Skip to content

Commit

Permalink
Minor logic fixes for RG and SS.
Browse files Browse the repository at this point in the history
  • Loading branch information
nerthul11 committed Aug 12, 2024
1 parent 942ced7 commit 63d5f45
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 13 deletions.
2 changes: 1 addition & 1 deletion BreakableWallRandomizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace BreakableWallRandomizer
public class BreakableWallRandomizer : Mod, IGlobalSettings<BWR_Settings>
{
new public string GetName() => "Breakable Wall Randomizer";
public override string GetVersion() => "3.0.2.1";
public override string GetVersion() => "3.0.2.2";
public BWR_Settings GS { get; set; } = new();
private static BreakableWallRandomizer _instance;
public BreakableWallRandomizer() : base()
Expand Down
4 changes: 2 additions & 2 deletions BreakableWallRandomizer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<Product>BreakableWallRandomizer</Product>
<Description>A Randomizer add-on for wall and floor objects.</Description>
<Copyright>Copyright ©2023</Copyright>
<AssemblyVersion>3.0.2.1</AssemblyVersion>
<FileVersion>3.0.2.1</FileVersion>
<AssemblyVersion>3.0.2.2</AssemblyVersion>
<FileVersion>3.0.2.2</FileVersion>
<OutputPath>bin\$(Configuration)\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
5 changes: 3 additions & 2 deletions Resources/Data/BreakableWallObjects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2664,15 +2664,16 @@
"sceneName": "Ruins1_30",
"x": 0.1,
"y": -0.25,
"persistentBool": "",
"persistentBool": "brokenMageWindow",
"sprite": "break_floor_glass",
"alsoDestroy": [],
"exit": false,
"groupWalls": [],
"group": "",
"logic": "Ruins1_30 + QUAKE + $CASTSPELL[1,before:ROOMSOUL]",
"logicOverrides": {
"Broke_Sanctum_Glass_Floor": "Dive_Floor-Above_Soul_Warrior"
"Broke_Sanctum_Glass_Floor": "Dive_Floor-Above_Soul_Warrior",
"Ruins1_23[top1]": "(ORIG) + Dive_Floor-Above_Soul_Warrior"
},
"logicSubstitutions": {
"Ruins1_30[bot1]": {
Expand Down
25 changes: 17 additions & 8 deletions Resources/Data/WallGroups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,34 +108,43 @@
"group": "Catacombs_Walls",
"logic": "RestingGrounds_10",
"logicOverrides": {
"Geo_Rock-Resting_Grounds_Catacombs_Left_Dupe": "RestingGrounds_10 + Wall-Catacombs_Left_1",
"Geo_Chest-Resting_Grounds": "(ORIG) + Wall-Catacombs_Right_1",
"Hallownest_Seal-Resting_Grounds_Catacombs": "(ORIG) + Wall-Catacombs_Left_1 + Wall-Catacombs_Left_2 + Wall-Catacombs_Seal",
"Geo_Rock-Resting_Grounds_Catacombs_Left_Dupe": "(RestingGrounds_10[top1] | RestingGrounds_10) + Wall-Catacombs_Left_1",
"Hallownest_Seal-Resting_Grounds_Catacombs": "(RestingGrounds_10[top1] | RestingGrounds_10) + Wall-Catacombs_Left_1 + Wall-Catacombs_Left_2 + Wall-Catacombs_Seal",
"Opened_Resting_Grounds_Catacombs_Wall": "Plank-Catacombs_Elevator",
"RestingGrounds_10[left1]": "(ORIG) + Plank-Catacombs_Elevator",
"RestingGrounds_10[left1]": "RestingGrounds_10[left1] | (ORIG) + Plank-Catacombs_Elevator",
"RestingGrounds_10[top2]": "RestingGrounds_10[top2] + (LEFTCLAW | WINGS + PRECISEMOVEMENT | RIGHTCLAW) | (ORIG) + Wall-Catacombs_Right_1 + Wall-Catacombs_Grey_Mourner",
"Soul_Eater": "(ORIG) + Wall-Catacombs_Soul_Eater + Wall-Catacombs_Right_1 + Wall-Catacombs_Right_2",
"Wanderer's_Journal-Resting_Grounds_Catacombs": "(ORIG) + Wall-Catacombs_Right_1 + Wall-Catacombs_Right_2"
"Wanderer's_Journal-Resting_Grounds_Catacombs": "(ORIG) + Wall-Catacombs_Right_2"
},
"logicSubstitutions": {
"Geo_Rock-Resting_Grounds_Catacombs_Grub":
{
"RestingGrounds_10": "(RestingGrounds_10[top2] + Wall-Catacombs_Grey_Mourner | RestingGrounds_10)",
"UPWALLBREAK": "Wall-Catacombs_Right_1 + Wall-Catacombs_Grub"
},
"Geo_Rock-Resting_Grounds_Catacombs_Left":
{
"RestingGrounds_10": "(RestingGrounds_10[left1] + Plank-Catacombs_Elevator | RestingGrounds_10[top1] | RestingGrounds_10)",
"UPWALLBREAK": "Wall-Catacombs_Left_1 + Wall-Catacombs_Left_2"
},
"Grub-Resting_Grounds":
{
"UPWALLBREAK": "Wall-Catacombs_Right_1 + Wall-Catacombs_Grub"
"RestingGrounds_10": "(RestingGrounds_10[top2] + Wall-Catacombs_Grey_Mourner | RestingGrounds_10)",
"UPWALLBREAK": "Wall-Catacombs_Grub"
},
"RestingGrounds_10": {
"RestingGrounds_10[left1]": "RestingGrounds_10[left1] + Plank-Catacombs_Elevator",
"RestingGrounds_10[left1]": "RestingGrounds_10[left1] + Plank-Catacombs_Elevator + Wall-Catacombs_Right_1",
"RestingGrounds_10[top1]": "RestingGrounds_10[top1] + Wall-Catacombs_Right_1",
"RestingGrounds_10[top2]": "RestingGrounds_10[top2] + Wall-Catacombs_Right_1 + Wall-Catacombs_Grey_Mourner"
},
"Ruins2_10[right1]": {
"Opened_Resting_Grounds_Catacombs_Wall": "Plank-Catacombs_Elevator"
},
"Soul_Eater": {
"RestingGrounds_10": "(RestingGrounds_10[top2] + Wall-Catacombs_Grey_Mourner | RestingGrounds_10)",
"UPWALLBREAK": "Wall-Catacombs_Right_2 + Wall-Catacombs_Soul_Eater"
},
"Wanderer's_Journal-Resting_Grounds_Catacombs": {
"RestingGrounds_10": "(RestingGrounds_10[top2] + Wall-Catacombs_Grey_Mourner | RestingGrounds_10)"
}
}
},
Expand Down
7 changes: 7 additions & 0 deletions Resources/Logic/ConnectionOverrides.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"logicOverride": "ORIG + Wall-Chandelier",
"logicSubstitutions": {}
},
{
"name": "Defeated_Any_Entombed_Husk",
"logicOverride": "",
"logicSubstitutions": {
"RestingGrounds_10": "(RestingGrounds_10 | RestingGrounds_10[left1] + Plank-Catacombs_Elevator | RestingGrounds_10[top1] | RestingGrounds_10[top2] + Wall-Catacombs_Grey_Mourner)"
}
},
{
"name": "Lever-Palace_Final",
"logicOverride": "(ORIG) | White_Palace_12[bot1] + RIGHTCLAW + LEFTSUPERDASH + Wall-White_Palace_Shortcut + Plank-White_Palace_Shortcut_Exit",
Expand Down

0 comments on commit 63d5f45

Please sign in to comment.