# HG changeset patch # User belphegorr # Date 1343150130 -10800 # Node ID 2520705b857f7833974ad69f331e941c91c6e11e # Parent 1a6a6db3fa963097b071db02b0645d6bb0ae8432 Switched Fell From Heaven to Fell From Grace on missions 5, 6. Changed start dialogue of the princess in Mission 6. diff -r 1a6a6db3fa96 -r 2520705b857f share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua Tue Jul 24 18:36:23 2012 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/backstab.lua Tue Jul 24 20:15:30 2012 +0300 @@ -14,7 +14,7 @@ waterNum = 3 buffaloNum = 4 chiefNum = 5 -princessNum = 6 +girlNum = 6 wiseNum = 7 spyKillStage = 1 @@ -24,7 +24,7 @@ tmpVar = 0 nativeNames = {loc("Leaks A Lot"), loc("Dense Cloud"), loc("Fiery Water"), - loc("Raging Buffalo"), loc("Righteous Beard"), loc("Fell From Heaven"), + loc("Raging Buffalo"), loc("Righteous Beard"), loc("Fell From Grace"), loc("Wise Oak"), loc("Eagle Eye"), loc("Flaming Worm")} nativeHats = {"Rambo", "RobinHood", "pirate_jack", "zoo_Bunny", "IndianChief", @@ -166,7 +166,7 @@ if nativeRevived[leaksNum] == true and nativeRevived[denseNum] == true then AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("But why would they help us?"), SAY_SAY, 4000}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("It must be the aliens!"), SAY_SAY, 3500}}) - AnimInsertStepNext({func = AnimSay, args = {natives[princessNum], loc("You just appeared out of thin air!"), SAY_SAY, 5000}}) + AnimInsertStepNext({func = AnimSay, args = {natives[girlNum], loc("You just appeared out of thin air!"), SAY_SAY, 5000}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("But...we died!"), SAY_SAY, 2500}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("This must be the caves!"), SAY_SAY, 3500}}) AnimInsertStepNext({func = AnimSay, args = {natives[denseNum], loc("Dude, where are we?"), SAY_SAY, 3000}}) @@ -182,7 +182,7 @@ AnimInsertStepNext({func = AnimWait, args = {natives[leaksNum], 800}}) AnimInsertStepNext({func = AnimTurn, args = {natives[leaksNum], "Left"}}) AnimInsertStepNext({func = AnimTurn, args = {natives[denseNum], "Right"}}) - AnimInsertStepNext({func = AnimCustomFunction, swh = false, args = {natives[leaksNum], CondNeedToTurn, {natives[leaksNum], natives[princessNum]}}}) + AnimInsertStepNext({func = AnimCustomFunction, swh = false, args = {natives[leaksNum], CondNeedToTurn, {natives[leaksNum], natives[girlNum]}}}) if nativeDead[chiefNum] ~= true then AnimInsertStepNext({func = AnimTurn, args = {natives[chiefNum], "Right"}}) end @@ -235,7 +235,8 @@ AnimInsertStepNext({func = AnimVisualGear, args = {GetGearPosition(natives[denseNum]), vgtExplosion, 0, true}}) AnimInsertStepNext({func = AnimSay, args = {natives[wiseNum], loc("Here, let me help you!"), SAY_SAY, 3000}}) if nativeDead[chiefNum] == true then - AnimInsertStepNext({func = AnimSay, args = {natives[princessNum], loc("You killed my father, you monster!"), SAY_SAY, 5000}}) + AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("I forgot that she's the daughter of the chief, too..."), SAY_THINK, 7000}}) + AnimInsertStepNext({func = AnimSay, args = {natives[girlNum], loc("You killed my father, you monster!"), SAY_SAY, 5000}}) end AnimInsertStepNext({func = AnimSay, args = {natives[denseNum], loc("Look, I had no choice!"), SAY_SAY, 3000}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("You have been giving us out to the enemy, haven't you!"), SAY_SAY, 7000}}) @@ -250,9 +251,9 @@ AnimInsertStepNext({func = AnimSay, args = {natives[wiseNum], loc("What shall we do with the traitor?"), SAY_SAY, 5000}}) AnimInsertStepNext({func = SetHealth, swh = false, args = {natives[waterNum], 26}}) AnimInsertStepNext({func = AnimVisualGear, args = {nativePos[denseNum][1] + 50, nativePos[denseNum][2], vgtExplosion, 0, true}}) - AnimInsertStepNext({func = AnimSay, args = {natives[princessNum], loc("I can't believe what I'm hearing!"), SAY_SAY, 5500}}) + AnimInsertStepNext({func = AnimSay, args = {natives[girlNum], loc("I can't believe what I'm hearing!"), SAY_SAY, 5500}}) AnimInsertStepNext({func = AnimSay, args = {natives[waterNum], loc("You know what? I don't even regret anything!"), SAY_SAY, 7000}}) - AnimInsertStepNext({func = AnimSay, args = {natives[princessNum], loc("In fact, you are the only one that's been acting strangely."), SAY_SAY, 8000}}) + AnimInsertStepNext({func = AnimSay, args = {natives[girlNum], loc("In fact, you are the only one that's been acting strangely."), SAY_SAY, 8000}}) AnimInsertStepNext({func = AnimSay, args = {natives[waterNum], loc("Are you accusing me of something?"), SAY_SAY, 3500}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("Seems like every time you take a \"walk\", the enemy find us!"), SAY_SAY, 8000}}) AnimInsertStepNext({func = AnimSay, args = {natives[waterNum], loc("You know...taking a stroll."), SAY_SAY, 3500}}) @@ -271,7 +272,7 @@ AnimInsertStepNext({func = AnimJump, args = {natives[waterNum], "long"}}) AnimInsertStepNext({func = AnimTurn, args = {natives[waterNum], "Left"}}) AnimInsertStepNext({func = AnimSay, args = {natives[wiseNum], loc("There must be a spy among us!"), SAY_SAY, 4000}}) - AnimInsertStepNext({func = AnimSay, args = {natives[princessNum], loc("We made sure noone followed us!"), SAY_SAY, 4000}}) + AnimInsertStepNext({func = AnimSay, args = {natives[girlNum], loc("We made sure noone followed us!"), SAY_SAY, 4000}}) AnimInsertStepNext({func = AnimSay, args = {natives[leaksNum], loc("What? Here? How did they find us?!"), SAY_SAY, 5000}}) end @@ -456,8 +457,8 @@ if choice == choiceEliminate then table.insert(afterChoiceAnim, {func = AnimWait, args = {speakerHog, 1500}}) table.insert(afterChoiceAnim, {func = AnimSay, args = {speakerHog, loc("He won't be selling us out anymore!"), SAY_SAY, 6000}}) - if nativeDead[princessNum] ~= true and m4ChiefDead == 1 then - table.insert(afterChoiceAnim, {func = AnimSay, args = {natives[princessNum], loc("That's for my father!"), SAY_SAY, 3500}}) + if nativeDead[girlNum] ~= true and m4ChiefDead == 1 then + table.insert(afterChoiceAnim, {func = AnimSay, args = {natives[girlNum], loc("That's for my father!"), SAY_SAY, 3500}}) end table.insert(afterChoiceAnim, {func = AnimSay, args = {speakerHog, loc("Let's show those cannibals what we're made of!"), SAY_SAY, 7000}}) else @@ -718,10 +719,10 @@ else SaveCampaignVar("M5BuffaloDead", "0") end - if nativeDead[princessNum] == true then - SaveCampaignVar("M5PrincessDead", "1") + if nativeDead[girlNum] == true then + SaveCampaignVar("M5GirlDead", "1") else - SaveCampaignVar("M5PrincessDead", "0") + SaveCampaignVar("M5GirlDead", "0") end if nativeDead[wiseNum] == true then SaveCampaignVar("M5WiseDead", "1") @@ -839,8 +840,8 @@ end if m4ChiefDead == 1 then DeleteGear(natives[chiefNum]) - SetGearPosition(natives[princessNum], unpack(nativePos[buffaloNum])) - nativePos[princessNum] = nativePos[buffaloNum] + SetGearPosition(natives[girlNum], unpack(nativePos[buffaloNum])) + nativePos[girlNum] = nativePos[buffaloNum] end if m4BuffaloDead == 1 then DeleteGear(natives[buffaloNum]) @@ -859,7 +860,7 @@ end function SetupAmmo() - AddAmmo(natives[princessNum], amSwitch, 0) + AddAmmo(natives[girlNum], amSwitch, 0) end function AddHogs() diff -r 1a6a6db3fa96 -r 2520705b857f share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua --- a/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua Tue Jul 24 18:36:23 2012 +0300 +++ b/share/hedgewars/Data/Missions/Campaign/A Classic Fairytale/dragon.lua Tue Jul 24 20:15:30 2012 +0300 @@ -116,7 +116,7 @@ waterNum = 3 buffaloNum = 4 chiefNum = 5 -princessNum = 6 +girlNum = 6 wiseNum = 7 nativeNames = {loc("Leaks A Lot"), loc("Dense Cloud"), loc("Fiery Water"), @@ -221,11 +221,11 @@ table.insert(startAnim, {func = AnimSay, args = {native, loc("Where did that alien run?"), SAY_THINK, 0}}) table.insert(startAnim, {func = AnimMove, args = {native, "Right", nativePos[1] + 200, 0}}) table.insert(startAnim, {func = AnimSay, args = {native, loc("When I find it..."), SAY_THINK, 3000}}) - elseif m == princessNum then + elseif m == girlNum then table.insert(startAnim, {func = AnimMove, args = {native, "Right", nativePos[1] + 50, 0}}) - table.insert(startAnim, {func = AnimSay, args = {native, loc("A woman shouldn't do this kind of thing!"), SAY_THINK, 0}}) + table.insert(startAnim, {func = AnimSay, args = {native, loc("This is typical!"), SAY_THINK, 0}}) table.insert(startAnim, {func = AnimMove, args = {native, "Right", nativePos[1] + 200, 0}}) - table.insert(startAnim, {func = AnimSay, args = {native, loc("I could be eating snails right now."), SAY_THINK, 5500}}) + table.insert(startAnim, {func = AnimSay, args = {native, loc("It's always up to women to clear up the mess men created!"), SAY_THINK, 8500}}) elseif m == chiefNum then table.insert(startAnim, {func = AnimMove, args = {native, "Right", nativePos[1] + 50, 0}}) table.insert(startAnim, {func = AnimSay, args = {native, loc("What is this place?"), SAY_THINK, 0}}) @@ -476,7 +476,7 @@ m4ChiefDead = tonumber(GetCampaignVar("M4ChiefDead")) m5ChiefDead = tonumber(GetCampaignVar("M5ChiefDead")) m5WiseDead = tonumber(GetCampaignVar("M5WiseDead")) - m5PrincessDead = tonumber(GetCampaignVar("M5PrincessDead")) + m5GirlDead = tonumber(GetCampaignVar("M5GirlDead")) m2Choice = tonumber(GetCampaignVar("M2Choice")) m5Choice = tonumber(GetCampaignVar("M5Choice")) m5DeployedNum = tonumber(GetCampaignVar("M5DeployedNum"))