Author: sveinung
Date: Thu Apr 30 16:51:04 2015
New Revision: 28964

URL: http://svn.gna.org/viewcvs/freeciv?rev=28964&view=rev
Log:
Unhardcode the establish trade route one time bonus fudge factor.

The fudge factor is meant to make the one time bonus more like the one found
in Civilization 2. Some rulesets may not wish to do that.

See patch #6044

Modified:
    trunk/ai/default/advdomestic.c
    trunk/common/traderoutes.c
    trunk/data/alien/effects.ruleset
    trunk/data/civ1/effects.ruleset
    trunk/data/civ2/effects.ruleset
    trunk/data/civ2civ3/effects.ruleset
    trunk/data/classic/effects.ruleset
    trunk/data/experimental/effects.ruleset
    trunk/server/rscompat.c

Modified: trunk/ai/default/advdomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdomestic.c?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/ai/default/advdomestic.c      (original)
+++ trunk/ai/default/advdomestic.c      Thu Apr 30 16:51:04 2015
@@ -322,7 +322,7 @@
 
   /* We assume that we are creating trade route to city with 75% of
    * pcitys trade 10 squares away. */
-  income = (10 + 10) * (1.75 * pcity->surplus[O_TRADE]) / 24 * 3;
+  income = (10 + 10) * (1.75 * pcity->surplus[O_TRADE]) / 24;
 
   /* A ruleset may use the Trade_Revenue_Bonus effect to reduce the one
    * time bonus if no trade route is established. Make sure it gets the

Modified: trunk/common/traderoutes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/traderoutes.c?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/common/traderoutes.c  (original)
+++ trunk/common/traderoutes.c  Thu Apr 30 16:51:04 2015
@@ -380,10 +380,6 @@
   /* Should this be real_map_distance? */
   tb = map_distance(pc1->tile, pc2->tile) + 10;
   tb = (tb * (pc1->surplus[O_TRADE] + pc2->surplus[O_TRADE])) / 24;
-
-  /*  fudge factor to more closely approximate Civ2 behavior (Civ2 is
-   * really very different -- this just fakes it a little better) */
-  tb *= 3;
   
   /* Trade_revenue_bonus increases revenue by power of 2 in milimes */
   bonus = get_target_bonus_effects(NULL,

Modified: trunk/data/alien/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/alien/effects.ruleset    (original)
+++ trunk/data/alien/effects.ruleset    Thu Apr 30 16:51:04 2015
@@ -993,6 +993,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 [effect_trade_routes]
 type    = "Max_Trade_Routes"
 value   = 4

Modified: trunk/data/civ1/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/civ1/effects.ruleset     (original)
+++ trunk/data/civ1/effects.ruleset     Thu Apr 30 16:51:04 2015
@@ -1234,6 +1234,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 ; FIXME: Calendar effects are copied from default rulesets and are
 ; probably wrong for civ1 ruleset.
 [effect_calendar_base]

Modified: trunk/data/civ2/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/civ2/effects.ruleset     (original)
+++ trunk/data/civ2/effects.ruleset     Thu Apr 30 16:51:04 2015
@@ -2107,6 +2107,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 [effect_tithes_fundamentalism]
 type    = "Happiness_To_Gold" 
 value   = 1 

Modified: trunk/data/civ2civ3/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/civ2civ3/effects.ruleset (original)
+++ trunk/data/civ2civ3/effects.ruleset Thu Apr 30 16:51:04 2015
@@ -3470,6 +3470,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 [effect_calendar_base]
 type    = "Turn_Years"
 value   = 50

Modified: trunk/data/classic/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/classic/effects.ruleset  (original)
+++ trunk/data/classic/effects.ruleset  Thu Apr 30 16:51:04 2015
@@ -2172,6 +2172,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 [effect_calendar_base]
 type    = "Turn_Years"
 value   = 50

Modified: trunk/data/experimental/effects.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/data/experimental/effects.ruleset     (original)
+++ trunk/data/experimental/effects.ruleset     Thu Apr 30 16:51:04 2015
@@ -2370,6 +2370,12 @@
       "Action", "Enter Marketplace", "Local"
     }
 
+; Fudge factor to more closely approximate Civ2 behavior. (Civ2 is
+; really very different -- this just fakes it a little better)
+[effect_bonus_fudge_factor]
+type   = "Trade_Revenue_Bonus"
+value  = 1585
+
 [effect_upkeep_shield2gold]
 type    = "Shield2Gold_Factor"
 value   = 100

Modified: trunk/server/rscompat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=28964&r1=28963&r2=28964&view=diff
==============================================================================
--- trunk/server/rscompat.c     (original)
+++ trunk/server/rscompat.c     Thu Apr 30 16:51:04 2015
@@ -292,6 +292,10 @@
     /* The reduction only applies to Enter Marketplace. */
     effect_req_append(peffect, req_from_str("Action", "Local", FALSE, TRUE,
                                             "Enter Marketplace"));
+
+    /* The fudge factor to more closely approximate Civ2 behavior has
+     * moved to the ruleset. */
+     peffect = effect_new(EFT_TRADE_REVENUE_BONUS, 1585);
   }
 
   /* Upgrade existing effects. */


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to