From 1518168843670279f22c6fe2438f9db6261ed141 Mon Sep 17 00:00:00 2001
From: Mathx2 <Mathx2@gmail.com>
Date: Sat, 22 Jan 2022 22:48:20 -0800
Subject: [PATCH 1/5] Increase max number of locations

Updated from 100 to 500
---
 worlds/ror2/Locations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/ror2/Locations.py b/worlds/ror2/Locations.py
index b3de5cff..d1e62386 100644
--- a/worlds/ror2/Locations.py
+++ b/worlds/ror2/Locations.py
@@ -13,9 +13,9 @@ base_location_table = {
     "Level Four": None,
     "Level Five": None
 }
-# 37006 - 37106
+# 37006 - 37506
 item_pickups = {
-    f"ItemPickup{i}": 37005+i for i in range(1, 101)
+    f"ItemPickup{i}": 37005+i for i in range(1, 501)
 }
 
 location_table = {**base_location_table, **item_pickups}

From 9b5a1bedc0028af30f8c0d50a9e771f2bcd52522 Mon Sep 17 00:00:00 2001
From: Mathx2 <Mathx2@gmail.com>
Date: Sat, 22 Jan 2022 22:52:02 -0800
Subject: [PATCH 2/5] Increase amount of items allowed in the pool

Multiplied max for all items and revives by 5
---
 worlds/ror2/Options.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py
index 233d97f8..fae21346 100644
--- a/worlds/ror2/Options.py
+++ b/worlds/ror2/Options.py
@@ -6,7 +6,7 @@ class TotalLocations(Range):
     """Number of location checks which are added to the Risk of Rain playthrough."""
     displayname = "Total Locations"
     range_start = 10
-    range_end = 100
+    range_end = 500
     default = 20
 
 
@@ -14,7 +14,7 @@ class TotalRevivals(Range):
     """Number of `Dio's Best Friend` item put in the item pool."""
     displayname = "Total Revivals Available"
     range_start = 0
-    range_end = 10
+    range_end = 50
     default = 4
 
 
@@ -42,7 +42,7 @@ class GreenScrap(Range):
     """Weight of Green Scraps in the item pool."""
     displayname = "Green Scraps"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 16
 
 
@@ -50,7 +50,7 @@ class RedScrap(Range):
     """Weight of Red Scraps in the item pool."""
     displayname = "Red Scraps"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 4
 
 
@@ -58,7 +58,7 @@ class YellowScrap(Range):
     """Weight of yellow scraps in the item pool."""
     displayname = "Yellow Scraps"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 1
 
 
@@ -66,7 +66,7 @@ class WhiteScrap(Range):
     """Weight of white scraps in the item pool."""
     displayname = "White Scraps"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 32
 
 
@@ -74,7 +74,7 @@ class CommonItem(Range):
     """Weight of common items in the item pool."""
     displayname = "Common Items"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 64
 
 
@@ -82,7 +82,7 @@ class UncommonItem(Range):
     """Weight of uncommon items in the item pool."""
     displayname = "Uncommon Items"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 32
 
 
@@ -90,7 +90,7 @@ class LegendaryItem(Range):
     """Weight of legendary items in the item pool."""
     displayname = "Legendary Items"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 8
 
 
@@ -98,7 +98,7 @@ class BossItem(Range):
     """Weight of boss items in the item pool."""
     displayname = "Boss Items"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 4
 
 
@@ -106,7 +106,7 @@ class LunarItem(Range):
     """Weight of lunar items in the item pool."""
     displayname = "Lunar Items"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 16
 
 
@@ -114,7 +114,7 @@ class Equipment(Range):
     """Weight of equipment items in the item pool."""
     displayname = "Equipment"
     range_start = 0
-    range_end = 100
+    range_end = 500
     default = 32
 
 
@@ -166,4 +166,4 @@ ror2_options: typing.Dict[str, type(Option)] = {
     "item_weights":         ItemWeights,
     "item_pool_presets":    ItemPoolPresetToggle,
     **ror2_weights
-}
\ No newline at end of file
+}

From b2ebb65c26b798e4985b11d36ea4b33ac4d35edf Mon Sep 17 00:00:00 2001
From: Mathx2 <Mathx2@gmail.com>
Date: Sun, 23 Jan 2022 16:13:07 -0800
Subject: [PATCH 3/5] Set Max Weights back to 100

Increasing max weight to 500 for fine tuning was overkill.
Max Locations still set to 500
Max Revives still set to 10% of Max Locations
---
 worlds/ror2/Options.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py
index fae21346..da5ab676 100644
--- a/worlds/ror2/Options.py
+++ b/worlds/ror2/Options.py
@@ -42,7 +42,7 @@ class GreenScrap(Range):
     """Weight of Green Scraps in the item pool."""
     displayname = "Green Scraps"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 16
 
 
@@ -50,7 +50,7 @@ class RedScrap(Range):
     """Weight of Red Scraps in the item pool."""
     displayname = "Red Scraps"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 4
 
 
@@ -58,7 +58,7 @@ class YellowScrap(Range):
     """Weight of yellow scraps in the item pool."""
     displayname = "Yellow Scraps"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 1
 
 
@@ -66,7 +66,7 @@ class WhiteScrap(Range):
     """Weight of white scraps in the item pool."""
     displayname = "White Scraps"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 32
 
 
@@ -74,7 +74,7 @@ class CommonItem(Range):
     """Weight of common items in the item pool."""
     displayname = "Common Items"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 64
 
 
@@ -82,7 +82,7 @@ class UncommonItem(Range):
     """Weight of uncommon items in the item pool."""
     displayname = "Uncommon Items"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 32
 
 
@@ -90,7 +90,7 @@ class LegendaryItem(Range):
     """Weight of legendary items in the item pool."""
     displayname = "Legendary Items"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 8
 
 
@@ -98,7 +98,7 @@ class BossItem(Range):
     """Weight of boss items in the item pool."""
     displayname = "Boss Items"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 4
 
 
@@ -106,7 +106,7 @@ class LunarItem(Range):
     """Weight of lunar items in the item pool."""
     displayname = "Lunar Items"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 16
 
 
@@ -114,7 +114,7 @@ class Equipment(Range):
     """Weight of equipment items in the item pool."""
     displayname = "Equipment"
     range_start = 0
-    range_end = 500
+    range_end = 100
     default = 32
 
 

From 8550c071a2b1101dd94a8ff9d4c1d021aa1bd2a5 Mon Sep 17 00:00:00 2001
From: Mathx2 <Mathx2@gmail.com>
Date: Mon, 24 Jan 2022 14:40:51 -0800
Subject: [PATCH 4/5] Revert Max revives

Set the max revives back to 10 and start to convert it to a percentage of the total locations instead of a static value.
---
 worlds/ror2/Options.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py
index da5ab676..d9bfc275 100644
--- a/worlds/ror2/Options.py
+++ b/worlds/ror2/Options.py
@@ -11,10 +11,10 @@ class TotalLocations(Range):
 
 
 class TotalRevivals(Range):
-    """Number of `Dio's Best Friend` item put in the item pool."""
-    displayname = "Total Revivals Available"
+    """Total Percentage of `Dio's Best Friend` item put in the item pool."""
+    displayname = "Total Percentage Revivals Available"
     range_start = 0
-    range_end = 50
+    range_end = 10
     default = 4
 
 

From 341fefda01daba933ae4a0a28970fb51a68a833c Mon Sep 17 00:00:00 2001
From: Mathx2 <Mathx2@gmail.com>
Date: Mon, 24 Jan 2022 14:43:42 -0800
Subject: [PATCH 5/5] Convert revives to a percent of total locations

---
 worlds/ror2/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py
index 410c40dd..1ac6e9d4 100644
--- a/worlds/ror2/__init__.py
+++ b/worlds/ror2/__init__.py
@@ -73,12 +73,12 @@ class RiskOfRainWorld(World):
         itempool = []
 
         # Add revive items for the player
-        itempool += ["Dio's Best Friend"] * self.world.total_revivals[self.player]
+        itempool += ["Dio's Best Friend"] * int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player])
 
         # Fill remaining items with randomly generated junk
         itempool += self.world.random.choices(list(junk_pool.keys()), weights=list(junk_pool.values()),
                                               k=self.world.total_locations[self.player] -
-                                                self.world.total_revivals[self.player])
+                                                int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player]))
 
         # Convert itempool into real items
         itempool = list(map(lambda name: self.create_item(name), itempool))