--- a/ChangeLog.txt	Tue Sep 26 03:58:23 2017 +0200
+++ b/ChangeLog.txt	Tue Sep 26 04:56:19 2017 +0200
@@ -209,6 +209,7 @@
  * Killing The Specialists: Fix killing hog with Deagle gave you chance to use another weapon in same turn
  * Fix weird behaviour when walking right before the first animation in most missions
  * Fix a coupe of texts being untranslatable
+ * Fix a variety of minor logic flaws in the story
  * Fix typos
  * All missions: Fix incorrect crate types
 

--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Tue Sep 26 03:58:23 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/death01.lua	Tue Sep 26 04:56:19 2017 +0200
@@ -295,19 +295,28 @@
 end
 
 function AnimationSetup()
+	local profDiedOnMoon = GetCampaignVar("ProfDiedOnMoon") == "1"
 	-- DIALOG01, GAME START, INTRODUCTION
 	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, loc("As you can see I have survived our last encounter and I had time to plot my master plan!"), 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
+		table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("As you can see I have survived our last encounter and I had time to plot my master plan!"), SAY_SAY, 4000}})
+	end
 	table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("I've thought that the best way to get the device is to let you collect most of the parts for me!"), SAY_SAY, 4000}})
 	table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("So, now I got the last part and I have your friends captured."), SAY_SAY, 4000}})
 	table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("Will you give me the other parts?"), SAY_SAY, 4000}})
 	table.insert(dialog01, {func = AnimWait, args = {hero.gear, 3000}})
 	table.insert(dialog01, {func = AnimSay, args = {hero.gear, loc("I will never hand you the parts!"), SAY_SAY, 4000}})
 	table.insert(dialog01, {func = AnimWait, args = {professor.human, 3000}})
-	table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("Then prepare for battle!"), SAY_SAY, 4000}})
+	if profDiedOnMoon then
+		table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("Then prepare for battle!"), SAY_SHOUT, 4000}})
+	else
+		table.insert(dialog01, {func = AnimSay, args = {professor.human, loc("Then prepare for battle!"), SAY_SAY, 4000}})
+	end
 	table.insert(dialog01, {func = startBattle, args = {}})
 end
 

--- a/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Tue Sep 26 03:58:23 2017 +0200
+++ b/share/hedgewars/Data/Missions/Campaign/A_Space_Adventure/moon01.lua	Tue Sep 26 04:56:19 2017 +0200
@@ -380,6 +380,7 @@
 	AnimCaption(hero.gear, loc("Congrats! You destroyed the enemy!"), 6000)
 	SendStat(siCustomAchievement, loc("You have eliminated the whole evil team. You're pretty tough!"))
 
+	SaveCampaignVar("ProfDiedOnMoon", "1")
 	victory()
 end
 
@@ -404,6 +405,7 @@
 	DismissTeam(teamB.name)
 	AnimWait(hero.gear,5000)
 
+	SaveCampaignVar("ProfDiedOnMoon", "1")
 	victory()
 end
 
@@ -417,6 +419,7 @@
 	SendStat(siCustomAchievement, loc("You have eliminated the evil minions."))
 	SendStat(siCustomAchievement, loc("You drove Professor Hogevil away."))
 
+	SaveCampaignVar("ProfDiedOnMoon", "0")
 	victory()
 end