diff --git a/assets/jp/bounty/CHECK_MANSION.png b/assets/jp/bounty/CHECK_MANSION.png new file mode 100644 index 0000000..e0a2331 Binary files /dev/null and b/assets/jp/bounty/CHECK_MANSION.png differ diff --git a/assets/jp/bounty/CHECK_ROAD.png b/assets/jp/bounty/CHECK_ROAD.png new file mode 100644 index 0000000..cb6f71b Binary files /dev/null and b/assets/jp/bounty/CHECK_ROAD.png differ diff --git a/assets/jp/bounty/SELECT_DESERT_RAILROAD.png b/assets/jp/bounty/SELECT_DESERT_RAILROAD.png index a73e3cd..182e1fb 100644 Binary files a/assets/jp/bounty/SELECT_DESERT_RAILROAD.png and b/assets/jp/bounty/SELECT_DESERT_RAILROAD.png differ diff --git a/assets/jp/bounty/SELECT_MANSION.png b/assets/jp/bounty/SELECT_MANSION.png new file mode 100644 index 0000000..5f2bbb1 Binary files /dev/null and b/assets/jp/bounty/SELECT_MANSION.png differ diff --git a/assets/jp/bounty/SELECT_ROAD.png b/assets/jp/bounty/SELECT_ROAD.png new file mode 100644 index 0000000..44b7ba4 Binary files /dev/null and b/assets/jp/bounty/SELECT_ROAD.png differ diff --git a/assets/jp/bounty/SELECT_SCHOOLHOUSE.png b/assets/jp/bounty/SELECT_SCHOOLHOUSE.png index fcfb631..e479c85 100644 Binary files a/assets/jp/bounty/SELECT_SCHOOLHOUSE.png and b/assets/jp/bounty/SELECT_SCHOOLHOUSE.png differ diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 6bbde48..96f6412 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -169,6 +169,16 @@ Schoolhouse: value: 0 option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] Count: 2 +Road: + Stage: + value: 0 + option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] + Count: 0 +Mansion: + Stage: + value: 0 + option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] + Count: 0 Scrimmage: OnError: diff --git a/tasks/bounty/bounty.py b/tasks/bounty/bounty.py index 9b72bf8..78c4b68 100644 --- a/tasks/bounty/bounty.py +++ b/tasks/bounty/bounty.py @@ -21,10 +21,12 @@ class BountyStatus(Flag): class Bounty(BountyUI): @property def bounty_info(self): - bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE) - check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE) - stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage) - count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count) + bounty = (SELECT_HIGHWAY, SELECT_DESERT_RAILROAD, SELECT_SCHOOLHOUSE, SELECT_ROAD, SELECT_MANSION) + check = (CHECK_HIGHWAY, CHECK_DESERT_RAILROAD, CHECK_SCHOOLHOUSE, CHECK_ROAD, CHECK_MANSION) + stage = (self.config.Highway_Stage, self.config.DesertRailroad_Stage, self.config.Schoolhouse_Stage, + self.config.Road_Stage, self.config.Mansion_Stage) + count = (self.config.Highway_Count, self.config.DesertRailroad_Count, self.config.Schoolhouse_Count, + self.config.Road_Count, self.config.Mansion_Count) info = zip(bounty, check, stage, count) return filter(lambda x: x[3] > 0, info)