From a000b16570495db009a31df355a65b79556e1768 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 7 May 2023 23:19:23 +0300 Subject: [PATCH 19/19] Extras: Add support for second alt removal activity gfx tag See osdn #47952 Signed-off-by: Marko Lindqvist --- client/packhand.c | 1 + client/tilespec.c | 12 ++++++--- common/extras.h | 1 + common/networking/packets.def | 1 + data/alien/terrain.ruleset | 23 ++++++++++++++++ data/civ1/terrain.ruleset | 19 ++++++++++++++ data/civ2/terrain.ruleset | 32 +++++++++++++++++++++++ data/civ2civ3/terrain.ruleset | 39 +++++++++++++++++++++++++++ data/classic/terrain.ruleset | 35 +++++++++++++++++++++++++ data/goldkeep/terrain.ruleset | 36 +++++++++++++++++++++++++ data/granularity/terrain.ruleset | 7 +++++ data/multiplayer/terrain.ruleset | 35 +++++++++++++++++++++++++ data/ruledit/comments-3.3.txt | 1 + data/sandbox/terrain.ruleset | 42 ++++++++++++++++++++++++++++++ data/stub/terrain.ruleset | 5 ++++ data/webperimental/terrain.ruleset | 35 +++++++++++++++++++++++++ server/ruleset.c | 4 +++ tools/ruledit/edit_extra.cpp | 21 +++++++++++++++ tools/ruledit/edit_extra.h | 2 ++ 19 files changed, 348 insertions(+), 3 deletions(-) diff --git a/client/packhand.c b/client/packhand.c index e3b36bbb51..4f8d844d0f 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -4182,6 +4182,7 @@ void handle_ruleset_extra(const struct packet_ruleset_extra *p) sz_strlcpy(pextra->act_gfx_alt2, p->act_gfx_alt2); sz_strlcpy(pextra->rmact_gfx, p->rmact_gfx); sz_strlcpy(pextra->rmact_gfx_alt, p->rmact_gfx_alt); + sz_strlcpy(pextra->rmact_gfx_alt2, p->rmact_gfx_alt2); sz_strlcpy(pextra->graphic_str, p->graphic_str); sz_strlcpy(pextra->graphic_alt, p->graphic_alt); diff --git a/client/tilespec.c b/client/tilespec.c index f84cde70c1..5ac6e26c2d 100644 --- a/client/tilespec.c +++ b/client/tilespec.c @@ -3971,9 +3971,15 @@ void tileset_setup_extra(struct tileset *t, t->sprites.extras[id].rmact = load_sprite(t, pextra->rmact_gfx_alt, TRUE, TRUE, FALSE); if (t->sprites.extras[id].rmact == NULL) { - tileset_error(LOG_FATAL, tileset_name_get(t), - _("Missing %s removal activity sprite for tags \"%s\" and alternative \"%s\"."), - extra_rule_name(pextra), pextra->rmact_gfx, pextra->rmact_gfx_alt); + t->sprites.extras[id].rmact = load_sprite(t, pextra->rmact_gfx_alt2, + TRUE, TRUE, FALSE); + if (t->sprites.extras[id].rmact == NULL) { + tileset_error(LOG_FATAL, tileset_name_get(t), + _("Missing %s removal activity sprite for tags \"%s\" " + "and alternatives \"%s\" and \"%s\"."), + extra_rule_name(pextra), pextra->rmact_gfx, + pextra->rmact_gfx_alt, pextra->rmact_gfx_alt2); + } } } } diff --git a/common/extras.h b/common/extras.h index b5a9c0f5a8..0b70457009 100644 --- a/common/extras.h +++ b/common/extras.h @@ -98,6 +98,7 @@ struct extra_type char act_gfx_alt2[MAX_LEN_NAME]; char rmact_gfx[MAX_LEN_NAME]; char rmact_gfx_alt[MAX_LEN_NAME]; + char rmact_gfx_alt2[MAX_LEN_NAME]; struct requirement_vector reqs; struct requirement_vector rmreqs; diff --git a/common/networking/packets.def b/common/networking/packets.def index af70925eb0..d0229eed44 100644 --- a/common/networking/packets.def +++ b/common/networking/packets.def @@ -1759,6 +1759,7 @@ PACKET_RULESET_EXTRA = 232; sc, lsend STRING act_gfx_alt2[MAX_LEN_NAME]; STRING rmact_gfx[MAX_LEN_NAME]; STRING rmact_gfx_alt[MAX_LEN_NAME]; + STRING rmact_gfx_alt2[MAX_LEN_NAME]; STRING graphic_str[MAX_LEN_NAME]; STRING graphic_alt[MAX_LEN_NAME]; UINT8 reqs_count; diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index 5cf3846b1a..4f63c8ec01 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -709,6 +709,7 @@ ui_name_base_airbase = _("?gui_type:Build Airforce base") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -806,6 +807,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine" @@ -835,6 +837,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Irrigation", "Farmland" @@ -855,6 +858,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "TerrainFlag", "NoPollution", "Tile", FALSE @@ -885,6 +889,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -914,6 +919,7 @@ act_gfx_alt = "unit.farmland" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Protein Modifications", "Player" @@ -942,6 +948,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "TerrainFlag", "NoPollution", "Tile", FALSE @@ -968,6 +975,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Strong Force", "Player", TRUE, FALSE @@ -995,6 +1003,7 @@ act_gfx_alt = "unit.outpost" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Force Channeling", "Player", TRUE, FALSE @@ -1021,6 +1030,7 @@ act_gfx_alt = "unit.airbase" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Commercial Antigravity", "Player", TRUE, FALSE @@ -1048,6 +1058,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1076,6 +1087,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Brute Force", "Player" @@ -1104,6 +1116,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Maglev", "Player" @@ -1135,6 +1148,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Strong Resistance", "Player" @@ -1165,6 +1179,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Burrowing", "Player" @@ -1194,6 +1209,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Native", "Amphibious" @@ -1218,6 +1234,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Native", "Amphibious" @@ -1242,6 +1259,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ There is more than average amount of various resources,\ @@ -1260,6 +1278,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ Mine run by superior alien technology ready to operate.\ @@ -1278,6 +1297,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ Entire forest seems to be of the single fast-growing organism with\ @@ -1296,6 +1316,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ Where the heat from inside the planet escapes, mineral rich\ @@ -1314,6 +1335,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ Weird alien fish might look like something escaped from nightmares, \ @@ -1332,6 +1354,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* xgettext:no-c-format */ helptext = _("\ Rocks in the area have unusually bright glow.\ diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index 7695b5e289..f43379cdec 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -876,6 +876,7 @@ ui_name_base_airbase = _("?gui_type:Build None") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -972,6 +973,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine" @@ -1005,6 +1007,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Irrigation" @@ -1029,6 +1032,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "Terrain", "Ocean", "Tile", FALSE @@ -1088,6 +1092,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1119,6 +1124,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1152,6 +1158,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1184,6 +1191,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "Tech", "Railroad", "Player", TRUE @@ -1218,6 +1226,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE native_to = "Land" flags = "NaturalDefense" @@ -1244,6 +1253,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1257,6 +1267,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1270,6 +1281,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1283,6 +1295,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1296,6 +1309,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_horses] name = _("Horses") @@ -1309,6 +1323,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1322,6 +1337,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -1335,6 +1351,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1348,6 +1365,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_seals] name = _("Seals") @@ -1361,6 +1379,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index afb8c28c70..965c22067e 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -947,6 +947,7 @@ ui_name_base_airbase = _("?gui_type:Build Airforce base") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1043,6 +1044,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine" @@ -1077,6 +1079,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Irrigation", "Farmland" @@ -1101,6 +1104,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "Terrain", "Ocean", "Tile", FALSE @@ -1160,6 +1164,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1192,6 +1197,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Refrigeration", "Player" @@ -1223,6 +1229,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1258,6 +1265,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1289,6 +1297,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1321,6 +1330,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Railroad", "Player" @@ -1358,6 +1368,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Land" @@ -1385,6 +1396,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1398,6 +1410,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1411,6 +1424,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1424,6 +1438,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1437,6 +1452,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1450,6 +1466,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1463,6 +1480,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1476,6 +1494,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1489,6 +1508,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -1502,6 +1522,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1515,6 +1536,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_peat] name = _("Peat") @@ -1528,6 +1550,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -1541,6 +1564,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1554,6 +1578,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -1567,6 +1592,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -1580,6 +1606,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -1593,6 +1620,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -1606,6 +1634,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -1619,6 +1648,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_icy_oil] name = _("Oil") @@ -1633,6 +1663,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_desert_oil] name = _("Oil") @@ -1646,6 +1677,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/civ2civ3/terrain.ruleset b/data/civ2civ3/terrain.ruleset index 78b7d2f742..03de78d101 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -1152,6 +1152,7 @@ ui_name_base_airbase = _("?gui_type:Build Airstrip/Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1248,6 +1249,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1288,6 +1290,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Oceanic", "Tile", FALSE, TRUE @@ -1318,6 +1321,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Refining", "Player", TRUE, FALSE @@ -1345,6 +1349,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "Tech", "Miniaturization", "Player", TRUE @@ -1373,6 +1378,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1434,6 +1440,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1466,6 +1473,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; Note, there are extra restrictions on where farmland can be built ; through "Build Irrigation" action enablers reqs = @@ -1501,6 +1509,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1532,6 +1541,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1565,6 +1575,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Extra", "Fort", "Tile", TRUE, FALSE @@ -1610,6 +1621,7 @@ act_gfx_alt = "unit.airbase" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1651,6 +1663,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Extra", "Airstrip", "Tile", TRUE, FALSE @@ -1693,6 +1706,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1721,6 +1735,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1746,6 +1761,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "UnitFlag", "Settlers", "Local", TRUE, FALSE @@ -1781,6 +1797,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Railroad", "Player", TRUE, FALSE @@ -1820,6 +1837,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Superconductors", "Player", TRUE, FALSE @@ -1859,6 +1877,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE native_to = "Land", "Small Land", "Merchant", "Trireme" defense_bonus = 25 @@ -1892,6 +1911,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1905,6 +1925,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1918,6 +1939,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1931,6 +1953,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1944,6 +1967,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1957,6 +1981,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1970,6 +1995,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1983,6 +2009,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1996,6 +2023,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -2009,6 +2037,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -2022,6 +2051,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" flags = "AllowsFarmlandOnDesert" [extra_peat] @@ -2036,6 +2066,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -2049,6 +2080,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_resources] name = _("Resources") @@ -2062,6 +2094,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -2075,6 +2108,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -2088,6 +2122,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -2101,6 +2136,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -2114,6 +2150,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -2127,6 +2164,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -2140,6 +2178,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/classic/terrain.ruleset b/data/classic/terrain.ruleset index ce1ea39d3a..08700f4fc2 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -1131,6 +1131,7 @@ ui_name_base_airbase = _("?gui_type:Build Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1227,6 +1228,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1261,6 +1263,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "Oil", "Tile", FALSE, TRUE @@ -1289,6 +1292,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "quiet" "TerrainFlag", "Oil", "Tile", TRUE @@ -1316,6 +1320,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1375,6 +1380,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1407,6 +1413,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Refrigeration", "Player" @@ -1438,6 +1445,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1468,6 +1476,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1504,6 +1513,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1534,6 +1544,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1561,6 +1572,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1586,6 +1598,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1618,6 +1631,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Railroad", "Player" @@ -1655,6 +1669,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Land" @@ -1681,6 +1696,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1694,6 +1710,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1707,6 +1724,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1720,6 +1738,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1733,6 +1752,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1746,6 +1766,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1759,6 +1780,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1772,6 +1794,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1785,6 +1808,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -1798,6 +1822,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1811,6 +1836,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_peat] name = _("Peat") @@ -1824,6 +1850,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -1837,6 +1864,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1850,6 +1878,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -1863,6 +1892,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -1876,6 +1906,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -1889,6 +1920,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -1902,6 +1934,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -1915,6 +1948,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -1928,6 +1962,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/goldkeep/terrain.ruleset b/data/goldkeep/terrain.ruleset index 53e9ce7755..9a811a8796 100644 --- a/data/goldkeep/terrain.ruleset +++ b/data/goldkeep/terrain.ruleset @@ -1107,6 +1107,7 @@ ui_name_base_airbase = _("?gui_type:Build Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1203,6 +1204,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1237,6 +1239,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "Oil", "Tile", FALSE, TRUE @@ -1265,6 +1268,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "quiet" "TerrainFlag", "Oil", "Tile", TRUE @@ -1292,6 +1296,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1351,6 +1356,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1383,6 +1389,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Refrigeration", "Player" @@ -1414,6 +1421,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1443,6 +1451,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1479,6 +1488,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1509,6 +1519,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1536,6 +1547,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1561,6 +1573,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1595,6 +1608,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Railroad", "Player" @@ -1633,6 +1647,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Superconductors", "Player" @@ -1670,6 +1685,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Land", "Big Land", "Trireme" @@ -1701,6 +1717,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1714,6 +1731,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1727,6 +1745,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1740,6 +1759,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1753,6 +1773,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1766,6 +1787,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1779,6 +1801,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1792,6 +1815,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1805,6 +1829,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -1818,6 +1843,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1831,6 +1857,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_peat] name = _("Peat") @@ -1844,6 +1871,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -1857,6 +1885,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1870,6 +1899,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -1883,6 +1913,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -1896,6 +1927,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -1909,6 +1941,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -1922,6 +1955,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -1935,6 +1969,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -1948,6 +1983,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/terrain.ruleset b/data/granularity/terrain.ruleset index 63aa983ac1..36e87803c8 100644 --- a/data/granularity/terrain.ruleset +++ b/data/granularity/terrain.ruleset @@ -480,6 +480,7 @@ ui_name_base_airbase = _("?gui_type:Build Type B Base") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -577,6 +578,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = TRUE reqs = { "type", "name", "range" @@ -598,6 +600,7 @@ helptext = _("Irrigation increases tile food production.") ;act_gfx_alt2 = "-" ;rmact_gfx = "None" ;rmact_gfx_alt = "-" +;rmact_gfx_alt2 = "-" ;buildable = FALSE ;reqs = ; { "type", "name", "range" @@ -620,6 +623,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = TRUE hidden_by = "Road" ;reqs = @@ -644,6 +648,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = TRUE reqs = { "type", "name", "range" @@ -670,6 +675,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE native_to = "Land" helptext = _("\ @@ -689,6 +695,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index ebacb78ee2..48e9503f19 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -1105,6 +1105,7 @@ ui_name_base_airbase = _("?gui_type:Build Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1201,6 +1202,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1235,6 +1237,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "Oil", "Tile", FALSE, TRUE @@ -1263,6 +1266,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "quiet" "TerrainFlag", "Oil", "Tile", TRUE @@ -1290,6 +1294,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1350,6 +1355,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1382,6 +1388,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Refrigeration", "Player" @@ -1411,6 +1418,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1440,6 +1448,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1476,6 +1485,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1506,6 +1516,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1533,6 +1544,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1558,6 +1570,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1590,6 +1603,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Railroad", "Player" @@ -1627,6 +1641,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Land" @@ -1653,6 +1668,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1666,6 +1682,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1679,6 +1696,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1692,6 +1710,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1705,6 +1724,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1718,6 +1738,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1731,6 +1752,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1744,6 +1766,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1757,6 +1780,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -1770,6 +1794,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1783,6 +1808,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_peat] name = _("Peat") @@ -1796,6 +1822,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -1809,6 +1836,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1822,6 +1850,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -1835,6 +1864,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -1848,6 +1878,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -1861,6 +1892,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -1874,6 +1906,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -1887,6 +1920,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -1900,6 +1934,7 @@ activity_gfx = "None" act_gfx_alt = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/ruledit/comments-3.3.txt b/data/ruledit/comments-3.3.txt index 6e7966e182..bf9d4195f4 100644 --- a/data/ruledit/comments-3.3.txt +++ b/data/ruledit/comments-3.3.txt @@ -766,6 +766,7 @@ extras = "\ ; This can be \"None\" to indicate that graphic sprite\n\ ; is not needed.\n\ ; rmact_gfx_alt = tag for alternative graphic for unit removing extra\n\ +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra\n\ ; reqs = requirements to build the extra (see effects.ruleset\n\ ; and README.effects for help on requirements)\n\ ; rmreqs = requirements to remove the extra\n\ diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index 1f9f2d8271..d8870f5dcc 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -1153,6 +1153,7 @@ ui_name_base_airbase = _("?gui_type:Build Airstrip/Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1249,6 +1250,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1289,6 +1291,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Oceanic", "Tile", FALSE, TRUE @@ -1319,6 +1322,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Refining", "Player", TRUE, FALSE @@ -1346,6 +1350,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present" "Tech", "Miniaturization", "Player", TRUE @@ -1374,6 +1379,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1435,6 +1441,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1467,6 +1474,7 @@ activity_gfx = "None" act_gfx_alt = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" appearance_reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1496,6 +1504,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; Note, there are extra restrictions on where farmland can be built ; through "Build Irrigation" action enablers reqs = @@ -1531,6 +1540,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1562,6 +1572,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1595,6 +1606,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Extra", "Fort", "Tile", TRUE, FALSE @@ -1642,6 +1654,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Extra", "Fortress", "Tile", TRUE, FALSE @@ -1682,6 +1695,7 @@ act_gfx_alt = "unit.airbase" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1723,6 +1737,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Extra", "Airstrip", "Tile", TRUE, FALSE @@ -1766,6 +1781,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1798,6 +1814,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1821,6 +1838,7 @@ rmreqs = } rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" graphic = "extra.transport_hub" graphic_alt = "extra.ruins" activity_gfx = "None" @@ -1849,6 +1867,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "UnitFlag", "Settlers", "Local", TRUE, FALSE @@ -1886,6 +1905,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Railroad", "Player", TRUE, FALSE @@ -1925,6 +1945,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Superconductors", "Player", TRUE, FALSE @@ -1964,6 +1985,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE native_to = "Land", "Small Land", "Merchant", "Trireme" defense_bonus = 25 @@ -1999,6 +2021,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -2012,6 +2035,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -2025,6 +2049,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -2038,6 +2063,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -2051,6 +2077,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -2064,6 +2091,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -2077,6 +2105,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -2090,6 +2119,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -2103,6 +2133,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -2116,6 +2147,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -2129,6 +2161,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" flags = "AllowsFarmlandOnDesert" [extra_peat] @@ -2143,6 +2176,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -2156,6 +2190,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -2169,6 +2204,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -2182,6 +2218,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -2195,6 +2232,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -2208,6 +2246,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -2221,6 +2260,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -2234,6 +2274,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -2247,6 +2288,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/stub/terrain.ruleset b/data/stub/terrain.ruleset index 6dae65d888..0a4426c73e 100644 --- a/data/stub/terrain.ruleset +++ b/data/stub/terrain.ruleset @@ -373,6 +373,7 @@ ui_name_base_airbase = _("?gui_type:Build Type B Base") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -469,6 +470,7 @@ ui_name_base_airbase = _("?gui_type:Build Type B Base") ;act_gfx_alt2 = "-" ;rmact_gfx = "None" ;rmact_gfx_alt = "-" +;rmact_gfx_alt2 = "-" ;build_time = 0 ;removal_time = 0 ;helptext = _("") @@ -485,6 +487,7 @@ ui_name_base_airbase = _("?gui_type:Build Type B Base") ;act_gfx_alt2 = "-" ;rmact_gfx = "None" ;rmact_gfx_alt = "-" +;rmact_gfx_alt2 = "-" ;buildable = FALSE ;reqs = ; { "type", "name", "range" @@ -506,6 +509,7 @@ ui_name_base_airbase = _("?gui_type:Build Type B Base") ;act_gfx_alt2 = "-" ;rmact_gfx = "None" ;rmact_gfx_alt = "-" +;rmact_gfx_alt2 = "-" ;buildable = FALSE ;reqs = ; { "type", "name", "range" @@ -527,6 +531,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/terrain.ruleset b/data/webperimental/terrain.ruleset index fe069f17ea..e7d851ffba 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -1131,6 +1131,7 @@ ui_name_base_airbase = _("?gui_type:Build Airbase") ; This can be "None" to indicate that graphic sprite ; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra +; rmact_gfx_alt2 = tag for second alternative graphic for unit removing extra ; reqs = requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ; rmreqs = requirements to remove the extra @@ -1227,6 +1228,7 @@ act_gfx_alt = "unit.cultivate" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" build_time = 0 removal_time = 0 conflicts = "Mine", "Oil Well" @@ -1261,6 +1263,7 @@ act_gfx_alt = "unit.plant" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "Oil", "Tile", FALSE, TRUE @@ -1289,6 +1292,7 @@ act_gfx_alt = "unit.mine" act_gfx_alt2 = "unit.plant" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "quiet" "TerrainFlag", "Oil", "Tile", TRUE @@ -1316,6 +1320,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.pollution" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1375,6 +1380,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "TerrainClass", "Land", "Tile" @@ -1407,6 +1413,7 @@ act_gfx_alt = "unit.irrigation" act_gfx_alt2 = "unit.cultivate" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Refrigeration", "Player" @@ -1438,6 +1445,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "unit.fallout" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainFlag", "NoPollution", "Tile", FALSE, TRUE @@ -1467,6 +1475,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Construction", "Player", TRUE, FALSE @@ -1503,6 +1512,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1533,6 +1543,7 @@ act_gfx_alt = "unit.fortress" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "Tech", "Radio", "Player", TRUE, FALSE @@ -1560,6 +1571,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range", "present", "quiet" "TerrainClass", "Land", "Tile", TRUE, FALSE @@ -1585,6 +1597,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "UnitFlag", "Settlers", "Local" @@ -1617,6 +1630,7 @@ act_gfx_alt = "unit.road" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" reqs = { "type", "name", "range" "Tech", "Railroad", "Player" @@ -1654,6 +1668,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" buildable = FALSE defense_bonus = 50 native_to = "Land" @@ -1680,6 +1695,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_iron] name = _("Iron") @@ -1693,6 +1709,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_game] name = _("?animals:Game") @@ -1706,6 +1723,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_furs] name = _("Furs") @@ -1719,6 +1737,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_coal] name = _("Coal") @@ -1732,6 +1751,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fish] name = _("Fish") @@ -1745,6 +1765,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_fruit] name = _("Fruit") @@ -1758,6 +1779,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_gems] name = _("Gems") @@ -1771,6 +1793,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_buffalo] name = _("Buffalo") @@ -1784,6 +1807,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wheat] name = _("Wheat") @@ -1797,6 +1821,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oasis] name = _("Oasis") @@ -1810,6 +1835,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_peat] name = _("Peat") @@ -1823,6 +1849,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_pheasant] name = _("Pheasant") @@ -1836,6 +1863,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_bonus] name = _("Resources") @@ -1849,6 +1877,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_ivory] name = _("Ivory") @@ -1862,6 +1891,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_silk] name = _("Silk") @@ -1875,6 +1905,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_spice] name = _("Spice") @@ -1888,6 +1919,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_whales] name = _("Whales") @@ -1901,6 +1933,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_wine] name = _("Wine") @@ -1914,6 +1947,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" [extra_oil] name = _("Oil") @@ -1927,6 +1961,7 @@ act_gfx_alt = "-" act_gfx_alt2 = "-" rmact_gfx = "None" rmact_gfx_alt = "-" +rmact_gfx_alt2 = "-" ; /* <-- avoid gettext warnings ; diff --git a/server/ruleset.c b/server/ruleset.c index 7f8ae7def8..06d1b12cd5 100644 --- a/server/ruleset.c +++ b/server/ruleset.c @@ -3622,6 +3622,9 @@ static bool load_ruleset_terrain(struct section_file *file, sz_strlcpy(pextra->rmact_gfx_alt, secfile_lookup_str_default(file, "-", "%s.rmact_gfx_alt", section)); + sz_strlcpy(pextra->rmact_gfx_alt2, + secfile_lookup_str_default(file, "-", + "%s.rmact_gfx_alt2", section)); sz_strlcpy(pextra->graphic_str, secfile_lookup_str_default(file, "-", "%s.graphic", section)); sz_strlcpy(pextra->graphic_alt, @@ -8427,6 +8430,7 @@ static void send_ruleset_extras(struct conn_list *dest) sz_strlcpy(packet.act_gfx_alt2, e->act_gfx_alt2); sz_strlcpy(packet.rmact_gfx, e->rmact_gfx); sz_strlcpy(packet.rmact_gfx_alt, e->rmact_gfx_alt); + sz_strlcpy(packet.rmact_gfx_alt2, e->rmact_gfx_alt2); sz_strlcpy(packet.graphic_str, e->graphic_str); sz_strlcpy(packet.graphic_alt, e->graphic_alt); diff --git a/tools/ruledit/edit_extra.cpp b/tools/ruledit/edit_extra.cpp index 30740a04e7..f22931f6e7 100644 --- a/tools/ruledit/edit_extra.cpp +++ b/tools/ruledit/edit_extra.cpp @@ -108,6 +108,15 @@ edit_extra::edit_extra(ruledit_gui *ui_in, struct extra_type *extra_in) extra_layout->addWidget(label, row, 0); extra_layout->addWidget(rmact_gfx_alt, row++, 1); + label = new QLabel(QString::fromUtf8(R__("Second alt removal activity gfx tag"))); + label->setParent(this); + + rmact_gfx_alt2 = new QLineEdit(this); + connect(rmact_gfx_alt2, SIGNAL(returnPressed()), this, SLOT(rmact_gfx_alt2_given())); + + extra_layout->addWidget(label, row, 0); + extra_layout->addWidget(rmact_gfx_alt2, row++, 1); + refresh(); main_layout->addLayout(extra_layout); @@ -128,6 +137,7 @@ void edit_extra::closeEvent(QCloseEvent *cevent) act_gfx_alt2_given(); rmact_gfx_given(); rmact_gfx_alt_given(); + rmact_gfx_alt2_given(); extra->ruledit_dlg = nullptr; } @@ -144,6 +154,7 @@ void edit_extra::refresh() act_gfx_alt2->setText(extra->act_gfx_alt2); rmact_gfx->setText(extra->rmact_gfx); rmact_gfx_alt->setText(extra->rmact_gfx_alt); + rmact_gfx_alt2->setText(extra->rmact_gfx_alt2); } /**********************************************************************//** @@ -215,3 +226,13 @@ void edit_extra::rmact_gfx_alt_given() sz_strlcpy(extra->rmact_gfx_alt, tag_bytes); } + +/**********************************************************************//** + User entered new second alternative removal activity graphics tag. +**************************************************************************/ +void edit_extra::rmact_gfx_alt2_given() +{ + QByteArray tag_bytes = rmact_gfx_alt2->text().toUtf8(); + + sz_strlcpy(extra->rmact_gfx_alt2, tag_bytes); +} diff --git a/tools/ruledit/edit_extra.h b/tools/ruledit/edit_extra.h index 2e5e42b4bb..6baa2d315f 100644 --- a/tools/ruledit/edit_extra.h +++ b/tools/ruledit/edit_extra.h @@ -44,6 +44,7 @@ class edit_extra : public QDialog QLineEdit *act_gfx_alt2; QLineEdit *rmact_gfx; QLineEdit *rmact_gfx_alt; + QLineEdit *rmact_gfx_alt2; protected: void closeEvent(QCloseEvent *cevent); @@ -56,6 +57,7 @@ class edit_extra : public QDialog void act_gfx_alt2_given(); void rmact_gfx_given(); void rmact_gfx_alt_given(); + void rmact_gfx_alt2_given(); }; #endif // FC__EDIT_EXTRA_H -- 2.39.2