mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,691 Commits 13 Branches 58 Tags 878 MiB
Commit Graph

258 Commits

Author SHA1 Message Date
Mike Pope c69f0e2b0e Improve schema handling of aiMain.nextId and fix maps. 2013-03-31 22:07:05 +10:30
Michael Vehrs 281981fe7c Rename attribute 'colonyCenterTile' to 'unattended'. 2013-03-31 10:19:35 +02:00
Mike Pope 7b11e6c5ed Rename nextID. 2013-03-31 14:28:12 +10:30
Michael Pope 20be23d386 Tidy serialization #37, UnitTypeOption. 2013-03-27 18:54:56 +10:30
Michael Pope b1e2216d10 Add missing @compat annotation for recent schema changes. 2013-03-26 14:37:31 +10:30
Michael Vehrs b2bde26c9c Switch colony tile to the new generalized production scheme. 2013-03-17 12:58:06 +01:00
Michael Pope ee07b8cbe7 Tidy serialization #35, StringTemplate. 2013-03-15 19:58:40 +10:30
Michael Pope d6a5b55455 Tidy serialization #32, NationOptions. 2013-03-14 19:57:20 +10:30
Michael Pope a02cc54d04 Tidy serialization #14, Market/Data. 2013-02-20 07:29:04 +10:30
Michael Vehrs 183dc7c924 Add generalized production element, step 1. 
This commit adds a new generalized production element, which allows
for production types with several input and output goods, and also
subsumes the basic production and factory production features of
building types. The production element is added to tile types and
building types, but the original semantics are preserved as far as
possible. They will be replaced in subsequent commits.
 2013-02-10 13:39:53 +01:00
Mike Pope 7529d6a697 Add convertThreshold to native settlement types. 2012-12-22 12:20:03 +00:00
Mike Pope 5e691e205f Generalize preserveAttributes to children. 2012-12-03 07:11:37 +00:00
Mike Pope c1f3a7d5e9 Add preserveAttributes specification attribute. 2012-11-22 08:55:09 +00:00
Mike Pope a4bc73918b ExportData is a FreeColObject, use id attribute. 2012-11-16 10:52:14 +00:00
Michael Vehrs 0a34c3995e Use TileImprovementStyle. 2012-11-11 08:29:08 +00:00
Michael Vehrs 9e6a721073 Prepare mercenary force. 2012-08-18 08:17:35 +00:00
Michael Vehrs 3d1c244d84 Add optional upkeep and bankruptcy. 2012-07-29 12:09:20 +00:00
Michael Vehrs be8c01eff4 Prepare natural and other disasters. 2012-07-21 07:49:09 +00:00
Mike Pope 19a49150ed Rework TerrainGenerator, importing regions and adding contiguity. 2012-06-24 07:00:31 +00:00
Mike Pope c0b5ea0615 Add MOUNDS type to LCR-schema. 2012-06-23 12:20:59 +00:00
Mike Pope 7af528c9a2 Support region <child> in schema. 2012-06-23 11:19:40 +00:00
Michael Vehrs 06c10220bd Move OptionGroupUI to a tree-based layout. 2012-06-09 08:11:10 +00:00
Michael Vehrs 71610d9e24 Add Role as a GameObjectType. 2012-04-01 08:55:50 +00:00
Michael Vehrs 221a3bb811 Prepare intervention force. 2012-02-20 06:28:15 +00:00
Michael Vehrs df2d75a4b4 Make clearing of forest more similar to the original game. 2012-02-11 14:23:40 +00:00
Michael Vehrs a5cbe1a929 Patch by Marko Voß adding elevation attribute to tile type. 2011-11-26 09:06:45 +00:00
Michael Vehrs 6215ca24da Fix schema. 2011-11-05 09:46:10 +00:00
Michael Vehrs 841285407b Update schema to handle unitListOption. 2011-10-17 05:03:03 +00:00
Michael Vehrs 811b43356c Move aggression and number-of-settlements into NationType. 2011-08-14 15:13:47 +00:00
Michael Vehrs f24f6933d5 Extend Limit to handle Options, and make use of LAST_COLONIAL_YEAR. 2011-08-13 08:45:29 +00:00
Michael Vehrs 34a0c0c1ac Add preferredLatitude and startsOnEastCoast to Nation. 2011-07-30 09:23:42 +00:00
Michael Vehrs 8ef0406df7 Remove unused anthem attribute from Nation. 2011-07-29 12:08:40 +00:00
Michael Vehrs 6b5efdd0cf Add minimum and maximum latitudes to Map. 2011-07-29 11:30:35 +00:00
Michael Vehrs 319e009f9c Add HighSeas. 2011-07-26 06:30:06 +00:00
Michael Vehrs f7cd47f468 Make use of new destinations. 2011-07-24 14:07:23 +00:00
Nick Shanks 7ecdc7e784 show experience even when a unit is not working on that job. potentially can be extended to allow possibility of units earning experience at one thing whilst producing another (e.g. food vs. grain) 2011-07-15 08:02:38 +00:00
Michael Vehrs 1cea9f1535 Get rid of xmllint errors. 2011-07-09 09:00:09 +00:00
Michael Vehrs c6881819cf Add nationality and ethnicity. 2011-07-09 08:53:25 +00:00
Mike Pope f7e13b36b6 The monarch now becomes displeased if a subject accepts an offer of mercenaries but evades full payment. Displeasure disables further offers of land support. 2011-07-08 12:50:39 +00:00
Michael Vehrs d482b61682 Fix serialization test. 2011-07-03 11:08:34 +00:00
Michael Vehrs 194e06c989 Restore reading of required-location-ability for the sake of compatibility. 2011-06-17 12:16:57 +00:00
Michael Vehrs c2c6184b15 Add UUID. 2011-05-28 10:13:37 +00:00
Mike Pope c548fe79c7 Fix schema for IndianSettlement. 2011-03-31 09:42:22 +00:00
Mike Pope bec3e6be39 Fix serialization of Tile.moveToEurope. 2011-03-31 09:40:25 +00:00
Michael Vehrs b3853c6de6 Add map layers for future improvements to map loading. 2011-03-19 08:40:51 +00:00
Mike Pope 1a7a954f78 Fix BR#3194193 - FC010 Loading a SaveGame on a turn where FF choice is made. 2011-03-10 09:27:19 +00:00
Michael Vehrs 788fd8dcb3 Use PercentageType some more. 2011-02-05 15:10:34 +00:00
Michael Vehrs a70812a9b0 Add maximumExperience to UnitType. 2011-01-30 12:19:49 +00:00
Michael Vehrs 8a32ee26a3 Use percentages rather than booleans for UnitTypeChange. 2011-01-30 12:10:22 +00:00
Mike Pope cada626edd Fix TODO to recover the trade bonus with native settlements that was dropped when settlement types were introduced. 2011-01-24 12:42:53 +00:00
Michael Vehrs c5197cfabd Add second plunder entry for Cortes. 2011-01-19 16:58:51 +00:00
Michael Vehrs 600f90f1dc Update copyright headers. 2011-01-01 11:31:57 +00:00
Michael Vehrs c4e2336e7b Add build queue for population. 2010-12-31 13:03:25 +00:00
Mike Pope 7dda212abd Convert PlayerExploredTile stockade handling to use a key from the spec rather than a special case level-based array. 2010-12-30 06:32:45 +00:00
Michael Vehrs ae2fb22018 Add basic MapConverter and use it. 2010-12-29 12:19:58 +00:00
Mike Pope 1d106164d2 Revise PlayerExploredTile. Remove dead code and unused fields, but add and use missing owningSettlement field. 2010-12-29 01:17:45 +00:00
Mike Pope 483f1f4add Use the PlayerExploredTile version of stockade level when appropriate. 2010-12-22 09:20:39 +00:00
Michael Vehrs a915d5a534 Add Consumer interface, and remove unused sequence attribute. 2010-12-19 11:47:10 +00:00
Michael Vehrs 7a92442619 Restore stored-as, but DON'T use it for automatic conversion. 2010-11-28 11:14:09 +00:00
Michael Vehrs ecaba75537 Add settlementType attribute. 2010-11-28 10:44:16 +00:00
Mike Pope 609a02503f Move tea party modifier into the spec, fix modifier serialization bug that made the tea party into an additive bonus. 2010-11-27 05:06:35 +00:00
Michael Vehrs c80b429008 Remove GoodsType.storedAs attribute. 2010-11-25 17:04:38 +00:00
Mike Pope 8d580f8233 Move the wandering native land claims radius magic number to SettlementType. 2010-11-15 09:09:03 +00:00
Michael Vehrs ade0ba98c9 Move defence modifiers into settlement type. 2010-11-14 13:20:23 +00:00
Mike Pope 604faea5a1 Fix missing feature #2786046: Bonus Resources 2010-11-04 08:18:29 +00:00
Michael Vehrs c821f0246c Add Plunder class. 2010-10-29 16:06:53 +00:00
Michael Vehrs 6ea7c49e5a Make Spanish Succession an Event. 2010-10-23 14:53:10 +00:00
Michael Vehrs 456fba04d9 Prepare addition of upkeep. 2010-10-20 16:01:45 +00:00
Michael Vehrs 924e3b4c8f Fix serialization tests. 2010-10-17 11:27:07 +00:00
Michael Vehrs 7699a2262b Remove dead elements. 2010-10-17 11:25:58 +00:00
Michael Vehrs 967e498089 Replace DifficultyLevel with an OptionGroup. 2010-10-09 12:30:08 +00:00
Michael Vehrs b8e5051028 Allow OptionGroups to contain OptionGroups. 2010-09-20 15:31:11 +00:00
Mike Pope 1108d49a56 Fix Market, promote MarketData to FreeColGameObject so they can be individually updated. 2010-08-31 12:52:05 +00:00
Michael Vehrs 859a418d57 Options MUST be children of an OptionGroup from now on. 2010-08-28 11:44:36 +00:00
Michael Vehrs ef77a02fab Add difficultyLevel attribute. 2010-08-26 10:09:39 +00:00
Michael Vehrs 1d8ac7fd54 Merge all specification work back into trunk. 2010-08-26 08:59:42 +00:00
Michael Vehrs 393300e404 Revert to known-good revision 7315. 2010-08-24 13:09:44 +00:00
Michael Vehrs 185c94d854 Update range option. 2010-08-23 09:32:35 +00:00
Michael Vehrs d9e95d8432 Serialize options. 2010-08-22 08:28:52 +00:00
Mike Pope 50134947db Remove unused player index. 2010-08-12 05:21:18 +00:00
Mike Pope 78f8b915f5 Clean up several issues around colony ownership, including a server-side reinstatement of the tile reassignment code temporarily removed in svn.7063. 2010-07-30 12:19:04 +00:00
Michael Vehrs c79b71da79 Add delete attribute to various elements, improving inheritance. 2010-07-26 15:24:05 +00:00
Michael Vehrs fe082c9979 Make it possible to delete FreeColGameObjectTypes from the specification. 2010-07-25 15:23:28 +00:00
Michael Vehrs 74a0c8e5d7 Use inheritance to define FreeCol's default ruleset. 2010-07-20 15:50:34 +00:00
Michael Vehrs 76baa6830d Basic support for specification inheritance. Some problems remain. 2010-07-19 15:58:15 +00:00
Michael Vehrs 9cd19a4b93 Remove path image from specification. 2010-07-15 18:04:12 +00:00
Michael Vehrs 9fe235c2d9 Clean up consumption of goods by units in settlements. 2010-07-15 16:29:16 +00:00
Michael Vehrs 5ba07158f3 Fix failing validation tests. 2010-07-03 12:16:55 +00:00
Michael Vehrs 76229b9a6a Serialize UnitTypeChange. 2010-06-24 05:33:41 +00:00
Michael Vehrs 44fbc0b182 Replace tile/tiles elements with scope in tile improvement. 2010-06-13 13:15:02 +00:00
Michael Vehrs 7866c1df01 Serialize GoodsType and start validation (test is expected to fail for some time). 2010-06-12 14:47:56 +00:00
Michael Vehrs 91d5feb625 Fix broken validation test. 2010-06-05 14:37:49 +00:00
julviala 1900cc2f47 add audio option comment for v 0.39 of specification schema 2010-05-21 07:35:21 +00:00
julviala 6f2627310d Cleaning of old specifications.xml schemas. 2010-05-20 15:47:08 +00:00
Michael Vehrs d184cf5155 Remove color from Nation and Player. 2010-05-20 15:40:16 +00:00
julviala 045ef46e71 Move remaining audio options to specifications.xml and clean now useless option constructors 2010-05-20 11:58:44 +00:00
julviala 08d75508e7 Move audioMixerOption to specification.xml 2010-05-20 10:01:34 +00:00
Michael Vehrs 27241ae983 Remove overlay from tile improvement. 2010-04-24 09:57:27 +00:00
Michael Vehrs 9928cbb995 Remove art from tile type. 2010-04-21 05:02:18 +00:00
Michael Vehrs 6123e638f7 Let ResourceManager handle unit order buttons. 2010-04-18 07:50:35 +00:00
Michael Vehrs 0a27a0ac35 Remove minimap color from TileType. 2010-04-17 12:52:14 +00:00
Michael Vehrs e1a22914d1 Use inheritance for European and Indian nation types. 2010-04-11 14:54:29 +00:00
Michael Vehrs 0ae2f24d90 Use inheritance for building types. 2010-04-11 13:30:38 +00:00
Michael Vehrs c229777d0a Add inheritance to specification, starting with unit types. 2010-04-11 12:03:00 +00:00
Michael Vehrs c8714f5e7b Extend Event and re-use it for FoundingFather. 2010-04-10 12:53:13 +00:00
Michael Vehrs 27f51fa80d Add starting units to difficulty level. 2010-04-10 08:36:13 +00:00
Michael Vehrs 6b77ab3307 Add tile production to difficulty level; starting units to follow. 2010-04-08 16:34:38 +00:00
Michael Vehrs be13fa2e20 Add StringOptionUI. 2010-04-07 16:57:11 +00:00
Michael Vehrs 201000062f Add events to specification. 2010-04-05 12:19:26 +00:00
Michael Vehrs e84118a29c Move limit into other types. 2010-04-05 11:15:52 +00:00
Michael Vehrs 6ab539d041 Add Limit to Specification. 2010-04-03 12:30:48 +00:00
Mike Pope 4b557ce882 Remove hard-coded goods type references. 2010-04-03 09:30:56 +00:00
Michael Vehrs 1e96f7e2be Simplify reading of child elements. As a side effect, enable forward declaration of all child elements. 2010-03-17 05:58:16 +00:00
Michael Vehrs a2e30ae38d Improve validation of current savegames. 2010-03-08 16:06:22 +00:00
Michael Vehrs 7b83956f21 Some more work towards validating current savegames. 2010-03-07 09:34:58 +00:00
Michael Vehrs f00d48e38d Some improvements towards validating current save games. 2010-03-06 14:54:17 +00:00
Michael Vehrs 842a4b07c6 Fix failing test due to new build queue format. 2010-03-06 11:12:37 +00:00
Michael Vehrs 5ece247f13 Add establishment date to colony. 2010-03-06 11:02:49 +00:00
Michael Vehrs b22f043fbf numberOfSettlements is no longer used. 2010-03-06 10:53:17 +00:00
Michael Vehrs d3bac92382 Restore various production-related changes to make FreeCol match the original more closely (was 6162--6165 in 0.9.x). 2010-02-28 11:58:51 +00:00
Michael Vehrs bee95e0ccd Rewrite ModelMessage (step 1/many). 2010-02-16 06:21:01 +00:00
Michael Vehrs cdf24e752d Extend radius of settlements. 
Most Indian settlements have a radius of one tile, capitals have a
radius of two tiles. Aztec and Inca settlements have a radius of two
tiles, and their capitals have a radius of three tiles. The radius of
settlements and capitals are now fields of the NationType class, and
attributes of the IndianNationType in the specification.
 2010-01-24 16:29:54 +00:00
Michael Vehrs d2179a1fcf Tighten validation. 2010-01-24 12:24:47 +00:00
Michael Vehrs d6e12f58ce Add support for aiMain. 2010-01-23 10:33:01 +00:00
Michael Vehrs 104afa1f03 Add SaveGameValidator and improve validation. 2010-01-23 08:57:16 +00:00
Michael Vehrs 4bf92209f4 Validate lost city rumours. 2010-01-22 16:24:07 +00:00
Michael Vehrs bfe8c0ed66 Validate all maps. 2010-01-21 17:07:36 +00:00
Michael Vehrs c957c83078 Upgrade serialization test from colony to player. 2010-01-17 15:11:06 +00:00
Michael Vehrs c1023425f4 Make tile production depend on difficulty (step 1). 2010-01-16 13:48:15 +00:00
Michael Vehrs b10a77f17f Add schema files and serialization test. 2010-01-16 09:52:49 +00:00
Michael Vehrs 6b3dc40a0e Fix bug #2902259: Dutch should start with Vet soldier. 2010-01-10 11:30:56 +00:00
Michael Vehrs 10e171681f Merge all changes from 0.9.x 2009-12-31 11:41:00 +00:00
Michael Vehrs fcaf66f318 Generalize SimpleCombatModel, fixing bug #2807062: Native city defense bonus. 2009-06-21 15:11:04 +00:00
Michael Vehrs a85875f306 Clean up default downgrades. 2009-05-30 12:23:37 +00:00
Michael Vehrs 95ecd444d9 Add scope to unit type change. 2009-05-29 13:10:03 +00:00
Michael Vehrs 8e792c6987 Generalize layering of TileItems and simplify TileItemContainer. 2009-05-02 07:31:39 +00:00
Michael Vehrs 66d3ca9b5d Remove 'classic'. Classic nations are the nations defined in the classic rule set. 2009-03-15 13:16:22 +00:00
Michael Vehrs 7a493328bb Make liberty and immigration distinct from bells and crosses. 2009-02-14 13:17:51 +00:00
Michael Vehrs 2f266b4a1e Clean up and generalize some methods. 2009-01-27 17:14:37 +00:00
Michael Vehrs c2048b92df Merge work on scopes and resources. 2009-01-23 07:02:04 +00:00
Michael Vehrs 78123ad82b Patch by Markus Schaber to remove unused imports. 2008-12-30 14:41:00 +00:00
Michael Vehrs f71e3255d5 Partial implementation of fixed recruitables. 2008-12-30 12:48:05 +00:00
Michael Vehrs 05077bc775 Move goods into resources. 2008-12-07 11:23:44 +00:00
Michael Vehrs 98944acaba Update specification and schema. 2008-12-04 06:54:29 +00:00
julviala f2c086784a Fix double definition of boolean and integer options in specification XSD 2008-12-03 16:58:18 +00:00
Michael Vehrs afba47a756 Update rule sets and schema. 2008-12-03 07:24:19 +00:00
Michael Vehrs 26f3c60315 Update specification version number. 2008-10-15 15:45:10 +00:00
Michael Vehrs a49470967b Revert default role and add default equipment. 2008-10-14 15:44:26 +00:00
Michael Vehrs e07d90a26a Introduce UnitType default role. 2008-10-13 15:22:51 +00:00
julviala 207accaf08 Fix specification.xml schema for ant-based XML Validation 2008-10-06 10:41:21 +00:00