Skip to content

Commit

Permalink
Merge pull request #8 from NewSoupVi/0.3.5
Browse files Browse the repository at this point in the history 
0.3.5
  • Loading branch information
@Beaker271
Beaker271 authored Oct 7, 2022
2 parents 7ca02f8 + 4007b2e commit 09ec412
Show file tree
Hide file tree
Showing 16 changed files with 798 additions and 1,371 deletions.
Binary file added images/challengeBox.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/laser.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/lasersText.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/mountainLong.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/mountainShort.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/wonkavator.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
206 changes: 204 additions & 2 deletions items/items.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,124 @@
"codes": "Symbols",
"type": "toggle",
"loop": "true"
},
{
"name": "Victory Condition",
"codes": "goal",
"type": "progressive",
"allow_disabled": true,
"initial_stage_idx": 0,
"stages": [
{
"img": "images/wonkavator.png",
"codes": "wonkavator",
"inherit_codes": false
},
{
"img": "images/challengeBox.png",
"codes": "challengeBox",
"inherit_codes": false
},
{
"img": "images/mountainShort.png",
"codes": "Short",
"inherit_codes": false
},
{
"img": "images/mountainLong.png",
"codes": "Long",
"inherit_codes": false
},
]
},
{
"name": "Laser Box Short Requirement",
"type": "consumable",
"img": "images/mountainShort.png",
"max_quantity": 7,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_background": "#000000",
"overlay_font_size": 16,
"codes": "boxShort"
},
{
"name": "Laser Box Long Requirement",
"type": "consumable",
"img": "images/mountainLong.png",
"max_quantity": 11,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_background": "#000000",
"overlay_font_size": 16,
"codes": "boxLong"
},
{
"name": "Hiiden Victory Condition",
"codes": "hiddenGoal",
"type": "progressive",
"allow_disabled": true,
"initial_stage_idx": 0,
"stages": [
{
"img": "images/wonkavator.png",
"codes": "hiddenWonkavator",
"inherit_codes": false
},
{
"img": "images/challengeBox.png",
"codes": "hiddenChallengeBox",
"inherit_codes": false
},
{
"img": "images/mountainShort.png",
"codes": "hiddenShortGoal",
"inherit_codes": false
},
{
"img": "images/mountainLong.png",
"codes": "hiddenLongGoal",
"inherit_codes": false
},
]
},
{
"name": "Hidden Box Short Requirement",
"type": "consumable",
"img": "images/laser.png",
"max_quantity": 7,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_background": "#000000",
"overlay_font_size": 16,
"codes": "hiddenShort"
},
{
"name": "Hidden Box Long Requirement",
"type": "consumable",
"img": "images/laser.png",
"max_quantity": 11,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_background": "#000000",
"overlay_font_size": 16,
"codes": "hiddenLong"
},
{
"name": "Lasers Activated",
"type": "consumable",
"img": "images/laser.png",
"max_quantity": 11,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_background": "#000000",
"overlay_font_size": 16,
"codes": "lasers"
},
{
"name": "Doors Unshuffled",
Expand Down Expand Up @@ -188,6 +306,13 @@
"codes": "doorsMax",
"type": "toggle",
"loop": "true"
},
{
"name": "Shuffle Lasers",
"img": "images/lasersText.png",
"codes": "shuffleLasers",
"type": "toggle",
"loop": "true"
},
{
"name": "Puzzle Skips",
Expand Down Expand Up @@ -308,11 +433,11 @@
"codes": "Town Door to Church (Panel)"
},
{
"name": "Town Maze Panel (Drop",
"name": "Town Maze Panel (Drop-Down Staircase) (Panel)",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Town Maze Panel (Drop"
"codes": "Town Maze Panel (Drop-Down Staircase) (Panel)"
},
{
"name": "Windmill Door (Panel)",
Expand Down Expand Up @@ -1354,4 +1479,81 @@
"img": "images/Door.png",
"codes": "Theater Walkway Doors"
},
{
"name": "Symmetry Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Symmetry Laser"
},
{
"name": "Desert Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Desert Laser"
},
{
"name": "Quarry Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Quarry Laser"
},
{
"name": "Shadows Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Shadows Laser"
},
{
"name": "Keep Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Keep Laser"
},
{
"name": "Monastery Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Monastery Laser"
},
{
"name": "Town Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Town Laser"
},
{
"name": "Jungle Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Jungle Laser"
},
{
"name": "Bunker Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Bunker Laser"
},
{
"name": "Swamp Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Swamp Laser"
},
{
"name": "Treehouse Laser",
"type": "toggle",
"loop": "true",
"img": "images/Door.png",
"codes": "Treehouse Laser"
},
]
9 changes: 8 additions & 1 deletion layouts/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@
},
{
"type": "item",
"margin": "0, 0, 1, 10",
"margin": "0, 1",
"item": "Symbols",
"h_alignment": "center",
"v_alignment": "strech"
},
{
"type": "item",
"margin": "0, 0, 1, 10",
"item": "shuffleLasers",
"h_alignment": "center",
"v_alignment": "strech"
},
{
"type": "item",
"margin": "0, 1",
"item": "DoorsNo",
"h_alignment": "center",
Expand Down
6 changes: 3 additions & 3 deletions layouts/tracker.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"h_alignment": "left",
"item_size": "50",
"rows": [
[ "BWSquare", "ColoredSquares", "Stars", "StarSameColor", "Triangles", "Brain" ],
[ "Dots", "ColoredDots", "SoundDots", "Symmetry" , "Boat" ],
[ "Shapers", "RotatedShapers", "NegativeShapers", "Eraser", "Skip"]
[ "BWSquare", "ColoredSquares", "Stars", "StarSameColor", "Triangles", "Brain", "goal" ],
[ "Dots", "ColoredDots", "SoundDots", "Symmetry" , "Boat", "lasers", "boxShort"],
[ "Shapers", "RotatedShapers", "NegativeShapers", "Eraser", "Skip", "", "boxLong"]
]
},
]},
Expand Down
Loading

0 comments on commit 09ec412

Please sign in to comment.