Merge pull request #373 from rherriman/alf-includes

Allow loading of ALF files outside of asset bundle

levels/avaraline-quirks-mode/alf/moonlight.alf

@@ -0,0 +1,14 @@
+<map>
+  <include alf="layout/moonlight.alf" />
+
+  <set
+    pReqPointMultiplier="1"
+    pHillX="0"
+    pHillY="4"
+    pHillZ="0"
+    pHillW="15"
+    pHillD="15"
+    pHillH="2"
+  />
+  <include alf="logic/koth.alf" />
+</map>

levels/avaraline-quirks-mode/alf/niflheim.alf

@@ -9,8 +9,6 @@
     light.0.a="30"
     light.0.b="10"
     light.1.i="0.5"
-    gameLength="3750"
-    defaultLives="999"
     lightHull="131"
     mediumHull="132"
     heavyHull="133"
@@ -24,15 +22,15 @@
     missileArmed.c = "#333333"
     missileLaunched.c = "#b3ffcc"
     wallHeight="0"
+    pGameLength="3750"
   />
-  <enum start="int((gameLength * 0.33) + (random * (gameLength * 0.33)))" vars="wigReveal" />
+  <include alf="logic/killfest.alf" />
+  <enum start="int((pGameLength * 0.33) + (random * (pGameLength * 0.33)))" vars="wigReveal" />
 
   <Teleporter group="-1" y="-30" activeRange="30 * 5" deadRange="20 * 5" destGroup="@recenter" shape="0" spin="false" color="#ffffff" color.1="#000000" cx="0" cz="0" angle="45" />
   <Teleporter y="20" shape="0" group="@recenter" spin="false" color="#ffffff" color.1="#000000" cx="0" cz="0" angle="45" />
   <Timer in="@killGoodies" out="@killGoodies" wait="1" />
   <Timer in="@start" out="@killGoodies" wait="wigReveal" />
-  <Timer in="@start" out="@gameEnds" wait="gameLength" />
-  <Teleporter start="@gameEnds" y="-10" activeRange="2000" shape="0" win="0" color="#ffffff" color.1="#000000" cx="0" cz="0" angle="45" />
 
   <Sound y="200" sound="snArcticWind" isAmbient="true" loopCount="-1" volume="100" cx="0" cz="0" angle="225" />
   <Sound y="200" sound="snUnderwater" isAmbient="true" loopCount="-1" volume="70" cx="0" cz="0" angle="225" />

levels/avaraline-strict-mode/alf/telecaster-captures.alf → levels/avaraline-quirks-mode/alf/telecaster-captures.alf

@@ -22,7 +22,7 @@
     pCaptureD="captureSize"
     pCaptureH="captureSize"
     pCaptureVizX="0"
-    pCaptureVizY="1.75"
+    pCaptureVizY="mGoodyOffset"
     pCaptureVizZ="0"
   />
   <include alf="logic/capture-point.alf" />
@@ -35,7 +35,7 @@
     pCaptureD="captureSize"
     pCaptureH="captureSize"
     pCaptureVizX="-outerCaptureX"
-    pCaptureVizY="outerCaptureY + 1.75"
+    pCaptureVizY="outerCaptureY + mGoodyOffset"
     pCaptureVizZ="-outerCaptureZ"
   />
   <Hologram cx="-outerCaptureX" y="outerCaptureY + 0.05" cz="-outerCaptureZ" angle="45" shape="bspGroundStar" scale="0.5" color="#260019" />
@@ -50,7 +50,7 @@
     pCaptureD="captureSize"
     pCaptureH="captureSize"
     pCaptureVizX="outerCaptureX"
-    pCaptureVizY="outerCaptureY + 1.75"
+    pCaptureVizY="outerCaptureY + mGoodyOffset"
     pCaptureVizZ="outerCaptureZ"
   />
   <Hologram cx="outerCaptureX" y="outerCaptureY + 0.05" cz="outerCaptureZ" angle="45" shape="bspGroundStar" scale="0.5" color="#260019" />
@@ -65,7 +65,7 @@
     pCaptureD="captureSize"
     pCaptureH="captureSize"
     pCaptureVizX="-outerCaptureZ"
-    pCaptureVizY="outerCaptureY + 1.75"
+    pCaptureVizY="outerCaptureY + mGoodyOffset"
     pCaptureVizZ="outerCaptureX"
   />
   <Hologram cx="-outerCaptureZ" y="outerCaptureY + 0.05" cz="outerCaptureX" angle="45" shape="bspGroundStar" scale="0.5" color="#260019" />
@@ -80,7 +80,7 @@
     pCaptureD="captureSize"
     pCaptureH="captureSize"
     pCaptureVizX="outerCaptureZ"
-    pCaptureVizY="outerCaptureY + 1.75"
+    pCaptureVizY="outerCaptureY + mGoodyOffset"
     pCaptureVizZ="-outerCaptureX"
   />
   <Hologram cx="outerCaptureZ" y="outerCaptureY + 0.05" cz="-outerCaptureX" angle="45" shape="bspGroundStar" scale="0.5" color="#260019" />

levels/avaraline-quirks-mode/alf/watery-keep.alf

@@ -185,7 +185,7 @@
   <Hologram shape="bspVines" y="9.5" isAmbient="true" scale="0.75" color="#808e5a" color.1="#b1c28c" cx="-24.995" cz="10.625" angle="90" />
 
   <!-- "WATER" -->
-  <Field watch="playerMask" deltaY="0.055" shape="3002" color="#ffffff" color.1="#000000" x="-18.75" z="55" w="12.5" d="10" h="6" cx="0" cz="0" angle="0" />
+  <Field watch="playerMask" deltaY="0.055" shape="bspWateryKeepWater" color="#ffffff" color.1="#000000" x="-18.75" z="55" w="12.5" d="10" h="6" cx="0" cz="0" angle="0" />
   <Field deltaY="0" visible="true" color="hsla(323, 6%, 41%, 1)" color.1="#000000" x="0" z="0" w="30" d="30" h="0" y="9" />
   <Field deltaY="0" visible="true" color="hsla(323, 6%, 41%, 1)" color.1="#000000" x="-17.5" z="-10" w="5" d="20" h="0" y="9" />
   <Field deltaY="0" visible="true" color="hsla(323, 6%, 41%, 1)" color.1="#000000" x="-17.5" z="10" w="5" d="20" h="0" y="9" />

levels/avaraline-quirks-mode/default.avarascript

@@ -17,8 +17,9 @@ mXLgMissile = 6
 mXXLgMissile = 8
 
 // Custom assets.
-bspFlag = 3000
-bspSwirl = 3001
+bspFlag = 3500
+bspSwirl = 3501
+bspWateryKeepWater = 3502
 snWaves = 3000
 snWaves2 = 3001
 snWaterStep = 3002

levels/avaraline-quirks-mode/set.json

@@ -1,4 +1,5 @@
 {
+  "REQD": [{"Package": "avaraline-strict-mode"}],
   "LEDI": [
     {
       "Alf": "air-voss.alf",
@@ -10,6 +11,21 @@
       "Name": "Baghdad 3: Electric Boogaloo",
       "Message": "The unwanted stepchild of all Baghdad clones."
     },
+    {
+      "Alf": "bodhi-4mkf.alf",
+      "Name": "Bodhi [4MKF]",
+      "Message": "Sought a yogi, found a grizzly. Four minute killfest version."
+    },
+    {
+      "Alf": "bwadi-4mkf.alf",
+      "Name": "Bwadi [4MKF]",
+      "Message": "A simple, open level with plenty of ammunition, updated for 2022. Four minute killfest version."
+    },
+    {
+      "Alf": "bwadi-koth.alf",
+      "Name": "Bwadi [KOTH]",
+      "Message": "A simple, open level with plenty of ammunition, updated for 2022. King of the hill version."
+    },
     {
       "Alf": "choke-daddy.alf",
       "Name": "Choke Daddy",
@@ -20,14 +36,84 @@
       "Name": "Choke Daddy Down",
       "Message": "A mash-up of Baghdad, Choke, and Showdown. Low gravity with extra powerful grenades and missiles. Five lives."
     },
+    {
+      "Alf": "crescent-4mkf.alf",
+      "Name": "Crescent [4MKF]",
+      "Message": "Two fortnights hence. Four minute killfest version."
+    },
+    {
+      "Alf": "enso-4mkf.alf",
+      "Name": "Ensō [4MKF]",
+      "Message": "Ink on paper. Four minute killfest version."
+    },
+    {
+      "Alf": "grimoire-4mkf.alf",
+      "Name": "Grimoire [4MKF]",
+      "Message": "Purely for academic purposes, you understand. Four minute killfest version."
+    },
+    {
+      "Alf": "hawthorne-4mkf.alf",
+      "Name": "Hawthorne [4MKF]",
+      "Message": "A small, enclosed level with moving blocks, updated for 2022. Four minute killfest version."
+    },
+    {
+      "Alf": "indra-4mkf.alf",
+      "Name": "Indra [4MKF]",
+      "Message": "Tossing lightning from the back of an elephant. Four minute killfest version."
+    },
+    {
+      "Alf": "io-4mkf.alf",
+      "Name": "I/O [4MKF]",
+      "Message": "Garbage in, garbage out. Four minute killfest version."
+    },
+    {
+      "Alf": "moonlight.alf",
+      "Name": "Moonlight [KOTH]",
+      "Message": ""
+    },
+    {
+      "Alf": "majuscule-4mkf.alf",
+      "Name": "Majuscule [4MKF]",
+      "Message": "A mash-up of Coromoran and Fuchsia. Four minute killfest version."
+    },
     {
       "Alf": "niflheim.alf",
-      "Name": "Niflheim",
+      "Name": "Niflheim [4MKF]",
       "Message": "Four minute Klondike killfest, with wig reveal! Patented Corpserot® missiles (a product of the Grimdark Corporation) are faster and more accurate at the expense of damage."
     },
+    {
+      "Alf": "on-the-rocks-4mkf.alf",
+      "Name": "On the Rocks [4MKF]",
+      "Message": "The new original. Four minute killfest version."
+    },
+    {
+      "Alf": "scimitar-4mkf.alf",
+      "Name": "Scimitar [4MKF]",
+      "Message": "Awash in sand and heat. Four minute killfest version."
+    },
+    {
+      "Alf": "stratocaster-hss-4mkf.alf",
+      "Name": "Stratocaster HSS [4MKF]",
+      "Message": "Bucking the hum of the strum. Four minute killfest version."
+    },
+    {
+      "Alf": "stratocaster-hss-koth.alf",
+      "Name": "Stratocaster HSS [KOTH]",
+      "Message": "Bucking the hum of the strum. King of the hill version."
+    },
+    {
+      "Alf": "telecaster-4mkf.alf",
+      "Name": "Telecaster [4MKF]",
+      "Message": "A mash-up of Stratocaster and Tesla. Four minute killfest version."
+    },
+    {
+      "Alf": "telecaster-captures.alf",
+      "Name": "Telecaster [Captures]",
+      "Message": "A mash-up of Stratocaster and Tesla. Captures version."
+    },
     {
       "Alf": "watery-keep.alf",
-      "Name": "Watery Keep",
+      "Name": "Watery Keep [CTF]",
       "Message": "Ancient legend has it, water was transported here via a tube. Updated for 2022."
     }
   ],

levels/avaraline-strict-mode/set.json

@@ -10,86 +10,41 @@
       "Name": "Bodhi",
       "Message": "Sought a yogi, found a grizzly."
     },
-    {
-      "Alf": "bodhi-4mkf.alf",
-      "Name": "Bodhi [4MKF]",
-      "Message": "Sought a yogi, found a grizzly. Four minute killfest version."
-    },
     {
       "Alf": "bwadi.alf",
       "Name": "Bwadi",
       "Message": "A simple, open level with plenty of ammunition, updated for 2022."
     },
-    {
-      "Alf": "bwadi-4mkf.alf",
-      "Name": "Bwadi [4MKF]",
-      "Message": "A simple, open level with plenty of ammunition, updated for 2022. Four minute killfest version."
-    },
-    {
-      "Alf": "bwadi-koth.alf",
-      "Name": "Bwadi [KOTH]",
-      "Message": "A simple, open level with plenty of ammunition, updated for 2022. King of the hill version."
-    },
     {
       "Alf": "crescent.alf",
       "Name": "Crescent",
       "Message": "Two fortnights hence."
     },
-    {
-      "Alf": "crescent-4mkf.alf",
-      "Name": "Crescent [4MKF]",
-      "Message": "Two fortnights hence. Four minute killfest version."
-    },
     {
       "Alf": "enso.alf",
       "Name": "Ensō",
       "Message": "Ink on paper."
     },
-    {
-      "Alf": "enso-4mkf.alf",
-      "Name": "Ensō [4MKF]",
-      "Message": "Ink on paper. Four minute killfest version."
-    },
     {
       "Alf": "grimoire.alf",
       "Name": "Grimoire",
       "Message": "Purely for academic purposes, you understand."
     },
-    {
-      "Alf": "grimoire-4mkf.alf",
-      "Name": "Grimoire [4MKF]",
-      "Message": "Purely for academic purposes, you understand. Four minute killfest version."
-    },
     {
       "Alf": "hawthorne.alf",
       "Name": "Hawthorne",
       "Message": "A small, enclosed level with moving blocks, updated for 2022."
     },
-    {
-      "Alf": "hawthorne-4mkf.alf",
-      "Name": "Hawthorne [4MKF]",
-      "Message": "A small, enclosed level with moving blocks, updated for 2022. Four minute killfest version."
-    },
     {
       "Alf": "indra.alf",
       "Name": "Indra",
       "Message": "Tossing lightning from the back of an elephant."
     },
-    {
-      "Alf": "indra-4mkf.alf",
-      "Name": "Indra [4MKF]",
-      "Message": "Tossing lightning from the back of an elephant. Four minute killfest version."
-    },
     {
       "Alf": "io.alf",
       "Name": "I/O",
       "Message": "Garbage in, garbage out."
     },
-    {
-      "Alf": "io-4mkf.alf",
-      "Name": "I/O [4MKF]",
-      "Message": "Garbage in, garbage out. Four minute killfest version."
-    },
     {
       "Alf": "klondike.alf",
       "Name": "Klondike",
@@ -100,60 +55,25 @@
       "Name": "Majuscule",
       "Message": "A mash-up of Coromoran and Fuchsia."
     },
-    {
-      "Alf": "majuscule-4mkf.alf",
-      "Name": "Majuscule [4MKF]",
-      "Message": "A mash-up of Coromoran and Fuchsia. Four minute killfest version."
-    },
     {
       "Alf": "on-the-rocks.alf",
       "Name": "On the Rocks",
       "Message": "The new original."
     },
-    {
-      "Alf": "on-the-rocks-4mkf.alf",
-      "Name": "On the Rocks [4MKF]",
-      "Message": "The new original. Four minute killfest version."
-    },
     {
       "Alf": "scimitar.alf",
       "Name": "Scimitar",
       "Message": "Awash in sand and heat."
     },
-    {
-      "Alf": "scimitar-4mkf.alf",
-      "Name": "Scimitar [4MKF]",
-      "Message": "Awash in sand and heat. Four minute killfest version."
-    },
     {
       "Alf": "stratocaster-hss.alf",
       "Name": "Stratocaster HSS",
       "Message": "Bucking the hum of the strum."
     },
-    {
-      "Alf": "stratocaster-hss-4mkf.alf",
-      "Name": "Stratocaster HSS [4MKF]",
-      "Message": "Bucking the hum of the strum. Four minute killfest version."
-    },
-    {
-      "Alf": "stratocaster-hss-koth.alf",
-      "Name": "Stratocaster HSS [KOTH]",
-      "Message": "Bucking the hum of the strum. King of the hill version."
-    },
     {
       "Alf": "telecaster.alf",
       "Name": "Telecaster",
       "Message": "A mash-up of Stratocaster and Tesla."
-    },
-    {
-      "Alf": "telecaster-4mkf.alf",
-      "Name": "Telecaster [4MKF]",
-      "Message": "A mash-up of Stratocaster and Tesla. Four minute killfest version."
-    },
-    {
-      "Alf": "telecaster-captures.alf",
-      "Name": "Telecaster [Captures]",
-      "Message": "A mash-up of Stratocaster and Tesla. Captures version."
     }
   ]
 }