# HG changeset patch # User Wuzzy # Date 1557782033 -7200 # Node ID ff4003a90ff893c901851f8d0d541d687880d954 # Parent ba5fd934f49be674ade8e50ea08e5aa3c8b07b4c Enable automatic voicepack language selection for all missions diff -r ba5fd934f49b -r ff4003a90ff8 ChangeLog.txt --- a/ChangeLog.txt Mon May 13 22:51:31 2019 +0200 +++ b/ChangeLog.txt Mon May 13 23:13:53 2019 +0200 @@ -126,6 +126,7 @@ + New call: SetTeamPassive(teamname, isPassive): Mark a team as passive. Passive teams do not play and are treated like frozen teams. + New return value: AddTeam/AddMissionTeam return , + SetClanColor: Now accepts negative color argument for user clan color, like in AddTeam + + AddTeam: Append “_qau” to voicepack name to enable automatic selection of voicepack language + Utils library: New calls: getReadableChallengeRecord, updateChallengeRecord, integerSqrt, integerHypotenuse + New callback: onGameResult(winningClan): Called when the game ends normally. winningClan = index of winning clan or -1 on draw + New callback: onCaseDrop(gear): Called at the point where a crate MIGHT be dropped between turns. Gear is the crate gear or nil diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Mon May 13 23:13:53 2019 +0200 @@ -1008,7 +1008,7 @@ end function AddHogs() - tribeTeamName = AddTeam(loc("Tribe"), -2, "Bone", "Island", "HillBilly", "cm_birdy") + tribeTeamName = AddTeam(loc("Tribe"), -2, "Bone", "Island", "HillBilly_qau", "cm_birdy") SetTeamPassive(tribeTeamName, true) for i = 8, 9 do natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i]) @@ -1020,17 +1020,17 @@ end nativesNum = 7 - cannibalsTeamName1 = AddTeam(loc("Assault Team"), -1, "skull", "Island", "Pirate", "cm_vampire") + cannibalsTeamName1 = AddTeam(loc("Assault Team"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 1, 6 do cannibals[i] = AddHog(cannibalNames[i], 3, 50, "vampirichog") end - cannibalsTeamName2 = AddTeam(loc("Reinforcements"), -1, "skull", "Island", "Pirate", "cm_vampire") + cannibalsTeamName2 = AddTeam(loc("Reinforcements"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 7, 9 do cannibals[i] = AddHog(cannibalNames[i], 2, 50, "vampirichog") end - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") for i = 1, 9 do diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Mon May 13 23:13:53 2019 +0200 @@ -633,11 +633,11 @@ gearDead[natives[i]] = false end - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") gearDead[cyborg] = false - fighterTeamName = AddTeam(loc("011101000"), -9, "ring", "UFO", "Robot", "cm_binary") + fighterTeamName = AddTeam(loc("011101000"), -9, "ring", "UFO", "Robot_qau", "cm_binary") for i = 1, 4 do cyborgs[i] = AddHog(cyborgNames[i], 2, 100, "cyborg2") gearDead[cyborgs[i]] = false diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Mon May 13 23:13:53 2019 +0200 @@ -529,7 +529,7 @@ end function AddHogs() - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") nativesTeamName = AddMissionTeam(-2) @@ -550,7 +550,7 @@ table.insert(players, natives[i]) end - cannibalsTeamName = AddTeam(loc("Cannibals"), -2, "skull", "Island", "Pirate", "cm_vampire") + cannibalsTeamName = AddTeam(loc("Cannibals"), -2, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 1, cannibalsNum do cannibals[i] = AddHog(cannibalNames[i], 0, 100, "Zombi") table.insert(players, cannibals[i]) @@ -558,13 +558,13 @@ playersNum = #players playersLeft = playersNum - hedgecogsTeamName = AddTeam(loc("Hedge-cogs"), -9, "ring", "UFO", "Robot", "cm_cyborg") + hedgecogsTeamName = AddTeam(loc("Hedge-cogs"), -9, "ring", "UFO", "Robot_qau", "cm_cyborg") for i = 1, cyborgsNum do cyborgs[i] = AddHog(cyborgNames[i], 2, 80, "cyborg2") end if m8EnemyFled == 1 then - leaderTeamName = AddTeam(loc("Leader"), -9, "ring", "UFO", "Robot", "cm_cyborg") + leaderTeamName = AddTeam(loc("Leader"), -9, "ring", "UFO", "Robot_qau", "cm_cyborg") if m8Scene == denseScene then leader = AddHog(loc("Dense Cloud"), 2, 200, nativeHats[denseNum]) elseif m8Scene == waterScene then diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Mon May 13 23:13:53 2019 +0200 @@ -324,7 +324,7 @@ natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i]) end - AddTeam(loc("Cannibals"), -2, "skull", "Island", "Pirate", "cm_vampire") + AddTeam(loc("Cannibals"), -2, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 1, 5 do cannibals[i] = AddHog(cannibalNames[i], 0, 100, cannibalHats[i]) end diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Mon May 13 23:13:53 2019 +0200 @@ -524,7 +524,7 @@ end function AddHogs() - princessTeamName = AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly", "cm_female") + princessTeamName = AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly_qau", "cm_female") SetTeamPassive(princessTeamName, true) princess = AddHog(loc("Fell From Heaven"), 0, 333, "tiara") SetGearAIHints(princess, aihDoesntMatter) @@ -536,11 +536,11 @@ gearDead[natives[i-6]] = false end - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") gearDead[cyborg] = false - biomechanicTeamName = AddTeam(loc("Biomechanic Team"), -1, "ring", "UFO", "Robot", "cm_cyborg") + biomechanicTeamName = AddTeam(loc("Biomechanic Team"), -1, "ring", "UFO", "Robot_qau", "cm_cyborg") for i = 1, cyborgsNum do cyborgs[i] = AddHog(cyborgNames[i], cyborgsDif[i], cyborgsHealth[i], "cyborg2") gearDead[cyborgs[i]] = false diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Mon May 13 23:13:53 2019 +0200 @@ -758,7 +758,7 @@ AnimSetGearPosition(youngh, 1862, 1362) HogTurnLeft(youngh, false) - AddTeam(loc("Cannibals"), -1, "skull", "Island", "Pirate","cm_vampire") + AddTeam(loc("Cannibals"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") cannibal = AddHog(loc("Brainiac"), 0, 5, "Zombi") AnimSetGearPosition(cannibal, 525, 1256) HogTurnLeft(cannibal, false) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Mon May 13 23:13:53 2019 +0200 @@ -1090,11 +1090,11 @@ leaks = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo") dense = AddHog(loc("Dense Cloud"), 0, 100, "RobinHood") - princessTeamName = AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly", "cm_female") + princessTeamName = AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly_qau", "cm_female") SetTeamPassive(princessTeamName, true) princess = AddHog(loc("Fell From Heaven"), 0, 200, "tiara") - cannibalsTeamName = AddTeam(loc("Cannibal Sentry"), -1, "skull", "Island", "Pirate","cm_vampire") + cannibalsTeamName = AddTeam(loc("Cannibal Sentry"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") cannibals = {} for i = 1, 4 do cannibals[i] = AddHog(cannibalNames[i], 3, 40, "Zombi") @@ -1108,7 +1108,7 @@ SetEffect(cannibals[i], heArtillery, 1) end - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Y3K1337"), 0, 200, "cyborg1") AnimSetGearPosition(dense, 0, 0) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Mon May 13 23:13:53 2019 +0200 @@ -720,21 +720,21 @@ origNatives[4] = natives[4] nativesLeft = nativesNum - beepTeamName = AddTeam(loc("Beep Loopers"), -1, "ring", "UFO", "Robot", "cm_cyborg") + beepTeamName = AddTeam(loc("Beep Loopers"), -1, "ring", "UFO", "Robot_qau", "cm_cyborg") for i = 1, cyborgsTeamNum[1] do cyborgs[i] = AddHog(cyborgNames[i], cyborgsDif[i], cyborgsHealth[i], "cyborg2") end - corpTeamName = AddTeam(loc("Corporationals"), -1, "ring", "UFO", "Robot", "cm_cyborg") + corpTeamName = AddTeam(loc("Corporationals"), -1, "ring", "UFO", "Robot_qau", "cm_cyborg") for i = cyborgsTeamNum[1] + 1, cyborgsNum do cyborgs[i] = AddHog(cyborgNames[i], cyborgsDif[i], cyborgsHealth[i], "cyborg2") end cyborgsLeft = cyborgsTeamNum[1] + cyborgsTeamNum[2] - leaderbotTeamName = AddTeam(loc("Leaderbot"), -1, "ring", "UFO", "Robot", "cm_cyborg") + leaderbotTeamName = AddTeam(loc("Leaderbot"), -1, "ring", "UFO", "Robot_qau", "cm_cyborg") enemy = AddHog(loc("Name"), 2, 200, "cyborg1") - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") SetGearPosition(cyborg, unpack(cyborgHidePos)) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Mon May 13 23:13:53 2019 +0200 @@ -612,7 +612,7 @@ dense = AddHog(loc("Dense Cloud"), 0, 100, "RobinHood") spiky = AddHog(loc("Spiky Cheese"), 0, 100, "hair_yellow") - weaklingsTeamName = AddTeam(loc("Weaklings"), -1, "skull", "Island", "Pirate","cm_vampire") + weaklingsTeamName = AddTeam(loc("Weaklings"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") cannibals = {} cannibals[1] = AddHog(loc("Brainiac"), 5, 20, "Zombi") @@ -621,14 +621,14 @@ hogNr[cannibals[i]] = i - 2 end - AddTeam(loc("Stronglings"), -1, "skull", "Island", "Pirate","cm_vampire") + AddTeam(loc("Stronglings"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 6, 9 do cannibals[i] = AddHog(HogNames[i], 4, 30, "vampirichog") hogNr[cannibals[i]] = i - 2 end - AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Y3K1337"), 0, 200, "cyborg1") end diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Mon May 13 23:13:53 2019 +0200 @@ -336,17 +336,17 @@ natives = {leaks, dense, water, buffalo, chief} nativesNum = 5 - AddTeam(loc("Light Cannfantry"), -1, "skull", "Island", "Pirate", "cm_vampire") + AddTeam(loc("Light Cannfantry"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 1, 4 do cannibals[i] = AddHog(HogNames[i], 2, 40, "Zombi") end - AddTeam(loc("Heavy Cannfantry"), -1, "skull", "Island", "Pirate", "cm_vampire") + AddTeam(loc("Heavy Cannfantry"), -1, "skull", "Island", "Pirate_qau", "cm_vampire") for i = 5, 8 do cannibals[i] = AddHog(HogNames[i], 2, 55, "vampirichog") end - cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary") + cyborgTeamName = AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot_qau", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") AnimSetGearPosition(leaks, unpack(leaksPos)) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Mon May 13 23:13:53 2019 +0200 @@ -130,14 +130,14 @@ AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- PAotH - teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") + teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default_qau", "cm_galaxy") SetTeamPassive(teamA.name, true) director.gear = AddHog(director.name, 0, 100, "hair_yellow") AnimSetGearPosition(director.gear, director.x, director.y) doctor.gear = AddHog(doctor.name, 0, 100, "Glasses") AnimSetGearPosition(doctor.gear, doctor.x, doctor.y) -- Guards - teamB.name = AddTeam(teamB.name, teamB.color, "Statue", "Island", "Default", "cm_swordshield2") + teamB.name = AddTeam(teamB.name, teamB.color, "Statue", "Island", "Default_qau", "cm_swordshield2") guard1.gear = AddHog(guard1.name, 1, 100, "policecap") AnimSetGearPosition(guard1.gear, guard1.x, guard1.y) guard2.gear = AddHog(guard2.name, 1, 100, "policecap") diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Mon May 13 23:13:53 2019 +0200 @@ -113,7 +113,7 @@ AnimSetGearPosition(hero.gear, hero.x, hero.y) -- PAotH (passive team) - teamB.name = AddTeam(teamB.name, teamB.color, "Earth", "Island", "Default", "cm_galaxy") + teamB.name = AddTeam(teamB.name, teamB.color, "Earth", "Island", "Default_qau", "cm_galaxy") SetTeamPassive(teamB.name, true) paoth1.gear = AddHog(paoth1.name, 0, 100, "hair_yellow") AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y) @@ -125,7 +125,7 @@ SetGearAIHints(paoth2.gear, aihDoesntMatter) -- Professor's Team (computer enemy) - teamC.name = AddTeam(teamC.name, teamC.color, "eyecross", "Island", "Default", "cm_sine") + teamC.name = AddTeam(teamC.name, teamC.color, "eyecross", "Island", "Default_qau", "cm_sine") professor.bot = AddHog(professor.name, 1, 300, "tophats") AnimSetGearPosition(professor.bot, paoth1.x - 100, paoth1.y) HogTurnLeft(professor.bot, true) @@ -137,7 +137,7 @@ end -- Professor (special team for cut sequence only) - teamD.name = AddTeam(teamD.name, teamD.color, "star", "Island", "Default", "cm_sine") + teamD.name = AddTeam(teamD.name, teamD.color, "star", "Island", "Default_qau", "cm_sine") professor.human = AddHog(professor.name, 0, 300, "tophats") -- hog will be removed and replaced by professor.bot after cut sequence AnimSetGearPosition(professor.human, hero.x + 70, hero.y) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Mon May 13 23:13:53 2019 +0200 @@ -77,7 +77,7 @@ SetGearPosition(hero.gear, hero.x, hero.y) -- enemies shuffleHogs(enemies) - teamB.name = AddTeam(teamB.name, teamB.color, "skull", "Island", "Default", "cm_skull") + teamB.name = AddTeam(teamB.name, teamB.color, "skull", "Island", "Default_qau", "cm_skull") for i=1,table.getn(enemies) do enemies[i].gear = AddHog(enemies[i].name, 1, 100, "war_desertgrenadier1") SetGearPosition(enemies[i].gear, enemies[i].x, enemies[i].y) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Mon May 13 23:13:53 2019 +0200 @@ -110,12 +110,12 @@ AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- PAotH undercover scientist and chief Sandologist - teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") + teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default_qau", "cm_galaxy") SetTeamPassive(teamA.name, true) ally.gear = AddHog(ally.name, 0, 100, "Cowboy") AnimSetGearPosition(ally.gear, ally.x, ally.y) -- Smugglers - teamB.name = AddTeam(teamB.name, teamB.color, "chest", "Island", "Default", "cm_bloodyblade") + teamB.name = AddTeam(teamB.name, teamB.color, "chest", "Island", "Default_qau", "cm_bloodyblade") SetTeamPassive(teamB.name, true) smuggler1.gear = AddHog(smuggler1.name, 1, 100, "hair_orange") AnimSetGearPosition(smuggler1.gear, smuggler1.x, smuggler1.y) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Mon May 13 23:13:53 2019 +0200 @@ -126,11 +126,11 @@ AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- Captain Lime - teamD.name = AddTeam(teamD.name, teamD.color, "Cherry", "Island", "Default", "congo-brazzaville") + teamD.name = AddTeam(teamD.name, teamD.color, "Cherry", "Island", "Default_qau", "congo-brazzaville") green1.gear = AddHog(green1.name, 0, 200, "war_desertofficer") AnimSetGearPosition(green1.gear, green1.x, green1.y) -- Green Bananas - teamB.name = AddTeam(teamB.name, teamB.color, "Cherry", "Island", "Default", "congo-brazzaville") + teamB.name = AddTeam(teamB.name, teamB.color, "Cherry", "Island", "Default_qau", "congo-brazzaville") green2.gear = AddHog(green2.name, 0, 100, "war_britmedic") AnimSetGearPosition(green2.gear, green2.x, green2.y) HogTurnLeft(green2.gear, true) @@ -144,7 +144,7 @@ AnimSetGearPosition(green5.gear, green5.x, green5.y) HogTurnLeft(green5.gear, true) -- Yellow Watermelons - teamC.name = AddTeam(teamC.name, teamC.color, "Flower", "Island", "Default", "cm_mog") + teamC.name = AddTeam(teamC.name, teamC.color, "Flower", "Island", "Default_qau", "cm_mog") yellow1.gear = AddHog(yellow1.name, 1, 100, "war_desertgrenadier2") AnimSetGearPosition(yellow1.gear, yellow1.x, yellow1.y) -- the rest of the Yellow Watermelons diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Mon May 13 23:13:53 2019 +0200 @@ -95,7 +95,7 @@ -- Fruit Assassins local assasinsHats = { "NinjaFull", "NinjaStraight", "NinjaTriangle" } - teamC.name = AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default", "cm_scout") + teamC.name = AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default_qau", "cm_scout") for i=1,table.getn(redHedgehogs) do redHedgehogs[i].gear = AddHog(redHedgehogs[i].name, 1, 100, assasinsHats[GetRandom(3)+1]) SetGearPosition(redHedgehogs[i].gear, 2010 + 50*i, 630) @@ -132,7 +132,7 @@ -- Captain Lime -- Spawn with his "true" evil color so a new clan is created for Captain Lime ... - teamB.name = AddTeam(teamB.name, teamB.colorEvil, "Cherry", "Island", "Default", "congo-brazzaville") + teamB.name = AddTeam(teamB.name, teamB.colorEvil, "Cherry", "Island", "Default_qau", "congo-brazzaville") SetTeamPassive(teamB.name, true) green1.gear = AddHog(green1.name, 0, 100, green1.hat) -- ... however, we immediately change the color to "nice mode". diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Mon May 13 23:13:53 2019 +0200 @@ -96,12 +96,12 @@ -- enemies local hats = { "Bandit", "fr_apple", "fr_banana", "fr_lemon", "fr_orange", "fr_pumpkin", "Gasmask", "NinjaFull", "NinjaStraight", "NinjaTriangle" } - teamC.name = AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default", "cm_bars") + teamC.name = AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default_qau", "cm_bars") for i=1,table.getn(enemiesEven) do enemiesEven[i].gear = AddHog(enemiesEven[i].name, 1, 100, hats[GetRandom(table.getn(hats))+1]) AnimSetGearPosition(enemiesEven[i].gear, enemiesEven[i].x, enemiesEven[i].y) end - teamB.name = AddTeam(teamB.name, teamB.color, "bp2", "Island", "Default", "cm_bars") + teamB.name = AddTeam(teamB.name, teamB.color, "bp2", "Island", "Default_qau", "cm_bars") for i=1,table.getn(enemiesOdd) do enemiesOdd[i].gear = AddHog(enemiesOdd[i].name, 1, 100, hats[GetRandom(table.getn(hats))+1]) AnimSetGearPosition(enemiesOdd[i].gear, enemiesOdd[i].x, enemiesOdd[i].y) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Mon May 13 23:13:53 2019 +0200 @@ -117,12 +117,12 @@ AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- Ally - teamA.name = AddTeam(teamA.name, teamA.color, "heart", "Island", "Default", "cm_face") + teamA.name = AddTeam(teamA.name, teamA.color, "heart", "Island", "Default_qau", "cm_face") SetTeamPassive(teamA.name, true) ally.gear = AddHog(ally.name, 0, 100, "war_airwarden02") AnimSetGearPosition(ally.gear, ally.x, ally.y) -- Frozen Bandits - teamB.name = AddTeam(teamB.name, teamB.color, "plant2", "Island", "Default", "cm_pirate") + teamB.name = AddTeam(teamB.name, teamB.color, "plant2", "Island", "Default_qau", "cm_pirate") bandit1.gear = AddHog(bandit1.name, 1, 120, "Santa") AnimSetGearPosition(bandit1.gear, bandit1.x, bandit1.y) HogTurnLeft(bandit1.gear, true) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Mon May 13 23:13:53 2019 +0200 @@ -88,7 +88,7 @@ hero.name = GetHogName(hero.gear) AnimSetGearPosition(hero.gear, hero.x, hero.y) -- Ally - teamB.name = AddTeam(teamB.name, teamB.color, "heart", "Island", "Default", "cm_face") + teamB.name = AddTeam(teamB.name, teamB.color, "heart", "Island", "Default_qau", "cm_face") SetTeamPassive(teamB.name, true) ally.gear = AddHog(ally.name, 0, 100, "war_airwarden02") AnimSetGearPosition(ally.gear, ally.x, ally.y) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Mon May 13 23:13:53 2019 +0200 @@ -121,7 +121,7 @@ hero.name = GetHogName(hero.gear) AnimSetGearPosition(hero.gear, hero.x, hero.y) -- PAotH - teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") + teamA.name = AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default_qau", "cm_galaxy") SetTeamPassive(teamA.name, true) paoth1.gear = AddHog(paoth1.name, 0, 100, "scif_2001O") AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y) @@ -136,13 +136,13 @@ AnimSetGearPosition(paoth4.gear, paoth4.x, paoth4.y) HogTurnLeft(paoth4.gear, true) -- Professor - teamC.name = AddTeam(teamC.name, teamC.color, "star", "Island", "Default", "cm_sine") + teamC.name = AddTeam(teamC.name, teamC.color, "star", "Island", "Default_qau", "cm_sine") SetTeamPassive(teamC.name, true) professor.gear = AddHog(professor.name, 0, professor.health, "tophats") AnimSetGearPosition(professor.gear, professor.x, professor.y) HogTurnLeft(professor.gear, true) -- Minions - teamB.name = AddTeam(teamB.name, teamB.color, "eyecross", "Island", "Default", "cm_sine") + teamB.name = AddTeam(teamB.name, teamB.color, "eyecross", "Island", "Default_qau", "cm_sine") minion1.gear = AddHog(minion1.name, 1, 50, "Gasmask") AnimSetGearPosition(minion1.gear, minion1.x, minion1.y) HogTurnLeft(minion1.gear, true) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Mon May 13 23:13:53 2019 +0200 @@ -80,7 +80,7 @@ hero.name = GetHogName(hero.gear) AnimSetGearPosition(hero.gear, hero.x, hero.y) -- Crazy Runner - teamB.name = AddTeam(teamB.name, teamB.color, "ring", "Island", "Default", "cm_sonic") + teamB.name = AddTeam(teamB.name, teamB.color, "ring", "Island", "Default_qau", "cm_sonic") runner.gear = AddHog(runner.name, 0, 100, "sth_Sonic") AnimSetGearPosition(runner.gear, runner.places[1].x, runner.places[1].y) HogTurnLeft(runner.gear, true) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua --- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Mon May 13 23:13:53 2019 +0200 @@ -54,7 +54,7 @@ HealthDecrease = 0 WaterRise = 0 - haplessTeamName = AddTeam(loc("Hapless Hogs"), -1, "Simple", "Island", "Default") + haplessTeamName = AddTeam(loc("Hapless Hogs"), -1, "Simple", "Island", "Default_qau") hh[0] = AddHog(loc("Sinky"), 1, 100, "fr_lemon") hh[1] = AddHog(loc("Drowner"), 1, 100, "fr_orange") hh[2] = AddHog(loc("Heavy"), 1, 100, "dish_Teapot") diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Mon May 13 23:13:53 2019 +0200 @@ -27,7 +27,7 @@ AddMissionTeam(-1) player = AddMissionHog(10) - AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "cm_cyborg") + AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot_qau", "cm_cyborg") enemy = AddHog(loc("Unit 835"), 1, 10, "cyborg1") SetGearPosition(player,142,656) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Mon May 13 23:13:53 2019 +0200 @@ -35,7 +35,7 @@ player = AddMissionHog(1) instructor = AddHog(loc("Instructor"), 0, 100, "sf_vega") - enemyTeamName = AddTeam(loc("Blue Team"), -2, "bubble", "Island", "Default", "somalia") + enemyTeamName = AddTeam(loc("Blue Team"), -2, "bubble", "Island", "Default_qau", "somalia") enemy = AddHog(loc("Filthy Blue"), 1, 100, "Skull") SetGearPosition(player,146,902) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Mon May 13 23:13:53 2019 +0200 @@ -29,7 +29,7 @@ AddMissionTeam(-1) player = AddMissionHog(1) - AddTeam(loc("Toxic Team"), -6, "skull", "Island", "Default", "cm_magicskull") + AddTeam(loc("Toxic Team"), -6, "skull", "Island", "Default_qau", "cm_magicskull") enemy = AddHog(loc("Poison"), 1, 100, "Skull") SetGearPosition(player,430,516) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Mon May 13 23:13:53 2019 +0200 @@ -23,7 +23,7 @@ clanID = 5, flag = "cm_cyborg", grave = "ring", - voice = "Robot", + voice = "Robot_qau", hogs = { {name=loc("Unit 881"), x=561, y=1365, health=100, hat="cyborg1", botLevel=1, ammo = { diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Mon May 13 23:13:53 2019 +0200 @@ -41,7 +41,7 @@ { name = loc("Clowns"), flag = "cm_face", grave = "Duck2", - voice = "Mobster", + voice = "Mobster_qau", clanID = 5, hogs = { { name = loc("Poison"), health = 100, x = 1133, y = 446, hat = "WhySoSerious", botLevel = 1, ammo = enemyAmmo }, diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Mon May 13 23:13:53 2019 +0200 @@ -31,7 +31,7 @@ AddMissionTeam(-1) player = AddMissionHog(1) - AddTeam(loc("Toxic Team"), -6, "skull", "Island", "Default", "cm_magicskull") + AddTeam(loc("Toxic Team"), -6, "skull", "Island", "Default_qau", "cm_magicskull") enemy = AddHog(loc("Poison"), 1, 10, "Skull") SetGearPosition(player,970,23) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Mon May 13 23:13:53 2019 +0200 @@ -28,7 +28,7 @@ player = AddMissionHog(50) p2 = AddMissionHog(20) - AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "cm_cyborg") + AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot_qau", "cm_cyborg") enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg1") SetGearPosition(player,1403,235) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua --- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Mon May 13 23:13:53 2019 +0200 @@ -30,7 +30,7 @@ player = AddMissionHog(30) hlayer = AddMissionHog(40) - AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "cm_binary") + AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot_qau", "cm_binary") enemy = AddHog(loc("WatchBot 4000"), 5, 50, "cyborg1") SetGearPosition(player, 180, 555) diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Missions/Scenario/portal.lua --- a/share/hedgewars/Data/Missions/Scenario/portal.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Missions/Scenario/portal.lua Mon May 13 23:13:53 2019 +0200 @@ -23,7 +23,7 @@ playerTeamName = AddMissionTeam(-1) player = AddMissionHog(10) - AddTeam(loc("Hell Army"), -9, "skull", "Island", "Default", "cm_hellish") + AddTeam(loc("Hell Army"), -9, "skull", "Island", "Default_qau", "cm_hellish") enemy1 = AddHog(loc("Lucifer"), 1, 200, "InfernalHorns") enemy2 = AddHog(loc("Voldemort"), 1, 150, "WizardHat") enemy3 = AddHog(loc("Zombi"), 1, 100, "Zombi") @@ -33,7 +33,7 @@ enemy7 = AddHog(loc("C-2"), 1, 50, "cyborg1") enemy8 = AddHog(loc("Rider"), 1, 50, "scif_SparkssHelmet") - AddTeam(loc("Badmad"), -9, "skull", "Island", "Default", "cm_pentagram") + AddTeam(loc("Badmad"), -9, "skull", "Island", "Default_qau", "cm_pentagram") enemy9 = AddHog(loc("C-1"), 1, 50, "cyborg2") enemy10 = AddHog(loc("Hidden"), 1, 40, "bushhider") enemy11 = AddHog(loc("Ronald"), 1, 70, "clown") diff -r ba5fd934f49b -r ff4003a90ff8 share/hedgewars/Data/Scripts/SimpleMission.lua --- a/share/hedgewars/Data/Scripts/SimpleMission.lua Mon May 13 22:51:31 2019 +0200 +++ b/share/hedgewars/Data/Scripts/SimpleMission.lua Mon May 13 23:13:53 2019 +0200 @@ -65,6 +65,7 @@ - flag flag name (default: hedgewars) - grave grave name (has default grave for each team) - fort fort name (default: Castle) + - voice voicepack (default: Default_qau) HEDGEHOG DATA: - id optional identifier for goals