From 83ec62d81e87ce6c412e1c91ba0e8ef7a49d33bc Mon Sep 17 00:00:00 2001 From: ViVi Date: Mon, 17 Feb 2025 11:45:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[SW2]=20=E3=82=86=E3=81=A8=E3=83=81?= =?UTF-8?q?=E3=83=A3adv.=E7=94=A8=E3=81=AE=E6=AD=A6=E5=99=A8=E6=94=BB?= =?UTF-8?q?=E6=92=83=E3=81=AE=E5=A8=81=E5=8A=9B=E8=A7=A3=E6=B1=BA=E3=82=B3?= =?UTF-8?q?=E3=83=9E=E3=83=B3=E3=83=89=E3=81=AB=E3=80=81=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E3=81=A8=E7=94=A8=E6=B3=95=E3=82=92=E6=98=8E=E8=A8=98?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _core/lib/sw2/palette-sub.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_core/lib/sw2/palette-sub.pl b/_core/lib/sw2/palette-sub.pl index 178a70a5a..5bf8b7fdb 100644 --- a/_core/lib/sw2/palette-sub.pl +++ b/_core/lib/sw2/palette-sub.pl @@ -498,8 +498,7 @@ sub palettePreset { $text .= $bot{YTC} ? '首切' : $bot{BCD} ? 'r5' : ''; } $text .= " ダメージ"; - $text .= extractWeaponMarks($::pc{'weapon'.$_.'Name'}.$::pc{'weapon'.$_.'Note'}) unless $bot{BCD}; - $text .= "／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}" if $bot{BCD}; + $text .= "／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}"; $text .= "（${partName}）" if $partName && $bot{BCD}; $text .= "\n"; } From c6111a684825caa5a977969d6af5b6601c00b142 Mon Sep 17 00:00:00 2001 From: ViVi Date: Mon, 17 Feb 2025 21:26:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[SW2]=20=E3=82=86=E3=81=A8=E3=83=81?= =?UTF-8?q?=E3=83=A3adv.=E7=94=A8=E3=81=AE=E5=A8=81=E5=8A=9B=E8=A1=A8?= =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E8=A1=8C=E3=81=AB=E3=80=81?= =?UTF-8?q?=E6=AD=A6=E5=99=A8=E6=94=BB=E6=92=83=E3=81=AE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _core/lib/sw2/palette-sub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_core/lib/sw2/palette-sub.pl b/_core/lib/sw2/palette-sub.pl index 178a70a5a..9562005ec 100644 --- a/_core/lib/sw2/palette-sub.pl +++ b/_core/lib/sw2/palette-sub.pl @@ -530,7 +530,7 @@ sub palettePreset { if($dmgTexts{$paNum} eq $dmgTexts{$paNum - 1}){ $activeName = $::pc{'paletteAttack'.($paNum - 1).'Name'} ? "＋$::pc{'paletteAttack'.($paNum - 1).'Name'}" : ''; } - $text .= $bot{BCD} ? ($dmgTexts{$paNum} =~ s/(\n)/$activeName$1/gr) : $dmgTexts{$paNum}; + $text .= ($dmgTexts{$paNum} =~ s/(\n)/$activeName$1/gr); $text .= "\n"; } } From 898b30a5ad01bdf12a8eba5ef5ce2e76641ce2a9 Mon Sep 17 00:00:00 2001 From: ViVi Date: Tue, 18 Feb 2025 00:25:20 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Fix:=20[SW2]=20=E6=AD=A6=E5=99=A8=E6=94=BB?= =?UTF-8?q?=E6=92=83=E3=81=AE=E5=A8=81=E5=8A=9B=E8=A1=A8=E3=82=B3=E3=83=9E?= =?UTF-8?q?=E3=83=B3=E3=83=89=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=80=81?= =?UTF-8?q?=E5=82=99=E8=80=83=E6=AC=84=E3=81=AB=E8=A8=98=E8=BF=B0=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E7=89=B9=E6=80=A7=EF=BC=88?= =?UTF-8?q?=E5=88=83=E6=AD=A6=E5=99=A8=EF=BC=8F=E6=89=93=E6=92=83=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=EF=BC=89=E3=81=8C=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _core/lib/sw2/palette-sub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_core/lib/sw2/palette-sub.pl b/_core/lib/sw2/palette-sub.pl index 5bf8b7fdb..6eeab9f83 100644 --- a/_core/lib/sw2/palette-sub.pl +++ b/_core/lib/sw2/palette-sub.pl @@ -498,7 +498,7 @@ sub palettePreset { $text .= $bot{YTC} ? '首切' : $bot{BCD} ? 'r5' : ''; } $text .= " ダメージ"; - $text .= "／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}"; + $text .= "／$::pc{'weapon'.$_.'Name'}@{[extractWeaponMarks($::pc{'weapon'.$_.'Note'})]}$::pc{'weapon'.$_.'Usage'}"; $text .= "（${partName}）" if $partName && $bot{BCD}; $text .= "\n"; } From 44f5947bcb5d09aeafeab6f56e9303b0ae972adb Mon Sep 17 00:00:00 2001 From: ViVi Date: Mon, 17 Feb 2025 21:47:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[SW2]=20=E6=AD=A6=E5=99=A8=E6=94=BB?= =?UTF-8?q?=E6=92=83=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E3=80=81?= =?UTF-8?q?=E5=91=BD=E4=B8=AD=E5=8A=9B=E5=88=A4=E5=AE=9A=E3=81=82=E3=82=8B?= =?UTF-8?q?=E3=81=84=E3=81=AF=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=AB?= =?UTF-8?q?=E5=BD=B1=E9=9F=BF=E3=81=8C=E3=81=AA=E3=81=91=E3=82=8C=E3=81=B0?= =?UTF-8?q?=E3=80=81=E3=81=9D=E3=81=AE=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?= =?UTF-8?q?=E3=81=AF=E5=87=BA=E5=8A=9B=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _core/lib/sw2/palette-sub.pl | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/_core/lib/sw2/palette-sub.pl b/_core/lib/sw2/palette-sub.pl index 3a5273517..9896669ba 100644 --- a/_core/lib/sw2/palette-sub.pl +++ b/_core/lib/sw2/palette-sub.pl @@ -510,26 +510,30 @@ sub palettePreset { my $activeName = $::pc{'paletteAttack'.$paNum.'Name'} ? "＋$::pc{'paletteAttack'.$paNum.'Name'}" : ''; - $text .= "2d+"; - $text .= $::pc{paletteUseVar} ? "{命中$_}" : $::pc{"weapon${_}AccTotal"}; - $text .= "+{命中修正}"; - if($::pc{'paletteAttack'.$paNum.'Acc'}){ - $text .= optimizeOperatorFirst "+$::pc{'paletteAttack'.$paNum.'Acc'}"; - } - $text .= " 命中力／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}"; - $text .= "（${partName}）" if $partName; - if($::pc{'paletteAttack'.$paNum.'Name'}){ - $text .= "＋$::pc{'paletteAttack'.$paNum.'Name'}"; + if ($paNum == 0 || $::pc{'paletteAttack'.$paNum.'Acc'}) { + $text .= "2d+"; + $text .= $::pc{paletteUseVar} ? "{命中$_}" : $::pc{"weapon${_}AccTotal"}; + $text .= "+{命中修正}"; + if($::pc{'paletteAttack'.$paNum.'Acc'}){ + $text .= optimizeOperatorFirst "+$::pc{'paletteAttack'.$paNum.'Acc'}"; + } + $text .= " 命中力／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}"; + $text .= "（${partName}）" if $partName; + if($::pc{'paletteAttack'.$paNum.'Name'}){ + $text .= "＋$::pc{'paletteAttack'.$paNum.'Name'}"; + } + $text .= "\n"; } - $text .= "\n"; if($dmgTexts{$paNum + 1} && $dmgTexts{$paNum} eq $dmgTexts{$paNum + 1}){ next; } - if($dmgTexts{$paNum} eq $dmgTexts{$paNum - 1}){ - $activeName = $::pc{'paletteAttack'.($paNum - 1).'Name'} ? "＋$::pc{'paletteAttack'.($paNum - 1).'Name'}" : ''; + elsif ($paNum == 0 || $::pc{'paletteAttack'.$paNum.'Crit'} || $::pc{'paletteAttack'.$paNum.'Dmg'} || $::pc{'paletteAttack'.$paNum.'Roll'}) { + if($dmgTexts{$paNum} eq $dmgTexts{$paNum - 1}){ + $activeName = $::pc{'paletteAttack'.($paNum - 1).'Name'} ? "＋$::pc{'paletteAttack'.($paNum - 1).'Name'}" : ''; + } + $text .= ($dmgTexts{$paNum} =~ s/(\n)/$activeName$1/gr); } - $text .= ($dmgTexts{$paNum} =~ s/(\n)/$activeName$1/gr); $text .= "\n"; } }