Switch almost all Lua calls of AddTeam to using default clan colors instead of hardcoded color
Missing: fruit02, HedgeEditor
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Aug 01 15:50:39 2018 +0200
@@ -960,28 +960,28 @@
end
function AddHogs()
- AddTeam(loc("Tribe"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Tribe"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 8, 9 do
natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
end
- AddTeam(loc("Natives"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 1, 7 do
natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
end
nativesNum = 7
- AddTeam(loc("Assault Team"), 0xDD0000, "skull", "Island", "Pirate", "cm_vampire")
+ AddTeam(loc("Assault Team"), -1, "skull", "Island", "Pirate", "cm_vampire")
for i = 1, 6 do
cannibals[i] = AddHog(cannibalNames[i], 3, 50, "vampirichog")
end
- AddTeam(loc("Reinforcements"), 0xDD0000, "skull", "Island", "Pirate", "cm_vampire")
+ AddTeam(loc("Reinforcements"), -1, "skull", "Island", "Pirate", "cm_vampire")
for i = 7, 9 do
cannibals[i] = AddHog(cannibalNames[i], 2, 50, "vampirichog")
end
- AddTeam(loc("011101001"), 0xDD0000, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/dragon.lua Wed Aug 01 15:50:39 2018 +0200
@@ -625,17 +625,17 @@
end
function AddHogs()
- AddTeam(loc("Natives"), 0x4980C1, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 1, 7 do
natives[i] = AddHog(nativeNames[i], 0, 200, nativeHats[i])
gearDead[natives[i]] = false
end
- AddTeam(loc("011101001"), 0xFF0204, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
gearDead[cyborg] = false
- AddTeam(loc("011101000"), 0xFFFF01, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101000"), -9, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/enemy.lua Wed Aug 01 15:50:39 2018 +0200
@@ -519,10 +519,10 @@
end
function AddHogs()
- AddTeam(loc("011101001"), 0xFF0204, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
- AddTeam(loc("Natives"), 0x4980C1, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
-- There are 3-4 natives in this mission
natives[1] = AddHog(nativeNames[leaksNum], 0, 100, nativeHats[leaksNum])
if m5DeployedNum ~= leaksNum and m8DeployedLeader == 0 then
@@ -540,7 +540,7 @@
table.insert(players, natives[i])
end
- AddTeam(loc("Cannibals"), 0x4980C1, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Cannibals"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 1, cannibalsNum do
cannibals[i] = AddHog(cannibalNames[i], 0, 100, "Zombi")
table.insert(players, cannibals[i])
@@ -548,13 +548,13 @@
playersNum = #players
playersLeft = playersNum
- AddTeam(loc("Hedge-cogs"), 0xFFFF01, "ring", "UFO", "Robot", "cm_cyborg")
+ AddTeam(loc("Hedge-cogs"), -9, "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"), 0xFFFF01, "ring", "UFO", "Robot", "cm_cyborg")
+ AddTeam(loc("Leader"), -9, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/epil.lua Wed Aug 01 15:50:39 2018 +0200
@@ -311,23 +311,23 @@
end
function AddHogs()
- AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 1, 5 do
natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
end
- AddTeam(loc("More Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("More Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 6, 10 do
natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
end
- AddTeam(loc("Cannibals"), 29439, "skull", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Cannibals"), -2, "skull", "Island", "HillBilly", "cm_birdy")
for i = 1, 5 do
cannibals[i] = AddHog(cannibalNames[i], 0, 100, cannibalHats[i])
end
if m8Scene == denseScene or m8Scene == waterScene then
- AddTeam(loc("Traitors"), 29439, "Bone", "Island", "HillBilly", "cm_bloodyblade")
+ AddTeam(loc("Traitors"), -2, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/family.lua Wed Aug 01 15:50:39 2018 +0200
@@ -519,22 +519,22 @@
end
function AddHogs()
- AddTeam(loc("Princess"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
princess = AddHog(loc("Fell From Heaven"), 0, 333, "tiara")
SetGearAIHints(princess, aihDoesntMatter)
gearDead[princess] = false
- AddTeam(loc("Natives"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 7, 9 do
natives[i-6] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
gearDead[natives[i-6]] = false
end
- AddTeam(loc("011101001"), 0xDD0000, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
gearDead[cyborg] = false
- AddTeam(loc("Biomechanic Team"), 14483456, "ring", "UFO", "Robot", "cm_cyborg")
+ AddTeam(loc("Biomechanic Team"), -1, "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/first_blood.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/first_blood.lua Wed Aug 01 15:50:39 2018 +0200
@@ -729,7 +729,7 @@
Theme = "Nature"
- AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
youngh = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo")
elderh = AddHog(loc("Righteous Beard"), 0, 99, "IndianChief")
princess = AddHog(loc("Fell From Heaven"), 0, 300, "tiara")
@@ -740,7 +740,7 @@
AnimSetGearPosition(youngh, 1862, 1362)
HogTurnLeft(youngh, false)
- AddTeam(loc("Cannibals"), 14483456, "skull", "Island", "Pirate","cm_vampire")
+ AddTeam(loc("Cannibals"), -1, "skull", "Island", "Pirate","cm_vampire")
cannibal = AddHog(loc("Brainiac"), 0, 5, "Zombi")
AnimSetGearPosition(cannibal, 525, 1256)
HogTurnLeft(cannibal, false)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/journey.lua Wed Aug 01 15:50:39 2018 +0200
@@ -1088,14 +1088,14 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Natives"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
leaks = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo")
dense = AddHog(loc("Dense Cloud"), 0, 100, "RobinHood")
- AddTeam(loc("Princess"), 0x0072FF, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Princess"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
princess = AddHog(loc("Fell From Heaven"), 0, 200, "tiara")
- AddTeam(loc("Cannibal Sentry"), 0xDD0000, "skull", "Island", "Pirate","cm_vampire")
+ AddTeam(loc("Cannibal Sentry"), -1, "skull", "Island", "Pirate","cm_vampire")
cannibals = {}
for i = 1, 4 do
cannibals[i] = AddHog(cannibalNames[i], 3, 40, "Zombi")
@@ -1109,7 +1109,7 @@
SetEffect(cannibals[i], heArtillery, 1)
end
- AddTeam(loc("011101001"), 0xDD0000, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Y3K1337"), 0, 200, "cyborg1")
AnimSetGearPosition(dense, 0, 0)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/queen.lua Wed Aug 01 15:50:39 2018 +0200
@@ -722,7 +722,7 @@
end
function AddHogs()
- AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
for i = 7, 9 do
natives[i-6] = AddHog(nativeNames[i], 0, 100, nativeHats[i])
origNatives[i-6] = natives[i-6]
@@ -731,21 +731,21 @@
origNatives[4] = natives[4]
nativesLeft = nativesNum
- AddTeam(loc("Beep Loopers"), 14483456, "ring", "UFO", "Robot", "cm_cyborg")
+ AddTeam(loc("Beep Loopers"), -1, "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_cyborg")
+ AddTeam(loc("Corporationals"), -1, "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_cyborg")
+ AddTeam(loc("Leaderbot"), -1, "ring", "UFO", "Robot", "cm_cyborg")
enemy = AddHog(loc("Name"), 2, 200, "cyborg1")
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "ring", "UFO", "Robot", "cm_binary")
cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1")
HideHedge(cyborg)
--- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/shadow.lua Wed Aug 01 15:50:39 2018 +0200
@@ -603,13 +603,13 @@
end
function AddHogs()
- AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
ramon = AddHog(loc("Ramon"), 0, 100, "rasta")
leaks = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo")
dense = AddHog(loc("Dense Cloud"), 0, 100, "RobinHood")
spiky = AddHog(loc("Spiky Cheese"), 0, 100, "hair_yellow")
- AddTeam(loc("Weaklings"), 14483456, "skull", "Island", "Pirate","cm_vampire")
+ AddTeam(loc("Weaklings"), -1, "skull", "Island", "Pirate","cm_vampire")
cannibals = {}
cannibals[1] = AddHog(loc("Brainiac"), 5, 20, "Zombi")
@@ -618,14 +618,14 @@
hogNr[cannibals[i]] = i - 2
end
- AddTeam(loc("Stronglings"), 14483456, "skull", "Island", "Pirate","cm_vampire")
+ AddTeam(loc("Stronglings"), -1, "skull", "Island", "Pirate","cm_vampire")
for i = 6, 9 do
cannibals[i] = AddHog(HogNames[i], 4, 30, "vampirichog")
hogNr[cannibals[i]] = i - 2
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/united.lua Wed Aug 01 15:50:39 2018 +0200
@@ -323,7 +323,7 @@
end
function AddHogs()
- AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy")
+ AddTeam(loc("Natives"), -2, "Bone", "Island", "HillBilly", "cm_birdy")
leaks = AddHog(loc("Leaks A Lot"), 0, 100, "Rambo")
dense = AddHog(loc("Dense Cloud"), 0, 100, "RobinHood")
water = AddHog(loc("Fiery Water"), 0, 100, "pirate_jack")
@@ -332,17 +332,17 @@
natives = {leaks, dense, water, buffalo, chief}
nativesNum = 5
- AddTeam(loc("Light Cannfantry"), 14483456, "skull", "Island", "Pirate", "cm_vampire")
+ AddTeam(loc("Light Cannfantry"), -1, "skull", "Island", "Pirate", "cm_vampire")
for i = 1, 4 do
cannibals[i] = AddHog(HogNames[i], 2, 40, "Zombi")
end
- AddTeam(loc("Heavy Cannfantry"), 14483456, "skull", "Island", "Pirate", "cm_vampire")
+ AddTeam(loc("Heavy Cannfantry"), -1, "skull", "Island", "Pirate", "cm_vampire")
for i = 5, 8 do
cannibals[i] = AddHog(HogNames[i], 2, 55, "vampirichog")
end
- AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary")
+ AddTeam(loc("011101001"), -1, "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Wed Aug 01 15:50:39 2018 +0200
@@ -83,11 +83,11 @@
guard2.y = 1800
-- Planetary Association of the Hedgehogs
teamA.name = loc("PAotH")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Guards")
-teamB.color = 0x0072FF -- blue
+teamB.color = -2
teamC.name = loc("Hog Solo")
-teamC.color = 0x38D61C -- green
+teamC.color = -6
-------------- LuaAPI EVENT HANDLERS ------------------
function onGameInit()
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Wed Aug 01 15:50:39 2018 +0200
@@ -79,11 +79,11 @@
thug7.y = 1960
thug7.health = 80
teamA.name = loc("Hog Solo")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("PAotH")
teamB.color = teamA.color
teamC.name = loc("Professor")
-teamC.color = 0x0072FF -- blue
+teamC.color = -2
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Wed Aug 01 15:50:39 2018 +0200
@@ -44,11 +44,11 @@
-- teams
local teamA = {
name = loc("Hog Solo"),
- color = tonumber("38D61C",16) -- green
+ color = -6
}
local teamB = {
name = loc("5 Deadly Hogs"),
- color = tonumber("FF0000",16) -- red
+ color = -1
}
-- After hero killed an enemy, his weapons will be reset in the next round
local heroWeaponResetPending = false
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Wed Aug 01 15:50:39 2018 +0200
@@ -76,11 +76,11 @@
smuggler3.x = 1940
smuggler3.y = 1625
teamA.name = loc("PAotH")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Smugglers")
-teamB.color = 0xFE8B0E -- orange
+teamB.color = -7
teamC.name = loc("Hog Solo")
-teamC.color = 0x38D61C -- green
+teamC.color = -6
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Wed Aug 01 15:50:39 2018 +0200
@@ -31,7 +31,7 @@
hero.y = 1950
hero.dead = false
teamA.name = loc("Hog Solo")
-teamA.color = tonumber("38D61C",16) -- green
+teamA.color = -6
-- way points
local current waypoint = 1
local waypoints = {
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Wed Aug 01 15:50:39 2018 +0200
@@ -29,7 +29,7 @@
-- teams
local teamA = {
name = loc("Hog Solo"),
- color = tonumber("38D61C",16) -- green
+ color = -6
}
-- creates & targets
local rcCrates = {
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Wed Aug 01 15:50:39 2018 +0200
@@ -30,7 +30,7 @@
-- teams
local teamA = {
name = loc("Hog Solo"),
- color = tonumber("38D61C",16) -- green
+ color = -6
}
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Wed Aug 01 15:50:39 2018 +0200
@@ -97,13 +97,13 @@
{name = loc("Naranja Jed"), x = 960 , y = 516, health = 40},
}
teamA.name = loc("Hog Solo")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Green Bananas")
-teamB.color = 0x38D61C -- green
+teamB.color = -6
teamC.name = loc("Yellow Watermelons")
-teamC.color = 0xFFFF01 -- yellow
+teamC.color = -9
teamD.name = loc("Captain Lime")
-teamD.color = 0x38D61C -- green
+teamD.color = -6
function onGameInit()
Seed = 1
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Wed Aug 01 15:50:39 2018 +0200
@@ -67,9 +67,11 @@
{ name = loc("Deadly Grape") }
}
-- Hog Solo and Green Bananas
+-- TODO: Use default clan colors
teamA.name = loc("Hog Solo and GB")
teamA.color = 0x38D61C -- green
teamB.name = loc("Captain Lime")
+-- FIXME: Use different clan color
teamB.color = 0x38D61D -- greenish
teamC.name = loc("Fruit Assassins")
teamC.color = 0xFF0000 -- red
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Wed Aug 01 15:50:39 2018 +0200
@@ -59,17 +59,17 @@
-- teams
local teamA = {
name = loc("Hog Solo"),
- color = tonumber("38D61C",16) -- green
+ color = -6
}
local teamB = {
-- Red Strawberries 1
name = loc("RS1"),
- color = tonumber("FF0000",16) -- red
+ color = -1
}
local teamC = {
-- Red Strawberries 2
name = loc("RS2"),
- color = tonumber("FF0000",16) -- red
+ color = -1
}
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Wed Aug 01 15:50:39 2018 +0200
@@ -73,11 +73,11 @@
bandit5.frozen = false
bandit5.roundsToUnfreeze = 0
teamA.name = loc("Allies")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Frozen Bandits")
-teamB.color = 0x0072FF -- blue
+teamB.color = -2
teamC.name = loc("Hog Solo")
-teamC.color = 0x38D61C -- green
+teamC.color = -6
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Wed Aug 01 15:50:39 2018 +0200
@@ -41,9 +41,9 @@
ally.x = 860
ally.y = 130
teamA.name = loc("Hog Solo")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Allies")
-teamB.color = 0x38D61C -- green
+teamB.color = -6
-- way points
local current waypoint = 1
local waypoints = {
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Wed Aug 01 15:50:39 2018 +0200
@@ -89,13 +89,13 @@
minion3.y = 1750
teamA.name = loc("PAotH")
-teamA.color = 0x38D61C -- green
+teamA.color = -6
teamB.name = loc("Minions")
-teamB.color = 0x0072FF -- blue
+teamB.color = -2
teamC.name = loc("Professor")
-teamC.color = 0x0072FF -- blue
+teamC.color = -2
teamD.name = loc("Hog Solo")
-teamD.color = 0x38D61C -- green
+teamD.color = -6
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Wed Aug 01 15:50:39 2018 +0200
@@ -41,11 +41,11 @@
-- teams
local teamA = {
name = loc("Hog Solo"),
- color = tonumber("38D61C",16) -- green
+ color = -6
}
local teamB = {
name = loc("Crazy Runner"),
- color = tonumber("0072FF",16) -- blue
+ color = -2
}
-------------- LuaAPI EVENT HANDLERS ------------------
--- a/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/Basic_Training_-_Sniper_Rifle.lua Wed Aug 01 15:50:39 2018 +0200
@@ -134,7 +134,7 @@
HealthDecrease = 0
-- Create the player team
- AddTeam(playerTeamName, 0xFF0204, "Simple", "Island", "Default", "cm_crosshair")
+ AddTeam(playerTeamName, -1, "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/ClimbHome.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/ClimbHome.lua Wed Aug 01 15:50:39 2018 +0200
@@ -23,7 +23,7 @@
Explosives = 0
MineDudPercent = 0
Map = "ClimbHome"
- AddTeam(loc("Lonely Hog"), 0xDD0000, "bubble", "Island", "Default")
+ AddTeam(loc("Lonely Hog"), -1, "bubble", "Island", "Default")
player = AddHog(loc("Climber"), 0, 1, "NoHat")
if showWaterStats then
dummyHog = AddHog(" ", 0, 1, "NoHat")
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_RCPlane_Challenge.lua Wed Aug 01 15:50:39 2018 +0200
@@ -34,7 +34,7 @@
MinesNum = 0
Explosives = 0
- AddTeam(loc("Wannabe Flyboys"), 14483456, "Simple", "Island", "Default", "cm_scout")
+ AddTeam(loc("Wannabe Flyboys"), -1, "Simple", "Island", "Default", "cm_scout")
player = AddHog(loc("Ace"), 0, 80, "Gasmask")
SetGearPosition(player, 1380, 1500)
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_Rope_Knock_Challenge.lua Wed Aug 01 15:50:39 2018 +0200
@@ -151,17 +151,17 @@
MinesNum = 0
Explosives = 0
- AddTeam(playerTeamName, 0xFF0204, "money", "Island", "Default", "cm_shoppa")
+ AddTeam(playerTeamName, -1, "money", "Island", "Default", "cm_shoppa")
hhs[0] = AddHog(loc("Ace"), 0, 1, "Gasmask")
SetGearPosition(player, 1380, 1500)
- AddTeam(loc("Unsuspecting Louts"), 0x4980C1, "Simple", "Island", "Default", "cm_face")
+ AddTeam(loc("Unsuspecting Louts"), -2, "Simple", "Island", "Default", "cm_face")
for i = 1, 8 do
-- The name "generic" is a placeholder and will be replaced in AssignCharacter
hhs[i] = AddHog("generic", 0, 1, "NoHat")
end
- AddTeam(loc("Unlucky Sods"), 0x4980C1, "Simple", "Island", "Default", "cm_balrog")
+ AddTeam(loc("Unlucky Sods"), -2, "Simple", "Island", "Default", "cm_balrog")
for i = 9, 16 do
hhs[i] = AddHog("generic", 0, 1, "NoHat")
end
--- a/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Challenge/User_Mission_-_That_Sinking_Feeling.lua Wed Aug 01 15:50:39 2018 +0200
@@ -41,7 +41,7 @@
Theme = "City"
SuddenDeathTurns = 1
- AddTeam(loc("Hapless Hogs"), 14483456, "Simple", "Island", "Default")
+ AddTeam(loc("Hapless Hogs"), -1, "Simple", "Island", "Default")
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")
@@ -51,7 +51,7 @@
hh[6] = AddHog(loc("Sponge"), 1, 100, "sf_chunli")
hh[7] = AddHog(loc("Deadweight"), 1, 100, "dish_Teacup")
- AddTeam(loc("Nameless Heroes"), 14483456, "Simple", "Island", "Default", "cm_crossedswords")
+ AddTeam(loc("Nameless Heroes"), -1, "Simple", "Island", "Default", "cm_crossedswords")
player = AddHog(loc("The Nameless One"), 0, 1, "NoHat")
SetGearPosition(player, 3992, 733)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Bamboo_Thicket.lua Wed Aug 01 15:50:39 2018 +0200
@@ -24,10 +24,10 @@
WaterRise = 0
GameFlags = gfDisableWind
- AddTeam(loc("Pathetic Resistance"), 14483456, "Plinko", "Island", "Default", "cm_yinyang")
+ AddTeam(loc("Pathetic Resistance"), -1, "Plinko", "Island", "Default", "cm_yinyang")
player = AddHog(loc("Ikeda"), 0, 10, "StrawHat")
- AddTeam(loc("Cybernetic Empire"), 1175851, "ring", "Island", "Robot", "cm_cyborg")
+ AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Dangerous_Ducklings.lua Wed Aug 01 15:50:39 2018 +0200
@@ -31,11 +31,11 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Bloody Rookies"), 14483456, "Rubberduck", "Island", "Default", "cm_duckhead")
+ AddTeam(loc("Bloody Rookies"), -1, "Rubberduck", "Island", "Default", "cm_duckhead")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
instructor = AddHog(loc("Instructor"), 0, 100, "sf_vega")
- AddTeam(loc("Blue Team"), 29439, "bubble", "Island", "Default", "somalia")
+ AddTeam(loc("Blue Team"), -2, "bubble", "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Diver.lua Wed Aug 01 15:50:39 2018 +0200
@@ -27,10 +27,10 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Bloody Rookies"), 14483456, "deadhog", "Island", "Default", "cm_eyes")
+ AddTeam(loc("Bloody Rookies"), -1, "deadhog", "Island", "Default", "cm_eyes")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
- AddTeam(loc("Toxic Team"), 1175851, "skull", "Island", "Default", "cm_magicskull")
+ AddTeam(loc("Toxic Team"), -6, "skull", "Island", "Default", "cm_magicskull")
enemy = AddHog(loc("Poison"), 1, 100, "Skull")
SetGearPosition(player,430,516)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Spooky_Tree.lua Wed Aug 01 15:50:39 2018 +0200
@@ -30,10 +30,9 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Bloody Rookies"), 14483456, "deadhog", "Island", "Default", "cm_eyes")
+ AddTeam(loc("Bloody Rookies"), -1, "deadhog", "Island", "Default", "cm_eyes")
player = AddHog(loc("Hunter"), 0, 1, "NoHat")
- --852718
- AddTeam(loc("Toxic Team"), 1175851, "skull", "Island", "Default", "cm_magicskull")
+ AddTeam(loc("Toxic Team"), -6, "skull", "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 Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork.lua Wed Aug 01 15:50:39 2018 +0200
@@ -24,11 +24,11 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Feeble Resistance"), 14483456, "Statue", "Island", "Default", "cm_kiwi")
+ AddTeam(loc("Feeble Resistance"), -1, "Statue", "Island", "Default", "cm_kiwi")
player = AddHog(loc("Greg"), 0, 50, "NoHat")
p2 = AddHog(loc("Mark"), 0, 20, "NoHat")
- AddTeam(loc("Cybernetic Empire"), 1175851, "ring", "Island", "Robot", "cm_cyborg")
+ AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "cm_cyborg")
enemy = AddHog(loc("Unit 3378"), 5, 30, "cyborg1")
SetGearPosition(player,1403,235)
--- a/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/User_Mission_-_Teamwork_2.lua Wed Aug 01 15:50:39 2018 +0200
@@ -26,11 +26,11 @@
Map = "CrazyMission"
Theme = "CrazyMission"
- AddTeam(loc("Feeble Resistance"), 14483456, "Statue", "Island", "Default", "cm_kiwi")
+ AddTeam(loc("Feeble Resistance"), -1, "Statue", "Island", "Default", "cm_kiwi")
player = AddHog(loc("Greg"), 0, 30, "NoHat")
hlayer = AddHog(loc("Mark"), 0, 40, "NoHat")
- AddTeam(loc("Cybernetic Empire"), 1175851, "ring", "Island", "Robot", "cm_binary")
+ AddTeam(loc("Cybernetic Empire"), -6, "ring", "Island", "Robot", "cm_binary")
enemy = AddHog(loc("WatchBot 4000"), 5, 50, "cyborg1")
SetGearPosition(player, 180, 555)
--- a/share/hedgewars/Data/Missions/Scenario/portal.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Scenario/portal.lua Wed Aug 01 15:50:39 2018 +0200
@@ -20,10 +20,10 @@
HealthDecrease = 0
WaterRise = 0
- AddTeam(loc("Subjects"), 0xFFFF01, "Simple", "Island", "Default", "cm_test")
+ AddTeam(loc("Subjects"), -9, "Simple", "Island", "Default", "cm_test")
player = AddHog(loc("Subject 1"), 0, 10, "Terminator_Glasses")
- AddTeam(loc("Hell Army"), 0xFF0402, "skull", "Island", "Default", "cm_hellish")
+ AddTeam(loc("Hell Army"), -1, "skull", "Island", "Default", "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"), 0xFF0402, "skull", "Island", "Default", "cm_pentagram")
+ AddTeam(loc("Badmad"), -1, "skull", "Island", "Default", "cm_pentagram")
enemy9 = AddHog(loc("C-1"), 1, 50, "cyborg2")
enemy10 = AddHog(loc("Hidden"), 1, 40, "bushhider")
enemy11 = AddHog(loc("Ronald"), 1, 70, "clown")
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Bazooka.lua Wed Aug 01 15:50:39 2018 +0200
@@ -47,7 +47,7 @@
------ TEAM LIST ------
- AddTeam(loc("Bazooka Team"), 0xFF0204, "Flower", "Earth", "Default", "hedgewars")
+ AddTeam(loc("Bazooka Team"), -1, "Flower", "Earth", "Default", "hedgewars")
hog = AddHog(loc("Greenhorn"), 0, 100, "NoHat")
SetGearPosition(hog, 1485, 2001)
SetEffect(hog, heResurrectable, 1)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Flying_Saucer.lua Wed Aug 01 15:50:39 2018 +0200
@@ -375,7 +375,7 @@
HealthDecrease = 0
-- Team name is a pun on “hedgehog” and “astronauts”
- AddTeam( loc( "Hogonauts" ), 0xDDDD00, "earth", "Earth", "Default", "cm_galaxy" )
+ AddTeam( loc( "Hogonauts" ), -9, "earth", "Earth", "Default", "cm_galaxy" )
-- Hedgehog name is a pun on “Neil Armstrong”
Player = AddHog( loc( "Neil Hogstrong" ), 0, 1, "NoHat" )
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Grenade.lua Wed Aug 01 15:50:39 2018 +0200
@@ -39,7 +39,7 @@
------ TEAM LIST ------
- AddTeam(loc("Grenade Team"), 0xFF0204, "Flower", "Earth", "Default", "cm_grenade")
+ AddTeam(loc("Grenade Team"), -1, "Flower", "Earth", "Default", "cm_grenade")
hog = AddHog(loc("Greenhorn"), 0, 1, "NoHat")
SetGearPosition(hog, 570, 157)
SetEffect(hog, heResurrectable, 1)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Movement.lua Wed Aug 01 15:50:39 2018 +0200
@@ -113,7 +113,7 @@
drawMap()
------ HOG LIST ------
- AddTeam(loc("Training Team"), 0xFF0204, "deadhog", "SteelTower", "Default", "hedgewars")
+ AddTeam(loc("Training Team"), -1, "deadhog", "SteelTower", "Default", "hedgewars")
hhs[1] = AddHog(loc("Greenhorn"), 0, 100, "NoHat")
SetGearPosition(hhs[1], 404, 1714)
--- a/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Missions/Training/Basic_Training_-_Rope.lua Wed Aug 01 15:50:39 2018 +0200
@@ -118,7 +118,7 @@
WaterRise = 0
HealthDecrease = 0
- AddTeam(teamName, 0xFF0204, "Plinko", "Snail", "Default", "cm_yinyang")
+ AddTeam(teamName, -1, "Plinko", "Snail", "Default", "cm_yinyang")
hog = AddHog(loc("Roper"), 0, initHogHealth, "StrawHat")
SetGearPosition(hog, cpX, cpY)
SetEffect(hog, heResurrectable, 1)
--- a/share/hedgewars/Data/Scripts/SimpleMission.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Scripts/SimpleMission.lua Wed Aug 01 15:50:39 2018 +0200
@@ -200,17 +200,6 @@
HELPER VARIABLES
]]
-local defaultClanColors = {
- [0] = 0xff0204, -- red
- [1] = 0x4980c1, -- blue
- [2] = 0x1de6ba, -- cyan
- [3] = 0xb541ef, -- purple
- [4] = 0xe55bb0, -- magenta
- [5] = 0x20bf00, -- green
- [6] = 0xfe8b0e, -- orange
- [7] = 0x5f3605, -- brown
- [8] = 0xffff01, -- yellow
-}
local defaultGraves = {
"Grave", "Statue", "pyramid", "Simple", "skull", "Badger", "Duck2", "Flower"
}
@@ -666,7 +655,7 @@
voice = def(teamData.voice, "Default")
flag = def(teamData.flag, defaultFlags[math.min(teamID, 8)])
- AddTeam(name, defaultClanColors[clanID], grave, fort, voice, flag)
+ AddTeam(name, -(clanID+1), grave, fort, voice, flag)
for hogID, hogData in pairs(teamData.hogs) do
local name, botLevel, health, hat
--- a/share/hedgewars/Data/Scripts/SpeedShoppa.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Scripts/SpeedShoppa.lua Wed Aug 01 15:50:39 2018 +0200
@@ -49,7 +49,7 @@
- teamName: name of the hedgehog’s team (default: "Shoppers")
- teamGrave: name of the hedgehog’s grave (default: "Statue")
- teamFlag: name of the team’s flag (default: "cm_shoppa")
- - clanColor: color of the (only) clan (default: 0xFF0204, which is a red tone)
+ - clanColor: color of the (only) clan (default: -1, default first clan color)
- goalText: A short string explaining the goal of the mission
(default: "Use your rope to collect all crates as fast as possible.")
- faceLeft: If true, the hog faces to the left initially, if false, it faces to the right.
@@ -78,7 +78,7 @@
if params.teamName == nil then params.teamName = loc("Shoppers") end
if params.goalText == nil then params.goalText = loc("Use your rope to collect all crates as fast as possible.") end
if params.missionTitle == nil then params.missionTitle = loc("Speed Shoppa") end
- if params.clanColor == nil then params.clanColor = 0xFF0204 end
+ if params.clanColor == nil then params.clanColor = -1 end
if params.teamGrave == nil then params.teamGrave = "Statue" end
if params.teamFlag == nil then params.teamFlag = "cm_shoppa" end
if params.extra_onGameInit == nil then params.extra_onGameInit = function() end end
--- a/share/hedgewars/Data/Scripts/TargetPractice.lua Wed Aug 01 02:49:03 2018 +0200
+++ b/share/hedgewars/Data/Scripts/TargetPractice.lua Wed Aug 01 15:50:39 2018 +0200
@@ -101,7 +101,7 @@
- teamGrave: name of the hedgehog’s grave
- teamFlag: name of the team’s flag (default: "cm_crosshair")
- secGearType: cluster of projectile gear (if present) (used to re-center camera)
- - clanColor: color of the (only) clan (default: 0xFF0204, which is a red tone)
+ - clanColor: color of the (only) clan (default: -1, default first clan color)
- goalText: A short string explaining the goal of the mission
(default: "Destroy all targets within the time!")
- shootText: A string which says how many times the player shot, “%d” is replaced
@@ -119,7 +119,7 @@
if params.teamName == nil then params.teamName = loc("Training Team") end
if params.goalText == nil then params.goalText = loc("Eliminate all targets before your time runs out.|You have unlimited ammo for this mission.") end
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.clanColor == nil then params.clanColor = -1 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