From debb6cde0b188740db09fd3928f499e7f1a7f05c Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Sun, 23 Jul 2023 19:04:23 -0400 Subject: [PATCH 1/7] add Lone Wolf & Tzen checks to NFP --- event/lone_wolf.py | 6 +++++- event/tzen.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/event/lone_wolf.py b/event/lone_wolf.py index ce93f05b..97a098b0 100644 --- a/event/lone_wolf.py +++ b/event/lone_wolf.py @@ -8,7 +8,11 @@ def character_gate(self): return self.characters.MOG def init_rewards(self): - self.reward1 = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) + if self.args.no_free_characters_espers: + self.reward1 = self.add_reward(RewardType.ITEM) + else: + self.reward1 = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) + self.reward2 = self.add_reward(RewardType.ITEM) def init_event_bits(self, space): diff --git a/event/tzen.py b/event/tzen.py index 6e2434cc..3e0be429 100644 --- a/event/tzen.py +++ b/event/tzen.py @@ -5,7 +5,10 @@ def name(self): return "Tzen" def init_rewards(self): - self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) + if self.args.no_free_characters_espers: + self.reward = self.add_reward(RewardType.ITEM) + else: + self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) def init_event_bits(self, space): space.write( From 71e9bce41c6ebf7bd088bb8742d91b39de1e10f7 Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Sun, 24 Sep 2023 18:27:29 -0400 Subject: [PATCH 2/7] remove Tzen Thief, add Mt Zozo to NFP setting --- event/mt_zozo.py | 5 ++++- event/tzen.py | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/event/mt_zozo.py b/event/mt_zozo.py index 6b43c0b8..fe54b824 100644 --- a/event/mt_zozo.py +++ b/event/mt_zozo.py @@ -8,7 +8,10 @@ def character_gate(self): return self.characters.CYAN def init_rewards(self): - self.reward = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) + if self.args.no_free_characters_espers: + self.reward = self.add_reward(RewardType.ITEM) + else: + self.reward = self.add_reward(RewardType.CHARACTER | RewardType.ESPER | RewardType.ITEM) def init_event_bits(self, space): space.write( diff --git a/event/tzen.py b/event/tzen.py index 3e0be429..b7969b59 100644 --- a/event/tzen.py +++ b/event/tzen.py @@ -5,10 +5,7 @@ def name(self): return "Tzen" def init_rewards(self): - if self.args.no_free_characters_espers: - self.reward = self.add_reward(RewardType.ITEM) - else: - self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) + self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) def init_event_bits(self, space): space.write( From 6e1302032baefe1f33422a257439da00d36a9e88 Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Sat, 18 Nov 2023 13:36:43 -0500 Subject: [PATCH 3/7] fix bug with Phoenix Cave & KT skip for mid path --- event/kefka_tower.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/event/kefka_tower.py b/event/kefka_tower.py index 4b31ec08..6413ce77 100644 --- a/event/kefka_tower.py +++ b/event/kefka_tower.py @@ -71,6 +71,11 @@ def statue_landing_mod(self): field.SetEventBit(event_bit.CENTER_DOOR_KEFKA_TOWER), field.SetEventBit(event_bit.LEFT_RIGHT_DOORS_KEFKA_TOWER), + # clear out the Kefka switches due to bug with Phoenix Cave & KT Skip + field.ClearEventBit(event_bit.multipurpose_party1_step(2)), + field.ClearEventBit(event_bit.multipurpose_party2_step(2)), + field.ClearEventBit(event_bit.multipurpose_party3_step(2)), + field.LoadMap(0x163, direction.DOWN, default_music = False, x = 39, y = 9, fade_in = False, entrance_event = True), From c3b7509dbf3b30b3b7fbee9e7d179b914d5217de Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Sat, 18 Nov 2023 14:05:02 -0500 Subject: [PATCH 4/7] fix bug with Phoenix Cave & KT skip for mid path --- event/tzen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/event/tzen.py b/event/tzen.py index b7969b59..6e2434cc 100644 --- a/event/tzen.py +++ b/event/tzen.py @@ -5,7 +5,7 @@ def name(self): return "Tzen" def init_rewards(self): - self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) + self.reward = self.add_reward(RewardType.ESPER | RewardType.ITEM) def init_event_bits(self, space): space.write( From 6d34f8dc498b48bf060828de8864130ca6f244d3 Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Mon, 11 Mar 2024 00:45:29 -0400 Subject: [PATCH 5/7] update Coliseum display for shuffle+random --- args/coliseum.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/args/coliseum.py b/args/coliseum.py index 9fe9ce27..c158696a 100644 --- a/args/coliseum.py +++ b/args/coliseum.py @@ -65,11 +65,13 @@ def options(args): result = [] opponents = "Original" - if args.coliseum_opponents_random: + # if Coliseum opponents are random or shuffled + random + if args.coliseum_opponents_random or args.coliseum_opponents_shuffle_random: opponents = "Random" rewards = "Original" - if args.coliseum_rewards_random: + # if Coliseum rewards are random or shuffled + random + if args.coliseum_rewards_random or args.coliseum_rewards_shuffle_random: rewards = "Random" rewards_visible = "Original" From a234ec99b8d311313629beb8e7207ae25a54ea54 Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Mon, 11 Mar 2024 00:55:50 -0400 Subject: [PATCH 6/7] update Coliseum display for shuffle+random, include %s --- args/coliseum.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/args/coliseum.py b/args/coliseum.py index c158696a..93ec4f19 100644 --- a/args/coliseum.py +++ b/args/coliseum.py @@ -65,14 +65,20 @@ def options(args): result = [] opponents = "Original" - # if Coliseum opponents are random or shuffled + random - if args.coliseum_opponents_random or args.coliseum_opponents_shuffle_random: - opponents = "Random" + # if Coliseum opponents are random + if args.coliseum_opponents_random: + opponents = f"Random {args.coliseum_opponents_random}%" + # if Coliseum opponents are shuffle + random + elif args.coliseum_opponents_shuffle_random: + opponents = f"Shuffle + Random {args.coliseum_opponents_random}%" rewards = "Original" - # if Coliseum rewards are random or shuffled + random - if args.coliseum_rewards_random or args.coliseum_rewards_shuffle_random: - rewards = "Random" + # if Coliseum rewards are random + if args.coliseum_rewards_random: + rewards = f"Random {args.coliseum_rewards_random}%" + # if Coliseum rewards are shuffle + random + elif args.coliseum_rewards_shuffle_random: + rewards = f"Shuffle + Random {args.coliseum_rewards_random}%" rewards_visible = "Original" if not args.coliseum_rewards_menu: From 5517dad36ede84e0e3ca36249d0fd152750e97d2 Mon Sep 17 00:00:00 2001 From: Brian - TheShwantz27 Date: Mon, 11 Mar 2024 12:03:13 -0400 Subject: [PATCH 7/7] update display for Coliseum opponents & rewards --- args/coliseum.py | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/args/coliseum.py b/args/coliseum.py index 93ec4f19..5bc66db4 100644 --- a/args/coliseum.py +++ b/args/coliseum.py @@ -41,12 +41,12 @@ def flags(args): if args.coliseum_opponents_random: flags += f" -cor {args.coliseum_opponents_random}" elif args.coliseum_opponents_shuffle_random: - flags += f" -cor {args.coliseum_opponents_shuffle_random}" + flags += f" -cosr {args.coliseum_opponents_shuffle_random}" if args.coliseum_rewards_random: flags += f" -crr {args.coliseum_rewards_random}" elif args.coliseum_rewards_shuffle_random: - flags += f" -crr {args.coliseum_rewards_shuffle_random}" + flags += f" -crsr {args.coliseum_rewards_shuffle_random}" if args.coliseum_rewards_visible_random: flags += f" -crvr {args.coliseum_rewards_visible_random_min} {args.coliseum_rewards_visible_random_max}" @@ -64,36 +64,45 @@ def flags(args): def options(args): result = [] - opponents = "Original" # if Coliseum opponents are random if args.coliseum_opponents_random: - opponents = f"Random {args.coliseum_opponents_random}%" + result.append(("Opponents", "Random", "opponents")) + result.append((" Random", f"{args.coliseum_opponents_random}%","coliseum_opponents_random")) # if Coliseum opponents are shuffle + random elif args.coliseum_opponents_shuffle_random: - opponents = f"Shuffle + Random {args.coliseum_opponents_random}%" + result.append(("Opponents", "Random", "opponents")) + result.append((" Shuffle + Random", f"{args.coliseum_opponents_shuffle_random}%","coliseum_opponents_shuffle_random")) + # else Coliseum opponents are Original + else: + result.append(("Opponents", "Original", "opponents")) - rewards = "Original" # if Coliseum rewards are random if args.coliseum_rewards_random: - rewards = f"Random {args.coliseum_rewards_random}%" - # if Coliseum rewards are shuffle + random + result.append(("Rewards", "Random", "rewards")) + result.append((" Random", f"{args.coliseum_rewards_random}%","coliseum_rewards_random")) + # if Coliseum opponents are shuffle + random elif args.coliseum_rewards_shuffle_random: - rewards = f"Shuffle + Random {args.coliseum_rewards_random}%" + result.append(("Rewards", "Random", "rewards")) + result.append((" Shuffle + Random", f"{args.coliseum_rewards_shuffle_random}%","coliseum_rewards_shuffle_random")) + # else Coliseum opponents are Original + else: + result.append(("Rewards", "Original", "rewards")) + # process rewards menu options rewards_visible = "Original" if not args.coliseum_rewards_menu: rewards_visible = "F" else: if args.coliseum_rewards_visible_random: rewards_visible = f"{args.coliseum_rewards_visible_random_min}-{args.coliseum_rewards_visible_random_max}" - - return [ - ("Opponents", opponents, "opponents"), - ("Rewards", rewards, "rewards"), - ("Rewards Visible", rewards_visible, "rewards_visible"), - ("No Exp. Eggs", args.coliseum_no_exp_eggs, "coliseum_no_exp_eggs"), - ("No Illuminas", args.coliseum_no_illuminas, "coliseum_no_illuminas"), - ] + # update Coliseum menu display + result.append(("Rewards Visible", rewards_visible, "rewards_visible")) + # update Coliseum Exp Eggs display + result.append(("No Exp. Eggs", args.coliseum_no_exp_eggs, "coliseum_no_exp_eggs")) + # update Coliseum Illuminas display + result.append(("No Illuminas", args.coliseum_no_illuminas, "coliseum_no_illuminas")) + + return result def menu(args): return (name(), options(args))