From 973836a69ca4443747705f850cfe505d55b773eb Mon Sep 17 00:00:00 2001
From: Damnae <damnaee@gmail.com>
Date: Mon, 9 Oct 2023 10:30:35 +0200
Subject: [PATCH] Fix CreateBattleEvent task.

---
 src/gamecore/tasks/CreateBattleEvent.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/gamecore/tasks/CreateBattleEvent.vue b/src/gamecore/tasks/CreateBattleEvent.vue
index 2cf6db4..3e2c3ca 100644
--- a/src/gamecore/tasks/CreateBattleEvent.vue
+++ b/src/gamecore/tasks/CreateBattleEvent.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { ref, inject } from 'vue';
+  import { ref, inject, computed } from 'vue';
   import { getHash } from '@/common/translate';
   import useHashStore from '@/common/hashstore';
   import { GamecoreTask, GamecoreTargetType, DynamicExpression, } from '@/sources/gamecore';
-  import { BattleEvent, getBattleEvent } from '@/sources/battleevent';
+  import { getBattleEvent } from '@/sources/battleevent';
   import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateTargetType from '../EvaluateTargetType.vue';
   import EvaluateExpression from '../EvaluateExpression.vue';
@@ -13,7 +13,7 @@
   const node = props.node as unknown as 
   {
     PropertyFromTarget?:GamecoreTargetType
-    EventID:number
+    EventID:number|DynamicExpression
     DynamicValues?:
     {
       [key:string]:DynamicExpression
@@ -22,7 +22,15 @@
     TotalDamageTeam:string
   }
 
-  const battleEvent = ref<BattleEvent>(await getBattleEvent(commitId, node.EventID))
+  const battleEventId = computed(() => 
+  {
+    if (typeof(node.EventID) == 'number')
+      return node.EventID
+
+    if (!node.EventID.IsDynamic)
+      return node.EventID.FixedValue?.Value
+  })
+  const battleEvent = ref(battleEventId.value ? await getBattleEvent(commitId, battleEventId.value) : undefined)
 
   if (node.DynamicValues)
   {
@@ -37,9 +45,12 @@
   <BlockLayout :source="node">
 
     Create battle event 
-    <RouterLink :to="{ name:'battleEvent', params:{ commitId: commitId, objectId: node.EventID }}">
-      <em :title="node.EventID.toString()">{{ battleEvent.BattleEventName }}</em>
+    <RouterLink v-if="battleEvent" :to="{ name:'battleEvent', params:{ commitId: commitId, objectId: battleEventId }}">
+      <em :title="battleEventId?.toString()">{{ battleEvent.BattleEventName }}</em>
     </RouterLink>
+    <em v-else-if="typeof(node.EventID) != 'number'">
+      <EvaluateExpression :expression="node.EventID" />
+    </em>
 
     for team <em>{{ node.Team }}</em>
     <template v-if="node.PropertyFromTarget">