--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Nov 23 23:54:55 2016 +0100
@@ -916,7 +916,7 @@
cannibals[i] = AddHog(cannibalNames[i], 1, 50, "vampirichog")
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
for i = 1, 9 do
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Wed Nov 23 23:54:55 2016 +0100
@@ -515,11 +515,11 @@
gearDead[natives[i]] = false
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
gearDead[cyborg] = false
- AddTeam(loc("011101000"), 14483455, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101000"), 14483455, "ring", "UFO", "Robot", "cm_binary")
for i = 1, 4 do
cyborgs[i] = AddHog(cyborgNames[i], 2, 100, "cyborg2")
gearDead[cyborgs[i]] = false
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Wed Nov 23 23:54:55 2016 +0100
@@ -485,7 +485,7 @@
end
function AddHogs()
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
@@ -513,13 +513,13 @@
playersNum = #players
playersLeft = playersNum
- AddTeam(loc("Hedge-cogs"), 14483455, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Hedge-cogs"), 14483455, "ring", "UFO", "Robot", "cm_cyborg")
for i = 1, cyborgsNum do
cyborgs[i] = AddHog(cyborgNames[i], 2, 80, "cyborg2")
end
if m8EnemyFled == 1 then
- AddTeam(loc("Leader"), 14483455, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Leader"), 14483455, "ring", "UFO", "Robot", "cm_cyborg")
if m8Scene == denseScene then
leader = AddHog(loc("Dense Cloud"), 2, 200, nativeHats[denseNum])
elseif m8Scene == waterScene then
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Wed Nov 23 23:54:55 2016 +0100
@@ -281,7 +281,7 @@
end
if m8Scene == denseScene or m8Scene == waterScene then
- AddTeam(loc("Traitors"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Traitors"), 29439, "Bone", "Island", "HillBilly", "cm_bloodyblade")
if m8Scene == denseScene then
DeleteGear(natives[2])
natives[2] = AddHog(nativeNames[2], 0, 100, nativeHats[2])
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Wed Nov 23 23:54:55 2016 +0100
@@ -428,13 +428,13 @@
gearDead[natives[i-6]] = false
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
princess = AddHog(loc("Fell From Heaven"), 0, 333, "tiara")
gearDead[cyborg] = false
gearDead[princess] = false
- AddTeam(loc("Biomechanic Team"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Biomechanic Team"), 14483456, "ring", "UFO", "Robot", "cm_cyborg")
for i = 1, cyborgsNum do
cyborgs[i] = AddHog(cyborgNames[i], cyborgsDif[i], cyborgsHealth[i], "cyborg2")
gearDead[cyborgs[i]] = false
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Wed Nov 23 23:54:55 2016 +0100
@@ -962,7 +962,7 @@
AnimSetGearPosition(cannibals[i], 0, 0)
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Y3K1337"), 0, 200, "cyborg1")
princess = AddHog(loc("Fell From Heaven"), 0, 200, "tiara")
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Wed Nov 23 23:54:55 2016 +0100
@@ -689,21 +689,21 @@
origNatives[4] = natives[4]
nativesLeft = nativesNum
- AddTeam(loc("Beep Loopers"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Beep Loopers"), 14483456, "ring", "UFO", "Robot", "cm_cyborg")
for i = 1, cyborgsTeamNum[1] do
cyborgs[i] = AddHog(cyborgNames[i], cyborgsDif[i], cyborgsHealth[i], "cyborg2")
end
- AddTeam(loc("Corporationals"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Corporationals"), 14483456, "ring", "UFO", "Robot", "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]
- AddTeam(loc("Leaderbot"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("Leaderbot"), 14483456, "ring", "UFO", "Robot", "cm_cyborg")
enemy = AddHog(loc("Name"), 2, 200, "cyborg1")
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
SetGearPosition(cyborg, 0, 0)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Wed Nov 23 23:54:55 2016 +0100
@@ -535,7 +535,7 @@
hogNr[cannibals[i]] = i - 2
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Y3K1337"), 0, 200, "cyborg1")
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Wed Nov 23 23:54:55 2016 +0100
@@ -318,7 +318,7 @@
cannibals[i] = AddHog(HogNames[i], 2, 55, "vampirichog")
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_star")
+ AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
AnimSetGearPosition(leaks, unpack(leaksPos))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Wed Nov 23 23:54:55 2016 +0100
@@ -98,17 +98,17 @@
Theme = "Nature"
-- I had originally hero in PAotH team and changed it, may reconsider though
-- PAotH
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "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")
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Wed Nov 23 23:54:55 2016 +0100
@@ -101,11 +101,11 @@
Theme = "Hell"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- PAotH
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_galaxy")
paoth1.gear = AddHog(paoth1.name, 0, 100, "hair_yellow")
AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y)
HogTurnLeft(paoth1.gear, true)
@@ -113,11 +113,11 @@
AnimSetGearPosition(paoth2.gear, paoth2.x, paoth2.y)
HogTurnLeft(paoth2.gear, true)
-- Professor and Thugs
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_sine")
professor.bot = AddHog(professor.name, 1, 300, "tophats")
AnimSetGearPosition(professor.bot, paoth1.x - 100, paoth1.y)
HogTurnLeft(professor.bot, true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Wed Nov 23 23:54:55 2016 +0100
@@ -65,12 +65,12 @@
Theme = "Hell"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "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)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Wed Nov 23 23:54:55 2016 +0100
@@ -105,16 +105,16 @@
end
-- Hog Solo
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_galaxy")
ally.gear = AddHog(ally.name, 0, 100, "Cowboy")
AnimSetGearPosition(ally.gear, ally.x, ally.y)
-- Smugglers
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "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")
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Wed Nov 23 23:54:55 2016 +0100
@@ -72,7 +72,7 @@
Theme = "Desert"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Wed Nov 23 23:54:55 2016 +0100
@@ -68,7 +68,7 @@
Theme = "Desert"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Wed Nov 23 23:54:55 2016 +0100
@@ -45,7 +45,7 @@
Theme = "EarthRise"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Wed Nov 23 23:54:55 2016 +0100
@@ -110,19 +110,19 @@
Theme = "Fruit"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamD.name, teamD.color, "Bone", "Island", "HillBilly", "congo-brazzaville")
green1.bot = AddHog(green1.name, 1, 200, "war_desertofficer")
AnimSetGearPosition(green1.bot, green1.x, green1.y)
green1.human = AddHog(green1.name, 0, 200, "war_desertofficer")
AnimSetGearPosition(green1.human, green1.x, green1.y)
green1.gear = green1.human
-- Green Bananas
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "congo-brazzaville")
green2.gear = AddHog(green2.name, 0, 100, "war_britmedic")
AnimSetGearPosition(green2.gear, green2.x, green2.y)
HogTurnLeft(green2.gear, true)
@@ -136,7 +136,7 @@
AnimSetGearPosition(green5.gear, green5.x, green5.y)
HogTurnLeft(green5.gear, true)
-- Yellow Watermelons
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_mog")
yellow1.gear = AddHog(yellow1.name, 1, 100, "war_desertgrenadier2")
AnimSetGearPosition(yellow1.gear, yellow1.x, yellow1.y)
-- the rest of the Yellow Watermelons
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Wed Nov 23 23:54:55 2016 +0100
@@ -91,7 +91,7 @@
end
-- Hog Solo and Green Bananas
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgehog")
hero.gear = AddHog(hero.name, 0, health, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
@@ -102,7 +102,7 @@
AnimSetGearPosition(green3.gear, green3.x, green3.y)
HogTurnLeft(green3.gear, true)
-- Captain Lime
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "congo-brazzaville")
green1.human = AddHog(green1.name, 0, 100, "war_desertofficer")
AnimSetGearPosition(green1.human, green1.x, green1.y)
green1.bot = AddHog(green1.name, 1, 100, "war_desertofficer")
@@ -110,7 +110,7 @@
green1.gear = green1.human
-- Fruit Assassins
local assasinsHats = { "NinjaFull", "NinjaStraight", "NinjaTriangle" }
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Wed Nov 23 23:54:55 2016 +0100
@@ -81,18 +81,18 @@
Theme = "Fruit"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "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)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Wed Nov 23 23:54:55 2016 +0100
@@ -108,16 +108,16 @@
end
-- Hog Solo
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "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, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_pirate")
bandit1.gear = AddHog(bandit1.name, 1, 120, "Santa")
AnimSetGearPosition(bandit1.gear, bandit1.x, bandit1.y)
HogTurnLeft(bandit1.gear, true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Wed Nov 23 23:54:55 2016 +0100
@@ -81,11 +81,11 @@
Theme = "Snow"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- Ally
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_face")
ally.gear = AddHog(ally.name, 0, 100, "war_airwarden02")
AnimSetGearPosition(ally.gear, ally.x, ally.y)
HogTurnLeft(ally.gear, true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Wed Nov 23 23:54:55 2016 +0100
@@ -108,7 +108,7 @@
Map = "moon01_map"
Theme = "Cheese" -- Because ofc moon is made of cheese :)
-- Hog Solo
- AddTeam(teamD.name, teamD.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamD.name, teamD.color, "Bone", "Island", "HillBilly", "hedgewars")
if tonumber(GetCampaignVar("HeroHealth")) then
hero.gear = AddHog(hero.name, 0, tonumber(GetCampaignVar("HeroHealth")), "war_desertgrenadier1")
else
@@ -116,7 +116,7 @@
end
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- PAotH
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_galaxy")
paoth1.gear = AddHog(paoth1.name, 0, 100, "scif_2001O")
AnimSetGearPosition(paoth1.gear, paoth1.x, paoth1.y)
HogTurnLeft(paoth1.gear, true)
@@ -130,12 +130,12 @@
AnimSetGearPosition(paoth4.gear, paoth4.x, paoth4.y)
HogTurnLeft(paoth4.gear, true)
-- Professor
- AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamC.name, teamC.color, "Bone", "Island", "HillBilly", "cm_sine")
professor.gear = AddHog(professor.name, 0, 120, "tophats")
AnimSetGearPosition(professor.gear, professor.x, professor.y)
HogTurnLeft(professor.gear, true)
-- Minions
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_sine")
minion1.gear = AddHog(minion1.name, 1, 50, "Gasmask")
AnimSetGearPosition(minion1.gear, minion1.x, minion1.y)
HogTurnLeft(minion1.gear, true)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Wed Nov 23 23:54:55 2016 +0100
@@ -62,11 +62,11 @@
Theme = "Cheese"
-- Hog Solo
- AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamA.name, teamA.color, "Bone", "Island", "HillBilly", "hedgewars")
hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- Crazy Runner
- AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(teamB.name, teamB.color, "Bone", "Island", "HillBilly", "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)
--- a/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Wed Nov 23 23:54:55 2016 +0100
@@ -95,7 +95,7 @@
Theme = "Golf"
-- Create the player team
- AddTeam(loc("Sniperz"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Sniperz"), 14483456, "Simple", "Island", "Default", "cm_crosshair")
-- And add a hog to it
player = AddHog(loc("Hunter"), 0, 1, "Sniper")
SetGearPosition(player, 602, 1465)
--- a/share/hedgewars/Data/Missions/Challenge/Challenge_-_Speed_Shoppa_-_Hedgelove.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Challenge_-_Speed_Shoppa_-_Hedgelove.lua Wed Nov 23 23:54:55 2016 +0100
@@ -4,7 +4,7 @@
params.missionTitle = loc("Shoppa Love")
params.teamName = loc("Team of Hearts")
params.hogName = loc("Heartful")
-params.teamFlag = "cm_iluvu"
+params.teamFlag = "cm_heart"
params.teamGrave = "heart"
params.hogHat = "pinksunhat"
params.crateType = "health"
--- a/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Grenade_easy.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Grenade_easy.lua Wed Nov 23 23:54:55 2016 +0100
@@ -13,6 +13,7 @@
hogName = loc("Grenadier"),
hogHat = "war_desertgrenadier2",
teamName = loc("Grenade Group"),
+ teamFlag = "cm_grenade",
targets = {
{ x = 1834, y = 747 },
{ x = 2308, y = 729 },
--- a/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Grenade_hard.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Grenade_hard.lua Wed Nov 23 23:54:55 2016 +0100
@@ -13,6 +13,7 @@
hogName = loc("Grenadier"),
hogHat = "war_desertgrenadier2",
teamName = loc("Grenade Group"),
+ teamFlag = "cm_grenade",
targets = {
{ x = 1190, y = 694 },
{ x = 962, y = 680 },
--- a/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Homing_Bee.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Homing_Bee.lua Wed Nov 23 23:54:55 2016 +0100
@@ -11,6 +11,7 @@
hog_y = 514,
hogHat = "NoHat",
teamGrave = "bp2",
+ teamFlag = "cm_flower",
targets = {
{ x = 1949, y = 273 },
{ x = 1734, y = 322 },
--- a/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Shotgun.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/Target_Practice_-_Shotgun.lua Wed Nov 23 23:54:55 2016 +0100
@@ -11,6 +11,7 @@
hog_y = 324,
hogHat = "NoHat",
hogGrave = "Bones",
+ teamFlag = "cm_crosshair",
targets = {
{ x = 495, y = 501 },
{ x = 227, y = 530 },
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Wed Nov 23 23:54:55 2016 +0100
@@ -28,7 +28,7 @@
MinesNum = 0
Explosives = 0
- AddTeam(loc("Wannabe Flyboys"), 14483456, "Simple", "Island", "Default", "Hedgewars")
+ AddTeam(loc("Wannabe Flyboys"), 14483456, "Simple", "Island", "Default", "cm_scout")
player = AddHog(loc("Ace"), 0, 80, "Gasmask")
SetGearPosition(player, 1380, 1500)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Wed Nov 23 23:54:55 2016 +0100
@@ -20,10 +20,10 @@
Theme = "Bamboo"
SuddenDeathTurns = 99999
- AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default", "cm_yinyang")
player = AddHog(loc("Ikeda"), 0, 10, "StrawHat")
- AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default")
+ AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default", "cm_cyborg")
enemy = AddHog(loc("Unit 835"), 1, 10, "cyborg1")
SetGearPosition(player,142,656)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Wed Nov 23 23:54:55 2016 +0100
@@ -29,11 +29,11 @@
SuddenDeathTurns = 99999
- AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_duckhead")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
instructor = AddHog(loc("Instructor"), 0, 100, "sf_vega")
- AddTeam(loc("Blue Team"), 29439, "Simple", "Island", "Default")
+ AddTeam(loc("Blue Team"), 29439, "Simple", "Island", "Default", "somalia")
enemy = AddHog(loc("Filthy Blue"), 1, 100, "Skull")
SetGearPosition(player,146,902)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Wed Nov 23 23:54:55 2016 +0100
@@ -22,10 +22,10 @@
Theme = "City" -- The theme to be used
SuddenDeathTurns = 99999
- AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_eyes")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
- AddTeam(loc("Toxic Team"), 1175851, "Simple", "Island", "Default")
+ AddTeam(loc("Toxic Team"), 1175851, "Simple", "Island", "Default", "cm_magicskull")
enemy = AddHog(loc("Poison"), 1, 100, "Skull")
SetGearPosition(player,430,516)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Newton_and_the_Hammock.lua Wed Nov 23 23:54:55 2016 +0100
@@ -21,10 +21,10 @@
Map = "Hammock"
Theme = "Nature"
- AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Pathetic Resistance"), 14483456, "Simple", "Island", "Default", "cm_duckhead")
player = AddHog(loc("Ikeda"), 0, 48, "StrawHat")
- AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default")
+ AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Default", "cm_cyborg")
enemy = AddHog(loc("Unit") .. " 811", 1, 100, "cyborg1")
SetGearPosition(player,430,1540)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Nobody_Laugh.lua Wed Nov 23 23:54:55 2016 +0100
@@ -20,13 +20,13 @@
Map = "Bath"
Theme = "Nature"
- AddTeam(loc("Nameless Heroes"), 14483456, "eyecross", "Wood", "HillBilly", "cm_birdy")
+ AddTeam(loc("Nameless Heroes"), 14483456, "eyecross", "Wood", "HillBilly", "cm_crossedswords")
hhs[1] = AddHog(loc( "Hunter" ), 0, 1, "Skull")
SetGearPosition(hhs[1], 1267, 451)
hhs[2] = AddHog(loc("Drowner"), 0, 31, "mp3")
SetGearPosition(hhs[2], 1332, 451)
- AddTeam(loc("Clowns"), 1175851, "Duck2", "Tank", "Mobster", "cm_spider")
+ AddTeam(loc("Clowns"), 1175851, "Duck2", "Tank", "Mobster", "cm_face")
hhs[3] = AddHog(loc("Poison"), 5, 100, "WhySoSerious")
SetGearPosition(hhs[3], 1133, 446)
hhs[4] = AddHog(loc("Bobo"), 5, 100, "clown")
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Wed Nov 23 23:54:55 2016 +0100
@@ -28,10 +28,10 @@
Theme = "Halloween" -- The theme to be used
SuddenDeathTurns = 99999
- AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Bloody Rookies"), 14483456, "Simple", "Island", "Default", "cm_eyes")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
--852718
- AddTeam(loc("Toxic Team"), 1175851, "Simple", "Island", "Default")
+ AddTeam(loc("Toxic Team"), 1175851, "Simple", "Island", "Default", "cm_magicskull")
enemy = AddHog(loc("Poison"), 1, 10, "Skull")
SetGearPosition(player,970,23)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Wed Nov 23 23:54:55 2016 +0100
@@ -22,12 +22,12 @@
Theme = "Nature" -- The theme to be used
SuddenDeathTurns = 99999
- AddTeam(loc("Feeble Resistance"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Feeble Resistance"), 14483456, "Simple", "Island", "Default", "cm_kiwi")
player = AddHog(string.format(loc("Pathetic Hog #%d"), 1), 0, 50, "NoHat")
p2 = AddHog(string.format(loc("Pathetic Hog #%d"), 2), 0, 20, "NoHat")
--AddTeam("Toxic Team", 1175851, "Simple", "Island", "Robot","cm_binary")
- AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Robot", "cm_binary")
+ AddTeam(loc("Cybernetic Empire"), 1175851, "Simple", "Island", "Robot", "cm_cyborg")
enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg1")
SetGearPosition(player,1403,235)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_The_Great_Escape.lua Wed Nov 23 23:54:55 2016 +0100
@@ -16,10 +16,10 @@
MinesNum = 0
Explosives = 0
- AddTeam(loc("Hero Team"), 14483456, "Simple", "Island", "Default", "Hedgewars")
+ AddTeam(loc("Hero Team"), 14483456, "Simple", "Island", "Default", "cm_swordshield")
player = AddHog(loc("Good Dude"), 0, 80, "NoHat") --NoHat
- AddTeam(loc("Bad Team"), 1175851, "Simple", "Island", "Default", "Hedgewars")
+ AddTeam(loc("Bad Team"), 1175851, "Simple", "Island", "Default", "cm_dragonrb")
enemy = AddHog(loc("Bad Guy"), 1, 40, "NoHat")
end
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Wed Nov 23 23:54:55 2016 +0100
@@ -91,7 +91,7 @@
Theme = "Bamboo"
-- Create the player team
- AddTeam(loc("'Zooka Team"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("'Zooka Team"), 14483456, "Simple", "Island", "Default", "cm_crosshair")
-- And add a hog to it
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
SetGearPosition(player, 936, 136)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Wed Nov 23 23:54:55 2016 +0100
@@ -84,7 +84,7 @@
Theme = "Castle"
-- Create the player team
- AddTeam(loc("Grenadiers"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Grenadiers"), 14483456, "Simple", "Island", "Default", "cm_grenade")
-- And add a hog to it
player = AddHog(loc("Nade Boy"), 0, 1, "war_grenadier1")
SetGearPosition(player, 506, 76)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Wed Nov 23 23:54:55 2016 +0100
@@ -108,7 +108,7 @@
Map = "Ropes" -- Map name
Theme = "Nature" -- Map theme
- AddTeam( loc( "Rope Team" ), 14483456, "Simple", "Island", "Default" ) -- Lets make the team
+ AddTeam( loc( "Rope Team" ), 14483456, "Simple", "Island", "Default", "cm_shoppa" ) -- Lets make the team
Player = AddHog( loc( "Hunter" ), 0, 1, "StrawHat" ) -- Add a hog for it, and name it "Hunter"
SetGearPosition( Player, 420, 1750 ) -- Set player position
--- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Wed Nov 23 23:54:55 2016 +0100
@@ -407,7 +407,7 @@
loc_noop("Clowns"),
{"WhySoSerious","clown-copper","clown-crossed","clown","Joker"},
{loc_noop("Baggy"),loc_noop("Bingo"),loc_noop("Bobo"),loc_noop("Bozo"),loc_noop("Buster"),loc_noop("Chester"),loc_noop("Copper"),loc_noop("Heckles"),loc_noop("Giggles"),loc_noop("Jingo"),loc_noop("Molly"),loc_noop("Loopy"),loc_noop("Patches"),loc_noop("Tatters")},
- "R","cm_birdy","Mobster","Rubberduck","Castle"
+ "R","cm_balls","Mobster","Rubberduck","Castle"
},
{
@@ -428,7 +428,7 @@
loc_noop("Color Squad"),
{"hair_blue","hair_green","hair_red","hair_yellow","hair_purple","hair_grey","hair_orange","hair_pink"},
{loc_noop("Blue"),loc_noop("Green"),loc_noop("Red"),loc_noop("Yellow"),loc_noop("Purple"),loc_noop("Grey"),loc_noop("Orange"),loc_noop("Pink")},
- "F","cm_birdy","Singer","Grave","Castle"
+ "F","mauritius","Singer","Grave","Castle"
},
{
@@ -463,21 +463,21 @@
loc_noop("The Zoo"),
{"zoo_Bat","zoo_Beaver","zoo_Bunny","zoo_Deer","zoo_Hedgehog","zoo_Moose","zoo_Pig","zoo_Porkey","zoo_Sheep","zoo_chicken","zoo_elephant","zoo_fish","zoo_frog","zoo_snail","zoo_turtle"},
{loc_noop("Batty"),loc_noop("Tails"),loc_noop("Bunny"),loc_noop("Deer"),loc_noop("Spikes"),loc_noop("Horns"),loc_noop("Bacon"),loc_noop("Porkey"),loc_noop("Sheepy"),loc_noop("Chicken"),loc_noop("Trunks"),loc_noop("Fishy"),loc_noop("Legs"),loc_noop("Slimer"),loc_noop("Roshi")},
- "FR","cm_hurrah","Default","Bone","Castle"
+ "FR","cm_birdy","Default","Bone","Castle"
},
{
loc_noop("The Devs"),
{"ushanka","zoo_Sheep","bb_bob","Skull","poke_mudkip","lambda","WizardHat","sf_ryu","android","fr_lemon","mp3"},
{loc_noop("unC0Rr"), loc_noop("sheepluva"), loc_noop("nemo"), loc_noop("mikade"), loc_noop("koda"), loc_noop("burp"),loc_noop("HeneK"),loc_noop("Tiyuri"),loc_noop("Xeli"),loc_noop("Displacer"),loc_noop("szczur")},
- "FR","hedgewars","Classic","Statue","Castle"
+ "FR","cm_hw","Classic","Statue","Castle"
},
{
loc_noop("Mushroom Kingdom"),
{"sm_daisy","sm_luigi","sm_mario","sm_peach","sm_toad","sm_wario"},
{loc_noop("Daisy"),loc_noop("Luigi"),loc_noop("Mario"),loc_noop("Princess Peach"),loc_noop("Toad"),loc_noop("Wario")},
- "FR","cm_birdy","Default","Badger","Castle"
+ "FR","comoros","Default","Badger","Castle"
},
{
@@ -521,14 +521,14 @@
loc_noop("Desert Storm"),
{"war_desertofficer","war_desertgrenadier1","war_desertmedic","war_desertsapper1","war_desertgrenadier2","war_desertgrenadier4","war_desertsapper2","war_desertgrenadier5"},
{loc_noop("Brigadier Briggs"),loc_noop("Lt. Luke"),loc_noop("Sgt. Smith"),loc_noop("Corporal Calvin"),loc_noop("Frank"),loc_noop("Joe"),loc_noop("Sam"),loc_noop("Donald")},
- "F","cm_birdy","Default","Grave","Castle"
+ "F","bhutan","Default","Grave","Castle"
},
{
loc_noop("The Hospital"),
{"doctor","nurse","war_britmedic","war_desertmedic","war_germanww2medic"},
{loc_noop("Dr. Blackwell"),loc_noop("Dr. Drew"),loc_noop("Dr. Harvey"),loc_noop("Dr. Crushing"),loc_noop("Dr. Jenner"),loc_noop("Dr. Barnard"),loc_noop("Dr. Parkinson"),loc_noop("Dr. Banting"),loc_noop("Dr. Horace"),loc_noop("Dr. Hollows"),loc_noop("Dr. Jung")},
- "R","cm_birdy","Default","heart","Castle"
+ "R","cm_firstaid","Default","heart","Castle"
}
}
--- a/share/hedgewars/Data/Scripts/TargetPractice.lua Wed Nov 23 20:25:44 2016 +0100
+++ b/share/hedgewars/Data/Scripts/TargetPractice.lua Wed Nov 23 23:54:55 2016 +0100
@@ -96,6 +96,7 @@
- hogName: name of the hedgehog (default: "Trainee")
- teamName: name of the hedgehog’s team (default: "Training Team")
- teamGrave: name of the hedgehog’s grave
+ - teamFlag: name of the team’s flag (default: "cm_crosshair")
- clanColor: color of the (only) clan (default: 0xFF0204, which is a red tone)
- goalText: A short string explaining the goal of the mission
(default: "Destroy all targets within the time!")
@@ -110,6 +111,7 @@
if params.shootText == nil then params.shootText = loc("You have shot %d times.") end
if params.clanColor == nil then params.clanColor = 0xFF0204 end
if params.teamGrave == nil then params.teamGrave= "Statue" end
+ if params.teamFlag == nil then params.teamFlag = "cm_crosshair" end
if params.wind == nil then params.wind = 0 end
local solid, artillery
@@ -137,7 +139,7 @@
SetWind(params.wind)
- AddTeam(loc(params.teamName), params.clanColor, params.teamGrave, "Island", "Default", "Flowerhog")
+ AddTeam(loc(params.teamName), params.clanColor, params.teamGrave, "Flowerhog", "Default", params.teamFlag)
player = AddHog(loc(params.hogName), 0, 1, params.hogHat)
SetGearPosition(player, params.hog_x, params.hog_y)