<URL: http://bugs.freeciv.org/Ticket/Display.html?id=36225 >
This patch removes the unused trireme-loss tech flags.
I will commit immediately.
-jason
Index: data/civ2/techs.ruleset
===================================================================
--- data/civ2/techs.ruleset (revision 12648)
+++ data/civ2/techs.ruleset (working copy)
@@ -493,7 +493,7 @@
name = _("Navigation")
req1 = "Seafaring"
req2 = "Astronomy"
-flags = "Reduce_Trireme_Loss2"
+flags = ""
graphic = "a.navigation"
graphic_alt = "-"
@@ -624,7 +624,7 @@
name = _("Seafaring")
req1 = "Pottery"
req2 = "Map Making"
-flags = "Reduce_Trireme_Loss1"
+flags = ""
graphic = "a.seafaring"
graphic_alt = "-"
Index: data/default/techs.ruleset
===================================================================
--- data/default/techs.ruleset (revision 12648)
+++ data/default/techs.ruleset (working copy)
@@ -498,7 +498,7 @@
name = _("Navigation")
req1 = "Seafaring"
req2 = "Astronomy"
-flags = "Reduce_Trireme_Loss2"
+flags = ""
graphic = "a.navigation"
graphic_alt = "-"
@@ -629,7 +629,7 @@
name = _("Seafaring")
req1 = "Pottery"
req2 = "Map Making"
-flags = "Reduce_Trireme_Loss1"
+flags = ""
graphic = "a.seafaring"
graphic_alt = "-"
Index: common/tech.c
===================================================================
--- common/tech.c (revision 12648)
+++ common/tech.c (working copy)
@@ -42,7 +42,7 @@
static const char *flag_names[] = {
"Bonus_Tech", "Bridge", "Railroad", "Fortress",
"Population_Pollution_Inc",
- "Airbase", "Farmland", "Reduce_Trireme_Loss1", "Reduce_Trireme_Loss2",
+ "Airbase", "Farmland",
"Build_Airborne"
};
/* Note that these strings must correspond with the enums in tech_flag_id,
Index: common/tech.h
===================================================================
--- common/tech.h (revision 12648)
+++ common/tech.h (working copy)
@@ -59,8 +59,6 @@
TF_POPULATION_POLLUTION_INC, /* Increase the pollution factor created by popultaion by one */
TF_AIRBASE, /* "Airbase" unit types can build Airbases */
TF_FARMLAND, /* "Settler" unit types can build farmland */
- TF_REDUCE_TRIREME_LOSS1, /* Reduces chance of Trireme being lost at sea */
- TF_REDUCE_TRIREME_LOSS2, /* Reduces chance of Trireme being lost at sea */
TF_BUILD_AIRBORNE, /* Player can build air units */
TF_LAST
};
Index: client/helpdata.c
===================================================================
--- client/helpdata.c (revision 12648)
+++ client/helpdata.c (working copy)
@@ -1008,21 +1008,9 @@
_("* May become veteran through training or combat.\n"));
}
if (unit_type_flag(utype, F_TRIREME)) {
- Tech_type_id tech1 = find_tech_by_flag(0, TF_REDUCE_TRIREME_LOSS1);
- Tech_type_id tech2 = find_tech_by_flag(0, TF_REDUCE_TRIREME_LOSS2);
sprintf(buf + strlen(buf),
_("* Must end turn in a city or next to land,"
" or has a 50%% risk of being lost at sea.\n"));
- if (tech1 != A_LAST) {
- sprintf(buf + strlen(buf),
- _("* The discovery of %s reduces the risk to 25%%.\n"),
- get_tech_name(game.player_ptr, tech1));
- }
- if (tech2 != A_LAST) {
- sprintf(buf + strlen(buf),
- _("* %s reduces the risk to 12%%.\n"),
- get_tech_name(game.player_ptr, tech2));
- }
}
if (utype->fuel > 0) {
char allowed_units[10][64];
@@ -1135,12 +1123,6 @@
"an immediate advance.\n"),
get_tech_name(game.player_ptr, i));
}
- if (tech_flag(i, TF_REDUCE_TRIREME_LOSS1))
- sprintf(buf + strlen(buf), _("* Reduces the chance of losing boats "
- "on the high seas to 25%%.\n"));
- if (tech_flag(i, TF_REDUCE_TRIREME_LOSS2))
- sprintf(buf + strlen(buf), _("* Reduces the chance of losing boats "
- "on the high seas to 12%%.\n"));
if (tech_flag(i, TF_POPULATION_POLLUTION_INC))
sprintf(buf + strlen(buf), _("* Increases the pollution generated by "
"the population.\n"));
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
