Added 2 new benches, other minor logic changes.

homothetyhk · Jun 19, 2022 · 3219a45 · 3219a45
1 parent acc2b18
commit 3219a45
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 5 deletions.
diff --git a/BenchRando/BenchNames.cs b/BenchRando/BenchNames.cs
@@ -109,6 +109,7 @@ public static string[] ToArray()
         public const string Bench_Distant_Reservoir = "Bench-Distant_Reservoir";
         public const string Bench_Deepnest_Gate = "Bench-Deepnest_Gate";
         public const string Bench_Distant_Stag = "Bench-Distant_Stag";
+        public const string Bench_Deepnest_Maze = "Bench-Deepnest_Maze";
         public const string Bench_Abyss_Workshop = "Bench-Abyss_Workshop";
         public const string Bench_Far_Basin = "Bench-Far_Basin";
         public const string Bench_Basin_Hub = "Bench-Basin_Hub";
@@ -124,6 +125,7 @@ public static string[] ToArray()
         public const string Bench_Crusher_Refuge = "Bench-Crusher_Refuge";
         public const string Bench_Western_Peak = "Bench-Western_Peak";
         public const string Bench_Quirrel_Peak = "Bench-Quirrel_Peak";
+        public const string Bench_Peak_Ravine = "Bench-Peak_Ravine";
         public const string Bench_Unns_Chamber = "Bench-Unn's_Chamber";
         public const string Bench_Gulka_Gulley = "Bench-Gulka_Gulley";
         public const string Bench_Hunters_Hideout = "Bench-Hunter's_Hideout";

diff --git a/BenchRando/BenchRando.csproj b/BenchRando/BenchRando.csproj
@@ -4,8 +4,8 @@
     <RootNamespace>BenchRando</RootNamespace>
     <AssemblyName>BenchRando</AssemblyName>
     <TargetFramework>net472</TargetFramework>
-    <AssemblyVersion>0.9.0</AssemblyVersion>
-    <FileVersion>0.9.0</FileVersion>
+    <AssemblyVersion>0.9.1</AssemblyVersion>
+    <FileVersion>0.9.1</FileVersion>
     <Deterministic>true</Deterministic>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <LangVersion>latest</LangVersion>

diff --git a/BenchRando/Rando/RandoInterop.cs b/BenchRando/Rando/RandoInterop.cs
@@ -78,6 +78,8 @@ public static void Finish(RandoController rc)
                     cbm.AddBench(def.Name, bdg);
                 }
                 ItemChangerMod.Modules.GetOrAdd<IC.BRLocalSettingsModule>().LS = LS;
+                ItemChangerMod.Modules.GetOrAdd<ItemChanger.Modules.PlayerDataEditModule>()
+                    .AddPDEdit(nameof(PlayerData.charmBenchMsg), true);
             }
         }
 

diff --git a/BenchRando/Resources/benches.json b/BenchRando/Resources/benches.json
@@ -367,10 +367,18 @@
     "IsRandomizable": true,
     "X": "NaN",
     "Y": "NaN",
-    "Logic": "Fungus2_13 + (LEFTDASH | LEFTSUPERDASH | ANYCLAW | WINGS | ACID | ENEMYPOGOS | PRECISEMOVEMENT)",
+    "Logic": "Fungus2_13 + (LEFTDASH | LEFTSUPERDASH | ANYCLAW | WINGS | ACID | ENEMYPOGOS | PRECISEMOVEMENT) | Fungus2_13[left3] + (RIGHTDASH | ACID | WINGS | LEFTCLAW | RIGHTCLAW + PRECISEMOVEMENT | AIRSTALL + ROOMSOUL | TERMINALSHADESKIPS) | Bench-Bretta",
     "LogicOverrides": [
       {
         "name": "Fungus2_13",
+        "logic": "ORIG | Bench-Bretta + (RIGHTDASH | RIGHTSUPERDASH | ANYCLAW | WINGS | ENEMYPOGOS | PRECISEMOVEMENT)"
+      },
+      {
+        "name": "Fungus2_13[left3]",
+        "logic": "ORIG | Bench-Bretta"
+      },
+      {
+        "name": "Geo_Rock-Mantis_Outskirts_Alcove",
         "logic": "ORIG | Bench-Bretta"
       }
     ],
@@ -554,7 +562,7 @@
       },
       {
         "name": "Waterways_02[bot2]",
-        "logic": "ORIG | Bench-Waterways + (ANYCLAW | WINGS | RIGHTSUPERDASH | ENEMYPOGOS + SWIM | ENEMYPOGOS + DANGEROUSSKIPS + RIGHTDASH)"
+        "logic": "ORIG | Bench-Waterways + (ANYCLAW | WINGS | RIGHTSUPERDASH | SWIM | ENEMYPOGOS + DANGEROUSSKIPS + RIGHTDASH)"
       },
       {
         "name": "Rancid_Egg-Waterways_Main",
@@ -2209,6 +2217,27 @@
     ],
     "ExtraUnlockActions": []
   },
+  "Bench-Deepnest_Maze": {
+    "Name": "Bench-Deepnest_Maze",
+    "SceneName": "Deepnest_30",
+    "BenchAreaName": "Deepnest",
+    "BenchMenuName": "Maze",
+    "MapZone": "DEEPNEST",
+    "DefaultStyle": "Beast",
+    "IsBaseBench": false,
+    "IsRandomizable": true,
+    "X": 37.4,
+    "Y": 147.4,
+    "Logic": "Deepnest_30[top1]",
+    "LogicOverrides": [
+      {
+        "name": "Deepnest_30[top1]",
+        "logic": "ORIG | Bench-Deepnest_Maze"
+      }
+    ],
+    "ExtraDeployers": [],
+    "ExtraUnlockActions": []
+  },
   "Bench-Abyss_Workshop": {
     "Name": "Bench-Abyss_Workshop",
     "SceneName": "Abyss_09",
@@ -2581,6 +2610,27 @@
     ],
     "ExtraUnlockActions": []
   },
+  "Bench-Peak_Ravine": {
+    "Name": "Bench-Peak_Ravine",
+    "SceneName": "Mines_28",
+    "BenchAreaName": "Peak",
+    "BenchMenuName": "Ravine",
+    "MapZone": "MINES",
+    "DefaultStyle": "Right",
+    "IsBaseBench": false,
+    "IsRandomizable": true,
+    "X": 4.9,
+    "Y": 27.4,
+    "Logic": "Mines_28[left1] | Mines_28[door1] | Bench-Peak_Ravine",
+    "LogicOverrides": [
+      {
+        "name": "Mines_28[bot1]",
+        "logic": "ORIG | Bench-Peak_Ravine"
+      }
+    ],
+    "ExtraDeployers": [],
+    "ExtraUnlockActions": []
+  },
   "Bench-Unn's_Chamber": {
     "Name": "Bench-Unn's_Chamber",
     "SceneName": "Fungus1_Slug",

diff --git a/BenchRando/Resources/language.json b/BenchRando/Resources/language.json
@@ -484,6 +484,11 @@
     "Key": "BENCHNAME.Bench-Distant_Stag",
     "Value": "Distant Stag Bench"
   },
+  {
+    "Sheet": "UI",
+    "Key": "BENCHNAME.Bench-Deepnest_Maze",
+    "Value": "Deepnest Maze Bench"
+  },
   {
     "Sheet": "UI",
     "Key": "BENCHNAME.Bench-Abyss_Workshop",
@@ -559,6 +564,11 @@
     "Key": "BENCHNAME.Bench-Quirrel_Peak",
     "Value": "Quirrel Peak Bench"
   },
+  {
+    "Sheet": "UI",
+    "Key": "BENCHNAME.Bench-Peak_Ravine",
+    "Value": "Peak Ravine Bench"
+  },
   {
     "Sheet": "UI",
     "Key": "BENCHNAME.Bench-Unn's_Chamber",

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Randomized benches will appear **purple** in the Benchwarp menu. This indicates
 
 ## Randomize Bench Spots
 
-This setting randomizes the spots which have benches, replacing base game benches and adding new benches. BenchRando currently adds **83** new bench spots to the base **49** bench spots, for a total of **132** spots. The randomization guarantees that each of the Benchwarp area categories has at least **1** bench, and no more than **6** benches. It also guarantees that the total number of benches is between **45** and **55**.
+This setting randomizes the spots which have benches, replacing base game benches and adding new benches. BenchRando currently adds **85** new bench spots to the base **49** bench spots, for a total of **134** spots. The randomization guarantees that each of the Benchwarp area categories has at least **1** bench, and no more than **6** benches. It also guarantees that the total number of benches is between **45** and **55**.
 
 The randomization is uniform in area: each area is equally likely to be chosen to receive a bench, and then the bench is chosen uniformly from the list of benches for said area.