From 08aa64580d16be75e65c720ec862f11420430756 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 28 Apr 2022 23:07:09 +0800
Subject: [PATCH] Add: Rondo at Rainbow's End chapter AC

- Fix: swipe route out of target box
- Fix: Re-add handle_combat_weapon_release()
---
 assets/cn/template/TEMPLATE_SIREN_Leipzig.gif | Bin 0 -> 2197 bytes
 assets/en/template/TEMPLATE_SIREN_Leipzig.gif | Bin 0 -> 2197 bytes
 assets/jp/template/TEMPLATE_SIREN_Leipzig.gif | Bin 0 -> 2197 bytes
 assets/tw/template/TEMPLATE_SIREN_Leipzig.gif | Bin 0 -> 2197 bytes
 campaign/event_20220428_cn/a1.py              |  25 ++++++++++++++++
 campaign/event_20220428_cn/a2.py              |  27 ++++++++++++++++++
 campaign/event_20220428_cn/a3.py              |  26 +++++++++++++++++
 campaign/event_20220428_cn/c1.py              |  26 +++++++++++++++++
 campaign/event_20220428_cn/c2.py              |  27 ++++++++++++++++++
 campaign/event_20220428_cn/c3.py              |  26 +++++++++++++++++
 module/base/utils.py                          |   2 +-
 module/combat/combat_manual.py                |   8 +++---
 module/config/config_manual.py                |   1 +
 module/map/fleet.py                           |   5 ++++
 module/map_detection/grid_info.py             |   2 +-
 module/template/assets.py                     |   1 +
 16 files changed, 170 insertions(+), 6 deletions(-)
 create mode 100644 assets/cn/template/TEMPLATE_SIREN_Leipzig.gif
 create mode 100644 assets/en/template/TEMPLATE_SIREN_Leipzig.gif
 create mode 100644 assets/jp/template/TEMPLATE_SIREN_Leipzig.gif
 create mode 100644 assets/tw/template/TEMPLATE_SIREN_Leipzig.gif

diff --git a/assets/cn/template/TEMPLATE_SIREN_Leipzig.gif b/assets/cn/template/TEMPLATE_SIREN_Leipzig.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f85b5ab0e97c60ad04cffae8a913d3eaa52fae2
GIT binary patch
literal 2197
zcmZ?wbhEHb<Yy3KXlG#f|NsBLfB*jc`Sa`7uOB~tynFZV_3PKKUcGwp;>Gjl&!0Yh
z`sB%zd-v|$xN+mcg$w7;pFeZv%<0poPn|k-^5n^*M~@ypeE7hD1N-;y-?L}WjvYI;
zZQHhW>((t>wrtq2VcoiQYuBz_vu4fe)vFgSTsUvuya^K~^z`&}b#=A3x3{&mwYIjl
zw6rugH#amil$Ms}=jZ3<=H}$&WMyS#WMrhJrKP5(rlh1KCnqN*B_$>%CL|=p$H&LT
z#l^<P#>B)#M@L6RMMXqJgolTRg@uKLgaif#1_T87`}_O(`FVMHd3t(!czC$Exw*Q!
zy12MFJ3Bi$IXOByIygAk+uPgO+1c9K+Su4wSy@?HT3T3Gn46oMnVFfInwprH7#kZK
z85tQG8X6cF=<Dn2>FMd{=xA$eYieq0XlSUbtE;K0sj8}~sHi9@DJd!{Dkvz(%gf8j
z$;rsbNJ&YFi;IhiiHVAe3JD1b3JUV`^YiiX@$&LAjDkTH0*e2+{aizWogD*Qjr0td
z8UO!hQ2fclp$K%Q4#=sXY{J0tpMgC=;o-psR%V`@hL@j`4|18XFj#E3l+?t)YJQ-C
z(fRP1nGBpMDx8ZI8yIC04xE^I`4}I&w*QubM8*V%o+$|z_82NJ_YhJ}Zew6Dczk-Q
zVc?brFOyt6r>c8o#XWfV$aR`b^t_zTBqo>Mg{;%=%t&lKJ6G8-tS4Y&D-(}o>8c46
zKeL{k$Sx$oP{`DBVuDiTJRZhF$p;#k<u<(ep{U|9L8&B%LD0y7fk7mw!hlbS#bb`#
zWbK?E1<t3E6j#(o6w0V@%`nM3qVe+J;p2VEIVE2>f?B<%YDH}FNj#LoC2k!sFX3R(
z(x0N*p*tELG9Bj?)rr~=vT@TK?+*s4&lac!8ngM%HqAKXlDTL}#{?lMr;>&X3e6oN
zx_%i24GagH{`0sbI67bkT|2yd`ThGhu!#Bj^Cz&B`SRt<`}gmGWzCy6Z-B+kvuDqM
z1<j*JkAMZuojZ4cWzDr~*REW-a`ECtNI`S(;6Y#!vv=>_RjXF5T)A@Y+_|%6&6+V|
z#<XeECQh8#*VotE+Y2dKfW->1Kxu4jtgo-HtE;Q7t}ZVxFDfc3C@27yFL`-+!14uH
zxTL421IriuB}-&vB)o754GjgBFTugVK|w*lA_iE#`1<<#`1p8xdqYYYND+gze6hB+
z1{N^{%NJc;U0@NTrKJTdVu0lfq;OGIRz@ydWMyT6<%_hmw4|gYq=*p_5dju4!19HQ
zi;JC|orQ%3lxRo6pa}tB(ZN3@qfvpOjZHAG;inSwK{houzK{ouhnN`IjrSGIoW#^E
z$;@P>!dT3Bph+s>z=4OCmi09WCv1xNDWGt$XG-R)HI2$_JwoaUX$%Yji_b_HMcrBx
z80_LHr0vhZ!eQ9bCa7akqa}Fxi7P(?8-v8lMx~P?*2P;o3LYG2J1J2S*RWEUots-!
z&uvM;<tLu~MwRDOeoky|Vr1iA_J!k<a!0RrO4gSbjtdSj2!$5uunDEK%S!jQGZ_fF
z9#1=#SjQk~)a)_IBCG5J2NMeizoA9dhXp}PzfaTiXyI{edfGQp$$LZ0&P8*&rW@Fv
zz3^~SP}daA&=moVNvb{4w)q#<sAOuUpOrEzyf&jSDEVlgvR%TF4~DKje0*{yDGdyc
Mhgdj8fr-`{0B5u<8UO$Q

literal 0
HcmV?d00001

diff --git a/assets/en/template/TEMPLATE_SIREN_Leipzig.gif b/assets/en/template/TEMPLATE_SIREN_Leipzig.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f85b5ab0e97c60ad04cffae8a913d3eaa52fae2
GIT binary patch
literal 2197
zcmZ?wbhEHb<Yy3KXlG#f|NsBLfB*jc`Sa`7uOB~tynFZV_3PKKUcGwp;>Gjl&!0Yh
z`sB%zd-v|$xN+mcg$w7;pFeZv%<0poPn|k-^5n^*M~@ypeE7hD1N-;y-?L}WjvYI;
zZQHhW>((t>wrtq2VcoiQYuBz_vu4fe)vFgSTsUvuya^K~^z`&}b#=A3x3{&mwYIjl
zw6rugH#amil$Ms}=jZ3<=H}$&WMyS#WMrhJrKP5(rlh1KCnqN*B_$>%CL|=p$H&LT
z#l^<P#>B)#M@L6RMMXqJgolTRg@uKLgaif#1_T87`}_O(`FVMHd3t(!czC$Exw*Q!
zy12MFJ3Bi$IXOByIygAk+uPgO+1c9K+Su4wSy@?HT3T3Gn46oMnVFfInwprH7#kZK
z85tQG8X6cF=<Dn2>FMd{=xA$eYieq0XlSUbtE;K0sj8}~sHi9@DJd!{Dkvz(%gf8j
z$;rsbNJ&YFi;IhiiHVAe3JD1b3JUV`^YiiX@$&LAjDkTH0*e2+{aizWogD*Qjr0td
z8UO!hQ2fclp$K%Q4#=sXY{J0tpMgC=;o-psR%V`@hL@j`4|18XFj#E3l+?t)YJQ-C
z(fRP1nGBpMDx8ZI8yIC04xE^I`4}I&w*QubM8*V%o+$|z_82NJ_YhJ}Zew6Dczk-Q
zVc?brFOyt6r>c8o#XWfV$aR`b^t_zTBqo>Mg{;%=%t&lKJ6G8-tS4Y&D-(}o>8c46
zKeL{k$Sx$oP{`DBVuDiTJRZhF$p;#k<u<(ep{U|9L8&B%LD0y7fk7mw!hlbS#bb`#
zWbK?E1<t3E6j#(o6w0V@%`nM3qVe+J;p2VEIVE2>f?B<%YDH}FNj#LoC2k!sFX3R(
z(x0N*p*tELG9Bj?)rr~=vT@TK?+*s4&lac!8ngM%HqAKXlDTL}#{?lMr;>&X3e6oN
zx_%i24GagH{`0sbI67bkT|2yd`ThGhu!#Bj^Cz&B`SRt<`}gmGWzCy6Z-B+kvuDqM
z1<j*JkAMZuojZ4cWzDr~*REW-a`ECtNI`S(;6Y#!vv=>_RjXF5T)A@Y+_|%6&6+V|
z#<XeECQh8#*VotE+Y2dKfW->1Kxu4jtgo-HtE;Q7t}ZVxFDfc3C@27yFL`-+!14uH
zxTL421IriuB}-&vB)o754GjgBFTugVK|w*lA_iE#`1<<#`1p8xdqYYYND+gze6hB+
z1{N^{%NJc;U0@NTrKJTdVu0lfq;OGIRz@ydWMyT6<%_hmw4|gYq=*p_5dju4!19HQ
zi;JC|orQ%3lxRo6pa}tB(ZN3@qfvpOjZHAG;inSwK{houzK{ouhnN`IjrSGIoW#^E
z$;@P>!dT3Bph+s>z=4OCmi09WCv1xNDWGt$XG-R)HI2$_JwoaUX$%Yji_b_HMcrBx
z80_LHr0vhZ!eQ9bCa7akqa}Fxi7P(?8-v8lMx~P?*2P;o3LYG2J1J2S*RWEUots-!
z&uvM;<tLu~MwRDOeoky|Vr1iA_J!k<a!0RrO4gSbjtdSj2!$5uunDEK%S!jQGZ_fF
z9#1=#SjQk~)a)_IBCG5J2NMeizoA9dhXp}PzfaTiXyI{edfGQp$$LZ0&P8*&rW@Fv
zz3^~SP}daA&=moVNvb{4w)q#<sAOuUpOrEzyf&jSDEVlgvR%TF4~DKje0*{yDGdyc
Mhgdj8fr-`{0B5u<8UO$Q

literal 0
HcmV?d00001

diff --git a/assets/jp/template/TEMPLATE_SIREN_Leipzig.gif b/assets/jp/template/TEMPLATE_SIREN_Leipzig.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f85b5ab0e97c60ad04cffae8a913d3eaa52fae2
GIT binary patch
literal 2197
zcmZ?wbhEHb<Yy3KXlG#f|NsBLfB*jc`Sa`7uOB~tynFZV_3PKKUcGwp;>Gjl&!0Yh
z`sB%zd-v|$xN+mcg$w7;pFeZv%<0poPn|k-^5n^*M~@ypeE7hD1N-;y-?L}WjvYI;
zZQHhW>((t>wrtq2VcoiQYuBz_vu4fe)vFgSTsUvuya^K~^z`&}b#=A3x3{&mwYIjl
zw6rugH#amil$Ms}=jZ3<=H}$&WMyS#WMrhJrKP5(rlh1KCnqN*B_$>%CL|=p$H&LT
z#l^<P#>B)#M@L6RMMXqJgolTRg@uKLgaif#1_T87`}_O(`FVMHd3t(!czC$Exw*Q!
zy12MFJ3Bi$IXOByIygAk+uPgO+1c9K+Su4wSy@?HT3T3Gn46oMnVFfInwprH7#kZK
z85tQG8X6cF=<Dn2>FMd{=xA$eYieq0XlSUbtE;K0sj8}~sHi9@DJd!{Dkvz(%gf8j
z$;rsbNJ&YFi;IhiiHVAe3JD1b3JUV`^YiiX@$&LAjDkTH0*e2+{aizWogD*Qjr0td
z8UO!hQ2fclp$K%Q4#=sXY{J0tpMgC=;o-psR%V`@hL@j`4|18XFj#E3l+?t)YJQ-C
z(fRP1nGBpMDx8ZI8yIC04xE^I`4}I&w*QubM8*V%o+$|z_82NJ_YhJ}Zew6Dczk-Q
zVc?brFOyt6r>c8o#XWfV$aR`b^t_zTBqo>Mg{;%=%t&lKJ6G8-tS4Y&D-(}o>8c46
zKeL{k$Sx$oP{`DBVuDiTJRZhF$p;#k<u<(ep{U|9L8&B%LD0y7fk7mw!hlbS#bb`#
zWbK?E1<t3E6j#(o6w0V@%`nM3qVe+J;p2VEIVE2>f?B<%YDH}FNj#LoC2k!sFX3R(
z(x0N*p*tELG9Bj?)rr~=vT@TK?+*s4&lac!8ngM%HqAKXlDTL}#{?lMr;>&X3e6oN
zx_%i24GagH{`0sbI67bkT|2yd`ThGhu!#Bj^Cz&B`SRt<`}gmGWzCy6Z-B+kvuDqM
z1<j*JkAMZuojZ4cWzDr~*REW-a`ECtNI`S(;6Y#!vv=>_RjXF5T)A@Y+_|%6&6+V|
z#<XeECQh8#*VotE+Y2dKfW->1Kxu4jtgo-HtE;Q7t}ZVxFDfc3C@27yFL`-+!14uH
zxTL421IriuB}-&vB)o754GjgBFTugVK|w*lA_iE#`1<<#`1p8xdqYYYND+gze6hB+
z1{N^{%NJc;U0@NTrKJTdVu0lfq;OGIRz@ydWMyT6<%_hmw4|gYq=*p_5dju4!19HQ
zi;JC|orQ%3lxRo6pa}tB(ZN3@qfvpOjZHAG;inSwK{houzK{ouhnN`IjrSGIoW#^E
z$;@P>!dT3Bph+s>z=4OCmi09WCv1xNDWGt$XG-R)HI2$_JwoaUX$%Yji_b_HMcrBx
z80_LHr0vhZ!eQ9bCa7akqa}Fxi7P(?8-v8lMx~P?*2P;o3LYG2J1J2S*RWEUots-!
z&uvM;<tLu~MwRDOeoky|Vr1iA_J!k<a!0RrO4gSbjtdSj2!$5uunDEK%S!jQGZ_fF
z9#1=#SjQk~)a)_IBCG5J2NMeizoA9dhXp}PzfaTiXyI{edfGQp$$LZ0&P8*&rW@Fv
zz3^~SP}daA&=moVNvb{4w)q#<sAOuUpOrEzyf&jSDEVlgvR%TF4~DKje0*{yDGdyc
Mhgdj8fr-`{0B5u<8UO$Q

literal 0
HcmV?d00001

diff --git a/assets/tw/template/TEMPLATE_SIREN_Leipzig.gif b/assets/tw/template/TEMPLATE_SIREN_Leipzig.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f85b5ab0e97c60ad04cffae8a913d3eaa52fae2
GIT binary patch
literal 2197
zcmZ?wbhEHb<Yy3KXlG#f|NsBLfB*jc`Sa`7uOB~tynFZV_3PKKUcGwp;>Gjl&!0Yh
z`sB%zd-v|$xN+mcg$w7;pFeZv%<0poPn|k-^5n^*M~@ypeE7hD1N-;y-?L}WjvYI;
zZQHhW>((t>wrtq2VcoiQYuBz_vu4fe)vFgSTsUvuya^K~^z`&}b#=A3x3{&mwYIjl
zw6rugH#amil$Ms}=jZ3<=H}$&WMyS#WMrhJrKP5(rlh1KCnqN*B_$>%CL|=p$H&LT
z#l^<P#>B)#M@L6RMMXqJgolTRg@uKLgaif#1_T87`}_O(`FVMHd3t(!czC$Exw*Q!
zy12MFJ3Bi$IXOByIygAk+uPgO+1c9K+Su4wSy@?HT3T3Gn46oMnVFfInwprH7#kZK
z85tQG8X6cF=<Dn2>FMd{=xA$eYieq0XlSUbtE;K0sj8}~sHi9@DJd!{Dkvz(%gf8j
z$;rsbNJ&YFi;IhiiHVAe3JD1b3JUV`^YiiX@$&LAjDkTH0*e2+{aizWogD*Qjr0td
z8UO!hQ2fclp$K%Q4#=sXY{J0tpMgC=;o-psR%V`@hL@j`4|18XFj#E3l+?t)YJQ-C
z(fRP1nGBpMDx8ZI8yIC04xE^I`4}I&w*QubM8*V%o+$|z_82NJ_YhJ}Zew6Dczk-Q
zVc?brFOyt6r>c8o#XWfV$aR`b^t_zTBqo>Mg{;%=%t&lKJ6G8-tS4Y&D-(}o>8c46
zKeL{k$Sx$oP{`DBVuDiTJRZhF$p;#k<u<(ep{U|9L8&B%LD0y7fk7mw!hlbS#bb`#
zWbK?E1<t3E6j#(o6w0V@%`nM3qVe+J;p2VEIVE2>f?B<%YDH}FNj#LoC2k!sFX3R(
z(x0N*p*tELG9Bj?)rr~=vT@TK?+*s4&lac!8ngM%HqAKXlDTL}#{?lMr;>&X3e6oN
zx_%i24GagH{`0sbI67bkT|2yd`ThGhu!#Bj^Cz&B`SRt<`}gmGWzCy6Z-B+kvuDqM
z1<j*JkAMZuojZ4cWzDr~*REW-a`ECtNI`S(;6Y#!vv=>_RjXF5T)A@Y+_|%6&6+V|
z#<XeECQh8#*VotE+Y2dKfW->1Kxu4jtgo-HtE;Q7t}ZVxFDfc3C@27yFL`-+!14uH
zxTL421IriuB}-&vB)o754GjgBFTugVK|w*lA_iE#`1<<#`1p8xdqYYYND+gze6hB+
z1{N^{%NJc;U0@NTrKJTdVu0lfq;OGIRz@ydWMyT6<%_hmw4|gYq=*p_5dju4!19HQ
zi;JC|orQ%3lxRo6pa}tB(ZN3@qfvpOjZHAG;inSwK{houzK{ouhnN`IjrSGIoW#^E
z$;@P>!dT3Bph+s>z=4OCmi09WCv1xNDWGt$XG-R)HI2$_JwoaUX$%Yji_b_HMcrBx
z80_LHr0vhZ!eQ9bCa7akqa}Fxi7P(?8-v8lMx~P?*2P;o3LYG2J1J2S*RWEUots-!
z&uvM;<tLu~MwRDOeoky|Vr1iA_J!k<a!0RrO4gSbjtdSj2!$5uunDEK%S!jQGZ_fF
z9#1=#SjQk~)a)_IBCG5J2NMeizoA9dhXp}PzfaTiXyI{edfGQp$$LZ0&P8*&rW@Fv
zz3^~SP}daA&=moVNvb{4w)q#<sAOuUpOrEzyf&jSDEVlgvR%TF4~DKje0*{yDGdyc
Mhgdj8fr-`{0B5u<8UO$Q

literal 0
HcmV?d00001

diff --git a/campaign/event_20220428_cn/a1.py b/campaign/event_20220428_cn/a1.py
index ba103fc62..f6a86e392 100644
--- a/campaign/event_20220428_cn/a1.py
+++ b/campaign/event_20220428_cn/a1.py
@@ -26,6 +26,13 @@ MAP.weight_data = """
     50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
+    {'battle': 0, 'enemy': 4, 'siren': 1},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 2},
+    {'battle': 3, 'enemy': 2, 'boss': 1},
+    {'battle': 4, 'enemy': 2},
+]
+MAP.spawn_data_loop = [
     {'battle': 0, 'enemy': 2, 'siren': 1},
     {'battle': 1, 'enemy': 1},
     {'battle': 2, 'enemy': 1},
@@ -54,6 +61,24 @@ class Config:
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (120, 255 - 49),
+        'width': (1.5, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 49, 255),
+        'prominence': 10,
+        'distance': 50,
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 49)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_SWIPE_MULTIPLY = 1.728
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.671
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20220428_cn/a2.py b/campaign/event_20220428_cn/a2.py
index e5f036556..7ef60aea7 100644
--- a/campaign/event_20220428_cn/a2.py
+++ b/campaign/event_20220428_cn/a2.py
@@ -58,6 +58,33 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = False
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (150, 255 - 33),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_ENEMY_GENRE_DETECTION_SCALING = {
+        'DD': 1.111,
+        'CL': 1.111,
+        'CA': 1.111,
+        'CV': 1.111,
+        'BB': 1.111,
+    }
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
+    MAP_SWIPE_MULTIPLY = 1.868
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.806
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20220428_cn/a3.py b/campaign/event_20220428_cn/a3.py
index b9a53c237..e6d8d1050 100644
--- a/campaign/event_20220428_cn/a3.py
+++ b/campaign/event_20220428_cn/a3.py
@@ -68,6 +68,32 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = False
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (150, 255 - 33),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_ENEMY_GENRE_DETECTION_SCALING = {
+        'DD': 1.111,
+        'CL': 1.111,
+        'CA': 1.111,
+        'CV': 1.111,
+        'BB': 1.111,
+    }
+    MAP_SWIPE_MULTIPLY = 1.504
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.454
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20220428_cn/c1.py b/campaign/event_20220428_cn/c1.py
index 20f3c4032..2ab235981 100644
--- a/campaign/event_20220428_cn/c1.py
+++ b/campaign/event_20220428_cn/c1.py
@@ -26,6 +26,13 @@ MAP.weight_data = """
     50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
+    {'battle': 0, 'enemy': 4, 'siren': 2},
+    {'battle': 1, 'enemy': 2},
+    {'battle': 2, 'enemy': 4},
+    {'battle': 3, 'enemy': 2},
+    {'battle': 4, 'enemy': 2, 'boss': 1},
+]
+MAP.spawn_data_loop = [
     {'battle': 0, 'enemy': 2, 'siren': 2},
     {'battle': 1, 'enemy': 1},
     {'battle': 2, 'enemy': 2},
@@ -54,6 +61,25 @@ class Config:
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = True
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (150, 255 - 33),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 33, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 33)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_SWIPE_MULTIPLY = 1.728
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.671
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20220428_cn/c2.py b/campaign/event_20220428_cn/c2.py
index 1c588bba9..ba7332445 100644
--- a/campaign/event_20220428_cn/c2.py
+++ b/campaign/event_20220428_cn/c2.py
@@ -58,6 +58,33 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = False
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (150, 255 - 24),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 24, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 24)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_ENEMY_GENRE_DETECTION_SCALING = {
+        'DD': 1.111,
+        'CL': 1.111,
+        'CA': 1.111,
+        'CV': 1.111,
+        'BB': 1.111,
+    }
+    MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom'
+    MAP_SWIPE_MULTIPLY = 1.868
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.806
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/campaign/event_20220428_cn/c3.py b/campaign/event_20220428_cn/c3.py
index 1aa01dc27..2acf741f0 100644
--- a/campaign/event_20220428_cn/c3.py
+++ b/campaign/event_20220428_cn/c3.py
@@ -69,6 +69,32 @@ class Config(ConfigBase):
     MAP_HAS_MYSTERY = False
     # ===== End of generated config =====
 
+    MAP_HAS_DECOY_ENEMY = False
+    INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (150, 255 - 24),
+        'width': (0.9, 10),
+        'prominence': 10,
+        'distance': 35,
+    }
+    EDGE_LINES_FIND_PEAKS_PARAMETERS = {
+        'height': (255 - 24, 255),
+        'prominence': 10,
+        'distance': 50,
+        # 'width': (0, 7),
+        'wlen': 1000
+    }
+    HOMO_EDGE_COLOR_RANGE = (0, 24)
+    HOMO_EDGE_HOUGHLINES_THRESHOLD = 300
+    MAP_ENEMY_GENRE_DETECTION_SCALING = {
+        'DD': 1.111,
+        'CL': 1.111,
+        'CA': 1.111,
+        'CV': 1.111,
+        'BB': 1.111,
+    }
+    MAP_SWIPE_MULTIPLY = 1.504
+    MAP_SWIPE_MULTIPLY_MINITOUCH = 1.454
+
 
 class Campaign(CampaignBase):
     MAP = MAP
diff --git a/module/base/utils.py b/module/base/utils.py
index 047c328af..cca38f36b 100644
--- a/module/base/utils.py
+++ b/module/base/utils.py
@@ -115,7 +115,7 @@ def random_rectangle_vector_opted(
         return tuple(end_point - vector), tuple(end_point)
 
     end_point = random_rectangle_point(box)
-    return tuple(end_point - vector), tuple(end_point)
+    return point_limit(end_point - vector, box), point_limit(end_point, box)
 
 
 def random_line_segments(p1, p2, n, random_range=(0, 0, 0, 0)):
diff --git a/module/combat/combat_manual.py b/module/combat/combat_manual.py
index cd7dc34c3..b3b7a683c 100644
--- a/module/combat/combat_manual.py
+++ b/module/combat/combat_manual.py
@@ -38,10 +38,10 @@ class CombatManual(ModuleBase):
         return True
 
     def handle_combat_weapon_release(self):
-        # if self.appear_then_click(READY_AIR_RAID, interval=5):
-        #     return True
-        # if self.appear_then_click(READY_TORPEDO, interval=5):
-        #     return True
+        if self.appear_then_click(READY_AIR_RAID, interval=10):
+            return True
+        if self.appear_then_click(READY_TORPEDO, interval=10):
+            return True
 
         return False
 
diff --git a/module/config/config_manual.py b/module/config/config_manual.py
index bf8c43386..119021e43 100644
--- a/module/config/config_manual.py
+++ b/module/config/config_manual.py
@@ -93,6 +93,7 @@ class ManualConfig:
     MAP_HAS_FORTRESS = False  # event_2021917_cn, clear fortress to remove roadblock to boss.
     MAP_HAS_MISSILE_ATTACK = False  # event_202111229_cn, missile attack covers the feature area of sirens.
     MAP_HAS_BOUNCING_ENEMY = False  # event_20220224_cn, enemy is bouncing in a fixed route.
+    MAP_HAS_DECOY_ENEMY = False  # event_20220428, decoy enemy on map, disappear when fleet reach there.
     MAP_FOCUS_ENEMY_AFTER_BATTLE = False  # Operation siren
     MAP_ENEMY_TEMPLATE = ['Light', 'Main', 'Carrier', 'Treasure']
     MAP_SIREN_TEMPLATE = ['DD', 'CL', 'CA', 'BB', 'CV']
diff --git a/module/map/fleet.py b/module/map/fleet.py
index 77b66a5a0..c207e959f 100644
--- a/module/map/fleet.py
+++ b/module/map/fleet.py
@@ -444,6 +444,9 @@ class Fleet(Camera, AmbushHandler):
             self.find_path_initial()
             raise MapEnemyMoved
         self.find_path_initial()
+        if self.config.MAP_HAS_DECOY_ENEMY:
+            if result == 'nothing' and expected == 'combat':
+                raise MapEnemyMoved
 
     def goto(self, location, optimize=None, expected=''):
         """
@@ -517,6 +520,8 @@ class Fleet(Camera, AmbushHandler):
         logger.info(f'Submarine: {location2node(self.fleet_submarine_location)}')
 
     def full_scan(self, queue=None, must_scan=None, mode='normal'):
+        if self.config.MAP_HAS_DECOY_ENEMY and mode == 'normal':
+            mode = 'decoy'
         super().full_scan(
             queue=queue, must_scan=must_scan, battle_count=self.battle_count, mystery_count=self.mystery_count,
             siren_count=self.siren_count, carrier_count=self.carrier_count, mode=mode)
diff --git a/module/map_detection/grid_info.py b/module/map_detection/grid_info.py
index c7a9378a8..efa8b90ae 100644
--- a/module/map_detection/grid_info.py
+++ b/module/map_detection/grid_info.py
@@ -224,7 +224,7 @@ class GridInfo:
             if self.is_fortress:
                 # Fortress can be a normal enemy
                 return True
-            elif not self.is_land and (self.may_enemy or self.is_carrier):
+            elif not self.is_land and (self.may_enemy or self.is_carrier or mode == 'decoy'):
                 self.is_enemy = True
                 if info.enemy_scale and not self.enemy_scale:
                     self.enemy_scale = info.enemy_scale
diff --git a/module/template/assets.py b/module/template/assets.py
index 63b65d042..3db49293d 100644
--- a/module/template/assets.py
+++ b/module/template/assets.py
@@ -95,6 +95,7 @@ TEMPLATE_SIREN_Kinu = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_
 TEMPLATE_SIREN_Kirishima = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Kirishima.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Kirishima.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Kirishima.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Kirishima.gif'})
 TEMPLATE_SIREN_Kongo = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Kongo.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Kongo.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Kongo.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Kongo.gif'})
 TEMPLATE_SIREN_LaGalissonniere = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LaGalissonniere.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LaGalissonniere.gif'})
+TEMPLATE_SIREN_Leipzig = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Leipzig.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Leipzig.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Leipzig.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Leipzig.gif'})
 TEMPLATE_SIREN_LeMalinIdol = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'en': './assets/en/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_LeMalinIdol.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_LeMalinIdol.gif'})
 TEMPLATE_SIREN_Lexington = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Lexington.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Lexington.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Lexington.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Lexington.gif'})
 TEMPLATE_SIREN_Littorio = Template(file={'cn': './assets/cn/template/TEMPLATE_SIREN_Littorio.gif', 'en': './assets/en/template/TEMPLATE_SIREN_Littorio.gif', 'jp': './assets/jp/template/TEMPLATE_SIREN_Littorio.gif', 'tw': './assets/tw/template/TEMPLATE_SIREN_Littorio.gif'})