diff --git a/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg b/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg index 787a6ac2096..440989521fe 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg @@ -145,10 +145,10 @@ {INCOME 4 8 12} [/side] -#Time Areas broken / removed in CVS, Wait for attachable halos +#Time Areas broken - no visible change, use a halo with it [time_area] - x=1,1,1,2,2,2,2,3,3,3,3,3,4,4,4,4,5,5,5,6,6 - y=17,18,19,16,17,18,19,16,17,18,19,20,16,17,18,19,17,18,19,17,18 + x=1,1,1,2,2,2,2,3,3,3,3,3,4,4,4,4,5,5,5 #,6,6 + y=17,18,19,16,17,18,19,16,17,18,19,20,16,17,18,19,17,18,19 #,17,18 {MORNING} {MORNING} {AFTERNOON} @@ -163,7 +163,14 @@ {STARTING_VILLAGES 1 12} {STARTING_VILLAGES 2 10} - {PUT_IMG (items/lighthouse.png) 3 18} + #{PUT_IMG (items/lighthouse.png) 3 18} + [item] + x=3 + y=18 + image=items/lighthouse.png + halo=halo/lighthouse-aura.png + [/item] + {PUT_IMG (pirate-galleon.png) 17 24} {PUT_IMG (pirate-galleon.png) 20 22} {PUT_IMG (galleon.png) 21 25} diff --git a/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg b/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg index 27a796f21f1..0fe50b884cb 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg @@ -175,10 +175,10 @@ {INCOME 5 10 15} [/side] - #Time Areas broken / removed in CVS (0.8.1), Wait for attachable halos +#Time Areas broken - no visible change, use a halo with it [time_area] - x=34,35,36,36,36,35,34,33,32,32,32,33,34,35,35,34,33,33,34,37,37,31,31 - y=6,7,7,8,9,10,10,10,9,8,7,7,7,8,9,9,9,8,8,8,9,8,9 + x=34,35,36,36,36,35,34,33,32,32,32,33,34,35,35,34,33,33,34 #,37,37,31,31 + y=6,7,7,8,9,10,10,10,9,8,7,7,7,8,9,9,9,8,8 #,8,9,8,9 {MORNING} {MORNING} {AFTERNOON} @@ -197,7 +197,13 @@ {PUT_IMG (items/signpost.png) 8 17} {PUT_IMG (items/signpost.png) 1 10} {PUT_IMG (items/signpost.png) 36 18} - {PUT_IMG (items/lighthouse.png) 34 8} + #{PUT_IMG (items/lighthouse.png) 34 8} + [item] + x=34 + y=8 + image=items/lighthouse.png + halo=halo/lighthouse-aura.png + [/item] [recall] description=Lady Jessica diff --git a/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg b/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg index 0ba19742bc2..7b62a0d51ee 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg @@ -76,6 +76,14 @@ aggression=0.75 caution=0.0 [/ai] + [ai] + [protect_location] + x=11 + y=14 + radius=10 + value=10 + [/protect_location] + [/ai] [/side] [side] @@ -102,6 +110,14 @@ aggression=0.75 caution=0.0 [/ai] + [ai] + [protect_location] + x=11 + y=14 + radius=10 + value=10 + [/protect_location] + [/ai] [/side] {scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg} diff --git a/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg b/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg index 004b5dea51f..a8705da7335 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg @@ -14,8 +14,25 @@ {scenarios/The_Rise_of_Wesnoth/trow-macros.cfg} [bigmap] - {CROSS 315 180} - image=maps/the_great_continent.png + [if] + [variable] + name=last_done + equals=none + [/variable] + [then] + image=maps/the_great_continent.png + {DOT 240 260} + {DOT 265 265} + {DOT 280 250} + {DOT 295 235} + {DOT 305 210} + {CROSS 315 180} + [/then] + [else] + image=maps/the_great_continent.png + {CROSS 315 180} + [/else] + [/if] [/bigmap] [side] diff --git a/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg b/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg index afecc50a97e..7c480600fa5 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg @@ -25,6 +25,8 @@ [bigmap] image=maps/the_green_isle.png + {DOT 325 400} + {DOT 312 398} {CROSS 300 395} [/bigmap] diff --git a/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg b/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg index 91834d3d7d4..ee8707e751a 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg @@ -46,7 +46,14 @@ [event] name=prestart - {PUT_IMG (items/lighthouse.png) 3 5} + #{PUT_IMG (items/lighthouse.png) 3 5} + [item] + x=3 + y=5 + image=items/lighthouse.png + halo=halo/lighthouse-aura.png + [/item] + {PUT_IMG (misc/trapdoor.png) 16 17} {PUT_IMG (items/signpost.png) 24 11} {PUT_IMG (pirate-galleon.png) 20 9} diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg index aa21092a5b9..2d613bf281c 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg @@ -65,6 +65,14 @@ recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,fighter,scout [/ai] + [ai] + [protect_location] + x=20 + y=23 + radius=12 + value=10 + [/protect_location] + [/ai] [/side] [side] @@ -85,6 +93,14 @@ recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,fighter,scout [/ai] + [ai] + [protect_location] + x=20 + y=23 + radius=12 + value=10 + [/protect_location] + [/ai] [/side] @@ -106,6 +122,14 @@ recruitment_ignore_bad_movement=yes recruitment_pattern=scout,archer,fighter,scout [/ai] + [ai] + [protect_location] + x=20 + y=23 + radius=12 + value=10 + [/protect_location] + [/ai] [/side] [side] @@ -141,9 +165,9 @@ {STARTING_VILLAGES 2 10} {STARTING_VILLAGES 3 10} {STARTING_VILLAGES 4 10} - {STARTING_VILLAGES 5 10} + {STARTING_VILLAGES 5 10} - {PUT_IMG (terrain/) 20 27} + {PUT_IMG (terrain/mine.png) 20 27} [recall] description=Lady Jessica diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg index a763edb0dbb..1575ce9f9d4 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg @@ -382,7 +382,10 @@ speaker=Lady Outlaw message="On we go. . ." [/message] - + [set_variable] + name=last_done + value="Midlands" + [/set_variable] [/event] [event] diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg index 6a2565e2e8d..956ced6f4fa 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg @@ -28,10 +28,29 @@ {scenarios/The_Rise_of_Wesnoth/trow-macros.cfg} [bigmap] - image=maps/the_green_isle.png - {CROSS 350 345} + [if] + [variable] + name=last_done + equals=Midlands + [/variable] + [then] + image=maps/the_green_isle.png + {DOT 315 330} + {DOT 325 334} + {DOT 335 338} + {DOT 345 342} + {CROSS 350 345} + [/then] + [else] + image=maps/the_green_isle.png + {DOT 365 310} + {DOT 361 319} + {DOT 357 328} + {DOT 353 337} + {CROSS 350 345} + [/else] + [/if] [/bigmap] - [side] type=Noble Commander @@ -108,6 +127,7 @@ [event] name=prestart + {CLEAR_VARIABLE last_done} {PUT_IMG (terrain/temple.png) 23 22} {PUT_IMG (items/castle-ruins.png) 5 5} diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg index 56f4d7b11d5..4ebbd890090 100644 --- a/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg +++ b/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg @@ -488,7 +488,11 @@ speaker=Lady Outlaw message="On we go. . ." [/message] - + [set_variable] + name=last_done + value="River" + [/set_variable] + {CLEAR_VARIABLE random} [/event]