1 files changed, 31 insertions, 34 deletions

diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c
index 0577e73..4b2fee5 100644
--- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c
@@ -3,7 +3,7 @@
 #strict 2
 
 static const
-	SETTING_Deathmatch = 0, SETTING_Extinguisher = 1, SETTING_FriendlyPushing = 2, SETTING_RotateInJump = 3,
+	SETTING_Deathmatch = 0, SETTING_SuddenDeath = 1, SETTING_Extinguisher = 2, SETTING_RotateInJump = 3,
 	SETTING_RelaunchesInc = 4, SETTING_RelaunchesDec = 5,
 	SETTING_DeathmatchScoreInc = 6, SETTING_DeathmatchScoreDec = 7,
 	SETTING_Ambience = 8;
@@ -13,7 +13,7 @@ local clonk, setupPlayer;
 
 // Selected values
 local section, mode;
-local extinguisherEnabled, friendlyPushingEnabled, rotateInJumpEnabled;
+local extinguisherEnabled, suddendeathEnabled, rotateInJumpEnabled;
 local ambienceEnabled;
 local numRelaunches;
 local deathmatchEnabled, deathmatchWinScore;
@@ -28,10 +28,11 @@ protected func Initialize()
 	section = Sections[0];
 
 	Modes = [
-		[MODE_Classic, "$ModeClassic$", ROCK],
-		[MODE_SuddenDeath, "$ModeSuddenDeath$", SDDT],
-		[MODE_Magic, "$ModeMagic$", SMGC],
-		[MODE_Apocalyptic, "$ModeApocalyptic$", APCE]];
+		[MODE_Classic, "$ModeClassic$", CLSC],
+		[MODE_Magic, "$ModeMagic$", MLPG],
+		[MODE_Knightly, "$ModeKnightly$", MKNI],
+		[MODE_Apocalyptic, "$ModeApocalyptic$", APCE],
+		[MODE_Festive, "$ModeFestive$", FSTV]];
 }
 
 private func ShowSetup()
@@ -70,13 +71,12 @@ private func ShowModeMenu()
 		CheckPreselect(m[0] == mode, menuItemIndex++);
 	}
 
-	clonk->AddMenuItem("$Back$", "ShowSectionMenu()", ROCK);
+	clonk->AddMenuItem("$Back$", "ShowSectionMenu()", SBCK);
 }
 
 private func SelectMode(int selectedMode)
 {
 	mode = selectedMode;
-	if (mode == MODE_SuddenDeath) deathmatchEnabled = false;
 	ShowMessage();
 
 	ShowSettingsMenu();
@@ -89,20 +89,17 @@ private func ShowSettingsMenu(bool preselect, int selectedSetting)
 	var menuItemIndex = 0;
 
 	// Deathmatch entry
-	if (mode != MODE_SuddenDeath)
-	{
-		AddOptionMenuItem(GetName(0, DTHM), deathmatchEnabled, "SelectSetting(SETTING_Deathmatch)", DTHM);
-		CheckPreselect(preselect && selectedSetting == SETTING_Deathmatch, menuItemIndex++);
-	}
-
+	AddOptionMenuItem(GetName(0, DTHM), deathmatchEnabled, "SelectSetting(SETTING_Deathmatch)", DTHM);
+	CheckPreselect(preselect && selectedSetting == SETTING_Deathmatch, menuItemIndex++);
+	
+	// Sudden Death entry
+	AddOptionMenuItem(GetName(0, SDDT), suddendeathEnabled, "SelectSetting(SETTING_SuddenDeath)", SDDT);
+	CheckPreselect(preselect && selectedSetting == SETTING_SuddenDeath, menuItemIndex++);
+	
 	// Extinguisher entry
 	AddOptionMenuItem(GetName(0, _ETG), extinguisherEnabled, "SelectSetting(SETTING_Extinguisher)", _ETG);
 	CheckPreselect(preselect && selectedSetting == SETTING_Extinguisher, menuItemIndex++);
-
-	// "Friendly Pushing" entry
-	AddOptionMenuItem(GetName(0, FYPG), friendlyPushingEnabled, "SelectSetting(SETTING_FriendlyPushing)", FYPG);
-	CheckPreselect(preselect && selectedSetting == SETTING_FriendlyPushing, menuItemIndex++);
-
+	
 	// "Turn in jump" entry
 	AddOptionMenuItem(GetName(0, RIJP), rotateInJumpEnabled, "SelectSetting(SETTING_RotateInJump)", RIJP);
 	CheckPreselect(preselect && selectedSetting == SETTING_RotateInJump, menuItemIndex++);
@@ -113,22 +110,22 @@ private func ShowSettingsMenu(bool preselect, int selectedSetting)
 
 	if (!deathmatchEnabled)
 	{
-		clonk->AddMenuItem("$Relaunches$ +", "SelectSetting(SETTING_RelaunchesInc)", SKUL);
+		clonk->AddMenuItem("$Relaunches$ +", "SelectSetting(SETTING_RelaunchesInc)", SREL);
 		CheckPreselect(preselect && selectedSetting == SETTING_RelaunchesInc, menuItemIndex++);
-		clonk->AddMenuItem("$Relaunches$ -", "SelectSetting(SETTING_RelaunchesDec)", SKUL);
+		clonk->AddMenuItem("$Relaunches$ -", "SelectSetting(SETTING_RelaunchesDec)", SREL);
 		CheckPreselect(preselect && selectedSetting == SETTING_RelaunchesDec, menuItemIndex++);
 	}
 	else
 	{
-		clonk->AddMenuItem("$Kills$ +", "SelectSetting(SETTING_DeathmatchScoreInc)", SWOR);
+		clonk->AddMenuItem("$Kills$ +", "SelectSetting(SETTING_DeathmatchScoreInc)", SKIL);
 		CheckPreselect(preselect && selectedSetting == SETTING_DeathmatchScoreInc, menuItemIndex++);
-		clonk->AddMenuItem("$Kills$ -", "SelectSetting(SETTING_DeathmatchScoreDec)", SWOR);
+		clonk->AddMenuItem("$Kills$ -", "SelectSetting(SETTING_DeathmatchScoreDec)", SKIL);
 		CheckPreselect(preselect && selectedSetting == SETTING_DeathmatchScoreDec, menuItemIndex++);
 	}
 
-	clonk->AddMenuItem("$Done$", "SetupDone()", GOLD);
+	clonk->AddMenuItem("$Done$", "SetupDone()", SDNE);
 	CheckPreselect(!preselect, menuItemIndex++);
-	clonk->AddMenuItem("$Back$", "ShowModeMenu()", ROCK);
+	clonk->AddMenuItem("$Back$", "ShowModeMenu()", SBCK);
 }
 
 private func SelectSetting(int selectedSetting)
@@ -137,13 +134,13 @@ private func SelectSetting(int selectedSetting)
 	{
 		deathmatchEnabled = !deathmatchEnabled;
 	}
-	else if (selectedSetting == SETTING_Extinguisher)
+	else if (selectedSetting == SETTING_SuddenDeath)
 	{
-		extinguisherEnabled = !extinguisherEnabled;
+		suddendeathEnabled = !suddendeathEnabled;
 	}
-	else if (selectedSetting == SETTING_FriendlyPushing)
+	else if (selectedSetting == SETTING_Extinguisher)
 	{
-		friendlyPushingEnabled = !friendlyPushingEnabled;
+		extinguisherEnabled = !extinguisherEnabled;
 	}
 	else if (selectedSetting == SETTING_RotateInJump)
 	{
@@ -212,7 +209,7 @@ private func ShowMessage() { Message("@%s", 0, GetMessage()); }
 
 private func GetMessage()
 {
-	var msgSection = Format("$Landscape$: %s", GetName(0, section));
+	var msgSection = Format("$Landscape$: {{%i}} %s", section, GetName(0, section));
 
 	var msgMode;
 	for (var m in Modes)
@@ -227,17 +224,17 @@ private func GetMessage()
 	var msgWinScore;
 	if (!deathmatchEnabled)
 	{
-		msgWinScore = Format("{{SKUL}} $Relaunches$: %d", numRelaunches);
+		msgWinScore = Format("{{SREL}} $Relaunches$: %d", numRelaunches);
 	}
 	else
 	{
-		msgWinScore = Format("{{SWOR}} %s: %d $Kills$", GetName(0, DTHM), deathmatchWinScore);
+		msgWinScore = Format("{{SKIL}} %s: %d $Kills$", GetName(0, DTHM), deathmatchWinScore);
 	}
 
 	var msgExtinguisher = Format("{{_ETG}} %s: %s", GetName(0, _ETG), IIf(extinguisherEnabled, "$Enabled$", "$Disabled$"));
-	var msgFriendlyPushing = Format("{{FYPG}} %s: %s", GetName(0, FYPG), IIf(friendlyPushingEnabled, "$Enabled$", "$Disabled$"));
+	var msgSuddenDeath = Format("{{SDDT}} %s: %s", GetName(0, SDDT), IIf(suddendeathEnabled, "$Enabled$", "$Disabled$"));
 	var msgRotateInJump = Format("{{RIJP}} %s: %s", GetName(0, RIJP), IIf(rotateInJumpEnabled, "$Enabled$", "$Disabled$"));
 	var msgAmbience = Format("{{SABC}} $Ambience$: %s", IIf(ambienceEnabled, "$Enabled$", "$Disabled$"));
 
-	return Format("%s|%s|%s|%s|%s|%s|%s", msgSection, msgMode, msgWinScore, msgExtinguisher, msgFriendlyPushing, msgRotateInJump, msgAmbience);
+	return Format("%s|%s|%s|%s|%s|%s|%s", msgSection, msgMode, msgWinScore, msgExtinguisher, msgSuddenDeath, msgRotateInJump, msgAmbience);
 }
\ No newline at end of file