diff --git a/assets/jp/school_exchange/CHECK_GEHENNA.png b/assets/jp/scrimmage/CHECK_GEHENNA.png similarity index 100% rename from assets/jp/school_exchange/CHECK_GEHENNA.png rename to assets/jp/scrimmage/CHECK_GEHENNA.png diff --git a/assets/jp/school_exchange/CHECK_MILLENNIUM.png b/assets/jp/scrimmage/CHECK_MILLENNIUM.png similarity index 100% rename from assets/jp/school_exchange/CHECK_MILLENNIUM.png rename to assets/jp/scrimmage/CHECK_MILLENNIUM.png diff --git a/assets/jp/scrimmage/CHECK_SCRIMMAGE.png b/assets/jp/scrimmage/CHECK_SCRIMMAGE.png new file mode 100644 index 0000000..1fbeaa2 Binary files /dev/null and b/assets/jp/scrimmage/CHECK_SCRIMMAGE.png differ diff --git a/assets/jp/school_exchange/CHECK_TRINITY.png b/assets/jp/scrimmage/CHECK_TRINITY.png similarity index 100% rename from assets/jp/school_exchange/CHECK_TRINITY.png rename to assets/jp/scrimmage/CHECK_TRINITY.png diff --git a/assets/jp/scrimmage/OCR_TICKET.png b/assets/jp/scrimmage/OCR_TICKET.png new file mode 100644 index 0000000..c3736db Binary files /dev/null and b/assets/jp/scrimmage/OCR_TICKET.png differ diff --git a/assets/jp/school_exchange/SELECT_GEHENNA.png b/assets/jp/scrimmage/SELECT_GEHENNA.png similarity index 100% rename from assets/jp/school_exchange/SELECT_GEHENNA.png rename to assets/jp/scrimmage/SELECT_GEHENNA.png diff --git a/assets/jp/school_exchange/SELECT_MILLENNIUM.png b/assets/jp/scrimmage/SELECT_MILLENNIUM.png similarity index 100% rename from assets/jp/school_exchange/SELECT_MILLENNIUM.png rename to assets/jp/scrimmage/SELECT_MILLENNIUM.png diff --git a/assets/jp/school_exchange/SELECT_TRINITY.png b/assets/jp/scrimmage/SELECT_TRINITY.png similarity index 100% rename from assets/jp/school_exchange/SELECT_TRINITY.png rename to assets/jp/scrimmage/SELECT_TRINITY.png diff --git a/tasks/school_exchange/assets/assets_school_exchange.py b/tasks/scrimmage/assets/assets_scrimmage.py similarity index 63% rename from tasks/school_exchange/assets/assets_school_exchange.py rename to tasks/scrimmage/assets/assets_scrimmage.py index 77d277d..d463885 100644 --- a/tasks/school_exchange/assets/assets_school_exchange.py +++ b/tasks/scrimmage/assets/assets_scrimmage.py @@ -6,7 +6,7 @@ from module.base.button import Button, ButtonWrapper CHECK_GEHENNA = ButtonWrapper( name='CHECK_GEHENNA', jp=Button( - file='./assets/jp/school_exchange/CHECK_GEHENNA.png', + file='./assets/jp/scrimmage/CHECK_GEHENNA.png', area=(109, 149, 195, 177), search=(89, 129, 215, 197), color=(201, 205, 206), @@ -17,7 +17,7 @@ CHECK_GEHENNA = ButtonWrapper( CHECK_MILLENNIUM = ButtonWrapper( name='CHECK_MILLENNIUM', jp=Button( - file='./assets/jp/school_exchange/CHECK_MILLENNIUM.png', + file='./assets/jp/scrimmage/CHECK_MILLENNIUM.png', area=(108, 148, 254, 178), search=(88, 128, 274, 198), color=(202, 206, 208), @@ -25,10 +25,21 @@ CHECK_MILLENNIUM = ButtonWrapper( ), en=None, ) +CHECK_SCRIMMAGE = ButtonWrapper( + name='CHECK_SCRIMMAGE', + jp=Button( + file='./assets/jp/scrimmage/CHECK_SCRIMMAGE.png', + area=(651, 90, 889, 130), + search=(631, 70, 909, 150), + color=(96, 119, 144), + button=(651, 90, 889, 130), + ), + en=None, +) CHECK_TRINITY = ButtonWrapper( name='CHECK_TRINITY', jp=Button( - file='./assets/jp/school_exchange/CHECK_TRINITY.png', + file='./assets/jp/scrimmage/CHECK_TRINITY.png', area=(115, 148, 250, 178), search=(95, 128, 270, 198), color=(204, 208, 210), @@ -36,10 +47,21 @@ CHECK_TRINITY = ButtonWrapper( ), en=None, ) +OCR_TICKET = ButtonWrapper( + name='OCR_TICKET', + jp=Button( + file='./assets/jp/scrimmage/OCR_TICKET.png', + area=(195, 85, 235, 113), + search=(175, 65, 255, 133), + color=(206, 211, 215), + button=(195, 85, 235, 113), + ), + en=None, +) SELECT_GEHENNA = ButtonWrapper( name='SELECT_GEHENNA', jp=Button( - file='./assets/jp/school_exchange/SELECT_GEHENNA.png', + file='./assets/jp/scrimmage/SELECT_GEHENNA.png', area=(1125, 275, 1224, 310), search=(1105, 255, 1244, 330), color=(207, 217, 225), @@ -50,7 +72,7 @@ SELECT_GEHENNA = ButtonWrapper( SELECT_MILLENNIUM = ButtonWrapper( name='SELECT_MILLENNIUM', jp=Button( - file='./assets/jp/school_exchange/SELECT_MILLENNIUM.png', + file='./assets/jp/scrimmage/SELECT_MILLENNIUM.png', area=(1069, 381, 1217, 417), search=(1049, 361, 1237, 437), color=(206, 214, 222), @@ -61,7 +83,7 @@ SELECT_MILLENNIUM = ButtonWrapper( SELECT_TRINITY = ButtonWrapper( name='SELECT_TRINITY', jp=Button( - file='./assets/jp/school_exchange/SELECT_TRINITY.png', + file='./assets/jp/scrimmage/SELECT_TRINITY.png', area=(1074, 165, 1221, 204), search=(1054, 145, 1241, 224), color=(213, 221, 228),