From 51d3f24b1b92b4bf14e9641f3da6e18845b10499 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Sun, 30 Nov 2008 13:55:59 +0000 Subject: [PATCH] Fixed some inconsistencies with galleon MUFs or similar appearances. 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! --- .../scenarios/08_Clearwater_Port.cfg | 15 +++++---------- .../scenarios/09_Fallen_Lich_Point.cfg | 2 +- .../scenarios/11_Southbay_in_Winter.cfg | 4 ++-- .../scenarios/12_A_Final_Spring.cfg | 12 ++++++------ .../scenarios/13_Peoples_in_Decline.cfg | 6 +++--- .../scenarios/14_Rough_Landing.cfg | 6 +++--- .../scenarios/15_New_Land.cfg | 16 ++++++++-------- .../scenarios/20_Return_of_the_Fleet.cfg | 14 +++++++------- .../scenarios/22_Rise_of_Wesnoth.cfg | 8 ++++---- 9 files changed, 39 insertions(+), 44 deletions(-) diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg index 76f76abd134..5c6411e49ca 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg index c13f053d43e..4c4764cd1df 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg index 11513d7a681..1a2e8a6c742 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/11_Southbay_in_Winter.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg index 1932bf90a96..9218ca37ecd 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg index f7d77b6a9ed..5cddfcf0ee5 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg index 79ccf6de07b..06379ccfa20 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg index c0882d363d1..ba46efc6ee8 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg index 2c1d59d5f43..0711ddfd2b6 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg @@ -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 diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg index 8d91e9b718a..8bb9c62065e 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg @@ -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