From df1e8f389dc8963a563f7833c2dd969620265331 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@alumni.stanford.edu>
Date: Sat, 19 Oct 2024 21:12:19 +1300
Subject: [PATCH] Add ASD Advanced Open and Prem Advanced

---
 .../{asd-juniors.xml => asd-openadvanced.xml} | 19 +++----
 v1/formats/asd-premadvanced.xml               | 50 +++++++++++++++++++
 2 files changed, 60 insertions(+), 9 deletions(-)
 rename v1/formats/{asd-juniors.xml => asd-openadvanced.xml} (64%)
 create mode 100644 v1/formats/asd-premadvanced.xml

diff --git a/v1/formats/asd-juniors.xml b/v1/formats/asd-openadvanced.xml
similarity index 64%
rename from v1/formats/asd-juniors.xml
rename to v1/formats/asd-openadvanced.xml
index 1146b9a..0efb60c 100644
--- a/v1/formats/asd-juniors.xml
+++ b/v1/formats/asd-openadvanced.xml
@@ -1,22 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <debate-format schema-version="2.2">
-  <name>Auckland Schools Junior Championships</name>
-  <short-name>ASD Juniors</short-name>
-  <version>2</version>
+  <name>Auckland Schools Advanced Open</name>
+  <short-name>ASD Advanced Open</short-name>
+  <version>1</version>
   <info>
     <region>Auckland</region>
     <level>School</level>
-    <used-at>Auckland Schools Debating Junior Championships</used-at>
-    <description>3 vs 3, 5-minute speeches, 2.5-minute replies, no POIs</description>
+    <used-at>Auckland Schools Debating Advanced Open Competitions</used-at>
+    <description>3 vs 3, 6-minute speeches, 3-minute replies, POIs allowed</description>
   </info>
   <prep-time length="60:00"/>
   <speech-types>
-    <speech-type ref="substantive" length="5:00" first-period="normal">
-      <bell time="4:00" number="1" next-period="warning"/>
+    <speech-type ref="substantive" length="6:00" first-period="normal">
+      <bell time="1:00" number="1" next-period="pois-allowed"/>
+      <bell time="5:00" number="1" next-period="warning"/>
       <bell time="finish" number="2" next-period="overtime"/>
     </speech-type>
-    <speech-type ref="reply" length="2:30" first-period="normal">
-      <bell time="1:30" number="1" next-period="warning"/>
+    <speech-type ref="reply" length="3:00" first-period="normal">
+      <bell time="2:00" number="1" next-period="warning"/>
       <bell time="finish" number="2" next-period="overtime"/>
     </speech-type>
   </speech-types>
diff --git a/v1/formats/asd-premadvanced.xml b/v1/formats/asd-premadvanced.xml
new file mode 100644
index 0000000..090ab5b
--- /dev/null
+++ b/v1/formats/asd-premadvanced.xml
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<debate-format schema-version="2.2">
+  <name>Auckland Schools Premier Advanced</name>
+  <short-name>ASD Premier Advanced</short-name>
+  <version>1</version>
+  <info>
+    <region>Auckland</region>
+    <level>School</level>
+    <used-at>Auckland Schools Debating Premier Advanced Competitions</used-at>
+    <description>3 vs 3, 8-minute speeches, 4-minute replies, POIs allowed</description>
+  </info>
+  <prep-time length="60:00"/>
+  <speech-types>
+    <speech-type ref="substantive" length="8:00" first-period="normal">
+      <bell time="1:00" number="1" next-period="pois-allowed"/>
+      <bell time="7:00" number="1" next-period="warning"/>
+      <bell time="finish" number="2" next-period="overtime"/>
+    </speech-type>
+    <speech-type ref="reply" length="4:00" first-period="normal">
+      <bell time="3:00" number="1" next-period="warning"/>
+      <bell time="finish" number="2" next-period="overtime"/>
+    </speech-type>
+  </speech-types>
+  <speeches>
+    <speech type="substantive">
+      <name>1st Affirmative</name>
+    </speech>
+    <speech type="substantive">
+      <name>1st Negative</name>
+    </speech>
+    <speech type="substantive">
+      <name>2nd Affirmative</name>
+    </speech>
+    <speech type="substantive">
+      <name>2nd Negative</name>
+    </speech>
+    <speech type="substantive">
+      <name>3rd Affirmative</name>
+    </speech>
+    <speech type="substantive">
+      <name>3rd Negative</name>
+    </speech>
+    <speech type="reply">
+      <name>Negative Reply</name>
+    </speech>
+    <speech type="reply">
+      <name>Affirmative Reply</name>
+    </speech>
+  </speeches>
+</debate-format>