Author: beetlenaut
Date: Sat Oct 22 00:59:44 2011
New Revision: 51572
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51572&view=rev
Log:
Changed the bonuses on the second scenario. Now, you get a loyal unit for
killing any enemy leader (instead of only side 2).
Modified:
trunk/data/campaigns/Dead_Water/scenarios/02_Flight.cfg
trunk/data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
trunk/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
trunk/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
trunk/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg
trunk/data/campaigns/Dead_Water/utils/items.cfg
Modified: trunk/data/campaigns/Dead_Water/scenarios/02_Flight.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/scenarios/02_Flight.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/scenarios/02_Flight.cfg (original)
+++ trunk/data/campaigns/Dead_Water/scenarios/02_Flight.cfg Sat Oct 22 00:59:44
2011
@@ -52,7 +52,7 @@
[/story]
{DEFAULT_SCHEDULE}
- {TURNS4 22 22 22 22}
+ {TURNS4 21 22 23 24}
victory_when_enemies_defeated=no
[side]
@@ -418,41 +418,141 @@
[event]
name=die
[filter]
- id=Mel Daveth
- [/filter]
-
- # If either of the named characters is dead, we have to take
- # note because they shouldnât show up in the last
- # scenario. (We'll just rename the bad guys in that case.)
- [set_variable]
- name=MD_dead
- value=yes
- [/set_variable]
- [/event]
-
- [event]
- name=die
- [filter]
id=Mal-Kevek
[/filter]
-
+
# It seems strange to have to kill him in a "die" event, but
# he's only *mostly* dead otherwise, and the bat can't appear
# at his location:
[kill]
id=Mal-Kevek
[/kill]
+
+ [if]
+ [have_unit]
+ side=2
+ race=undead
+ [/have_unit]
+ [then]
+ [kill]
+ side=2
+ race=undead
+ animate=yes
+ [/kill]
+ [message]
+ speaker=Cylanna
+ message= _ "With their master gone, the undead are
vanishing!"
+ [/message]
+ [/then]
+ [/if]
+
+ [unit]
+ type=Dread Bat
+ side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ {TRAIT_RESILIENT}
+ {TRAIT_STRONG}
+ [/modifications]
+ id=Fearsome Bat
+ name= _ "Fearsome Bat"
+ side=1
+ x=$x1
+ y=$y1
+ overlays=overlays/loyal-icon.png
+ [/unit]
+
+ [if]
+ [variable]
+ name=$second_unit.id
+ not_equals=Gwabbo
+ [/variable]
+ [then]
+ [message]
+ speaker=second_unit
+ message= _ "Look! There is a massive bat back here."
+ [/message]
+ [message]
+ speaker=Gwabbo
+ message= _ "Be courageous, and attack it anyway!"
+ [/message]
+ [message]
+ speaker=second_unit
+ message= _ "But it isn't attacking <i>me</i>. Do you
think, with its master gone, it might desire a new one?"
+ [/message]
+ [message]
+ speaker=Kai Krellis
+ message= _ "If it does not attack, we shall not kill it.
Let us see if it follows us."
+ [/message]
+ [/then]
+ [else]
+ [message]
+ speaker=Kai Krellis
+ message= _ "That is a mighty bat!"
+ [/message]
+ [message]
+ speaker=second_unit
+ message= _ "It is no matter. I will destroy it
immediately."
+ [/message]
+ [message]
+ speaker=Cylanna
+ message= _ "Hold a moment! Do you think, with its master
gone, it might desire a new one?"
+ [/message]
+ [message]
+ speaker=Kai Krellis
+ message= _ "If it does not attack, do not kill it. Let us
see if it follows us."
+ [/message]
+ [/else]
+ [/if]
+
+ # If either of the named characters is dead, we have to take
+ # note because they shouldnât show up in the last
+ # scenario. (We'll just rename the bad guys in that case.)
+ [set_variable]
+ name=MK_dead
+ value=yes
+ [/set_variable]
+ [/event]
+
+ [event]
+ name=die
+ [filter]
+ id=Mel Daveth
+ [/filter]
+
+ [kill]
+ id=Mel Daveth
+ [/kill]
+
+ [if]
+ [have_unit]
+ side=3
+ race=undead
+ [/have_unit]
+ [then]
+ [kill]
+ side=3
+ race=undead
+ animate=yes
+ [/kill]
+ [message]
+ speaker=Cylanna
+ message= _ "With their master gone, the undead are fading
away!"
+ [/message]
+ [/then]
+ [/if]
+
+ {RING_OF_STRENGTH_APPEARS}
[unit]
type=Vampire Bat
side=1
[modifications]
{TRAIT_LOYAL}
- {TRAIT_RESILIENT}
+ {TRAIT_INTELLIGENT}
[/modifications]
id=Friendly Bat
name= _ "Friendly Bat"
- unrenamable=no
side=1
x=$x1
y=$y1
@@ -467,7 +567,7 @@
[then]
[message]
speaker=second_unit
- message= _ "Look! There is a bat cowering in the corner
here."
+ message= _ "And look! There is a bat cowering in the
corner here."
[/message]
[message]
speaker=Kai Krellis
@@ -514,9 +614,9 @@
[/message]
[/else]
[/if]
-
+
[set_variable]
- name=MK_dead
+ name=MD_dead
value=yes
[/set_variable]
[/event]
@@ -527,30 +627,95 @@
[filter]
id=Dead Knight
[/filter]
+ [kill]
+ id=Dead Knight
+ [/kill]
+
+ [if]
+ [have_unit]
+ side=4
+ race=undead
+ [/have_unit]
+ [then]
+ [kill]
+ side=4
+ race=undead
+ animate=yes
+ [/kill]
+ [message]
+ speaker=Cylanna
+ message= _ "With their master gone, the skeletons are
crumbling!"
+ [/message]
+ [/then]
+ [/if]
+
+ [unit]
+ type=Walking Corpse
+ variation=bat
+ side=1
+ [modifications]
+ {TRAIT_LOYAL}
+ [/modifications]
+ id=Undead Bat
+ name= _ "Undead Bat"
+ side=1
+ x=$x1
+ y=$y1
+ overlays=overlays/loyal-icon.png
+ [/unit]
+
+ [message]
+ speaker=second_unit
+ message= _ "Look! There is a bat in the corner here. It is moving,
but it looks half dead."
+ [/message]
+ [if]
+ [have_unit]
+ id=Gwabbo
+ [/have_unit]
+ [then]
+ [message]
+ speaker=Gwabbo
+ message= _ "No, that thing is all the way dead."
+ [/message]
+ [/then]
+ [else]
+ [message]
+ speaker=Cylanna
+ message= _ "Actually, I believe it is truly dead."
+ [/message]
+ [/else]
+ [/if]
+ [message]
+ speaker=Cylanna
+ message= _ "I beleive it is undead and has no will of its own, but
the Kai may have the will power to direct it."
+ [/message]
+ [message]
+ speaker=Kai Krellis
+ message= _ "Fascinating. I shall certainly try."
+ [/message]
# The chest looks funny if it's floating on top of the Death
# Knight's tent, so we'll put it at the second unitâs feet
# (or, well, tail)
[item]
- x=$second_unit.x
- y=$second_unit.y
+ x,y=36,4
image=items/chest.png
[/item]
[message]
speaker=second_unit
- message= _ "Look, this chest was in his tent. It is filled with
gold!"
+ message= _ "He had a chest in his tent, too. It is filled with
gold!"
[/message]
[sound]
name=gold.ogg
[/sound]
[gold]
side=1
- amount=200
+ amount=120
[/gold]
[message]
speaker=narrator
image=wesnoth-icon.png
- message= _ "You receive 200 gold."
+ message= _ "You receive 120 gold."
[/message]
[/event]
Modified: trunk/data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg (original)
+++ trunk/data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg Sat Oct 22
00:59:44 2011
@@ -226,7 +226,7 @@
[filter]
x=20
y=17
- id=Friendly Bat
+ id=Friendly Bat,Undead Bat,Fearsome Bat
[/filter]
[if]
@@ -237,7 +237,7 @@
[then]
[message]
- speaker=Friendly Bat
+ speaker=$unit.id
message= _ "Neep, neep!"
[/message]
Modified: trunk/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg (original)
+++ trunk/data/campaigns/Dead_Water/scenarios/04_Slavers.cfg Sat Oct 22
00:59:44 2011
@@ -551,7 +551,7 @@
[if]
[variable]
name=unit.id
- equals=Friendly Bat
+ contains=Bat
[/variable]
[then]
[message]
@@ -592,11 +592,11 @@
[if]
[variable]
name=unit.id
- equals=Friendly Bat
+ contains=Bat
[/variable]
[then]
[message]
- speaker=Friendly Bat
+ speaker=$unit.id
message= _ "Neep!"
[/message]
[message]
@@ -715,11 +715,11 @@
[if]
[variable]
name=unit.id
- equals=Friendly Bat
+ contains=Bat
[/variable]
[then]
[message]
- speaker=Friendly Bat
+ speaker=$unit.id
message= _ "Neep?"
[/message]
[message]
Modified: trunk/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg (original)
+++ trunk/data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg Sat Oct 22
00:59:44 2011
@@ -332,7 +332,7 @@
[filter]
race=bats
[not]
- id=Friendly Bat
+ side=1
[/not]
[/filter]
variable=bats
@@ -519,11 +519,11 @@
[if]
[variable]
name=unit.id
- equals=Friendly Bat
+ contains=Bat
[/variable]
[then]
[message]
- speaker=Friendly Bat
+ speaker=$unit.id
message= _ "Neep, neep, neep!"
[/message]
[/then]
Modified: trunk/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg (original)
+++ trunk/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg Sat Oct 22
00:59:44 2011
@@ -828,6 +828,16 @@
[/event]
[event]
+ name=die
+ [filter]
+ id=Mel Daveth
+ [/filter]
+
+ {RING_OF_STRENGTH_APPEARS}
+
+ [/event]
+
+ [event]
name=enemies defeated
[message]
speaker=Kai Krellis
Modified: trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg (original)
+++ trunk/data/campaigns/Dead_Water/utils/dw-utils.cfg Sat Oct 22 00:59:44 2011
@@ -102,6 +102,12 @@
[recall]
id=Friendly Bat
[/recall]
+ [recall]
+ id=Undead Bat
+ [/recall]
+ [recall]
+ id=Fearsome Bat
+ [/recall]
#enddef
#define HOW_TO_LOSE
Modified: trunk/data/campaigns/Dead_Water/utils/items.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Dead_Water/utils/items.cfg?rev=51572&r1=51571&r2=51572&view=diff
==============================================================================
--- trunk/data/campaigns/Dead_Water/utils/items.cfg (original)
+++ trunk/data/campaigns/Dead_Water/utils/items.cfg Sat Oct 22 00:59:44 2011
@@ -164,42 +164,6 @@
[/event]
[event]
- name=die
- [filter]
- id=Mel Daveth
- [/filter]
-
- [if]
- [variable]
- name=MD_dead
- not_equals=yes
- [/variable]
-
- [then]
- [set_variable]
- name=ring_x
- value=$x1
- [/set_variable]
- [set_variable]
- name=ring_y
- value=$y1
- [/set_variable]
-
- {PLACE_IMAGE items/ring-silver.png $ring_x $ring_y}
- [delay]
- time=600
- # Gives you half a second to see the ring before the
message (possibly) covers it up.
- [/delay]
-
- [message]
- speaker=$second_unit.id
- message= _ "The human wizard was wearing a ring! Maybe it
is magic. Someone should try it on to see what it does."
- [/message]
- [/then]
- [/if]
- [/event]
-
- [event]
name=moveto
first_time_only=no
@@ -212,7 +176,7 @@
[if]
[variable]
name=unit.id
- equals=Friendly Bat
+ contains=Bat
[/variable]
[then]
[if]
@@ -402,3 +366,34 @@
[/if]
[/event]
#enddef
+
+#define RING_OF_STRENGTH_APPEARS
+ [if]
+ [variable]
+ name=MD_dead
+ not_equals=yes
+ [/variable]
+
+ [then]
+ [set_variable]
+ name=ring_x
+ value=$x1
+ [/set_variable]
+ [set_variable]
+ name=ring_y
+ value=$y1
+ [/set_variable]
+
+ {PLACE_IMAGE items/ring-silver.png $ring_x $ring_y}
+ [delay]
+ time=600
+ # Gives you half a second to see the ring before the message
(possibly) covers it up.
+ [/delay]
+
+ [message]
+ speaker=$second_unit.id
+ message= _ "The human wizard was wearing a ring! Maybe it is
magic. Someone should try it on to see what it does."
+ [/message]
+ [/then]
+ [/if]
+#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
