Merge pull request TK11235#148 from entyu/v1.10.0b0

V1.10.0b0
usaturn · Jan 10, 2023 · bd109dd · bd109dd
2 parents 3d176b5 + 8ddc4e6
commit bd109dd
Show file tree

Hide file tree

Showing 17 changed files with 687 additions and 134 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "udonarium_lily",
-  "version": "1.09.1",
+  "version": "1.10.0b0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/class/chat-message.ts b/src/app/class/chat-message.ts
@@ -8,6 +8,14 @@ import { ChatTab } from '@udonarium/chat-tab';
 import { ChatTabList } from '@udonarium/chat-tab-list';
 import { ObjectStore } from './core/synchronize-object/object-store';
 
+import { GameCharacter } from '@udonarium/game-character';
+
+
+export interface ChatMessageTargetContext {
+  text: string;
+  object: GameCharacter;
+}
+
 export interface ChatMessageContext {
   identifier?: string;
   tabIdentifier?: string;
@@ -24,8 +32,10 @@ export interface ChatMessageContext {
   imagePos?: number;
   messColor?: string;
   sendFrom?: string; //lily
+
 }
 
+
 @SyncObject('chat')
 export class ChatMessage extends ObjectNode implements ChatMessageContext {
   @SyncVar() originFrom: string;
@@ -40,6 +50,8 @@ export class ChatMessage extends ObjectNode implements ChatMessageContext {
   @SyncVar() sendFrom: string;
   @SyncVar() fixd: boolean = false;
 
+  targetInfo: ChatMessageTargetContext[];
+
   get tabIdentifier(): string { return this.parent.identifier; }
   get text(): string { return <string>this.value }
   set text(text: string) { this.value = text }

diff --git a/src/app/class/chat-palette.ts b/src/app/class/chat-palette.ts
@@ -3,6 +3,7 @@ import { ObjectContext } from './core/synchronize-object/game-object';
 import { ObjectNode } from './core/synchronize-object/object-node';
 import { StringUtil } from './core/system/util/string-util';
 import { DataElement } from './data-element';
+import { GameCharacter } from './game-character';
 
 export interface PaletteLine {
   palette: string;
@@ -128,9 +129,28 @@ export class ChatPalette extends ObjectNode {
     this.isAnalized = false;
   }
 
+  checkTargetCharactor(text: string): boolean{
+    let istarget = text.match(/[tTｔＴ][{｛]\s*([^{}｛｝]+)\s*[}｝]/g) ? true : false;
+
+    if( text.match(/^[tTｔＴ][:：]([^:：]+)/g) ){
+      istarget = true;
+    }
+    if( text.match(/\s[tTｔＴ][:：]([^:：]+)/g) ){
+      istarget = true;
+    }
+    if( text.match(/^[tTｔＴ][&＆]([^&＆]+)/g) ){
+      istarget = true;
+    }
+    if( text.match(/\s[tTｔＴ][&＆]([^&＆]+)/g) ){
+      istarget = true;
+    }
+    console.log('複数対象用コマンド：'+istarget);
+    return istarget;
+  }
+
   evaluate(line: PaletteLine, extendVariables?: DataElement): string
-  evaluate(line: string, extendVariables?: DataElement): string
-  evaluate(line: any, extendVariables?: DataElement): string {
+  evaluate(line: string, extendVariables?: DataElement,target?: GameCharacter): string
+  evaluate(line: any, extendVariables?: DataElement,target?: GameCharacter): string {
     let evaluate: string = '';
     if (typeof line === 'string') {
       evaluate = line;
@@ -145,7 +165,8 @@ export class ChatPalette extends ObjectNode {
     while (isContinue) {
       loop++;
       isContinue = false;
-      evaluate = evaluate.replace(/[{｛]\s*([^{}｛｝]+)\s*[}｝]/g, (match, name) => {
+      evaluate = evaluate.replace(/[tTｔＴ]?[{｛]\s*([^{}｛｝]+)\s*[}｝]/g, (match, name) => {
+
         name = StringUtil.toHalfWidth(name);
         let useMax = false;
         let namematch = name.match(/(.+)([\^＾]$)/);
@@ -154,14 +175,34 @@ export class ChatPalette extends ObjectNode {
           useMax = true;
         }
         isContinue = true;
-        for (let variable of this.paletteVariables) {
-          if (variable.name == name) return variable.value;
-        }
-        if (extendVariables) {
-          let element = extendVariables.getFirstElementByName(name);
-          if (element) {
-            if(useMax && element.isNumberResource) return element.value + '';
-            return element.isNumberResource ? element.currentValue + '' : element.value + '';
+
+        if (match.match(/^[tTｔＴ].*/)) {
+          for (let variable of target.chatPalette.paletteVariables) {
+            if (variable.name == name) return variable.value.replace(/[{｛]/g,'t{');;
+          }
+          if (target) {
+            let element = target.rootDataElement.getFirstElementByName(name);
+            if (element) {
+              let targetElementText =''
+              if (useMax && element.isNumberResource) targetElementText = element.value + '';
+              targetElementText = element.isNumberResource ? element.currentValue + '' : element.value + '';
+              if ( targetElementText.match(/[{｛]\s*([^{}｛｝]+)\s*[}｝]/g)) {
+                targetElementText = targetElementText.replace(/[{｛]/g,'t{');
+              }
+              return targetElementText;
+            }
+          }
+        }else{
+          for (let variable of this.paletteVariables) {
+            if (variable.name == name) return variable.value;
+          }
+
+          if (extendVariables) {
+            let element = extendVariables.getFirstElementByName(name);
+            if (element) {
+              if(useMax && element.isNumberResource) return element.value + '';
+              return element.isNumberResource ? element.currentValue + '' : element.value + '';
+            }
           }
         }
         return '';

diff --git a/src/app/class/chat-tab.ts b/src/app/class/chat-tab.ts
@@ -1,4 +1,4 @@
-import { ChatMessage, ChatMessageContext } from './chat-message';
+import { ChatMessage, ChatMessageContext, ChatMessageTargetContext } from './chat-message';
 import { SyncObject, SyncVar } from './core/synchronize-object/decorator';
 import { ObjectNode } from './core/synchronize-object/object-node';
 import { InnerXml, ObjectSerializer } from './core/synchronize-object/object-serializer';
@@ -82,7 +82,6 @@ export class ChatTab extends ObjectNode implements InnerXml {
     if ( index >= 0 ){
       this.imageIdentifierZpos.splice(index, 1);
       this.imageIdentifierZpos.push( Number(toppos) );
-      console.log( 'imageIdentifierZpos = ' + this.imageIdentifierZpos );
     }
   }
 
@@ -116,19 +115,18 @@ export class ChatTab extends ObjectNode implements InnerXml {
       }else{
         // マウスクリック非表示を復帰する
         this.imageDispFlag[child.imagePos] = true;
-//        console.log("立ち絵テスト3 this.imageDispFlag[child.imagePos]" + child.imagePos + " / "+this.imageDispFlag[child.imagePos] + ":");
       }
 
       EventSystem.trigger('MESSAGE_ADDED', { tabIdentifier: this.identifier, messageIdentifier: child.identifier });
     }
   }
 
-  addMessage(message: ChatMessageContext): ChatMessage {
+  addMessage(message: ChatMessageContext , messageTargetContext ? :ChatMessageTargetContext[] ): ChatMessage {
     message.tabIdentifier = this.identifier;
 
     let chat = new ChatMessage();
     for (let key in message) {
-      console.log('addMessage:' + key);
+//      console.log('addMessage:' + key);
       if (key === 'identifier') continue;
       if (key === 'tabIdentifier') continue;
 
@@ -175,11 +173,23 @@ export class ChatTab extends ObjectNode implements InnerXml {
       this.cutInLauncher.chatActivateCutIn( chat.text , message.to ); // カットイン末尾発動
     }
 
-    EventSystem.trigger('SEND_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier });
-
+    let isContext = false;
+    if (messageTargetContext){
+      if (messageTargetContext.length >= 1){
+        isContext = true;
+      }
+    }
+    if(isContext){
+      for( let context of messageTargetContext){
+        EventSystem.trigger('SEND_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier, messageTrget: context });
+      }
+    }else{
+      EventSystem.trigger('SEND_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier, messageTrget: null });
+    }
+
     EventSystem.trigger('DICE_TABLE_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier });
 
-    EventSystem.trigger('RESOURCE_EDIT_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier });
+    EventSystem.trigger('RESOURCE_EDIT_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier, messageTargetContext: messageTargetContext ? messageTargetContext : null});
 
     // 2021年4月実装のえいぷりるコマンド判定
     EventSystem.trigger('APRIL_MESSAGE', { tabIdentifier: this.identifier, messageIdentifier: chat.identifier });