Add files via upload

seto10987 · web-flow · commit c735eb98057f · 2024-02-25T19:48:07.000-06:00
diff --git a/items/items.json b/items/items.json
@@ -45,7 +45,7 @@
         "name": "Core A-Side Crystal Heart",
         "type": "toggle",
         "img": "images/items/items/blue_heart.png",
-        "codes": "hearta9"
+        "codes": "hearta8"
     },    
     {
         "name": "City B-Side Crystal Heart",
@@ -93,7 +93,7 @@
         "name": "Core B-Side Crystal Heart",
         "type": "toggle",
         "img": "images/items/items/red_heart.png",
-        "codes": "heartb9"
+        "codes": "heartb8"
     },    
     {
         "name": "City C-Side Crystal Heart",
@@ -141,7 +141,7 @@
         "name": "Core C-Side Crystal Heart",
         "type": "toggle",
         "img": "images/items/items/yellow_heart.png",
-        "codes": "heartc9"
+        "codes": "heartc8"
     },    
     {
         "name": "City Cassette",
@@ -189,7 +189,7 @@
         "name": "Core Cassette",
         "type": "toggle",
         "img": "images/items/items/cassette.png",
-        "codes": "cassette9"
+        "codes": "cassette8"
     },
     {
         "name": "City A-Side Level Completion",
@@ -237,19 +237,19 @@
         "name": "Epilogue Level Completion",
         "type": "toggle",
         "img": "images/items/items/complete.png",
-        "codes": "compa8"
+        "codes": "compep"
     },    
     {
         "name": "Core A-Side Level Completion",
         "type": "toggle",
         "img": "images/items/items/complete.png",
-        "codes": "compa9"
+        "codes": "compa8"
     },    
     {
         "name": "Farewell A-Side Level Completion",
         "type": "toggle",
         "img": "images/items/items/complete.png",
-        "codes": "compa10"
+        "codes": "compa9"
     },
     {
         "name": "City B-Side Level Completion",
@@ -297,7 +297,7 @@
         "name": "Core B-Side Level Completion",
         "type": "toggle",
         "img": "images/items/items/complete.png",
-        "codes": "compb9"
+        "codes": "compb8"
     },    
     {
         "name": "City C-Side Level Completion",
@@ -345,6 +345,6 @@
         "name": "Core C-Side Level Completion",
         "type": "toggle",
         "img": "images/items/items/complete.png",
-        "codes": "compc9"
+        "codes": "compc8"
     }
 ]
diff --git a/items/labels.json b/items/labels.json
@@ -173,14 +173,14 @@
         "img": "images/items/labels/ch9.png",
         "initial_active_state": true,
         "allow_disabled": false,
-        "codes": "ch9"
+        "codes": "ch8"
     },    
     {
         "name": "Chapter 9",
         "type": "toggle",
         "img": "images/items/labels/ch10.png",
         "initial_active_state": true,
         "allow_disabled": false,
-        "codes": "ch10"
+        "codes": "ch9"
     }
 ]
diff --git a/items/settings.json b/items/settings.json
@@ -119,5 +119,20 @@
             }
             
         ]
-    }
+    },
+	{
+        "name": "Current Level",
+        "type": "progressive",
+        "img": "",
+        "disabled_img": "",
+        "codes": "cur_level_id"
+	},
+	{
+	  "name": "Auto-Tab",
+	  "type": "progressive",
+	  "loop": true,
+	  "img": "images/items/items/autotab.png",
+	  "disabled_img": "images/items/items/autotab_off.png",
+	  "codes": "tab_switch"
+	}
 ]
diff --git a/layouts/auto_tab.json b/layouts/auto_tab.json
@@ -0,0 +1,30 @@
+{
+    "auto_tab": {
+        "type": "array",
+        "orientation": "vertical",
+        "margin": "0,0",
+        "content": [
+            {
+                "type": "array",
+                "orientation": "horizontal",
+                "margin": "0,0",
+                "content": [
+                    {
+                        "type": "itemgrid",
+                        "item_margin": "2, 2",
+                        "item_size": "30, 30",
+                        "background": "#04000a",
+                        "h_alignment": "right",
+                        "item_h_alignment": "center",
+                        "item_v_alignment": "center",
+                        "rows": [
+                            [
+                                "tab_switch"
+                            ]
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+}
diff --git a/layouts/items.json b/layouts/items.json
@@ -20,28 +20,28 @@
                         "rows": [
                             
                             [
-                                "", "ch1", "ch2", "ch3", "ch4", "ch5", "ch6", "ch7", "ep", "ch9", "ch10"
+                                "", "ch1", "ch2", "ch3", "ch4", "ch5", "ch6", "ch7", "ep", "ch8", "ch9"
                             ],
                             [
-                                "alabel", "compa1", "compa2", "compa3", "compa4", "compa5", "compa6", "compa7", "compa8", "compa9", "compa10"
+                                "alabel", "compa1", "compa2", "compa3", "compa4", "compa5", "compa6", "compa7", "compep", "compa8", "compa9"
                             ],
                             [
-                                "blabel", "compb1", "compb2", "compb3", "compb4", "compb5", "compb6", "compb7", "", "compb9"
+                                "blabel", "compb1", "compb2", "compb3", "compb4", "compb5", "compb6", "compb7", "", "compb8"
                             ],
                             [
-                                "clabel", "compc1", "compc2", "compc3", "compc4", "compc5", "compc6", "compc7", "", "compc9"
+                                "clabel", "compc1", "compc2", "compc3", "compc4", "compc5", "compc6", "compc7", "", "compc8"
                             ],
                             [
-                                "cassettelabel", "cassette1", "cassette2", "cassette3", "cassette4", "cassette5", "cassette6", "cassette7", "", "cassette9"
+                                "cassettelabel", "cassette1", "cassette2", "cassette3", "cassette4", "cassette5", "cassette6", "cassette7", "", "cassette8"
                             ],
                             [
-                                "alabel", "hearta1", "hearta2", "hearta3", "hearta4", "hearta5", "hearta6", "hearta7", "", "hearta9"                             
+                                "alabel", "hearta1", "hearta2", "hearta3", "hearta4", "hearta5", "hearta6", "hearta7", "", "hearta8"                             
                             ],
                             [
-                                "blabel", "heartb1", "heartb2", "heartb3", "heartb4", "heartb5", "heartb6", "heartb7", "", "heartb9"
+                                "blabel", "heartb1", "heartb2", "heartb3", "heartb4", "heartb5", "heartb6", "heartb7", "", "heartb8"
                             ],
                             [
-                                "clabel", "heartc1", "heartc2", "heartc3", "heartc4", "heartc5", "heartc6", "heartc7", "", "heartc9"
+                                "clabel", "heartc1", "heartc2", "heartc3", "heartc4", "heartc5", "heartc6", "heartc7", "", "heartc8"
                             ]
                         ]
                     }
diff --git a/layouts/settings.json b/layouts/settings.json
@@ -18,9 +18,6 @@
                         "item_h_alignment": "center",
                         "item_v_alignment": "center",
                         "rows": [
-                            [
-                                ""
-                            ],
                             [
                                 "", "goallevel", "goal", ""
                             ],                        
@@ -37,7 +34,10 @@
                                 "compttl", "comptotal", "comprequired", "compreq"
                             ],
                             [
-                                "", "", "", ""
+                                ""
+                            ],
+                            [
+                                ""
                             ]
                         ]
                     }
diff --git a/layouts/tracker.json b/layouts/tracker.json
@@ -1,23 +1,4 @@
 ﻿{
-    "settings_popup": {
-        "type": "array",
-        "margin": "5",
-        "content": [
-            {
-                "type": "group",
-                "header": "Autofill Settings",
-                "description": "Enable/Disable the automatic fill of the settings pannel from for connected Slot_Data",
-                "header_background": "#3e4b57",
-                "content": [
-                    {
-                        "type": "item",
-                        "margin": "-5,-1,-5,-5",
-                        "item": "autofill_settings"
-                    }
-                ]
-            }            
-        ]
-    },
     "tracker_default": {
         "type": "container",
         "background": "#000000",
diff --git a/locations/core/core.json b/locations/core/core.json
@@ -3,6 +3,7 @@
         "name": "Core",
         "chest_unopened_img": "images/items/items/berry.png",
         "chest_opened_img": "images/items/items/berry2.png",
+        "visibility_rules": ["core", "farewell"],
         "children": [
             {
                 "name": "Core A-Side - Into the Core",
@@ -15,8 +16,7 @@
                     }
                 ],
                 "access_rules": 
-                // remove $HEART|hearttotal|4 with new update
-                ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+                ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
                 "sections": 
                 [
                     {
@@ -37,7 +37,7 @@
                     }
                 ],
                 "access_rules": 
-                ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+                ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
                 "sections": 
                 [
                     {
@@ -68,7 +68,7 @@
                     }
                 ],
                 "access_rules": 
-                ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+                ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
                 "sections": 
                 [
                     {
@@ -109,8 +109,8 @@
                         "y": 279
                     }
                 ],
-                "access_rules": 
-                ["cassette9, $HEART|hearttotal|15"],
+                "visibility_rules": ["farewell"],
+                "access_rules": ["cassette8, $HEART|hearttotal|15"],
                 "sections": 
                 [
                     {
@@ -139,8 +139,8 @@
                         "y": 319
                     }
                 ],
-                "access_rules": 
-                ["$C9, $HEART|hearttotal|23"],
+                "visibility_rules": ["farewell"],
+                "access_rules": ["$C8, $HEART|hearttotal|23"],
                 "sections": 
                 [
                     {
diff --git a/locations/core/core_heart_of_the_mountain.json b/locations/core/core_heart_of_the_mountain.json
@@ -3,8 +3,9 @@
         "name": "Core-Heart of the Mountain",
         "chest_unopened_img": "images/items/items/berry.png",
         "chest_opened_img": "images/items/items/berry2.png",
+        "visibility_rules": ["core", "farewell"],
         "access_rules": 
-        ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+        ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
         "children": [
             {
                 "name": "Strawberry 5",
diff --git a/locations/core/core_hot_and_cold.json b/locations/core/core_hot_and_cold.json
@@ -3,8 +3,9 @@
         "name": "Core-Hot and Cold",
         "chest_unopened_img": "images/items/items/berry.png",
         "chest_opened_img": "images/items/items/berry2.png",
+        "visibility_rules": ["core", "farewell"],
         "access_rules": 
-        ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+        ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
         "children": [
             {
                 "name": "Strawberry 2",
diff --git a/locations/core/core_into_the_core.json b/locations/core/core_into_the_core.json
@@ -3,8 +3,9 @@
         "name": "Core-Into the Core",
         "chest_unopened_img": "images/items/items/berry.png",
         "chest_opened_img": "images/items/items/berry2.png",
+        "visibility_rules": ["core", "farewell"],
         "access_rules": 
-        ["compa8, $CORE, $HEART|hearttotal|4", "compa8, core, $HEART|hearttotal|4, $GOAL"],
+        ["compep, $CORE, $HEART|hearttotal|4", "compep, core, $HEART|hearttotal|4, $GOAL"],
         "children": [
             {
                 "name": "Strawberry 1",
diff --git a/locations/farewell/farewell.json b/locations/farewell/farewell.json
@@ -1,6 +1,7 @@
 [
     {
         "name": "Farewell",
+        "visibility_rules": ["farewell"],
         "children": [
             {
                 "name": "Farewell",
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 ﻿{
     "name": "Celeste PopTracker",
     "game_name": "Celeste",
-    "package_version": "2.3.0",
+    "package_version": "2.4.0",
     "package_uid": "celeste",
     "platform": "steam",
     "author": "Seto10987",
diff --git a/scripts/autotracking/archipelago.lua b/scripts/autotracking/archipelago.lua
diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
diff --git a/scripts/autotracking/tab_mapping.lua b/scripts/autotracking/tab_mapping.lua
diff --git a/scripts/init.lua b/scripts/init.lua
diff --git a/scripts/logic.lua b/scripts/logic.lua

Original file line number	Diff line number	Diff line change
`@@ -173,14 +173,14 @@`
`173`	`173`	`"img": "images/items/labels/ch9.png",`
`174`	`174`	`"initial_active_state": true,`
`175`	`175`	`"allow_disabled": false,`
`176`		`- "codes": "ch9"`
	`176`	`+ "codes": "ch8"`
`177`	`177`	`},`
`178`	`178`	`{`
`179`	`179`	`"name": "Chapter 9",`
`180`	`180`	`"type": "toggle",`
`181`	`181`	`"img": "images/items/labels/ch10.png",`
`182`	`182`	`"initial_active_state": true,`
`183`	`183`	`"allow_disabled": false,`
`184`		`- "codes": "ch10"`
	`184`	`+ "codes": "ch9"`
`185`	`185`	`}`
`186`	`186`	`]`
Original file line number	Diff line number	Diff line change
`@@ -20,28 +20,28 @@`
`20`	`20`	`"rows": [`
`21`	`21`
`22`	`22`	`[`
`23`		`- "", "ch1", "ch2", "ch3", "ch4", "ch5", "ch6", "ch7", "ep", "ch9", "ch10"`
	`23`	`+ "", "ch1", "ch2", "ch3", "ch4", "ch5", "ch6", "ch7", "ep", "ch8", "ch9"`
`24`	`24`	`],`
`25`	`25`	`[`
`26`		`- "alabel", "compa1", "compa2", "compa3", "compa4", "compa5", "compa6", "compa7", "compa8", "compa9", "compa10"`
	`26`	`+ "alabel", "compa1", "compa2", "compa3", "compa4", "compa5", "compa6", "compa7", "compep", "compa8", "compa9"`
`27`	`27`	`],`
`28`	`28`	`[`
`29`		`- "blabel", "compb1", "compb2", "compb3", "compb4", "compb5", "compb6", "compb7", "", "compb9"`
	`29`	`+ "blabel", "compb1", "compb2", "compb3", "compb4", "compb5", "compb6", "compb7", "", "compb8"`
`30`	`30`	`],`
`31`	`31`	`[`
`32`		`- "clabel", "compc1", "compc2", "compc3", "compc4", "compc5", "compc6", "compc7", "", "compc9"`
	`32`	`+ "clabel", "compc1", "compc2", "compc3", "compc4", "compc5", "compc6", "compc7", "", "compc8"`
`33`	`33`	`],`
`34`	`34`	`[`
`35`		`- "cassettelabel", "cassette1", "cassette2", "cassette3", "cassette4", "cassette5", "cassette6", "cassette7", "", "cassette9"`
	`35`	`+ "cassettelabel", "cassette1", "cassette2", "cassette3", "cassette4", "cassette5", "cassette6", "cassette7", "", "cassette8"`
`36`	`36`	`],`
`37`	`37`	`[`
`38`		`- "alabel", "hearta1", "hearta2", "hearta3", "hearta4", "hearta5", "hearta6", "hearta7", "", "hearta9"`
	`38`	`+ "alabel", "hearta1", "hearta2", "hearta3", "hearta4", "hearta5", "hearta6", "hearta7", "", "hearta8"`
`39`	`39`	`],`
`40`	`40`	`[`
`41`		`- "blabel", "heartb1", "heartb2", "heartb3", "heartb4", "heartb5", "heartb6", "heartb7", "", "heartb9"`
	`41`	`+ "blabel", "heartb1", "heartb2", "heartb3", "heartb4", "heartb5", "heartb6", "heartb7", "", "heartb8"`
`42`	`42`	`],`
`43`	`43`	`[`
`44`		`- "clabel", "heartc1", "heartc2", "heartc3", "heartc4", "heartc5", "heartc6", "heartc7", "", "heartc9"`
	`44`	`+ "clabel", "heartc1", "heartc2", "heartc3", "heartc4", "heartc5", "heartc6", "heartc7", "", "heartc8"`
`45`	`45`	`]`
`46`	`46`	`]`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@`
`18`	`18`	`"item_h_alignment": "center",`
`19`	`19`	`"item_v_alignment": "center",`
`20`	`20`	`"rows": [`
`21`		`- [`
`22`		`- ""`
`23`		`- ],`
`24`	`21`	`[`
`25`	`22`	`"", "goallevel", "goal", ""`
`26`	`23`	`],`
`@@ -37,7 +34,10 @@`
`37`	`34`	`"compttl", "comptotal", "comprequired", "compreq"`
`38`	`35`	`],`
`39`	`36`	`[`
`40`		`- "", "", "", ""`
	`37`	`+ ""`
	`38`	`+ ],`
	`39`	`+ [`
	`40`	`+ ""`
`41`	`41`	`]`
`42`	`42`	`]`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"name": "Core",`
`4`	`4`	`"chest_unopened_img": "images/items/items/berry.png",`
`5`	`5`	`"chest_opened_img": "images/items/items/berry2.png",`
	`6`	`+ "visibility_rules": ["core", "farewell"],`
`6`	`7`	`"children": [`
`7`	`8`	`{`
`8`	`9`	`"name": "Core A-Side - Into the Core",`
`@@ -15,8 +16,7 @@`
`15`	`16`	`}`
`16`	`17`	`],`
`17`	`18`	`"access_rules":`
`18`		`- // remove $HEART\|hearttotal\|4 with new update`
`19`		`- ["compa8, $CORE, $HEART\|hearttotal\|4", "compa8, core, $HEART\|hearttotal\|4, $GOAL"],`
	`19`	`+ ["compep, $CORE, $HEART\|hearttotal\|4", "compep, core, $HEART\|hearttotal\|4, $GOAL"],`
`20`	`20`	`"sections":`
`21`	`21`	`[`
`22`	`22`	`{`
`@@ -37,7 +37,7 @@`
`37`	`37`	`}`
`38`	`38`	`],`
`39`	`39`	`"access_rules":`
`40`		`- ["compa8, $CORE, $HEART\|hearttotal\|4", "compa8, core, $HEART\|hearttotal\|4, $GOAL"],`
	`40`	`+ ["compep, $CORE, $HEART\|hearttotal\|4", "compep, core, $HEART\|hearttotal\|4, $GOAL"],`
`41`	`41`	`"sections":`
`42`	`42`	`[`
`43`	`43`	`{`
`@@ -68,7 +68,7 @@`
`68`	`68`	`}`
`69`	`69`	`],`
`70`	`70`	`"access_rules":`
`71`		`- ["compa8, $CORE, $HEART\|hearttotal\|4", "compa8, core, $HEART\|hearttotal\|4, $GOAL"],`
	`71`	`+ ["compep, $CORE, $HEART\|hearttotal\|4", "compep, core, $HEART\|hearttotal\|4, $GOAL"],`
`72`	`72`	`"sections":`
`73`	`73`	`[`
`74`	`74`	`{`
`@@ -109,8 +109,8 @@`
`109`	`109`	`"y": 279`
`110`	`110`	`}`
`111`	`111`	`],`
`112`		`- "access_rules":`
`113`		`- ["cassette9, $HEART\|hearttotal\|15"],`
	`112`	`+ "visibility_rules": ["farewell"],`
	`113`	`+ "access_rules": ["cassette8, $HEART\|hearttotal\|15"],`
`114`	`114`	`"sections":`
`115`	`115`	`[`
`116`	`116`	`{`
`@@ -139,8 +139,8 @@`
`139`	`139`	`"y": 319`
`140`	`140`	`}`
`141`	`141`	`],`
`142`		`- "access_rules":`
`143`		`- ["$C9, $HEART\|hearttotal\|23"],`
	`142`	`+ "visibility_rules": ["farewell"],`
	`143`	`+ "access_rules": ["$C8, $HEART\|hearttotal\|23"],`
`144`	`144`	`"sections":`
`145`	`145`	`[`
`146`	`146`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "Farewell",`
	`4`	`+ "visibility_rules": ["farewell"],`
`4`	`5`	`"children": [`
`5`	`6`	`{`
`6`	`7`	`"name": "Farewell",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Celeste PopTracker",`
`3`	`3`	`"game_name": "Celeste",`
`4`		`- "package_version": "2.3.0",`
	`4`	`+ "package_version": "2.4.0",`
`5`	`5`	`"package_uid": "celeste",`
`6`	`6`	`"platform": "steam",`
`7`	`7`	`"author": "Seto10987",`