Revert WML workarounds on mainline replay OOS issues (#7463)

* Revert changes in 91983c8

* Revert changes in 6551584

* Revert "Solve OOS by moving code to synced event"

This reverts commit 040550f0a6.
This commit is contained in:
Luis Miguel Iglesias Sánchez 2023-03-20 17:20:58 +01:00 committed by GitHub
parent 8065f63b69
commit 9c706ae656
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 31 deletions

View file

@ -342,6 +342,15 @@
[event]
name=enemies defeated
[endlevel]
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
[event]
name=victory
[message]
speaker=Tallin
message= _ "<i>Yes</i>! We did it! We are free!"
@ -384,11 +393,6 @@
[/move_unit_fake]
[redraw][/redraw]
[endlevel]
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
# Death events

View file

@ -716,22 +716,6 @@
boolean_equals=yes
[/variable]
[then]
[if]
[variable]
name=have_bodyguard
boolean_not_equals=yes
[/variable]
[then]
[message]
speaker=Ethiliel
message= _ "Come, my bodyguards! We must make haste to follow this trail and find Mebrin."
[/message]
[fire_event]
name=bodyguard
[/fire_event]
[/then]
[/if]
[endlevel]
result=victory
bonus=yes
@ -767,6 +751,24 @@
[event]
name=victory
[if]
[variable]
name=have_bodyguard
boolean_not_equals=yes
[/variable]
[then]
[message]
speaker=Ethiliel
message= _ "Come, my bodyguards! We must make haste to follow this trail and find Mebrin."
[/message]
[fire_event]
name=bodyguard
[/fire_event]
[/then]
[/if]
{CLEAR_VARIABLE mebrin_found,undead_defeated,bandits_defeated,have_bodyguard}
[/event]
[/scenario]

View file

@ -4184,9 +4184,11 @@
message= _ "Good, until then well settle around that oasis and set up as good a defense as we can. Until I know whats out there, Im not taking any chances."
[/message]
[fire_event]
name=victory_event
[/fire_event]
[endlevel]
result=victory
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
# Flooding algorithm
@ -4409,7 +4411,7 @@
#victory event
[event]
name=victory_event
name=victory
# reveal map in-between starting valley and location elves move to
[remove_shroud]
@ -4671,12 +4673,6 @@
{CLEAR_VARIABLE healing_rune1,healing_rune2}
{CLEAR_VARIABLE messenger_timer,messengers_incoming}
[endlevel]
result=victory
bonus=yes
{NEW_GOLD_CARRYOVER 40}
[/endlevel]
[/event]
# set time for all underground areas to be always night/underground