Author: cazfi Date: Mon Nov 23 02:28:30 2015 New Revision: 30744 URL: http://svn.gna.org/viewcvs/freeciv?rev=30744&view=rev Log: Update lua scripts in supplied rulesets to match changes in research notification API.
See patch #6604 Modified: branches/S2_6/data/alien/script.lua branches/S2_6/data/default/default.lua branches/S2_6/data/multiplayer/script.lua Modified: branches/S2_6/data/alien/script.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/script.lua?rev=30744&r1=30743&r2=30744&view=diff ============================================================================== --- branches/S2_6/data/alien/script.lua (original) +++ branches/S2_6/data/alien/script.lua Mon Nov 23 02:28:30 2015 @@ -30,7 +30,11 @@ notify.event(owner, unit.tile, E.HUT_TECH, _("There was a datapod containing research info about %s."), tech:name_translation()) - notify.embassies(owner, unit.tile, E.HUT_TECH, + notify.research(owner, false, E.TECH_GAIN, + _("%s found datapod containing research info about %s."), + owner.nation:plural_translation(), + tech:name_translation()) + notify.research_embassies(owner, unit.tile, E.HUT_TECH, _("The %s have acquired %s from Space Capsule they found."), owner.nation:plural_translation(), tech:name_translation()) Modified: branches/S2_6/data/default/default.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/default/default.lua?rev=30744&r1=30743&r2=30744&view=diff ============================================================================== --- branches/S2_6/data/default/default.lua (original) +++ branches/S2_6/data/default/default.lua Mon Nov 23 02:28:30 2015 @@ -39,7 +39,12 @@ notify.event(owner, unit.tile, E.HUT_TECH, _("You found %s in ancient scrolls of wisdom."), tech:name_translation()) - notify.embassies(owner, unit.tile, E.HUT_TECH, + notify.research(owner, false, E.TECH_GAIN, + -- TRANS: One player got tech for the whole team. + _("%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, _("The %s have acquired %s from ancient scrolls of wisdom."), owner.nation:plural_translation(), tech:name_translation()) Modified: branches/S2_6/data/multiplayer/script.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/script.lua?rev=30744&r1=30743&r2=30744&view=diff ============================================================================== --- branches/S2_6/data/multiplayer/script.lua (original) +++ branches/S2_6/data/multiplayer/script.lua Mon Nov 23 02:28:30 2015 @@ -45,14 +45,21 @@ gained[0]:name_translation(), gained[1]:name_translation()) + notify.research(player, false, E.TECH_GAIN, + _("%s boosts %s research; you gain the immediate advances %s and %s."), + darw_btype:name_translation(), + player.nation:plural_translation(), + gained[0]:name_translation(), + gained[1]:name_translation()) + -- default.lua informs the embassies when the tech source is a hut. -- They should therefore be informed about the source here too. - notify.embassies(player, NIL, E.TECH_EMBASSY, - _("The %s gain %s and %s from %s."), - player.nation:plural_translation(), - gained[0]:name_translation(), - gained[1]:name_translation(), - darw_btype:name_translation()) + notify.research_embassies(player, NIL, E.TECH_EMBASSY, + _("The %s gain %s and %s from %s."), + player.nation:plural_translation(), + gained[0]:name_translation(), + gained[1]:name_translation(), + darw_btype:name_translation()) end end end @@ -113,12 +120,18 @@ _("Great philosophers from all the world join your civilization: you get the immediate advance %s."), gained:name_translation()) + -- Notify research partners + notify.research(player, false, E.TECH_GAIN, + _("Great philosophers from all the world join the %s: you get the immediate advance %s."), + player.nation:plural_translation(), + gained:name_translation()) + -- default.lua informs the embassies when the tech source is a hut. -- They should therefore be informed about the source here too. - notify.embassies(player, NIL, 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()) + notify.research_embassies(player, NIL, 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()) end end _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits