Index: data/default/effects.ruleset =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/default/effects.ruleset,v retrieving revision 1.6 diff -u -r1.6 effects.ruleset --- data/default/effects.ruleset 21 Apr 2005 22:53:13 -0000 1.6 +++ data/default/effects.ruleset 2 May 2005 23:10:10 -0000 @@ -64,16 +64,7 @@ [effect_bank] name = "Tax_Bonus" -value = 50 -reqs = - { "type", "name", "range" - "Building", "Marketplace", "City" - "Building", "Bank", "City" - } - -[effect_bank_1] -name = "Luxury_Bonus" -value = 50 +value = 150 reqs = { "type", "name", "range" "Building", "Marketplace", "City" @@ -195,19 +186,10 @@ } [effect_colosseum] -name = "Make_Content" -value = 3 -reqs = - { "type", "name", "range" - "Building", "Colosseum", "City" - } - -[effect_colosseum_1] -name = "Make_Content" -value = 1 +name = "Luxury_Bonus" +value = 100 reqs = { "type", "name", "range" - "Tech", "Electricity", "Player" "Building", "Colosseum", "City" } @@ -252,6 +234,14 @@ "Building", "Courthouse", "City" } +[effect_blacksmith] +name = "Prod_Bonus" +value = 25 +reqs = + { "type", "name", "range" + "Building", "Blacksmith", "City" + } + [effect_factory] name = "Prod_Bonus" value = 50 @@ -345,15 +335,7 @@ [effect_marketplace] name = "Tax_Bonus" -value = 50 -reqs = - { "type", "name", "range" - "Building", "Marketplace", "City" - } - -[effect_marketplace_1] -name = "Luxury_Bonus" -value = 50 +value = 100 reqs = { "type", "name", "range" "Building", "Marketplace", "City" @@ -660,16 +642,7 @@ [effect_stock_exchange] name = "Tax_Bonus" -value = 50 -reqs = - { "type", "name", "range" - "Building", "Bank", "City" - "Building", "Stock Exchange", "City" - } - -[effect_stock_exchange_1] -name = "Luxury_Bonus" -value = 50 +value = 200 reqs = { "type", "name", "range" "Building", "Bank", "City" @@ -893,12 +866,13 @@ "Building", "J.S. Bach's Cathedral", "Player" } -[effect_king_richards_crusade] -name = "Prod_Add_Tile" -value = 1 +[effect_national_championship] +name = "Luxury_bonus" +value = 100 reqs = { "type", "name", "range" - "Building", "King Richard's Crusade", "City" + "Building", "National Championship", "City" + "Building", "Colosseum", "City" } [effect_leonardos_workshop] Index: data/default/buildings.ruleset =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/default/buildings.ruleset,v retrieving revision 1.71 diff -u -r1.71 buildings.ruleset --- data/default/buildings.ruleset 18 Apr 2005 23:33:03 -0000 1.71 +++ data/default/buildings.ruleset 2 May 2005 23:10:10 -0000 @@ -105,7 +105,26 @@ ; /* xgettext:no-c-format */ helptext = _("\ Together with the Marketplace improvement, a Bank increases the\ - luxury and tax production within a city by 100%.\ + gold production within a city by 250%.\ +") + +[building_blacksmith] +name = _("Blacksmith") +genus = "Improvement" +reqs = + { "type", "name", "range" + "Tech", "Iron Working", "Player" + } +graphic = "b.blacksmith" +graphic_alt = "b.barracks" +obsolete_by = "None" +build_cost = 30 +upkeep = 2 +sabotage = 100 +sound = "b_blacksmith" +sound_alt = "b_generic" +helptext = _("\ +Adds 25% to shield production.\ ") [building_barracks] @@ -258,17 +277,14 @@ graphic = "b.colosseum" graphic_alt = "-" obsolete_by = "None" -build_cost = 70 -upkeep = 4 +build_cost = 60 +upkeep = 2 sabotage = 100 sound = "b_colosseum" sound_alt = "b_generic" helptext = _("\ -Entertains the citizens of a city, making 3 unhappy citizens content. \ - (Four after the discovery of Electricity.)\ +Entertains the citizens of a city, giving 100% bonus to luxuries.\ ") -; NOTE: -; For Civ2 the "Electricity" condition should be "Electronics" [building_courthouse] name = _("Courthouse") @@ -423,14 +439,14 @@ graphic = "b.marketplace" graphic_alt = "-" obsolete_by = "None" -build_cost = 60 +build_cost = 40 upkeep = 0 sabotage = 100 sound = "b_marketplace" sound_alt = "b_generic" ; /* xgettext:no-c-format */ helptext = _("\ -Increases the luxury and tax output in a city by 50%.\ +Increases the gold output in a city by 100%.\ ") [building_mass_transit] @@ -848,7 +864,7 @@ ; /* xgettext:no-c-format */ helptext = _("\ Together with a Marketplace and a Bank, a Stock Exchange boosts\ - tax and luxury production in a city by 150%.\ + gold production in a city by 450%.\ ") [building_super_highways] @@ -1210,24 +1226,42 @@ Makes two unhappy citizens content in every city.\ ") -[building_king_richards_crusade] -name = _("King Richard's Crusade") -genus = "GreatWonder" +[building_crusade] +name = _("Crusade") +genus = "SmallWonder" reqs = { "type", "name", "range" - "Tech", "Engineering", "Player" + "Tech", "Monotheism", "Player" } graphic = "b.king_richards_crusade" graphic_alt = "-" -obsolete_by = "Robotics" +obsolete_by = "None" build_cost = 150 upkeep = 0 sabotage = 0 sound = "w_king_richards_crusade" sound_alt = "w_generic" helptext = _("\ -Adds one extra shield resource on every square around the city\ - where it is built.\ +Allows you to build Crusaders in this city.\ +") + +[building_nation_championship] +name = _("National Championship") +genus = "SmallWonder" +reqs = + { "type", "name", "range" + "Tech", "Radio", "Player" + } +graphic_alt = "b.national_championship" +graphic_alt = "b.king_richards_crusade" +obsolete_by = "None" +build_cost = 400 +upkeep = 0 +sabotage = 0 +sound = "w_national_championship" +sound_alt = "w_generic" +helptext = _("\ +All Colosseums give 200% bonus to luxuries instead of 100%.\ ") [building_leonardos_workshop] Index: data/default/units.ruleset =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/default/units.ruleset,v retrieving revision 1.67 diff -u -r1.67 units.ruleset --- data/default/units.ruleset 4 Apr 2005 21:45:49 -0000 1.67 +++ data/default/units.ruleset 2 May 2005 23:10:10 -0000 @@ -737,6 +737,35 @@ flags = "Horse" roles = "AttackFast", "Hut", "Hunter" +[unit_crusaders] +name = _("Crusaders") +move_type = "Land" +tech_req = "None" +impr_req = "Crusade" +obsolete_by = "None" +graphic = "u.crusaders" +graphic_alt = "-" +sound_move = "m_crusaders" +sound_move_alt = "m_generic" +sound_fight = "f_crusaders" +sound_fight_alt = "f_generic" +build_cost = 20 +pop_cost = 0 +attack = 5 +defense = 2 +hitpoints = 10 +firepower = 1 +move_rate = 2 +vision_range = 1 +transport_cap = 0 +fuel = 0 +uk_happy = 0 +uk_shield = 0 +uk_food = 1 +uk_gold = 1 +flags = "Horse" +roles = "AttackFast" + [unit_knights] name = _("Knights") move_type = "Land"