fix(single-mode): update templates

fix #232 fix #233 fix #234
NateScarlet · Feb 18, 2022 · ed22a30 · ed22a30
1 parent c3a2289
commit ed22a30
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 3 deletions.
diff --git a/...ingle_mode/__snapshots__/command_test/test_recognize_commands.command_scene_issue232.json b/...ingle_mode/__snapshots__/command_test/test_recognize_commands.command_scene_issue232.json
@@ -0,0 +1,5 @@
+{
+  "hasHealthCare": false,
+  "hasScheduledRace": false,
+  "canGoOutWithFriend": true
+}
diff --git a/...ingle_mode/__snapshots__/command_test/test_recognize_commands.command_scene_issue234.json b/...ingle_mode/__snapshots__/command_test/test_recognize_commands.command_scene_issue234.json
@@ -0,0 +1,5 @@
+{
+  "hasHealthCare": false,
+  "hasScheduledRace": false,
+  "canGoOutWithFriend": false
+}
diff --git a/..._mode/__snapshots__/context_test/test_recognize_command_scene.command_scene_issue232.json b/..._mode/__snapshots__/context_test/test_recognize_command_scene.command_scene_issue232.json
@@ -0,0 +1,31 @@
+{
+  "date": [
+    1,
+    0,
+    0
+  ],
+  "mood": [
+    1.2,
+    1.1
+  ],
+  "scenario": "新設！　URAファイナルズ！！",
+  "vitality": 0.6376811594202898,
+  "maxVitality": 100,
+  "speed": 217,
+  "stamina": 237,
+  "power": 218,
+  "guts": 106,
+  "wisdom": 149,
+  "fanCount": 0,
+  "turf": "",
+  "dart": "",
+  "sprint": "",
+  "mile": "",
+  "intermediate": "",
+  "long": "",
+  "last": "",
+  "middle": "",
+  "head": "",
+  "lead": "",
+  "condition": 0
+}
diff --git a/..._mode/__snapshots__/context_test/test_recognize_command_scene.command_scene_issue234.json b/..._mode/__snapshots__/context_test/test_recognize_command_scene.command_scene_issue234.json
@@ -0,0 +1,31 @@
+{
+  "date": [
+    1,
+    0,
+    0
+  ],
+  "mood": [
+    1.0,
+    1.0
+  ],
+  "scenario": "アオハル杯～輝け、チームの絆～",
+  "vitality": 0.34782608695652173,
+  "maxVitality": 100,
+  "speed": 250,
+  "stamina": 155,
+  "power": 206,
+  "guts": 108,
+  "wisdom": 95,
+  "fanCount": 0,
+  "turf": "",
+  "dart": "",
+  "sprint": "",
+  "mile": "",
+  "intermediate": "",
+  "long": "",
+  "last": "",
+  "middle": "",
+  "head": "",
+  "lead": "",
+  "condition": 0
+}
diff --git a/auto_derby/templates/single_mode_command_go_out.pos.png b/auto_derby/templates/single_mode_command_go_out.pos.png
diff --git a/auto_derby/templates/single_mode_formal_race_banner.pos.png b/auto_derby/templates/single_mode_formal_race_banner.pos.png
diff --git a/auto_derby/templates/single_mode_race_menu_fan_icon.pos.png b/auto_derby/templates/single_mode_race_menu_fan_icon.pos.png
diff --git a/auto_derby/templates/single_mode_ura_finals.png b/auto_derby/templates/single_mode_ura_finals.png
diff --git a/auto_derby/templates/single_mode_ura_finals.pos.png b/auto_derby/templates/single_mode_ura_finals.pos.png
diff --git a/auto_derby/test_data/single_mode/command_scene_11.png b/auto_derby/test_data/single_mode/command_scene_11.png
diff --git a/auto_derby/test_data/single_mode/command_scene_issue232.png b/auto_derby/test_data/single_mode/command_scene_issue232.png
diff --git a/auto_derby/test_data/single_mode/command_scene_issue234.png b/auto_derby/test_data/single_mode/command_scene_issue234.png
diff --git a/scripts/capture_template_position.py b/scripts/capture_template_position.py
@@ -36,7 +36,9 @@ def _latest_file():
     )
 
 
-def create_pos_mask(name: Text, game_img: PIL.Image.Image, threshold: float):
+def create_pos_mask(
+    name: Text, game_img: PIL.Image.Image, threshold: float, padding: int
+):
     template.g.screenshot_width = game_img.width
     pos_name = template.add_middle_ext(name, "pos")
     pos_img = template.try_load(pos_name)
@@ -46,7 +48,6 @@ def create_pos_mask(name: Text, game_img: PIL.Image.Image, threshold: float):
     else:
         out_img = np.zeros((960, 540), dtype=np.uint8)
 
-    padding = 2
     for _, pos in template.match(
         game_img, template.Specification(name, templates.ANY_POS, threshold=threshold)
     ):
@@ -71,19 +72,21 @@ def main():
         "--game-image", "-g", dest="game_image", default="debug/last_screenshot.png"
     )
     parser.add_argument("--threshold", "-t", dest="threshold", type=float, default=0.9)
+    parser.add_argument("--padding", "-p", dest="padding", type=int, default=2)
     parser.add_argument("--debug", "-d", action="store_true")
     args = parser.parse_args()
     name = args.name
     if args.debug:
         template._DEBUG_TMPL = name  # type: ignore
     threshold = args.threshold
+    padding = args.padding
     game_image_path = args.game_image
     if not name:
         name = _latest_file()
     game_image = imagetools.resize(
         PIL.Image.open(game_image_path), width=template.TARGET_WIDTH
     )
-    create_pos_mask(name, game_image, threshold)
+    create_pos_mask(name, game_image, threshold, padding)
 
 
 if __name__ == "__main__":