Author: cazfi
Date: Sun Aug 2 21:06:13 2015
New Revision: 29296
URL: http://svn.gna.org/viewcvs/freeciv?rev=29296&view=rev
Log:
Added user unit type flag "Infra" to all rulesets, gave it to all units that
already have "Settlers" flag.
Ruleset compatibility code does the same to all loaded 2.6 rulesets.
See patch #6011
Modified:
trunk/data/alien/units.ruleset
trunk/data/civ1/units.ruleset
trunk/data/civ2/units.ruleset
trunk/data/civ2civ3/units.ruleset
trunk/data/classic/units.ruleset
trunk/data/experimental/units.ruleset
trunk/data/multiplayer/units.ruleset
trunk/server/rscompat.c
Modified: trunk/data/alien/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/alien/units.ruleset (original)
+++ trunk/data/alien/units.ruleset Sun Aug 2 21:06:13 2015
@@ -19,6 +19,7 @@
_("Bombarder")
_("Cities")
_("AddToCity")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -441,7 +442,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil"
roles = "Settlers"
helptext = _("\
This is Earth technology engineer.\
@@ -472,7 +473,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil"
roles = "Settlers"
helptext = _("\
Native version of the Engineer unit.\
@@ -504,7 +505,7 @@
uk_food = 0
uk_gold = 0
city_size = 2
-flags = "Cities", "Settlers", "Cant_Fortify", "NonMil"
+flags = "Cities", "Settlers", "Infra", "Cant_Fortify", "NonMil"
roles = "Cities", "Settlers"
helptext = _("\
Amphibious Engineer that can also establish new cities on Ocean. \
@@ -850,7 +851,7 @@
uk_food = 0
uk_gold = 0
targets = "Antigravity", "Burrowing"
-flags = "Settlers", "Capturer"
+flags = "Settlers", "Infra", "Capturer"
roles = "Hunter"
helptext = _("\
Burrowing unit that also has capability to attack Antigravity units with \
Modified: trunk/data/civ1/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/civ1/units.ruleset (original)
+++ trunk/data/civ1/units.ruleset Sun Aug 2 21:06:13 2015
@@ -26,6 +26,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -284,7 +285,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "AddToCity", "Cities",
"NoVeteran"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "AddToCity",
"Cities", "NoVeteran"
roles = "Settlers", "Cities"
helptext = _("\
Settlers are one of the key units in the game, as they are your main \
Modified: trunk/data/civ2/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/civ2/units.ruleset (original)
+++ trunk/data/civ2/units.ruleset Sun Aug 2 21:06:13 2015
@@ -31,6 +31,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -287,7 +288,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "Airbase", "AddToCity",
"Cities", "NoVeteran"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "Airbase",
"AddToCity", "Cities", "NoVeteran"
roles = "Settlers", "Cities"
helptext = _("\
Settlers are one of the key units in the game, as they are your main \
@@ -346,7 +347,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "Transform", "Airbase",
"AddToCity", "Cities", "NoVeteran"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "Transform",
"Airbase", "AddToCity", "Cities", "NoVeteran"
roles = "Settlers", "Cities"
helptext = _("\
Engineers are similar to Settlers, but they work twice as fast and\
Modified: trunk/data/civ2civ3/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/civ2civ3/units.ruleset (original)
+++ trunk/data/civ2civ3/units.ruleset Sun Aug 2 21:06:13 2015
@@ -38,6 +38,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -418,7 +419,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity",
"Cities"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"AddToCity", "Cities"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -462,7 +463,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity",
"Capturable"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"AddToCity", "Capturable"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -501,7 +502,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"Airbase"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -565,7 +566,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 1
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase",
"Transform"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"Airbase", "Transform"
veteran_names = _("green"), _("veteran"), _("hardened"), _("elite")
veteran_raise_chance = 50, 33, 20, 0
veteran_work_raise_chance = 3, 2, 1, 0
@@ -2024,7 +2025,7 @@
uk_food = 1
uk_gold = 1
cargo = "Land", "Small Land", "Big Land", "Merchant"
-flags = "Settlers", "BadCityDefender", "HasNoZOC"
+flags = "Settlers", "Infra", "BadCityDefender", "HasNoZOC"
veteran_names = _("green"), _("veteran"), _("hardened"), _("elite")
veteran_raise_chance = 50, 33, 20, 0
veteran_work_raise_chance = 0, 0, 0, 0
Modified: trunk/data/classic/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/classic/units.ruleset (original)
+++ trunk/data/classic/units.ruleset Sun Aug 2 21:06:13 2015
@@ -36,6 +36,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -392,7 +393,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity",
"Cities"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"AddToCity", "Cities"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -437,7 +438,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Airbase"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"Airbase"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -499,7 +500,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "Transform",
"Airbase"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"Transform", "Airbase"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
Modified: trunk/data/experimental/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/experimental/units.ruleset (original)
+++ trunk/data/experimental/units.ruleset Sun Aug 2 21:06:13 2015
@@ -39,6 +39,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -406,7 +407,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "Cant_Fortify", "NonMil", "HasNoZOC", "AddToCity",
"Cities"
+flags = "Settlers", "Infra", "Cant_Fortify", "NonMil", "HasNoZOC",
"AddToCity", "Cities"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -451,7 +452,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "NonMil", "HasNoZOC", "Airbase"
+flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Airbase"
veteran_names =
; /* TRANS: Worker veteran level */
_("?worker_level:apprentice"),
@@ -518,7 +519,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "NonMil", "HasNoZOC", "Transform", "Airbase"
+flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Transform",
"Airbase"
veteran_names =
; /* TRANS: Worker veteran level */
_("?worker_level:apprentice"),
Modified: trunk/data/multiplayer/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/data/multiplayer/units.ruleset (original)
+++ trunk/data/multiplayer/units.ruleset Sun Aug 2 21:06:13 2015
@@ -35,6 +35,7 @@
_("Cities")
_("AddToCity")
_("Nuclear")
+ _("Infra"), _("Can build infrastructure.")
}
[veteran_system]
@@ -391,7 +392,7 @@
uk_shield = 1
uk_food = 1
uk_gold = 0
-flags = "Settlers", "NonMil", "HasNoZOC", "AddToCity", "Cities",
"Cant_Fortify"
+flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "AddToCity",
"Cities", "Cant_Fortify"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -437,7 +438,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "NonMil", "HasNoZOC", "Airbase", "Cant_Fortify"
+flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Airbase",
"Cant_Fortify"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
@@ -498,7 +499,7 @@
uk_shield = 1
uk_food = 0
uk_gold = 0
-flags = "Settlers", "NonMil", "HasNoZOC", "Transform", "Airbase",
"Cant_Fortify"
+flags = "Settlers", "Infra", "NonMil", "HasNoZOC", "Transform",
"Airbase", "Cant_Fortify"
; No veteran levels (level name is never displayed)
veteran_names = _("green")
veteran_raise_chance = 0
Modified: trunk/server/rscompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=29296&r1=29295&r2=29296&view=diff
==============================================================================
--- trunk/server/rscompat.c (original)
+++ trunk/server/rscompat.c Sun Aug 2 21:06:13 2015
@@ -134,7 +134,7 @@
int unit_flag_position = first_free_unit_type_user_flag();
- if (MAX_NUM_USER_UNIT_FLAGS <= unit_flag_position + 6) {
+ if (MAX_NUM_USER_UNIT_FLAGS <= unit_flag_position + 7) {
/* Can't add the user unit type flags. */
log_error("Can't upgrade the ruleset. Not enough free unit type "
"user flags to add user flags for the unit type flags "
@@ -178,6 +178,11 @@
N_("Nuclear"),
N_("This unit's attack causes a nuclear"
" explosion!"));
+ unit_flag_position++;
+
+ set_user_unit_type_flag_name(unit_flag_position + UTYF_USER_FLAG_1,
+ N_("Infra"),
+ N_("Can build infrastructure."));
unit_flag_position++;
/* If you add more new flags, update also the (sanity) check about
@@ -231,6 +236,18 @@
return;
}
+ if (info->ver_units < 10) {
+ unit_type_iterate(ptype) {
+ if (utype_has_flag(ptype, UTYF_SETTLERS)) {
+ int flag;
+
+ flag = unit_type_flag_id_by_name("Infra", fc_strcasecmp);
+ fc_assert(unit_type_flag_id_is_valid(flag));
+ BV_SET(ptype->flags, flag);
+ }
+ } unit_type_iterate_end;
+ }
+
if (info->ver_game < 10) {
struct action_enabler *enabler;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
