upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 04:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some inconsistencies with galleon MUFs or similar appearances.

Browse Source 
Fixed a major inconsistency: Familiar is a Dread Bat sometimes,
sometimes not; he is a Dread Bat when spawned and not during MUFs.
This is Espreon's fault... Shame on you Espreon!
This commit is contained in:
Ignacio R. Morelle 2008-11-30 13:55:59 +00:00
parent 48f0dd1fba
commit 51d3f24b1b
9 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
View File

@ -187,7 +187,7 @@
{PLACE_IMAGE (scenery/signpost.png) 8 17}
{PLACE_IMAGE (scenery/signpost.png) 1 10}
{PLACE_IMAGE (scenery/signpost.png) 36 18}
#{PLACE_IMAGE (scenery/lighthouse.png) 34 8}
[item]
x=34
y=8
@ -625,7 +625,7 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15
[/move_unit_fake]
{PLACE_IMAGE (units/transport/pirate-galleon.png) 30 15}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 30 15}
{PLACE_IMAGE (items/gohere.png) 31 16}
[message]
@ -640,7 +640,7 @@
[event]
name=turn 18
# {PLACE_IMAGE (terrain/pier.png) 31 16}
[removeitem]
x=31
y=16
@ -651,7 +651,6 @@
message= _ "My lord, the first ship is departing. But the second ship should arrive shortly."
[/message]
# {PLACE_IMAGE (terrain/water/coast.png) 30 15}
[removeitem]
x=30
y=15
@ -676,7 +675,7 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,14
[/move_unit_fake]
{PLACE_IMAGE (units/transport/pirate-galleon.png) 31 14}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 31 14}
{PLACE_IMAGE (items/gohere.png) 32 14}
[message]
@ -692,7 +691,6 @@
[event]
name=turn 24
# {PLACE_IMAGE (terrain/pier.png) 32 14}
[removeitem]
x=32
y=14
@ -703,7 +701,6 @@
message= _ "My lord, the second ship is departing. But the last ship will be here before long. With your help we can hold on just a while longer."
[/message]
# {PLACE_IMAGE (terrain/water/coast.png) 31 14}
[removeitem]
x=31
y=14
@ -728,7 +725,7 @@
y=14,14,13,12,11,11,10,11,11,12,12,13,13,14,15,15
[/move_unit_fake]
{PLACE_IMAGE (units/transport/pirate-galleon.png) 28 15}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 28 15}
{PLACE_IMAGE (items/gohere.png) 29 16}
[message]
@ -744,7 +741,6 @@
[event]
name=time over
# {PLACE_IMAGE (terrain/pier.png) 29 16}
[removeitem]
x=29
y=16
@ -755,7 +751,6 @@
message= _ "My lord, the last ship is departing. We're trapped!"
[/message]
# {PLACE_IMAGE (terrain/water/ocean.png) 28 15}
[removeitem]
x=28
y=15

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
View File

@ -228,7 +228,7 @@
y=30,29,29,28,27,26
[/move_unit_fake]
{PLACE_IMAGE (units/transport/pirate-galleon.png) 34 26}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 34 26}
[unhide_unit]
x=33

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg
View File

@ -50,8 +50,8 @@
{PLACE_IMAGE (scenery/trapdoor-open.png) 16 17}
{PLACE_IMAGE (scenery/signpost.png) 24 11}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 20 9}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 17 11}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 20 9}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 17 11}
[recall]
id=Lady Jessica

12
data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
View File

@ -172,9 +172,9 @@
halo=halo/lighthouse-aura.png
[/item]
{PLACE_IMAGE (units/transport/pirate-galleon.png) 17 24}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 20 22}
{PLACE_IMAGE (units/transport/galleon.png) 21 25}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 17 24}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 20 22}
{PLACE_IMAGE ("units/transport/galleon.png~RC(magenta>blue)") 21 25}
{PLACE_IMAGE (scenery/trapdoor-closed.png) 16 30}
{PLACE_IMAGE (scenery/signpost.png) 24 24}
{PLACE_IMAGE (scenery/signpost.png) 30 44}
@ -418,13 +418,13 @@
name=turn 4
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=5
x=45,44,43,42
y=22,22,23,23
[/move_unit_fake]
{UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 5 42 23}
{UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 5 42 23}
[move_unit_fake]
type=Ancient Lich
@ -494,7 +494,7 @@
[/kill]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=5
x=42,43,44,45
y=23,23,22,22

6
data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
View File

@ -146,7 +146,7 @@
y=9
[/recall]
{PLACE_IMAGE units/transport/galleon.png 10 9}
{PLACE_IMAGE ("units/transport/galleon.png~RC(magenta>red)") 10 9}
[objectives]
side=1
@ -271,7 +271,7 @@
message= _ "I don't find that thought very comforting."
[/message]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=3,3,4
y=1,2,2
@ -291,7 +291,7 @@
[/kill]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=4,3,2,1
y=2,3,2,2

6
data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
View File

@ -148,7 +148,7 @@
y=24
[/recall]
{PLACE_IMAGE units/transport/galleon.png 10 27}
{PLACE_IMAGE ("units/transport/galleon.png~RC(magenta>red)") 10 27}
[objectives]
side=1
@ -309,7 +309,7 @@
[/message]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=1,2,3
y=25,25,26
@ -329,7 +329,7 @@
[/kill]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=3,3,2,1
y=26,27,27,28

16
data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
View File

@ -139,11 +139,11 @@
y=31,31,32,32,33,34,35,36,36,37,38,38
[/move_unit_fake]
{PLACE_IMAGE units/transport/galleon.png 2 38}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 3 26}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 4 24}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 2 23}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 5 27}
{PLACE_IMAGE ("units/transport/galleon.png~RC(magenta>red)") 2 38}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 3 26}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 4 24}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 2 23}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 5 27}
[unhide_unit]
x=1
@ -263,20 +263,20 @@
[/message]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=1,2,3
y=15,15,15
[/move_unit_fake]
{UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 4 3 15}
{UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 4 3 15}
[kill]
id=Familiar
[/kill]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=4
x=3,3,2,1
y=15,14,13,13

14
data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
View File

@ -156,10 +156,10 @@
[event]
name=prestart
{PLACE_IMAGE (units/transport/pirate-galleon.png) 10 27}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 7 30}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 6 33}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 5 36}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 10 27}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 7 30}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 6 33}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>red)") 5 36}
{PLACE_IMAGE (scenery/slab1.png) 18 15}
@ -261,13 +261,13 @@
[/filter_second]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=2
x=29,28,28
y=1,1,2
[/move_unit_fake]
{UNDEAD_INTEL (Blood Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 2 28 2}
{UNDEAD_INTEL (Dread Bat) (Familiar) ( _ "Familiar") "portraits/familiar.png" 2 28 2}
# wmllint: recognize Familiar
[move_unit_fake]
@ -330,7 +330,7 @@
[/kill]
[move_unit_fake]
type=Blood Bat
type=Dread Bat
side=2
x=28,28,29
y=2,1,1

8
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
View File

@ -224,10 +224,10 @@
[event]
name=prestart
{PLACE_IMAGE (units/transport/pirate-galleon.png) 21 35}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 21 37}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 22 39}
{PLACE_IMAGE (units/transport/pirate-galleon.png) 23 44}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 21 35}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 21 37}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 22 39}
{PLACE_IMAGE ("units/transport/transport-galleon.png~RC(magenta>blue)") 23 44}
[recall]
id=Lady Jessica