Author: zookeeper
Date: Thu Sep 11 20:44:04 2008
New Revision: 29399
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29399&view=rev
Log:
Fixed bug #12291. Needs some extra work for the case of Krash being dead.
Modified:
trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg Thu Sep
11 20:44:04 2008
@@ -454,6 +454,7 @@
team_name=alliance
user_team_name=_"Alliance"
controller=human
+ save_id=Krash
[/side]
# Start event - recall heroes, set objectives, do the talk
@@ -1273,12 +1274,6 @@
[/message]
[/then]
[/if]
-
- # Flip Krash back to side 1 and make him unable to recruit.
- # Otherwise he'll mess up the start conditions for the next
- # scenario.
- {MODIFY_UNIT id=Krash side 1}
- {MODIFY_UNIT id=Krash canrecruit no}
[/event]
# Load death events
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/11a_Eastern_Flank.cfg Thu
Sep 11 20:44:04 2008
@@ -103,46 +103,25 @@
# Allied side - also player controlled, leader serves as a placeholder for
Krash if he's alive
[side]
side=7
+ type=Drake Burner
+ id=Krash
+ name= _ "Krash"
+ canrecruit=yes
+ save_id=Krash
{GOLD4 300 250 200 150}
recruit=Drake Fighter,Drake Glider,Drake Burner,Drake Clasher
team_name=knalgans
user_team_name=_"Alliance"
controller=human
- no_leader=yes
[/side]
# Check if Krash is on recall list and if yes replace side 7 leader with
him
[event]
name=prestart
- [recall]
- id=Krash
- [/recall]
[if]
[have_unit]
id=Krash
[/have_unit]
- [then]
- [store_unit]
- [filter]
- id=Krash
- [/filter]
- kill=yes
- fire_event=no
- variable=placing_krash
- [/store_unit]
- [store_starting_location]
- side=7
- variable=placing_krash_on
- [/store_starting_location]
- {VARIABLE placing_krash.x $placing_krash_on.x}
- {VARIABLE placing_krash.y $placing_krash_on.y}
- {VARIABLE placing_krash.side 7}
- [unstore_unit]
- variable=placing_krash
- [/unstore_unit]
- {CLEAR_VARIABLE placing_krash}
- {CLEAR_VARIABLE placing_krash_on}
- [/then]
[else]
[terrain]
x=29,29,30,30,30,31,31,31,32,32
@@ -491,18 +470,6 @@
next_scenario=showdown
[/else]
[/if]
- [store_unit]
- [filter]
- id=Krash
- [/filter]
- kill=no
- variable=krash_hack
- [/store_unit]
- {VARIABLE krash_hack.side 1}
- [unstore_unit]
- variable=krash_hack
- [/unstore_unit]
- {CLEAR_VARIABLE krash_hack}
[/event]
# Load death events
{campaigns/Northern_Rebirth/utils/herodeaths.cfg}
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg Thu
Sep 11 20:44:04 2008
@@ -171,12 +171,16 @@
# Empty side - player will asume control of it if Krash is alive
[side]
side=7
+ type=Drake Burner
+ id=Krash
+ name= _ "Krash"
+ canrecruit=yes
+ save_id=Krash
{GOLD4 300 250 200 150}
recruit=Drake Fighter,Drake Glider,Drake Burner,Drake Clasher
team_name=knalgans
user_team_name=_"Alliance"
controller=human
- no_leader=yes
[/side]
# Empty side - to ensure proper recall list caryover
[side]
@@ -199,35 +203,11 @@
# {SCATTER_IMAGE (terrain=Gs^Fp) 20 scenery/pine2.png}
# If Krash is alive place him at sides 7 keep, otherwise remove that
castle
- [recall]
- id=Krash
- [/recall]
[if]
[have_unit]
id=Krash
[/have_unit]
- [then]
- [store_starting_location]
- side=7
- variable=krash_starts_at
- [/store_starting_location]
- [store_unit]
- [filter]
- id=Krash
- [/filter]
- kill=yes
- fire_event=no
- variable=place_krash_at
- [/store_unit]
- {VARIABLE place_krash_at.x $krash_starts_at.x}
- {VARIABLE place_krash_at.y $krash_starts_at.y}
- [unstore_unit]
- variable=place_krash_at
- [/unstore_unit]
- {CLEAR_VARIABLE place_krash_at}
- {CLEAR_VARIABLE krash_starts_at}
- [/then]
[else]
[terrain]
x=4,4,4,5,5,5,6,6,6
@@ -570,18 +550,6 @@
[/if]
[store_unit]
[filter]
- id=Krash
- [/filter]
- kill=no
- variable=krash_hack
- [/store_unit]
- {VARIABLE krash_hack.side 1}
- [unstore_unit]
- variable=krash_hack
- [/unstore_unit]
- {CLEAR_VARIABLE krash_hack}
- [store_unit]
- [filter]
id=Anita
[/filter]
kill=no
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg?rev=29399&r1=29398&r2=29399&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg (original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg Thu Sep 11
20:44:04 2008
@@ -205,12 +205,16 @@
# Side for Krash, if alive
[side]
side=7
+ type=Drake Burner
+ id=Krash
+ name= _ "Krash"
+ canrecruit=yes
+ save_id=Krash
gold=100
recruit=Drake Fighter,Drake Glider,Drake Burner,Drake Clasher
team_name=knalgans
user_team_name=_"Alliance"
controller=human
- no_leader=yes
[/side]
{STARTING_VILLAGES 7 10}
# Allied AI
@@ -262,9 +266,6 @@
# {SCATTER_IMAGE (terrain=Gg,Gs^Fp) 12 scenery/pine1.png}
# Check if Krash is alive, if yes place him at helm of side 7,
otherwise it's taken over by older lich
[recall]
- id=Krash
- [/recall]
- [recall]
id="Ro'Arthian"
[/recall]
[store_starting_location]
@@ -275,23 +276,6 @@
[have_unit]
id=Krash
[/have_unit]
- [then]
- [store_unit]
- [filter]
- id=Krash
- [/filter]
- kill=yes
- fire_event=no
- variable=place_krash_at
- [/store_unit]
- {VARIABLE place_krash_at.x $side_seven_starts_at.x}
- {VARIABLE place_krash_at.y $side_seven_starts_at.y}
- {VARIABLE place_krash_at.side 7}
- [unstore_unit]
- variable=place_krash_at
- [/unstore_unit]
- {CLEAR_VARIABLE place_krash_at}
- [/then]
[else]
[store_unit]
[filter]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
