diff options
Diffstat (limited to 'TemplePushing.c4s/Misc.c4d')
4 files changed, 14 insertions, 31 deletions
diff --git a/TemplePushing.c4s/Misc.c4d/FestiveClonks.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/FestiveClonks.c4d/Script.c index 656a32b..845a57d 100644 --- a/TemplePushing.c4s/Misc.c4d/FestiveClonks.c4d/Script.c +++ b/TemplePushing.c4s/Misc.c4d/FestiveClonks.c4d/Script.c @@ -4,7 +4,7 @@ #appendto CLNK func Construction () { - if (mode == MODE_Festive) + if (mode && mode->GetID() == MODE_Festive) { if(GetID() == CLNK) SetGraphics(0, this, FSVC); return (_inherited (...)); diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c index bd26a3e..a453b2f 100644 --- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c +++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/Script.c @@ -28,12 +28,12 @@ protected func Initialize() } section = Sections[0]; - Modes = [ - [MODE_Classic, "$ModeClassic$", CLSC], - [MODE_Magic, "$ModeMagic$", MLPG], - [MODE_Knightly, "$ModeKnightly$", MKNI], - [MODE_Apocalyptic, "$ModeApocalyptic$", APCE], - [MODE_Festive, "$ModeFestive$", FSTV]]; + Modes = []; + for (var i = 0, def; def = GetDefinition(i, C4D_StaticBack); ++i) + { + if (DefinitionCall(def, "ModeName")) Modes[GetLength(Modes)] = def; + } + mode = Modes[0]; } private func ShowSetup() @@ -82,8 +82,8 @@ private func ShowModeMenu() var menuItemIndex = 0; for (var m in Modes) { - clonk->AddMenuItem(m[1], Format("SelectMode(%d)", m[0]), m[2]); - CheckPreselect(!selectRandomMode && m[0] == mode, menuItemIndex++); + clonk->AddMenuItem(m->ModeName(), Format("SelectMode(%i)", m), m); + CheckPreselect(!selectRandomMode && m == mode, menuItemIndex++); } clonk->AddMenuItem("$Random$", "SelectRandomMode()", SRND); @@ -91,7 +91,7 @@ private func ShowModeMenu() clonk->AddMenuItem("$Back$", "ShowSectionMenu()", SBCK); } -private func SelectMode(int selectedMode) +private func SelectMode(id selectedMode) { selectRandomMode = false; mode = selectedMode; @@ -196,7 +196,7 @@ private func SetupDone() { // Apply random selection if (selectRandomSection) section = Sections[Random(GetLength(Sections))]; - if (selectRandomMode) mode = Modes[Random(GetLength(Modes))][0]; + if (selectRandomMode) mode = Modes[Random(GetLength(Modes))]; selectRandomSection = selectRandomMode = false; // Show final setup message and start the game ShowMessage(); @@ -260,14 +260,7 @@ private func GetMessage() } else { - for (var m in Modes) - { - if (m[0] == mode) - { - msgMode = Format("$Mode$: {{%i}} %s", m[2], m[1]); - break; - } - } + msgMode = Format("$Mode$: {{%i}} %s", mode, mode->ModeName()); } var msgWinScore; diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblDE.txt b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblDE.txt index ffe51b6..1212c01 100644 --- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblDE.txt +++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblDE.txt @@ -1,8 +1,3 @@ -ModeClassic=<c e6b800>Klassisch</c> -ModeMagic=<c 4700b2>Magisch</c> -ModeKnightly=<c 99ff66>Mittelalterlich</c> -ModeApocalyptic=<c b20000>Apokalyptisch</c> -ModeFestive=<c f0ffff>Winterlich</c> Back=Zurück Done=Fertig Relaunches=Relaunches @@ -12,4 +7,4 @@ Mode=Modus Enabled=Aktiviert Disabled=Deaktiviert Ambience=Ambiente -Random=Zufällig
\ No newline at end of file +Random=Zufällig diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblUS.txt b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblUS.txt index 07240dd..f689af1 100644 --- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblUS.txt +++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/StringTblUS.txt @@ -1,8 +1,3 @@ -ModeClassic=<c e6b800>Classic</c> -ModeMagic=<c 4700b2>Magical</c> -ModeKnightly=<c 99ff66>Medieval</c> -ModeApocalyptic=<c b20000>Apocalyptical</c> -ModeFestive=<c f0ffff>Winterly</c> Back=Back Done=Done Relaunches=Relaunches @@ -12,4 +7,4 @@ Mode=Mode Enabled=Enabled Disabled=Disabled Ambience=Ambience -Random=Random
\ No newline at end of file +Random=Random |