Added Income improvements to ccl, removed hard coded versions

doc/ChangeLog.html

@@ -36,6 +36,7 @@
 <li>Future 1.19 Release<p>
     <ul>
     <li>++
+    <li>Added Income improvements to ccl, removed hard coded versions (from Russell Smith).
     <li>Fixed Pathfinder cost bug, which stopped units from moving (from Russell Smith).
     <li>Fixed Pathfinder bug and cleaned up vision table management (from Russell Smith).
     <li>Added Circular Goal support, Major vision and pathfinding changes (from Russell Smith).

doc/scripts/unittype.html

@@ -197,8 +197,8 @@ Define unit stats.
 <h4>Syntax</h4>
 
 <code>(define-unit-type ident name graphics pixel_size animations icon
-    speed overlay sight_range hitpoints magic costs tile_size box_size
+    speed overlay sight_range hitpoints magic costs improve_production tile_size
-    attack_range computer_reaction_range human_reaction_range armor
+    box_size attack_range computer_reaction_range human_reaction_range armor
     priorty damage piercing_damge weapon_upgradable armor_upgradeable
     decay annoy_factor points missle corpse type right_mouse can_target
     flags sounds attack_sound)</code>
@@ -271,14 +271,18 @@ NOTE: this will be changed to identifiers sometime.
 <dd>Flag to determine whether this unit is a spell user. 0 = false (not a magic
 user), 1 = true (magic user).  F.E. 1, 0</dd>
 <dt>costs</dt>
-<dd>Define the costs to build (or aquire) this unit. It is an array of #(
+<dd>Define the costs to build (or aquire) this unit. It is an array of '(
-time gold wood oil) or #(time gold wood oil ore stone coal). Time is in frames
+resource-name amount) pairs. Time is in frames to build this unit.
-to build this unit.
 Gold is the amount required to build this unit. Wood is the amount required
 to build this unit.  Oil is the amount required to build this unit.
-F.E.: #( 200 2000 1000 200 ).<p>
+F.E.: '( time 200 gold 2000 wood 1000 oil 200 ).<p>
-NOTE: This is extendable more costs could be added. (using 6 resources insteed
+</dd>
-of 3. Or redefining the gold resource into a crytal resource)
+<dt>improve_production</dt>
+<dd>Define the production increase from defaults that this unit adds. It is an array of '(
+rosource-name amount) pairs. 
+Gold is the amount it increase the default gold by. All other defined resources are
+treated the same way.
+F.E.: 'improve-production '( gold 20 wood 5 ).<p>
 </dd>
 <dt>tile_size</dt>
 <dd>Define the unit-type size in tiles. NOTE: currently only buildings could

src/unit/script_unittype.cpp

@@ -223,6 +223,16 @@ local SCM CclDefineUnitType(SCM list)
 		type->_Costs[CclGetResourceByName(value)]=gh_scm2int(gh_car(sublist));
 		sublist=gh_cdr(sublist);
 	    }
+	} else if( gh_eq_p(value,gh_symbol2scm("improve-production")) ) {
+	    sublist=gh_car(list);
+	    list=gh_cdr(list);
+	    while( !gh_null_p(sublist) ) {
+		value=gh_car(sublist);
+		sublist=gh_cdr(sublist);
+		type->ImproveIncomes[CclGetResourceByName(value)]=
+			DefaultIncomes[CclGetResourceByName(value)]+gh_scm2int(gh_car(sublist));
+		sublist=gh_cdr(sublist);
+	    }
 	} else if( gh_eq_p(value,gh_symbol2scm("construction")) ) {
 	    // FIXME: What if constructions arn't yet loaded?
 	    str=gh_scm2newstr(gh_car(list),NULL);

src/unit/unittype.cpp

@@ -1188,41 +1188,6 @@ global void InitUnitTypes(int reset_player_stats)
 	//
 	*(UnitType**)hash_add(UnitTypeHash,UnitTypes[type]->Ident)
 		=UnitTypes[type];
-	//
-	//	Hardcoded incomes, FIXME: should be moved to some configs.
-	//
-	if( !strcmp(UnitTypes[type]->Ident,"unit-elven-lumber-mill") ) {
-	    UnitTypes[type]->ImproveIncomes[WoodCost]=
-		    DefaultIncomes[WoodCost]+25;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-troll-lumber-mill") ) {
-	    UnitTypes[type]->ImproveIncomes[WoodCost]=
-		    DefaultIncomes[WoodCost]+25;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-human-refinery") ) {
-	    UnitTypes[type]->ImproveIncomes[OilCost]=
-		    DefaultIncomes[OilCost]+25;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-orc-refinery") ) {
-	    UnitTypes[type]->ImproveIncomes[OilCost]=
-		    DefaultIncomes[OilCost]+25;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-keep") ) {
-	    UnitTypes[type]->ImproveIncomes[GoldCost]=
-		    DefaultIncomes[GoldCost]+10;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-stronghold") ) {
-	    UnitTypes[type]->ImproveIncomes[GoldCost]=
-		    DefaultIncomes[GoldCost]+10;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-castle") ) {
-	    UnitTypes[type]->ImproveIncomes[GoldCost]=
-		    DefaultIncomes[GoldCost]+20;
-	}
-	if( !strcmp(UnitTypes[type]->Ident,"unit-fortress") ) {
-	    UnitTypes[type]->ImproveIncomes[GoldCost]=
-		    DefaultIncomes[GoldCost]+20;
-	}
     }
 
     // LUDO : called after game is loaded -> don't reset stats !