From e4f8cc65ef0f211b25a4f3a7e96a1143753bce76 Mon Sep 17 00:00:00 2001 From: Zedb0T <89345505+Zedb0T@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:49:36 -0500 Subject: [PATCH 1/3] Add jak 2 orb counters --- jak2/opengoal-jak2-autosplitter.asl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jak2/opengoal-jak2-autosplitter.asl b/jak2/opengoal-jak2-autosplitter.asl index 65c0690..644bbf4 100644 --- a/jak2/opengoal-jak2-autosplitter.asl +++ b/jak2/opengoal-jak2-autosplitter.asl @@ -42,6 +42,20 @@ startup { settings.Add("group_endingConditions", true, "Ending Conditions"); AddToSettings(vars.endingConditions, "group_endingConditions"); + // Per-level Orb Count Splits + Action>, string, int, string> AddOpenOrbsCountOptions = (list, id_prefix, offset, name_prefix) => { + for (int i = 1; i <= 95; i++) { + AddOption(list, id_prefix + i, offset, typeof(byte), i, false, "Orb " + i, false); + } + }; + settings.Add("jak2_orb_count", true, "Collectiable counters"); + + vars.allOpenOrbsCount = new List>(); + AddOpenOrbsCountOptions(vars.allOpenOrbsCount, "jak2_orb_count", 4, " a"); + settings.Add("jak2_all_open_orbs", true, "All Open Orbs", "jak2_orb_count"); + AddToSettings(vars.allOpenOrbsCount, "jak2_all_open_orbs"); + vars.optionLists.Add(vars.allOpenOrbsCount); + // NOTE: This section is autogenerated. Do not edit it directly. // __AUTOGENERATED__ START vars.anyPercent = new List>(); From 565b73eb035d7ea315fdceefe6710d3ba9568b9b Mon Sep 17 00:00:00 2001 From: Zedb0T <89345505+Zedb0T@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:52:58 -0500 Subject: [PATCH 2/3] whoops --- jak2/opengoal-jak2-autosplitter.asl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jak2/opengoal-jak2-autosplitter.asl b/jak2/opengoal-jak2-autosplitter.asl index 644bbf4..2302943 100644 --- a/jak2/opengoal-jak2-autosplitter.asl +++ b/jak2/opengoal-jak2-autosplitter.asl @@ -48,14 +48,14 @@ startup { AddOption(list, id_prefix + i, offset, typeof(byte), i, false, "Orb " + i, false); } }; - settings.Add("jak2_orb_count", true, "Collectiable counters"); + settings.Add("jak2_orb_count", true, "Collectable counters"); vars.allOpenOrbsCount = new List>(); AddOpenOrbsCountOptions(vars.allOpenOrbsCount, "jak2_orb_count", 4, " a"); settings.Add("jak2_all_open_orbs", true, "All Open Orbs", "jak2_orb_count"); AddToSettings(vars.allOpenOrbsCount, "jak2_all_open_orbs"); vars.optionLists.Add(vars.allOpenOrbsCount); - + // NOTE: This section is autogenerated. Do not edit it directly. // __AUTOGENERATED__ START vars.anyPercent = new List>(); From e7c0bec6ebc9a5ba038d3c93c6dcf3e1052d3292 Mon Sep 17 00:00:00 2001 From: Zedb0T <89345505+Zedb0T@users.noreply.github.com> Date: Sun, 12 Nov 2023 01:05:07 -0500 Subject: [PATCH 3/3] add ending condition --- jak2/opengoal-jak2-autosplitter.asl | 1 + 1 file changed, 1 insertion(+) diff --git a/jak2/opengoal-jak2-autosplitter.asl b/jak2/opengoal-jak2-autosplitter.asl index 2302943..80214b9 100644 --- a/jak2/opengoal-jak2-autosplitter.asl +++ b/jak2/opengoal-jak2-autosplitter.asl @@ -39,6 +39,7 @@ startup { AddOption(vars.endingConditions, "endingConditions_kor-death", 12, typeof(byte), 1, false, "Kor Death", false); AddOption(vars.endingConditions, "endingConditions_all-collectables", 13, typeof(byte), 1, false, "All Collectables", false); AddOption(vars.endingConditions, "endingConditions_all-orbs", 4, typeof(uint), 286, false, "All Orbs", false); + AddOption(vars.endingConditions, "endingConditions_all-open-orbs", 4, typeof(uint), 95, false, "All Open Orbs", false); settings.Add("group_endingConditions", true, "Ending Conditions"); AddToSettings(vars.endingConditions, "group_endingConditions");