Author: esr
Date: Thu Sep 11 16:55:19 2008
New Revision: 29396
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29396&view=rev
Log:
Fix bug #12278. Also bump Tallin's level to 1 if he's a Peasant, a
level 0 Sergeant is a bit wacky.
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg?rev=29396&r1=29395&r2=29396&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg Thu Sep
11 16:55:19 2008
@@ -194,13 +194,14 @@
[/ai]
[/side]
- # Prestart event, we change tallin to be of seregant line
+ # Prestart event, we change Tallin to be of Sergeant line
[event]
name=prestart
# {SCATTER_IMAGE (terrain=Gg,Gs^Fp) 12 scenery/pine2.png}
- # Store Tallin, we need to kill, otherwise animations will get screwed
on unstoring
+ # Store Tallin. We need to kill him, otherwise animations will get
+ # screwed on unstoring
[store_unit]
[filter]
id=Tallin
@@ -209,7 +210,8 @@
kill=yes
[/store_unit]
- # Check his level, and set new type to be a commander of the same level
+ # Check his level, and set new type to be a commander of the same
level.
+ # Setting the advancement type seems to be required, I'm not sure why.
[if]
[variable]
name=type_change.level
@@ -217,6 +219,7 @@
[/variable]
[then]
{VARIABLE type_change.type General}
+ {VARIABLE type_change.advances_to null}
[/then]
[else]
[if]
@@ -226,9 +229,12 @@
[/variable]
[then]
{VARIABLE type_change.type Lieutenant}
+ {VARIABLE type_change.advances_to General}
[/then]
[else]
{VARIABLE type_change.type Sergeant}
+ {VARIABLE type_change.level 1}
+ {VARIABLE type_change.advances_to Lieutenant}
[/else]
[/if]
[/else]
@@ -245,7 +251,8 @@
kill=no
variable=type_change
[/store_unit]
- # We also need to fix current hitpoints, otherwise he would get
unstored hurt
+ # We also need to fix current hitpoints, otherwise he could
+ # get unstored hurt
{VARIABLE type_change.hitpoints $type_change.max_hitpoints}
[unstore_unit]
variable=type_change
@@ -253,11 +260,13 @@
{CLEAR_VARIABLE type_change}
[/event]
- # Start event, recal heroes, place some bad guys, set objectives, do the
talking
+ # Start event, recall heroes, place some bad guys, set objectives,
+ # do the talking
[event]
name=start
- # This hack is a workaround for unit roles not getting carried over to
next scenario
+ # This hack is a workaround for unit roles not getting carried over
+ # to next scenario. It may no longer be needed in 1.5 - must test.
[role]
[filter_wml]
[variables]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
