Author: jtn
Date: Thu Jan 29 01:36:13 2015
New Revision: 27886
URL: http://svn.gna.org/viewcvs/freeciv?rev=27886&view=rev
Log:
Rework disaster messages.
See gna patch #5761.
Modified:
branches/S2_5/server/cityturn.c
branches/S2_5/server/settings.c
Modified: branches/S2_5/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=27886&r1=27885&r2=27886&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Thu Jan 29 01:36:13 2015
@@ -2950,19 +2950,19 @@
ftc_server,
/* TRANS: Disasters such as Earthquake */
_("%s was hit by %s."), city_name(pcity),
- disaster_rule_name(pdis));
+ disaster_name_translation(pdis));
if (disaster_has_effect(pdis, DE_POLLUTION)) {
if (place_pollution(pcity, S_POLLUTION)) {
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("Tile polluted"));
+ _("Pollution near %s."), city_link(pcity));
}
}
if (disaster_has_effect(pdis, DE_FALLOUT)) {
if (place_pollution(pcity, S_FALLOUT)) {
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("Fallout contaminated tile."));
+ _("Fallout near %s."), city_link(pcity));
}
}
@@ -2973,7 +2973,9 @@
pcity = NULL;
} else {
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("Some population lost."));
+ /* TRANS: "Nuclear Accident ... Montreal." */
+ _("%s causes population loss in %s."),
+ disaster_name_translation(pdis), city_link(pcity));
}
}
@@ -2993,8 +2995,11 @@
building_lost(pcity, imprs[num]);
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("%s destroyed."),
- improvement_name_translation(imprs[num]));
+ /* TRANS: second %s is the name of a city improvement */
+ _("%s destroys %s in %s."),
+ disaster_name_translation(pdis),
+ improvement_name_translation(imprs[num]),
+ city_link(pcity));
}
}
@@ -3003,16 +3008,22 @@
pcity->food_stock = 0;
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("Foodbox emptied."));
+ /* TRANS: %s is a city name */
+ _("All stored food destroyed in %s."), city_link(pcity));
}
}
if (pcity && disaster_has_effect(pdis, DE_EMPTY_PRODSTOCK)) {
if (pcity->shield_stock > 0) {
+ char prod[256];
+
pcity->shield_stock = 0;
+ universal_name_translation(&pcity->production, prod, sizeof(prod));
notify_player(pplayer, ptile, E_DISASTER, ftc_server,
- _("Production box emptied."));
+ /* TRANS: "Production of Colossus in Rhodes destroyed." */
+ _("Production of %s in %s destroyed."),
+ prod, city_link(pcity));
}
}
Modified: branches/S2_5/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=27886&r1=27885&r2=27886&view=diff
==============================================================================
--- branches/S2_5/server/settings.c (original)
+++ branches/S2_5/server/settings.c Thu Jan 29 01:36:13 2015
@@ -1702,7 +1702,10 @@
GEN_INT("disasters", game.info.disasters,
SSET_RULES_FLEXIBLE, SSET_SOCIOLOGY, SSET_VITAL, SSET_TO_CLIENT,
N_("Frequency of disasters"),
- N_("Sets frequency of disasters occurring to cities."),
+ N_("Affects how often random disasters happen to cities, "
+ "if any are defined by the ruleset. The relative frequency "
+ "of disaster types is set by the ruleset. Zero prevents "
+ "any random disasters from occurring."),
NULL, NULL,
GAME_MIN_DISASTERS, GAME_MAX_DISASTERS,
GAME_DEFAULT_DISASTERS)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
