Author: fendrin
Date: Tue Oct 25 17:08:22 2011
New Revision: 51629
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51629&view=rev
Log:
NR 06a: Removed obsolete fix for missing Supporter.
Moved scenario setup code from start to prestart event.
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=51629&r1=51628&r2=51629&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg Tue Oct
25 17:08:22 2011
@@ -208,59 +208,7 @@
[event]
name=prestart
- {RECALL_SUPPORTER}
-
- # Check his level, and set new type to be a commander of the same
level.
- {STORE_UNIT_VAR id=Tallin level old_tallin_level}
-
- [switch]
- variable=old_tallin_level
-
- [case]
- value=0
- {VARIABLE new_tallin_type Sergeant}
- [/case]
-
- [case]
- value=1
- {VARIABLE new_tallin_type Sergeant}
- [/case]
-
- [case]
- value=2
- {VARIABLE new_tallin_type Lieutenant}
- [/case]
-
- [else]
- {VARIABLE new_tallin_type General}
- [/else]
- [/switch]
-
- {TRANSFORM_UNIT id=Tallin $new_tallin_type}
- {FULL_HEAL id=Tallin}
-
- {CLEAR_VARIABLE old_tallin_level,new_tallin_type}
- [/event]
-
- # 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. It may no longer be needed in 1.5 - must test.
- [role]
- [filter_wml]
- [variables]
- role=Supporter
- [/variables]
- [/filter_wml]
- role=Supporter
- [/role]
# Recall heroes and a supporter
- [recall]
- role=Supporter
- [/recall]
[recall]
id=Camerin
[/recall]
@@ -279,6 +227,8 @@
[recall]
id=Sister Thera
[/recall]
+ {RECALL_SUPPORTER}
+
# Place bad guy bodyguards
{NOTRAIT_UNIT 2 "Orcish Warlord" 2 20}
[+unit]
@@ -308,6 +258,44 @@
[+unit]
ai_special=guardian
[/unit]
+
+ # Check his level, and set new type to be a commander of the same
level.
+ {STORE_UNIT_VAR id=Tallin level old_tallin_level}
+
+ [switch]
+ variable=old_tallin_level
+
+ [case]
+ value=0
+ {VARIABLE new_tallin_type Sergeant}
+ [/case]
+
+ [case]
+ value=1
+ {VARIABLE new_tallin_type Sergeant}
+ [/case]
+
+ [case]
+ value=2
+ {VARIABLE new_tallin_type Lieutenant}
+ [/case]
+
+ [else]
+ {VARIABLE new_tallin_type General}
+ [/else]
+ [/switch]
+
+ {TRANSFORM_UNIT id=Tallin $new_tallin_type}
+ {FULL_HEAL id=Tallin}
+
+ {CLEAR_VARIABLE old_tallin_level,new_tallin_type}
+ [/event]
+
+ # Start event, recall heroes, place some bad guys, set objectives,
+ # do the talking
+ [event]
+ name=start
+
# Do the talk
[message]
id=Rakshas
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
