Author: sveinung
Date: Wed Nov 25 06:48:53 2015
New Revision: 30756
URL: http://svn.gna.org/viewcvs/freeciv?rev=30756&view=rev
Log:
Rulesets: fix research notification Lua calls
Don't pass tile to notify.research_embassies(). It doesn't take tile.
See bug #24118
Modified:
trunk/data/alien/script.lua
trunk/data/default/default.lua
trunk/data/multiplayer/script.lua
Modified: trunk/data/alien/script.lua
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/script.lua?rev=30756&r1=30755&r2=30756&view=diff
==============================================================================
--- trunk/data/alien/script.lua (original)
+++ trunk/data/alien/script.lua Wed Nov 25 06:48:53 2015
@@ -34,7 +34,7 @@
_("%s found datapod containing research info about %s."),
owner.nation:plural_translation(),
tech:name_translation())
- notify.research_embassies(owner, unit.tile, E.HUT_TECH,
+ notify.research_embassies(owner, E.HUT_TECH,
_("The %s have acquired %s from Space Capsule they found."),
owner.nation:plural_translation(),
tech:name_translation())
Modified: trunk/data/default/default.lua
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/default/default.lua?rev=30756&r1=30755&r2=30756&view=diff
==============================================================================
--- trunk/data/default/default.lua (original)
+++ trunk/data/default/default.lua Wed Nov 25 06:48:53 2015
@@ -44,7 +44,7 @@
_("%s found %s in ancient scrolls of wisdom for you."),
owner.nation:plural_translation(),
tech:name_translation())
- notify.research_embassies(owner, unit.tile, E.TECH_EMBASSY,
+ notify.research_embassies(owner, E.TECH_EMBASSY,
_("The %s have acquired %s from ancient scrolls of wisdom."),
owner.nation:plural_translation(),
tech:name_translation())
Modified: trunk/data/multiplayer/script.lua
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/script.lua?rev=30756&r1=30755&r2=30756&view=diff
==============================================================================
--- trunk/data/multiplayer/script.lua (original)
+++ trunk/data/multiplayer/script.lua Wed Nov 25 06:48:53 2015
@@ -54,7 +54,7 @@
-- default.lua informs the embassies when the tech source is a hut.
-- They should therefore be informed about the source here too.
- notify.research_embassies(player, NIL, E.TECH_EMBASSY,
+ notify.research_embassies(player, E.TECH_EMBASSY,
_("The %s gain %s and %s from %s."),
player.nation:plural_translation(),
gained[0]:name_translation(),
@@ -128,7 +128,7 @@
-- default.lua informs the embassies when the tech source is a hut.
-- They should therefore be informed about the source here too.
- notify.research_embassies(player, NIL, E.TECH_EMBASSY,
+ notify.research_embassies(player, E.TECH_EMBASSY,
_("Great philosophers from all the world join the %s: they get %s
as an immediate advance."),
player.nation:plural_translation(),
gained:name_translation())
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
