✨ Support large nets and palmers and use big items for the drop rates.

I used the compare script and things look close enough to be reasonable.

Author: coderanger

py/cider_compare.py

@@ -0,0 +1,40 @@
+import droprates
+
+normal_drops = droprates.compile_drops(
+    explore=True,
+    lemonade=True,
+    net=True,
+    iron_depot=True,
+    lemonade_fake_explores=True,
+    nets_fake_fishes=True,
+)
+
+big_drops = droprates.compile_drops(
+    explore=True,
+    lemonade=True,
+    net=True,
+    iron_depot=True,
+    lemonade_fake_explores=True,
+    nets_fake_fishes=True,
+    cider=True,
+    palmer=True,
+    large_net=True,
+)
+
+for loc in normal_drops.locations.keys() & big_drops.locations.keys():
+    normal_loc = normal_drops.locations[loc]
+    big_loc = big_drops.locations[loc]
+    for item in normal_loc.items.keys() & big_loc.items.keys():
+        normal_item = normal_loc.items[item]
+        big_item = big_loc.items[item]
+        normal_hits = normal_item.fishes or normal_item.explores
+        big_hits = big_item.fishes or big_item.explores
+        normal_rate = normal_hits / normal_item.drops
+        big_rate = big_hits / big_item.drops
+        rate_diff = big_rate - normal_rate
+        rate_pct_diff = rate_diff * 100 / normal_rate
+        if abs(rate_pct_diff) >= 5:
+            print(f"{loc} {item}: {rate_pct_diff} {normal_rate:.2f} {big_rate:.2f}")
+        else:
+            # print(f"{loc} {item}: {rate_pct_diff}")
+            pass

py/droprates.py

@@ -61,6 +61,8 @@
     * 1000
 )
 
+BROKEN_OVERFLOW_TYPES = {"cider", "large_net", "palmer"}
+
 
 def cache_path_for(**kwargs) -> str:
     buf = io.StringIO()
@@ -96,8 +98,10 @@ class ItemDrops:
     explores: int = 0
     lemonades: int = 0
     ciders: int = 0
+    palmers: int = 0
     fishes: int = 0
     nets: int = 0
+    large_nets: int = 0
     harvests: int = 0
     drops: int = 0
 
@@ -107,8 +111,10 @@ class LocationDrops:
     explores: int = 0
     lemonades: int = 0
     ciders: int = 0
+    palmers: int = 0
     fishes: int = 0
     nets: int = 0
+    large_nets: int = 0
     harvests: int = 0
     drops: int = 0
     items: dict[str, ItemDrops] = attrs.Factory(lambda: defaultdict(ItemDrops))
@@ -119,8 +125,10 @@ class Drops:
     explores: int = 0
     lemonades: int = 0
     ciders: int = 0
+    palmers: int = 0
     fishes: int = 0
     nets: int = 0
+    large_nets: int = 0
     harvests: int = 0
     drops: int = 0
     locations: dict[str, LocationDrops] = attrs.Factory(
@@ -179,12 +187,22 @@ def count_sources(
         # This is kind of wrong for global and location stats since not all explores count
         # for all items but it's more correct than not.
         drops.explores += row["results"].get("explores", row["results"]["stamina"])
+    elif row["type"] == "palmer":
+        drops.palmers += 1
+        if lemonade_fake_explores_location is not None:
+            drops.explores += round(
+                (1 / BASE_DROP_RATES[lemonade_fake_explores_location]) * 500
+            )
     elif row["type"] == "fish":
         drops.fishes += 1
     elif row["type"] == "net":
         drops.nets += 1
         if nets_fake_fishes:
             drops.fishes += sum(it.get("quantity", 1) for it in row["results"]["items"])
+    elif row["type"] == "large_net":
+        drops.large_nets += 1
+        if nets_fake_fishes:
+            drops.fishes += 400
     elif row["type"] == "harvestall":
         # We already checked that only mono-seed logs are considered.
         drops.harvests += len(row["results"]["crops"])
@@ -194,8 +212,10 @@ def compile_drops(
     explore: bool = False,
     lemonade: bool = False,
     cider: bool = False,
+    palmer: bool = False,
     fish: bool = False,
     net: bool = False,
+    large_net: bool = False,
     harvest: bool = False,
     since: int = 0,
     iron_depot: bool = False,
@@ -208,8 +228,10 @@ def compile_drops(
         e=explore,
         l=lemonade,
         c=cider,
+        p=palmer,
         f=fish,
         n=net,
+        m=large_net,
         h=harvest,
         s=since,
         i=iron_depot,
@@ -246,10 +268,14 @@ def compile_drops(
         types.add("lemonade")
     if cider:
         types.add("cider")
+    if palmer:
+        types.add("palmer")
     if fish:
         types.add("fish")
     if net:
         types.add("net")
+    if large_net:
+        types.add("large_net")
     if harvest:
         types.add("harvestall")
     explores = Drops()
@@ -273,7 +299,7 @@ def compile_drops(
                 # Ignore out-of-bounds drops. This allows accounting for stuff like drop
                 # rates changing substantially by manually resetting firstDropped.
                 continue
-            if row["type"] == "cider" and item["item"] in overflow_items:
+            if row["type"] in BROKEN_OVERFLOW_TYPES and item["item"] in overflow_items:
                 # Cider overflow always reports 0 drops so any item that overflows during
                 # a cider has to be ignored.
                 continue
@@ -317,7 +343,7 @@ def compile_drops(
             if row["ts"] not in when_items_dropped[(item, location_name)]:
                 # Item couldn't drop, this doesn't count.
                 continue
-            if row["type"] == "cider" and item in overflow_items:
+            if row["type"] in BROKEN_OVERFLOW_TYPES and item in overflow_items:
                 # Cider overflow always reports 0 drops so any item that overflows during
                 # a cider has to be ignored.
                 continue

py/fixtures.py

@@ -137,20 +137,28 @@ def load_quests(resolve_items=False) -> Iterable[Quest]:
 def _get_drops():
     import droprates
 
+    # This seems to be ready to go but I reserve the right to change my mind.
+    USE_BIG_ITEMS = True
+
     normal_drops = droprates.compile_drops(
         explore=True,
         lemonade=True,
         net=True,
         harvest=True,
         lemonade_fake_explores=True,
         nets_fake_fishes=True,
+        cider=USE_BIG_ITEMS,
+        palmer=USE_BIG_ITEMS,
+        large_net=USE_BIG_ITEMS,
     )
 
     iron_depot_drops = droprates.compile_drops(
         explore=True,
         lemonade=True,
         lemonade_fake_explores=True,
         iron_depot=True,
+        cider=USE_BIG_ITEMS,
+        palmer=USE_BIG_ITEMS,
     )
 
     manual_fish_drops = droprates.compile_drops(fish=True)