From fd6d5d4aa4f02af314c7901b60f6db6ffadd968e Mon Sep 17 00:00:00 2001 From: Ryan Herriman Date: Thu, 14 Dec 2023 11:20:06 -0700 Subject: [PATCH] Recolor/rename Moonlight to Heir Apparent Also add 4MKF version of Banzai, and restructure the Air Voss variants under the hood to use includes. --- levels/avaraline-quirks-mode/alf/air-voss.alf | 119 +----- .../avaraline-quirks-mode/alf/banzai-4mkf.alf | 6 + .../alf/choke-daddy-down.alf | 134 +------ .../avaraline-quirks-mode/alf/choke-daddy.alf | 134 +------ .../alf/{moonlight.alf => heir-apparent.alf} | 2 +- .../alf/layout/air-voss.alf | 75 ++++ .../layout/goodies/air-voss-nades-only.alf | 44 +++ .../alf/layout/goodies/air-voss.alf | 59 +++ .../alf/layout/heir-apparent.alf | 325 ++++++++++++++++ .../alf/layout/moonlight.alf | 331 ----------------- levels/avaraline-quirks-mode/set.json | 11 +- levels/avaraline-strict-mode/alf/banzai.alf | 346 +----------------- levels/avaraline-strict-mode/alf/klondike.alf | 200 +--------- .../alf/layout/banzai.alf | 345 +++++++++++++++++ .../alf/layout/klondike.alf | 199 ++++++++++ 15 files changed, 1070 insertions(+), 1260 deletions(-) create mode 100644 levels/avaraline-quirks-mode/alf/banzai-4mkf.alf rename levels/avaraline-quirks-mode/alf/{moonlight.alf => heir-apparent.alf} (80%) create mode 100644 levels/avaraline-quirks-mode/alf/layout/air-voss.alf create mode 100644 levels/avaraline-quirks-mode/alf/layout/goodies/air-voss-nades-only.alf create mode 100644 levels/avaraline-quirks-mode/alf/layout/goodies/air-voss.alf create mode 100644 levels/avaraline-quirks-mode/alf/layout/heir-apparent.alf delete mode 100644 levels/avaraline-quirks-mode/alf/layout/moonlight.alf create mode 100644 levels/avaraline-strict-mode/alf/layout/banzai.alf create mode 100644 levels/avaraline-strict-mode/alf/layout/klondike.alf diff --git a/levels/avaraline-quirks-mode/alf/air-voss.alf b/levels/avaraline-quirks-mode/alf/air-voss.alf index 822641c8..6cdd99ee 100644 --- a/levels/avaraline-quirks-mode/alf/air-voss.alf +++ b/levels/avaraline-quirks-mode/alf/air-voss.alf @@ -1,127 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/levels/avaraline-quirks-mode/alf/banzai-4mkf.alf b/levels/avaraline-quirks-mode/alf/banzai-4mkf.alf new file mode 100644 index 00000000..4c1d77f9 --- /dev/null +++ b/levels/avaraline-quirks-mode/alf/banzai-4mkf.alf @@ -0,0 +1,6 @@ + + + + + + diff --git a/levels/avaraline-quirks-mode/alf/choke-daddy-down.alf b/levels/avaraline-quirks-mode/alf/choke-daddy-down.alf index 1da4ee6f..d76807ab 100644 --- a/levels/avaraline-quirks-mode/alf/choke-daddy-down.alf +++ b/levels/avaraline-quirks-mode/alf/choke-daddy-down.alf @@ -1,144 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/levels/avaraline-quirks-mode/alf/choke-daddy.alf b/levels/avaraline-quirks-mode/alf/choke-daddy.alf index 2eed0eda..1c38fc9a 100644 --- a/levels/avaraline-quirks-mode/alf/choke-daddy.alf +++ b/levels/avaraline-quirks-mode/alf/choke-daddy.alf @@ -1,140 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/levels/avaraline-quirks-mode/alf/moonlight.alf b/levels/avaraline-quirks-mode/alf/heir-apparent.alf similarity index 80% rename from levels/avaraline-quirks-mode/alf/moonlight.alf rename to levels/avaraline-quirks-mode/alf/heir-apparent.alf index 6b66d67f..4f4855a5 100644 --- a/levels/avaraline-quirks-mode/alf/moonlight.alf +++ b/levels/avaraline-quirks-mode/alf/heir-apparent.alf @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss-nades-only.alf b/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss-nades-only.alf new file mode 100644 index 00000000..2ec42564 --- /dev/null +++ b/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss-nades-only.alf @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss.alf b/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss.alf new file mode 100644 index 00000000..7540c1af --- /dev/null +++ b/levels/avaraline-quirks-mode/alf/layout/goodies/air-voss.alf @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/levels/avaraline-quirks-mode/alf/layout/heir-apparent.alf b/levels/avaraline-quirks-mode/alf/layout/heir-apparent.alf new file mode 100644 index 00000000..2be3d802 --- /dev/null +++ b/levels/avaraline-quirks-mode/alf/layout/heir-apparent.alf @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/levels/avaraline-quirks-mode/alf/layout/moonlight.alf b/levels/avaraline-quirks-mode/alf/layout/moonlight.alf deleted file mode 100644 index bb234370..00000000 --- a/levels/avaraline-quirks-mode/alf/layout/moonlight.alf +++ /dev/null @@ -1,331 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/levels/avaraline-quirks-mode/set.json b/levels/avaraline-quirks-mode/set.json index 8954e5c4..23027fb0 100644 --- a/levels/avaraline-quirks-mode/set.json +++ b/levels/avaraline-quirks-mode/set.json @@ -11,6 +11,11 @@ "Name": "Baghdad 3: Electric Boogaloo", "Message": "The unwanted stepchild of all Baghdad clones." }, + { + "Alf": "banzai.alf", + "Name": "Banzai [4MKF]", + "Message": "Take a leap of faith. Four minute killfest version." + }, { "Alf": "bodhi-4mkf.alf", "Name": "Bodhi [4MKF]", @@ -67,9 +72,9 @@ "Message": "Garbage in, garbage out. Four minute killfest version." }, { - "Alf": "moonlight.alf", - "Name": "Moonlight [KOTH]", - "Message": "" + "Alf": "heir-apparent.alf", + "Name": "Heir Apparent [KOTH]", + "Message": "The King is dead. Long live the King." }, { "Alf": "majuscule-4mkf.alf", diff --git a/levels/avaraline-strict-mode/alf/banzai.alf b/levels/avaraline-strict-mode/alf/banzai.alf index cfb96937..9a99ef37 100644 --- a/levels/avaraline-strict-mode/alf/banzai.alf +++ b/levels/avaraline-strict-mode/alf/banzai.alf @@ -1,347 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/levels/avaraline-strict-mode/alf/klondike.alf b/levels/avaraline-strict-mode/alf/klondike.alf index 42ec3ee7..75119cb8 100644 --- a/levels/avaraline-strict-mode/alf/klondike.alf +++ b/levels/avaraline-strict-mode/alf/klondike.alf @@ -1,201 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/levels/avaraline-strict-mode/alf/layout/banzai.alf b/levels/avaraline-strict-mode/alf/layout/banzai.alf new file mode 100644 index 00000000..29033f96 --- /dev/null +++ b/levels/avaraline-strict-mode/alf/layout/banzai.alf @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/levels/avaraline-strict-mode/alf/layout/klondike.alf b/levels/avaraline-strict-mode/alf/layout/klondike.alf new file mode 100644 index 00000000..077959cc --- /dev/null +++ b/levels/avaraline-strict-mode/alf/layout/klondike.alf @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +