diff --git a/_core/lib/ar2e/convert.pl b/_core/lib/ar2e/convert.pl
index 13cc04605..5941022a0 100644
--- a/_core/lib/ar2e/convert.pl
+++ b/_core/lib/ar2e/convert.pl
@@ -3,24 +3,11 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
 require $set::data_class;
 require $set::data_races;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/ar2e/view-chara.pl b/_core/lib/ar2e/view-chara.pl
index f92d2120b..a48c839c3 100644
--- a/_core/lib/ar2e/view-chara.pl
+++ b/_core/lib/ar2e/view-chara.pl
@@ -571,10 +571,11 @@ ()
 }
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -589,7 +590,10 @@ ()
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -614,6 +618,9 @@ ()
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/blp/convert.pl b/_core/lib/blp/convert.pl
index fab2e05d0..63aed42a0 100644
--- a/_core/lib/blp/convert.pl
+++ b/_core/lib/blp/convert.pl
@@ -3,21 +3,8 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/blp/view-chara.pl b/_core/lib/blp/view-chara.pl
index 1845e1cfa..858814b61 100644
--- a/_core/lib/blp/view-chara.pl
+++ b/_core/lib/blp/view-chara.pl
@@ -373,10 +373,11 @@ sub textCost {
 $SHEET->param(History => \@history);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -388,7 +389,10 @@ sub textCost {
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -413,6 +417,9 @@ sub textCost {
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/dx3/convert.pl b/_core/lib/dx3/convert.pl
index a00bd7759..1f4ac3b96 100644
--- a/_core/lib/dx3/convert.pl
+++ b/_core/lib/dx3/convert.pl
@@ -3,21 +3,8 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/dx3/data-syndrome.pl b/_core/lib/dx3/data-syndrome.pl
index 51b0fb5a1..04ff95daa 100644
--- a/_core/lib/dx3/data-syndrome.pl
+++ b/_core/lib/dx3/data-syndrome.pl
@@ -78,6 +78,7 @@ package data;
   ['自傷',16],
   ['恐怖',17],
   ['憎悪',18],
+  ['改変',30],
 );
 
 1;
\ No newline at end of file
diff --git a/_core/lib/dx3/view-chara.pl b/_core/lib/dx3/view-chara.pl
index 774c692f0..519ea68a4 100644
--- a/_core/lib/dx3/view-chara.pl
+++ b/_core/lib/dx3/view-chara.pl
@@ -606,10 +606,11 @@ sub textType {
 $SHEET->param(History => \@history);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -621,7 +622,10 @@ sub textType {
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### 種族名 --------------------------------------------------
@@ -650,6 +654,9 @@ sub textType {
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/edit.js b/_core/lib/edit.js
index 1aeb0c7fb..da9c5c253 100644
--- a/_core/lib/edit.js
+++ b/_core/lib/edit.js
@@ -291,6 +291,7 @@ function setDefaultStatus(statusArray){
     tbody.innerHTML = '';
     for(let item of statusArray){
       for (const key in item) {
+        if(key === 'メモ'){ continue }
         const row = document.createElement('tr');
         row.innerHTML = `
           <td>
diff --git a/_core/lib/edit.pl b/_core/lib/edit.pl
index e3fe703d1..bcd36a72f 100644
--- a/_core/lib/edit.pl
+++ b/_core/lib/edit.pl
@@ -40,6 +40,10 @@
     %conv_data =  %{ decode_json($data) };
     $type = $conv_data{type};
   }
+  elsif($::in{json}){
+    %conv_data =  %{ decode_json($::in{json}) };
+    $type = $conv_data{type};
+  }
   elsif($::in{backupJSON}){
     %conv_data =  %{ decode_json($::in{backupJSON} ) };
     $type = $conv_data{type};
@@ -698,6 +702,7 @@ sub textRuleArea {
         　　　　　　<code>:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|説明文2行目</code> 項目名を記入しないか、半角スペースで埋めると上と結合します。<br>
         折り畳み：行頭に<code>[>]項目名</code>：以降のテキストがすべて折り畳みになります。<br>
         　　　　　項目名を省略すると、自動的に「詳細」になります。<br>
+        　　　　　<code>&gt;</code>の代わりに<code>↓</code><code>V</code><code>v</code><code>Ｖ</code><code>ｖ</code>のいずれかの文字をもちいると、デフォルトで展開状態となります（例： <code>[v]項目名</code>）。<br>
         折り畳み終了：行頭に<code>[---]</code>：（ハイフンは3つ以上任意）<br>
         　　　　　　　省略すると、以後のテキストが全て折りたたまれます。<br>
         コメントアウト：行頭に<code>//</code>：記述した行を非表示にします。
diff --git a/_core/lib/gc/convert.pl b/_core/lib/gc/convert.pl
index d4f4cec77..3c1d64ef6 100644
--- a/_core/lib/gc/convert.pl
+++ b/_core/lib/gc/convert.pl
@@ -3,23 +3,10 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
 require $set::data_class;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/gc/view-chara.pl b/_core/lib/gc/view-chara.pl
index acd4a9ae2..43779f012 100644
--- a/_core/lib/gc/view-chara.pl
+++ b/_core/lib/gc/view-chara.pl
@@ -645,10 +645,11 @@ sub stylizeDuration {
 $SHEET->param(historyMoneyTotal => commify $pc{historyMoneyTotal} );
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -663,7 +664,10 @@ sub stylizeDuration {
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -688,6 +692,9 @@ sub stylizeDuration {
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/gc/view-country.pl b/_core/lib/gc/view-country.pl
index 93c418c5b..1af074f7b 100644
--- a/_core/lib/gc/view-country.pl
+++ b/_core/lib/gc/view-country.pl
@@ -256,10 +256,11 @@
 $SHEET->param(historyCountsTotal   => commify $pc{countsTotal}   );
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -274,7 +275,10 @@
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{countryName}));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby $pc{countryName}) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -297,6 +301,9 @@
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/gs/convert.pl b/_core/lib/gs/convert.pl
index 04552ba22..b664733f1 100644
--- a/_core/lib/gs/convert.pl
+++ b/_core/lib/gs/convert.pl
@@ -3,23 +3,10 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
 require $set::data_class;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/gs/view-chara.pl b/_core/lib/gs/view-chara.pl
index 18a2be24c..677414fcf 100644
--- a/_core/lib/gs/view-chara.pl
+++ b/_core/lib/gs/view-chara.pl
@@ -617,10 +617,11 @@ ()
 }
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -632,7 +633,10 @@ ()
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -657,6 +661,9 @@ ()
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/junction.pl b/_core/lib/junction.pl
index d040e9978..38805c3b8 100644
--- a/_core/lib/junction.pl
+++ b/_core/lib/junction.pl
@@ -4,13 +4,21 @@
 use utf8;
 use Encode;
 
-our $ver = "1.26.100";
+our $ver = "1.27.007";
 
 our %in;
 for (param()){ $in{$_} = param($_); }
 
 my $mode = $in{mode};
 
+#if ( $mode eq 'register'
+#  || $mode eq 'option'
+#  || $mode eq 'passchange'
+#  || $mode eq 'reset'
+#){
+#  error('ユーザーID関連機能メンテナンス中：2025// :～');
+#}
+
 if($mode eq 'register'){
   if($in{id})    { require $set::lib_register; }    #登録処理
   else           { require $set::lib_form; }        #新規登録フォーム
diff --git a/_core/lib/kiz/convert.pl b/_core/lib/kiz/convert.pl
index 8a0ae669e..c3abc3cc9 100644
--- a/_core/lib/kiz/convert.pl
+++ b/_core/lib/kiz/convert.pl
@@ -3,21 +3,8 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/kiz/view-chara.pl b/_core/lib/kiz/view-chara.pl
index bda1ced6d..bb0cfcae0 100644
--- a/_core/lib/kiz/view-chara.pl
+++ b/_core/lib/kiz/view-chara.pl
@@ -380,10 +380,11 @@ sub textTarget {
 $SHEET->param(History => \@history);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -395,7 +396,10 @@ sub textTarget {
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -420,6 +424,9 @@ sub textTarget {
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/ms/config-default.pl b/_core/lib/ms/config-default.pl
index fb6461be6..8b7f87652 100644
--- a/_core/lib/ms/config-default.pl
+++ b/_core/lib/ms/config-default.pl
@@ -128,6 +128,8 @@ package set;
   our $lib_palette_sub = $::core_dir . '/lib/ms/palette-sub.pl';
   # 一覧
   our $lib_list_char   = $::core_dir . '/lib/ms/list-chara.pl';
+  # JS固定値
+  our $lib_js_consts = $::core_dir . '/lib/ms/js-consts.pl';
   # JSON出力
   our $lib_json     = $::core_dir . '/lib/json.pl';
   our $lib_json_sub = $::core_dir . '/lib/ms/json-sub.pl';
@@ -135,6 +137,7 @@ package set;
   our $lib_convert = $::core_dir . '/lib/ms/convert.pl';
 
   # 各種データ
+  our $data_magi = $::core_dir . '/lib/ms/data-magi.pl';
 
   # HTMLテンプレート
   our $skin_tmpl  = $::core_dir . '/skin/ms/index.html';      # 一覧／登録フォーム等の大枠
diff --git a/_core/lib/ms/convert.pl b/_core/lib/ms/convert.pl
index 8a0ae669e..c3abc3cc9 100644
--- a/_core/lib/ms/convert.pl
+++ b/_core/lib/ms/convert.pl
@@ -3,21 +3,8 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/ms/data-magi.pl b/_core/lib/ms/data-magi.pl
new file mode 100644
index 000000000..77f870de4
--- /dev/null
+++ b/_core/lib/ms/data-magi.pl
@@ -0,0 +1,266 @@
+#################### データ ####################
+use strict;
+use utf8;
+
+package data;
+
+### PC用マギ --------------------------------------------------
+my @pcMagi = (
+  {
+    name   => '一騎当千',
+    timing => 'メイン',
+    target => '単体',
+    cond   => '3～10',
+    note   => '［モブ］のみ対象にできる。対象に［1D＋5］点のダメージを与える。ダメージの適用後、［マリョク］を1上げる。',
+  },
+  {
+    name   => '英雄',
+    timing => 'メイン',
+    target => '単体',
+    cond   => '9～12',
+    note   => '対象に［お前の【社会】×2］点のダメージを与える。シナリオに3回使える。',
+  },
+  {
+    name   => '回生の妙薬',
+    timing => '開始／終了',
+    target => '単体',
+    cond   => '1～5',
+    note   => '［ノックアウト］しているキャラクターのみ対象にできる。対象の［ノックアウト］を回復し、【耐久値】を最大値にする。セッションに1回使える。',
+  },
+  {
+    name   => '全力全壊',
+    timing => 'メイン',
+    target => '単体',
+    cond   => '3・6・9・12',
+    note   => '対象に［2D］点のダメージを与える。ダメージの適用後、［マリョク］を2上げる。',
+  },
+  {
+    name   => '狙撃',
+    timing => 'メイン',
+    target => '単体',
+    cond   => '1・3・5・7・9・11',
+    note   => '対象に［3＋マリョク］点のダメージを与える。',
+  },
+  {
+    name   => 'ブレス',
+    timing => 'メイン',
+    target => '1～2体',
+    cond   => '1～6',
+    note   => '対象に5回のダメージを与える。ダメージの適用後、［マリョク］を1上げる。',
+  },
+  {
+    name   => '怪力無双',
+    timing => 'サブ',
+    target => '自身',
+    cond   => '1～6',
+    note   => '［手番］が終わるまで《マギ》で与えるダメージを［お前の【身体】］点増やす。',
+  },
+  {
+    name   => '死に損ない',
+    timing => 'サブ',
+    target => '自身',
+    cond   => '2・5・7・10',
+    note   => 'お前の【耐久値】を［マリョク＋5］点回復する。効果の適用後、［マリョク］を1上げる。',
+  },
+  {
+    name   => '以心伝心',
+    timing => 'ダメージ増加',
+    target => '単体',
+    cond   => '2・4・6・8・10・12',
+    note   => '対象が与えるダメージを5回増やす。ラウンドに1回使える。',
+  },
+  {
+    name   => '祝福の風',
+    timing => 'ダメージ増加',
+    target => '単体',
+    cond   => '1・3・5・7・9・11',
+    note   => '対象が与えるダメージを［お前の【異質】］点増やす。効果の適用後、［マリョク］を1下げる。ラウンドに1回使える。',
+  },
+  {
+    name   => '心血の刃',
+    timing => 'ダメージ増加',
+    target => '単体',
+    cond   => '2～7',
+    note   => 'お前の【耐久値】を任意の点数減らす（最大でお前の【身体】点まで）。対象が与えるダメージを［減らした【耐久値】］点増やす。ラウンドに2回使える。',
+  },
+  {
+    name   => '守護者',
+    timing => '効果参照',
+    target => '単体',
+    cond   => '2・4・6・8・10・12',
+    note   => 'ダメージ適用の直前に使用する。対象に与えられるダメージを、代わりにお前が受ける。その際、お前が受けるダメージを3回減らす。自身不可。',
+  },
+  {
+    name   => '結界',
+    timing => 'ダメージ減少',
+    target => '単体',
+    cond   => '1～6',
+    note   => '対象に与えられるダメージを［お前の【異質】］点減らす。効果の適用後、［マリョク］を1下げる。ラウンドに1回使える。',
+  },
+  {
+    name   => '破壊の指',
+    timing => '開始',
+    target => '効果参照',
+    cond   => '7～12',
+    note   => 'お前はエリアの［特性］を1つ選択する。選んだ［特性］を即座にエリアから取り除く。また、ラウンド終了までお前が《マギ》で与えるダメージを5点増やす。エリアに［特性］がない場合は使用できない。',
+  },
+  {
+    name   => 'いたずら',
+    timing => '効果参照',
+    target => '効果参照',
+    cond   => 'なし',
+    note   => '［行動フェイズ］なら任意のタイミング、［ロケアクション］なら［ラウンドの終了］で使用する。［マリョク］をリセット（P150）する。セッションに3回使える。',
+  },
+  {
+    name   => '浄化の音',
+    timing => '効果参照',
+    target => '効果参照',
+    cond   => 'なし',
+    note   => '［行動フェイズ］なら任意のタイミング、［ロケアクション］なら［【イニシアチブ】の確認］で使用する。［マリョク］の出目を［4］か［7］に変更する。セッションに3回まで使用可能。',
+  },
+  {
+    name   => 'トリックスター',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => '6～12',
+    note   => '［【イニシアチブ】の決定］のダイスロールの直後に使用する。対象とお前の【イニシアチブ】を入れ替える。',
+  },
+  {
+    name   => '福招き',
+    timing => '効果参照',
+    target => '単体',
+    cond   => '3～9',
+    note   => '対象がダイスロールした直後に使用する。そのダイスロールをもう1度やり直す。シナリオに2回使える。',
+  },
+  {
+    name   => 'まきもどし',
+    timing => '効果参照',
+    target => '自身',
+    cond   => '１～７',
+    note   => 'お前がダイスロールした直後に使用する。そのダイスロールをもう1度やり直す。セッションに3回使える。',
+  },
+  {
+    name   => '駿足',
+    timing => '常時',
+    target => '自身',
+    cond   => 'なし',
+    note   => 'お前の【イニシアチブ】は［1D＋2］で決定する。',
+  },
+  {
+    name   => '頑鉄',
+    timing => '常時',
+    target => '自身',
+    cond   => 'なし',
+    note   => 'お前の【耐久値】に＋3し、受けるダメージを常に2回減少する。お前の【イニシアチブ】は［1D－2］で決定する（最低1）。',
+  },
+);
+
+our %pcMagiData;
+our @pcMagiNames;
+foreach my $data (@pcMagi){
+  my $name = $data->{name};
+  delete $data->{name};
+  $pcMagiData{$name} = $data;
+  push(@pcMagiNames, $name);
+}
+
+### クラン用マギ --------------------------------------------------
+my @clanMagi = (
+  {
+    name   => 'スクランブル！',
+    timing => '終了',
+    target => '単体',
+    cond   => '8～12',
+    note   => '［マリョク］を7下げる。クラン全員がそれぞれ1Dをロールする（この効果には［ノックアウト］でも例外的に参加できる）。ロールしたダイスの［出目］を合計したダメージを対象に与える。このダメージには［ダメージ増加］の《マギ》を使用できない。セッションに1回使える。',
+  },
+  {
+    name   => '諦め悪いんで',
+    timing => '終了',
+    target => 'クラン全員',
+    cond   => '1～6',
+    note   => 'クラン全員の【耐久値】を［1D＋マリョク］点回復する。セッションに1回使える。',
+  },
+  {
+    name   => '悪名高き',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => 'なし',
+    note   => '【社会】が指定された［判定］の直前に使う。代わりに【身体】か【異質】でロールできる。あるいは「判定に【社会】を使用できない」というアクシデント表の効果を無視する。セッションに3回使える。',
+  },
+  {
+    name   => 'エース',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => 'なし',
+    note   => '「【イニシアチブ】の確認」（P188）で使用する。対象は【イニシアチブ】に関係なく次に［手番］を得る。すでに［手番］を行ったキャラクターは対象にできない。セッションに1回使える。',
+  },
+  {
+    name   => '同志たち',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => 'なし',
+    note   => '対象が［ノックアウト］になった直後に使用する。対象の［ノックアウト］を回復し、【耐久値】を１５点にする。セッションに2回使える',
+  },
+  {
+    name   => '特別部署',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => 'なし',
+    note   => '【身体】が指定された［判定］の直前に使う。代わりに【異質】か【社会】でロールできる。あるいは「判定に【身体】を使用できない」というアクシデント表の効果を無視する。セッションに3回使える。',
+  },
+  {
+    name   => '人気グループ',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => '3～10',
+    note   => '［住民］［店員］［警備員］などの［特性］があるエリアのみ使える。ダイスロールした直後に使用する。ロールしたダイス1個の出目を2下げる。［ロケアクション］中は効果を発揮しない。セッションに3回使える。',
+  },
+  {
+    name   => 'プランB',
+    timing => '効果参照',
+    target => '単体（クラン）',
+    cond   => '1・3・5・7・9・11',
+    note   => '対象がダイスロールした直後に使う。そのダイスロールをもう1度やり直す。セッションに3回使える。',
+  },
+  {
+    name   => 'アレ出しとこうか',
+    timing => '開始',
+    target => 'クラン全員',
+    cond   => 'なし',
+    note   => '［ロケアクション］が終わるまで、クラン全員が攻撃で与えるダメージを3回増やす。セッションに1回使える。',
+  },
+  {
+    name   => 'クラン体操第一',
+    timing => '開始',
+    target => 'クラン全員',
+    cond   => 'なし',
+    note   => '［ロケアクション］が終わるまで、クラン全員が受けるダメージを3回減らす。セッションに1回使える。',
+  },
+  {
+    name   => '戦闘集団',
+    timing => '常時',
+    target => 'クラン全員',
+    cond   => 'なし',
+    note   => '対象が攻撃で与えるダメージを常に2回増やす。',
+  },
+  {
+    name   => 'スポーツチーム',
+    timing => '常時',
+    target => 'クラン全員',
+    cond   => 'なし',
+    note   => '対象の【イニシアチブ】は［1D＋1］で決定する。ほかの《マギ》で【イニシアチブ】の決め方が変わっているPCは、この《マギ》の効果を受けない。',
+  },
+);
+
+our %clanMagiData;
+our @clanMagiNames;
+foreach my $data (@clanMagi){
+  my $name = $data->{name};
+  delete $data->{name};
+  $clanMagiData{$name} = $data;
+  push(@clanMagiNames, $name);
+}
+
+
+
+1;
\ No newline at end of file
diff --git a/_core/lib/ms/edit-chara.js b/_core/lib/ms/edit-chara.js
index 620cb933c..b44f47e09 100644
--- a/_core/lib/ms/edit-chara.js
+++ b/_core/lib/ms/edit-chara.js
@@ -99,9 +99,18 @@ function delAttribute(){
 function checkMagi() {
   let count = 0;
   for (let num = 1; num <= 4; num++){
-    if(form['magi'+num+'Name'].value){ count++ }
+    const magi = form[`magi${num}`].value;
+    if(magi){
+      count++;
+    }
+    const hasData = SET.pcMagiData.hasOwnProperty(magi) || null;
+    for (let type of ['timing','target','cond','note']){
+      document.querySelector(`#magi${num} .text-${type}`).textContent = hasData ? SET.pcMagiData[magi][type] : '';
+      form[`magi${num}${ucfirst(type)}`].classList.toggle('hidden', hasData);
+    }
+    document.querySelector(`#magi${num} .changed-name`).classList.toggle('hidden', !form[`magi${num}NC`].checked);
   }
-  document.getElementById('magi').querySelector('.annotate').textContent
+  document.getElementById('magi').querySelector('.annotate.caution').textContent
     = (count < 1) ? 'マギを1つ記入してください' : '';
 }
 
diff --git a/_core/lib/ms/edit-chara.pl b/_core/lib/ms/edit-chara.pl
index 73899c537..0cd1b9f00 100644
--- a/_core/lib/ms/edit-chara.pl
+++ b/_core/lib/ms/edit-chara.pl
@@ -8,6 +8,7 @@
 my $LOGIN_ID = $::LOGIN_ID;
 
 ### 読込前処理 #######################################################################################
+require $set::data_magi;
 require $set::lib_palette_sub;
 
 ### データ読み込み ###################################################################################
@@ -94,6 +95,7 @@
   <link rel="stylesheet" media="all" href="${main::core_dir}/skin/ms/css/edit.css?${main::ver}">
   <script src="${main::core_dir}/skin/_common/js/lib/Sortable.min.js"></script>
   <script src="${main::core_dir}/skin/_common/js/lib/compressor.min.js"></script>
+  <script src="./?mode=js-consts&ver=${main::ver}"></script>
   <script src="${main::core_dir}/lib/edit.js?${main::ver}" defer></script>
   <script src="${main::core_dir}/lib/ms/edit-chara.js?${main::ver}" defer></script>
   <style>
@@ -210,6 +212,10 @@
         </dl>
       </div>
 
+      <div class="box" style="margin:auto;width:max-content;background-image:none">
+        <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=80" target="_blank">⇒キャラクター作成の手順（サポートハブ）</a></div>
+      </div>
+
       <div class="box in-toc" id="name-form" data-content-title="東京名・プレイヤー名">
         <div>
           <dl id="character-name">
@@ -298,6 +304,7 @@
               <div class="annotate caution"></div>
             </dd>
           </dl>
+          <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=142" target="_blank">⇒特性の例（サポートハブ）</a></div>
         </div>
 
       </div>
@@ -307,6 +314,7 @@
           <table class="edit-table line-tbody no-border-cells" id="magi-table">
             <colgroup id="magi-col">
               <col class="name  ">
+              <col class="check ">
               <col class="timing">
               <col class="target">
               <col class="cond  ">
@@ -314,7 +322,8 @@
             </colgroup>
             <thead id="magi-thead">
               <tr>
-                <th class="name  ">名称
+                <th class="name  ">名前
+                <th class="check small nowrap">名前<br>変更
                 <th class="timing">タイミング
                 <th class="target">対象
                 <th class="cond  ">条件
@@ -324,16 +333,20 @@
   print <<"HTML";
             <tbody id="magi${num}">
               <tr>
-                <td class="name  ">《@{[ input "magi${num}Name",'','checkMagi' ]}》
-                <td class="timing">@{[ input "magi${num}Timing" ,'','','list="list-timing"' ]}
-                <td class="target">@{[ input "magi${num}Target" ,'','','list="list-target"' ]}
-                <td class="cond  ">@{[ input "magi${num}Cond",'','','list="list-cond"' ]}
-                <td class="left">@{[ input "magi${num}Note" ]}
+                <td class="name  ">
+                  《@{[ selectBox "magi${num}",'checkMagi',@data::pcMagiNames,'その他' ]}》
+                  <div class="changed-name hidden">《@{[ input "magi${num}Name",'','','placeholder="任意の名前"' ]}》</div>
+                <td class="check ">@{[ checkbox "magi${num}NC",'','checkMagi' ]}
+                <td class="timing">@{[ input "magi${num}Timing" ,'','','list="list-timing"' ]}<div class="text-timing"></div>
+                <td class="target">@{[ input "magi${num}Target" ,'','','list="list-target"' ]}<div class="text-target"></div>
+                <td class="cond  ">@{[ input "magi${num}Cond"   ,'','','list="list-cond"'   ]}<div class="text-cond"></div>
+                <td class="left">@{[ input "magi${num}Note" ]}<div class="text-note"></div>
 HTML
 }
 print <<"HTML";
         </table>
         <div class="annotate caution"></div>
+        <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=149#index_id1" target="_blank">⇒PC用マギの一覧（サポートハブ）</a></div>
       </div>
       
       <details class="box" id="free-note" @{[$pc{freeNote}?'open':'']}>
@@ -523,11 +536,6 @@
   <datalist id="list-cond">
     <option value="なし">
   </datalist>
-  <script>
-HTML
-print <<"HTML";
-@{[ &commonJSVariable ]}
-  </script>
 </body>
 
 </html>
diff --git a/_core/lib/ms/edit-clan.js b/_core/lib/ms/edit-clan.js
index f975c0c2b..34f3fa990 100644
--- a/_core/lib/ms/edit-clan.js
+++ b/_core/lib/ms/edit-clan.js
@@ -80,10 +80,19 @@ function checkAttribute() {
 // マギ欄 ----------------------------------------
 function checkMagi() {
   let count = 0;
-  for (let num = 1; num <= 4; num++){
-    if(form['magi'+num+'Name'].value){ count++ }
+  for (let num = 1; num <= 5; num++){
+    const magi = form[`magi${num}`].value;
+    if(magi){
+      count++;
+    }
+    const hasData = SET.clanMagiData.hasOwnProperty(magi) || null;
+    for (let type of ['timing','target','cond','note']){
+      document.querySelector(`#magi${num} .text-${type}`).textContent = hasData ? SET.clanMagiData[magi][type] : '';
+      form[`magi${num}${ucfirst(type)}`].classList.toggle('hidden', hasData);
+    }
+    document.querySelector(`#magi${num} .changed-name`).classList.toggle('hidden', !form[`magi${num}NC`].checked);
   }
-  document.getElementById('magi').querySelector('.annotate').textContent
+  document.getElementById('magi').querySelector('.annotate.caution').textContent
     = (count < 2) ? 'マギを《スクランブル！》と合わせて2つ取得してください' : '';
 }
 
diff --git a/_core/lib/ms/edit-clan.pl b/_core/lib/ms/edit-clan.pl
index d4b6fbef2..419e7157c 100644
--- a/_core/lib/ms/edit-clan.pl
+++ b/_core/lib/ms/edit-clan.pl
@@ -8,6 +8,7 @@
 my $LOGIN_ID = $::LOGIN_ID;
 
 ### 読込前処理 #######################################################################################
+require $set::data_magi;
 require $set::lib_palette_sub;
 
 ### データ読み込み ###################################################################################
@@ -46,11 +47,7 @@
   $pc{level} = 0;
   $pc{endurance} = 20;
 
-  $pc{magi1Name}   = 'スクランブル！';
-  $pc{magi1Timing} = '終了';
-  $pc{magi1Target} = '単体';
-  $pc{magi1Cond}   = '8～12';
-  $pc{magi1Note}   = 'クラン全員で1Dをロールし、合計点のダメージを与える。(P139)';
+  $pc{magi1}   = 'スクランブル！';
 
   %pc = applyCustomizedInitialValues(\%pc, 'c');
 }
@@ -102,6 +99,7 @@
   <link rel="stylesheet" media="all" href="${main::core_dir}/skin/ms/css/edit.css?${main::ver}">
   <script src="${main::core_dir}/skin/_common/js/lib/Sortable.min.js"></script>
   <script src="${main::core_dir}/skin/_common/js/lib/compressor.min.js"></script>
+  <script src="./?mode=js-consts&ver=${main::ver}"></script>
   <script src="${main::core_dir}/lib/edit.js?${main::ver}" defer></script>
   <script src="${main::core_dir}/lib/ms/edit-clan.js?${main::ver}" defer></script>
   <style>
@@ -224,6 +222,10 @@
         </dl>
       </div>
 
+      <div class="box" style="margin:auto;width:max-content;background-image:none">
+        <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=88" target="_blank">⇒キャラクター作成の手順（サポートハブ）</a></div>
+      </div>
+
       <div class="box in-toc" id="name-form" data-content-title="クラン名・管理プレイヤー名">
         <div>
           <dl id="character-name">
@@ -329,6 +331,7 @@
 print <<"HTML";
           <!-- <div class="add-del-button"><a onclick="addAttribute()">▼</a><a onclick="delAttribute()">▲</a></div> -->
           <div class="annotate caution"></div>
+          <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=142" target="_blank">⇒特性の例（サポートハブ）</a></div>
         </div>
 
       </div>
@@ -338,13 +341,16 @@
           <table class="edit-table line-tbody no-border-cells" id="magi-table">
             <colgroup id="magi-col">
               <col class="name  ">
+              <col class="check ">
               <col class="timing">
               <col class="target">
               <col class="cond  ">
+              <col class="note  ">
             </colgroup>
             <thead id="magi-thead">
               <tr>
                 <th class="name  ">名称
+                <th class="check small nowrap">名前<br>変更
                 <th class="timing">タイミング
                 <th class="target">対象
                 <th class="cond  ">条件
@@ -354,16 +360,20 @@
   print <<"HTML";
             <tbody id="magi${num}">
               <tr>
-                <td class="name  ">《@{[ input "magi${num}Name",'','checkMagi' ]}》
-                <td class="timing">@{[ input "magi${num}Timing" ,'','','list="list-timing"' ]}
-                <td class="target">@{[ input "magi${num}Target" ,'','','list="list-target"' ]}
-                <td class="cond  ">@{[ input "magi${num}Cond",'','','list="list-cond"' ]}
-                <td class="left">@{[ input "magi${num}Note" ]}
+                <td class="name  ">
+                  《@{[ selectBox "magi${num}",'checkMagi',@data::clanMagiNames,'その他' ]}》
+                  <div class="changed-name hidden">《@{[ input "magi${num}Name",'','','placeholder="任意の名前"' ]}》</div>
+                <td class="check ">@{[ checkbox "magi${num}NC",'','checkMagi' ]}
+                <td class="timing">@{[ input "magi${num}Timing" ,'','','list="list-timing"' ]}<div class="text-timing"></div>
+                <td class="target">@{[ input "magi${num}Target" ,'','','list="list-target"' ]}<div class="text-target"></div>
+                <td class="cond  ">@{[ input "magi${num}Cond"   ,'','','list="list-cond"'   ]}<div class="text-cond"></div>
+                <td class="left">@{[ input "magi${num}Note" ]}<div class="text-note"></div>
 HTML
 }
 print <<"HTML";
         </table>
         <div class="annotate caution"></div>
+        <div class="annotate"><a href="https://karasuba-sei.biz/officialsite/?p=149#index_id2" target="_blank">⇒クラン用マギの一覧（サポートハブ）</a></div>
       </div>
       
       <details class="box" id="free-note" @{[$pc{freeNote}?'open':'']}>
@@ -536,11 +546,6 @@
   <datalist id="list-cond">
     <option value="なし">
   </datalist>
-  <script>
-HTML
-print <<"HTML";
-@{[ &commonJSVariable ]}
-  </script>
 </body>
 
 </html>
diff --git a/_core/lib/ms/js-consts.pl b/_core/lib/ms/js-consts.pl
new file mode 100644
index 000000000..7f6ac1e60
--- /dev/null
+++ b/_core/lib/ms/js-consts.pl
@@ -0,0 +1,23 @@
+use strict;
+#use warnings;
+use utf8;
+use open ":utf8";
+use JSON::PP;
+
+### データ読み込み ###################################################################################
+require $set::data_magi;
+
+### 出力 #############################################################################################
+my %settings = (
+  gameSystem => $set::game,
+  pcMagiNames => \@data::pcMagiNames,
+  pcMagiData => \%data::pcMagiData,
+  clanMagiNames => \@data::clanMagiNames,
+  clanMagiData => \%data::clanMagiData,
+);
+print "const SET = ". JSON::PP->new->encode(\%settings);
+print "\n";
+print "console.log('=====SET=====')";
+
+
+1;
\ No newline at end of file
diff --git a/_core/lib/ms/subroutine-sub.pl b/_core/lib/ms/subroutine-sub.pl
index f1c4f19b3..ed780fbbe 100644
--- a/_core/lib/ms/subroutine-sub.pl
+++ b/_core/lib/ms/subroutine-sub.pl
@@ -33,6 +33,17 @@ sub data_update_chara {
   my $ver = $pc{ver};
   delete $pc{updateMessage};
   $ver =~ s/^([0-9]+)\.([0-9]+)\.([0-9]+)$/$1.$2$3/;
+  if($ver < 1.27007){
+    foreach (1 .. 4){
+      if(exists $data::pcMagiData{$pc{"magi${_}Name"}}){
+        $pc{"magi${_}"} = $pc{"magi${_}Name"};
+      }
+      elsif($pc{"magi${_}Name"}) {
+        $pc{"magi${_}"} = 'その他';
+        $pc{"magi${_}NC"} = 1;
+      }
+    }
+  }
   
   $pc{ver} = $main::ver;
   $pc{lasttimever} = $ver;
@@ -45,9 +56,15 @@ sub data_update_clan {
   my $ver = $pc{ver};
   delete $pc{updateMessage};
   $ver =~ s/^([0-9]+)\.([0-9]+)\.([0-9]+)$/$1.$2$3/;
-  if($ver < 1.24002){
-    if($pc{magi1Name} eq 'スクランブル！' && $pc{magi1Cond} eq '7～12'){
-      $pc{magi1Cond} = '8～12'
+  if($ver < 1.27007){
+    foreach (1 .. 5){
+      if(exists $data::clanMagiData{$pc{"magi${_}Name"}}){
+        $pc{"magi${_}"} = $pc{"magi${_}Name"};
+      }
+      elsif($pc{"magi${_}Name"}) {
+        $pc{"magi${_}"} = 'その他';
+        $pc{"magi${_}NC"} = 1;
+      }
     }
   }
   $pc{ver} = $main::ver;
diff --git a/_core/lib/ms/view-chara.pl b/_core/lib/ms/view-chara.pl
index 379908c3f..4114cc932 100644
--- a/_core/lib/ms/view-chara.pl
+++ b/_core/lib/ms/view-chara.pl
@@ -6,7 +6,7 @@
 use HTML::Template;
 
 ### データ読み込み ###################################################################################
-# なし
+require $set::data_magi;
 
 ### テンプレート読み込み #############################################################################
 my $SHEET;
@@ -170,13 +170,18 @@
 my @magi;
 foreach (1 .. 4){
   #next if !existsRow "magi$_",'Name','Timing','Target','Cond','Note';
-  $pc{'magi'.$_.'Name'} &&= "《$pc{'magi'.$_.'Name'}》";
+  my $magi = $pc{"magi$_"};
+  my ($name, $baseName) = ($magi,'');
+  if($pc{"magi${_}NC"}){
+    $name = $pc{"magi${_}Name"};
+    $baseName = "<b class=\"base-name\">《${magi}》</b> " if $magi ne 'その他';
+  }
   push(@magi, {
-    NAME   => $pc{'magi'.$_.'Name'},
-    TIMING => $pc{'magi'.$_.'Timing'},
-    TARGET => $pc{'magi'.$_.'Target'},
-    COND   => $pc{'magi'.$_.'Cond'},
-    NOTE   => $pc{'magi'.$_.'Note'},
+    NAME   => ($name ? "《${name}》" : ''),
+    TIMING => ($data::pcMagiData{$magi}{timing} // $pc{"magi${_}Timing"}),
+    TARGET => ($data::pcMagiData{$magi}{target} // $pc{"magi${_}Target"}),
+    COND   => ($data::pcMagiData{$magi}{cond  } // $pc{"magi${_}Cond"}),
+    NOTE   => $baseName.($data::pcMagiData{$magi}{note} // $pc{"magi${_}Note"}),
   });
 }
 $SHEET->param(Magi => \@magi);
@@ -214,10 +219,11 @@
 $SHEET->param(History => \@history);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -229,7 +235,10 @@
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -254,6 +263,9 @@
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/ms/view-clan.pl b/_core/lib/ms/view-clan.pl
index ce114043c..3d1f99a5e 100644
--- a/_core/lib/ms/view-clan.pl
+++ b/_core/lib/ms/view-clan.pl
@@ -6,7 +6,7 @@
 use HTML::Template;
 
 ### データ読み込み ###################################################################################
-# なし
+require $set::data_magi;
 
 ### テンプレート読み込み #############################################################################
 my $SHEET;
@@ -167,13 +167,18 @@
 my @magi;
 foreach (1 .. 5){
   next if !existsRow "magi$_",'Name','Timing','Target','Cond','Note';
-  $pc{'magi'.$_.'Name'} &&= "《$pc{'magi'.$_.'Name'}》";
+  my $magi = $pc{"magi$_"};
+  my ($name, $baseName) = ($magi,'');
+  if($pc{"magi${_}NC"}){
+    $name = $pc{"magi${_}Name"};
+    $baseName = "<b class=\"base-name\">《${magi}》</b> " if $magi ne 'その他';
+  }
   push(@magi, {
-    NAME   => $pc{'magi'.$_.'Name'},
-    TIMING => $pc{'magi'.$_.'Timing'},
-    TARGET => $pc{'magi'.$_.'Target'},
-    COND   => $pc{'magi'.$_.'Cond'},
-    NOTE   => $pc{'magi'.$_.'Note'},
+    NAME   => ($name ? "《${name}》" : ''),
+    TIMING => ($data::clanMagiData{$magi}{timing} // $pc{"magi${_}Timing"}),
+    TARGET => ($data::clanMagiData{$magi}{target} // $pc{"magi${_}Target"}),
+    COND   => ($data::clanMagiData{$magi}{cond  } // $pc{"magi${_}Cond"}),
+    NOTE   => $baseName.($data::clanMagiData{$magi}{note} // $pc{"magi${_}Note"}),
   });
 }
 $SHEET->param(Magi => \@magi);
@@ -211,10 +216,11 @@
 $SHEET->param(History => \@history);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -226,7 +232,10 @@
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{clanName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{clanName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -251,6 +260,9 @@
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/subroutine.pl b/_core/lib/subroutine.pl
index 2327719e7..9711c5826 100644
--- a/_core/lib/subroutine.pl
+++ b/_core/lib/subroutine.pl
@@ -534,12 +534,12 @@ sub unescapeTagsLines {
   $text =~ s/^RIGHT:/<\/p><p class="right">/gim;
   
   my $d_count = 0;
-  $d_count += ($text =~ s/^\[&gt;\]\*\*\*\*(.*?)$/<\/p><details><summary class="header4">$1<\/summary><div class="detail-body"><p>/gim);
-  $d_count += ($text =~ s/^\[&gt;\]\*\*\*(.*?)$/<\/p><details><summary class="header3">$1<\/summary><div class="detail-body"><p>/gim);
-  $d_count += ($text =~ s/^\[&gt;\]\*\*(.*?)$/<\/p><details><summary class="header2">$1<\/summary><div class="detail-body"><p>/gim);
-  $d_count += ($text =~ s/^\[&gt;\]\*(.*?)$/<\/p><details><summary class="header1">$1<\/summary><div class="detail-body"><p>/gim);
-  $d_count += ($text =~ s/^\[&gt;\](.+?)$/<\/p><details><summary>$1<\/summary><div class="detail-body"><p>/gim);
-  $d_count += ($text =~ s/^\[&gt;\]$/<\/p><details><summary>詳細<\/summary><div class="detail-body"><p>/gim);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header4\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header3\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header2\">$2<\/summary><div class=\"detail-body\"><p>"/gime);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]\*(.*?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary class=\"header1\">$2<\/summary><div class=\"detail-bod\"><p>"/gime);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\](.+?)$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>$2<\/summary><div class=\"detail-body\"><p>"/gime);
+  $d_count += ($text =~ s/^\[(&gt;|[↓vＶｖ])\]$/"<\/p><details @{[$1 eq '&gt;' ? '' : 'open']}><summary>詳細<\/summary><div class=\"detail-body\"><p>"/gime);
   $d_count -= ($text =~ s/^\[-{3,}\]\n?$/<\/p><\/div><\/details><p>/gim);
   
   $text =~ s/^-{4,}$/<\/p><hr><p>/gim;  
@@ -697,6 +697,8 @@ sub removeTags {
   $text =~ s#<rp>[》]</rp>#)#g;
   $text =~ s/<img alt="&#91;(.)&#93;"/[$1]<img /g;
   $text =~ s/<.+?>//g;
+  $text =~ s/&#91;/[/g;
+  $text =~ s/&#93;/]/g;
   return $text;
 }
 sub removeRuby {
@@ -830,6 +832,21 @@ sub infoJson {
   exit;
 }
 
+### 外部データ取得 --------------------------------------------------
+sub urlDataGet {
+  require LWP::UserAgent;
+
+  my $url = shift;
+  my $ua  = LWP::UserAgent->new;
+  my $res = $ua->get($url);
+  if ($res->is_success) {
+    return $res->decoded_content;
+  }
+  else {
+    error '入力されたURLへのアクセスに失敗しました。(STATUS CODE:'.$res->code.')';
+  }
+}
+
 ### アップデート・コンバート --------------------------------------------------
 ## バックアップ形式変更
 sub logFileCheck {
diff --git a/_core/lib/sw2.0/data-class.pl b/_core/lib/sw2.0/data-class.pl
index 3482653d6..76e0c174e 100644
--- a/_core/lib/sw2.0/data-class.pl
+++ b/_core/lib/sw2.0/data-class.pl
@@ -6,6 +6,39 @@ package data;
 
 require $::core_dir.'/lib/sw2/data-class.pl';
 
+### 技能名一覧 --------------------------------------------------
+# 基本的な並び
+our @class_names = (
+  'ファイター',
+  'グラップラー',
+  'バトルダンサー',
+  'フェンサー',
+  'シューター',
+  'ソーサラー',
+  'コンジャラー',
+  'プリースト',
+  'フェアリーテイマー',
+  'マギテック',
+  'デーモンルーラー',
+  'グリモワール',
+  'ドルイド',
+  'アビスゲイザー',
+  'スカウト',
+  'レンジャー',
+  'セージ',
+  'エンハンサー',
+  'バード',
+  'ライダー',
+  'アルケミスト',
+  'ウォーリーダー',
+  'フィジカルマスター',
+  'ミスティック',
+  'アーティザン',
+  'アリストクラシー',
+  'ジオマンサー',
+  'ダークハンター',
+);
+
 ### 魔法技能一覧 --------------------------------------------------
 our @class_caster = (
   'ソーサラー',
@@ -21,6 +54,24 @@ package data;
 );
 
 ### 技能詳細データ --------------------------------------------------
+delete $data::class{'侍'};
+delete $data::class{'忍者'};
+delete $data::class{'呪術師'};
+delete $data::class{'巫覡'};
+$data::class{'グラップラー'}{feats} = [
+  ['追加攻撃',1],
+  ['投げ攻撃',1],
+  ['鎧貫き',5],
+  ['カウンター',7],
+  ['バトルマスター',13],
+];
+$data::class{'レンジャー'}{feats} = [
+  ['治癒適性',5],
+  ['不屈',7],
+  ['ポーションマスター',9],
+  ['韋駄天',12],
+  ['縮地',15],
+];
 $data::class{'スカウト'}{package} = {
   Dex => { name => '器用', stt => 'A' },
   Agi => { name => '敏捷', stt => 'B', initiative => 1 },
diff --git a/_core/lib/sw2.0/edit-chara.pl b/_core/lib/sw2.0/edit-chara.pl
index 2abc3f8a8..f36f07db4 100644
--- a/_core/lib/sw2.0/edit-chara.pl
+++ b/_core/lib/sw2.0/edit-chara.pl
@@ -109,8 +109,6 @@
 
 $pc{accuracyEnhance} ||= 0;
 $pc{evasiveManeuver} ||= 0;
-$pc{tenacity} ||= 0;
-$pc{capacity} ||= 0;
 
 ### 改行処理 --------------------------------------------------
 $pc{items}         =~ s/&lt;br&gt;/\n/g;
@@ -459,7 +457,7 @@
 print '<div class="classes-group" id="classes-magic-user"><h3>魔法使い系技能</h3><dl class="edit-table side-margin">';
 foreach my $name (@data::class_names){ print classInputBox($name) if $data::class{$name}{type} eq 'magic-user'; }
 print '</dl></div>';
-print '<div class="classes-group" id="classes-other-user"><h3>その他系技能</h3><dl class="edit-table side-margin">';
+print '<div class="classes-group" id="classes-others"><h3>その他系技能</h3><dl class="edit-table side-margin">';
 foreach my $name (@data::class_names){ print classInputBox($name) if !$data::class{$name}{type}; }
 print '</dl></div>';
 
@@ -478,9 +476,9 @@ sub classInputBox {
   return $out;
 }
 print <<"HTML";
-            <dl class="edit-table side-margin" style="grid-column: 2;flex-grow:0;grid-template-columns:1fr auto;">
-              <dt style="border-width: 1px 0 1px;">求道者
-              <dd style="border-width: 1px 0 1px;"><select name="lvSeeker" onchange="calcLv();calcStt();">
+          <div class="classes-group" id="classes-seeker"><h3>求道者</h3>
+            <dl class="edit-table side-margin" style="flex-grow:0;grid-template-columns:auto 1fr;">
+              <dd style="grid-column:span 2"><select name="lvSeeker" onchange="calcLv();calcStt();">
 HTML
 my $i = 0;
 foreach (@data::seeker_lv){ print '<option value="'.$i.'"'.($pc{lvSeeker} eq $i?' selected':'').'>'.$_.'</option>'; $i++; }
@@ -489,14 +487,15 @@ sub classInputBox {
 HTML
 foreach my $i (1..5){
   print <<"HTML";
-              <dt id="seeker-buildup${i}" style="text-align:right;">成長枠追加:
+              <dt id="seeker-buildup${i}" style="text-align:right;font-size:85%;">成長枠追加
               <dd><select name="seekerBuildup${i}" onchange="changeLv()">
                 @{[ option("seekerBuildup${i}",'戦闘特技','真語魔法','操霊魔法','深智魔法','神聖魔法','妖精魔法','魔動機術','召異魔法','秘奥魔法','練技','呪歌','騎芸','賦術','鼓咆','占瞳','魔装','呪印','貴格') ]}
               </select>
 HTML
 }
 print <<"HTML";
-            </dl>
+              </dl>
+            </div>
           </div>
           <div class="box" id="common-classes">
             <h2>
@@ -568,7 +567,6 @@ sub classInputBox {
               秘伝
               <small class="notes">所持名誉点：<b id="honor-value-MA"></b></small>
             </h2>
-            <div>所持名誉点：<span id="honor-value-MA"></span></div>
             <ul id="mystic-arts-list" class="edit-table side-margin">
 HTML
 my @honortypes = ('def=human|<人族名誉点（通常の名誉点）>','barbaros|<蛮族名誉点>','dragon|<盟竜点>');
@@ -957,7 +955,7 @@ sub classInputBox {
                 <td id="attack-${ename}-str">0
                 <td id="attack-${ename}-acc">0
                 <td>―
-                <td>@{[ $name eq 'フェンサー' ? '-1' : '―' ]}
+                <td>@{[ $data::class{$name}{critMod} || '―' ]}
                 <td id="attack-${ename}-dmg">―
 HTML
 }
@@ -1115,6 +1113,11 @@ sub classInputBox {
                 <td>―
                 <td>―
                 <td id="mastery-shield-value">$pc{masteryShield}
+              <tr id="mastery-ryugaiarmour"@{[ display $pc{masteryRyugai} ]}>
+                <td>《防具習熟／龍骸》
+                <td>―
+                <td>―
+                <td id="mastery-ryugaiarmour-value">$pc{masteryRyugai}
               <tr id="mastery-artisan-def"@{[ display $pc{masteryArtisan} ]}>
                 <td>《魔器習熟》
                 <td>―
@@ -1327,7 +1330,8 @@ sub classInputBox {
           <li>
             <code>\@器用度+1</code>や<code>\@防護点+1</code>のように記述すると、<span class="text-em">常時</span>有効な上昇効果が自動計算されます。<br>
             有効な項目は、<code>器用度</code>～<code>精神力</code> <code>生命抵抗力</code> <code>精神抵抗力</code> <code>回避力</code> <code>防護点</code> <code>移動力</code> <code>魔力</code> <code>行使判定</code> <code>武器必筋上限</code>です。<br>
-            同じ項目へは累積するため、同名や効果排他のアイテムには注意してください。
+            同じ項目へは累積するため、同名や効果排他のアイテムには注意してください。<br>
+            能力値の増強にかぎり、<code>\@筋力増強+2</code>のように<code>増強</code>の文言を記述することで、能力値ごとに最大の値のみを採用できます。
         </ul>
         </div>
       </div>
@@ -1462,9 +1466,9 @@ sub classInputBox {
               <td>-
               <td>
               <td>キャラクター作成
-              <td id="history0-exp">$pc{history0Exp}
-              <td id="history0-money">$pc{history0Money}
-              <td id="history0-honor">$pc{history0Honor}
+              <td id="history0-exp">@{[commify $pc{history0Exp}]}
+              <td id="history0-money">@{[commify $pc{history0Money}]}
+              <td id="history0-honor">@{[commify $pc{history0Honor}]}
               <td id="history0-grow">$pc{history0Grow}
             </tr>
 HTML
@@ -1570,127 +1574,8 @@ sub classInputBox {
     </article>
 HTML
 sub chatPaletteFormOptional {
-  $pc{chatPaletteInsertNum} ||= 2;
-  $pc{paletteAttackNum} ||= 3;
-  $pc{paletteMagicNum} ||= 3;
-  my $html = <<"HTML";
-      <div class="box" id="palette-optional">
-        <h2>プリセットの追加オプション</h2>
-        <div id="palette-common-classes">
-          <h3>一般技能の判定の出力設定</h3>
-          <p>その行の技能のレベルと、選択したボーナスの組み合わせが追加されます</p>
-          <table class="edit-table side-margin">
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{commonClassNum}){
-    $html .= '<template id="palette-common-class-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-common-class-row'.$_.'"><td class="name">'.($pc{"commonClass$_"} =~ s/[(（].+?[）)]$//r).'</td>';
-    $html .= '<td class="left">';
-    $html .= checkbox("paletteCommonClass${_}Dex", '器用度B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Agi", '敏捷度B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Str", '筋力B'  , 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Vit", '生命力B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Int", '知力B'  , 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Mnd", '精神力B', 'setChatPalette');
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-        </div>
-        <details id="palette-insert" @{[ $pc{chatPaletteInsert1} ? 'open' : '' ]}>
-          <summary class="header2">追加挿入</summary>
-          <ul>
-HTML
-  foreach ('TMPL',1 .. $pc{chatPaletteInsertNum}){
-    $html .= '<template id="palette-insert-template">' if $_ eq 'TMPL';
-    $html .= "<li>"
-      . selectBox("chatPaletteInsert${_}Position", 'setChatPalette', 'def=|<先頭>','general|<非戦闘系の直後>','common|<一般技能の直後>','feats|<宣言特技の直後>','magic|<魔法系の直後>','attack|<武器攻撃系の直後>','defense|<抵抗回避の直後>')
-      . "に挿入"
-      . "<textarea name=\"chatPaletteInsert${_}\" onchange=\"setChatPalette()\">$pc{'chatPaletteInsert'.$_}</textarea>";
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </ul>
-          <div class="add-del-button"><a onclick="addChatPaletteInsert()">▼</a><a onclick="delChatPaletteInsert()">▲</a></div>
-          @{[ input "chatPaletteInsertNum","hidden" ]}
-        </details>
-        <details id="palette-attack" @{[ $pc{"paletteAttack1Name"} ? 'open' : '' ]}>
-          <summary class="header2">武器攻撃の追加オプション</summary>
-          <p>宣言特技などの名称と修正を入力すると、それにもとづいた命中判定および威力算出の行が追加されます。</p>
-          <table class="edit-table side-margin">
-            <thead>
-              <tr>
-                <th>
-                <th class="name  ">名称（宣言特技名など）
-                <th class="acc   ">命中修正
-                <th class="crit  ">C値修正
-                <th class="dmg   "><span class="small">ダメージ<br>修正</span>
-                <th class="roll  ">出目修正
-                <th class="target">対象の武器
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{paletteAttackNum}){
-    $html .= '<template id="palette-attack-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-attack-row'.$_.'">';
-    $html .= '<td class="handle">';
-    $html .= '<td>'.input("paletteAttack${_}Name",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Acc" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Crit",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Dmg" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Roll",'','','onchange="setChatPalette()"');
-    $html .= '<td class="palette-attack-checklist left">';
-    my %added;
-    foreach my $num (1 .. $pc{weaponNum}) {
-      my $name = $pc{"weapon${num}Name"}.$pc{"weapon${num}Usage"} || '―';
-      next if $added{$name};
-      $html .= checkbox("paletteAttack${_}CheckWeapon${num}",$name,'setChatPalette');
-      $added{$name} = 1;
-    }
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-          <div class="add-del-button"><a onclick="addPaletteAttack()">▼</a><a onclick="delPaletteAttack()">▲</a></div>
-          @{[ input "paletteAttackNum","hidden" ]}
-        </details>
-        <details id="palette-magic" @{[ $pc{"paletteMagic1Name"} ? 'open' : '' ]}>
-          <summary class="header2">魔法の追加オプション</summary>
-          <p>宣言特技などの名称と修正を入力すると、それにもとづいた、行使判定および威力算出の行が追加されます。</p>
-          <table class="edit-table side-margin">
-            <thead>
-              <tr>
-                <th>
-                <th class="name ">名称（宣言特技名など）
-                <th class="power">魔力修正
-                <th class="cast ">行使修正
-                <th class="crit ">C値修正
-                <th class="dmg  "><span class="small">ダメージ<br>修正</span>
-                <th class="target">対象の魔法
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{paletteMagicNum}){
-    $html .= '<template id="palette-magic-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-magic-row'.$_.'">';
-    $html .= '<td class="handle">';
-    $html .= '<td>'.input("paletteMagic${_}Name" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Power",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Cast" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Crit" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Dmg"  ,'','','onchange="setChatPalette()"');
-    $html .= '<td class="palette-magic-checklist left">';
-    foreach my $name (@data::class_caster){
-      next if (!$data::class{$name}{magic}{jName});
-      my $id    = $data::class{$name}{id};
-      $html .= checkbox("paletteMagic${_}Check$id",$data::class{$name}{magic}{jName},'setChatPalette');
-    }
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-          <div class="add-del-button"><a onclick="addPaletteMagic()">▼</a><a onclick="delPaletteMagic()">▲</a></div>
-          @{[ input "paletteMagicNum","hidden" ]}
-        </details>
-HTML
+  require($::core_dir . '/lib/sw2/edit-chara-palette-option.pl');
+  return palette::chatPaletteFormOptional(\%pc);
 }
 # ヘルプ
 my $text_rule = <<"HTML";
diff --git a/_core/lib/sw2/calc-chara.pl b/_core/lib/sw2/calc-chara.pl
index dbe2a916c..76e3b5723 100644
--- a/_core/lib/sw2/calc-chara.pl
+++ b/_core/lib/sw2/calc-chara.pl
@@ -132,26 +132,28 @@ sub data_calc {
   }
 
   ## 経験点消費
-  my @expA = ( 0, 1000, 2000, 3500, 5000, 7000, 9500, 12500, 16500, 21500, 27500, 35000, 44000, 54500, 66500, 80000, 95000, 125000 );
-  my @expB = ( 0,  500, 1500, 2500, 4000, 5500, 7500, 10000, 13000, 17000, 22000, 28000, 35500, 44500, 55000, 67000, 80500, 105500 );
-  my @expS = ( 0, 3000, 6000, 9000, 12000, 16000, 20000, 24000, 28000, 33000, 38000, 43000, 48000, 54000, 60000, 66000, 72000, 79000, 86000, 93000, 100000 );
+  my %expTable = (
+    A => [ 0, 1000, 2000, 3500, 5000, 7000, 9500, 12500, 16500, 21500, 27500, 35000, 44000, 54500, 66500, 80000, 95000, 125000 ],
+    B => [ 0,  500, 1500, 2500, 4000, 5500, 7500, 10000, 13000, 17000, 22000, 28000, 35500, 44500, 55000, 67000, 80500, 105500 ],
+    R => [ 0, 1500, 3000, 5000, 7500, 10500, 14500 ], #龍骸
+    S => [ 0, 3000, 6000, 9000, 12000, 16000, 20000, 24000, 28000, 33000, 38000, 43000, 48000, 54000, 60000, 66000, 72000, 79000, 86000, 93000, 100000 ], #求道
+  );
   $pc{expRest} = $pc{expTotal};
   foreach (@data::class_names){
-    if    ($data::class{$_}{expTable} eq 'A'){ $pc{expRest} -= $expA[$pc{'lv'.$data::class{$_}{id}}]; }
-    elsif ($data::class{$_}{expTable} eq 'B'){ $pc{expRest} -= $expB[$pc{'lv'.$data::class{$_}{id}}]; }
+    $pc{expRest} -= $expTable{$data::class{$_}{expTable}}[$pc{'lv'.$data::class{$_}{id}}];
   }
   
   ### 求道者 --------------------------------------------------
-  $pc{expRest} -= $expS[$pc{lvSeeker}];
+  $pc{expRest} -= $expTable{S}[$pc{lvSeeker}];
   if($pc{lvSeeker}){
     $pc{lvMonster} = $pc{level};
-    $pc{lvMonster} += $expS[$pc{lvSeeker}] >= 90001 ? 7
-                    : $expS[$pc{lvSeeker}] >= 70001 ? 6
-                    : $expS[$pc{lvSeeker}] >= 50001 ? 5
-                    : $expS[$pc{lvSeeker}] >= 40001 ? 4
-                    : $expS[$pc{lvSeeker}] >= 30001 ? 3
-                    : $expS[$pc{lvSeeker}] >= 20001 ? 2
-                    : $expS[$pc{lvSeeker}] >= 10001 ? 1
+    $pc{lvMonster} += $expTable{S}[$pc{lvSeeker}] >= 90001 ? 7
+                    : $expTable{S}[$pc{lvSeeker}] >= 70001 ? 6
+                    : $expTable{S}[$pc{lvSeeker}] >= 50001 ? 5
+                    : $expTable{S}[$pc{lvSeeker}] >= 40001 ? 4
+                    : $expTable{S}[$pc{lvSeeker}] >= 30001 ? 3
+                    : $expTable{S}[$pc{lvSeeker}] >= 20001 ? 2
+                    : $expTable{S}[$pc{lvSeeker}] >= 10001 ? 1
                     : 0;
   }
   $pc{sttSeekerGrow} = $pc{lvSeeker} >= 17 ? 30
@@ -291,21 +293,26 @@ sub data_calc {
     $pc{raceAbility} =~ s/［(竜|魔物)化］/［剣の託宣／復活$1化］/;
   }
   ### 装備品の備考 --------------------------------------------------
-  my %equipModTotal = {};
+  my %equipModStatusIncrement = {};
   foreach (@{extractModifications(\%pc)}) {
     my %mod = %{$_};
     foreach ('A'..'F'){
       $pc{'sttEquip'.$_} += $mod{$_} // 0;
+
+      # 増強
+      $equipModStatusIncrement{$_} //= 0;
+      $equipModStatusIncrement{$_} = max($equipModStatusIncrement{$_}, $mod{"${_}:increment"} // 0);
     }
-    foreach ('vResist','mResist','eva','def','mobility'){
-      $equipModTotal{$_} += $mod{$_} // 0;
-    }
-    foreach ('magicPower','magicCast','magicDamage'){
+    foreach ('vResist','mResist','eva','def','mobility','magicPower','magicCast','magicDamage'){
       $pc{$_.'Equip'} += $mod{$_} // 0;
     }
     $pc{reqdStrWeaponMod} += $mod{reqdWeapon} // 0;
   }
 
+  foreach ('A' .. 'F') {
+    $pc{"sttEquip${_}"} += $equipModStatusIncrement{$_};
+  }
+
   ### 能力値計算 --------------------------------------------------
   ## 成長
   $pc{sttHistGrowA} = $pc{sttHistGrowB} = $pc{sttHistGrowC} = $pc{sttHistGrowD} = $pc{sttHistGrowE} = $pc{sttHistGrowF} = 0;
@@ -364,32 +371,20 @@ sub data_calc {
 
   ### 戦闘特技 --------------------------------------------------
   ## 自動習得
-  my @abilities;
-  if($pc{lvFig} >= 7) { push(@abilities, "タフネス"); }
-  if($pc{lvGra} >= 1) { push(@abilities, "追加攻撃"); }
-  if($pc{lvGra} >= 1 && $::SW2_0) { push(@abilities, "投げ攻撃"); }
-  if($pc{lvGra} >= 5 && $::SW2_0) { push(@abilities, "鎧貫き"); }
-  if($pc{lvGra} >= 7) { push(@abilities, "カウンター"); }
-  if($pc{lvBat} >= 7) { push(@abilities, "舞い流し"); }
-  if($pc{lvFig} >=13 || $pc{lvGra} >=13 || $pc{lvBat} >=13) { push(@abilities, "バトルマスター"); }
-  if($pc{lvCaster} >= 11){ push(@abilities, "ルーンマスター"); }
-  if($pc{lvSco} >= 5) { push(@abilities, $pc{combatFeatsExcSco5} || "トレジャーハント"); }
-  if($pc{lvSco} >= 7) { push(@abilities, "ファストアクション"); }
-  if($pc{lvSco} >=12) { push(@abilities, "トレジャーマスター"); }
-  if($pc{lvSco} >=15) { push(@abilities, "匠の技"); }
-  if($pc{lvSco} >= 9) { push(@abilities, "影走り"); }
-  if($pc{lvRan} >= 5) { push(@abilities, $pc{combatFeatsExcRan5} || ($::SW2_0?"治癒適性":"サバイバビリティ")); }
-  if($pc{lvRan} >= 7) { push(@abilities, "不屈"); }
-  if($pc{lvRan} >= 9) { push(@abilities, "ポーションマスター"); }
-  if($pc{lvRan} >=12) { push(@abilities, ($::SW2_0?"韋駄天":"縮地")); }
-  if($pc{lvRan} >=15) { push(@abilities, ($::SW2_0?"縮地":"ランアンドガン")); }
-  if($pc{lvSag} >= 5) { push(@abilities, $pc{combatFeatsExcSag5} || "鋭い目"); }
-  if($pc{lvSag} >= 7) { push(@abilities, "弱点看破"); }
-  if($pc{lvSag} >= 9) { push(@abilities, "マナセーブ"); }
-  if($pc{lvSag} >=12) { push(@abilities, "マナ耐性"); }
-  if($pc{lvSag} >=15) { push(@abilities, "賢人の知恵"); }
+  my @feats;
+  foreach my $class (@data::class_names){
+    my $id = $data::class{$class}{id};
+    next if !$data::class{$class}{feats};
+    foreach my $data (@{$data::class{$class}{feats}}){
+      if($pc{'lv'.$id} >= $data->[1]){
+        push(@feats, $pc{'combatFeatsExc'.$id.$data->[1]} || $data->[0]);
+      }
+    }
+  }
+  my %hasFeats;
+  @feats = grep { ! $hasFeats{ $_ }++ } @feats;
   $" = ',';
-  $pc{combatFeatsAuto} = "@abilities";
+  $pc{combatFeatsAuto} = "@feats";
   ## 選択特技による補正
   {
     foreach my $i (@set::feats_lv) {
@@ -412,9 +407,11 @@ sub data_calc {
       elsif($feat eq '防具習熟Ａ／金属鎧')  { $pc{masteryMetalArmour}   += 1; }
       elsif($feat eq '防具習熟Ａ／非金属鎧'){ $pc{masteryNonMetalArmour}+= 1; }
       elsif($feat eq '防具習熟Ａ／盾')      { $pc{masteryShield}        += 1; }
+      elsif($feat eq '防具習熟Ａ／龍骸')    { $pc{masteryRyugai}        += 1; }
       elsif($feat eq '防具習熟Ｓ／金属鎧')  { $pc{masteryMetalArmour}   += 2; }
       elsif($feat eq '防具習熟Ｓ／非金属鎧'){ $pc{masteryNonMetalArmour}+= 2; }
       elsif($feat eq '防具習熟Ｓ／盾')      { $pc{masteryShield}        += 2; }
+      elsif($feat eq '防具習熟Ｓ／龍骸')    { $pc{masteryRyugai}        += 2; }
       elsif($feat =~ /^武器習熟Ａ／(.*)$/) { $pc{'mastery'.ucfirst($data::weapon_id{$1})} += 1; }
       elsif($feat =~ /^武器習熟Ｓ／(.*)$/) { $pc{'mastery'.ucfirst($data::weapon_id{$1})} += 2; }
       elsif($feat =~ /^魔器習熟Ａ/) { $pc{masteryArtisan} += 1; }
@@ -444,11 +441,11 @@ sub data_calc {
   ### サブステータス --------------------------------------------------
   ## 生命抵抗力
   $pc{vitResistBase} = $st{LvD};
-  $pc{vitResistAddTotal} = $equipModTotal{vResist} + s_eval($pc{vitResistAdd}) + $pc{resistEnhance} + $pc{seekerAbilityResist};
+  $pc{vitResistAddTotal} = $pc{vResistEquip} + s_eval($pc{vitResistAdd}) + $pc{resistEnhance} + $pc{seekerAbilityResist};
   $pc{vitResistTotal}  = $pc{vitResistBase} + $pc{vitResistAddTotal};
   ## 精神抵抗力
   $pc{mndResistBase} = $st{LvF};
-  $pc{mndResistAddTotal} = $equipModTotal{mResist} + s_eval($pc{mndResistAdd}) + $pc{raceAbilityMndResist} + $pc{resistEnhance} + $pc{seekerAbilityResist};
+  $pc{mndResistAddTotal} = $pc{mResistEquip} + s_eval($pc{mndResistAdd}) + $pc{raceAbilityMndResist} + $pc{resistEnhance} + $pc{seekerAbilityResist};
   $pc{mndResistTotal}  = $pc{mndResistBase} + $pc{mndResistAddTotal};
   ## ＨＰＭＰ：装飾品
   foreach my $type ('Head', 'Ear', 'Face', 'Neck', 'Back', 'HandR', 'HandL', 'Waist', 'Leg', 'Other', 'Other2','Other3','Other4') {
@@ -460,7 +457,7 @@ sub data_calc {
   ## ＨＰ
   $pc{hpBase} = $pc{level}*3 + $pc{sttVit} + $pc{sttAddD} + $pc{sttEquipD};
   $pc{hpAddTotal} = s_eval($pc{hpAdd}) + $pc{tenacity} + $pc{hpAccessory} + $pc{seekerAbilityHpMp};
-  $pc{hpAddTotal} += 15 if $pc{lvFig} >= 7; #タフネス
+  $pc{hpAddTotal} += 15 if $hasFeats{'タフネス'};
   $pc{hpTotal}  = $pc{hpBase} + $pc{hpAddTotal};
   ## ＭＰ
   $pc{mpBase} = $lv_caster_total*3 + $pc{sttMnd} + $pc{sttAddF} + $pc{sttEquipF};
@@ -479,7 +476,7 @@ sub data_calc {
   }
   $pc{mobilityBase} = $pc{sttAgi} + $pc{sttAddB} + $pc{sttEquipB};
   $pc{mobilityBase} = $pc{mobilityBase} * 2  if ($pc{raceAbility} =~ /［半馬半人］/);
-  $pc{mobilityAddTotal} = s_eval($pc{mobilityAdd}) + $equipModTotal{mobility} + $own_mobility;
+  $pc{mobilityAddTotal} = s_eval($pc{mobilityAdd}) + $pc{mobilityEquip} + $own_mobility;
   $pc{mobilityTotal} = $pc{mobilityBase} + $pc{mobilityAddTotal};
   $pc{mobilityFull} = $pc{mobilityTotal} * 3;
   $pc{mobilityLimited} = min($pc{footwork} ? 10 : 3, $pc{mobilityTotal});
@@ -492,17 +489,17 @@ sub data_calc {
     my $c_id = $data::class{$class}{id};
     my $c_en = $data::class{$class}{eName};
     my $craftName = ucfirst $data::class{$class}{craft}{eName};
-    my %data = %{$data::class{$class}{package}};
+    my %pData = %{$data::class{$class}{package}};
     
-    foreach my $p_id (keys %data){
-      my $auto = 0;
+    foreach my $p_id (keys %pData){
+      my $auto = $pData{$p_id}{mod};
       my $disabled = 0;
       my $addAcuire = $pc{ $data::class{$class}{craft}{eName}.'Addition' }
           + $pc{ 'buildupAdd'.ucfirst($data::class{$class}{craft}{eName}) };
-      if(exists $data{$p_id}{unlockCraft}){
+      if(exists $pData{$p_id}{unlockCraft}){
         $disabled = 1;
         foreach(1 .. $pc{'lv'.$c_id}+$addAcuire){
-          if($pc{'craft'.$craftName.$_} eq $data{$p_id}{unlockCraft}){ $disabled = 0; last; }
+          if($pc{'craft'.$craftName.$_} eq $pData{$p_id}{unlockCraft}){ $disabled = 0; last; }
         }
       }
       # 陣率：軍師の知略
@@ -513,12 +510,12 @@ sub data_calc {
       }
       next if $disabled;
 
-      my $value = $st{$c_id.$data{$p_id}{stt}} + $pc{'pack'.$c_id.$p_id.'Add'} + $auto;
+      my $value = $st{$c_id.$pData{$p_id}{stt}} + $pc{'pack'.$c_id.$p_id.'Add'} + $auto;
       $pc{'pack'.$c_id.$p_id} = $value;
       $pc{'pack'.$c_id.$p_id.'Auto'} = $auto;
       if($pc{'lv'.$c_id}){
-        if($data{$p_id}{monsterLore}){ push @pack_lore, $value }
-        if($data{$p_id}{initiative} ){ push @pack_init, $value }
+        if($pData{$p_id}{monsterLore}){ push @pack_lore, $value }
+        if($pData{$p_id}{initiative} ){ push @pack_init, $value }
       }
     }
   }
@@ -575,6 +572,7 @@ sub data_calc {
       my $own_dex = $pc{"weapon${_}Own"} ? 2 : 0; # 専用化補正
       if($lv){ $acc = $lv + int(($dex+$own_dex) / 6) }
     }
+    $acc += $data::class{$class}{accUnlock}{mod};
     ## 人orコア部位
     if(!$partNum || $partNum eq $pc{partCore}) {
       $acc += $pc{accuracyEnhance}; # 命中強化
@@ -636,7 +634,7 @@ sub data_calc {
 
     ## 基礎値
     my $agi = $pc{sttAgi} + ($partNum ? $pc{sttPartB} : $pc{sttAddB}+$pc{sttEquipB});
-    my $eva = 0;
+    my $eva = $data::class{$class}{evaUnlock}{mod};
     my $def = 0;
     ## 部位（コア含）
     if($partNum){
@@ -682,6 +680,7 @@ sub data_calc {
         if   ($category eq   '金属鎧'){ $def += $pc{masteryMetalArmour} }
         elsif($category eq '非金属鎧'){ $def += $pc{masteryNonMetalArmour} }
         elsif($category eq       '盾'){ $def += $pc{masteryShield} }
+        elsif($category eq     '龍骸'){ $def += $pc{masteryRyugai} }
         if($pc{"armour${num}Note"} =~ /〈魔器〉/){ $artisan = $pc{masteryArtisan}; }
       }
       
@@ -690,8 +689,8 @@ sub data_calc {
     $eva += $lv ? $lv + int(($agi+$own_agi)/6) : 0;
     $def += $artisan;
 
-    $eva += $equipModTotal{eva};
-    $def += $equipModTotal{def};
+    $eva += $pc{evaEquip};
+    $def += $pc{defEquip};
 
     $pc{"defenseTotal${i}Eva"} = $eva;
     $pc{"defenseTotal${i}Def"} = $def;
diff --git a/_core/lib/sw2/convert.pl b/_core/lib/sw2/convert.pl
index 83205aaa2..0a83dfef1 100644
--- a/_core/lib/sw2/convert.pl
+++ b/_core/lib/sw2/convert.pl
@@ -3,23 +3,10 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
 require $set::data_class;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/sw2/data-class.pl b/_core/lib/sw2/data-class.pl
index 99a2c6dd9..cf3d5346a 100644
--- a/_core/lib/sw2/data-class.pl
+++ b/_core/lib/sw2/data-class.pl
@@ -35,6 +35,10 @@ package data;
   'ミスティック',
   'アーティザン',
   'アリストクラシー',
+  '侍',
+  '忍者',
+  '呪術師',
+  '巫覡',
 );
 
 ### 技能初出順一覧 --------------------------------------------------
@@ -68,6 +72,10 @@ package data;
   'バトルダンサー',
   'アビスゲイザー',
   'ダークハンター',
+  '侍',
+  '忍者',
+  '呪術師',
+  '巫覡',
 );
 
 ### 魔法技能一覧 --------------------------------------------------
@@ -82,6 +90,8 @@ package data;
   'デーモンルーラー',
   'アビスゲイザー',
   'グリモワール',
+  '呪術師',
+  '巫覡',
 );
 
 ### 技能詳細データ --------------------------------------------------
@@ -91,12 +101,21 @@ package data;
     expTable => 'A',
     id       => 'Fig',
     eName    => 'fighter',
+    feats => [
+      ['タフネス',7],
+      ['バトルマスター',13],
+    ],
   },
   'グラップラー' => {
     type     => 'weapon-user',
     expTable => 'A',
     id       => 'Gra',
     eName    => 'grappler',
+    feats => [
+      ['追加攻撃',1],
+      ['カウンター',7],
+      ['バトルマスター',13],
+    ],
   },
   'バトルダンサー' => {
     '2.5' => 1,
@@ -104,12 +123,18 @@ package data;
     expTable => 'A',
     id       => 'Bat',
     eName    => 'battledancer',
+    feats => [
+      ['舞い流し',7],
+      ['バトルマスター',13],
+    ],
   },
   'フェンサー' => {
     type     => 'weapon-user',
     expTable => 'B',
     id       => 'Fen',
     eName    => 'fencer',
+    reqdHalf => 1,
+    critMod => -1,
   },
   'シューター' => {
     type     => 'weapon-user',
@@ -130,6 +155,9 @@ package data;
     language => {
       '魔法文明語' => { talk => 1, read => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'コンジャラー' => {
     type     => 'magic-user',
@@ -143,6 +171,9 @@ package data;
     language => {
       '魔法文明語' => { talk => 1, read => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'ウィザード' => {
     type     => 'magic-user',
@@ -163,6 +194,9 @@ package data;
       jName => '神聖魔法',
       eName => 'holypray',
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'フェアリーテイマー' => {
     type     => 'magic-user',
@@ -176,6 +210,9 @@ package data;
     language => {
       '妖精語' => { talk => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'マギテック' => {
     type     => 'magic-user',
@@ -189,6 +226,9 @@ package data;
     language => {
       '魔動機文明語' => { talk => 1, read => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'スカウト' => {
     expTable => 'B',
@@ -199,6 +239,13 @@ package data;
       Agi => { name => '運動', stt => 'B', initiative => 1 },
       Obs => { name => '観察', stt => 'E' },
     },
+    feats => [
+      ['トレジャーハント',5],
+      ['ファストアクション',7],
+      ['影走り',9],
+      ['トレジャーマスター',12],
+      ['匠の技',15],
+    ],
   },
   'レンジャー' => {
     expTable => 'B',
@@ -209,6 +256,13 @@ package data;
       Agi => { name => '運動', stt => 'B' },
       Obs => { name => '観察', stt => 'E' },
     },
+    feats => [
+      ['サバイバビリティ',5],
+      ['不屈',7],
+      ['ポーションマスター',9],
+      ['縮地',12],
+      ['ランアンドガン',15],
+    ],
   },
   'セージ' => {
     expTable => 'B',
@@ -220,6 +274,13 @@ package data;
     package  => {
       Kno => { name => '知識', stt => 'E', monsterLore => 1 },
     },
+    feats => [
+      ['鋭い目',5],
+      ['弱点看破',7],
+      ['マナセーブ',9],
+      ['マナ耐性',12],
+      ['賢人の知恵',15],
+    ],
   },
   'エンハンサー' => {
     expTable => 'B',
@@ -434,6 +495,9 @@ package data;
       jName => '森羅魔法',
       eName => 'druidry',
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'デーモンルーラー' => {
     type     => 'magic-user',
@@ -450,6 +514,9 @@ package data;
       '魔神語' => { talk => 1 },
       '魔法文明語' => { read => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'ジオマンサー' => {
     '2.5' => 1,
@@ -599,6 +666,9 @@ package data;
     language => {
       '魔神語' => { talk => 1 },
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'ダークハンター' => {
     expTable => 'B',
@@ -889,6 +959,9 @@ package data;
         [13,"死者の奇跡",'モーリ＝モンストルム'],
       ],
     },
+    feats => [
+      ['ルーンマスター',11],
+    ],
   },
   'アーティザン' => {
     '2.0' => 1,
@@ -1063,6 +1136,104 @@ package data;
       ],
     },
   },
+  '侍' => {
+    type     => 'extra',
+    expTable => 'R',
+    id       => 'Sam',
+    eName    => 'samurai',
+    accUnlock => { lv => 1 },
+    evaUnlock => { lv => 1 },
+    package  => {
+      Tec => { name => '技巧', stt => 'A', mod => -2 },
+      Agi => { name => '運動', stt => 'B', mod => -2, forestall => 1 },
+      Obs => { name => '観察', stt => 'E', mod => -2 },
+    },
+    feats => [
+      #['タフネス',7],
+      ['追加攻撃',1],
+      #['カウンター',7],
+      #['バトルマスター',13],
+      ['サバイバビリティ',5],
+      #['不屈',7],
+      #['ポーションマスター',9],
+      #['縮地',12],
+      #['ランアンドガン',15],
+    ],
+  },
+  '忍者' => {
+    type     => 'extra',
+    expTable => 'R',
+    id       => 'Nin',
+    eName    => 'ninja',
+    accUnlock => { lv => 1 },
+    evaUnlock => { lv => 1 },
+    reqdHalf => 1,
+    critMod => -1,
+    package  => {
+      Tec => { name => '技巧', stt => 'A' },
+      Agi => { name => '運動', stt => 'B', forestall => 1 },
+      Obs => { name => '観察', stt => 'E' },
+    },
+    feats => [
+      ['トレジャーハント',5],
+      #['ファストアクション',7],
+      #['影走り',9],
+      #['トレジャーマスター',12],
+      #['匠の技',15],
+    ],
+  },
+  '呪術師' => {
+    type     => 'extra',
+    expTable => 'R',
+    id       => 'Juj',
+    eName    => 'jujutsushi',
+    magic => {
+      jName => '呪術',
+      eName => 'jujutsu',
+    },
+    language => {
+      '魔法文明語' => { talk => 1, read => 1 },
+      any => { talk => 1, read => 1 },
+    },
+    package  => {
+      Kno => { name => '知識', stt => 'E', mod => -2, monsterLore => 1 },
+    },
+    feats => [
+      #['ルーンマスター',11],
+      ['鋭い目',5],
+      #['弱点看破',7],
+      #['マナセーブ',9],
+      #['マナ耐性',12],
+      #['賢人の知恵',15],
+    ],
+  },
+  '巫覡' => {
+    type     => 'extra',
+    expTable => 'R',
+    id       => 'Fug',
+    eName    => 'fugeki',
+    accUnlock => { lv => 1, mod => -2 },
+    evaUnlock => { lv => 1, mod => -2 },
+    magic => {
+      jName => '巫寄せ',
+      eName => 'fuyose',
+    },
+    package  => {
+      Kno => { name => '知識', stt => 'E', mod => -2, monsterLore => 1 },
+    },
+    feats => [
+      #['タフネス',7],
+      ['追加攻撃',1],
+      #['カウンター',7],
+      #['バトルマスター',13],
+      #['ルーンマスター',11],
+      ['鋭い目',5],
+      #['弱点看破',7],
+      #['マナセーブ',9],
+      #['マナ耐性',12],
+      #['賢人の知恵',15],
+    ],
+  },
 );
 
 
diff --git a/_core/lib/sw2/data-feats.pl b/_core/lib/sw2/data-feats.pl
index 01853187b..781562f15 100644
--- a/_core/lib/sw2/data-feats.pl
+++ b/_core/lib/sw2/data-feats.pl
@@ -54,6 +54,7 @@ package data;
   ['常', 0,'武器習熟Ａ／クロスボウ',    ''],
   ['常', 0,'武器習熟Ａ／ブロウガン',    ''],
   ['常', 0,'武器習熟Ａ／ガン',          ''],
+  ['常', 0,'武器習熟Ａ／龍骸',          ''],
   ['常', 5,'武器習熟Ｓ／ソード',        ''],
   ['常', 5,'武器習熟Ｓ／アックス',      ''],
   ['常', 5,'武器習熟Ｓ／スピア',        ''],
@@ -68,6 +69,7 @@ package data;
   ['常', 5,'武器習熟Ｓ／クロスボウ',    ''],
   ['常', 5,'武器習熟Ｓ／ブロウガン',    ''],
   ['常', 5,'武器習熟Ｓ／ガン',          ''],
+  #['常', 5,'武器習熟Ｓ／龍骸',          ''],
   ['常',11,'武器の達人',''],
   ['常', 3,'賦術強化Ⅰ',''],
   ['常', 3,'賦術強化Ⅱ',''],
@@ -79,9 +81,11 @@ package data;
   ['常', 0,'防具習熟Ａ／金属鎧',  ''],
   ['常', 0,'防具習熟Ａ／非金属鎧',''],
   ['常', 0,'防具習熟Ａ／盾',      ''],
+  ['常', 0,'防具習熟Ａ／龍骸',    ''],
   ['常', 5,'防具習熟Ｓ／金属鎧',  ''],
   ['常', 5,'防具習熟Ｓ／非金属鎧',''],
   ['常', 5,'防具習熟Ｓ／盾',      ''],
+  #['常', 5,'防具習熟Ｓ／龍骸',    ''],
   ['常',11,'防具の達人',''],
   ['常', 9,'魔晶石の達人',''],
   ['常', 5,'魔法拡大の達人',''],
diff --git a/_core/lib/sw2/data-items.pl b/_core/lib/sw2/data-items.pl
index ceb0187df..b8131e0d3 100644
--- a/_core/lib/sw2/data-items.pl
+++ b/_core/lib/sw2/data-items.pl
@@ -19,6 +19,7 @@ package data;
   ['クロスボウ',    'crossbow'],
   ['ブロウガン',    'blowgun'],
   ['ガン',          'gun'],
+  ['龍骸',          'ryugai'],
 );
 
 our @weapon_names;
diff --git a/_core/lib/sw2/data-races.pl b/_core/lib/sw2/data-races.pl
index 6fc7433b4..9c0e77de2 100644
--- a/_core/lib/sw2/data-races.pl
+++ b/_core/lib/sw2/data-races.pl
@@ -903,6 +903,14 @@ package data;
   }
 }
 
+### 龍骸諸島用 --------------------------------------------------
+our %ryugaiRace = (
+  'ドワーフ' => '火鎚',
+  'エルフ（スノウエルフ）' => '雪人',
+  'ミアキス' => '化け猫',
+  'リルドラケン' => '龍人',
+  'ドレイク' => '龍鬼',
+);
 
 ### 部位データ --------------------------------------------------
 our %partsData = (
diff --git a/_core/lib/sw2/edit-chara-datalist.pl b/_core/lib/sw2/edit-chara-datalist.pl
index bdd276ece..5d091f920 100644
--- a/_core/lib/sw2/edit-chara-datalist.pl
+++ b/_core/lib/sw2/edit-chara-datalist.pl
@@ -35,6 +35,7 @@ sub printCharaDataList {
     <option value="1H騎">
     <option value="2H">
     <option value="2H#">
+    <option value="2H投">
     <option value="振2H">
     <option value="突2H">
   </datalist>
diff --git a/_core/lib/sw2/edit-chara-palette-option.pl b/_core/lib/sw2/edit-chara-palette-option.pl
new file mode 100644
index 000000000..698b40a90
--- /dev/null
+++ b/_core/lib/sw2/edit-chara-palette-option.pl
@@ -0,0 +1,140 @@
+use strict;
+use utf8;
+use open ":utf8";
+
+package palette;
+
+sub chatPaletteFormOptional {
+    my %pc = %{shift;};
+
+    require($::core_dir . '/lib/edit.pl');
+
+    $::pc{chatPaletteInsertNum} = ($pc{chatPaletteInsertNum} ||= 2);
+    $::pc{paletteAttackNum} = ($pc{paletteAttackNum} ||= 3);
+    $::pc{paletteMagicNum} = ($pc{paletteMagicNum} ||= 3);
+    my $html = <<"HTML";
+<div class="box" id="palette-optional">
+    <h2>プリセットの追加オプション</h2>
+    <div id="palette-common-classes">
+        <h3>一般技能の判定の出力設定</h3>
+        <p>その行の技能のレベルと、選択したボーナスの組み合わせが追加されます</p>
+        <table class="edit-table side-margin">
+            <tbody class="highlight-hovered-row">
+HTML
+    foreach ('TMPL',1 .. $pc{commonClassNum}){
+        $html .= '<template id="palette-common-class-template">' if $_ eq 'TMPL';
+        $html .= '<tr id="palette-common-class-row'.$_.'"><td class="name">'.($pc{"commonClass$_"} =~ s/[(（].+?[）)]$//r).'</td>';
+        $html .= '<td class="left">';
+        $html .= ::checkbox("paletteCommonClass${_}Dex", '器用度B', 'setChatPalette');
+        $html .= ::checkbox("paletteCommonClass${_}Agi", '敏捷度B', 'setChatPalette');
+        $html .= ::checkbox("paletteCommonClass${_}Str", '筋力B'  , 'setChatPalette');
+        $html .= ::checkbox("paletteCommonClass${_}Vit", '生命力B', 'setChatPalette');
+        $html .= ::checkbox("paletteCommonClass${_}Int", '知力B'  , 'setChatPalette');
+        $html .= ::checkbox("paletteCommonClass${_}Mnd", '精神力B', 'setChatPalette');
+        $html .= '</template>' if $_ eq 'TMPL';
+    }
+    $html .= <<"HTML";
+          </table>
+        </div>
+        <details id="palette-insert" @{[ $pc{chatPaletteInsert1} ? 'open' : '' ]}>
+          <summary class="header2">追加挿入</summary>
+          <ul>
+HTML
+    foreach ('TMPL',1 .. $pc{chatPaletteInsertNum}){
+        $html .= '<template id="palette-insert-template">' if $_ eq 'TMPL';
+        $html .= "<li>"
+            . ::selectBox("chatPaletteInsert${_}Position", 'setChatPalette', 'def=|<先頭>','general|<非戦闘系の直後>','common|<一般技能の直後>','feats|<宣言特技の直後>','magic|<魔法系の直後>','attack|<武器攻撃系の直後>','defense|<抵抗回避の直後>')
+            . "に挿入"
+            . "<textarea name=\"chatPaletteInsert${_}\" onchange=\"setChatPalette()\">$pc{'chatPaletteInsert'.$_}</textarea>";
+        $html .= '</template>' if $_ eq 'TMPL';
+    }
+    $html .= <<"HTML";
+          </ul>
+          <div class="add-del-button"><a onclick="addChatPaletteInsert()">▼</a><a onclick="delChatPaletteInsert()">▲</a></div>
+          @{[ ::input "chatPaletteInsertNum","hidden" ]}
+        </details>
+        <details id="palette-attack" @{[ $pc{"paletteAttack1Name"} ? 'open' : '' ]}>
+          <summary class="header2">武器攻撃の追加オプション</summary>
+          <p>宣言特技などの名称と修正を入力すると、それにもとづいた命中判定および威力算出の行が追加されます。</p>
+          <table class="edit-table side-margin">
+            <thead>
+              <tr>
+                <th>
+                <th class="name  ">名称（宣言特技名など）
+                <th class="acc   ">命中修正
+                <th class="crit  ">C値修正
+                <th class="dmg   "><span class="small">ダメージ<br>修正</span>
+                <th class="roll  ">出目修正
+                <th class="target">対象の武器
+            <tbody class="highlight-hovered-row">
+HTML
+    foreach ('TMPL',1 .. $pc{paletteAttackNum}){
+        $html .= '<template id="palette-attack-template">' if $_ eq 'TMPL';
+        $html .= '<tr id="palette-attack-row'.$_.'">';
+        $html .= '<td class="handle">';
+        $html .= '<td>'.::input("paletteAttack${_}Name",'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteAttack${_}Acc" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteAttack${_}Crit",'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteAttack${_}Dmg" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteAttack${_}Roll",'','','onchange="setChatPalette()"');
+        $html .= '<td class="palette-attack-checklist left">';
+        my %added;
+        foreach my $num (1 .. $pc{weaponNum}) {
+            my $name = $pc{"weapon${num}Name"}.$pc{"weapon${num}Usage"} || '―';
+            next if $added{$name};
+            $html .= ::checkbox("paletteAttack${_}CheckWeapon${num}",$name,'setChatPalette');
+            $added{$name} = 1;
+        }
+        $html .= '</template>' if $_ eq 'TMPL';
+    }
+    $html .= <<"HTML";
+          </table>
+          <div class="add-del-button"><a onclick="addPaletteAttack()">▼</a><a onclick="delPaletteAttack()">▲</a></div>
+          @{[ ::input "paletteAttackNum","hidden" ]}
+        </details>
+        <details id="palette-magic" @{[ $pc{"paletteMagic1Name"} ? 'open' : '' ]}>
+          <summary class="header2">魔法の追加オプション</summary>
+          <p>宣言特技などの名称と修正を入力すると、それにもとづいた、行使判定および威力算出の行が追加されます。</p>
+          <table class="edit-table side-margin">
+            <thead>
+              <tr>
+                <th>
+                <th class="name ">名称（宣言特技名など）
+                <th class="power">魔力修正
+                <th class="cast ">行使修正
+                <th class="rate ">威力修正
+                <th class="crit ">C値修正
+                <th class="dmg  "><span class="small">ダメージ<br>修正</span>
+                <th class="roll ">出目修正
+                <th class="target">対象の魔法
+            <tbody class="highlight-hovered-row">
+HTML
+    foreach ('TMPL',1 .. $pc{paletteMagicNum}){
+        $html .= '<template id="palette-magic-template">' if $_ eq 'TMPL';
+        $html .= '<tr id="palette-magic-row'.$_.'">';
+        $html .= '<td class="handle">';
+        $html .= '<td>'.::input("paletteMagic${_}Name" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Power",'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Cast" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Rate" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Crit" ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Dmg"  ,'','','onchange="setChatPalette()"');
+        $html .= '<td>'.::input("paletteMagic${_}Roll" ,'','','onchange="setChatPalette()"');
+        $html .= '<td class="palette-magic-checklist left">';
+        foreach my $name (@data::class_caster){
+            next if (!$data::class{$name}{magic}{jName});
+            my $id    = $data::class{$name}{id};
+            $html .= ::checkbox("paletteMagic${_}Check$id",$data::class{$name}{magic}{jName},'setChatPalette');
+        }
+        $html .= '</template>' if $_ eq 'TMPL';
+    }
+    $html .= <<"HTML";
+          </table>
+          <div class="add-del-button"><a onclick="addPaletteMagic()">▼</a><a onclick="delPaletteMagic()">▲</a></div>
+          @{[ ::input "paletteMagicNum","hidden" ]}
+        </details>
+      </div>
+HTML
+}
+
+1;
diff --git a/_core/lib/sw2/edit-chara.js b/_core/lib/sw2/edit-chara.js
index 2cb6dc37d..c9c33ae26 100644
--- a/_core/lib/sw2/edit-chara.js
+++ b/_core/lib/sw2/edit-chara.js
@@ -43,6 +43,15 @@ const expTable = {
      80500,
     105500
   ],
+  'R' : [
+        0,
+     1500, 
+     3000,
+     5000,
+     7500,
+    10500,
+    14500
+  ],
   'S' : [
          0,
       3000,
@@ -91,6 +100,8 @@ window.onload = function() {
   calcCommonClass();
   checkEffectAll();
   setupBracketInputCompletion();
+
+  if(form.unlockRyugai?.checked){ checkRyugai() }
   
   imagePosition();
   changeColor();
@@ -113,9 +124,9 @@ function formCheck(){
 
 // レギュレーション ----------------------------------------
 function changeRegu(){
-  document.getElementById("history0-exp").textContent = form.history0Exp.value;
-  document.getElementById("history0-honor").textContent = form.history0Honor.value;
-  document.getElementById("history0-money").textContent = form.history0Money.value;
+  document.getElementById("history0-exp").textContent = commify(form.history0Exp.value);
+  document.getElementById("history0-honor").textContent = commify(form.history0Honor.value);
+  document.getElementById("history0-money").textContent = commify(form.history0Money.value);
   
   calcExp();
   calcLv();
@@ -128,6 +139,41 @@ function changeFaith(obj) {
   obj.parentNode.classList.toggle('free', obj.value === 'その他の信仰');
 }
 
+// 『龍骸諸島』用項目の解禁 ----------------------------------------
+function checkRyugai(){
+  const checkbox = form.unlockRyugai;
+  const unlockedRyugai = checkbox?.checked ?? true;
+  document.getElementById('classes-extra').classList.toggle('hidden', !unlockedRyugai);
+  document.querySelector('#honor > dl.box dt').textContent = unlockedRyugai ? '誉れ' :'名誉点';
+  document.querySelector('#honor > div').classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#honor-items h2').textContent = unlockedRyugai ? '誉れ装備・誉れ称号' :'名誉アイテム';
+  document.querySelector('#honor-items tr:has(#rank-honor-value)'        ).classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#honor-items tr:has(#rankBarbaros-honor-value)').classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#honor-offset dt:first-of-type').textContent = unlockedRyugai ? '名折れ相殺' :'不名誉点相殺';
+  document.querySelector('#honor-offset dt:last-of-type ').classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#honor-offset dd:last-of-type ').classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#dishonor > dl.box dt').textContent = unlockedRyugai ? '名折れ' :'不名誉点';
+  document.querySelector('#dishonor > dl:has(#notoriety)').classList.toggle('hidden', unlockedRyugai);
+  document.querySelector('#dishonor-items h2').textContent = unlockedRyugai ? '名折れ詳細' :'名誉アイテム';
+  document.querySelector('#history-head .honor').textContent = unlockedRyugai ? '誉れ' :'名誉点';
+  document.querySelector('#history-foot .honor').textContent = unlockedRyugai ? '誉れ' :'名誉点';
+
+  if(unlockedRyugai){
+    for (const option of form.race.options) {
+      if (SET.ryugaiRace.hasOwnProperty(option.value)) {
+        option.text = SET.ryugaiRace[option.value]+'<'+option.value+'>';
+      }
+    }
+  }
+  else {
+    for (const option of form.race.options) {
+      if (SET.ryugaiRace.hasOwnProperty(option.value)) {
+        option.text = option.value;
+      }
+    }
+  }
+}
+
 // 16レベル以上の解禁 ----------------------------------------
 function checkLvCap() {
   const checkbox = form.unlockAbove16;
@@ -449,6 +495,7 @@ function setLanguageDefault(){
 }
 // ステータス計算 ----------------------------------------
 let reqdStr = 0;
+let reqdMnd = 0;
 let reqdStrHalf = 0;
 let stt = {};
 let bonus = {}
@@ -540,6 +587,7 @@ function calcStt() {
   }
   
   reqdStr = stt.totalStr;
+  reqdMnd = stt.totalMnd;
   reqdStrHalf = Math.ceil(reqdStr / 2);
   
   checkFeats();
@@ -559,6 +607,17 @@ function checkFeats(){
   console.log('checkFeats()');
   feats = {};
 
+  // 自動習得
+  for(const key of SET.classNames){
+    const cId  = SET.class[key].id;
+    for(const data of SET.class[key]?.feats || []){
+      if(lv[cId] >= data[1]){
+        feats[data[0]] = true;
+      }
+    }
+  }
+
+  // 選択習得
   const featsVagrantsOn = form.featsVagrantsOn.checked;
   const featsZeroOn     = form.featsZeroOn.checked;
   document.querySelectorAll(`#combat-feats option.vagrants` ).forEach(obj=>{ obj.style.display = featsVagrantsOn ? '' : 'none'; });
@@ -1015,7 +1074,7 @@ function checkFeats(){
         if     (RegExp.$1 === 'Ａ'){ feats['武器習熟／'+RegExp.$2] += 1; }
         else if(RegExp.$1 === 'Ｓ'){ feats['武器習熟／'+RegExp.$2] += 2; }
       }
-      else if(feat.match(/防具習熟(Ａ|Ｓ)／(金属鎧|非金属鎧|盾)/)){
+      else if(feat.match(/防具習熟(Ａ|Ｓ)／(金属鎧|非金属鎧|盾|龍骸)/)){
         feats['防具習熟／'+RegExp.$2] ||= 0;
         if     (RegExp.$1 === 'Ａ'){ feats['防具習熟／'+RegExp.$2] += 1; }
         else if(RegExp.$1 === 'Ｓ'){ feats['防具習熟／'+RegExp.$2] += 2; }
@@ -1123,7 +1182,7 @@ function calcSubStt() {
   subStt.mpBase = 
     (raceAbilities.includes('溢れるマナ')) ? (level * 3 + stt.totalMnd)
     : ( levelCasters.reduce((a,x) => a+x,0) * 3 + stt.totalMnd );
-  subStt.hpAutoAdd = (feats['頑強'] || 0) + (lv['Fig'] >= 7 ? 15 : 0) + seekerHpMpAdd;
+  subStt.hpAutoAdd = (feats['頑強'] || 0) + (feats['タフネス'] ? 15 : 0) + seekerHpMpAdd;
   subStt.mpAutoAdd = (feats['キャパシティ'] || 0) + raceAbilityMp     + seekerHpMpAdd;
   subStt.hpAccessory = 0;
   subStt.mpAccessory = 0;
@@ -1184,7 +1243,7 @@ function calcPackage() {
       
       let rows = 0;
       for(const pId in pData){
-        let autoBonus = 0;
+        let autoBonus = pData[pId]?.mod || 0;
         let disabled = false;
         if(pData[pId].unlockCraft && !crafts[pData[pId].unlockCraft]){
           disabled = true;
@@ -1218,6 +1277,7 @@ function calcMagic() {
   const addCast = Number(form.magicCastAdd.value)+(equipMod.MagicCast||0);
   const addDamage = Number(form.magicDamageAdd.value)+(equipMod.MagicDamage||0);
 
+  document.getElementById("magic-power-magicenhance-value").textContent = feats['魔力強化']||0;
   document.getElementById("magic-power-equip-value" ).textContent = formatNumber(equipMod.MagicPower );
   document.getElementById("magic-cast-equip-value"  ).textContent = formatNumber(equipMod.MagicCast  );
   document.getElementById("magic-damage-equip-value").textContent = formatNumber(equipMod.MagicDamage);
@@ -1382,8 +1442,8 @@ function calcParts(){
     }
     // コア
     if(form.partCore.value == num){
-      hp += subStt.hpBase + subStt.hpAutoAdd - stt.addD - equipMod.D + Number(form.sttPartD.value||0);
-      mp += subStt.mpBase + subStt.mpAutoAdd - stt.addF - equipMod.F + Number(form.sttPartF.value||0);
+      hp += subStt.hpBase + subStt.hpAutoAdd - stt.addD - (equipMod.D ?? 0) + Number(form.sttPartD.value||0);
+      mp += subStt.mpBase + subStt.mpAutoAdd - stt.addF - (equipMod.F ?? 0) + Number(form.sttPartF.value||0);
       if(raceAbilities.includes('蠍人の身体')){
         def = 0;
         hp += subStt.hpAccessory;
@@ -1469,14 +1529,14 @@ function calcAttack() {
     document.getElementById(`attack-${eName}`).style.display = display;
 
     document.getElementById(`attack-${eName}-str`).textContent
-      = (id == 'Fen' ? reqdStrHalf
-      : SET.class[name]?.accUnlock?.reqd ? stt['total'+SET.class[name]?.accUnlock?.reqd]
-      : reqdStr)
-      + (equipMod.WeaponReqd ? `+${equipMod.WeaponReqd}` : '');
+      = ( SET.class[name]?.reqdHalf ? reqdStrHalf
+        : SET.class[name]?.accUnlock?.reqd ? stt['total'+SET.class[name]?.accUnlock?.reqd]
+        : reqdStr
+      ) + (equipMod.WeaponReqd ? `+${equipMod.WeaponReqd}` : '');
     
     document.getElementById(`attack-${eName}-acc`).textContent
       = SET.class[name]?.accUnlock?.acc === 'power' ? magicPowers[id]
-      : lv[id] + bonus.Dex;
+      : lv[id] + bonus.Dex + (SET.class[name]?.accUnlock?.mod || 0);
     
     document.getElementById(`attack-${eName}-dmg`).textContent
       = SET.class[name]?.accUnlock?.dmg === 'power' ? magicPowers[id]
@@ -1509,7 +1569,8 @@ function calcWeapon() {
     const category = form["weapon"+i+"Category"].value;
     const ownDex = form["weapon"+i+"Own"].checked ? 2 : 0;
     const note = form["weapon"+i+"Note"].value;
-    const weaponReqd = safeEval(form["weapon"+i+"Reqd"].value) || 0;
+    const weaponReqdRaw = form["weapon"+i+"Reqd"]?.value?.toString();
+    const weaponReqd = (weaponReqdRaw.match(/^(\d+)w$/i) ? safeEval(RegExp.$1) : safeEval(weaponReqdRaw)) || 0;
     const classLv = lv[ SET.class[className]?.id ] || 0;
     let dex = (partNum ? stt.Dex+Number(form.sttPartA.value || 0) : stt.totalDex);
     let str = (partNum ? stt.Str+Number(form.sttPartC.value || 0) : stt.totalStr);
@@ -1519,9 +1580,11 @@ function calcWeapon() {
     form["weapon"+i+"Class"].classList.toggle('error', errorAccClass[className] == true); 
     // 必筋チェック
     const maxReqd
-      = (className === "フェンサー") ? reqdStrHalf
+      = SET.class[className]?.reqdHalf ? reqdStrHalf
+      : /^\d+w$/i.test(weaponReqdRaw) ? reqdMnd
       : SET.class[className]?.accUnlock?.reqd ? stt['total'+SET.class[className]?.accUnlock?.reqd]
       : reqdStr;
+      console.log(maxReqd)
     form["weapon"+i+"Reqd"].classList.toggle('error', weaponReqd > maxReqd + (equipMod.WeaponReqd||0));
     // 基礎命中
     if(SET.class[className]?.accUnlock?.acc === 'power'){
@@ -1530,6 +1593,7 @@ function calcWeapon() {
     else if(classLv) {
       accBase += classLv + parseInt((dex + ownDex) / 6);
     }
+    accBase += SET.class[className]?.accUnlock?.mod || 0;
     // 基礎ダメージ
     if     (category === 'クロスボウ'){ dmgBase = modeZero ? 0 : classLv; }
     else if(category === 'ガン')      { dmgBase = magicPowers['Mag']; }
@@ -1599,8 +1663,8 @@ function calcDefense() {
     }
     if(display == 'none'){ errorEvaClass[name] = true; }
     document.getElementById(`evasion-${eName}`).style.display = display;
-    document.getElementById(`evasion-${eName}-str`).textContent = id == 'Fen' ? reqdStrHalf : reqdStr;
-    document.getElementById(`evasion-${eName}-eva`).textContent = lv[id] + bonus.Agi;
+    document.getElementById(`evasion-${eName}-str`).textContent = SET.class[name]?.reqdHalf ? reqdStrHalf : reqdStr;
+    document.getElementById(`evasion-${eName}-eva`).textContent = lv[id] + bonus.Agi + (SET.class[name]?.evaUnlock?.mod || 0);
   }
   document.getElementById("evasion-demonruler").style.display = !modeZero && lv['Dem'] >= 2 ? "" : modeZero && lv['Dem'] > 7 ? "" :"none";
   document.getElementById("evasion-demonruler-str").textContent = reqdStr;
@@ -1624,10 +1688,12 @@ function calcDefense() {
   document.getElementById("mastery-metalarmour").style.display    = feats['防具習熟／金属鎧']   > 0 ? "" :"none";
   document.getElementById("mastery-nonmetalarmour").style.display = feats['防具習熟／非金属鎧'] > 0 ? "" :"none";
   document.getElementById("mastery-shield").style.display         = feats['防具習熟／盾']       > 0 ? "" :"none";
+  document.getElementById("mastery-ryugaiarmour").style.display   = feats['防具習熟／龍骸']     > 0 ? "" :"none";
   document.getElementById("mastery-artisan-def").style.display    = feats['魔器習熟']           > 0 ? "" :"none";
   document.getElementById("mastery-metalarmour-value").textContent    = feats['防具習熟／金属鎧']   || 0;
   document.getElementById("mastery-nonmetalarmour-value").textContent = feats['防具習熟／非金属鎧'] || 0;
   document.getElementById("mastery-shield-value").textContent         = feats['防具習熟／盾']       || 0;
+  document.getElementById("mastery-ryugaiarmour-value").textContent   = feats['防具習熟／龍骸']     || 0;
   document.getElementById("mastery-artisan-def-value").textContent    = feats['魔器習熟']           || 0;
   // 回避行動
   evaAdd += feats['回避行動'] || 0;
@@ -1684,12 +1750,12 @@ function calcArmour(evaAdd,defBase) {
     form['evasionClass'+i].classList.toggle('error', errorEvaClass[className] == true); 
 
     // 最大必筋
-    const maxReqd = (className === "フェンサー") ? reqdStrHalf : reqdStr;
+    const maxReqd = (SET.class[className]?.reqdHalf) ? reqdStrHalf : reqdStr;
 
     // 計算
     const classLv = lv[SET.class[className]?.id] || 0;
 
-    let eva = 0;
+    let eva = (SET.class[className]?.evaUnlock?.mod || 0);
     let def = 0;
     let agi = (partNum ? stt.Agi+Number(form.sttPartB.value || 0) : stt.totalAgi);
     if(!partNum || partNum == form.partCore.value) {
@@ -1826,24 +1892,28 @@ function calcHonor(){
     form['honorItem'+i+'Pt'].classList.toggle('mark', (point && point <= free));
   }
   // 流派
-  let mysticArtsPt = 0;
+  let mysticArtsPt = null;
   for (let i = 1; i <= form.mysticArtsNum.value; i++){
+    if ((form[`mysticArts${i}`].value ?? '') === '') { continue }
     let point = safeEval(form['mysticArts'+i+'Pt'].value) || 0;
+    mysticArtsPt ??= 0;
     mysticArtsPt += point;
     form['mysticArts'+i+'Pt'].classList.toggle('mark', (point && point <= free));
   }
   for (let i = 1; i <= form.mysticMagicNum.value; i++){
+    if ((form[`mysticMagic${i}`].value ?? '') === '') { continue }
     let point = safeEval(form['mysticMagic'+i+'Pt'].value) || 0;
+    mysticArtsPt ??= 0;
     mysticArtsPt += point;
     form['mysticMagic'+i+'Pt'].classList.toggle('mark', (point && point <= free));
   }
-  pointTotal -= mysticArtsPt;
+  pointTotal -= mysticArtsPt ?? 0;
   //
   pointTotal -= Number(form.honorOffset.value) + Number(form.honorOffsetBarbaros.value);
   document.getElementById("honor-value"   ).textContent = pointTotal;
   document.getElementById("honor-value-MA").textContent = pointTotal;
   document.getElementById("mystic-arts-honor-value").textContent = mysticArtsPt;
-  document.getElementById('honor-items-mystic-arts').style.display = mysticArtsPt ? '' : 'none';
+  document.getElementById('honor-items-mystic-arts').style.display = mysticArtsPt != null ? '' : 'none';
 }
 // 不名誉点計算
 function calcDishonor(){
@@ -2445,6 +2515,12 @@ function checkEquipMod (){
   console.log('checkEquipMod()');
   // 装飾品欄の補正
   const sttRegEx = [
+    ['A:increment','器(?:用度?)?増強'],
+    ['B:increment','敏(?:捷度?)?増強'],
+    ['C:increment','筋(?:力)?増強'],
+    ['D:increment','生(?:命力)?増強'],
+    ['E:increment','知力?増強'],
+    ['F:increment','精(?:神力?)?増強'],
     ['A','器(?:用度?)?'],
     ['B','敏(?:捷度?)?'],
     ['C','筋(?:力)?'],
@@ -2462,6 +2538,7 @@ function checkEquipMod (){
     ['WeaponReqd','武器(?:必要筋力|必筋)上限'],
   ];
   let newMod = {};
+  const statusIncrement = {};
   document.querySelectorAll(':is(#weapons-table, #armours-table, #accessories-table) input[name$="Note"]').forEach(
     input => {
       const note = input.value ?? '';
@@ -2475,12 +2552,22 @@ function checkEquipMod (){
         const m = note.match('[@＠]'+i[1]+'([＋+－-][0-9]+)');
         if (m != null) {
           console.log(m[0],m[1])
+          const value = parseInt(m[1].replace(/[＋]/,"+").replace(/－/,"-") || 0);
           newMod[i[0]] ??= 0;
-          newMod[i[0]] += parseInt(m[1].replace(/[＋]/,"+").replace(/－/,"-") || 0);
+          newMod[i[0]] += value;
+
+          if (i[0].endsWith(':increment')) {
+            const key = i[0].replace(/:increment$/, '');
+            statusIncrement[key] = Math.max(statusIncrement[key] ?? 0, value);
+          }
         }
       }
     }
   );
+  for (const [key, value] of Object.entries(statusIncrement)) {
+    newMod[key] ??= 0;
+    newMod[key] += value;
+  }
   let hasChange;
   for(let i of sttRegEx){
     if(parseInt(newMod[i[0]]||0) !== parseInt(equipMod[i[0]]||0)){
@@ -2611,6 +2698,7 @@ setSortable('paletteAttack','#palette-attack > table tbody','tr');
 // 魔法
 function addPaletteMagic(){
   document.querySelector("#palette-magic > table tbody").append(createRow('palette-magic','paletteMagicNum'));
+  calcMagic();
 }
 function delPaletteMagic(){
   if(delRow('paletteMagicNum', '#palette-magic > table tbody tr:last-of-type')){
diff --git a/_core/lib/sw2/edit-chara.pl b/_core/lib/sw2/edit-chara.pl
index 3bc3f9d23..6dce0b068 100644
--- a/_core/lib/sw2/edit-chara.pl
+++ b/_core/lib/sw2/edit-chara.pl
@@ -110,11 +110,15 @@
 
 $pc{accuracyEnhance} ||= 0;
 $pc{evasiveManeuver} ||= 0;
-$pc{tenacity} ||= 0;
-$pc{capacity} ||= 0;
 
 $pc{unlockAbove16} = 1 if $pc{level} > 15;
 
+foreach my $name (@data::class_names){
+  if ($data::class{$name}{type} eq 'extra' && $pc{'lv'.$data::class{$name}{id}}){
+    $pc{unlockRyugai} = 1;
+  }
+}
+
 ### 改行処理 --------------------------------------------------
 $pc{words}           =~ s/&lt;br&gt;/\n/g;
 $pc{items}           =~ s/&lt;br&gt;/\n/g;
@@ -304,7 +308,10 @@
         </dl>
         <ul class="annotate"><li>経験点は、初期所有技能のぶんを含みます。</ul>
         <dl class="regulation-note"><dt>備考<dd>@{[ input "history0Note" ]}</dl>
-        @{[ checkbox 'unlockAbove16','16レベル以上を解禁する（2.0の超越者ルールの流用）','checkLvCap' ]}
+        <ul class="regulation-others">
+          <li class="left">@{[ checkbox 'unlockRyugai','『龍骸諸島』用項目の表示（および一部項目名の変更）','checkRyugai' ]}
+          <li class="left">@{[ checkbox 'unlockAbove16','16レベル以上の解禁（2.0の超越者ルールの流用）','checkLvCap' ]}
+        </ul>
       </details>
       <div id="area-status">
         @{[ imageForm($pc{imageURL}) ]}
@@ -465,9 +472,12 @@
 print '<div class="classes-group" id="classes-magic-user"><h3>魔法使い系技能</h3><dl class="edit-table side-margin">';
 foreach my $name (@data::class_names){ print classInputBox($name) if $data::class{$name}{type} eq 'magic-user'; }
 print '</dl></div>';
-print '<div class="classes-group" id="classes-other-user"><h3>その他系技能</h3><dl class="edit-table side-margin">';
+print '<div class="classes-group" id="classes-others"><h3>その他系技能</h3><dl class="edit-table side-margin">';
 foreach my $name (@data::class_names){ print classInputBox($name) if !$data::class{$name}{type}; }
 print '</dl></div>';
+print '<div class="classes-group hidden" id="classes-extra"><h3>龍骸技能</h3><dl class="edit-table side-margin">';
+foreach my $name (@data::class_names){ print classInputBox($name) if $data::class{$name}{type} eq 'extra'; }
+print '</dl></div>';
 
 sub classInputBox {
   my $name = shift;
@@ -479,12 +489,11 @@ sub classInputBox {
   $out .= '>';
   $out .= '[2.0] ' if $data::class{$name}{'2.0'};
   $out .= $name;
-  $out .= '<select name="faithType" style="width:auto;">'.option('faithType','†|<†セイクリッド系>','‡|<‡ヴァイス系>','†‡|<†‡両系統使用可>').'</select>' if($name eq 'プリースト');
+  $out .= '<select name="faithType" style="width: calc(100% - 7em);">'.option('faithType','†|<†セイクリッド系>','‡|<‡ヴァイス系>','†‡|<†‡両系統使用可>').'</select>' if($name eq 'プリースト');
   $out .= '<dd>' . input("lv${id}", 'number','changeLv','min="0" max="17"');
   return $out;
 }
 print <<"HTML";
-            </dl>
           </div>
           <div class="box" id="common-classes">
             <h2>
@@ -958,7 +967,7 @@ sub classInputBox {
                 <td id="attack-${ename}-str">0
                 <td id="attack-${ename}-acc">0
                 <td>―
-                <td>@{[ $name eq 'フェンサー' ? '-1' : '―' ]}
+                <td>@{[ $data::class{$name}{critMod} || '―' ]}
                 <td id="attack-${ename}-dmg">―
 HTML
 }
@@ -1109,6 +1118,11 @@ sub classInputBox {
                 <td>―
                 <td>―
                 <td id="mastery-shield-value">$pc{masteryShield}
+              <tr id="mastery-ryugaiarmour"@{[ display $pc{masteryRyugai} ]}>
+                <td>《防具習熟／龍骸》
+                <td>―
+                <td>―
+                <td id="mastery-ryugaiarmour-value">$pc{masteryRyugai}
               <tr id="mastery-artisan-def"@{[ display $pc{masteryArtisan} ]}>
                 <td>《魔器習熟》
                 <td>―
@@ -1159,7 +1173,7 @@ sub classInputBox {
   print <<"HTML";
               <tr id="armour-row${num}" data-type="">
                 <th class="type handle">
-                <td><select name="armour${num}Category" oninput="setArmourType();changeArmourName();calcDefense();calcMobility()">@{[ option "armour${num}Category",'金属鎧','非金属鎧','盾','その他' ]}</select>
+                <td><select name="armour${num}Category" oninput="setArmourType();changeArmourName();calcDefense();calcMobility()">@{[ option "armour${num}Category",'金属鎧','非金属鎧','盾','龍骸','その他' ]}</select>
                 <td>@{[ input "armour${num}Name",'','changeArmourName','list="list-item-name"' ]}
                 <td>@{[ input "armour${num}Reqd",'','calcDefense' ]}
                 <td>@{[ input "armour${num}Eva",'number','calcDefense' ]}
@@ -1328,7 +1342,8 @@ sub classInputBox {
             <li>
               <code>\@器用度+1</code>や<code>\@防護点+1</code>のように記述すると、<span class="text-em">常時</span>有効な上昇効果が自動計算されます。<br>
               有効な項目は、<code>器用度</code>～<code>精神力</code> <code>生命抵抗力</code> <code>精神抵抗力</code> <code>回避力</code> <code>防護点</code> <code>移動力</code> <code>魔力</code> <code>行使判定</code> <code>武器必筋上限</code>です。<br>
-              同じ項目へは累積するため、同名や効果排他のアイテムには注意してください。
+              同じ項目へは累積するため、同名や効果排他のアイテムには注意してください。<br>
+              能力値の増強にかぎり、<code>\@筋力増強+2</code>のように<code>増強</code>の文言を記述することで、能力値ごとに最大の値のみを採用できます。
           </ul>
         </div>
       </div>
@@ -1485,9 +1500,9 @@ sub classInputBox {
               <td>-
               <td>
               <td>キャラクター作成
-              <td id="history0-exp">$pc{history0Exp}
-              <td id="history0-money">$pc{history0Money}
-              <td id="history0-honor">$pc{history0Honor}
+              <td id="history0-exp">@{[commify $pc{history0Exp}]}
+              <td id="history0-money">@{[commify $pc{history0Money}]}
+              <td id="history0-honor">@{[commify $pc{history0Honor}]}
               <td id="history0-grow">$pc{history0Grow}
             </tr>
 HTML
@@ -1676,128 +1691,8 @@ sub classInputBox {
     </article>
 HTML
 sub chatPaletteFormOptional {
-  $pc{chatPaletteInsertNum} ||= 2;
-  $pc{paletteAttackNum} ||= 3;
-  $pc{paletteMagicNum} ||= 3;
-  my $html = <<"HTML";
-      <div class="box" id="palette-optional">
-        <h2>プリセットの追加オプション</h2>
-        <div id="palette-common-classes">
-          <h3>一般技能の判定の出力設定</h3>
-          <p>その行の技能のレベルと、選択したボーナスの組み合わせが追加されます</p>
-          <table class="edit-table side-margin">
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{commonClassNum}){
-    $html .= '<template id="palette-common-class-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-common-class-row'.$_.'"><td class="name">'.($pc{"commonClass$_"} =~ s/[(（].+?[）)]$//r).'</td>';
-    $html .= '<td class="left">';
-    $html .= checkbox("paletteCommonClass${_}Dex", '器用度B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Agi", '敏捷度B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Str", '筋力B'  , 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Vit", '生命力B', 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Int", '知力B'  , 'setChatPalette');
-    $html .= checkbox("paletteCommonClass${_}Mnd", '精神力B', 'setChatPalette');
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-        </div>
-        <details id="palette-insert" @{[ $pc{chatPaletteInsert1} ? 'open' : '' ]}>
-          <summary class="header2">追加挿入</summary>
-          <ul>
-HTML
-  foreach ('TMPL',1 .. $pc{chatPaletteInsertNum}){
-    $html .= '<template id="palette-insert-template">' if $_ eq 'TMPL';
-    $html .= "<li>"
-      . selectBox("chatPaletteInsert${_}Position", 'setChatPalette', 'def=|<先頭>','general|<非戦闘系の直後>','common|<一般技能の直後>','feats|<宣言特技の直後>','magic|<魔法系の直後>','attack|<武器攻撃系の直後>','defense|<抵抗回避の直後>')
-      . "に挿入"
-      . "<textarea name=\"chatPaletteInsert${_}\" onchange=\"setChatPalette()\">$pc{'chatPaletteInsert'.$_}</textarea>";
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </ul>
-          <div class="add-del-button"><a onclick="addChatPaletteInsert()">▼</a><a onclick="delChatPaletteInsert()">▲</a></div>
-          @{[ input "chatPaletteInsertNum","hidden" ]}
-        </details>
-        <details id="palette-attack" @{[ $pc{"paletteAttack1Name"} ? 'open' : '' ]}>
-          <summary class="header2">武器攻撃の追加オプション</summary>
-          <p>宣言特技などの名称と修正を入力すると、それにもとづいた命中判定および威力算出の行が追加されます。</p>
-          <table class="edit-table side-margin">
-            <thead>
-              <tr>
-                <th>
-                <th class="name  ">名称（宣言特技名など）
-                <th class="acc   ">命中修正
-                <th class="crit  ">C値修正
-                <th class="dmg   "><span class="small">ダメージ<br>修正</span>
-                <th class="roll  ">出目修正
-                <th class="target">対象の武器
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{paletteAttackNum}){
-    $html .= '<template id="palette-attack-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-attack-row'.$_.'">';
-    $html .= '<td class="handle">';
-    $html .= '<td>'.input("paletteAttack${_}Name",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Acc" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Crit",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Dmg" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteAttack${_}Roll",'','','onchange="setChatPalette()"');
-    $html .= '<td class="palette-attack-checklist left">';
-    my %added;
-    foreach my $num (1 .. $pc{weaponNum}) {
-      my $name = $pc{"weapon${num}Name"}.$pc{"weapon${num}Usage"} || '―';
-      next if $added{$name};
-      $html .= checkbox("paletteAttack${_}CheckWeapon${num}",$name,'setChatPalette');
-      $added{$name} = 1;
-    }
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-          <div class="add-del-button"><a onclick="addPaletteAttack()">▼</a><a onclick="delPaletteAttack()">▲</a></div>
-          @{[ input "paletteAttackNum","hidden" ]}
-        </details>
-        <details id="palette-magic" @{[ $pc{"paletteMagic1Name"} ? 'open' : '' ]}>
-          <summary class="header2">魔法の追加オプション</summary>
-          <p>宣言特技などの名称と修正を入力すると、それにもとづいた、行使判定および威力算出の行が追加されます。</p>
-          <table class="edit-table side-margin">
-            <thead>
-              <tr>
-                <th>
-                <th class="name ">名称（宣言特技名など）
-                <th class="power">魔力修正
-                <th class="cast ">行使修正
-                <th class="crit ">C値修正
-                <th class="dmg  "><span class="small">ダメージ<br>修正</span>
-                <th class="target">対象の魔法
-            <tbody class="highlight-hovered-row">
-HTML
-  foreach ('TMPL',1 .. $pc{paletteMagicNum}){
-    $html .= '<template id="palette-magic-template">' if $_ eq 'TMPL';
-    $html .= '<tr id="palette-magic-row'.$_.'">';
-    $html .= '<td class="handle">';
-    $html .= '<td>'.input("paletteMagic${_}Name" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Power",'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Cast" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Crit" ,'','','onchange="setChatPalette()"');
-    $html .= '<td>'.input("paletteMagic${_}Dmg"  ,'','','onchange="setChatPalette()"');
-    $html .= '<td class="palette-magic-checklist left">';
-    foreach my $name (@data::class_caster){
-      next if (!$data::class{$name}{magic}{jName});
-      my $id    = $data::class{$name}{id};
-      $html .= checkbox("paletteMagic${_}Check$id",$data::class{$name}{magic}{jName},'setChatPalette');
-    }
-    $html .= '</template>' if $_ eq 'TMPL';
-  }
-  $html .= <<"HTML";
-          </table>
-          <div class="add-del-button"><a onclick="addPaletteMagic()">▼</a><a onclick="delPaletteMagic()">▲</a></div>
-          @{[ input "paletteMagicNum","hidden" ]}
-        </details>
-      </div>
-HTML
+  require($::core_dir . '/lib/sw2/edit-chara-palette-option.pl');
+  return palette::chatPaletteFormOptional(\%pc);
 }
 
 # ヘルプ
diff --git a/_core/lib/sw2/edit-item.pl b/_core/lib/sw2/edit-item.pl
index 0a9fed7ad..584043adb 100644
--- a/_core/lib/sw2/edit-item.pl
+++ b/_core/lib/sw2/edit-item.pl
@@ -282,6 +282,7 @@
     <option value="1H騎">
     <option value="2H">
     <option value="2H#">
+    <option value="2H投">
     <option value="振2H">
     <option value="突2H">
   </datalist>
@@ -300,7 +301,7 @@
   <datalist id="list-age">
     <option value="現在">
     <option value="魔動機文明">
-    <option value="魔法文明">
+    <option value="古代魔法文明">
     <option value="神紀文明">
     <option value="不明">
   </datalist>
@@ -322,6 +323,7 @@
     <option value="〈非金属鎧〉">
     <option value="〈金属鎧〉">
     <option value="〈盾〉">
+    <option value="〈龍骸〉">
     <option value="装飾品：頭">
     <option value="装飾品：顔">
     <option value="装飾品：耳">
diff --git a/_core/lib/sw2/js-consts.pl b/_core/lib/sw2/js-consts.pl
index b2cf370b7..d659e3093 100644
--- a/_core/lib/sw2/js-consts.pl
+++ b/_core/lib/sw2/js-consts.pl
@@ -39,6 +39,7 @@
   nBRank => \@set::notoriety_barbaros_rank,
   partsData => \%data::partsData,
   effects => \%effects,
+  ryugaiRace => \%data::ryugaiRace,
 );
 print "const SET = ". JSON::PP->new->encode(\%settings);
 print "\n";
diff --git a/_core/lib/sw2/json-sub.pl b/_core/lib/sw2/json-sub.pl
index 0c70f9bd9..2db334247 100644
--- a/_core/lib/sw2/json-sub.pl
+++ b/_core/lib/sw2/json-sub.pl
@@ -26,8 +26,8 @@ sub addJsonData {
           }
         }
         if (!$pc{mount} || $pc{"status${i}Vit"} =~ /\d/) {
-          $vitresist = $pc{mount} ? $pc{"status${i}Vit"} : $pc{vitResist} . '（' . $pc{vitResistFix} . '）';
-          $mndresist = $pc{mount} ? $pc{"status${i}Mnd"} : $pc{mndResist} . '（' . $pc{mndResistFix} . '）';
+          $vitresist = $pc{mount} ? $pc{"status${i}Vit"} : $pc{vitResist} . ' (' . $pc{vitResistFix} . ')';
+          $mndresist = $pc{mount} ? $pc{"status${i}Mnd"} : $pc{mndResist} . ' (' . $pc{mndResistFix} . ')';
         }
       }
     }
@@ -39,15 +39,15 @@ sub addJsonData {
           $i .= $ii > 1 ? "-$ii" : '';
         }
       }
-      $vitresist = $pc{mount} ? $pc{"status${i}Vit"} : $pc{vitResist} . '（' . $pc{vitResistFix} . '）';
-      $mndresist = $pc{mount} ? $pc{"status${i}Mnd"} : $pc{mndResist} . '（' . $pc{mndResistFix} . '）';
+      $vitresist = $pc{mount} ? $pc{"status${i}Vit"} : $pc{vitResist} . ' (' . $pc{vitResistFix} . ')';
+      $mndresist = $pc{mount} ? $pc{"status${i}Mnd"} : $pc{mndResist} . ' (' . $pc{mndResistFix} . ')';
     }
 
     my $taxa = "分類:$pc{taxa}";
     my $data1 = "知能:$pc{intellect}　知覚:$pc{perception}".($pc{mount}?'':"　反応:$pc{disposition}");
        $data1 .= "　穢れ:$pc{sin}" if $pc{sin};
     my $data2  = "言語:$pc{language}".($pc{mount}?'':"　生息地:$pc{habitat}");
-    my $data3  = "弱点:$pc{weakness}\n".($pc{mount}?'':"先制値:$pc{initiative}　")."生命抵抗力:${vitresist}　精神抵抗力:${mndresist}";
+    my $data3  = ($pc{mount}?'':"先制値:$pc{initiative}　")."生命抵抗力:${vitresist}　精神抵抗力:${mndresist}";
     $pc{sheetDescriptionS} = $taxa."\n".$data3;
     $pc{sheetDescriptionM} = $taxa."　".$data1."\n".$data2."\n".$data3;
     
@@ -77,18 +77,31 @@ sub addJsonData {
     my $base = "種族:$pc{race}　性別:$pc{gender}　年齢:$pc{age}";
     my $sub  = "ランク:".join('／', @ranks)."　信仰:".($pc{faith}||'－')."　穢れ:".($pc{sin}||0);
     my $classes = "技能:${class_text}";
-    my $status  = "能力値:器用$pc{sttDex}".($pc{sttAddA}?"+$pc{sttAddA}":'')."\[$pc{bonusDex}\]"
-                .      "／敏捷$pc{sttAgi}".($pc{sttAddB}?"+$pc{sttAddB}":'')."\[$pc{bonusAgi}\]"
-                .      "／筋力$pc{sttStr}".($pc{sttAddC}?"+$pc{sttAddC}":'')."\[$pc{bonusStr}\]"
-                .      "／生命$pc{sttVit}".($pc{sttAddD}?"+$pc{sttAddD}":'')."\[$pc{bonusVit}\]"
-                .      "／知力$pc{sttInt}".($pc{sttAddE}?"+$pc{sttAddE}":'')."\[$pc{bonusInt}\]"
-                .      "／精神$pc{sttMnd}".($pc{sttAddF}?"+$pc{sttAddF}":'')."\[$pc{bonusMnd}\]";
+    foreach ('A' .. 'F') {
+      $pc{"sttAddTotal${_}"} += $pc{"sttEquip${_}"};
+    }
+    my $status  = "能力値:器用$pc{sttDex}".($pc{sttAddTotalA}?"+$pc{sttAddTotalA}":'')."\[$pc{bonusDex}\]"
+                .      "／敏捷$pc{sttAgi}".($pc{sttAddTotalB}?"+$pc{sttAddTotalB}":'')."\[$pc{bonusAgi}\]"
+                .      "／筋力$pc{sttStr}".($pc{sttAddTotalC}?"+$pc{sttAddTotalC}":'')."\[$pc{bonusStr}\]"
+                .      "／生命$pc{sttVit}".($pc{sttAddTotalD}?"+$pc{sttAddTotalD}":'')."\[$pc{bonusVit}\]"
+                .      "／知力$pc{sttInt}".($pc{sttAddTotalE}?"+$pc{sttAddTotalE}":'')."\[$pc{bonusInt}\]"
+                .      "／精神$pc{sttMnd}".($pc{sttAddTotalF}?"+$pc{sttAddTotalF}":'')."\[$pc{bonusMnd}\]";
     $pc{sheetDescriptionS} = $base."\n".$classes;
     $pc{sheetDescriptionM} = $base."\n".$sub."\n".$classes."\n".$status;
   }
 
   ## ユニット（コマ）用ステータス --------------------------------------------------
-  $pc{unitStatus} = createUnitStatus(\%pc, $target);
+  if ($pc{type} eq 'm' && $target eq 'ccfolia') {
+    $pc{unitStatus} = createUnitStatus(\%pc, $target);
+    #$pc{sheetDescriptionM} .= "\n".$pc{unitStatus}->{'メモ'} if $pc{unitStatus}->{'メモ'};
+    my @memo = grep { exists $_->{'メモ'} } @{$pc{unitStatus}};
+    $pc{sheetDescriptionM} .= "\n$memo[0]->{'メモ'}" if @memo && @memo[0]->{'メモ'};
+    my @array = grep { !exists $_->{'メモ'} } @{$pc{unitStatus}};
+    $pc{unitStatus} = \@array;
+  }
+  else {
+    $pc{unitStatus} = createUnitStatus(\%pc, $target);
+  }
   
   return \%pc;
 }
diff --git a/_core/lib/sw2/list-mons.pl b/_core/lib/sw2/list-mons.pl
index 1f984429c..e7e167ac2 100644
--- a/_core/lib/sw2/list-mons.pl
+++ b/_core/lib/sw2/list-mons.pl
@@ -242,9 +242,13 @@ sub lvMaxCheck {
     next;
   }
 
+  # 適正レベル
+  $lv =~ s/^(\d+)-(\d+)$/$1～$2/;
+
   # 価格
   $price =~ s#^／#―／#;
   $price =~ s#／$#／―#;
+  $price = commify($price);
 
   #タグ
   my $tags_links;
diff --git a/_core/lib/sw2/palette-sub.pl b/_core/lib/sw2/palette-sub.pl
index 28fe4eb90..10f57c1ad 100644
--- a/_core/lib/sw2/palette-sub.pl
+++ b/_core/lib/sw2/palette-sub.pl
@@ -192,21 +192,33 @@ sub palettePreset {
   ## ＰＣ
   if(!$type){
     $text .= appendPaletteInsert('');
+    $text .= "//行為判定修正=0\n";
+    $text .= "//行動判定修正=0\n";
     # 基本判定
-    $text .= "### ■非戦闘系\n";
-    $text .= "2d+{冒険者}+{器用B} 冒険者＋器用\n";
-    $text .= "2d+{冒険者}+{敏捷B} 冒険者＋敏捷\n";
-    $text .= "2d+{冒険者}+{筋力B} 冒険者＋筋力\n";
-    $text .= "2d+{冒険者}+{知力B} 冒険者＋知力\n";
+    $text .= "### ■非戦闘系";
+    $text .= "・魔物知識" if $::pc{monsterLore};
+    $text .= "・先制" if $::pc{initiative};
+    $text .= "\n";
+    foreach my $statusName ('器用', '敏捷', '筋力', '生命', '知力','精神') {
+      $text .= "2d+{冒険者}+{${statusName}B}+{行為判定修正}+{行動判定修正} 冒険者＋${statusName}\n";
+    }
     foreach my $class (@classNames){
       my $c_id = $data::class{$class}{id};
       next if !$data::class{$class}{package} || !$::pc{'lv'.$c_id};
       my %data = %{$data::class{$class}{package}};
       foreach my $p_id (sort{$data{$a}{stt} cmp $data{$b}{stt} || $data{$a} cmp $data{$b}} keys %data){
+        if ($data{$p_id}{unlockCraft}) {
+          my $craftEName = $data::class{$class}{craft}{eName};
+          my $craftNum = $::pc{"lv${c_id}"} + ($::pc{"${craftEName}Addition"} // 0);
+
+          # 条件となる技芸を習得していなければ出力しない.
+          next unless grep { $::pc{"craft@{[ucfirst($craftEName)]}${_}"} eq $data{$p_id}{unlockCraft} } (1 .. $craftNum);
+        }
+
         my $name = $class.$data{$p_id}{name};
-        $text .= "2d+{$name} $name\n";
-        if($data{$p_id}{monsterLore} && $::pc{monsterLoreAdd}){ $text .= "2d+{$name}+$::pc{monsterLoreAdd} 魔物知識\n"; }
-        if($data{$p_id}{initiative } && $::pc{initiativeAdd }){ $text .= "2d+{$name}+$::pc{initiativeAdd } 先制\n"; }
+        $text .= "2d+{$name}+{行為判定修正}+{行動判定修正} $name\n";
+        if($data{$p_id}{monsterLore} && $::pc{monsterLoreAdd}){ $text .= "2d+{$name}+$::pc{monsterLoreAdd}+{行為判定修正}+{行動判定修正} 魔物知識\n"; }
+        if($data{$p_id}{initiative } && $::pc{initiativeAdd }){ $text .= "2d+{$name}+$::pc{initiativeAdd }+{行為判定修正}+{行動判定修正} 先制\n"; }
       }
     }
     $text .= "\n";
@@ -216,12 +228,12 @@ sub palettePreset {
       next if !$::pc{"commonClass$_"};
       my $name = removeTags unescapeTags $::pc{'commonClass'.$_};
       $name =~ s/[(（].+?[）)]$//;
-      $text .= "2d+{$name}+{器用B} ${name}＋器用\n" if $::pc{"paletteCommonClass${_}Dex"};
-      $text .= "2d+{$name}+{敏捷B} ${name}＋敏捷\n" if $::pc{"paletteCommonClass${_}Agi"};
-      $text .= "2d+{$name}+{筋力B} ${name}＋筋力\n" if $::pc{"paletteCommonClass${_}Str"};
-      $text .= "2d+{$name}+{生命B} ${name}＋生命\n" if $::pc{"paletteCommonClass${_}Vit"};
-      $text .= "2d+{$name}+{知力B} ${name}＋知力\n" if $::pc{"paletteCommonClass${_}Int"};
-      $text .= "2d+{$name}+{精神B} ${name}＋精神\n" if $::pc{"paletteCommonClass${_}Mnd"};
+      $text .= "2d+{$name}+{器用B}+{行為判定修正}+{行動判定修正} ${name}＋器用\n" if $::pc{"paletteCommonClass${_}Dex"};
+      $text .= "2d+{$name}+{敏捷B}+{行為判定修正}+{行動判定修正} ${name}＋敏捷\n" if $::pc{"paletteCommonClass${_}Agi"};
+      $text .= "2d+{$name}+{筋力B}+{行為判定修正}+{行動判定修正} ${name}＋筋力\n" if $::pc{"paletteCommonClass${_}Str"};
+      $text .= "2d+{$name}+{生命B}+{行為判定修正}+{行動判定修正} ${name}＋生命\n" if $::pc{"paletteCommonClass${_}Vit"};
+      $text .= "2d+{$name}+{知力B}+{行為判定修正}+{行動判定修正} ${name}＋知力\n" if $::pc{"paletteCommonClass${_}Int"};
+      $text .= "2d+{$name}+{精神B}+{行為判定修正}+{行動判定修正} ${name}＋精神\n" if $::pc{"paletteCommonClass${_}Mnd"};
     }
     $text .= "\n";
     $text .= appendPaletteInsert('common');
@@ -290,12 +302,37 @@ sub palettePreset {
         my $activeName  = $::pc{'paletteMagic'.$paNum.'Name'} ? "＋$::pc{'paletteMagic'.$paNum.'Name'}" : '';
         my $activePower = $::pc{'paletteMagic'.$paNum.'Power'} ? optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Power'}") : '';
         my $activeCrit  = $::pc{'paletteMagic'.$paNum.'Crit' } ? optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Crit' }") : '';
+        my $activeRate  = $::pc{'paletteMagic'.$paNum.'Rate' } ? optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Rate' }") : '';
         my $activeDmg   = $::pc{'paletteMagic'.$paNum.'Dmg'  } ? optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Dmg'  }") : '';
         my $activeRoll  = $::pc{'paletteMagic'.$paNum.'Roll' } ? '#'.optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Roll' }") : '';
 
         my $magicPower = "{$power}" . ($name =~ /魔/ ? $activePower :"");
+
+        sub modifyRate {
+          my $base = shift;
+          my $offset = shift;
+
+          if ($offset ne '') {
+            my $expression = "${base}+(${offset})";
+
+            if ($offset =~ /^[-+\d()]+$/) {
+              # 単純な数値なら計算してしまう（威力の上限・下限を考慮するため）.
+              my $modified = s_eval($expression);
+              $modified = 0 if $modified < 0;
+              $modified = 100 if $modified > 100;
+              return $modified;
+            }
+            else {
+              # 計算できない場合は式として表現しておく.
+              return "(${expression})";
+            }
+          }
+
+          return $base;
+        }
         
         my $half;
+        my $lastModifiedRate;
         foreach my $pow (sort {$a <=> $b} keys %{$pows{$id}}) {
           if($pows{$id}{$pow} =~ /^[0-9]+$/){
             next if($pows{$id}{$pow} > $::pc{'lv'.$id} && $id ne 'Fai');
@@ -313,16 +350,21 @@ sub palettePreset {
           }
           if($id eq 'Bar'){ $pow += $::pc{finaleEnhance} || 0; }
 
-          $text .= "k${pow}[{魔法C}$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{魔法D修正}$activeDmg ダメージ\n";
+          my $modifiedRate = modifyRate($pow, $activeRate);
+          next if $modifiedRate eq $lastModifiedRate;
+
+          $text .= "k${modifiedRate}\[{魔法C}$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{魔法D修正}$activeDmg${activeRoll} ダメージ\n";
           if ($id eq 'Sor' && $pow == 30 && $::pc{lvSor} >= 12) {
-            $text .= "k${pow}[10$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{物理魔法D修正}$activeDmg 物理ダメージ\n";
+            $text .= "k${modifiedRate}\[10$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{物理魔法D修正}$activeDmg${activeRoll} 物理ダメージ\n";
           }
           if ($id eq 'Fai' && $::pc{fairyContractEarth} && ($pow == 10 || $pow == 50)) {
-            $text .= "k${pow}[12$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{物理魔法D修正}$activeDmg 物理ダメージ\n";
+            $text .= "k${modifiedRate}\[12$activeCrit]+$magicPower".addNum($::pc{'magicDamageAdd'.$id})."+{物理魔法D修正}$activeDmg${activeRoll} 物理ダメージ\n";
           }
-          my $halfCrit = $activeName =~ /クリティカルキャスト/ ? "{魔法C}$activeCrit" : "13";
-          if ($bot{YTC}) { $half .= "k${pow}[$halfCrit]+$magicPower" . "//" . addNum($::pc{'magicDamageAdd'.$id}) . "+{魔法D修正}$activeDmg 半減\n"; }
-          if ($bot{BCD}) { $half .= "k${pow}[$halfCrit]+$magicPower" . "h+("  . ($::pc{'magicDamageAdd'.$id} || '') . "+{魔法D修正}$activeDmg) 半減\n"; }
+          my $halfCrit = $activeName =~ /(?:クリティカル|テアリング)キャスト(?!(?:1|I(?:[^I]|$)|Ⅰ))/i ? "{魔法C}$activeCrit" : "13";
+          if ($bot{YTC}) { $half .= "k${modifiedRate}\[$halfCrit]+$magicPower" . "//" . addNum($::pc{'magicDamageAdd'.$id}) . "+{魔法D修正}$activeDmg${activeRoll} 半減\n"; }
+          if ($bot{BCD}) { $half .= "k${modifiedRate}\[$halfCrit]+$magicPower" . "h+("  . ($::pc{'magicDamageAdd'.$id} || '') . "+{魔法D修正}$activeDmg)${activeRoll} 半減\n"; }
+
+          $lastModifiedRate = $modifiedRate;
         }
         $text .= $half;
         if($id eq 'Dru'){
@@ -353,6 +395,7 @@ sub palettePreset {
           }
         }
 
+        $lastModifiedRate = undef;
         foreach my $pow (sort {$a <=> $b} keys %{$heals{$id}}) {
           if($heals{$id}{$pow} =~ /^[0-9]+$/){
             next if($::pc{'lv'.$id} < $heals{$id}{$pow});
@@ -365,7 +408,13 @@ sub palettePreset {
             }
             next if !$exist;
           }
-          $text .= "k${pow}[13]+$magicPower+{回復量修正} 回復量\n"
+
+          my $modifiedRate = modifyRate($pow, $activeRate);
+          next if $modifiedRate eq $lastModifiedRate;
+
+          $text .= "k${modifiedRate}\[13]+$magicPower+{回復量修正}${activeRoll} 回復量\n";
+
+          $lastModifiedRate = $modifiedRate;
         }
 
         $text =~ s/^(k[0-9]+)\[(.+?)\]/$1\[($2)\]/gm if $bot{BCD};
@@ -380,9 +429,9 @@ sub palettePreset {
         my $activeCast  = $::pc{'paletteMagic'.$paNum.'Cast' } ? optimizeOperatorFirst("+$::pc{'paletteMagic'.$paNum.'Cast' }") : '';
 
         $text .= "2d+{$power}";
-        if   ($name =~ /魔/){ $text .= "$activePower+{行使修正}$activeCast ${name}行使$activeName\n"; }
-        elsif($name =~ /歌/){ $text .= " 呪歌演奏\n"; }
-        else                { $text .= " ${name}\n"; }
+        if   ($name =~ /魔/){ $text .= "$activePower+{行使修正}+{行為判定修正}+{行動判定修正}$activeCast ${name}行使$activeName\n"; }
+        elsif($name =~ /歌/){ $text .= "+{行為判定修正}+{行動判定修正} @{[$::SW2_0 ? '呪歌' : '']}演奏\n"; }
+        else                { $text .= "+{行為判定修正}+{行動判定修正} ${name}\n"; }
         
         if($dmgTexts{$paNum + 1} && $dmgTexts{$paNum} eq $dmgTexts{$paNum + 1}){
           next;
@@ -390,7 +439,9 @@ sub palettePreset {
         if($dmgTexts{$paNum} eq $dmgTexts{$paNum - 1}){
           $activeName = $::pc{'paletteMagic'.($paNum - 1).'Name'} ? "＋$::pc{'paletteMagic'.($paNum - 1).'Name'}" : '';
         }
-        $text .= $bot{BCD} ? ($dmgTexts{$paNum} =~ s/(ダメージ|半減)(\n|／)/$1／$name$activeName$2/gr) : $dmgTexts{$paNum};
+        my $actionName = $name;
+        $actionName = '終律' if !$::SW2_0 && $actionName eq '呪歌';
+        $text .= $bot{BCD} ? ($dmgTexts{$paNum} =~ s/(ダメージ|半減)(\n|／)/$1／$actionName$activeName$2/gr) : $dmgTexts{$paNum};
         $text .= "\n";
       }
     }
@@ -513,11 +564,12 @@ sub palettePreset {
 
         $text .= "2d+";
         $text .= $::pc{paletteUseVar} ? "{命中$_}" : $::pc{"weapon${_}AccTotal"};
-        $text .= "+{命中修正}";
+        $text .= "+{命中修正}+{行為判定修正}+{行動判定修正}";
         if($::pc{'paletteAttack'.$paNum.'Acc'}){
           $text .= optimizeOperatorFirst "+$::pc{'paletteAttack'.$paNum.'Acc'}";
         }
         $text .= " 命中力／$::pc{'weapon'.$_.'Name'}$::pc{'weapon'.$_.'Usage'}";
+        $text .= "〈$::pc{'weapon'.$_.'Category'}〉" if $::pc{'weapon'.$_.'Usage'} =~ /H投/i && $::pc{'weapon'.$_.'Category'};
         $text .= "（${partName}）" if $partName;
         if($::pc{'paletteAttack'.$paNum.'Name'}){
           $text .= "＋$::pc{'paletteAttack'.$paNum.'Name'}";
@@ -543,8 +595,10 @@ sub palettePreset {
     $text .= "//生命抵抗修正=0\n";
     $text .= "//精神抵抗修正=0\n";
     $text .= "//回避修正=0\n";
-    $text .= "2d+{生命抵抗}+{生命抵抗修正} 生命抵抗力\n";
-    $text .= "2d+{精神抵抗}+{精神抵抗修正} 精神抵抗力\n";
+    $text .= "2d+{生命抵抗}+{生命抵抗修正}+{行為判定修正} 生命抵抗力\n";
+    $text .= "2d+{精神抵抗}+{精神抵抗修正}+{行為判定修正} 精神抵抗力\n";
+    my %hasClass;
+    my @hasClass = grep { ! $hasClass{ $::pc{"evasionClass$_"} }++ } (1 .. $::pc{defenseNum});
     foreach my $i (1..$::pc{defenseNum}){
       my $hasChecked = 0;
       foreach my $j (1..$::pc{armourNum}){
@@ -554,7 +608,9 @@ sub palettePreset {
 
       $text .= "2d+";
       $text .= $::pc{paletteUseVar} ? "{回避${i}}" : $::pc{"defenseTotal${i}Eva"};
-      $text .= "+{回避修正} 回避力".($::pc{"defenseTotal${i}Note"}?"／$::pc{'defenseTotal'.$i.'Note'}":'')."\n";
+      $text .= "+{回避修正}+{行為判定修正}+{行動判定修正} 回避力";
+      $text .= '（' . $::pc{"evasionClass${i}"} . '）' if @hasClass > 1;
+      $text .= ($::pc{"defenseTotal${i}Note"}?"／$::pc{'defenseTotal'.$i.'Note'}":'')."\n";
     }
     $text .= appendPaletteInsert('defense');
     
@@ -563,16 +619,18 @@ sub palettePreset {
   }
   ## 魔物
   elsif($type eq 'm') {
+    $text .= "//行為判定修正=0\n";
+    $text .= "//行動判定修正=0\n";
     $text .= "//生命抵抗修正=0\n";
     $text .= "//精神抵抗修正=0\n";
     $text .= "//回避修正=0\n";
-    $text .= "2d+{生命抵抗}+{生命抵抗修正} 生命抵抗力\n";
-    $text .= "2d+{精神抵抗}+{精神抵抗修正} 精神抵抗力\n";
+    $text .= "2d+{生命抵抗}+{生命抵抗修正}+{行為判定修正} 生命抵抗力\n";
+    $text .= "2d+{精神抵抗}+{精神抵抗修正}+{行為判定修正} 精神抵抗力\n";
     foreach (1 .. $::pc{statusNum}){
       (my $part   = $::pc{'status'.$_.'Style'}) =~ s/^.+?[（(](.+?)[)）]$/$1/;
       $part = '' if $::pc{partsNum} == 1;
       $part = "／$part" if $part ne '';
-      $text .= "2d+{回避$_}+{回避修正} 回避".$part."\n" if $::pc{'status'.$_.'Evasion'} ne '';
+      $text .= "2d+{回避$_}+{回避修正}+{行為判定修正}+{行動判定修正} 回避".$part."\n" if $::pc{'status'.$_.'Evasion'} ne '';
     }
     $text .= "\n";
 
@@ -584,7 +642,7 @@ sub palettePreset {
       if($part ne $weapon){ $weapon = $::pc{'status'.$_.'Style'}; }
       $weapon = '' if $::pc{partsNum} == 1;
       $weapon = "／$weapon" if $weapon ne '';
-      $text .= "2d+{命中$_}+{命中修正} 命中力$weapon\n" if $::pc{'status'.$_.'Accuracy'} ne '';
+      $text .= "2d+{命中$_}+{命中修正}+{行為判定修正}+{行動判定修正} 命中力$weapon\n" if $::pc{'status'.$_.'Accuracy'} ne '';
       $text .= "{ダメージ$_}+{打撃修正} ダメージ".$weapon."\n" if $::pc{'status'.$_.'Damage'} ne '';
       $text .= "\n";
     }
@@ -602,7 +660,7 @@ sub palettePreset {
       (?:魔力)
       ([0-9]+)
       [(（][0-9]+[）)]
-      /$text .= "2d+{$+{name}} $+{name}\n\n";/megix;
+      /$text .= "2d+{$+{name}}+{行為判定修正}+{行動判定修正} $+{name}\n\n";/megix;
     
     $skills =~ s/^
       (?<head>
@@ -627,7 +685,7 @@ sub palettePreset {
       (?=^$skillMarkRE|^●|\z)
       /
       $text .= convertMark($+{mark})."$+{name}／$+{fix}$+{other}\n"
-            .($+{base} ne '' ?"2d+{$+{name}} ".convertMark($+{mark})."$+{name}$+{other}\n":'')
+            .($+{base} ne '' ?"2d+{$+{name}}+{行為判定修正}+{行動判定修正} ".convertMark($+{mark})."$+{name}$+{other}\n":'')
             .skillNote($+{head},$+{name},$+{note})."\n";
       /megix;
   }
@@ -898,7 +956,7 @@ sub paletteProperties {
       my $id = $data::class{$class}{id};
       my $partNum = $::pc{"evasionPart$i"};
       my $partName = $::pc{"evasionPart${i}Name"} = $::pc{"part${partNum}Name"};
-      my $evaMod = 0;
+      my $evaMod = $::pc{evaEquip};
       my $ownAgi;
       my $hasChecked = 0;
       foreach my $j (1..$::pc{armourNum}){
@@ -975,11 +1033,16 @@ sub paletteProperties {
         (?<name>.+)
         [\/／]
         (
-          (?<dice> (?<value>[0-9]+)  [(（]  [0-9]+  [）)]  )
+          (
+            (?<dice> (?<value>[0-9]+)  [(（]  [0-9]+  [）)]  )
+            |
+            [0-9]+
+          )
+          .+?
           |
-          [0-9]+
+          必中
         )
-      .+?)
+      )
       (?:
         \s
         (?<note>[\s\S]*?)
@@ -1014,4 +1077,4 @@ sub convertFairyAttribute {
   return $skills;
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/_core/lib/sw2/subroutine-sw2.pl b/_core/lib/sw2/subroutine-sw2.pl
index 86d4db824..11f81bafe 100644
--- a/_core/lib/sw2/subroutine-sw2.pl
+++ b/_core/lib/sw2/subroutine-sw2.pl
@@ -13,6 +13,7 @@ sub createUnitStatus {
   my %pc = %{$_[0]};
   my $target = $_[1] || '';
   my @unitStatus;
+  my @unitMemo;
   if ($pc{type} eq 'm'){
     my @n2a = ('','A' .. 'Z');
     if($pc{statusNum} > 1){ # 2部位以上
@@ -35,12 +36,11 @@ sub createUnitStatus {
           $count{ $partname }++;
           $partname .= $n2a[ $count{ $partname } ];
         }
-        my $hp  = s_eval($pc{"status${i}Hp"});
-        my $mp  = s_eval($pc{"status${i}Mp"});
-        my $def = s_eval($pc{"status${i}Defense"});
-        push(@hp , {$partname.':HP' => "$hp/$hp"});
-        push(@mp , {$partname.':MP' => "$mp/$mp"}) unless isEmptyValue($mp);
-        push(@def, $partname.$def);
+        my $hp  = convertStt($pc{"status${i}Hp"});
+        my $mp  = convertStt($pc{"status${i}Mp"});
+        push(@hp , {$partname.':HP' => $hp});
+        push(@mp , {$partname.':MP' => $mp}) unless isEmptyValue($mp);
+        push(@def, $partname.$pc{"status${i}Defense"});
       }
       @unitStatus = ();
       push(@unitStatus, @hp);
@@ -48,7 +48,7 @@ sub createUnitStatus {
       if ($target eq 'udonarium') {
         push(@unitStatus, {'防護' => join('／',@def)});
       } else {
-        push(@unitStatus, {'メモ' => '防護:'.join('／',@def)});
+        push(@unitMemo, '防護:'.join('／',@def));
       }
     }
     else { # 1部位
@@ -59,12 +59,20 @@ sub createUnitStatus {
           $i .= $ii > 1 ? "-$ii" : '';
         }
       }
-      my $hp = s_eval($pc{"status${i}Hp"});
-      my $mp = s_eval($pc{"status${i}Mp"});
-      my $def = s_eval($pc{"status${i}Defense"});
-      push(@unitStatus, { 'HP' => "$hp/$hp" });
-      push(@unitStatus, { 'MP' => "$mp/$mp" }) unless isEmptyValue($mp);
-      push(@unitStatus, { '防護' => "$def" });
+      my $hp = convertStt($pc{"status${i}Hp"});
+      my $mp = convertStt($pc{"status${i}Mp"});
+      push(@unitStatus, { 'HP' => $hp });
+      push(@unitStatus, { 'MP' => $mp }) unless isEmptyValue($mp);
+      push(@unitStatus, { '防護' => $pc{"status${i}Defense"} });
+    }
+    
+    if($pc{weakness} && $pc{weakness} ne 'なし'){
+      if ($target eq 'udonarium') {
+        push(@unitStatus, { '弱点' => $pc{weakness} });
+      }
+      else {
+        push(@unitMemo, '弱点:'.$pc{weakness});
+      }
     }
   }
   else {
@@ -88,6 +96,17 @@ sub createUnitStatus {
       push(@unitStatus, { '陣気' => '0' }) if $pc{lvWar};
     }
   }
+  if(@unitMemo){
+    if ($target eq 'udonarium') {
+      push(@unitStatus, {'メモ' => join("　",@unitMemo)});
+    }
+    if ($target eq 'ccfolia') {
+      push(@unitStatus, {'メモ' => join("\n",@unitMemo)});
+    }
+    else {
+      push(@unitStatus, {'メモ' => join("<br>",@unitMemo)});
+    }
+  }
 
   foreach my $key (split ',', $pc{unitStatusNotOutput}){
     @unitStatus = grep { !exists $_->{$key} } @unitStatus;
@@ -196,6 +215,12 @@ sub extractModifications {
     my $note = shift;
 
     my %sttRegEx = (
+      'A:increment' => '器(?:用度?)?増強',
+      'B:increment' => '敏(?:捷度?)?増強',
+      'C:increment' => '筋(?:力)?増強',
+      'D:increment' => '生(?:命力)?増強',
+      'E:increment' => '知力?増強',
+      'F:increment' => '精(?:神力?)?増強',
       'A' => '器(?:用度?)?',
       'B' => '敏(?:捷度?)?',
       'C' => '筋(?:力)?',
@@ -489,6 +514,11 @@ sub data_update_chara {
       $pc{race} = 'ドレイクブロークン' if $pc{race} eq 'ドレイク（ブロークン）';
     }
   }
+  if($ver < 1.27004){
+    if($pc{lvSam} || $pc{lvNin} || $pc{lvJuj} || $pc{lvFug}){
+      $pc{unlockRyugai} = 1;
+    }
+  }
   $pc{ver} = $main::ver;
   $pc{lasttimever} = $ver;
   return %pc;
@@ -536,6 +566,9 @@ sub data_update_item {
       }
     }
   }
+  if($ver < 1.27003){
+    if($pc{age} eq '魔法文明'){ $pc{age} = '古代魔法文明' }
+  }
 
   $pc{ver} = $main::ver;
   $pc{lasttimever} = $ver;
@@ -558,6 +591,14 @@ sub data_update_arts {
   return %pc;
 }
 
+sub convertStt {
+  my $value = shift;
+  if($value eq ''){ return '' }
+  if($value =~ /[^0-9,\+\-\*\/\%\(\) ]/){ return $value }
+  my $v = s_eval($value);
+  return "$v/$v";
+}
+
 sub isEmptyValue {
   my $value = shift;
   return defined($value) && $value ne '' && $value !~ /^[-ー－―]$/ ? 0 : 1;
diff --git a/_core/lib/sw2/view-arts.pl b/_core/lib/sw2/view-arts.pl
index 893480ac0..d567aeac9 100644
--- a/_core/lib/sw2/view-arts.pl
+++ b/_core/lib/sw2/view-arts.pl
@@ -369,10 +369,11 @@ sub magicItemViewOn {
 if(@schoolmagics || $pc{schoolMagicNote}){ $SHEET->param(schoolMagicView => 1); }
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -384,7 +385,10 @@ sub magicItemViewOn {
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby $pc{artsName});
+  $SHEET->param(titleName =>
+    (removeTags removeRuby $pc{artsName}) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### 画像 --------------------------------------------------
@@ -436,6 +440,9 @@ sub magicItemViewOn {
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/sw2/view-chara.pl b/_core/lib/sw2/view-chara.pl
index 8b94e9e22..7a6610b2b 100644
--- a/_core/lib/sw2/view-chara.pl
+++ b/_core/lib/sw2/view-chara.pl
@@ -204,6 +204,9 @@
 $pc{race} =~ s/［.*］//g;
 {
   my $race = $pc{race};
+  if($pc{unlockRyugai} && exists $data::ryugaiRace{$race}){
+    $race = $data::ryugaiRace{$race};
+  }
   if($race =~ /^(.+?)[（(](.+?)[)）]/){
     my $base    = $1;
     my $variant = $2;
@@ -343,6 +346,7 @@
                      .($mysticarts_honor{dragon}  ?"<br><small>竜</small>$mysticarts_honor{dragon}"  :'');
 $SHEET->param(MysticArts => \@mystic_arts);
 $SHEET->param(MysticArtsHonor => $mysticarts_honor);
+$SHEET->param(displayArtsHonor => @mystic_arts ? 1 : 0);
 
 ### 秘奥魔法 --------------------------------------------------
 my %gramarye_ruby;
@@ -540,7 +544,7 @@
   }
   push(@magic, {
     NAME => $title,
-    OWN  => ($pc{'magicPowerOwn'.$id} ? '✔<span class="small">知力+2</span>' : ''),
+    OWN  => ($pc{'magicPowerOwn'.$id} ? '知力+2' : ''),
     MAGIC  => $magicname,
     POWER  => ($power ? '<span class="small">'.addNum($power).'=</span>' : '').$pc{'magicPower'.$id},
     CAST   => ($cast ? '<span class="small">'.addNum($cast).'=</span>' : '').($pc{'magicPower'.$id}+$cast),
@@ -562,7 +566,7 @@
   
   push(@magic, {
     NAME => $class."<wbr><span class=\"small\">技能レベル</span>".$pc{'lv'.$id},
-    OWN  => ($pc{'magicPowerOwn'.$id} ? '✔<span class="small">'.$stt.'+2</span>' : ''),
+    OWN  => ($pc{'magicPowerOwn'.$id} ? $stt.'+2' : ''),
     MAGIC  => $name,
     POWER  => ($pname) ? ($power ? '<span class="small">'.addNum($power).'=</span>' : '').$pc{'magicPower'.$id} : '―',
     CAST   => ($cast ? '<span class="small">'.addNum($cast).'=</span>' : '').($pc{'magicPower'.$id}+$cast),
@@ -614,13 +618,13 @@
       }
       next if !$isUnlock;
     }
-    my $reqdStr = ($id eq 'Fen' ? ceil($strTotal / 2) : $strTotal)
+    my $reqdStr = ($data::class{$name}{reqdHalf} ? ceil($strTotal / 2) : $strTotal)
                 . ($pc{reqdStrWeaponMod} ? "+$pc{reqdStrWeaponMod}" : '');
     push(@atacck, {
       NAME => $name."<wbr><span class=\"small\">技能レベル</span>".$pc{'lv'.$id},
       STR  => $reqdStr,
-      ACC  => $pc{'lv'.$id}+$pc{bonusDex},
-      ($id eq 'Fen' ? (CRIT => '-1') : ('' => '')),
+      ACC  => $pc{'lv'.$id}+$pc{bonusDex}+$data::class{$name}{accUnlock}{mod},
+      CRIT => ($data::class{$name}{critMod} || '―'),
       DMG  => $id eq 'Dem' ? '―' : $pc{'lv'.$id}+$pc{bonusStr},
     } );
   }
@@ -659,12 +663,12 @@ sub replaceModificationNotation {
   $sourceText =~ s#
       [\@＠]
       (
-        器(?:用度?)?  |
-        敏(?:捷度?)?  |
-        筋(?:力)?     |
-        生(?:命力)?   |
-        知力?         |
-        精(?:神力?)?  |
+        器(?:用度?)?(?:増強)?  |
+        敏(?:捷度?)?(?:増強)?  |
+        筋(?:力)?(?:増強)?     |
+        生(?:命力)?(?:増強)?   |
+        知力?(?:増強)?         |
+        精(?:神力?)?(?:増強)?  |
         生命抵抗力?   |
         精神抵抗力?   |
         回避力?       |
@@ -728,7 +732,7 @@ sub replaceModificationNotation {
       PART     => $pc{'part'.$pc{'weapon'.$_.'Part'}.'Name'},
       ROWSPAN  => $rowspan,
       NAMEOFF  => $pc{'weapon'.$_.'NameOff'},
-      USAGE    => $pc{'weapon'.$_.'Usage'},
+      USAGE    => $pc{'weapon'.$_.'Usage'} . ($pc{'weapon'.$_.'Usage'} =~ /H投/i && $pc{'weapon'.$_.'Category'} ? "<span class=\"category\">〈$pc{'weapon'.$_.'Category'}〉</span>" : ''),
       REQD     => $pc{'weapon'.$_.'Reqd'},
       ACC      => addNum($pc{'weapon'.$_.'Acc'}),
       ACCTOTAL => $pc{'weapon'.$_.'AccTotal'},
@@ -774,7 +778,7 @@ sub replaceModificationNotation {
     push(@evasion, {
       NAME => $name."<wbr><span class=\"small\">技能レベル</span>".$pc{'lv'.$id},
       STR  => ($id eq 'Fen' ? ceil($strTotal / 2) : $strTotal),
-      EVA  => $pc{'lv'.$id}+$pc{bonusAgi},
+      EVA  => $pc{'lv'.$id}+$pc{bonusAgi}+$data::class{$name}{evaUnlock}{mod},
     } );
   }
   if(!@evasion){
@@ -796,7 +800,7 @@ sub replaceModificationNotation {
       DEF  => $pc{defenseSeeker},
     } );
   }
-  foreach (['金属鎧','MetalArmour'],['非金属鎧','NonMetalArmour'],['盾','Shield']) {
+  foreach (['金属鎧','MetalArmour'],['非金属鎧','NonMetalArmour'],['盾','Shield'],['龍骸','Ryugai']) {
     next if !$pc{'mastery'.ucfirst(@$_[1])};
     push(@evasion, {
       NAME => "《防具習熟".($pc{'mastery'.ucfirst(@$_[1])} >= 2 ? 'Ｓ' : 'Ａ')."／".@$_[0]."》",
@@ -866,11 +870,12 @@ sub replaceModificationNotation {
     if   ($cate =~ /鎧/){ $count{'鎧'}++; $pc{'armour'.$_.'Type'} = "鎧$count{'鎧'}" }
     elsif($cate =~ /盾/){ $count{'盾'}++; $pc{'armour'.$_.'Type'} = "盾$count{'盾'}" }
     elsif($cate =~ /他/){ $count{'他'}++; $pc{'armour'.$_.'Type'} = "他$count{'他'}" }
+    elsif($cate =~ /龍/){ $count{'龍'}++; $pc{'armour'.$_.'Type'} = "龍骸$count{'龍'}" }
   }
   foreach (1 .. $pc{armourNum}){
     next if $pc{'armour'.$_.'Name'} eq '' && !$pc{'armour'.$_.'Eva'} && !$pc{'armour'.$_.'Def'} && !$pc{'armour'.$_.'Own'};
 
-    if($pc{'armour'.$_.'Type'} =~ /^(鎧|盾|他)[0-9]+/ && $count{$1} <= 1){ $pc{'armour'.$_.'Type'} = $1 }
+    if($pc{'armour'.$_.'Type'} =~ /^(鎧|盾|他|龍骸)[0-9]+/ && $count{$1} <= 1){ $pc{'armour'.$_.'Type'} = $1 }
 
     push(@armours, {
       TYPE => $pc{'armour'.$_.'Type'},
@@ -1017,15 +1022,13 @@ sub replaceModificationNotation {
   }
   if   ($pc{"history${_}HonorType"} eq 'barbaros'){ $pc{"history${_}Honor"} = '蛮'.$pc{"history${_}Honor"}; }
   elsif($pc{"history${_}HonorType"} eq 'dragon'  ){ $pc{"history${_}Honor"} = '竜'.$pc{"history${_}Honor"}; }
-  $pc{'history'.$_.'Exp'}   = formatHistoryFigures($pc{'history'.$_.'Exp'});
-  $pc{'history'.$_.'Money'} = formatHistoryFigures($pc{'history'.$_.'Money'});
   push(@history, {
     NUM    => ($pc{'history'.$_.'Gm'} ? $h_num : ''),
     DATE   => $pc{'history'.$_.'Date'},
     TITLE  => $pc{'history'.$_.'Title'},
-    EXP    => $pc{'history'.$_.'Exp'},
-    HONOR  => $pc{'history'.$_.'Honor'},
-    MONEY  => $pc{'history'.$_.'Money'},
+    EXP    => formatHistoryFigures($pc{'history'.$_.'Exp'}),
+    HONOR  => formatHistoryFigures($pc{'history'.$_.'Honor'}),
+    MONEY  => formatHistoryFigures($pc{'history'.$_.'Money'}),
     GROW   => $pc{'history'.$_.'Grow'},
     GM     => $pc{'history'.$_.'Gm'},
     MEMBER => $members,
@@ -1180,6 +1183,13 @@ ()
   @boxes = sort { $a->{SORT} <=> $b->{SORT} } @boxes;
   $SHEET->param(Effects => \@boxes);
 }
+### 名誉点等見出し変更 --------------------------------------------------
+if($pc{unlockRyugai}){
+  $SHEET->param(headTextHonor => '誉れ');
+  $SHEET->param(headTextHonorItems => '誉れ装備・誉れ称号');
+  $SHEET->param(headTextDishonor => '名折れ');
+  $SHEET->param(headTextDishonorItems => '名折れ詳細');
+}
 
 ### 戦闘用アイテム --------------------------------------------------
 my $smax = max($pc{lvSco},$pc{lvRan},$pc{lvSag});
@@ -1193,10 +1203,11 @@ ()
 $SHEET->param(BattleItems => \@battleitems);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -1214,7 +1225,10 @@ ()
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -1241,6 +1255,9 @@ ()
     if($pc{logId}){
       if   ($::in{f}         ){ push(@menu, { TEXT => 'ＰＣ',     TYPE => "href", VALUE => "./?id=$::in{id}&log=$pc{logId}",     CLASSES => 'character-format', }); }
       elsif($pc{fellowPublic}){ push(@menu, { TEXT => 'フェロー', TYPE => "href", VALUE => "./?id=$::in{id}&log=$pc{logId}&f=1", CLASSES => 'character-format', }); }
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
@@ -1273,4 +1290,4 @@ ()
   print $SHEET->output;
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/_core/lib/sw2/view-item.pl b/_core/lib/sw2/view-item.pl
index 8b14f4e4f..90aef4e64 100644
--- a/_core/lib/sw2/view-item.pl
+++ b/_core/lib/sw2/view-item.pl
@@ -155,10 +155,11 @@
 
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -170,7 +171,10 @@
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby $pc{itemName});
+  $SHEET->param(titleName =>
+    (removeTags removeRuby $pc{itemName}) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -193,6 +197,9 @@
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                   { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/sw2/view-mons.pl b/_core/lib/sw2/view-mons.pl
index d3436e19a..d0c17c429 100644
--- a/_core/lib/sw2/view-mons.pl
+++ b/_core/lib/sw2/view-mons.pl
@@ -154,6 +154,7 @@
     my $annotation = $value =~ s/([(（].+?[）)])$// ? $1 : '';
     my $unit = $value =~ /\d$/ ? 'G' : '';
 
+    $value = commify($value);
     $unit = "<small>$unit</small>" if $unit ne '';
     $annotation = "<small>$annotation</small>" if $annotation ne '';
 
@@ -242,10 +243,11 @@
 $SHEET->param(Loots => \@loots);
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -259,8 +261,9 @@
 else {
   my $name    = removeTags removeRuby($pc{characterName});
   my $species = removeTags removeRuby($pc{monsterName});
-  if($name && $species){ $SHEET->param(titleName => "${name}（${species}）"); }
-  else { $SHEET->param(titleName => $name || $species); }
+  my $date    = ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '');
+  if($name && $species){ $SHEET->param(titleName => "${name}（${species}）$date"); }
+  else { $SHEET->param(titleName => ($name||$species).$date); }
 }
 
 ### OGP --------------------------------------------------
@@ -290,6 +293,9 @@
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/lib/vc/convert.pl b/_core/lib/vc/convert.pl
index e11cbf512..3c554b44d 100644
--- a/_core/lib/vc/convert.pl
+++ b/_core/lib/vc/convert.pl
@@ -3,24 +3,11 @@
 #use warnings;
 use utf8;
 use open ":utf8";
-use LWP::UserAgent;
 use JSON::PP;
 
 require $set::data_class;
 require $set::data_races;
 
-sub urlDataGet {
-  my $url = shift;
-  my $ua  = LWP::UserAgent->new;
-  my $res = $ua->get($url);
-  if ($res->is_success) {
-    return $res->decoded_content;
-  }
-  else {
-    return undef;
-  }
-}
-
 sub dataConvert {
   my $set_url = shift;
   my $file;
diff --git a/_core/lib/vc/edit-chara.pl b/_core/lib/vc/edit-chara.pl
index 87edcf0c0..6d7361ed2 100644
--- a/_core/lib/vc/edit-chara.pl
+++ b/_core/lib/vc/edit-chara.pl
@@ -58,7 +58,7 @@
   $pc{paletteUseVar} = 1;
   $pc{paletteUseBuff} = 1;
 
-  %pc = applyCustomizedInitialValues(\%pc;
+  %pc = applyCustomizedInitialValues(\%pc, '');
 }
 
 ## 画像
diff --git a/_core/lib/vc/view-chara.pl b/_core/lib/vc/view-chara.pl
index 40d4f630a..7b8a62c27 100644
--- a/_core/lib/vc/view-chara.pl
+++ b/_core/lib/vc/view-chara.pl
@@ -315,10 +315,11 @@ ()
 }
 
 ### バックアップ --------------------------------------------------
+my $selectedLogName;
 if($::in{id}){
-  my($selected, $list) = getLogList($set::char_dir, $main::file);
+  ($selectedLogName, my $list) = getLogList($set::char_dir, $main::file);
   $SHEET->param(LogList => $list);
-  $SHEET->param(selectedLogName => $selected);
+  $SHEET->param(selectedLogName => $selectedLogName);
   if($pc{yourAuthor} || $pc{protect} eq 'password'){
     $SHEET->param(viewLogNaming => 1);
   }
@@ -333,7 +334,10 @@ ()
   $SHEET->param(titleName => '非公開データ');
 }
 else {
-  $SHEET->param(titleName => removeTags removeRuby($pc{characterName}||"“$pc{aka}”"));
+  $SHEET->param(titleName =>
+    (removeTags removeRuby($pc{characterName}||"“$pc{aka}”")) .
+    ($::in{log} ? " 【".($selectedLogName||$pc{updateTime})."】" : '')
+  );
 }
 
 ### OGP --------------------------------------------------
@@ -358,6 +362,9 @@ ()
   }
   else {
     if($pc{logId}){
+      if(!$pc{forbiddenMode}){
+        push(@menu, { TEXT => '出力'    , TYPE => "onclick", VALUE => "downloadListOn()",  });
+      }
       push(@menu, { TEXT => '過去ログ', TYPE => "onclick", VALUE => 'loglistOn()', });
       if($pc{reqdPassword}){ push(@menu, { TEXT => '復元', TYPE => "onclick", VALUE => "editOn()", }); }
       else                 { push(@menu, { TEXT => '復元', TYPE => "href"   , VALUE => "./?mode=edit&id=$::in{id}&log=$pc{logId}", }); }
diff --git a/_core/skin/_common/css/base.css b/_core/skin/_common/css/base.css
index 186228ccb..c833aaa37 100644
--- a/_core/skin/_common/css/base.css
+++ b/_core/skin/_common/css/base.css
@@ -205,7 +205,8 @@ main p a {
 
 input,
 textarea,
-select {
+select,
+button.submit {
   padding: 5px;
   border-width: 1px;
   border-style: solid;
@@ -216,9 +217,10 @@ select {
     border-color: #445;
   }
 }
-input[type="submit"] {
+input[type="submit"],
+button.submit {
   cursor: pointer;
-  color: #000;
+  color: #000 !important;
   background: linear-gradient(to bottom, #f0f7ff, #c0c7cf);
   &:hover { background: #c0c7cf; }
 }
diff --git a/_core/skin/_common/css/form.css b/_core/skin/_common/css/form.css
index e3eaddac7..11ecaa6e2 100644
--- a/_core/skin/_common/css/form.css
+++ b/_core/skin/_common/css/form.css
@@ -37,9 +37,20 @@ section.form {
     overflow: visible;
     font-size: 12px;
   }
-  & > input[type="submit"] {
+  & > input[type="submit"],
+  & button {
     width: 5em;
   }
+
+  button {
+    font-weight: normal;
+
+    &[disabled] {
+      cursor: not-allowed;
+      pointer-events: none;
+      opacity: 0.5;
+    }
+  }
 }
 .form dl {
   margin: 1em;
diff --git a/_core/skin/_common/form.html b/_core/skin/_common/form.html
index 0dd702efe..0562dc35a 100644
--- a/_core/skin/_common/form.html
+++ b/_core/skin/_common/form.html
@@ -175,7 +175,7 @@ <h2>パスワード変更</h2>
       <section class="form">
         <h2><span class="material-symbols-outlined bold">edit_note</span>コンバート作成</h2>
         <h3>URLから</h3>
-        <form method="get" action="./">
+        <form method="get" action="./" id="form-to-import-from-url">
           <input type="hidden" name="mode" value="convert">
           <p>
             入力したURLのデータを元にゆとシートⅡで新規作成します。<br>
@@ -191,6 +191,14 @@ <h3>ローカルファイルから</h3>
             <input type="file" name="file" style="width:50%;" accept=".json,.txt" required><input type="submit" value="作成">
           </p>
         </form>
+        <hr>
+        <h3>クリップボードから</h3>
+        <div class="form">
+          <p>
+            クリップボードからURL/JSONを読み取り、ゆとシートⅡで新規作成します。<br>
+            <button class="submit" id="button-to-import-from-clipboard" disabled>作成</button>
+          </p>
+        </div>
       </section>
       <section class="form">
         <h2><span class="material-symbols-outlined bold">visibility</span>コンバートビュー</h2>
diff --git a/_core/skin/_common/js/common.js b/_core/skin/_common/js/common.js
index aa7567813..90b630dd6 100644
--- a/_core/skin/_common/js/common.js
+++ b/_core/skin/_common/js/common.js
@@ -41,3 +41,86 @@ function formSwitch(){
   const viewMode = document.getElementById("form-search-area").style.display == 'none' ? 0 : 1;
   document.getElementById("form-search-area").style.display = viewMode ? 'none' : '';
 }
+
+window.addEventListener(
+    'load',
+    () => {
+        const button = document.getElementById('button-to-import-from-clipboard');
+
+        if (button != null) {
+            button.addEventListener(
+                'click',
+                async () => {
+                    button.disabled = true;
+
+                    let errorMessage;
+
+                    try {
+                        const text = await navigator.clipboard.readText();
+
+                        if (URL.canParse(text)) {
+                            const url = new URL(text);
+                            if (url.protocol === 'http:' || url.protocol === 'https:') {
+                                /** @var {HTMLFormElement} */
+                                const form = document.getElementById('form-to-import-from-url');
+
+                                form.querySelector('[name=url]').value = url.toString();
+                                form.submit();
+                            } else {
+                                errorMessage = "無効な形式のURLです。";
+                            }
+                        } else {
+                            let json;
+
+                            try {
+                                const data = JSON.parse(text);
+                                json = JSON.stringify(data);
+                            } catch {
+                                errorMessage = "クリップボードの内容がURLでもJSONでもありません。";
+                            }
+
+                            if (errorMessage == null) {
+                                /**
+                                 * @param {string} name
+                                 * @param {string} value
+                                 * @return {HTMLInputElement}
+                                 */
+                                function createParameter(name, value) {
+                                    const input = document.createElement('input');
+                                    input.setAttribute('name', name);
+                                    input.setAttribute('value', value);
+                                    input.setAttribute('type', 'hidden');
+                                    return input;
+                                }
+
+                                const form = document.createElement('form');
+                                form.setAttribute('method', 'post');
+                                form.setAttribute('action', './');
+                                form.appendChild(createParameter('mode', 'convert'));
+                                form.appendChild(createParameter('json', json));
+                                form.style.display = 'none';
+
+                                document.querySelector('body').appendChild(form);
+                                form.submit();
+                            }
+                        }
+                    } catch (error) {
+                        if (error.name === 'NotAllowedError') {
+                            errorMessage = "Read permission denied.";
+                        } else {
+                            throw error;
+                        }
+                    } finally {
+                        if (errorMessage != null) {
+                            alert(errorMessage);
+                        }
+
+                        button.disabled = false;
+                    }
+                }
+            );
+
+            button.disabled = false;
+        }
+    }
+);
diff --git a/_core/skin/_common/js/sheet.js b/_core/skin/_common/js/sheet.js
index 70cbbf662..07363a65c 100644
--- a/_core/skin/_common/js/sheet.js
+++ b/_core/skin/_common/js/sheet.js
@@ -88,9 +88,10 @@ window.addEventListener('load', ()=>{
 // 保存系 ----------------------------------------
 function getJsonData(targetEnvironment = '') {
   const paramId = /id=[0-9a-zA-Z\-]+/.exec(location.href)[0];
+  const paramDate = /log=[0-9\-]+/.exec(location.href)?.[0] ?? null;
   return new Promise((resolve, reject)=>{
     let xhr = new XMLHttpRequest();
-    xhr.open('GET', `./?${paramId}&mode=json&target=${targetEnvironment}`, true);
+    xhr.open('GET', `./?${paramId}&mode=json&target=${targetEnvironment}${paramDate?'&'+paramDate:''}`, true);
     xhr.responseType = "json";
     xhr.onload = (e) => {
       resolve(e.currentTarget.response);
diff --git a/_core/skin/ar2e/css/edit.css b/_core/skin/ar2e/css/edit.css
index 3f172a8d7..7d5f679be 100644
--- a/_core/skin/ar2e/css/edit.css
+++ b/_core/skin/ar2e/css/edit.css
@@ -228,7 +228,7 @@ dd.area-tags {
 }
 #levelup table {
   > thead {
-    > th {
+    > tr th {
       vertical-align: bottom;
     }
     > tr:first-child th:first-child {
@@ -249,18 +249,18 @@ dd.area-tags {
     > tr:nth-last-of-type(even) {
       background-color: var(--box-even-rows-bg-color);
     }
-    > td.skill {
+    & td.skill {
       text-align: right;
       position: relative;
     }
-    > td.skill input {
+    & td.skill input {
       width: calc(100% - 1.5em - 1px);
       border-left: none;
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
       font-size: inherit;
     }
-    > td.skill::before {
+    & td.skill::before {
       content: attr(data-lv);
       display: grid;
       align-items: center;
@@ -278,8 +278,8 @@ dd.area-tags {
       text-align: center;
       background-color: var(--input-bg-color);
     }
-    > td.skill[data-lv=""]::before,
-    > td.skill:not([data-lv])::before {
+    & td.skill[data-lv=""]::before,
+    & td.skill:not([data-lv])::before {
       content: 'Lv';
       color: var(--box-input-border-color);
     }
diff --git a/_core/skin/ar2e/sheet-chara.html b/_core/skin/ar2e/sheet-chara.html
index 798b5c138..ab285c985 100644
--- a/_core/skin/ar2e/sheet-chara.html
+++ b/_core/skin/ar2e/sheet-chara.html
@@ -120,7 +120,7 @@ <h1 id="character-name"><TMPL_IF aka><span id="aka">“<TMPL_VAR aka>”</span><
           <dl class="box" id="class-title">
             <dt>称号クラス<dd><TMPL_VAR classTitle>
           </dl>
-          <dl class="box" id=race">
+          <dl class="box" id="race">
             <dt>種族<dd><TMPL_VAR race>
           </dl>
           <dl class="box" id="class-main">
diff --git a/_core/skin/dx3/css/chara.css b/_core/skin/dx3/css/chara.css
index 3c123e0d9..71c51a09b 100644
--- a/_core/skin/dx3/css/chara.css
+++ b/_core/skin/dx3/css/chara.css
@@ -535,6 +535,7 @@ body {
 }
 #lois table tbody td.state {
   border-left: hidden;
+  padding: .3em 1px;
 }
 #lois table tbody td span[data-state] {
   display: inline-block;
diff --git a/_core/skin/ms/css/chara.css b/_core/skin/ms/css/chara.css
index 662cb7a2e..b89f92a03 100644
--- a/_core/skin/ms/css/chara.css
+++ b/_core/skin/ms/css/chara.css
@@ -322,6 +322,10 @@ h1#character-name:not(:has(ruby)) {
     :empty::before {
       content: "　";
     }
+    .base-name {
+      font-size: 85%;
+      opacity: 50%;
+    }
   }
   @media screen and (width <= 735px){
     & tr:not(:has(*:not(:empty))) {
diff --git a/_core/skin/ms/css/clan.css b/_core/skin/ms/css/clan.css
index 8f7ee4e65..3db2b49a0 100644
--- a/_core/skin/ms/css/clan.css
+++ b/_core/skin/ms/css/clan.css
@@ -316,6 +316,10 @@ h1#character-name:not(:has(ruby)) {
     :empty::before {
       content: "　";
     }
+    .base-name {
+      font-size: 85%;
+      opacity: 50%;
+    }
   }
 }
 /* // Free-Memo
diff --git a/_core/skin/ms/css/edit.css b/_core/skin/ms/css/edit.css
index 76f33bebf..0a7deab39 100644
--- a/_core/skin/ms/css/edit.css
+++ b/_core/skin/ms/css/edit.css
@@ -84,7 +84,8 @@
   overflow-x: auto;
 }
 #magi table colgroup {
-  .name   { width: 9.2em; }
+  .name   { width: 10.2em; }
+  .check  { width: 1.8em; }
   .timing { width: 7.5em; }
   .target { width: 7.5em; }
   .cond   { width: 7.5em; }
@@ -92,9 +93,16 @@
     .note   { width: 17.5em; }
   }
 }
-#magi table td.name input {
+#magi table td.name :is(select,input) {
   width: calc(100% - 2em);
 }
+#magi table td > div {
+  &.text-note {
+    font-size: 90%;
+    word-break: auto-phrase;
+  }
+  &:empty { display: none; }
+}
 
 #history > table {
   & thead {
diff --git a/_core/skin/sw2.0/sheet-chara.html b/_core/skin/sw2.0/sheet-chara.html
index e64c41c4b..4ae65a653 100644
--- a/_core/skin/sw2.0/sheet-chara.html
+++ b/_core/skin/sw2.0/sheet-chara.html
@@ -369,7 +369,7 @@ <h2>言語</h2>
           <h2><TMPL_VAR MagicPowerHeader></h2>
           <table class="data-table">
             <thead>
-              <tr><th><th><th><TMPL_VAR MagicPowerThPow><th class="small"><TMPL_VAR MagicPowerThAct><br>基準値<th class="small">ダメージ<br>上昇効果<th>専用
+              <tr><th><th><th><TMPL_VAR MagicPowerThPow><th class="small"><TMPL_VAR MagicPowerThAct><br>基準値<th class="small">ダメージ<br>上昇効果<th class="own">専用
             </thead>
             <TMPL_LOOP MagicPowers><tr>
               <td><TMPL_VAR NAME>
@@ -377,7 +377,7 @@ <h2><TMPL_VAR MagicPowerHeader></h2>
               <td class="num"><TMPL_VAR POWER>
               <td class="num"><TMPL_VAR CAST>
               <td class="num"><TMPL_VAR DAMAGE>
-              <td><TMPL_VAR OWN>
+              <td class="own"><TMPL_IF OWN><b class="term-em"><TMPL_VAR OWN></b></TMPL_IF>
             </TMPL_LOOP>
           </table>
         </section>
@@ -556,7 +556,7 @@ <h2>名誉アイテム</h2>
                 <tr><th><th>点数
               </thead>
               <tbody>
-                <TMPL_IF MysticArtsHonor><tr><td>秘伝<td><TMPL_VAR MysticArtsHonor></TMPL_IF>
+                <TMPL_IF displayArtsHonor><tr><td>秘伝<td><TMPL_VAR MysticArtsHonor></TMPL_IF>
                 <TMPL_LOOP HonorItems><tr><td class="left"><TMPL_VAR NAME><td><TMPL_VAR PT></TMPL_LOOP>
               </tbody>
             </table>
diff --git a/_core/skin/sw2/css/arts.css b/_core/skin/sw2/css/arts.css
index 5638303b6..8b7c84bac 100644
--- a/_core/skin/sw2/css/arts.css
+++ b/_core/skin/sw2/css/arts.css
@@ -447,6 +447,7 @@ article {
     background: var(--arts-name-bg-color);
     color: #fff;
     font-size: 150%;
+    word-break: auto-phrase;
   }
   & dd {
     display: flex;
diff --git a/_core/skin/sw2/css/chara.css b/_core/skin/sw2/css/chara.css
index dedaf1ef2..315414e06 100644
--- a/_core/skin/sw2/css/chara.css
+++ b/_core/skin/sw2/css/chara.css
@@ -750,6 +750,18 @@ dl#level {
 #magic-power{
   grid-column: span 2;
   align-self: end;
+  
+  max-width: 100%;
+  width: calc((100% + (100% - var(--box-h-gap)) / 210 * 90) * 0.25 + 21.3em);
+  &:has(td.own > b.term-em) {
+    width: calc((100% + (100% - var(--box-h-gap)) / 210 * 90) * 0.25 + 25.6em);
+  }
+  @media screen and (width <= 735px){
+    min-width: calc(100% - 4.3em);
+    &:has(td.own > b.term-em) {
+    min-width: 100% !important;
+    }
+  }
 }
 #magic-power table {
   table-layout: auto;
@@ -778,6 +790,15 @@ dl#level {
     line-height: 1.6;
     white-space: nowrap;
   }
+  & tbody td.own {
+    width: 4.8em;
+    font-size: 90%;
+  }
+  &:not(:has(td.own > b.term-em)) {
+    :is(th, td).own {
+      display: none;
+    }
+  }
 }
 #magic-power #fairycontact {
   margin: -.2em 0 -.1em;
@@ -832,6 +853,7 @@ dl#level {
     & tbody th {
       border-style: none solid hidden;
       background-color: transparent;
+      line-height:1;
     }
     & tbody:first-of-type tr:first-of-type th {
       border-top: hidden;
@@ -910,6 +932,21 @@ dl#level {
     font-size: 80%;
   }
 }
+#weapons tbody {
+  tr {
+    td.usage {
+      &:has(.category){
+        line-height: 1;
+      }
+      .category {
+        display: block;
+        margin-top: 1px;
+        font-size: 60%;
+        word-break: keep-all;
+      }
+    }
+  }
+}
 
 
 /* Defense-Status */
@@ -1572,4 +1609,4 @@ dl#level {
 }
 
 /* ////////// LayerEnd ////////// */
-}
\ No newline at end of file
+}
diff --git a/_core/skin/sw2/css/edit.css b/_core/skin/sw2/css/edit.css
index 805d38217..e93b659e7 100644
--- a/_core/skin/sw2/css/edit.css
+++ b/_core/skin/sw2/css/edit.css
@@ -46,9 +46,9 @@
     grid-row: 4;
   }
 }
-#regulation > label:last-child {
-  margin-top: 0.5em;
-  border: none;
+#regulation dl.regulation-others {
+  gap: 2px;
+  margin-bottom: 2px;
 }
 
 #area-status {
@@ -191,21 +191,28 @@
   justify-content: space-between;
 }
 #area-classes.common-classes-off {
-  flex-basis: calc(66% - 1rem);
+  flex-basis: calc(75% - 1rem);
   margin-right: var(--box-h-gap);
 }
 
 #classes {
-  flex-basis: 66%;
+  flex-basis: 75%;
   flex-grow: 1;
   display: grid;
   position: relative;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr 1fr 0.8fr;
+  &:has(#classes-extra.hidden){
+    flex-basis: 66%;
+    grid-template-columns: 1fr 1fr;
+  }
 
-  & h2 { grid-column: span 2; }
+  & h2 { grid-column: span 3; }
+  .classes-group { align-self: start; }
   #classes-weapon-user { grid-column: 1; }
   #classes-magic-user  { grid-column: 1; align-self: end; }
-  #classes-other-user  { grid-column: 2; grid-row: 2 / span 2; }
+  #classes-others      { grid-column: 2; grid-row: 2 / span 2; }
+  #classes-extra       { grid-column: 3; grid-row: 2 / span 2; }
+  #classes-seeker      { grid-column: 3; grid-row: 2 / span 2; }
 
   & h3 {
     margin-top: 0;
@@ -214,7 +221,7 @@
   & dl {
     flex-grow: 1;
     flex-basis: calc(50% - 10px);
-    grid-template-columns: 1fr 3.5em;
+    grid-template-columns: 1fr 3em;
 
     & dt {
       font-size: inherit;
@@ -618,6 +625,9 @@
       & option[value="Sag"],
       &[data-type="Sag"] + .lang-select-view { background: #55ff0033; }
       &[data-type="Sag"] + .lang-select-view::before { content: 'セージ'; }
+      & option[value="Juj"],
+      &[data-type="Juj"] + .lang-select-view { background: #55ff0033; }
+      &[data-type="Juj"] + .lang-select-view::before { content: '呪術師'; }
       & option[value="Bar"],
       &[data-type="Bar"] + .lang-select-view { background: #ffaa0033; }
       &[data-type="Bar"] + .lang-select-view::before { content: 'バード'; }
@@ -1392,6 +1402,7 @@ article > form > hr {
       &.name { width: 14em; }
       &.power { width: 6em; }
       &.cast  { width: 6em; }
+      &.rate { width: 6em; }
       &.crit  { width: 6em; }
       &.dmg   { width: 6em; }
       &.roll  { width: 6em; }
diff --git a/_core/skin/sw2/css/monster.css b/_core/skin/sw2/css/monster.css
index 336cf5b78..35f7bce97 100644
--- a/_core/skin/sw2/css/monster.css
+++ b/_core/skin/sw2/css/monster.css
@@ -355,6 +355,7 @@ table.status {
       border-width: 0px 1px 1px 0px;
       border-style: solid;
       text-align: center;
+      align-content: center;
       min-width: 6em;
     }
     > dd {
@@ -362,6 +363,7 @@ table.status {
       padding: .2rem .5rem;
       border-width: 0px 0px 1px;
       border-style: solid;
+      word-break: auto-phrase;
     }
     > dt:last-of-type,
     > dd:last-of-type {
diff --git a/_core/skin/sw2/js/lib/ytsheetToCcfolia.js b/_core/skin/sw2/js/lib/ytsheetToCcfolia.js
index 4472489ce..3195fce5d 100644
--- a/_core/skin/sw2/js/lib/ytsheetToCcfolia.js
+++ b/_core/skin/sw2/js/lib/ytsheetToCcfolia.js
@@ -22,7 +22,10 @@ output.generateCcfoliaJsonOfSwordWorld2PC = (json, character, defaultPalette) =>
   character.params = character.params.filter(data => !/^(威力|C値|防護)[0-9]$/.test(data.label));
   character.params = character.params.filter(data => !/^最大[MH]P$/.test(data.label));
   if(!json.lvCaster){
-    character.params = character.params.filter(data => !/^(魔力修正|行使修正|魔法C|魔法D修正)$/.test(data.label));
+    character.params = character.params.filter(data => !/^(魔力修正|行使修正)$/.test(data.label));
+    if(!json.lvBar){
+      character.params = character.params.filter(data => !/^(魔法C|魔法D修正)$/.test(data.label));
+    }
   }
   character.params = originalParams.concat(character.params);
 
diff --git a/_core/skin/sw2/js/lib/ytsheetToUdonarium.js b/_core/skin/sw2/js/lib/ytsheetToUdonarium.js
index 650e8d7c2..89099025d 100644
--- a/_core/skin/sw2/js/lib/ytsheetToUdonarium.js
+++ b/_core/skin/sw2/js/lib/ytsheetToUdonarium.js
@@ -76,12 +76,12 @@ output.generateUdonariumXmlDetailOfSwordWorld2PC = (json, opt_url, defaultPalett
     `        <data name="生命力">${json.sttVit}</data>`,
     `        <data name="知力">${json.sttInt}</data>`,
     `        <data name="精神力">${json.sttMnd}</data>`,
-    `        <data name="器用度増強">${json.sttAddA || 0}</data>`,
-    `        <data name="敏捷度増強">${json.sttAddB || 0}</data>`,
-    `        <data name="筋力増強">${json.sttAddC || 0}</data>`,
-    `        <data name="生命力増強">${json.sttAddD || 0}</data>`,
-    `        <data name="知力増強">${json.sttAddE || 0}</data>`,
-    `        <data name="精神力増強">${json.sttAddF || 0}</data>`
+    `        <data name="器用度増強">${Number(json.sttAddA || 0) + Number(json.sttEquipA || 0)}</data>`,
+    `        <data name="敏捷度増強">${Number(json.sttAddB || 0) + Number(json.sttEquipB || 0)}</data>`,
+    `        <data name="筋力増強">${Number(json.sttAddC || 0) + Number(json.sttEquipC || 0)}</data>`,
+    `        <data name="生命力増強">${Number(json.sttAddD || 0) + Number(json.sttEquipD || 0)}</data>`,
+    `        <data name="知力増強">${Number(json.sttAddE || 0) + Number(json.sttEquipE || 0)}</data>`,
+    `        <data name="精神力増強">${Number(json.sttAddF || 0) + Number(json.sttEquipF || 0)}</data>`
   ];
   
   let addedParam = {
diff --git a/_core/skin/sw2/sheet-chara.html b/_core/skin/sw2/sheet-chara.html
index 1fdf4fe41..38ac1be8c 100644
--- a/_core/skin/sw2/sheet-chara.html
+++ b/_core/skin/sw2/sheet-chara.html
@@ -348,7 +348,7 @@ <h2>言語</h2>
           <h2><TMPL_VAR MagicPowerHeader></h2>
           <table class="data-table">
             <thead>
-              <tr><th><th><th><TMPL_VAR MagicPowerThPow><th class="small"><TMPL_VAR MagicPowerThAct><br>基準値<th class="small">ダメージ<br>上昇効果<th>専用
+              <tr><th><th><th><TMPL_VAR MagicPowerThPow><th class="small"><TMPL_VAR MagicPowerThAct><br>基準値<th class="small">ダメージ<br>上昇効果<th class="own">専用
             <tbody>
             <TMPL_LOOP MagicPowers><tr>
               <td><TMPL_VAR NAME>
@@ -356,7 +356,7 @@ <h2><TMPL_VAR MagicPowerHeader></h2>
               <td class="num"><TMPL_VAR POWER>
               <td class="num"><TMPL_VAR CAST>
               <td class="num"><TMPL_VAR DAMAGE>
-              <td><TMPL_VAR OWN>
+              <td class="own"><TMPL_IF OWN><b class="term-em"><TMPL_VAR OWN></b></TMPL_IF>
             </TMPL_LOOP>
           </table>
         </section>
@@ -544,15 +544,15 @@ <h2>戦闘用アイテム</h2>
           </section>
           </TMPL_IF>
           <div id="honor">
-            <dl class="box"><dt>名誉点<dd><TMPL_VAR honor></dl>
-            <div class="box-union">
+            <dl class="box"><dt><TMPL_VAR headTextHonor DEFAULT=名誉点><dd><TMPL_VAR honor></dl>
+            <TMPL_UNLESS unlockRyugai><div class="box-union">
               <TMPL_IF rankHonorValue><dl class="box" id="adventurer-rank"><dt>冒険者ランク<dd><TMPL_VAR rank></dl></TMPL_IF>
               <TMPL_IF rankBarbarosValue><dl class="box" id="barbaros-rank"><dt>バルバロス栄光ランク<dd><TMPL_VAR rankBarbaros></dl></TMPL_IF>
               <TMPL_UNLESS rankHonorValue><TMPL_UNLESS rankBarbarosValue><dl class="box" id="adventurer-rank><dt">ランク<dd>―</dl></TMPL_UNLESS></TMPL_UNLESS>
-            </div>
+            </div></TMPL_UNLESS>
           </div>
           <section class="box honor-items" id="honor-items">
-            <h2>名誉アイテム</h2>
+            <h2><TMPL_VAR headTextHonorItems DEFAULT=名誉アイテム></h2>
             <table class="data-table side-margin">
               <thead>
                 <tr><th><th>点数
@@ -560,20 +560,20 @@ <h2>名誉アイテム</h2>
               <tbody>
                 <TMPL_IF rankHonorValue><tr><td>冒険者ランク<td><TMPL_VAR rankHonorValue></TMPL_IF>
                 <TMPL_IF rankBarbarosValue><tr><td>バルバロス栄光ランク<td><TMPL_VAR rankBarbarosValue></TMPL_IF>
-                <TMPL_IF MysticArtsHonor><tr><td>秘伝<td><TMPL_VAR MysticArtsHonor></TMPL_IF>
+                <TMPL_IF displayArtsHonor><tr><td>秘伝<td><TMPL_VAR MysticArtsHonor></TMPL_IF>
                 <TMPL_LOOP HonorItems><tr><td class="left"><TMPL_VAR NAME><td><TMPL_VAR PT></TMPL_LOOP>
-                <TMPL_IF honorOffset><tr><td>不名誉点相殺<td><TMPL_VAR honorOffset></TMPL_IF>
+                <TMPL_IF honorOffset><tr><td><TMPL_VAR headTextDishonor DEFAULT=不名誉点>相殺<td><TMPL_VAR honorOffset></TMPL_IF>
                 <TMPL_IF honorOffsetBarbaros><tr><td>不名誉点相殺（蛮族）<td><TMPL_VAR honorOffsetBarbaros></TMPL_IF>
               </tbody>
             </table>
           </section>
           <TMPL_IF DishonorItems>
           <div id="dishonor">
-            <dl class="box"><dt>不名誉点<dd><TMPL_VAR dishonor></dl>
-            <dl class="box"><dt>不名誉称号<dd><TMPL_VAR notoriety></dl>
+            <dl class="box"><dt><TMPL_VAR headTextDishonor DEFAULT=不名誉点><dd><TMPL_VAR dishonor></dl>
+            <TMPL_UNLESS unlockRyugai><dl class="box"><dt>不名誉称号<dd><TMPL_VAR notoriety></dl></TMPL_UNLESS>
           </div>
           <section class="box honor-items" id="dishonor-items">
-            <h2>不名誉詳細</h2>
+            <h2><TMPL_VAR headTextDishonorItems DEFAULT=不名誉詳細></h2>
             <table class="data-table side-margin">
               <thead><tr><th><th>点数</thead>
               <tbody>
@@ -604,7 +604,7 @@ <h2>セッション履歴</h2>
               <th class="title ">タイトル
               <th class="exp   ">経験点
               <th class="money ">ガメル
-              <th class="honor ">名誉点
+              <th class="honor "><TMPL_VAR headTextHonor DEFAULT=名誉点>
               <th class="grow  ">成長
               <th class="gm    ">GM
               <th class="member">参加者