From e48049f198ad77abd8bde192c7d7e543770fdec8 Mon Sep 17 00:00:00 2001
From: Constrat <56174894+Constrat@users.noreply.github.com>
Date: Sun, 7 Sep 2025 16:47:36 +0200
Subject: [PATCH] fix: Sami floor detection 2 Thanks again @lin4289 on discord

---
 .../resource/tasks/Roguelike/Sami.json        | 92 +++++++------------
 1 file changed, 33 insertions(+), 59 deletions(-)

diff --git a/resource/global/YoStarEN/resource/tasks/Roguelike/Sami.json b/resource/global/YoStarEN/resource/tasks/Roguelike/Sami.json
index ea6879cc7c..02f7b1acb0 100644
--- a/resource/global/YoStarEN/resource/tasks/Roguelike/Sami.json
+++ b/resource/global/YoStarEN/resource/tasks/Roguelike/Sami.json
@@ -171,6 +171,9 @@
     "Sami@Roguelike@GetDropSelectRecruit": {
         "template": "Sami@Roguelike@GetDropSelectRecruit.png"
     },
+	"Sami@Roguelike@GetDropSelectReward": {
+        "templThreshold": 0.9
+	},
     "Sami@Roguelike@NextLevel": {
         "text": [
             "Brisk Marshlands",
@@ -195,98 +198,69 @@
         "text": ["Use the Safe House again", "Use the Safe"]
     },
     "Sami@Roguelike@StrategyChange_mode0": {
-        "doc": "Ocr can't read 3rd floor, use temperature instead (experimental)",
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_aggressive"],
-            [".*Placid ?Forests", "_aggressive"],
-            [".*Dawning ?Frostbounds", "_pragmatic"],
-            [".*12.*", "_pragmatic"],
-            [".*Gelid ?Rockshelves", "_pragmatic"],
-            [".*Immaculate ?Garden", "_default"],
-            ["Garden", "_default"],
-            [".*70.*", "_default"],
+            [".*Placid ?Forest.*", "_aggressive"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_pragmatic"],
+            [".*Gel?i?d ?Rockshe.*", "_pragmatic"],
+			[".*Immaculate ?Garde.*", "_default"],
             [".*Clairvoyant ?Carcass", "_default"],
-            [".*Secluded ?Passage", "_SKIP_"]
+            [".*Secluded ?Passag.*", "_SKIP_"]
         ]
     },
     "Sami@Roguelike@StrategyChange_mode1": {
-        "doc": "Ocr can't read 3rd floor, use temperature instead (experimental)",
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_default"],
-            [".*Placid ?Forests", "_exit"],
-            [".*Dawning ?Frostbounds", "_exit"],
-            [".*12.*", "_exit"],
-            [".*Gelid ?Rockshelves", "_exit"],
-            [".*Immaculate ?Garden", "_exit"],
-            [".*Garden", "_exit"],
-            [".*70.*", "_exit"],
+            [".*Placid ?Forest.*", "_exit"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_exit"],
+            [".*Gel?i?d ?Rockshe.*", "_exit"],
+			[".*Immaculate ?Garde.*", "_exit"],
             [".*Clairvoyant ?Carcass", "_exit"],
-            [".*Secluded ?Passage", "_exit"]
+            [".*Secluded ?Passag.*", "_exit"]
         ]
     },
     "Sami@Roguelike@StrategyChange_mode4": {
-        "doc": "Ocr can't read 3rd floor, use temperature instead (experimental)",
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_default"],
-            [".*Placid ?Forests", "_default"],
-            [".*Dawning ?Frostbounds", "_exit"],
-            [".*12.*", "_exit"],
-            [".*Gelid ?Rockshelves", "_exit"],
-            [".*Immaculate ?Garden", "_exit"],
-            [".*Garden", "_exit"],
-            [".*70.*", "_exit"],
+            [".*Placid ?Forest.*", "_default"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_exit"],
+            [".*Gel?i?d ?Rockshe.*", "_exit"],
+			[".*Immaculate ?Garde.*", "_exit"],
             [".*Clairvoyant ?Carcass", "_exit"],
-            [".*Secluded ?Passage", "_exit"]
+            [".*Secluded ?Passag.*", "_exit"]
         ]
     },
     "Sami@Roguelike@StrategyChange_mode5": {
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_collapsal_paradigms"],
-            [".*Placid ?Forests", "_collapsal_paradigms"],
-            [".*Dawning ?Frostbounds", "_SKIP_"],
-            [".*12.*", "_SKIP_"],
-            [".*Gelid ?Rockshelves", "_SKIP_"],
-            [".*Immaculate ?Garden", "_SKIP_"],
-            [".*Garden", "_SKIP_"],
-            [".*70.*", "_SKIP_"],
+            [".*Placid ?Forest.*", "_collapsal_paradigms"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_SKIP_"],
+            [".*Gel?i?d ?Rockshe.*", "_SKIP_"],
+			[".*Immaculate ?Garde.*", "_SKIP_"],
             [".*Clairvoyant ?Carcass", "_SKIP_"],
-            [".*Secluded ?Passage", "_SKIP_"]
+            [".*Secluded ?Passag.*", "_SKIP_"]
         ]
     },
     "Sami@Roguelike@StrategyChange_mode6": {
-        "doc": "Ocr can't read 3rd floor, use temperature instead (experimental)",
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_aggressive"],
-            [".*Placid ?Forests", "_aggressive"],
-            [".*Dawning ?Frostbounds", "_pragmatic"],
-            [".*12.*", "_pragmatic"],
-            [".*Gelid ?Rockshelves", "_pragmatic"],
-            [".*Immaculate ?Garden", "_default"],
-            [".*Garden", "_default"],
-            [".*70.*", "_default"],
+            [".*Placid ?Forest.*", "_aggressive"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_pragmatic"],
+            [".*Gel?i?d ?Rockshe.*", "_pragmatic"],
+			[".*Immaculate ?Garde.*", "_default"],
             [".*Clairvoyant ?Carcass", "_default"],
-            [".*Secluded ?Passage", "_SKIP_"]
+            [".*Secluded ?Passag.*", "_SKIP_"]
         ]
     },
     "Sami@Roguelike@StrategyChange_mode7": {
-        "doc": "Ocr can't read 3rd floor, use temperature instead (experimental)",
-        "roi": [603, 49, 125, 18],
         "ocrReplace": [
             [".*Brisk ?M?arshlands", "_aggressive"],
-            [".*Placid ?Forests", "_aggressive"],
-            [".*Dawning ?Frostbounds", "_pragmatic"],
-            [".*12.*", "_pragmatic"],
-            [".*Gelid ?Rockshelves", "_pragmatic"],
-            [".*Immaculate ?Garden", "_default"],
-            [".*Garden", "_default"],
-            [".*70.*", "_default"],
+            [".*Placid ?Forest.*", "_aggressive"],
+            [".*Dawni?n?g ?(F|f)rostbou.*", "_pragmatic"],
+            [".*Gel?i?d ?Rockshe.*", "_pragmatic"],
+			[".*Immaculate ?Garde.*", "_default"],
             [".*Clairvoyant ?Carcass", "_default"],
-            [".*Secluded ?Passage", "_SKIP_"]
+            [".*Secluded ?Passag.*", "_SKIP_"]
         ]
     }
 }