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

WC2: Fix using the same variable for 2 things

Browse source 
Can't use wc2_player_count as condition after it is decreased.
This commit is contained in:
Severin Glöckner 2021-10-23 17:44:48 +02:00
parent ecdeb7f656
commit 0f67ab905b
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/campaigns/World_Conquest/lua/game_mechanics/promote_commander.lua
View file

@ -25,10 +25,14 @@ on_event("die", function(cx)
id = commander.id,
message = strings.promotion
}
elseif u.side <= wml.variables.wc2_player_count or 3 then
if wml.variables.wc2_player_count or 3 > 3 and not wml.variables.wc2_defeated_side then
-- For 4p, one player is allowed to be defeated, without all players losing the scenario.
elseif u.side <= (wml.variables.wc2_highest_player_side or wml.variables.wc2_player_count) then
-- For 4p, one player is allowed to be defeated, without all players losing the scenario.
if wml.variables.wc2_player_count > or 3 and not wml.variables.wc2_defeated_side then
wml.variables.wc2_defeated_side = u.side
-- Still need to know the original player count to detect when another player leader dies.
wml.variables.wc2_highest_player_side = wml.variables.wc2_player_count
-- Decrease player count for the next scenario.
wml.variables.wc2_player_count = wml.variables.wc2_player_count - 1
wesnoth.scenario.next = "WC_II_3p"
wesnoth.wml_actions.item {
@ -49,7 +53,8 @@ on_event("die", function(cx)
end
end)
-- clear variable from previous scenario
-- clear variables from previous scenario
on_event("start", function()
wml.variables.wc2_defeated_side = nil
end
wml.variables.wc2_highest_player_side = nil
end)