# HG changeset patch # User Wuzzy # Date 1506700843 -7200 # Node ID 0b27d8b4f8e7e18a9d4c24df86b37e5c34809805 # Parent 7510fe66bfbb5cc093f8dddb614e68d13f4737a8 Use Default voice in A Space Adventure campaign diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Sep 29 18:00:43 2017 +0200 @@ -111,17 +111,17 @@ Theme = "Nature" -- I had originally hero in PAotH team and changed it, may reconsider though -- PAotH - AddTeam(teamC.name, teamC.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) - AddTeam(teamA.name, teamA.color, "Earth", "Island", "HillBilly", "cm_galaxy") + AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") 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 - AddTeam(teamB.name, teamB.color, "Statue", "Island", "HillBilly", "cm_swordshield2") + AddTeam(teamB.name, teamB.color, "Statue", "Island", "Default", "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 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Sep 29 18:00:43 2017 +0200 @@ -104,11 +104,11 @@ Theme = "Hell" -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) -- PAotH - AddTeam(teamB.name, teamB.color, "Earth", "Island", "HillBilly", "cm_galaxy") + AddTeam(teamB.name, teamB.color, "Earth", "Island", "Default", "cm_galaxy") paoth1.gear = AddHog(paoth1.name, 0, 100, "hair_yellow") AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y) HogTurnLeft(paoth1.gear, true) @@ -116,11 +116,11 @@ AnimSetGearPosition(paoth2.gear, paoth2.x, paoth2.y) HogTurnLeft(paoth2.gear, true) -- Professor and Thugs - AddTeam(teamC.name, teamC.color, "star", "Island", "HillBilly", "cm_sine") + AddTeam(teamC.name, teamC.color, "star", "Island", "Default", "cm_sine") professor.human = AddHog(professor.name, 0, 300, "tophats") AnimSetGearPosition(professor.human, hero.x + 70, hero.y) HogTurnLeft(professor.human, true) - AddTeam(teamC.name, teamC.color, "eyecross", "Island", "HillBilly", "cm_sine") + AddTeam(teamC.name, teamC.color, "eyecross", "Island", "Default", "cm_sine") professor.bot = AddHog(professor.name, 1, 300, "tophats") AnimSetGearPosition(professor.bot, paoth1.x - 100, paoth1.y) HogTurnLeft(professor.bot, true) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Fri Sep 29 18:00:43 2017 +0200 @@ -70,12 +70,12 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) -- enemies shuffleHogs(enemies) - AddTeam(teamB.name, teamB.color, "skull", "Island", "HillBilly", "cm_skull") + AddTeam(teamB.name, teamB.color, "skull", "Island", "Default", "cm_skull") for i=1,table.getn(enemies) do enemies[i].gear = AddHog(enemies[i].name, 1, 100, "war_desertgrenadier1") AnimSetGearPosition(enemies[i].gear, enemies[i].x, enemies[i].y) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Sep 29 18:00:43 2017 +0200 @@ -102,16 +102,16 @@ local heroHealth = 100 -- Hog Solo - AddTeam(teamC.name, teamC.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, heroHealth, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- PAotH undercover scientist and chief Sandologist - AddTeam(teamA.name, teamA.color, "Earth", "Island", "HillBilly", "cm_galaxy") + AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") ally.gear = AddHog(ally.name, 0, 100, "Cowboy") AnimSetGearPosition(ally.gear, ally.x, ally.y) -- Smugglers - AddTeam(teamB.name, teamB.color, "chest", "Island", "HillBilly", "cm_bloodyblade") + AddTeam(teamB.name, teamB.color, "chest", "Island", "Default", "cm_bloodyblade") smuggler1.gear = AddHog(smuggler1.name, 1, 100, "hair_orange") AnimSetGearPosition(smuggler1.gear, smuggler1.x, smuggler1.y) smuggler2.gear = AddHog(smuggler2.name, 1, 100, "lambda") diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Fri Sep 29 18:00:43 2017 +0200 @@ -72,7 +72,7 @@ Theme = "Desert" -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Sep 29 18:00:43 2017 +0200 @@ -74,7 +74,7 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Sep 29 18:00:43 2017 +0200 @@ -49,7 +49,7 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Sep 29 18:00:43 2017 +0200 @@ -112,16 +112,16 @@ Theme = "Fruit" -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- Captain Lime - AddTeam(teamD.name, teamD.color, "Cherry", "Island", "HillBilly", "congo-brazzaville") + AddTeam(teamD.name, teamD.color, "Cherry", "Island", "Default", "congo-brazzaville") green1.gear = AddHog(green1.name, 0, 200, "war_desertofficer") AnimSetGearPosition(green1.gear, green1.x, green1.y) -- Green Bananas - AddTeam(teamB.name, teamB.color, "Cherry", "Island", "HillBilly", "congo-brazzaville") + AddTeam(teamB.name, teamB.color, "Cherry", "Island", "Default", "congo-brazzaville") green2.gear = AddHog(green2.name, 0, 100, "war_britmedic") AnimSetGearPosition(green2.gear, green2.x, green2.y) HogTurnLeft(green2.gear, true) @@ -135,7 +135,7 @@ AnimSetGearPosition(green5.gear, green5.x, green5.y) HogTurnLeft(green5.gear, true) -- Yellow Watermelons - AddTeam(teamC.name, teamC.color, "Flower", "Island", "HillBilly", "cm_mog") + AddTeam(teamC.name, teamC.color, "Flower", "Island", "Default", "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 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Sep 29 18:00:43 2017 +0200 @@ -92,7 +92,7 @@ local health = 100 -- Hog Solo and Green Bananas - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgehog") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgehog") hero.gear = AddHog(hero.name, 0, health, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) @@ -103,12 +103,12 @@ AnimSetGearPosition(green3.gear, green3.x, green3.y) HogTurnLeft(green3.gear, true) -- Captain Lime - AddTeam(teamB.name, teamB.color, "Cherry", "Island", "HillBilly", "congo-brazzaville") + AddTeam(teamB.name, teamB.color, "Cherry", "Island", "Default", "congo-brazzaville") green1.gear= AddHog(green1.name, 0, 100, "war_desertofficer") AnimSetGearPosition(green1.gear, green1.x, green1.y) -- Fruit Assassins local assasinsHats = { "NinjaFull", "NinjaStraight", "NinjaTriangle" } - AddTeam(teamC.name, teamC.color, "bp2", "Island", "HillBilly", "cm_scout") + AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default", "cm_scout") for i=1,table.getn(redHedgehogs) do redHedgehogs[i].gear = AddHog(redHedgehogs[i].name, 1, 100, assasinsHats[GetRandom(3)+1]) AnimSetGearPosition(redHedgehogs[i].gear, 2010 + 50*i, 630) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Fri Sep 29 18:00:43 2017 +0200 @@ -88,18 +88,18 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) -- enemies local hats = { "Bandit", "fr_apple", "fr_banana", "fr_lemon", "fr_orange", "fr_pumpkin", "Gasmask", "NinjaFull", "NinjaStraight", "NinjaTriangle" } - AddTeam(teamC.name, teamC.color, "bp2", "Island", "HillBilly", "cm_bars") + AddTeam(teamC.name, teamC.color, "bp2", "Island", "Default", "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 - AddTeam(teamB.name, teamB.color, "bp2", "Island", "HillBilly", "cm_bars") + AddTeam(teamB.name, teamB.color, "bp2", "Island", "Default", "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 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Sep 29 18:00:43 2017 +0200 @@ -112,16 +112,16 @@ end -- Hog Solo - AddTeam(teamC.name, teamC.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, heroHealth, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) HogTurnLeft(hero.gear, true) -- Ally - AddTeam(teamA.name, teamA.color, "heart", "Island", "HillBilly", "cm_face") + AddTeam(teamA.name, teamA.color, "heart", "Island", "Default", "cm_face") ally.gear = AddHog(ally.name, 0, 100, "war_airwarden02") AnimSetGearPosition(ally.gear, ally.x, ally.y) -- Frozen Bandits - AddTeam(teamB.name, teamB.color, "plant2", "Island", "HillBilly", "cm_pirate") + AddTeam(teamB.name, teamB.color, "plant2", "Island", "Default", "cm_pirate") bandit1.gear = AddHog(bandit1.name, 1, 120, "Santa") AnimSetGearPosition(bandit1.gear, bandit1.x, bandit1.y) HogTurnLeft(bandit1.gear, true) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Fri Sep 29 18:00:43 2017 +0200 @@ -85,11 +85,11 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) -- Ally - AddTeam(teamB.name, teamB.color, "heart", "Island", "HillBilly", "cm_face") + AddTeam(teamB.name, teamB.color, "heart", "Island", "Default", "cm_face") ally.gear = AddHog(ally.name, 0, 100, "war_airwarden02") AnimSetGearPosition(ally.gear, ally.x, ally.y) HogTurnLeft(ally.gear, true) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Sep 29 18:00:43 2017 +0200 @@ -111,7 +111,7 @@ Map = "moon01_map" Theme = "Cheese" -- Because ofc moon is made of cheese :) -- Hog Solo - AddTeam(teamD.name, teamD.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamD.name, teamD.color, "Simple", "Island", "Default", "hedgewars") if tonumber(GetCampaignVar("HeroHealth")) then hero.gear = AddHog(hero.name, 0, tonumber(GetCampaignVar("HeroHealth")), "war_desertgrenadier1") else @@ -119,7 +119,7 @@ end AnimSetGearPosition(hero.gear, hero.x, hero.y) -- PAotH - AddTeam(teamA.name, teamA.color, "Earth", "Island", "HillBilly", "cm_galaxy") + AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy") paoth1.gear = AddHog(paoth1.name, 0, 100, "scif_2001O") AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y) HogTurnLeft(paoth1.gear, true) @@ -133,12 +133,12 @@ AnimSetGearPosition(paoth4.gear, paoth4.x, paoth4.y) HogTurnLeft(paoth4.gear, true) -- Professor - AddTeam(teamC.name, teamC.color, "star", "Island", "HillBilly", "cm_sine") + AddTeam(teamC.name, teamC.color, "star", "Island", "Default", "cm_sine") professor.gear = AddHog(professor.name, 0, professor.health, "tophats") AnimSetGearPosition(professor.gear, professor.x, professor.y) HogTurnLeft(professor.gear, true) -- Minions - AddTeam(teamB.name, teamB.color, "eyecross", "Island", "HillBilly", "cm_sine") + AddTeam(teamB.name, teamB.color, "eyecross", "Island", "Default", "cm_sine") minion1.gear = AddHog(minion1.name, 1, 50, "Gasmask") AnimSetGearPosition(minion1.gear, minion1.x, minion1.y) HogTurnLeft(minion1.gear, true) diff -r 7510fe66bfbb -r 0b27d8b4f8e7 share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Fri Sep 29 03:41:30 2017 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Fri Sep 29 18:00:43 2017 +0200 @@ -64,11 +64,11 @@ HealthDecrease = 0 -- Hog Solo - AddTeam(teamA.name, teamA.color, "Simple", "Island", "HillBilly", "hedgewars") + AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars") hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1") AnimSetGearPosition(hero.gear, hero.x, hero.y) -- Crazy Runner - AddTeam(teamB.name, teamB.color, "ring", "Island", "HillBilly", "cm_sonic") + AddTeam(teamB.name, teamB.color, "ring", "Island", "Default", "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)