Skip to content

[SW2] 武器攻撃の追加オプションについて、命中力判定あるいはダメージに影響がなければ、そのコマンドは出力しない #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViVi-shark wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

[SW2] 武器攻撃の追加オプションについて、命中力判定あるいはダメージに影響がなければ、そのコマンドは出力しない #342

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83ec62d
[SW2] ゆとチャadv.用の武器攻撃の威力解決コマンドに、武器名と用法を明記する
Feb 17, 2025
c6111a6
[SW2] ゆとチャadv.用の威力表コマンド行に、武器攻撃の追加オプションの名称を含める
Feb 17, 2025
898b30a
Fix: [SW2] 武器攻撃の威力表コマンドについて、備考欄に記述されている特性（刃武器／打撃武器）が反映されなくなっていたのを修正
Feb 17, 2025
d4767e1
Merge branch 'feature/sw2-add_weapon_name_and_usage_to_rating_command…
Feb 18, 2025
bce4346
Merge branch 'feature/sw2-add_weapon_palette_option_name_to_rating_co…
Feb 18, 2025
44f5947
[SW2] 武器攻撃の追加オプションについて、命中力判定あるいはダメージに影響がなければ、そのコマンドは出力しない
Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions _core/lib/sw2/palette-sub.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}@{[extractWeaponMarks($::pc{'weapon'.$_.'Note'})]}$::pc{'weapon'.$_.'Usage'}";
$text .= "（${partName}）" if $partName && $bot{BCD};
$text .= "\n";
}
Expand All @@ -511,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 .= $bot{BCD} ? ($dmgTexts{$paNum} =~ s/(\n)/$activeName$1/gr) : $dmgTexts{$paNum};
$text .= "\n";
}
}
Expand Down