--- a/ChangeLog.txt Fri Dec 21 02:07:11 2018 +0100
+++ b/ChangeLog.txt Fri Dec 21 06:33:33 2018 +0100
@@ -11,6 +11,7 @@
+ Restructure credits
+ Credits screen in main menu is now translatable
+ Don't show crate spawn message for initial crates in missions
+ * Use player-chosen team identity in campaigns and singleplayer missions
* Fix last 2 characters in demo chat being missing
* King Mode: Fix team sometimes not being killed properly if king drowned
* King Mode: Kill resurrected minions if king is not alive
--- a/share/hedgewars/Data/Locale/campaigns_de.txt Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Locale/campaigns_de.txt Fri Dec 21 06:33:33 2018 +0100
@@ -33,43 +33,43 @@
A_Space_Adventure.name="Ein Weltraumabenteuer"
A_Space_Adventure-cosmos.name="Menü: Weltraumreise"
-A_Space_Adventure-cosmos.desc="Hogera, der Igelplanet, wird bald von einem riesigen Meteorit getroffen. In diesem Wettlauf ums Überleben musst du PAdIs besten Piloten, Igel Einsam, in einer Weltraumreise um die Nachbarplaneten führen, um alle 4 Teile des lang verschollenem Antigravitationsgeräts zu finden!"
+A_Space_Adventure-cosmos.desc="Hogera, der Igelplanet, wird bald von einem riesigen Meteorit getroffen. In diesem Wettlauf ums Überleben musst du einen mutigen Igel, der von der Planetaren Assoziation der Igel (PAdI) beauftragt wurde, in einer Weltraumreise um die Nachbarplaneten führen, um alle 4 Teile des lang verschollenem Antigravitationsgeräts zu finden."
A_Space_Adventure-moon01.name="Hauptmission: Der erste Halt"
-A_Space_Adventure-moon01.desc="Igel Einsam ist auf dem Mond gelandet, um seine fliegende Untertasse aufzutanken, aber Prof. Bösigel war zuerst da und hat einen Hinterhalt aufgestellt! Rette die gefangenen PAdI-Forscher und verscheuche Prof. Bösigel!"
+A_Space_Adventure-moon01.desc="Unser Held ist auf dem Mond gelandet, um die fliegende Untertasse aufzutanken, aber Prof. Bösigel war zuerst da und hat einen Hinterhalt aufgestellt! Rette die gefangenen PAdI-Forscher und verscheuche Prof. Bösigel!"
A_Space_Adventure-moon02.name="Nebenmission: Jag den blauen Igel"
-A_Space_Adventure-moon02.desc="Igel Einsam besucht einen Eremiten, einen alten PAdI-Veteran, der im Mond lebt, um Prof. Bösigel auszuspionieren. Allerdings muss er den Eremiten, Verrückter Renner, zuerst in einem Wettlauf besiegen!"
+A_Space_Adventure-moon02.desc="Unser Held besucht einen Eremiten, einen alten PAdI-Veteranen, der im Mond lebt, um Prof. Bösigel auszuspionieren. Allerdings musst du den Eremiten, Verrückter Renner, zuerst in einem Wettlauf besiegen!"
A_Space_Adventure-ice01.name="Hauptmission: Ein frostiges Abenteuer"
-A_Space_Adventure-ice01.desc="Willkommen auf dem Planeten des Eises. Hier ist es so kalt, dass die meisten Waffen von Igel Einsam nicht funktionieren werden. Du musst dir das verlorene Teil von dem Banditenanführer Thanta ergattern, indem du die Waffen, die du hier findest, verwendest!"
+A_Space_Adventure-ice01.desc="Willkommen auf dem Planeten des Eises. Hier ist es so kalt, dass die meisten Waffen nicht funktionieren werden. Du musst dir das verlorene Teil von dem Banditenanführer Thanta ergattern, indem du die Waffen, die du hier findest, verwendest!"
A_Space_Adventure-ice02.name="Nebenmission: Schwerer Flug"
-A_Space_Adventure-ice02.desc="Igel Einsam konnte nicht einfach nur den Eisplaneten besuchen, ohne das Olympiastadion des Untertassenfliegens zu besuchen! In dieser Mission kannst du deine Flugkünste unter Beweis stellen und deinen Platz unter den Besten einnehmen!"
+A_Space_Adventure-ice02.desc="Unser Held konnte nicht einfach nur den Eisplaneten besuchen, ohne das Olympiastadion des Untertassenfliegens zu besuchen! In dieser Mission kannst du deine Flugkünste unter Beweis stellen und deinen Platz unter den Besten einnehmen!"
A_Space_Adventure-desert01.name="Hauptmission: Suche im Staub"
-A_Space_Adventure-desert01.desc="Du bist auf dem Planeten aus Sand gelandet! Igel Einsam muss das fehlende Teil in den Bergwerksstollen finden. Sei vorsichtig, weil bösartige Schmuggler nur darauf warten, dich anzugreifen und auszurauben!"
+A_Space_Adventure-desert01.desc="Du bist auf dem Planeten aus Sand gelandet! Unser Held muss das fehlende Teil in den Bergwerksstollen finden. Sei vorsichtig, weil bösartige Schmuggler nur darauf warten, dich anzugreifen und auszurauben!"
A_Space_Adventure-desert02.name="Nebenmission: Lauf um dein Leben"
-A_Space_Adventure-desert02.desc="Igel Einsam suchte nach dem Teil in diesem Tunnel, als er unerwarteterweise anfing, geflutet zu werden! Komm so schnell wie möglich zur Oberfläche und pass auf, keine Mine auszulösen."
+A_Space_Adventure-desert02.desc="Unser Held suchte nach dem Teil in diesem Tunnel, als er unerwarteterweise anfing, geflutet zu werden! Komm so schnell wie möglich zur Oberfläche und pass auf, keine Mine auszulösen."
A_Space_Adventure-desert03.name="Nebenmission: Präzisionsfliegen"
-A_Space_Adventure-desert03.desc="Igel Einsam hat etwas Zeit, um sein Funkflugzeug zu fliegen und etwas Spaß zu haben. Flieg das Funkflugzeug und triff alle Ziele!"
+A_Space_Adventure-desert03.desc="Unser Held hat etwas Zeit, um mit Funkflugzeugen zu spielen und etwas Spaß zu haben. Flieg das Funkflugzeug und triff alle Ziele!"
A_Space_Adventure-fruit01.name="Hauptmission: Schlechtes Timing"
A_Space_Adventure-fruit01.desc="Auf dem Obstplaneten laufen die Dinge nicht so gut. Igel sammeln kein Obst, sondern sie bereiten sich auf den Kampf vor. Du musst dich entscheiden, ob du kämpfen oder fliehen wirst."
A_Space_Adventure-fruit02.name="Hauptmission: Zum Greifen nah"
-A_Space_Adventure-fruit02.desc="Igel Einsam nähert sich dem verlorenen Teil des Obstplaneten. Wird ihn Leutnant Limone dabei helfen, das Teil zu besorgen? Oder nicht?"
+A_Space_Adventure-fruit02.desc="Unser Held nähert sich dem verlorenen Teil des Obstplaneten. Wird ihn Leutnant Limone dabei helfen, das Teil zu besorgen? Oder nicht?"
A_Space_Adventure-fruit03.name="Nebenmission: Präzisionsschießen"
-A_Space_Adventure-fruit03.desc="Igel Einsam hat sich verlaufen und ist in dem Hinterhalt der Roten Erdbeeren geraten. Hilf ihm, sie zu eliminieren, um etwas zusätzliche Munition für die Mission »Zum Greifen nah« zu gewinnen."
+A_Space_Adventure-fruit03.desc="Unser Held hat sich verlaufen und ist in dem Hinterhalt der Roten Erdbeeren geraten. Hilf ihm, sie zu eliminieren, um etwas zusätzliche Munition für die Mission »Zum Greifen nah« zu gewinnen."
A_Space_Adventure-death01.name="Hauptmission: Das letzte Gefecht"
-A_Space_Adventure-death01.desc="Auf dem Todesplaneten, dem sterilsten Planeten in der Gegend, ist Igel Einsam ganz kurz davor, das letzte Teil des Geräts zu holen! Allerdings erwartet ihn eine unangenehme Überraschung."
+A_Space_Adventure-death01.desc="Auf dem Todesplaneten, dem sterilsten Planeten in der Gegend, ist unser Held ganz kurz davor, das letzte Teil des Geräts zu holen! Allerdings erwartet ihn eine unangenehme Überraschung."
A_Space_Adventure-death02.name="Nebenmission: Die Spezialisten töten"
-A_Space_Adventure-death02.desc="Igel Einsam ist wieder in eine schwierige Situation geraten. Hilf ihm, die »5 tödlichen Igel« in ihrem eigenem Spiel zu besiegen!"
+A_Space_Adventure-death02.desc="Unser Held ist wieder in eine schwierige Situation geraten. Besiege die »5 tödlichen Igel« in ihrem eigenem Spiel!"
A_Space_Adventure-final.name="Hauptmission: Der große Knall"
-A_Space_Adventure-final.desc="Igel Einsam muss ein paar Sprengkörper, die auf dem Meteoriten platziert wurden, detonieren. Hilf ihm, diese Mission zu beenden, ohne verletzt zu werden!"
+A_Space_Adventure-final.desc="Unser Held muss ein paar Sprengkörper, die auf dem Meteoriten platziert wurden, detonieren. Beende diese Mission, ohne verletzt zu werden!"
--- a/share/hedgewars/Data/Locale/campaigns_en.txt Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Locale/campaigns_en.txt Fri Dec 21 06:33:33 2018 +0100
@@ -32,30 +32,30 @@
A_Space_Adventure.name="A Space Adventure"
A_Space_Adventure-cosmos.name="Menu: Spacetrip"
-A_Space_Adventure-cosmos.desc="Hogera, the planet of hogs is about to be hit by a gigantic meteorite. In this race for survival you have to lead PAotH's best pilot, Hog Solo, in a space trip around the neighbor planets to collect all the 4 pieces of the long lost anti gravity device!"
+A_Space_Adventure-cosmos.desc="Hogera, the planet of hogs, is about to be hit by a gigantic meteorite. In this race for survival you have to lead a brave hedgehog, who was commissioned by the Planetary Association of the Hedgehogs (PAotH), on a space trip around the neighbor planets to collect all the 4 pieces of the long lost anti gravity device."
A_Space_Adventure-moon01.name="Main Mission: The first stop"
-A_Space_Adventure-moon01.desc="Hog Solo has landed on the moon to refuel his saucer but professor Hogevil has gone there first and set an ambush! Rescue the captured PAotH researchers and drive Professor Hogevil away!"
+A_Space_Adventure-moon01.desc="Our hero has landed on the moon to refuel the flying saucer but Professor Hogevil has gone there first and set an ambush! Rescue the captured PAotH researchers and drive Professor Hogevil away!"
A_Space_Adventure-moon02.name="Side Mission: Chasing the blue hog"
-A_Space_Adventure-moon02.desc="Hog Solo visits an hermit, old PAotH veteran, who lives on the moon in order to gather some intel about Prof. Hogevil. However, he has to beat the hermit, Soneek the Crazy Runner, in a chase game first!"
+A_Space_Adventure-moon02.desc="Our hero visits an hermit, old PAotH veteran, who lives on the moon in order to gather some intel about Prof. Hogevil. However, you have to beat the hermit, Crazy Runner, in a chase game first!"
A_Space_Adventure-ice01.name="Main Mission: A frozen adventure"
-A_Space_Adventure-ice01.desc="Welcome to the planet of ice. Here, it's so cold that most of Hog Solo's weapons won't work. You have to get the lost part from the bandit leader Thanta using the weapons that you'll find there!"
+A_Space_Adventure-ice01.desc="Welcome to the planet of ice. Here, it's so cold that most weapons won't work. You have to get the lost part from the bandit leader Thanta using the weapons that you'll find there!"
A_Space_Adventure-ice02.name="Side Mission: Hard flying"
-A_Space_Adventure-ice02.desc="Hog Solo couldn't just visit the Ice Planet without visiting the Olympic Stadium of Saucer Flying! In this mission you can prove your flying skills and claim your place among the best!"
+A_Space_Adventure-ice02.desc="Our hero couldn't just visit the Ice Planet without visiting the Olympic Stadium of Saucer Flying! In this mission you can prove your flying skills and claim your place among the best!"
A_Space_Adventure-desert01.name="Main Mission: Searching in the dust"
-A_Space_Adventure-desert01.desc="You have landed to the planet of sand! Hog Solo has to find the missing part in the underground tunnels. Be careful as vicious smugglers await to attack and rob you!"
+A_Space_Adventure-desert01.desc="You have landed to the planet of sand! Our hero has to find the missing part in the underground tunnels. Be careful as vicious smugglers await to attack and rob you!"
A_Space_Adventure-desert02.name="Side Mission: Running for survival"
-A_Space_Adventure-desert02.desc="Hog Solo was searching for the part in this tunnel when it unexpectedly start getting flooded! Get to the surface as soon as possible and be careful not to trigger a mine."
+A_Space_Adventure-desert02.desc="Our hero was searching for the part in this tunnel when it unexpectedly start getting flooded! Get to the surface as soon as possible and be careful not to trigger a mine."
A_Space_Adventure-desert03.name="Side Mission: Precise flying"
-A_Space_Adventure-desert03.desc="Hog Solo has some time to fly his RC plane and have some fun. Fly the RC plane and hit all the targets!"
+A_Space_Adventure-desert03.desc="Our hero has some time to play with RC planes and have some fun. Fly the RC plane and hit all the targets!"
A_Space_Adventure-fruit01.name="Main Mission: Bad timing"
-A_Space_Adventure-fruit01.desc="In the fruit planet things aren't going so well. Hogs aren't collecting fruits but they are preparing for battle. You'll have to choose if you'll fight or if you'll flee."
+A_Space_Adventure-fruit01.desc="On the fruit planet things aren't going so well. Hogs aren't collecting fruits but they are preparing for battle. You'll have to choose if you'll fight or if you'll flee."
A_Space_Adventure-fruit02.name="Main Mission: Getting to the device"
-A_Space_Adventure-fruit02.desc="Hog Solo gets closer to the lost part on the Fruit Planet. Will Captain Lime help him acquire the part or not?"
+A_Space_Adventure-fruit02.desc="Our hero gets closer to the lost part on the Fruit Planet. Will Captain Lime help you acquire the part or not?"
A_Space_Adventure-fruit03.name="Main Mission: Precise shooting"
-A_Space_Adventure-fruit03.desc="Hog Solo got lost and got ambushed by the Red Strawberries. Help him eliminate them and win some extra ammo for the mission “Getting to the device”."
+A_Space_Adventure-fruit03.desc="Our hero got lost and got ambushed by the Red Strawberries. Eliminate them and win some extra ammo for the mission “Getting to the device”."
A_Space_Adventure-death01.name="Main Mission: The last encounter"
-A_Space_Adventure-death01.desc="On the Death Planet, the most infertile planet around, Hog Solo is very close to get the last part of the device! However, an unpleasant surprise awaits him ..."
+A_Space_Adventure-death01.desc="On the Death Planet, the most infertile planet around, our hero is very close to get the last part of the device! However, an unpleasant surprise awaits ..."
A_Space_Adventure-death02.name="Side Mission: Killing the specialists"
-A_Space_Adventure-death02.desc="Again Hog Solo has got himself in a difficult situation. Help him defeat the “5 Deadly Hogs“ in their own game!"
+A_Space_Adventure-death02.desc="Again our hero has gotten in a difficult situation. Defeat the “5 Deadly Hogs“ in their own game!"
A_Space_Adventure-final.name="Main Mission: The big bang"
-A_Space_Adventure-final.desc="Hog Solo has to detonate some explosives that have been placed on the meteorite. Help him complete his mission without getting hurt!"
+A_Space_Adventure-final.desc="Our hero has to detonate some explosives that have been placed on the meteorite. Complete this mission without getting hurt!"
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/cosmos.lua Fri Dec 21 06:33:33 2018 +0100
@@ -32,7 +32,7 @@
local dialog09 = {}
-- mission objectives
local goals = {
- ["init"] = {missionName, loc("Getting ready"), loc("Help Hog Solo to find all the parts of the anti-gravity device.")..
+ ["init"] = {missionName, loc("Getting ready"), loc("Find all the parts of the anti-gravity device.")..
"|"..loc("Travel to all the neighbor planets and collect all the pieces"), 1, 0},
[dialog01] = {missionName, loc("Getting ready"), loc("Go and collect the crate").."|"..loc("Try not to get spotted by the guards!"), 1, 4500},
[dialog02] = {missionName, loc("The adventure begins!"), loc("Use the saucer and fly to the moon").."|"..loc("Travel carefully as your fuel is limited"), 1, 4500},
@@ -118,19 +118,20 @@
Map = "cosmos_map" -- custom map included in file
end
Theme = "Nature"
- -- I had originally hero in PAotH team and changed it, may reconsider though
- -- PAotH
- AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamC.name = AddMissionTeam(teamC.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
- AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy")
+ -- PAotH
+ teamA.name = 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", "Default", "cm_swordshield2")
+ teamB.name = 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")
@@ -474,7 +475,7 @@
SaveCampaignVar("Mission1", "2")
SaveCampaignVar("Mission2", "13")
SaveCampaignVar("Mission3", "1")
- sendStats(loc("Hog Solo arrived at the moon!"))
+ sendStats(string.format(loc("%s arrived at the moon!"), hero.name))
end
end
@@ -507,7 +508,7 @@
SaveCampaignVar("Mission2", "10")
SaveCampaignVar("Mission3", "1")
end
- sendStats(loc("Hog Solo arrived at the Fruit Planet!"))
+ sendStats(string.format(loc("%s arrived at the Fruit Planet!"), hero.name))
end
end
@@ -522,7 +523,7 @@
SaveCampaignVar("Mission2", "7")
SaveCampaignVar("Mission3", "12")
SaveCampaignVar("Mission4", "1")
- sendStats(loc("Hog Solo arrived at the Desert Planet!"))
+ sendStats(string.format(loc("%s arrived at the Desert Planet!"), hero.name))
end
end
@@ -536,7 +537,7 @@
SaveCampaignVar("Mission1", "5")
SaveCampaignVar("Mission2", "6")
SaveCampaignVar("Mission3", "1")
- sendStats(loc("Hog Solo arrived at the Ice Planet!"))
+ sendStats(string.format(loc("%s arrived at the Ice Planet!"), hero.name))
end
end
@@ -552,7 +553,7 @@
SaveCampaignVar("Mission1", "9")
SaveCampaignVar("Mission2", "11")
SaveCampaignVar("Mission3", "1")
- sendStats(loc("Hog Solo arrived at the Planet of Death!"))
+ sendStats(string.format(loc("%s arrived at the Planet of Death!"), hero.name))
end
end
@@ -568,7 +569,7 @@
SaveCampaignVar("UnlockedMissions", "2")
SaveCampaignVar("Mission1", "14")
SaveCampaignVar("Mission2", "1")
- sendStats(loc("Hog Solo arrived at the meteorite!"))
+ sendStats(string.format(loc("%s arrived at the meteorite!"), hero.name))
end
end
@@ -649,7 +650,7 @@
AddSkipFunction(dialog01, Skipanim, {dialog01})
table.insert(dialog01, {func = AnimWait, args = {doctor.gear, 3000}})
table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Near Secret Base 17 of PAotH in the rural Hogland ..."), 4000}})
- table.insert(dialog01, {func = AnimSay, args = {director.gear, loc("So Hog Solo, here we are ..."), SAY_SAY, 2000}})
+ table.insert(dialog01, {func = AnimSay, args = {director.gear, string.format(loc("So, %s, here we are ..."), hero.name), SAY_SAY, 2000}})
table.insert(dialog01, {func = AnimSay, args = {director.gear, loc("Behind these trees on the east side there is Secret Base 17."), SAY_SAY, 4000}})
table.insert(dialog01, {func = AnimSay, args = {director.gear, loc("You have to continue alone from now on."), SAY_SAY, 3000}})
table.insert(dialog01, {func = AnimSay, args = {director.gear, loc("Be careful, the future of Hogera is in your hands!"), SAY_SAY, 7200}})
@@ -705,7 +706,7 @@
-- DIALOG 08 - Hero wins death01
AddSkipFunction(dialog08, Skipanim, {dialog08})
table.insert(dialog08, {func = AnimCaption, args = {hero.gear, loc("Under the meteorite’s shadow ..."), 4000}})
- table.insert(dialog08, {func = AnimSay, args = {doctor.gear, loc("You did great, Hog Solo! However, we aren't out of danger yet!"), SAY_SHOUT, 4500}})
+ table.insert(dialog08, {func = AnimSay, args = {doctor.gear, string.format(loc("You did great, %s! However, we aren't out of danger yet!"), hero.name), SAY_SHOUT, 4500}})
table.insert(dialog08, {func = AnimSay, args = {doctor.gear, loc("The meteorite has come too close and the anti-gravity device isn't powerful enough to stop it now."), SAY_SHOUT, 5000}})
table.insert(dialog08, {func = AnimSay, args = {doctor.gear, loc("We need it to get split into at least two parts."), SAY_SHOUT, 3000}})
table.insert(dialog08, {func = AnimSay, args = {doctor.gear, loc("PAotH has sent explosives but unfortunately the trigger mechanism seems to be faulty!"), SAY_SHOUT, 5000}})
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua Fri Dec 21 06:33:33 2018 +0100
@@ -3,7 +3,7 @@
-- This is the mission to acquire the last part.
-- This mission is the cameo of Professor Hogevil
-- who has took hostages H and Dr. Cornelius.
--- Hog Solo has to defeat him and his thugs.
+-- The hero has to defeat him and his thugs.
HedgewarsScriptLoad("/Scripts/Locale.lua")
HedgewarsScriptLoad("/Scripts/Animate.lua")
@@ -103,13 +103,14 @@
Map = "death01_map"
Theme = "Hell"
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- PAotH
- AddTeam(teamB.name, teamB.color, "Earth", "Island", "Default", "cm_galaxy")
+ teamB.name = 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)
@@ -120,7 +121,7 @@
SetGearAIHints(paoth2.gear, aihDoesntMatter)
-- Professor and Thugs
- AddTeam(teamC.name, teamC.color, "eyecross", "Island", "Default", "cm_sine")
+ teamC.name = 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)
@@ -131,7 +132,7 @@
HogTurnLeft(thugs[i].gear, not thugs[i].turnLeft)
end
- AddTeam(teamC.name, teamC.color, "star", "Island", "Default", "cm_sine")
+ teamC.name = 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)
@@ -274,7 +275,7 @@
-------------- ACTIONS ------------------
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("To win the game you have to eliminate Professor Hogevil."))
sendSimpleTeamRankings({teamC.name, teamA.name, teamB.name})
EndGame()
@@ -303,7 +304,7 @@
AddSkipFunction(dialog01, Skipanim, {dialog01})
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 3000}})
table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Somewhere on the uninhabitable Death Planet ..."), 5000}})
- table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("Welcome Hog Solo, surprised to see me?"), SAY_SAY, 4000}})
+ table.insert(dialog01, {func = AnimSay, args = {professor.human, string.format(loc("Welcome, %s, surprised to see me?"), hero.name), SAY_SAY, 4000}})
if profDiedOnMoon then
table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("After you left the moon, my other loyal minions came and resurrected me so I could complete my master plan."), SAY_SAY, 6000}})
else
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death02.lua Fri Dec 21 06:33:33 2018 +0100
@@ -70,13 +70,14 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- enemies
shuffleHogs(enemies)
- AddTeam(teamB.name, teamB.color, "skull", "Island", "Default", "cm_skull")
+ teamB.name = 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)
@@ -208,7 +209,7 @@
-------------- ACTIONS ------------------
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to eliminate all the enemies."))
SendStat(siCustomAchievement, loc("Read the challenge objectives from within the mission for more details."))
sendSimpleTeamRankings({teamB.name, teamA.name})
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert01.lua Fri Dec 21 06:33:33 2018 +0100
@@ -1,6 +1,6 @@
------------------- ABOUT ----------------------
--
--- In the desert planet Hero will have to explore
+-- In the desert planet, the hero will have to explore
-- the dunes below the surface and find the hidden
-- crates. It is told that one crate contains the
-- lost part.
@@ -101,17 +101,18 @@
-- get hero health
local heroHealth = 100
- -- Hog Solo
- AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, heroHealth, "war_desertgrenadier1")
+ -- Hero
+ teamC.name = AddMissionTeam(teamC.color)
+ hero.gear = AddMissionHog(heroHealth)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
-- PAotH undercover scientist and chief Sandologist
- AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy")
+ teamA.name = 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", "Default", "cm_bloodyblade")
+ teamB.name = 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")
@@ -540,7 +541,7 @@
end
function lose()
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("To win the game you have to find the right crate."))
SendStat(siCustomAchievement, loc("You can avoid some battles."))
SendStat(siCustomAchievement, loc("Use your ammo wisely."))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert02.lua Fri Dec 21 06:33:33 2018 +0100
@@ -75,9 +75,10 @@
Map = "desert02_map"
Theme = "Desert"
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
@@ -172,7 +173,7 @@
-------------- ACTIONS ------------------
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("To win the game you have to go to the surface."))
SendStat(siCustomAchievement, loc("Most mines are not active."))
SendStat(siCustomAchievement, loc("From the second turn and beyond the water rises."))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/desert03.lua Fri Dec 21 06:33:33 2018 +0100
@@ -73,9 +73,10 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(1)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
initCheckpoint("desert03")
@@ -235,7 +236,7 @@
end
function gameOver()
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to destroy all the targets."))
SendStat(siCustomAchievement, loc("You will fail if you run out of ammo and there are still targets available."))
SendStat(siCustomAchievement, loc("Read the challenge objectives from within the mission for more details."))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/final.lua Fri Dec 21 06:33:33 2018 +0100
@@ -50,9 +50,10 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(1)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
initCheckpoint("final")
@@ -151,7 +152,7 @@
-------------- ACTIONS ------------------
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to destroy all the explosives without dying!"))
SendStat(siCustomAchievement, loc("Areas surrounded by a security border are indestructible."))
SendStat(siCustomAchievement, loc("Areas surrounded by a green dashed outline are portal-proof and repel portals."))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit01.lua Fri Dec 21 06:33:33 2018 +0100
@@ -39,7 +39,7 @@
loc("What do you want to do?").."| |"..
loc("Fight: Press [Attack]").."|"..
loc("Flee: Press [Jump]"), 1, 9999000, true},
- [dialog02] = {missionName, loc("Battle Starts Now!"), loc("You have chosen to fight!").."|"..loc("Lead the Green Bananas to battle and eliminate all the enemies!"), 1, 5000},
+ [dialog02] = {missionName, loc("Battle Starts Now!"), loc("You have chosen to fight!").."|"..loc("Lead your allies to battle and eliminate all the enemies!"), 1, 5000},
[dialog03] = {missionName, loc("Time to run!"), loc("You have chosen to flee.").."|"..loc("You have to reach the left-most place on the map."), 1, 5000},
["fight"] = {missionName, loc("Ready for Battle?"), loc("You have chosen to fight!"), 1, 2000},
["flee"] = {missionName, loc("Ready for Battle?"), loc("You have chosen to flee."), 1, 2000},
@@ -119,17 +119,18 @@
Map = "fruit01_map"
Theme = "Fruit"
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
-- Captain Lime
- AddTeam(teamD.name, teamD.color, "Cherry", "Island", "Default", "congo-brazzaville")
+ teamD.name = 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", "Default", "congo-brazzaville")
+ teamB.name = 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)
@@ -143,7 +144,7 @@
AnimSetGearPosition(green5.gear, green5.x, green5.y)
HogTurnLeft(green5.gear, true)
-- Yellow Watermelons
- AddTeam(teamC.name, teamC.color, "Flower", "Island", "Default", "cm_mog")
+ teamC.name = 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
@@ -360,7 +361,7 @@
function battleWin(gear)
-- add stats
saveVariables()
- SendStat(siGameResult, loc("Green Bananas won!"))
+ SendStat(siGameResult, string.format(loc("%s won!"), teamB.name))
SendStat(siCustomAchievement, loc("You have eliminated all visible enemy hedgehogs!"))
sendSimpleTeamRankings({teamA.name, teamD.name, teamB.name, teamC.name})
EndGame()
@@ -370,7 +371,7 @@
RemoveEventFunc(heroOnLaunchPadWithEnemies)
-- add stats
saveVariables()
- SendStat(siGameResult, loc("Hog Solo escaped successfully!"))
+ SendStat(siGameResult, string.format(loc("%s escaped successfully!"), hero.name))
SendStat(siCustomAchievement, loc("You have reached the take-off area successfully!"))
sendSimpleTeamRankings({teamA.name, teamD.name, teamB.name, teamC.name})
EndGame()
@@ -417,17 +418,17 @@
end
function AnimationSetup()
- -- DIALOG 01 - Start, Captain Lime talks explains to Hog Solo
+ -- DIALOG 01 - Start, Captain Lime talks and explains stuff to hero
AddSkipFunction(dialog01, Skipanim, {dialog01})
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 1000}})
table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Somewhere on the Planet of Fruits a terrible war is about to begin ..."), 5000}})
table.insert(dialog01, {func = AnimSay, args = {hero.gear, loc("I was told that as the leader of the king's guard, no one knows this world better than you!"), SAY_SAY, 5000}})
table.insert(dialog01, {func = AnimSay, args = {hero.gear, loc("So, I kindly ask for your help."), SAY_SAY, 3000}})
table.insert(dialog01, {func = AnimWait, args = {green1.gear, 2000}})
- table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("You couldn't have come to a worse time, Hog Solo!"), SAY_SAY, 3000}})
+ table.insert(dialog01, {func = AnimSay, args = {green1.gear, string.format(loc("You couldn't have come to a worse time, %s!"), hero.name), SAY_SAY, 3000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("The clan of the Red Strawberry wants to take over the dominion and overthrow King Pineapple."), SAY_SAY, 5000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("Under normal circumstances we could easily defeat them but we have kindly sent most of our men to the Kingdom of Sand to help with the annual dusting of the king's palace."), SAY_SAY, 8000}})
- table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("However, the army of Yellow Watermelons is about to attack any moment now."), SAY_SAY, 4000}})
+ table.insert(dialog01, {func = AnimSay, args = {green1.gear, string.format(loc("However, the army of %s is about to attack any moment now."), teamC.name), SAY_SAY, 4000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("I would gladly help you if we won this battle but under these circumstances I'll only help you if you fight for our side."), SAY_SAY, 6000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("What do you say? Will you fight for us?"), SAY_SAY, 3000}})
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 500}})
@@ -435,7 +436,7 @@
table.insert(dialog01, {func = AfterDialog01, args = {}})
-- DIALOG 02 - Hero selects to fight
AddSkipFunction(dialog02, Skipanim, {dialog02})
- table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("You choose well, Hog Solo!"), SAY_SAY, 3000}})
+ table.insert(dialog02, {func = AnimSay, args = {green1.gear, string.format(loc("You choose well, %s!"), hero.name), SAY_SAY, 3000}})
table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("I have only 3 hogs available and they are all cadets."), SAY_SAY, 4000}})
table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("As you are more experienced, I want you to lead them to battle."), SAY_SAY, 4000}})
table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("Of course, I will observe the battle and intervene if necessary."), SAY_SAY, 5000}})
@@ -464,7 +465,7 @@
function startBattle()
AnimSetInputMask(0xFFFFFFFF)
- -- Hog Solo weapons
+ -- Hero weapons
AddAmmo(hero.gear, amRope, 2)
AddAmmo(hero.gear, amBazooka, 3)
AddAmmo(hero.gear, amParachute, 1)
@@ -478,14 +479,14 @@
function gameLost()
if chooseToBattle then
- SendStat(siGameResult, loc("The Green Bananas lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), teamB.name))
SendStat(siCustomAchievement, loc("You have to eliminate all the visible enemies."))
SendStat(siCustomAchievement, loc("5 additional enemies will be spawned during the game."))
SendStat(siCustomAchievement, loc("You are in control of all the active ally units."))
SendStat(siCustomAchievement, loc("The ally units share their ammo."))
SendStat(siCustomAchievement, loc("Try to keep as many allies alive as possible."))
else
- SendStat(siGameResult, loc("Hog Solo couldn't escape, try again!"))
+ SendStat(siGameResult, string.format(loc("%s couldn't escape, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to get to the left-most land and remove any enemy hog from there."))
SendStat(siCustomAchievement, loc("You will play every 3 turns."))
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit02.lua Fri Dec 21 06:33:33 2018 +0100
@@ -22,12 +22,7 @@
local dialog05 = {}
-- mission objectives
local minesTimeText = loc("Mines time: 0 seconds")
-local goals = {
- [dialog01] = {missionName, loc("Exploring the tunnel"), loc("Search for the device with the help of the other hedgehogs ").."|"..loc("Hog Solo has to reach the last crates") .. "|" .. minesTimeText, 1, 4000},
- [dialog02] = {missionName, loc("Exploring the tunnel"), loc("Explore the tunnel with the other hedgehogs and search for the device").."|"..loc("Hog Solo has to reach the last crates") .. "|" .. minesTimeText, 1, 4000},
- [dialog03] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack Captain Lime before he attacks back").."|"..minesTimeText, 1, 4000},
- [dialog04] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack the assassins before they attack back").."|"..minesTimeText, 1, 4000},
-}
+local goals
-- crates
local girderCrate = {name = amGirder, x = 1680, y = 1160}
@@ -51,13 +46,16 @@
hero.y = 820
hero.dead = false
green1.name = loc("Captain Lime")
+green1.hat = "war_desertofficer"
green1.x = 1050
green1.y = 820
green1.dead = false
green2.name = loc("Mister Pear")
+green2.hat = "war_britmedic"
green2.x = 1350
green2.y = 820
green3.name = loc("Lady Mango")
+green3.hat = "hair_red"
green3.x = 1450
green3.y = 820
local redHedgehogs = {
@@ -101,22 +99,37 @@
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)
+ SetGearPosition(redHedgehogs[i].gear, 2010 + 50*i, 630)
end
local assassinsColor = div(GetClanColor(GetHogClan(redHedgehogs[1].gear)), 0x100)
- -- Hog Solo and Green Bananas
- 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)
+ -- Hero and Green Bananas
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(health)
+ hero.name = GetHogName(hero.gear)
+ SetHogTeamName(hero.gear, string.format(loc("%s and GB"), teamA.name))
+ teamA.name = GetHogTeamName(hero.gear)
+ SetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
- green2.gear = AddHog(green2.name, 0, 100, "war_britmedic")
- AnimSetGearPosition(green2.gear, green2.x, green2.y)
+ local heroColor = div(GetClanColor(GetHogClan(hero.gear)), 0x100)
+
+ -- companions
+ -- Change companion identity if they have same name as hero
+ -- to avoid confusion.
+ if green2.name == hero.name then
+ green2.name = loc("Green Hog Grape")
+ green2.hat = "war_desertsapper1"
+ elseif green3.name == hero.name then
+ green3.name = loc("Green Hog Grape")
+ green3.hat = "war_desertsapper1"
+ end
+ green2.gear = AddHog(green2.name, 0, 100, green2.hat)
+ SetGearPosition(green2.gear, green2.x, green2.y)
HogTurnLeft(green2.gear, true)
- green3.gear = AddHog(green3.name, 0, 100, "hair_red")
- AnimSetGearPosition(green3.gear, green3.x, green3.y)
+
+ green3.gear = AddHog(green3.name, 0, 100, green3.hat)
+ SetGearPosition(green3.gear, green3.x, green3.y)
HogTurnLeft(green3.gear, true)
- local heroColor = div(GetClanColor(GetHogClan(hero.gear)), 0x100)
-- Captain Lime
-- Returns a color that is as close as possible to the color argument
@@ -140,8 +153,16 @@
-- This is a hack, but it works. See explanation at top of file
local cptnColor = getSimilarColor(heroColor, assassinsColor)
AddTeam(teamB.name, cptnColor, "Cherry", "Island", "Default", "congo-brazzaville")
- green1.gear= AddHog(green1.name, 0, 100, "war_desertofficer")
- AnimSetGearPosition(green1.gear, green1.x, green1.y)
+ green1.gear= AddHog(green1.name, 0, 100, green1.hat)
+ SetGearPosition(green1.gear, green1.x, green1.y)
+
+ -- Populate goals table
+ goals = {
+ [dialog01] = {missionName, loc("Exploring the tunnel"), loc("Search for the device with the help of the other hedgehogs.").."|"..string.format(loc("%s must collect the final crates."), hero.name) .. "|" .. minesTimeText, 1, 4000},
+ [dialog02] = {missionName, loc("Exploring the tunnel"), loc("Explore the tunnel with the other hedgehogs and search for the device.").."|"..string.format(loc("%s must collect the final crates."), hero.name) .. "|" .. minesTimeText, 1, 4000},
+ [dialog03] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack Captain Lime before he attacks back.").."|"..minesTimeText, 1, 4000},
+ [dialog04] = {missionName, loc("Return to the Surface"), loc("Go to the surface!").."|"..loc("Attack the assassins before they attack back.").."|"..minesTimeText, 1, 4000},
+ }
AnimInit(true)
AnimationSetup()
@@ -158,7 +179,7 @@
AddEvent(onHeroDeath, {hero.gear}, heroDeath, {hero.gear}, 0)
AddEvent(onDeviceCrates, {hero.gear}, deviceCrateEvent, {hero.gear}, 0)
- -- Hog Solo and GB weapons
+ -- Hero and Green Bananas weapons
AddAmmo(hero.gear, amSwitch, 100)
-- Assassins weapons
AddAmmo(redHedgehogs[1].gear, amBazooka, 6)
@@ -363,13 +384,13 @@
function heroDeath(gear)
if not ended then
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
- SendStat(siCustomAchievement, loc("To win the game, Hog Solo has to get the bottom crates and come back to the surface."))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
+ SendStat(siCustomAchievement, string.format(loc("To win the game, %s has to get the bottom crates and come back to the surface."), hero.name))
SendStat(siCustomAchievement, loc("You can use the other 2 hogs to assist you."))
SendStat(siCustomAchievement, loc("Do not destroy the crates!"))
if tookPartInBattle then
if permitCaptainLimeDeath then
- SendStat(siCustomAchievement, loc("You'll have to eliminate the Fruit Assassins at the end."))
+ SendStat(siCustomAchievement, string.format(loc("You'll have to eliminate %s at the end."), teamC.name))
sendSimpleTeamRankings({teamC.name, teamA.name})
else
sendSimpleTeamRankings({teamA.name})
@@ -393,7 +414,7 @@
-- Stop hedgehog
SetGearMessage(deviceCrate.collector, 0)
if deviceCrate.collector == hero.gear then
- -- Hog Solo collected the device crate
+ -- Hero collected the device crate
if not tookPartInBattle then
-- Captain Lime turns evil
@@ -473,10 +494,10 @@
end
function AnimationSetup()
- -- DIALOG 01 - Start, Captain Lime helps Hog Solo because he took part in the battle
+ -- DIALOG 01 - Start, Captain Lime helps the hero because he took part in the battle
AddSkipFunction(dialog01, Skipanim, {dialog01})
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 3000}})
- table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Somewhere else on the planet of fruits, Captain Lime helps Hog Solo"), 5000}})
+ table.insert(dialog01, {func = AnimCaption, args = {hero.gear, string.format(loc("Somewhere else on the planet of fruits, Captain Lime helps %s"), hero.name), 5000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("You fought bravely and you helped us win this battle!"), SAY_SAY, 5000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("So, as promised I have brought you where I think that the device you are looking for is hidden."), SAY_SAY, 7000}})
table.insert(dialog01, {func = AnimSay, args = {green1.gear, loc("I know that your resources are low due to the battle but I'll send two of my best hogs to assist you."), SAY_SAY, 7000}})
@@ -484,10 +505,10 @@
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 500}})
table.insert(dialog01, {func = AnimSwitchHog, args = {hero.gear}})
table.insert(dialog01, {func = ShowMission, args = goals[dialog01]})
- -- DIALOG02 - Start, Hog Solo escaped from the previous battle
+ -- DIALOG02 - Start, hero escaped from the previous battle
AddSkipFunction(dialog02, Skipanim, {dialog02})
table.insert(dialog02, {func = AnimWait, args = {hero.gear, 3000}})
- table.insert(dialog02, {func = AnimCaption, args = {hero.gear, loc("Somewhere else on the planet of fruits Hog Solo gets closer to the device"), 5000}})
+ table.insert(dialog02, {func = AnimCaption, args = {hero.gear, string.format(loc("Somewhere else on the planet of fruits, %s gets closer to the device"), hero.name), 5000}})
table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("You are the one who fled! So, you are alive."), SAY_SAY, 4000}})
table.insert(dialog02, {func = AnimSay, args = {green1.gear, loc("I'm still low on hogs. If you are not afraid I could use a set of extra hands."), SAY_SAY, 4000}})
table.insert(dialog02, {func = AnimWait, args = {hero.gear, 8000}})
@@ -506,7 +527,7 @@
table.insert(dialog03, {func = FollowGear, args = {hero.gear}})
table.insert(dialog03, {func = AnimSay, args = {hero.gear, loc("Hooray! I've found it, now I have to get back to Captain Lime!"), SAY_SAY, 4000}})
table.insert(dialog03, {func = AnimWait, args = {green1.gear, 4000}})
- table.insert(dialog03, {func = AnimSay, args = {green1.gear, loc("This Hog Solo is so naive! When he returns I'll shoot him and keep that device for myself!"), SAY_THINK, 4000}})
+ table.insert(dialog03, {func = AnimSay, args = {green1.gear, string.format(loc("This %s is so naive! I'm going to shoot this fool so I can keep that device for myself!"), hero.name), SAY_THINK, 4000}})
table.insert(dialog03, {func = ShowMission, args = goals[dialog03]})
table.insert(dialog03, {func = makeCptLimeEvil, args = {hero.gear}})
-- DIALOG04 - At crates, hero learns about the Assassins ambush
@@ -564,9 +585,9 @@
escapeHog(deviceCrate.collector)
AddCaption(loc("The device part has been stolen!"))
sendSimpleTeamRankings({teamA.name})
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
- SendStat(siCustomAchievement, loc("Oh no, the Green Bananas have betrayed Hog Solo and stole the anti-gravity device part!"))
- SendStat(siCustomAchievement, loc("Only Hog Solo can be trusted with the crate."))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
+ SendStat(siCustomAchievement, string.format(loc("Oh no, the companions have betrayed %s and stole the anti-gravity device part!"), hero.name))
+ SendStat(siCustomAchievement, string.format(loc("Only %s can be trusted with the crate."), hero.name))
EndGame()
ended = true
end
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/fruit03.lua Fri Dec 21 06:33:33 2018 +0100
@@ -88,19 +88,20 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
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", "Default", "cm_bars")
+ teamC.name = 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", "Default", "cm_bars")
+ teamB.name = 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)
@@ -260,7 +261,7 @@
-------------- ACTIONS ------------------
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to eliminate all the enemies."))
SendStat(siCustomAchievement, loc("Read the challenge objectives from within the mission for more details."))
sendSimpleTeamRankings({teamB.name, teamC.name, teamA.name})
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice01.lua Fri Dec 21 06:33:33 2018 +0100
@@ -110,17 +110,18 @@
SaveCampaignVar("HeroHealth", heroHealth)
end
- -- Hog Solo
- AddTeam(teamC.name, teamC.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, heroHealth, "war_desertgrenadier1")
+ -- Hero
+ teamC.name = AddMissionTeam(teamC.color)
+ hero.gear = AddMissionHog(heroHealth)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
HogTurnLeft(hero.gear, true)
-- Ally
- AddTeam(teamA.name, teamA.color, "heart", "Island", "Default", "cm_face")
+ teamA.name = 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", "Default", "cm_pirate")
+ teamB.name = 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)
@@ -439,7 +440,7 @@
end
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("To win the game you have to stand next to Thanta."))
SendStat(siCustomAchievement, loc("Most of the time you'll be able to use the freezer only."))
SendStat(siCustomAchievement, loc("Use the bazooka and the flying saucer to get the freezer."))
@@ -469,7 +470,7 @@
end
function thantaDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("Noo, Thanta has to stay alive!"))
SendStat(siCustomAchievement, loc("To win the game you have to go next to Thanta."))
SendStat(siCustomAchievement, loc("Most of the time you'll be able to use the freezer only."))
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/ice02.lua Fri Dec 21 06:33:33 2018 +0100
@@ -81,12 +81,13 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(100)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- Ally
- AddTeam(teamB.name, teamB.color, "heart", "Island", "Default", "cm_face")
+ teamB.name = 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)
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua Fri Dec 21 06:33:33 2018 +0100
@@ -111,16 +111,17 @@
WaterRise = 0
Map = "moon01_map"
Theme = "Cheese" -- Because ofc moon is made of cheese :)
- -- Hog Solo
- AddTeam(teamD.name, teamD.color, "Simple", "Island", "Default", "hedgewars")
+ -- Hero
+ teamD.name = AddMissionTeam(teamD.color)
if tonumber(GetCampaignVar("HeroHealth")) then
- hero.gear = AddHog(hero.name, 0, tonumber(GetCampaignVar("HeroHealth")), "war_desertgrenadier1")
+ hero.gear = AddMissionHog(tonumber(GetCampaignVar("HeroHealth")))
else
- hero.gear = AddHog(hero.name, 0, 100, "war_desertgrenadier1")
+ hero.gear = AddMissionHog(100)
end
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- PAotH
- AddTeam(teamA.name, teamA.color, "Earth", "Island", "Default", "cm_galaxy")
+ teamA.name = 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)
@@ -134,12 +135,12 @@
AnimSetGearPosition(paoth4.gear, paoth4.x, paoth4.y)
HogTurnLeft(paoth4.gear, true)
-- Professor
- AddTeam(teamC.name, teamC.color, "star", "Island", "Default", "cm_sine")
+ teamC.name = 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", "Default", "cm_sine")
+ teamB.name = 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)
@@ -172,7 +173,7 @@
AnimWait(hero.gear, 3000)
FollowGear(hero.gear)
- ShowMission(campaignName, missionName, loc("Hog Solo has to refuel his saucer.")..
+ ShowMission(campaignName, missionName, string.format(loc("%s has to refuel the saucer."), hero.name)..
"|"..loc("Rescue the imprisoned PAotH team and get the fuel!"), -amSkip, 0)
AddAmmo(minion1.gear, amDEagle, 10)
@@ -361,7 +362,7 @@
end
function heroDeath(gear)
- SendStat(siGameResult, loc("Hog Solo lost, try again!"))
+ SendStat(siGameResult, string.format(loc("%s lost, try again!"), hero.name))
SendStat(siCustomAchievement, loc("You have to get the weapons and rescue the PAotH researchers."))
sendSimpleTeamRankings({teamC.name, teamB.name, teamD.name, teamA.name})
EndGame()
@@ -387,7 +388,7 @@
function victory()
AnimCaption(hero.gear, loc("Congrats! You won!"), 6000)
saveCompletedStatus(1)
- SendStat(siGameResult, loc("Hog Solo wins, congratulations!"))
+ SendStat(siGameResult, string.format(loc("%s wins, congratulations!"), hero.name))
sendSimpleTeamRankings({teamD.name, teamA.name, teamC.name, teamB.name})
SaveCampaignVar("CosmosCheckPoint", "5") -- hero got fuels
resetCheckpoint() -- reset this mission
@@ -473,7 +474,7 @@
AddSkipFunction(dialog01, Skipanim, {dialog01})
table.insert(dialog01, {func = AnimWait, args = {hero.gear, 3000}})
table.insert(dialog01, {func = AnimCaption, args = {hero.gear, loc("Near a PAotH base on the moon ..."), 4000}})
- table.insert(dialog01, {func = AnimSay, args = {paoth1.gear, loc("Hey, Hog Solo! Finally you have come!"), SAY_SAY, 2000}})
+ table.insert(dialog01, {func = AnimSay, args = {paoth1.gear, string.format(loc("Hey, %s! Finally you have come!"), hero.name), SAY_SAY, 2000}})
table.insert(dialog01, {func = AnimSay, args = {paoth1.gear, loc("It seems that Professor Hogevil has prepared for your arrival!"), SAY_SAY, 4000}})
table.insert(dialog01, {func = AnimSay, args = {paoth1.gear, loc("He has captured the rest of the PAotH team and awaits to capture you!"), SAY_SAY, 5000}})
table.insert(dialog01, {func = AnimSay, args = {paoth1.gear, loc("We have to hurry! Are you armed?"), SAY_SAY, 4300}})
--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Fri Dec 21 02:07:11 2018 +0100
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon02.lua Fri Dec 21 06:33:33 2018 +0100
@@ -1,6 +1,6 @@
------------------- ABOUT ----------------------
--
--- Hog Solo has to catch the other hog in order
+-- The hero has to catch the other hog in order
-- to get informations about the origin of Pr. Hogevil
HedgewarsScriptLoad("/Scripts/Locale.lua")
@@ -63,12 +63,13 @@
WaterRise = 0
HealthDecrease = 0
- -- Hog Solo
- AddTeam(teamA.name, teamA.color, "Simple", "Island", "Default", "hedgewars")
- hero.gear = AddHog(hero.name, 0, 1, "war_desertgrenadier1")
+ -- Hero
+ teamA.name = AddMissionTeam(teamA.color)
+ hero.gear = AddMissionHog(1)
+ hero.name = GetHogName(hero.gear)
AnimSetGearPosition(hero.gear, hero.x, hero.y)
-- Crazy Runner
- AddTeam(teamB.name, teamB.color, "ring", "Island", "Default", "cm_sonic")
+ teamB.name = 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)
@@ -181,7 +182,7 @@
table.insert(dialog01, {func = AnimSay, args = {runner.gear, loc("Let's go!"), SAY_SAY, 2000}})
table.insert(dialog01, {func = ShowMission, args = goals[dialog01]})
table.insert(dialog01, {func = moveRunner, args = {}})
- -- DIALOG 02 - Hog Solo story
+ -- DIALOG 02 - Professor Hogevil story
AddSkipFunction(dialog02, Skipanim, {dialog02})
table.insert(dialog02, {func = AnimWait, args = {hero.gear, 3200}})
table.insert(dialog02, {func = AnimCaption, args = {hero.gear, loc("The truth about Professor Hogevil"), 5000}})