From 4b1f47de332c0d8efbf7b0c171ab0cfc9bdcfa67 Mon Sep 17 00:00:00 2001 From: Kiel <95580337+kielbasiago@users.noreply.github.com> Date: Wed, 25 May 2022 20:35:57 -0400 Subject: [PATCH 1/2] add --start-junk flag --- args/starting_gold_items.py | 7 ++++++- event/start.py | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/args/starting_gold_items.py b/args/starting_gold_items.py index 79da17e3..b452c5bf 100644 --- a/args/starting_gold_items.py +++ b/args/starting_gold_items.py @@ -14,7 +14,9 @@ def parse(parser): starting_gold_items.add_argument("-sfd", "--start-fenix-downs", default = 0, type = int, choices = range(11), metavar = "COUNT", help = "Start game with %(metavar)s Fenix Downs") starting_gold_items.add_argument("-sto", "--start-tools", default = 0, type = int, choices = range(9), metavar = "COUNT", - help = "Start game with %(metavar)s different random tools") + help = "Start game with %(metavar)s different random tools"), + starting_gold_items.add_argument("-sj", "--start-junk", default = 0, type = int, choices = range(25), metavar = "COUNT", + help = "Start game with %(metavar)s unique low tier items. Includes weapons, armors, helmets, and shields"), def process(args): pass @@ -32,6 +34,8 @@ def flags(args): flags += f" -sfd {args.start_fenix_downs}" if args.start_tools != 0: flags += f" -sto {args.start_tools}" + if args.start_junk != 0: + flags += f" -sj {args.start_junk}" return flags @@ -42,6 +46,7 @@ def options(args): ("Start Warp Stones", args.start_warp_stones), ("Start Fenix Downs", args.start_fenix_downs), ("Start Tools", args.start_tools), + ("Start Junk", args.start_junk), ] def menu(args): diff --git a/event/start.py b/event/start.py index 80f35b42..900be8df 100644 --- a/event/start.py +++ b/event/start.py @@ -188,6 +188,22 @@ def start_items_mod(self): field.AddItem(tool, sound_effect = False), ] + from constants.items import id_name + from data.shop_item_tiers import tiers + from data.item import Item + junk = [] + junk += tiers[Item.WEAPON][0] + junk += tiers[Item.SHIELD][0] + junk += tiers[Item.HELMET][0] + junk += tiers[Item.ARMOR][0] + + start_junk = random.sample(junk, self.args.start_junk) + + for junk_id in start_junk: + src += [ + field.AddItem(id_name[junk_id], sound_effect = False) + ] + if self.args.debug: src += [ field.AddItem("Dried Meat", sound_effect = False), From ef9e8d9318822b99d239ca254da900496dbba10a Mon Sep 17 00:00:00 2001 From: Kiel <95580337+kielbasiago@users.noreply.github.com> Date: Thu, 26 May 2022 07:53:15 -0400 Subject: [PATCH 2/2] Add relics to starting junk --- args/starting_gold_items.py | 2 +- event/start.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/args/starting_gold_items.py b/args/starting_gold_items.py index b452c5bf..dcf3c8ac 100644 --- a/args/starting_gold_items.py +++ b/args/starting_gold_items.py @@ -16,7 +16,7 @@ def parse(parser): starting_gold_items.add_argument("-sto", "--start-tools", default = 0, type = int, choices = range(9), metavar = "COUNT", help = "Start game with %(metavar)s different random tools"), starting_gold_items.add_argument("-sj", "--start-junk", default = 0, type = int, choices = range(25), metavar = "COUNT", - help = "Start game with %(metavar)s unique low tier items. Includes weapons, armors, helmets, and shields"), + help = "Start game with %(metavar)s unique low tier items. Includes weapons, armors, helmets, shields, and relics"), def process(args): pass diff --git a/event/start.py b/event/start.py index 900be8df..d8891adc 100644 --- a/event/start.py +++ b/event/start.py @@ -196,6 +196,7 @@ def start_items_mod(self): junk += tiers[Item.SHIELD][0] junk += tiers[Item.HELMET][0] junk += tiers[Item.ARMOR][0] + junk += tiers[Item.RELIC][0] start_junk = random.sample(junk, self.args.start_junk)