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

HttT bigmap Fix bug: Wrong defaults

Browse source 
When the path was not known (due to change_level) the big map assumed the wrong defaults. Now, it follows the default route from [scenario] next_scenario=
This commit is contained in:
Gregory A Lundberg 2016-08-06 13:00:00 -05:00
parent e9feb4c578
commit 9b80ea9689
4 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
View file

@ -84,17 +84,9 @@
{STARTING_VILLAGES 2 30}
[event]
name=start
#For Elensefar: where do we come from?
[set_variable]
name=path_muff_malal
value=yes
[/set_variable]
[/event]
[event]
name=prestart
{VARIABLE via_isle_of_the_damned no}
{PLACE_IMAGE scenery/signpost.png 8 2}
{PLACE_IMAGE scenery/rock2.png 17 20}

1
data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
View file

@ -106,6 +106,7 @@
[event]
name=prestart
{VARIABLE via_isle_of_the_damned yes}
{PLACE_IMAGE scenery/temple1.png 11 13}
{PLACE_IMAGE scenery/temple1.png 10 17}

4
data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
View file

@ -295,8 +295,8 @@
[/message]
[if]
[variable]
name=path_muff_malal
equals=yes
name=via_isle_of_the_damned
not_equals=yes
[/variable]
[then]
[message]

46
data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg
View file

@ -160,8 +160,8 @@
#define JOURNEY_06_NEW
[if]
[variable]
name=path_muff_malal
equals=yes
name=via_isle_of_the_damned
not_equals=yes
[/variable]
[then]
{JOURNEY_05A_OLD}
@ -195,8 +195,8 @@
#define JOURNEY_06_OLD
[if]
[variable]
name=path_muff_malal
equals=yes
name=via_isle_of_the_damned
not_equals=yes
[/variable]
[then]
{JOURNEY_05A_OLD}
@ -534,10 +534,12 @@
#enddef
#define JOURNEY_20A_NEW
[switch]
variable=A_Choice_Was_Made
[case]
value=a
[if]
[variable]
name=A_Choice_Was_Made
not_equals=b
[/variable]
[then]
{JOURNEY_19A_OLD}
{JOURNEY 909 183}
{JOURNEY 920 192}
@ -557,9 +559,8 @@
{JOURNEY 1079 333}
{JOURNEY 1095 336}
{NEW_BATTLE 1110 338}
[/case]
[case]
value=b
[/then]
[else]
{JOURNEY_19B_OLD}
{JOURNEY 836 341}
{JOURNEY 851 344}
@ -580,15 +581,17 @@
{JOURNEY 1080 346}
{JOURNEY 1095 342}
{NEW_BATTLE 1110 338}
[/case]
[/switch]
[/else]
[/if]
#enddef
#define JOURNEY_20A_OLD
[switch]
variable=A_Choice_Was_Made
[case]
value=a
[if]
[variable]
name=A_Choice_Was_Made
not_equals=b
[/variable]
[then]
{JOURNEY_19A_OLD}
{OLD_JOURNEY 909 183}
{OLD_JOURNEY 920 192}
@ -608,9 +611,8 @@
{OLD_JOURNEY 1079 333}
{OLD_JOURNEY 1095 336}
{OLD_BATTLE 1110 338}
[/case]
[case]
value=b
[/then]
[else]
{JOURNEY_19B_OLD}
{OLD_JOURNEY 836 341}
{OLD_JOURNEY 851 344}
@ -631,8 +633,8 @@
{OLD_JOURNEY 1080 346}
{OLD_JOURNEY 1095 342}
{OLD_BATTLE 1110 338}
[/case]
[/switch]
[/else]
[/if]
#enddef
#define JOURNEY_20B_NEW