0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Assign translatable names to WC/Soulless variations (bug #22902)

Browse source 
Backported from master, commit bf75c9d062.

As I said on IRC, whether unit type variations use variation_id or
variation_name to define the variation id is wholly immaterial for
syncing purposes because serialized singular units:

 1) Do not include [variation] definitions nowadays;
 2) Have a single variation=<id> attribute, where the source for the id
    of variations is determined internally during initialization.

One situation that could result in collateral OOS errors is
[store_unit_type]/wesnoth.unit_types retrieving different information
for 1.12.0 and 1.12.1 game clients running the same WML/Lua script. I
suspect this should be relatively rare and it's possible to guard
against synchronization issues by checking for both variation_id and
variation_name for WC/Soulless variations and picking one accordingly.
This commit is contained in:
Ignacio R. Morelle 2014-12-22 21:26:26 -03:00
parent 6fcc2325f0
commit 5e4554f333
4 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -24,6 +24,9 @@ Version 1.12.0+dev:
* Fixed the Set Password option during game creation not having an effect
due to a misplaced WML attribute in the client's command for the server
(bug #23015).
* Units:
* Assigned capitalized translatable names to Walking Corpse and Soulless
variations (bug #22902).
* WML engine:
* Fixed nested macros emitting incorrect bindings to the default 'wesnoth'
textdomain at the end of a substitution instead of the parent textdomain,

30
data/core/units/undead/Corpse_Soulless.cfg
View file

@ -133,7 +133,8 @@
deep_water=90
[/defense]
[variation]
variation_name=drake
variation_id=drake
variation_name= _ "wc_variation^Drake"
{UNIT_BODY_SOULLESS_STATS drakefoot 4 36}
{UNIT_BODY_SOULLESS_GRAPHICS_NO_DEATH_ANIM soulless-drake}
[movement_costs]
@ -146,7 +147,8 @@
[/defense]
[/variation]
[variation]
variation_name=dwarf
variation_id=dwarf
variation_name= _ "wc_variation^Dwarf"
{UNIT_BODY_SOULLESS_STATS dwarvishfoot 3 33}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-dwarf 4}
[movement_costs]
@ -157,7 +159,8 @@
[/defense]
[/variation]
[variation]
variation_name=goblin
variation_id=goblin
variation_name= _ "wc_variation^Goblin"
{UNIT_BODY_SOULLESS_STATS smallfoot 4 23}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-goblin 4}
[movement_costs]
@ -168,7 +171,8 @@
[/defense]
[/variation]
[variation]
variation_name=mounted
variation_id=mounted
variation_name= _ "wc_variation^Mounted"
{UNIT_BODY_SOULLESS_STATS mounted 5 33}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-mounted 4}
[movement_costs]
@ -179,7 +183,8 @@
[/defense]
[/variation]
[variation]
variation_name=gryphon
variation_id=gryphon
variation_name= _ "wc_variation^Gryphon"
{UNIT_BODY_SOULLESS_STATS fly 5 33}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-drake 3}
[defense]
@ -187,7 +192,8 @@
[/defense]
[/variation]
[variation]
variation_name=saurian
variation_id=saurian
variation_name= _ "wc_variation^Saurian"
{UNIT_BODY_SOULLESS_STATS lizard 4 25}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-saurian 4}
[movement_costs]
@ -198,7 +204,8 @@
[/defense]
[/variation]
[variation]
variation_name=swimmer
variation_id=swimmer
variation_name= _ "wc_variation^Swimmer"
{UNIT_BODY_SOULLESS_STATS swimmer 4 28}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-swimmer 4}
[movement_costs]
@ -207,7 +214,8 @@
[/movement_costs]
[/variation]
[variation]
variation_name=troll
variation_id=troll
variation_name= _ "wc_variation^Troll"
{UNIT_BODY_SOULLESS_STATS largefoot 4 33}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-troll 4}
[movement_costs]
@ -218,7 +226,8 @@
[/defense]
[/variation]
[variation]
variation_name=wose
variation_id=wose
variation_name= _ "wc_variation^Wose"
{UNIT_BODY_SOULLESS_STATS treefolk 3 40}
{UNIT_BODY_SOULLESS_GRAPHICS soulless-wose 4}
[movement_costs]
@ -229,7 +238,8 @@
[/defense]
[/variation]
[variation]
variation_name=bat
variation_id=bat
variation_name= _ "wc_variation^Bat"
inherit=no
{UNIT_BODY_SOULLESS_STATS fly 5 24}
[movement_costs]

30
data/core/units/undead/Corpse_Walking.cfg
View file

@ -132,7 +132,8 @@
deep_water=90
[/defense]
[variation]
variation_name=drake
variation_id=drake
variation_name= _ "wc_variation^Drake"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-drake 4}
{UNIT_BODY_WALKING_CORPSE_STATS drakefoot 4 23}
[movement_costs]
@ -145,7 +146,8 @@
[/defense]
[/variation]
[variation]
variation_name=dwarf
variation_id=dwarf
variation_name= _ "wc_variation^Dwarf"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-dwarf 4}
{UNIT_BODY_WALKING_CORPSE_STATS dwarvishfoot 3 21}
[movement_costs]
@ -156,7 +158,8 @@
[/defense]
[/variation]
[variation]
variation_name=goblin
variation_id=goblin
variation_name= _ "wc_variation^Goblin"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-goblin 4}
{UNIT_BODY_WALKING_CORPSE_STATS smallfoot 4 13}
[movement_costs]
@ -167,7 +170,8 @@
[/defense]
[/variation]
[variation]
variation_name=gryphon
variation_id=gryphon
variation_name= _ "wc_variation^Gryphon"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-drake 4}
{UNIT_BODY_WALKING_CORPSE_STATS fly 5 21}
[defense]
@ -175,7 +179,8 @@
[/defense]
[/variation]
[variation]
variation_name=mounted
variation_id=mounted
variation_name= _ "wc_variation^Mounted"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-mounted 4}
{UNIT_BODY_WALKING_CORPSE_STATS mounted 5 21}
[movement_costs]
@ -186,7 +191,8 @@
[/defense]
[/variation]
[variation]
variation_name=saurian
variation_id=saurian
variation_name= _ "wc_variation^Saurian"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-saurian 4}
{UNIT_BODY_WALKING_CORPSE_STATS lizard 4 16}
[movement_costs]
@ -197,7 +203,8 @@
[/defense]
[/variation]
[variation]
variation_name=swimmer
variation_id=swimmer
variation_name= _ "wc_variation^Swimmer"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-swimmer 4}
{UNIT_BODY_WALKING_CORPSE_STATS swimmer 4 18}
[movement_costs]
@ -206,7 +213,8 @@
[/movement_costs]
[/variation]
[variation]
variation_name=troll
variation_id=troll
variation_name= _ "wc_variation^Troll"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-troll 4}
{UNIT_BODY_WALKING_CORPSE_STATS largefoot 4 21}
[movement_costs]
@ -217,7 +225,8 @@
[/defense]
[/variation]
[variation]
variation_name=wose
variation_id=wose
variation_name= _ "wc_variation^Wose"
{UNIT_BODY_WALKING_CORPSE_GRAPHICS zombie-wose 4}
{UNIT_BODY_WALKING_CORPSE_STATS treefolk 3 26}
[movement_costs]
@ -228,7 +237,8 @@
[/defense]
[/variation]
[variation]
variation_name=bat
variation_id=bat
variation_name= _ "wc_variation^Bat"
inherit=no
{UNIT_BODY_WALKING_CORPSE_STATS fly 5 15}
[movement_costs]

4
players_changelog
View file

@ -21,6 +21,10 @@ Version 1.12.0+dev:
due to a misplaced WML attribute in the client's command for the server
(bug #23015).
* Units:
* Assigned capitalized translatable names to Walking Corpse and Soulless
variations (bug #22902).
Version 1.12.0:
* Language and i18n: