From 042b9a9fa07a7a8676225a23ad9cfbd5b32c14d9 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 8 Mar 2022 08:47:25 -0700 Subject: [PATCH] Pottery counting fixes Add major_only algorithm to code --- BaseClasses.py | 2 +- Main.py | 2 +- RELEASENOTES.md | 3 +++ Rom.py | 2 +- data/base2current.bps | Bin 85637 -> 85639 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index caf36b8b..90b929fa 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -2771,7 +2771,7 @@ e_dmg = {"default": 0, "shuffled": 1, "random": 2} # byte 9: RRAA ABBB (restrict boss mode, algorithm, boss shuffle) rb_mode = {"none": 0, "mapcompass": 1, "dungeon": 2} # algorithm: -algo_mode = {"balanced": 0, "equitable": 1, "vanilla_fill": 2, "dungeon_only": 3, "district": 4} +algo_mode = {"balanced": 0, "equitable": 1, "vanilla_fill": 2, "dungeon_only": 3, "district": 4, 'major_only': 5} boss_mode = {"none": 0, "simple": 1, "full": 2, "chaos": 3, 'random': 3, 'unique': 4} diff --git a/Main.py b/Main.py index 3383ec2f..7cd51ff9 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.1.9-v' +__version__ = '1.0.1.10v' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a0eee3b7..0b8bae71 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -147,6 +147,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.1.10 + * More location count fixes + * Add major_only algorithm to code * 1.0.1.9 * Every pot you pick up that wasn't part of the location pool does not count toward the location count * Fix for items spawning where a thrown pot was diff --git a/Rom.py b/Rom.py index fe6f3150..31879821 100644 --- a/Rom.py +++ b/Rom.py @@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'feadc243f2fe49237243d7c4da515d35' +RANDOMIZERBASEHASH = 'e972dbe4fac91ce33979c6c49a210a7d' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index a1c5c08762376e32139e6e6a708d5081de18b736..5477384917ce47e12648b51d3a3dc6a7c3d8d52f 100644 GIT binary patch delta 367 zcmV-#0g(QModt)T1(1pXsF91h1P_VucC$$Vlm!7Hlimh@0hE(o2aqcitf=bhnlHVT z^{l9X0qQ)6l_KY@sIUi@DKdej2_iMEs2U=9m?xl>B3Y9e2ty9ItElR9fQi=0pj?27 z{j+KaNdX8~uBhs`jUs5Xy9r(b2wSVD9DzpJ9 zBnWU-Fm#0o+FGTc3aE+-s=xB9sD%oQmzWL#LJOv^fD*HWvBDs!R+r@t0XG3EmmLoQJpm`TTMq#u NKM3xb;XB`nW^2n$kq7_) delta 365 zcmV-z0h0cQodt!R1(1pXrjd)f1R;vvb+btUlm!7Flimh@0g{tm2aqcgtf=bhnlHVT z^Q@?V0qQ)6l_KS>sIUi@DKdej2_iGCs2U=9m?xl>B3F|c2ty9GtElR9fQi=0pj?27 z`?G2YNdX8|uBhs`jUr~Vy9r(b2wAJB9D62mmSnKg9&l>zpJ9 zBnWU*FmiXW0W<-< zmyZnrIRU+w$qfO}0q>WZ4go?7q_2PyvxKq2AgNTB=MDik0VbCp4*@*^FSlI}0U|#L Ls0>W<_m6SvRV9z_