Skip to content

Commit

Permalink
Finished updating for 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Beaker271
Beaker271 committed Apr 1, 2023
1 parent 0f5e024 commit f35ff9b
Show file tree
Hide file tree
Showing 15 changed files with 860 additions and 60 deletions.
Binary file modified images/ExpertText.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/epDiffEclipse.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/epDiffNormal.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/epDiffTedious.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/randomizationSigma.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/randomizationVanilla.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.
53 changes: 47 additions & 6 deletions items/items.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,29 @@
"img": "images/Brain.png",
"codes": "Brain"
},
{
"name": "Expert",
"type": "toggle",
"loop": "true",
"img": "images/ExpertText.png",
"codes": "Expert"
{
"name": "Puzzle Randomization",
"codes": "puzzleRandomization",
"type": "progressive",
"allow_disabled": false,
"initial_stage_idx": 0,
"stages": [
{
"img": "images/randomizationSigma.png",
"codes": "randomizationSigma",
"inherit_codes": false
},
{
"img": "images/ExpertText.png",
"codes": "Expert",
"inherit_codes": false
},
{
"img": "images/randomizationVanilla.png",
"codes": "randomizationVanilla",
"inherit_codes": false
}
]
},
{
"name": "Shuffle Unrandomized",
Expand Down Expand Up @@ -415,6 +432,30 @@
"inherit_codes": false
}
]
},
{
"name": "EP Difficulty",
"codes": "epDiff",
"type": "progressive",
"allow_disabled": false,
"initial_stage_idx": 0,
"stages": [
{
"img": "images/epDiffNormal.png",
"codes": "epDiffNormal",
"inherit_codes": false
},
{
"img": "images/epDiffTedious.png",
"codes": "epDiffTedious",
"inherit_codes": false
},
{
"img": "images/epDiffEclipse.png",
"codes": "epDiffEclipse",
"inherit_codes": false
}
]
},
{
"name": "Puzzle Skips",
Expand Down
25 changes: 16 additions & 9 deletions layouts/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{
"type": "item",
"margin": "0, 1",
"item": "Expert",
"item": "puzzleRandomization",
"h_alignment": "center",
"v_alignment": "strech"
},
Expand All @@ -43,28 +43,35 @@
"item": "Caves",
"h_alignment": "center",
"v_alignment": "strech"
},
},
{
"type": "item",
"margin": "0, 1",
"item": "epSetting",
"item": "Symbols",
"h_alignment": "center",
"v_alignment": "strech"
},
},
{
"type": "item",
"margin": "0, 1",
"item": "Symbols",
"item": "shuffleLasers",
"h_alignment": "center",
"v_alignment": "strech"
},
},
{
"type": "item",
"margin": "0, 0, 1, 10",
"item": "shuffleLasers",
"margin": "0, 1",
"item": "epSetting",
"h_alignment": "center",
"v_alignment": "strech"
},
},
{
"type": "item",
"margin": "0, 1",
"item": "epDiff",
"h_alignment": "center",
"v_alignment": "strech"
},
{
"type": "item",
"margin": "0, 1",
Expand Down
66 changes: 31 additions & 35 deletions locations/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
"y": 1308
}
]
}, {
},
{
"name": "Tutorial East Wall",
"sections": [
{
Expand Down Expand Up @@ -244,14 +245,14 @@
"sections": [
{
"name": "Boat Tutorial EP",
"access_rules": ["@Places/ocean"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/ocean", "epdiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
"name": "Boat Tutorial Reflection EP",
"access_rules": ["@Places/ocean"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/ocean", "epdiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
Expand Down Expand Up @@ -818,7 +819,8 @@
},
{
"name": "Boathouse Moving Ramp EP",
"access_rules": ["@Logic/boathouseRamp, $canSolve|158148, $canSolve|158154, $hasPanel|Quarry Boathouse Ramp Horizontal Control (Panel)"],
"access_rules": ["$isDoors|off, @Logic/boathouseRamp, $canSolve|158148, $canSolve|158154, $hasPanel|Quarry Boathouse Ramp Horizontal Control (Panel), @Quarry Boathouse/Front Row",
"$isDoors|on, @Logic/boathouseRamp, $canSolve|158148, $canSolve|158154, $hasPanel|Quarry Boathouse Ramp Horizontal Control (Panel), Quarry Boathouse First Barrier"],
"visibility_rules": ["eps"],
"item_count": 1
}
Expand Down Expand Up @@ -1730,14 +1732,14 @@
},
{
"name": "Second Blade EP",
"access_rules": ["$canSolve|158247,@Places/windmill"],
"visibility_rules": ["eps"],
"access_rules": ["$canSolve|158247,@Places/windmill", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
"name": "Third Blade EP",
"access_rules": ["$canSolve|158247,@Places/windmill"],
"visibility_rules": ["eps"],
"access_rules": ["$canSolve|158247,@Places/windmill", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
}
],
Expand Down Expand Up @@ -1779,8 +1781,8 @@
},
{
"name": "Flowers EP",
"visibility_rules": ["eps"],
"access_rules": ["@Theater/Tutorial Video, @Places/tunnels"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"access_rules": ["@Theater/Tutorial Video, @Places/tunnels", "epDiffNormal"],
"item_count": 1
},
{
Expand Down Expand Up @@ -1809,8 +1811,8 @@
},
{
"name": "Eclipse EP",
"visibility_rules": ["eps"],
"access_rules": ["@Theater/Challenge Video"],
"visibility_rules": ["eps, epDiffEclipse"],
"access_rules": ["@Theater/Challenge Video", "epDiffNormal", "epdiffTedious"],
"item_count": 1
},
{
Expand Down Expand Up @@ -2326,14 +2328,14 @@
"sections": [
{
"name": "Rotating Bridge CCW EP",
"access_rules": ["$hasPanel|Swamp Rotating Bridge (Panel), $canSolve|158327, @Places/swampBack"],
"visibility_rules": ["eps"],
"access_rules": ["$hasPanel|Swamp Rotating Bridge (Panel), $canSolve|158327, @Places/swampBack", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
"name": "Rotating Bridge CW EP",
"access_rules": ["$hasPanel|Swamp Rotating Bridge (Panel), $canSolve|158327, @Places/swampBack"],
"visibility_rules": ["eps"],
"access_rules": ["$hasPanel|Swamp Rotating Bridge (Panel), $canSolve|158327, @Places/swampBack", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
}
],
Expand Down Expand Up @@ -2620,7 +2622,7 @@
},
{
"name": "Burned House EP",
"access_rules": ["@Places/overworld, @Places/treehouseMain"],
"access_rules": ["@Treehouse Left Side/Left Orange Bridge"],
"visibility_rules": ["eps"],
"item_count": 1
},
Expand Down Expand Up @@ -2662,8 +2664,8 @@
},
{
"name": "Boat CCW Undersiade EP",
"access_rules": ["@Places/ocean"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/ocean", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
Expand All @@ -2686,26 +2688,20 @@
},
{
"name": "Couch EP",
"access_rules": ["@Places/plates3, @Places/ocean"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/plates3, @Places/ocean", "epDiffNormal"],
"visibility_rules": ["eps, epDiffEclipse", "eps, epDiffTedious"],
"item_count": 1
},
{
"name": "Boat Green EP",
"access_rules": ["@Places/ocean"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/ocean", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
},
{
"name": "Boat CW Underside EP",
"access_rules": ["@Places/plates3"],
"visibility_rules": ["eps"],
"item_count": 1
},
{
"name": "Boat CCW Underside EP",
"access_rules": ["@Places/plates3"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/ocean", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
}
],
Expand All @@ -2729,8 +2725,8 @@
},
{
"name": "Cloud Cycle EP",
"access_rules": ["@Places/overworld"],
"visibility_rules": ["eps"],
"access_rules": ["@Places/overworld", "epDiffNormal"],
"visibility_rules": ["eps, epDiffTedious", "eps, epDiffEclipse"],
"item_count": 1
}
],
Expand Down
2 changes: 1 addition & 1 deletion locations/logic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
{
"name": "quarryBoathouseUpstairsFront",
"access_rules": [
"@Places/quarry, [@Logic/boathouseRamp], $canSolve|158148"
"@Places/quarry, @Logic/boathouseRamp, $canSolve|158148"
],
"item_count": 1
},
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Witness",
"game_name": "The Witness Archipelago Randomizer",
"package_version": "0.3.9",
"package_version": "0.4.0",
"package_uid": "witness_ap_tracker_newsoupvi",
"author": "NewSoupVi, Beaker",
"variants": {
Expand Down
Loading

0 comments on commit f35ff9b

Please sign in to comment.