diff --git a/common/unit.c b/common/unit.c index 7379f296d5..113a472a21 100644 --- a/common/unit.c +++ b/common/unit.c @@ -2170,13 +2170,13 @@ int unit_bribe_cost(struct unit *punit, struct player *briber) cost *= unit_build_shield_cost(punit) / 10; /* Rule set specific cost modification */ - cost = (cost - * get_target_bonus_effects(NULL, unit_owner(punit), briber, - game_city_by_number(punit->homecity), - NULL, unit_tile(punit), - unit_type(punit), NULL, NULL, - EFT_UNIT_BRIBE_COST_PCT)) - / 100; + cost += (cost + * get_target_bonus_effects(NULL, unit_owner(punit), briber, + game_city_by_number(punit->homecity), + NULL, unit_tile(punit), + unit_type(punit), NULL, NULL, + EFT_UNIT_BRIBE_COST_PCT)) + / 100; /* Veterans are not cheap. */ { diff --git a/data/alien/effects.ruleset b/data/alien/effects.ruleset index e09ed2bf95..523b83b8a4 100644 --- a/data/alien/effects.ruleset +++ b/data/alien/effects.ruleset @@ -1032,17 +1032,9 @@ reqs = type = "Max_Trade_Routes" value = 4 -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index 1d2d1b078c..cc50604373 100644 --- a/data/civ1/effects.ruleset +++ b/data/civ1/effects.ruleset @@ -1432,17 +1432,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index ed9c215906..57af47a9d8 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -2375,17 +2375,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index 004b14c8f2..aab2101855 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -3950,17 +3950,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 347f8f8a9f..c8cba7ecab 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -2463,17 +2463,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/experimental/effects.ruleset b/data/experimental/effects.ruleset index ecf3684178..75709dd388 100644 --- a/data/experimental/effects.ruleset +++ b/data/experimental/effects.ruleset @@ -2754,17 +2754,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index 377e783278..86ef3b7164 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -2511,17 +2511,9 @@ reqs = "Extra", "Pollution", "Local" } -[effect_unit_bribe_cost_standard] -type = "Unit_Bribe_Cost_Pct" -value = 100 -nreqs = - { "type", "name", "range" - "UnitFlag", "Cities", "Local" - } - [effect_unit_bribe_cost_settlers] type = "Unit_Bribe_Cost_Pct" -value = 50 +value = -50 reqs = { "type", "name", "range" "UnitFlag", "Cities", "Local" diff --git a/doc/README.effects b/doc/README.effects index 589b35348f..e7a21b5a3b 100644 --- a/doc/README.effects +++ b/doc/README.effects @@ -200,7 +200,7 @@ Incite_Cost_Pct Increases revolt cost by amount percent. Unit_Bribe_Cost_Pct - Keep amount percent of the unit bribe cost. Requirements are from the + Increases unit bribe cost by amount percent. Requirements are from the point of view of the target unit, not the briber. Size_Adj diff --git a/fc_version b/fc_version index a3f3ba7bcc..6212a141bd 100755 --- a/fc_version +++ b/fc_version @@ -30,7 +30,7 @@ DEFAULT_FOLLOW_TAG=stable # - Avoid adding a new mandatory capability to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2013.Aug.29" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2013.Aug.30" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR=""