From ad38b09429147275f4f82ef0fb7a1d4b9dd43732 Mon Sep 17 00:00:00 2001 From: Dalton Ma <85321730+bohrium2b@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:49:51 +1200 Subject: [PATCH 1/6] Add ASD PJ format --- v1/formats/asd-premjunior.xml | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 v1/formats/asd-premjunior.xml diff --git a/v1/formats/asd-premjunior.xml b/v1/formats/asd-premjunior.xml new file mode 100644 index 0000000..0e1c81e --- /dev/null +++ b/v1/formats/asd-premjunior.xml @@ -0,0 +1,49 @@ + + + ASD Premier Junior + 1 + + New Zealand + School + Auckland Schools Debating Premier Junior Competitions + 3 vs 3, 6-minute speeches, 3-minute replies, POIs allowed + + + + + + + + + + + + + + + + 1st Affirmative + + + 1st Negative + + + 2nd Affirmative + + + 2nd Negative + + + 3rd Affirmative + + + 3rd Negative + + + Negative Reply + + + Affirmative Reply + + + From ebf4290c71bfac8f926df606bb09cacf01388584 Mon Sep 17 00:00:00 2001 From: Dalton Ma <85321730+bohrium2b@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:03:03 +1200 Subject: [PATCH 2/6] Add ASD Senior Open --- v1/formats/asd-opensenior.xml | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 v1/formats/asd-opensenior.xml diff --git a/v1/formats/asd-opensenior.xml b/v1/formats/asd-opensenior.xml new file mode 100644 index 0000000..10d3d01 --- /dev/null +++ b/v1/formats/asd-opensenior.xml @@ -0,0 +1,49 @@ + + + ASD Senior Open + 1 + + New Zealand + School + Auckland Schools Debating Senior Open Competitions + 3 vs 3, 6-minute speeches, 3-minute replies, no POIs + + + + + + + + + + + + + + + + 1st Affirmative + + + 1st Negative + + + 2nd Affirmative + + + 2nd Negative + + + 3rd Affirmative + + + 3rd Negative + + + Negative Reply + + + Affirmative Reply + + + From 1eb0cd7c69c30aea8d8d59552f3df81b6eb8f0d4 Mon Sep 17 00:00:00 2001 From: Dalton Ma <85321730+bohrium2b@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:12:29 +1200 Subject: [PATCH 3/6] Add ASD Junior Open --- v1/formats/asd-openjunior.xml | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 v1/formats/asd-openjunior.xml diff --git a/v1/formats/asd-openjunior.xml b/v1/formats/asd-openjunior.xml new file mode 100644 index 0000000..16db81d --- /dev/null +++ b/v1/formats/asd-openjunior.xml @@ -0,0 +1,47 @@ + + + ASD Junior Open + 1 + + New Zealand + School + Auckland Schools Debating Junior Open Competitions + 3 vs 3, 5-minute speeches, 2.5-minute replies, no POIs + + + + + + + + + + + + + + 1st Affirmative + + + 1st Negative + + + 2nd Affirmative + + + 2nd Negative + + + 3rd Affirmative + + + 3rd Negative + + + Negative Reply + + + Affirmative Reply + + + From dfe549dcae0b3dc78f2298676e0d99ec6d363c32 Mon Sep 17 00:00:00 2001 From: Dalton Ma <85321730+bohrium2b@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:13:04 +1200 Subject: [PATCH 4/6] Remove unnecessary bell --- v1/formats/asd-opensenior.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/v1/formats/asd-opensenior.xml b/v1/formats/asd-opensenior.xml index 10d3d01..9205bc3 100644 --- a/v1/formats/asd-opensenior.xml +++ b/v1/formats/asd-opensenior.xml @@ -11,7 +11,6 @@ - From 0f4c7841e2981c06725f22ed3a9addede41aada2 Mon Sep 17 00:00:00 2001 From: Chuan-Zheng Lee Date: Sat, 19 Oct 2024 20:54:18 +1300 Subject: [PATCH 5/6] Apply suggestions from code review --- v1/formats/asd-openjunior.xml | 5 +++-- v1/formats/asd-opensenior.xml | 3 ++- v1/formats/asd-premjunior.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/v1/formats/asd-openjunior.xml b/v1/formats/asd-openjunior.xml index 16db81d..1115877 100644 --- a/v1/formats/asd-openjunior.xml +++ b/v1/formats/asd-openjunior.xml @@ -1,12 +1,13 @@ - ASD Junior Open + Auckland Schools Junior Open + ASD Junior Open 1 New Zealand School Auckland Schools Debating Junior Open Competitions - 3 vs 3, 5-minute speeches, 2.5-minute replies, no POIs + 3 vs 3, 5-minute speeches, 2½-minute replies, no POIs diff --git a/v1/formats/asd-opensenior.xml b/v1/formats/asd-opensenior.xml index 9205bc3..f8c0980 100644 --- a/v1/formats/asd-opensenior.xml +++ b/v1/formats/asd-opensenior.xml @@ -1,6 +1,7 @@ - ASD Senior Open + Auckland Schools Senior Open + ASD Senior Open 1 New Zealand diff --git a/v1/formats/asd-premjunior.xml b/v1/formats/asd-premjunior.xml index 0e1c81e..ad3740e 100644 --- a/v1/formats/asd-premjunior.xml +++ b/v1/formats/asd-premjunior.xml @@ -1,6 +1,7 @@ - ASD Premier Junior + Auckland Schools Premier Junior + ASD Premier Junior 1 New Zealand From 0477198b6641725f4f33d57d9d59c085e25361c7 Mon Sep 17 00:00:00 2001 From: Chuan-Zheng Lee Date: Sat, 19 Oct 2024 21:01:46 +1300 Subject: [PATCH 6/6] A few more tweaks --- v1/formats/asd-openjunior.xml | 3 ++- v1/formats/asd-opensenior.xml | 2 +- v1/formats/asd-premjunior.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/v1/formats/asd-openjunior.xml b/v1/formats/asd-openjunior.xml index 1115877..d8bfc3d 100644 --- a/v1/formats/asd-openjunior.xml +++ b/v1/formats/asd-openjunior.xml @@ -4,11 +4,12 @@ ASD Junior Open 1 - New Zealand + Auckland School Auckland Schools Debating Junior Open Competitions 3 vs 3, 5-minute speeches, 2½-minute replies, no POIs + diff --git a/v1/formats/asd-opensenior.xml b/v1/formats/asd-opensenior.xml index f8c0980..10ba5fc 100644 --- a/v1/formats/asd-opensenior.xml +++ b/v1/formats/asd-opensenior.xml @@ -4,7 +4,7 @@ ASD Senior Open 1 - New Zealand + Auckland School Auckland Schools Debating Senior Open Competitions 3 vs 3, 6-minute speeches, 3-minute replies, no POIs diff --git a/v1/formats/asd-premjunior.xml b/v1/formats/asd-premjunior.xml index ad3740e..f003ced 100644 --- a/v1/formats/asd-premjunior.xml +++ b/v1/formats/asd-premjunior.xml @@ -4,7 +4,7 @@ ASD Premier Junior 1 - New Zealand + Auckland School Auckland Schools Debating Premier Junior Competitions 3 vs 3, 6-minute speeches, 3-minute replies, POIs allowed