Merge pull request #2 from Br00ty/ap-style-logic

update to AP style logic
Br00ty · Jan 2, 2024 · 8cbeea2 · 8cbeea2
2 parents 8275cbf + b6bd9f6
commit 8cbeea2
Show file tree

Hide file tree

Showing 19 changed files with 3,123 additions and 1,157 deletions.
diff --git a/items/items.json b/items/items.json
@@ -165,22 +165,22 @@
             {
                 "img": "images/logic_settings/normal.png",
                 "codes": "logic,normal",
-                "inherit_codes": true
+                "inherit_codes": false
             },
             {
                 "img": "images/logic_settings/hard.png",
                 "codes": "logic,hard",
-                "inherit_codes": true
+                "inherit_codes": false
             },
             {
                 "img": "images/logic_settings/expert.png",
                 "codes": "logic,expert",
-                "inherit_codes": true
+                "inherit_codes": false
             },
             {
                 "img": "images/logic_settings/lunatic.png",
                 "codes": "logic,lunatic",
-                "inherit_codes": true
+                "inherit_codes": false
             }
         ]
     },
@@ -221,56 +221,6 @@
             }
         ]
     },
-    // LAYOUTS
-    {
-        "name": "Progressive Breaker Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_attack.png",
-        "disabled_img": "images/icons/icon_attack_grey.png",
-        "codes": "progbreakerLayout"
-    },
-    {
-        "name": "Progressive Slide Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_slide.png",
-        "disabled_img": "images/icons/icon_slide_grey.png",
-        "codes": "progslideLayout"
-    },
-    {
-        "name": "Split Kicks Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_HeliacalPower.png",
-        "disabled_img": "images/icons/icon_HeliacalPower_grey.png",
-        "codes": "splitkickLayout"
-    },
-    {
-        "name": "Progressive Breaker and Progressive Slide Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_HeliacalPower.png",
-        "disabled_img": "images/icons/icon_HeliacalPower_grey.png",
-        "codes": "progbreakerprogslideLayout"
-    },
-    {
-        "name": "Progressive Breaker and Split Kick Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_HeliacalPower.png",
-        "disabled_img": "images/icons/icon_HeliacalPower_grey.png",
-        "codes": "progbreakersplitkickLayout"
-    },
-    {
-        "name": "Progressive Slide and Split Kick Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_HeliacalPower.png",
-        "disabled_img": "images/icons/icon_HeliacalPower_grey.png",
-        "codes": "progslidesplitkickLayout"
-    },
-    {
-        "name": "All Progressives and Split Kick Layout",
-        "type": "toggle",
-        "img": "images/icons/icon_HeliacalPower.png",
-        "disabled_img": "images/icons/icon_HeliacalPower_grey.png",
-        "codes": "progsandsplitLayout"
-    },
     // EXAMPLE CODE
     {
         "name": "Progressive",

diff --git a/layouts/settings_popup.json b/layouts/settings_popup.json
@@ -6,7 +6,6 @@
         "margin": "0,0",
         "content": [
             {
-                "name": "Settings",
                 "type": "itemgrid",
                 "item_margin": "0,5",
                 "item_size": "200, 80",