# HG changeset patch # User Wuzzy # Date 1531329251 -7200 # Node ID 2a0df47058490a6a1f182a1de7cd7160b287d250 # Parent 7a63e0a2d2ca1df9a10459731a81626704b77d8a ACF5: Fix Tribe not being in same clan as Natives Clan color was off-by-one, this was probably a hack. diff -r 7a63e0a2d2ca -r 2a0df4705849 ChangeLog.txt --- a/ChangeLog.txt Wed Jul 11 18:59:23 2018 +0200 +++ b/ChangeLog.txt Wed Jul 11 19:14:11 2018 +0200 @@ -36,6 +36,7 @@ A Classic Fairytale: * Fix clan membership of princess in some missions + * Mission 5: Tribe was not in same clan as Natives, screwing up stats a bit A Space Adventure: * Fix clan membership of PAotH in main Death Planet mission diff -r 7a63e0a2d2ca -r 2a0df4705849 share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua --- a/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Jul 11 18:59:23 2018 +0200 +++ b/share/hedgewars/Data/Missions/Campaign/A_Classic_Fairytale/backstab.lua Wed Jul 11 19:14:11 2018 +0200 @@ -960,29 +960,28 @@ end function AddHogs() - AddTeam(loc("Natives"), 29439, "Bone", "Island", "HillBilly", "cm_birdy") + AddTeam(loc("Tribe"), 0x0072FF, "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") for i = 1, 7 do natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i]) end nativesNum = 7 - AddTeam(loc("Tribe"), 29438, "Bone", "Island", "HillBilly", "cm_birdy") - for i = 8, 9 do - natives[i] = AddHog(nativeNames[i], 0, 100, nativeHats[i]) - end - - - AddTeam(loc("Assault Team"), 14483456, "skull", "Island", "Pirate", "cm_vampire") + AddTeam(loc("Assault Team"), 0xDD0000, "skull", "Island", "Pirate", "cm_vampire") for i = 1, 6 do cannibals[i] = AddHog(cannibalNames[i], 3, 50, "vampirichog") end - AddTeam(loc("Reinforcements"), 14483456, "skull", "Island", "Pirate", "cm_vampire") + AddTeam(loc("Reinforcements"), 0xDD0000, "skull", "Island", "Pirate", "cm_vampire") for i = 7, 9 do cannibals[i] = AddHog(cannibalNames[i], 2, 50, "vampirichog") end - AddTeam(loc("011101001"), 14483456, "ring", "UFO", "Robot", "cm_binary") + AddTeam(loc("011101001"), 0xDD0000, "ring", "UFO", "Robot", "cm_binary") cyborg = AddHog(loc("Unit 334a$7%;.*"), 0, 200, "cyborg1") for i = 1, 9 do @@ -1013,7 +1012,8 @@ function onGameInit() Seed = 2 - GameFlags = gfSolidLand + -- gfTagTeam makes it easier to skip the Tribe team + GameFlags = gfSolidLand + gfTagTeam TurnTime = 60000 CaseFreq = 0 MinesNum = 0