Commit graph

333 commits

Author SHA1 Message Date
jason@long.name
4651f39819 build: package Mac version of Micropolis
Contributed by benawatt@gmail.com.

Requires App Bundler (https://java.net/projects/appbundler/downloads)
To build, type

ant dist-mac

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@877 d9718cc8-9f43-0410-858b-315f434eb58c
2013-12-01 22:48:08 +00:00
jason@long.name
034c6afd5a localization: german language strings
contributed by matthias.schulze5,
2013-11-10,
https://code.google.com/p/micropolis/issues/detail?id=38

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@876 d9718cc8-9f43-0410-858b-315f434eb58c
2013-11-11 21:05:48 +00:00
jason@long.name
280126ac05 refactor: move makeTraffic() from city to zone-behavior class
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@875 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:16 +00:00
jason@long.name
ff84c48091 cleanup: move code that refreshes tile/rawTile closer to where it is needed
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@874 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:13 +00:00
jason@long.name
93381a3490 refactor: make accessor method for fireRate[] array
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@873 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:09 +00:00
jason@long.name
e7cb33ca92 behaviors: move exploding-tile processing to new TileBehavior-based class
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@872 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-10 13:31:06 +00:00
jason@long.name
81c05604df behaviors: move terrain-related behaviors from MapScanner
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@871 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:54:03 +00:00
jason@long.name
4717c93039 behaviors: dispatch behavior from mapScan() method
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@870 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:59 +00:00
jason@long.name
fb4f1fee98 behaviors: MapScanner: s/cchr/rawTile and s/cchr9/tile
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@869 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:56 +00:00
jason@long.name
f3ca16a672 behaviors: define a new class TileBehavior to be a base class
this will be a base class of all tile-behavior classes

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@868 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:52 +00:00
jason@long.name
6bd61e6575 behaviors: rename old TileBehavior class to make room for new one
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@867 d9718cc8-9f43-0410-858b-315f434eb58c
2013-10-04 12:53:49 +00:00
jason@long.name
eb76937e2c copyright: add copyright notices to source files missing it
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@866 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 20:23:22 +00:00
jason@long.name
5252770d10 city-eval: use public getTrafficDensity() instead of direct access
of trfDensity[] array

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@865 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:37 +00:00
jason@long.name
2b60d14e96 overlay: use public getLandValue() method to draw landvalue overlay
instead of directly accessing the landValueMem[] array

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@864 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:28 +00:00
jason@long.name
275139c2d1 refactor: make public getLandValue() method for accessing landValueMem[]
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@863 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:17 +00:00
jason@long.name
300adefd27 cleanup: use getTrafficDensity() instead of directly accessing the array
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@862 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:34:06 +00:00
jason@long.name
72fac6d84e refactor: move traffic-density mutation code to new function
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@861 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:33:56 +00:00
jason@long.name
99954a3619 overlay: use public getTrafficDensity() method to draw traffic overlay
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@860 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-28 16:33:43 +00:00
jason@long.name
b18b51d08e refactor: remove isPic argument from cityMessage() notification
Have the decision of whether to show the message in the notification
pane be determined by the message type itself, rather than being
decided by the sender of the message.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@859 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-22 00:48:34 +00:00
jason@long.name
736754a5ab cleanup: rename FREEZ to RESCLR for consistency
matches the naming pattern used for COMCLR and INDCLR

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@858 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-20 11:21:28 +00:00
jason@long.name
d389124b86 cleanup: remove two more unused tile constants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@857 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-20 11:21:06 +00:00
jason@long.name
e81b0096aa cleanup: remove unused constant: UNUSED_TRASH2
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@856 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-20 11:20:57 +00:00
jason@long.name
50600cef2e cleanup: reduce visibility of many of the named tiles
(no reason that the front-end needs to reference these tiles directly)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@855 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-20 11:20:47 +00:00
jason@long.name
2a0ec53a05 gui: DemandIndicator- replace hardcoded dimensions with constants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@854 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-09 14:25:41 +00:00
jason@long.name
7b68e1299d android port: convert use of java.awt.Rectangle to own CityRect class
java.awt.Rectangle does not exist in the android SDK, so this patch
replaces its use within the Micropolis engine code with a custom class
with equivalent functionality.

This way all the classes in micropolisj.engine can be compiled with
the subset of the Java SDK that also exists in the Android SDK.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@853 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-09 14:11:55 +00:00
jason@long.name
6b899d096d MakeTiles: tolerate undefined tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@852 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-09 14:11:39 +00:00
jason@long.name
acce301d1d MakeTiles: support additional creation arguments
tile_count: to control how many tiles are generated
skip_tiles: to control which tile to start with

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@851 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-09 14:11:21 +00:00
jason@long.name
436789c12e gui: scroll with middle-button
Hold-down middle button and drag to scroll map without using
scroll bars.  Contributed by askywhale (email, 2013-09-01)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@850 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-07 15:18:38 +00:00
jason@long.name
dc412a71b6 cleanup: remove no-longer-used isRadioactive()
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@849 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-06 12:49:59 +00:00
jason@long.name
a3696e01ba cleanup: remove no-longer-used isFire()
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@848 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-06 12:49:31 +00:00
jason@long.name
90149dc9c0 evalLog road test: let road/rail crossing count as road
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@847 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-06 12:49:10 +00:00
jason@long.name
36035942af copyright: add copyright notice to tiles.rc
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@846 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:23:36 +00:00
jason@long.name
d86c9f6b65 cleanup: remove a bunch of unused tile constants
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@845 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:23:28 +00:00
jason@long.name
c3e677047a strictness: getZoneSizeFor must be called on a zone-center tile
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@844 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:23:07 +00:00
jason@long.name
94e9892731 refactor: make getZoneSizeFor return CityDimension (width AND height)
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@843 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:22:56 +00:00
jason@long.name
2af5cf14a7 refactor: introduce new CityDimension class to encapsulate width/height
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@842 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:22:40 +00:00
jason@long.name
b22263b4b6 applyZone: rewrite to use tiles.rc annotations
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@841 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-05 11:22:09 +00:00
jason@long.name
400c2942ee pollution: coal plant animated tiles should emit pollution
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@840 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-04 18:58:31 +00:00
jason@long.name
f6601ac95d pollution: industrial zone animations should emit pollution
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@839 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-04 18:58:19 +00:00
jason@long.name
43455f1903 pollution: airport's radar dish should emit pollution just like rest of airport
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@838 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-04 18:58:06 +00:00
jason@long.name
ed88e75a34 tiles.rc: move pollution values from Java code to tiles.rc
This patch maintains exact values for every tile, even where it
is probably wrong.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@837 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-04 18:57:51 +00:00
jason@long.name
db6f3fb59c doSpecialZone: use annotations to control which special zone processing is done
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@836 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-03 01:07:35 +00:00
jason@long.name
18f00153a3 refactor: doSpecialZone- split up into separate functions for each zone type
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@835 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-03 01:07:25 +00:00
jason@long.name
1932084d22 cleanup: remove erroneous assertion
Usually after powerScan() the powerPlants list will be empty, but
not if powerScan() aborts upon detection of a brown-out condition.

It does not matter anyway; the powerPlants will be cleared and
repopulated in normal course by simulate() in phase 0.

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@834 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:34:25 +00:00
jason@long.name
1b82d46aeb cleanup: remove two obsolete functions from TileConstants.java
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@833 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:34:16 +00:00
jason@long.name
bef75adc90 scanTile: use annotations in tiles.rc to determine behavior of tiles
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@832 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:34:06 +00:00
jason@long.name
070cd90727 refactor: move checkZonePower down a level
(This will allow elimination of the doZone() intermediary function)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@831 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:56 +00:00
jason@long.name
1e4dd42655 gitignore: prevent VIM swap files from getting caught by repository
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@830 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:47 +00:00
jason@long.name
0f2c2f4617 refactor: checkZonePower() to set PWR bit and count zones
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@829 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:38 +00:00
jason@long.name
07bc48c34c cleanup: consolidate all doFire() functionality into doFire() method
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@828 d9718cc8-9f43-0410-858b-315f434eb58c
2013-09-01 21:33:28 +00:00