Skip to content

Commit

Permalink
Hotfix for unbreakable walls.
Browse files Browse the repository at this point in the history
  • Loading branch information
nerthul11 committed Jun 29, 2024
1 parent 61251c6 commit 05f8519
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 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.0.1";
public override string GetVersion() => "3.0.0.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.0.1</AssemblyVersion>
<FileVersion>3.0.0.1</FileVersion>
<AssemblyVersion>3.0.0.2</AssemblyVersion>
<FileVersion>3.0.0.2</FileVersion>
<OutputPath>bin\$(Configuration)\</OutputPath>
<LangVersion>latest</LangVersion>
</PropertyGroup>
Expand Down
14 changes: 8 additions & 6 deletions IC/BreakableWallLocation.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ private InteropTag BreakableWallLocationTag(float x, float y)
sprite = "wood_plank_02";
if (name.StartsWith("Dive_Floor-"))
sprite = "break_floor_glass";
if (name.StartsWith("Wall_Group-"))
sprite = "mine_break_wall_03_0deg";

// Replace map for pinless-maps
string mapSceneName = sceneName;
Expand Down Expand Up @@ -171,6 +173,9 @@ private void ModifyWallBehaviour(PlayMakerFSM fsm)
if (wall.fsmType != fsm.FsmName)
continue;

BreakableWallRandomizer.Instance.Log(fsm.gameObject);
BreakableWallRandomizer.Instance.Log(wall.gameObject);

// If a location is present, it means that it's not vanilla
BreakableWallModule.Instance.vanillaWalls.RemoveAll(wall => wall.name == name);

Expand Down Expand Up @@ -244,8 +249,7 @@ private void ModifyWallBehaviour(PlayMakerFSM fsm)
// If items are left, make wall semi-transparent and passable
if (!Placement.AllObtained())
{
foreach (CondensedWallObject w in wallList)
MakeWallPassable(GameObject.Find(w.gameObject));
MakeWallPassable(fsm.gameObject);
}
else
{
Expand Down Expand Up @@ -311,16 +315,14 @@ private void ModifyWallBehaviour(PlayMakerFSM fsm)
{
if (Placement.AllObtained())
{
foreach (CondensedWallObject w in wallList)
MakeWallPassable(GameObject.Find(w.gameObject));
MakeWallPassable(fsm.gameObject);
fsm.SetState(originalIdleStateName);
}
else
{
if (wall.fsmType == "quake_floor")
{
foreach (CondensedWallObject w in wallList)
MakeWallPassable(GameObject.Find(w.gameObject));
MakeWallPassable(fsm.gameObject);
} // ensure everything is passable.
fsm.SetState(originalBreakStateName);
}
Expand Down
10 changes: 5 additions & 5 deletions Resources/Data/BreakableWallObjects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1580,11 +1580,11 @@
"exit": false,
"groupWalls": [],
"group": "",
"logic": "(Mines_35[left1] + Broke_Crystallized_Mound_Quake_Floor + (LEFTCLAW | RIGHTCLAW + PRECISEMOVEMENT + (RIGHTDASH | OBSCURESKIPS + DIFFICULTSKIPS) | WINGS + OBSCURESKIPS)) | Mines_35[left1] + Plank-Crystallized_Mound",
"logic": "(Mines_35[left1] + Dive_Floor-Crystallized_Mound + (LEFTCLAW | RIGHTCLAW + PRECISEMOVEMENT + (RIGHTDASH | OBSCURESKIPS + DIFFICULTSKIPS) | WINGS + OBSCURESKIPS)) | Mines_35[left1] + (RIGHTDASH | RIGHTSUPERDASH | RIGHTCLAW | WINGS | (FIREBALLSKIPS + (LEFTFIREBALL | SCREAM)) + $CASTSPELL[3]) + Plank-Crystallized_Mound",
"logicOverrides": {
"Descending_Dark": "(ORIG) | Mines_35[left1] + Plank-Crystallized_Mound",
"Grub-Crystallized_Mound": "(ORIG) | Mines_35[left1] + Plank-Crystallized_Mound + (RIGHTCLAW | WINGS + LEFTCLAW + BACKGROUNDPOGOS)",
"Soul_Totem-Crystallized_Mound": "(ORIG) | Mines_35[left1] + Plank-Crystallized_Mound + (RIGHTCLAW | WINGS + LEFTCLAW + BACKGROUNDPOGOS) + LEFTDASH"
"Descending_Dark": "(ORIG) | Mines_35[left1] + (RIGHTDASH | RIGHTSUPERDASH | RIGHTCLAW | WINGS | (FIREBALLSKIPS + (LEFTFIREBALL | SCREAM)) + $CASTSPELL[3]) + Plank-Crystallized_Mound",
"Grub-Crystallized_Mound": "(ORIG) | Mines_35[left1] + (RIGHTDASH | RIGHTSUPERDASH | RIGHTCLAW | WINGS | (FIREBALLSKIPS + (LEFTFIREBALL | SCREAM)) + $CASTSPELL[3]) + Plank-Crystallized_Mound + (RIGHTCLAW | WINGS + LEFTCLAW + BACKGROUNDPOGOS)",
"Soul_Totem-Crystallized_Mound": "(ORIG) | Mines_35[left1] + (RIGHTDASH | RIGHTSUPERDASH | RIGHTCLAW | WINGS | (FIREBALLSKIPS + (LEFTFIREBALL | SCREAM)) + $CASTSPELL[3]) + Plank-Crystallized_Mound + (RIGHTCLAW | WINGS + LEFTCLAW + BACKGROUNDPOGOS) + LEFTDASH"
},
"logicSubstitutions": {}
},
Expand Down Expand Up @@ -2875,7 +2875,7 @@
"alsoDestroy": [],
"exit": false,
"groupWalls": [],
"group": "King's_Pass_Walls",
"group": "",
"logic": "Tutorial_01",
"logicOverrides": {
"Geo_Rock-King's_Pass_Above_Fury": "(ORIG + Plank-King's_Pass) | (Tutorial_01 + (RIGHTCLAW | LEFTCLAW + WINGS + RIGHTDASH + LONGMARK + BACKGROUNDPOGOS))",
Expand Down

0 comments on commit 05f8519

Please sign in to comment.