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

Fixed some duplicate unit ids (fixes bug #16126),

Browse source 
...a few buggy messages and a broken event filter.
This commit is contained in:
Lari Nieminen 2010-06-07 04:21:20 +00:00
parent a8c0d08e71
commit 0da3dde7fa
3 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -487,7 +487,6 @@
#ifdef HARD
[unit]
type=Troll Whelp
id=Troll Assistant
name= _ "Troll Assistant"
x=31
y=4
@ -504,7 +503,7 @@
[unit]
type=Troll Shaman
id=Troll High Shaman
role=Troll High Shaman
name= _ "Troll High Shaman"
x=16
y=22
@ -531,7 +530,7 @@
[unit]
type=Troll Shaman
id=Troll High Shaman
role=Troll High Shaman
name= _ "Troll High Shaman"
x=18
y=23
@ -1306,7 +1305,7 @@
[/message]
[message]
speaker=Troll High Shaman
role=Troll High Shaman
message= _ "They have broken through the outer guard-line. Destroy the bridge, they must not pass!"
[/message]
@ -1479,7 +1478,7 @@
[then]
[message]
speaker=Troll High Shaman
role=Troll High Shaman
message= _ "Arise! Arise and engulf the intruders in your holy fire!"
[/message]
@ -1679,7 +1678,7 @@
[then]
[message]
speaker=Troll High Shaman
role=Troll High Shaman
message= _ "Arise, hallowed guardians, and destroy them!"
[/message]
@ -1730,7 +1729,7 @@
[then]
[message]
speaker=Troll High Shaman
role=Troll High Shaman
message= _ "Arise and attack them now, while they are vulnerable!"
[/message]
@ -1781,7 +1780,7 @@
[then]
[message]
speaker=Troll High Shaman
role=Troll High Shaman
message= _ "They must not be allowed to cross to the other side! Kill them!"
[/message]
@ -1852,7 +1851,7 @@
[unit]
type=Troll Shaman
id=Troll High Shaman
role=Troll High Shaman
name= _ "Troll High Shaman"
x=16
y=22
@ -1900,7 +1899,7 @@
[unit]
type=Troll Shaman
id=Troll High Shaman
role=Troll High Shaman
name= _ "Troll High Shaman"
x=26
y=28

10
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -752,7 +752,7 @@
[move_unit_fake]
type=Troll Shaman
side=1
side=3
x=33,34,35,36,37,38,39
y=30,30,30,29,30,30,31
[/move_unit_fake]
@ -1694,7 +1694,6 @@
[unit]
type=Tentacle of the Deep
id=Giant Tentacle
side=9
x=$tempx
y=$tempy
@ -1708,7 +1707,6 @@
[unit]
type=Tentacle of the Deep
id=Giant Tentacle
side=9
x=$tempx
y=$tempy
@ -1725,7 +1723,6 @@
[unit]
type=Tentacle of the Deep
id=Giant Tentacle
side=9
x=$tempx
y=$tempy
@ -1829,7 +1826,7 @@
first_time_only=no
[filter]
type=Giant Tentacle
type=Tentacle of the Deep
[/filter]
[set_variable]
@ -2000,6 +1997,9 @@
[message]
side=6
[not]
canrecruit=yes
[/not]
message= _ "The chieftain has fallen! Flee for your lives!"
[/message]

10
data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
View file

@ -1094,6 +1094,7 @@
[unit]
type=Troll Shaman
name= _ "Troll Avenger"
role=avenger
side=6
x=52
y=45
@ -1159,6 +1160,7 @@
[unit]
type=Dwarvish Pathfinder
name= _ "Dwarf Avenger"
role=avenger
side=6
x=52
y=45
@ -1180,14 +1182,14 @@
[then]
[message]
speaker=Troll Avenger
role=avenger
message= _ "Foul elves, you not escaped us yet. The Great Leader shall be avenged! We have dammed the river and soon all shall drown in its dark waters. Come join us in death!"
[/message]
[/then]
[else]
[message]
speaker=Dwarf Avenger
role=avenger
message= _ "Foul elves, you have not escaped yet. Our chieftain shall be avenged! We have dammed the river and soon all shall drown in its dark waters. Come join us in death!"
[/message]
[/else]
@ -5434,7 +5436,6 @@
#ifdef HARD
type=Dragoon
#endif
id=Human Escort
name= _ "Human Escort"
upkeep=free
x=$loc_x
@ -5453,7 +5454,6 @@
#ifdef HARD
type=Dragoon
#endif
id=Human Escort
name= _ "Human Escort"
upkeep=free
x=$loc_x
@ -5472,7 +5472,6 @@
#ifdef HARD
type=Swordsman
#endif
id=Human Escort
name= _ "Human Escort"
upkeep=free
x=$loc_x
@ -5491,7 +5490,6 @@
#ifdef HARD
type=Master Bowman
#endif
id=Human Escort
name= _ "Human Escort"
upkeep=free
x=$loc_x