diff --git a/assets/share/combat/prepare/EXTRACT_RESERVED_TRAILBLAZE_POWER.png b/assets/share/combat/fuel/EXTRACT_RESERVED_TRAILBLAZE_POWER.png similarity index 100% rename from assets/share/combat/prepare/EXTRACT_RESERVED_TRAILBLAZE_POWER.png rename to assets/share/combat/fuel/EXTRACT_RESERVED_TRAILBLAZE_POWER.png diff --git a/assets/share/combat/prepare/FUEL.SEARCH.png b/assets/share/combat/fuel/FUEL.SEARCH.png similarity index 100% rename from assets/share/combat/prepare/FUEL.SEARCH.png rename to assets/share/combat/fuel/FUEL.SEARCH.png diff --git a/assets/share/combat/prepare/FUEL.png b/assets/share/combat/fuel/FUEL.png similarity index 100% rename from assets/share/combat/prepare/FUEL.png rename to assets/share/combat/fuel/FUEL.png diff --git a/assets/share/combat/prepare/FUEL_ENTRANCE.png b/assets/share/combat/fuel/FUEL_ENTRANCE.png similarity index 100% rename from assets/share/combat/prepare/FUEL_ENTRANCE.png rename to assets/share/combat/fuel/FUEL_ENTRANCE.png diff --git a/assets/share/combat/prepare/FUEL_MINUS.png b/assets/share/combat/fuel/FUEL_MINUS.png similarity index 100% rename from assets/share/combat/prepare/FUEL_MINUS.png rename to assets/share/combat/fuel/FUEL_MINUS.png diff --git a/assets/share/combat/prepare/FUEL_PLUS.png b/assets/share/combat/fuel/FUEL_PLUS.png similarity index 100% rename from assets/share/combat/prepare/FUEL_PLUS.png rename to assets/share/combat/fuel/FUEL_PLUS.png diff --git a/assets/share/combat/prepare/FUEL_SELECTED.SEARCH.png b/assets/share/combat/fuel/FUEL_SELECTED.SEARCH.png similarity index 100% rename from assets/share/combat/prepare/FUEL_SELECTED.SEARCH.png rename to assets/share/combat/fuel/FUEL_SELECTED.SEARCH.png diff --git a/assets/share/combat/prepare/FUEL_SELECTED.png b/assets/share/combat/fuel/FUEL_SELECTED.png similarity index 100% rename from assets/share/combat/prepare/FUEL_SELECTED.png rename to assets/share/combat/fuel/FUEL_SELECTED.png diff --git a/assets/share/combat/prepare/FUEL_SLIDER.png b/assets/share/combat/fuel/FUEL_SLIDER.png similarity index 100% rename from assets/share/combat/prepare/FUEL_SLIDER.png rename to assets/share/combat/fuel/FUEL_SLIDER.png diff --git a/assets/share/combat/prepare/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png b/assets/share/combat/fuel/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png similarity index 100% rename from assets/share/combat/prepare/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png rename to assets/share/combat/fuel/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png diff --git a/assets/share/combat/prepare/OCR_FUEL.png b/assets/share/combat/fuel/OCR_FUEL.png similarity index 100% rename from assets/share/combat/prepare/OCR_FUEL.png rename to assets/share/combat/fuel/OCR_FUEL.png diff --git a/assets/share/combat/prepare/OCR_FUEL_COUNT.png b/assets/share/combat/fuel/OCR_FUEL_COUNT.png similarity index 100% rename from assets/share/combat/prepare/OCR_FUEL_COUNT.png rename to assets/share/combat/fuel/OCR_FUEL_COUNT.png diff --git a/assets/share/combat/prepare/OCR_RESERVED_TRAILBLAZE_POWER.png b/assets/share/combat/fuel/OCR_RESERVED_TRAILBLAZE_POWER.png similarity index 100% rename from assets/share/combat/prepare/OCR_RESERVED_TRAILBLAZE_POWER.png rename to assets/share/combat/fuel/OCR_RESERVED_TRAILBLAZE_POWER.png diff --git a/assets/share/combat/prepare/RESERVED_MINUS.png b/assets/share/combat/fuel/RESERVED_MINUS.png similarity index 100% rename from assets/share/combat/prepare/RESERVED_MINUS.png rename to assets/share/combat/fuel/RESERVED_MINUS.png diff --git a/assets/share/combat/prepare/RESERVED_PLUS.png b/assets/share/combat/fuel/RESERVED_PLUS.png similarity index 100% rename from assets/share/combat/prepare/RESERVED_PLUS.png rename to assets/share/combat/fuel/RESERVED_PLUS.png diff --git a/assets/share/combat/prepare/RESERVED_SLIDER.png b/assets/share/combat/fuel/RESERVED_SLIDER.png similarity index 100% rename from assets/share/combat/prepare/RESERVED_SLIDER.png rename to assets/share/combat/fuel/RESERVED_SLIDER.png diff --git a/assets/share/combat/prepare/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png b/assets/share/combat/fuel/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png similarity index 100% rename from assets/share/combat/prepare/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png rename to assets/share/combat/fuel/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png diff --git a/assets/share/combat/prepare/USING_FUEL.png b/assets/share/combat/fuel/USING_FUEL.png similarity index 100% rename from assets/share/combat/prepare/USING_FUEL.png rename to assets/share/combat/fuel/USING_FUEL.png diff --git a/tasks/combat/assets/assets_combat_fuel.py b/tasks/combat/assets/assets_combat_fuel.py new file mode 100644 index 000000000..c34ebee6b --- /dev/null +++ b/tasks/combat/assets/assets_combat_fuel.py @@ -0,0 +1,165 @@ +from module.base.button import Button, ButtonWrapper + +# This file was auto-generated, do not modify it manually. To generate: +# ``` python -m dev_tools.button_extract ``` + +EXTRACT_RESERVED_TRAILBLAZE_POWER = ButtonWrapper( + name='EXTRACT_RESERVED_TRAILBLAZE_POWER', + share=Button( + file='./assets/share/combat/fuel/EXTRACT_RESERVED_TRAILBLAZE_POWER.png', + area=(909, 506, 929, 526), + search=(889, 486, 949, 546), + color=(91, 91, 91), + button=(909, 506, 929, 526), + ), +) +FUEL = ButtonWrapper( + name='FUEL', + share=Button( + file='./assets/share/combat/fuel/FUEL.png', + area=(592, 276, 688, 366), + search=(474, 271, 811, 396), + color=(123, 96, 134), + button=(592, 276, 688, 366), + ), +) +FUEL_ENTRANCE = ButtonWrapper( + name='FUEL_ENTRANCE', + share=Button( + file='./assets/share/combat/fuel/FUEL_ENTRANCE.png', + area=(1035, 26, 1056, 48), + search=(1015, 6, 1076, 68), + color=(188, 180, 226), + button=(1035, 26, 1056, 48), + ), +) +FUEL_MINUS = ButtonWrapper( + name='FUEL_MINUS', + share=Button( + file='./assets/share/combat/fuel/FUEL_MINUS.png', + area=(472, 425, 510, 450), + search=(452, 405, 530, 470), + color=(236, 236, 236), + button=(472, 425, 510, 450), + ), +) +FUEL_PLUS = ButtonWrapper( + name='FUEL_PLUS', + share=Button( + file='./assets/share/combat/fuel/FUEL_PLUS.png', + area=(967, 426, 1005, 449), + search=(947, 406, 1025, 469), + color=(232, 232, 232), + button=(967, 426, 1005, 449), + ), +) +FUEL_SELECTED = ButtonWrapper( + name='FUEL_SELECTED', + share=Button( + file='./assets/share/combat/fuel/FUEL_SELECTED.png', + area=(587, 271, 692, 368), + search=(474, 271, 811, 396), + color=(136, 112, 144), + button=(587, 271, 692, 368), + ), +) +FUEL_SLIDER = ButtonWrapper( + name='FUEL_SLIDER', + share=Button( + file='./assets/share/combat/fuel/FUEL_SLIDER.png', + area=(561, 434, 916, 441), + search=(541, 414, 936, 461), + color=(215, 185, 154), + button=(561, 434, 916, 441), + ), +) +OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT = ButtonWrapper( + name='OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT', + share=Button( + file='./assets/share/combat/fuel/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png', + area=(425, 415, 688, 436), + search=(405, 395, 708, 456), + color=(192, 192, 192), + button=(425, 415, 688, 436), + ), +) +OCR_FUEL = ButtonWrapper( + name='OCR_FUEL', + share=Button( + file='./assets/share/combat/fuel/OCR_FUEL.png', + area=(605, 369, 678, 386), + search=(585, 349, 698, 406), + color=(66, 66, 66), + button=(605, 369, 678, 386), + ), +) +OCR_FUEL_COUNT = ButtonWrapper( + name='OCR_FUEL_COUNT', + share=Button( + file='./assets/share/combat/fuel/OCR_FUEL_COUNT.png', + area=(686, 409, 881, 425), + search=(666, 389, 901, 445), + color=(205, 205, 205), + button=(686, 409, 881, 425), + ), +) +OCR_RESERVED_TRAILBLAZE_POWER = ButtonWrapper( + name='OCR_RESERVED_TRAILBLAZE_POWER', + share=Button( + file='./assets/share/combat/fuel/OCR_RESERVED_TRAILBLAZE_POWER.png', + area=(883, 29, 992, 44), + search=(863, 9, 1012, 64), + color=(51, 65, 65), + button=(883, 29, 992, 44), + ), +) +RESERVED_MINUS = ButtonWrapper( + name='RESERVED_MINUS', + share=Button( + file='./assets/share/combat/fuel/RESERVED_MINUS.png', + area=(248, 474, 281, 498), + search=(228, 454, 301, 518), + color=(238, 238, 238), + button=(248, 474, 281, 498), + ), +) +RESERVED_PLUS = ButtonWrapper( + name='RESERVED_PLUS', + share=Button( + file='./assets/share/combat/fuel/RESERVED_PLUS.png', + area=(938, 475, 974, 498), + search=(918, 455, 994, 518), + color=(232, 232, 232), + button=(938, 475, 974, 498), + ), +) +RESERVED_SLIDER = ButtonWrapper( + name='RESERVED_SLIDER', + share=Button( + file='./assets/share/combat/fuel/RESERVED_SLIDER.png', + area=(334, 483, 873, 489), + search=(314, 463, 893, 509), + color=(212, 173, 130), + button=(334, 483, 873, 489), + ), +) +RESERVED_TRAILBLAZE_POWER_ENTRANCE = ButtonWrapper( + name='RESERVED_TRAILBLAZE_POWER_ENTRANCE', + share=Button( + file='./assets/share/combat/fuel/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png', + area=(895, 26, 916, 48), + search=(875, 6, 936, 68), + color=(154, 213, 214), + button=(895, 26, 916, 48), + ), +) +USING_FUEL = ButtonWrapper( + name='USING_FUEL', + share=Button( + file='./assets/share/combat/fuel/USING_FUEL.png', + area=(263, 265, 363, 365), + search=(243, 245, 383, 385), + color=(161, 116, 129), + button=(263, 265, 363, 365), + ), +) diff --git a/tasks/combat/assets/assets_combat_prepare.py b/tasks/combat/assets/assets_combat_prepare.py index 1eaf77bee..8363a4da0 100644 --- a/tasks/combat/assets/assets_combat_prepare.py +++ b/tasks/combat/assets/assets_combat_prepare.py @@ -20,116 +20,6 @@ COMBAT_PREPARE = ButtonWrapper( button=(956, 640, 1225, 676), ), ) -EXTRACT_RESERVED_TRAILBLAZE_POWER = ButtonWrapper( - name='EXTRACT_RESERVED_TRAILBLAZE_POWER', - share=Button( - file='./assets/share/combat/prepare/EXTRACT_RESERVED_TRAILBLAZE_POWER.png', - area=(909, 506, 929, 526), - search=(889, 486, 949, 546), - color=(91, 91, 91), - button=(909, 506, 929, 526), - ), -) -FUEL = ButtonWrapper( - name='FUEL', - share=Button( - file='./assets/share/combat/prepare/FUEL.png', - area=(592, 276, 688, 366), - search=(474, 271, 811, 396), - color=(123, 96, 134), - button=(592, 276, 688, 366), - ), -) -FUEL_ENTRANCE = ButtonWrapper( - name='FUEL_ENTRANCE', - share=Button( - file='./assets/share/combat/prepare/FUEL_ENTRANCE.png', - area=(1035, 26, 1056, 48), - search=(1015, 6, 1076, 68), - color=(188, 180, 226), - button=(1035, 26, 1056, 48), - ), -) -FUEL_MINUS = ButtonWrapper( - name='FUEL_MINUS', - share=Button( - file='./assets/share/combat/prepare/FUEL_MINUS.png', - area=(472, 425, 510, 450), - search=(452, 405, 530, 470), - color=(236, 236, 236), - button=(472, 425, 510, 450), - ), -) -FUEL_PLUS = ButtonWrapper( - name='FUEL_PLUS', - share=Button( - file='./assets/share/combat/prepare/FUEL_PLUS.png', - area=(967, 426, 1005, 449), - search=(947, 406, 1025, 469), - color=(232, 232, 232), - button=(967, 426, 1005, 449), - ), -) -FUEL_SELECTED = ButtonWrapper( - name='FUEL_SELECTED', - share=Button( - file='./assets/share/combat/prepare/FUEL_SELECTED.png', - area=(587, 271, 692, 368), - search=(474, 271, 811, 396), - color=(136, 112, 144), - button=(587, 271, 692, 368), - ), -) -FUEL_SLIDER = ButtonWrapper( - name='FUEL_SLIDER', - share=Button( - file='./assets/share/combat/prepare/FUEL_SLIDER.png', - area=(561, 434, 916, 441), - search=(541, 414, 936, 461), - color=(215, 185, 154), - button=(561, 434, 916, 441), - ), -) -OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT = ButtonWrapper( - name='OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT', - share=Button( - file='./assets/share/combat/prepare/OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT.png', - area=(425, 415, 688, 436), - search=(405, 395, 708, 456), - color=(192, 192, 192), - button=(425, 415, 688, 436), - ), -) -OCR_FUEL = ButtonWrapper( - name='OCR_FUEL', - share=Button( - file='./assets/share/combat/prepare/OCR_FUEL.png', - area=(605, 369, 678, 386), - search=(585, 349, 698, 406), - color=(66, 66, 66), - button=(605, 369, 678, 386), - ), -) -OCR_FUEL_COUNT = ButtonWrapper( - name='OCR_FUEL_COUNT', - share=Button( - file='./assets/share/combat/prepare/OCR_FUEL_COUNT.png', - area=(686, 409, 881, 425), - search=(666, 389, 901, 445), - color=(205, 205, 205), - button=(686, 409, 881, 425), - ), -) -OCR_RESERVED_TRAILBLAZE_POWER = ButtonWrapper( - name='OCR_RESERVED_TRAILBLAZE_POWER', - share=Button( - file='./assets/share/combat/prepare/OCR_RESERVED_TRAILBLAZE_POWER.png', - area=(883, 29, 992, 44), - search=(863, 9, 1012, 64), - color=(51, 65, 65), - button=(883, 29, 992, 44), - ), -) OCR_TRAILBLAZE_POWER = ButtonWrapper( name='OCR_TRAILBLAZE_POWER', share=Button( @@ -160,56 +50,6 @@ OCR_WAVE_COUNT = ButtonWrapper( button=(911, 555, 1151, 581), ), ) -RESERVED_MINUS = ButtonWrapper( - name='RESERVED_MINUS', - share=Button( - file='./assets/share/combat/prepare/RESERVED_MINUS.png', - area=(248, 474, 281, 498), - search=(228, 454, 301, 518), - color=(238, 238, 238), - button=(248, 474, 281, 498), - ), -) -RESERVED_PLUS = ButtonWrapper( - name='RESERVED_PLUS', - share=Button( - file='./assets/share/combat/prepare/RESERVED_PLUS.png', - area=(938, 475, 974, 498), - search=(918, 455, 994, 518), - color=(232, 232, 232), - button=(938, 475, 974, 498), - ), -) -RESERVED_SLIDER = ButtonWrapper( - name='RESERVED_SLIDER', - share=Button( - file='./assets/share/combat/prepare/RESERVED_SLIDER.png', - area=(334, 483, 873, 489), - search=(314, 463, 893, 509), - color=(212, 173, 130), - button=(334, 483, 873, 489), - ), -) -RESERVED_TRAILBLAZE_POWER_ENTRANCE = ButtonWrapper( - name='RESERVED_TRAILBLAZE_POWER_ENTRANCE', - share=Button( - file='./assets/share/combat/prepare/RESERVED_TRAILBLAZE_POWER_ENTRANCE.png', - area=(895, 26, 916, 48), - search=(875, 6, 936, 68), - color=(154, 213, 214), - button=(895, 26, 916, 48), - ), -) -USING_FUEL = ButtonWrapper( - name='USING_FUEL', - share=Button( - file='./assets/share/combat/prepare/USING_FUEL.png', - area=(263, 265, 363, 365), - search=(243, 245, 383, 385), - color=(161, 116, 129), - button=(263, 265, 363, 365), - ), -) WAVE_MINUS = ButtonWrapper( name='WAVE_MINUS', share=Button( diff --git a/tasks/combat/fuel.py b/tasks/combat/fuel.py index 65de458c8..df001a74e 100644 --- a/tasks/combat/fuel.py +++ b/tasks/combat/fuel.py @@ -8,25 +8,8 @@ from tasks.base.assets.assets_base_popup import GET_REWARD, POPUP_CONFIRM, POPUP from tasks.base.ui import UI from tasks.item.slider import Slider from tasks.combat.assets.assets_combat_finish import COMBAT_AGAIN -from tasks.combat.assets.assets_combat_prepare import ( - COMBAT_PREPARE, - EXTRACT_RESERVED_TRAILBLAZE_POWER, - FUEL, - FUEL_MINUS, - FUEL_PLUS, - FUEL_SELECTED, - OCR_FUEL, - OCR_FUEL_COUNT, - OCR_RESERVED_TRAILBLAZE_POWER, - OCR_EXTRACT_RESERVED_TRAILBLAZE_POWER_COUNT, - RESERVED_TRAILBLAZE_POWER_ENTRANCE, - RESERVED_MINUS, - RESERVED_PLUS, - RESERVED_SLIDER, - FUEL_ENTRANCE, - USING_FUEL, - FUEL_SLIDER -) +from tasks.combat.assets.assets_combat_prepare import COMBAT_PREPARE +from tasks.combat.assets.assets_combat_fuel import * class Fuel(UI):