From 5f55303421832487d8174f1fa15a914ed71d0147 Mon Sep 17 00:00:00 2001 From: kyO The NinjA Date: Wed, 27 May 2020 21:56:32 -0300 Subject: [PATCH] FIx 3 Star Asset --- assets/en/handler/MAP_STAR_1.png | Bin 5607 -> 8183 bytes assets/en/handler/MAP_STAR_2.png | Bin 5602 -> 8152 bytes assets/en/handler/MAP_STAR_3.png | Bin 5602 -> 8154 bytes campaign/event_20200521_en/d2.py | 40 ++++++++++++++++++++++--------- module/handler/assets.py | 6 ++--- 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/assets/en/handler/MAP_STAR_1.png b/assets/en/handler/MAP_STAR_1.png index 5510e61e65eebc963987383270cfe12f23768fed..2d3afcefa593374bbb27b3bbf7efcc1dc07baf53 100644 GIT binary patch literal 8183 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 literal 5607 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 P_G)ZscDYR7`Qd*6i{qdv diff --git a/assets/en/handler/MAP_STAR_2.png b/assets/en/handler/MAP_STAR_2.png index 12d0e3c2574574639449d5e0a2e6fa220f8b5605..87fc2bce58487ba83c824f972488da1cb6f46745 100644 GIT binary patch literal 8152 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 U)Rls2lQsfleG9!BsO#hZ0v9Su?EnA( literal 5602 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 diff --git a/assets/en/handler/MAP_STAR_3.png b/assets/en/handler/MAP_STAR_3.png index cf6168a83497f7ea2ac13f610ae08c92bac9de46..22f5197b56d5ddb8739d5584d00ff055f45a0495 100644 GIT binary patch literal 8154 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 literal 5602 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 LZ+fLt*XiEB1qPBA diff --git a/campaign/event_20200521_en/d2.py b/campaign/event_20200521_en/d2.py index 80a4cff18..c24c8f59c 100644 --- a/campaign/event_20200521_en/d2.py +++ b/campaign/event_20200521_en/d2.py @@ -13,16 +13,15 @@ MAP.map_data = ''' SP -- -- -- -- ME -- ++ MB ''' -MAP.camera_data = ['D2', 'B5', 'H4'] -MAP.weight_data = """ - 40 40 40 40 40 40 30 40 20 - 40 30 40 10 30 40 40 40 40 - 40 40 30 40 40 40 40 40 40 - 30 30 40 30 30 30 40 10 40 - 30 10 40 40 40 40 40 40 40 - 40 30 40 30 40 40 40 40 40 - 40 40 40 40 40 30 40 40 20 -""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 2, 'siren': 3}, + {'battle': 1, 'enemy': 1}, + {'battle': 2, 'enemy': 2, 'siren': 2}, + {'battle': 3, 'enemy': 1}, + {'battle': 4, 'enemy': 2, 'siren': 1}, + {'battle': 5, 'enemy': 1}, + {'battle': 6, 'boss': 1}, +] class Config: SUBMARINE = 1 @@ -33,9 +32,28 @@ class Config: MAP_HAS_FLEET_STEP = False MAP_HAS_MOVABLE_ENEMY = False MAP_HAS_SIREN = True - MAP_HAS_DYNAMIC_RED_BORDER = True + MAP_HAS_DYNAMIC_RED_BORDER = False MAP_SIREN_COUNT = 3 class Campaign(CampaignBase): MAP = MAP + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_enemy(scale=(2, 3)): + return True + + return self.battle_default() + + def battle_5(self): + if self.clear_enemy(scale=(1,)): + return True + if self.clear_enemy(scale=(2,)): + return True + + return self.battle_default() + + def battle_6(self): + return self.fleet_2.clear_boss() diff --git a/module/handler/assets.py b/module/handler/assets.py index 97da46954..fdd4b9396 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -31,9 +31,9 @@ MAP_BUFF = Button(area={'cn': (145, 115, 437, 159), 'en': (145, 115, 437, 159)}, MAP_CLEAR_PERCENTAGE = Button(area={'cn': (626, 185, 970, 190), 'en': (626, 185, 970, 190)}, color={'cn': (245, 213, 88), 'en': (245, 213, 88)}, button={'cn': (626, 185, 970, 190), 'en': (626, 185, 970, 190)}, file={'cn': './assets/cn/handler/MAP_CLEAR_PERCENTAGE.png', 'en': './assets/en/handler/MAP_CLEAR_PERCENTAGE.png'}) MAP_ENEMY_SEARCHING = Button(area={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382)}, color={'cn': (200, 99, 91), 'en': (200, 99, 91)}, button={'cn': (531, 320, 864, 382), 'en': (531, 320, 864, 382)}, file={'cn': './assets/cn/handler/MAP_ENEMY_SEARCHING.png', 'en': './assets/en/handler/MAP_ENEMY_SEARCHING.png'}) MAP_GREEN = Button(area={'cn': (195, 260, 349, 292), 'en': (201, 259, 341, 290)}, color={'cn': (125, 190, 84), 'en': (104, 207, 104)}, button={'cn': (195, 260, 349, 292), 'en': (201, 259, 341, 290)}, file={'cn': './assets/cn/handler/MAP_GREEN.png', 'en': './assets/en/handler/MAP_GREEN.png'}) -MAP_STAR_1 = Button(area={'cn': (245, 377, 254, 384), 'en': (245, 377, 254, 384)}, color={'cn': (251, 233, 143), 'en': (251, 233, 143)}, button={'cn': (245, 377, 254, 384), 'en': (245, 377, 254, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_1.png', 'en': './assets/en/handler/MAP_STAR_1.png'}) -MAP_STAR_2 = Button(area={'cn': (532, 377, 540, 384), 'en': (532, 377, 540, 384)}, color={'cn': (251, 233, 144), 'en': (251, 233, 144)}, button={'cn': (532, 377, 540, 384), 'en': (532, 377, 540, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_2.png', 'en': './assets/en/handler/MAP_STAR_2.png'}) -MAP_STAR_3 = Button(area={'cn': (818, 377, 827, 384), 'en': (818, 377, 827, 384)}, color={'cn': (251, 233, 143), 'en': (251, 233, 143)}, button={'cn': (818, 377, 827, 384), 'en': (818, 377, 827, 384)}, file={'cn': './assets/cn/handler/MAP_STAR_3.png', 'en': './assets/en/handler/MAP_STAR_3.png'}) +MAP_STAR_1 = Button(area={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389)}, color={'cn': (251, 233, 143), 'en': (252, 234, 146)}, button={'cn': (245, 377, 254, 384), 'en': (232, 381, 240, 389)}, file={'cn': './assets/cn/handler/MAP_STAR_1.png', 'en': './assets/en/handler/MAP_STAR_1.png'}) +MAP_STAR_2 = Button(area={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389)}, color={'cn': (251, 233, 144), 'en': (252, 234, 144)}, button={'cn': (532, 377, 540, 384), 'en': (518, 382, 526, 389)}, file={'cn': './assets/cn/handler/MAP_STAR_2.png', 'en': './assets/en/handler/MAP_STAR_2.png'}) +MAP_STAR_3 = Button(area={'cn': (818, 377, 827, 384), 'en': (804, 382, 812, 389)}, color={'cn': (251, 233, 143), 'en': (252, 234, 144)}, button={'cn': (818, 377, 827, 384), 'en': (804, 382, 812, 389)}, file={'cn': './assets/cn/handler/MAP_STAR_3.png', 'en': './assets/en/handler/MAP_STAR_3.png'}) MAP_WALK_OUT_OF_STEP = Button(area={'cn': (654, 312, 704, 335), 'en': (654, 312, 704, 335)}, color={'cn': (109, 113, 120), 'en': (109, 113, 120)}, button={'cn': (654, 312, 704, 335), 'en': (654, 312, 704, 335)}, file={'cn': './assets/cn/handler/MAP_WALK_OUT_OF_STEP.png', 'en': './assets/en/handler/MAP_WALK_OUT_OF_STEP.png'}) MYSTERY_ITEM = Button(area={'cn': (589, 294, 691, 427), 'en': (589, 294, 691, 427)}, color={'cn': (144, 127, 83), 'en': (144, 127, 83)}, button={'cn': (589, 294, 691, 427), 'en': (589, 294, 691, 427)}, file={'cn': './assets/cn/handler/MYSTERY_ITEM.png', 'en': './assets/en/handler/MYSTERY_ITEM.png'}) POPUP_CANCEL = Button(area={'cn': (404, 493, 576, 550), 'en': (378, 452, 544, 510)}, color={'cn': (166, 169, 172), 'en': (168, 170, 172)}, button={'cn': (404, 493, 576, 550), 'en': (378, 452, 544, 510)}, file={'cn': './assets/cn/handler/POPUP_CANCEL.png', 'en': './assets/en/handler/POPUP_CANCEL.png'})