Merge pull request #370 from rherriman/alf-includes

Add Bwadi [KOTH]
avaraline · Dec 4, 2023 · c05527c · c05527c
2 parents f85e799 + 8f5eada
commit c05527c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 2 deletions.
diff --git a/levels/avaraline-strict-mode/alf/bwadi-4mkf.alf b/levels/avaraline-strict-mode/alf/bwadi-4mkf.alf
@@ -1,7 +1,7 @@
 <map>
+  <set pCenterGoodyRespawn="350" />
   <include alf="layout/bwadi.alf" />
 
   <set pGameLength="3750" />
   <include alf="logic/killfest.alf" />
 </map>
-
diff --git a/levels/avaraline-strict-mode/alf/bwadi-koth.alf b/levels/avaraline-strict-mode/alf/bwadi-koth.alf
@@ -0,0 +1,18 @@
+<map>
+  <set pCenterGoodyRespawn="110" />
+  <include alf="layout/bwadi.alf" />
+
+  <set floorTemplate="bspFloorFrame" hillSize="10" />
+  <Wall x="0" y="4.01" z="0" w="hillSize" d="hillSize" h="0" color="#003399" />
+
+  <set
+    pHillX="0"
+    pHillY="4"
+    pHillZ="0"
+    pHillW="hillSize"
+    pHillD="hillSize"
+    pHillH="4"
+    wallYon="0.001"
+  />
+  <include alf="logic/koth.alf" />
+</map>
diff --git a/levels/avaraline-strict-mode/alf/bwadi.alf b/levels/avaraline-strict-mode/alf/bwadi.alf
@@ -1,3 +1,4 @@
 <map>
+  <set pCenterGoodyRespawn="350" />
   <include alf="layout/bwadi.alf" />
 </map>
diff --git a/levels/avaraline-strict-mode/alf/layout/bwadi.alf b/levels/avaraline-strict-mode/alf/layout/bwadi.alf
@@ -1,3 +1,5 @@
+<!-- @param int pCenterGoodyRespawn center goody respawn delay in ticks -->
+
 <SkyColor color="#99fdff" color.1="#c3cde6" />
 <GroundColor color="#3a404d" color.1="#000000" />
 <set
@@ -50,7 +52,7 @@
 
 <unique vars="mShow mTaken" />
 <And in="@start" out="mShow" />
-<Timer in="mTaken" out="mShow" wait="350" />
+<Timer in="mTaken" out="mShow" wait="pCenterGoodyRespawn" />
 <Goody shape="bspAvaraA" y="4 + mGoodyOffset" speed="2" grenades="mLgGrenade" missiles="mLgMissile" start="mShow" out="mTaken" color="#00a8aa" color.1="#000000" cx="0" cz="0" angle="45" />
 <unique vars="mShow mTaken" />
 <And in="@start" out="mShow" />

diff --git a/levels/avaraline-strict-mode/alf/stratocaster-hss-koth.alf b/levels/avaraline-strict-mode/alf/stratocaster-hss-koth.alf
@@ -11,6 +11,7 @@
     pHillW="hillSize"
     pHillD="hillSize"
     pHillH="4"
+    wallYon="0.001"
   />
   <include alf="logic/koth.alf" />
 </map>
diff --git a/levels/avaraline-strict-mode/alf/telecaster-captures.alf b/levels/avaraline-strict-mode/alf/telecaster-captures.alf
@@ -12,6 +12,7 @@
     outerCaptureX="24"
     outerCaptureY="10"
     outerCaptureZ="39"
+    wallYon="0.001"
   />
 
   <set

diff --git a/levels/avaraline-strict-mode/set.json b/levels/avaraline-strict-mode/set.json
@@ -25,6 +25,11 @@
       "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",