[SW2] チャットパレットのプリセットに、行為判定全般・行動判定全般への修正を表現する変数を追加

_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;

_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}", }); }

_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;

_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}", }); }

_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;

_core/lib/dx3/data-syndrome.pl

@@ -78,6 +78,7 @@ package data;
   ['自傷',16],
   ['恐怖',17],
   ['憎悪',18],
+  ['改変',30],
 );
 
 1;

_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}", }); }

_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>

_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>：記述した行を非表示にします。

_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;

_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}", }); }

_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}", }); }

_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;

_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}", }); }

_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; }        #新規登録フォーム