魔法ダメージのダメージ計算処理

data/entity/function/damage/apply/core/.mcfunction

@@ -9,10 +9,6 @@ execute if data storage entity:_ damage{value:0d} run return fail
 # 実行者が死亡していれば中断
 execute if predicate entity:damage/check_death run return fail
 
-
-# ダメージ値が割合設定ならば解決する
-execute if data storage entity:_ damage.value{} run function entity:damage/apply/core/resolve_percentage_damage/
-
 # 実行者のentity_typeによって処理を変更する
 execute if entity @s[type=player] run function entity:damage/apply/core/player
 execute unless entity @s[type=player] run function entity:damage/apply/core/mob

data/entity/function/damage/apply/core/get_magic_defense.mcfunction

@@ -0,0 +1,12 @@
+#> entity:damage/apply/core/get_magic_defense
+
+execute unless entity @s[type=player] run return run scoreboard players get @s MagicDefense
+
+# プレイヤーの魔法防御力はエンチャントから計算する
+function player:load_equipments
+
+data modify storage calc: List set value []
+# data modify storage calc: List append from storage item: Equipments[].components."minecraft:enchantments".levels
+execute store result score _ _ run function calc:list/sum/x1
+# 2倍にして魔法防御力とする
+return run scoreboard players operation _ _ += _ _

data/entity/function/damage/apply/magic.mcfunction

@@ -5,6 +5,22 @@
 data modify storage entity:_ damage set value {type:"entity:magic"}
 data modify storage entity:_ damage.value set from storage entity: damage.magic
 
+# ダメージ値が割合設定ならば解決する
+execute if data storage entity:_ damage.value{} run function entity:damage/apply/core/resolve_percentage_damage/
+
+# 軽減率を計算
+execute store result score _ MagicDefense run function entity:damage/apply/core/get_magic_defense
+# 75=軽減率調整用の数値 100倍で計算
+scoreboard players add _ MagicDefense 75
+scoreboard players set _ _ 7500
+scoreboard players operation _ _ /= _ MagicDefense
+
+execute store result score _ Calc run data get storage entity:_ damage.value 100
+
+# Shieldの処理を入れる
+# scoreboard players operation _ Calc -= @s Sheild?
+execute store result storage entity:_ damage.value double 0.0001 run scoreboard players operation _ Calc *= _ _
+
 # core処理を実行
 function entity:damage/apply/core/
 

data/entity/function/damage/apply/physical.mcfunction

@@ -5,6 +5,9 @@
 data modify storage entity:_ damage set value {type:"entity:physical"}
 data modify storage entity:_ damage.value set from storage entity: damage.physical
 
+# ダメージ値が割合設定ならば解決する
+execute if data storage entity:_ damage.value{} run function entity:damage/apply/core/resolve_percentage_damage/
+
 # core処理を実行
 function entity:damage/apply/core/
 

data/entity/function/damage/apply/unreasonable.mcfunction

@@ -5,6 +5,9 @@
 data modify storage entity:_ damage set value {type:"entity:unreasonable"}
 data modify storage entity:_ damage.value set from storage entity: damage.unreasonable
 
+# ダメージ値が割合設定ならば解決する
+execute if data storage entity:_ damage.value{} run function entity:damage/apply/core/resolve_percentage_damage/
+
 # core処理を実行
 function entity:damage/apply/core/
 

data/entity/tags/damage_type/magic.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "entity:magic"
+  ]
+}

data/entity/tags/damage_type/physical.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "entity:physical"
+  ]
+}

data/entity/tags/damage_type/unreasonable.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "entity:unreasonable"
+  ]
+}

data/minecraft/tags/damage_type/bypasses_armor.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "tusb:unreasonable",
-    "tusb:magic"
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
-}
+}

data/minecraft/tags/damage_type/bypasses_cooldown.json

@@ -1,7 +1,7 @@
 {
   "values": [
-    "entity:physical",
-    "entity:magic",
-    "entity:unreasonable"
+    "#entity:physical",
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
 }

data/minecraft/tags/damage_type/bypasses_effects.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "tusb:unreasonable"
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
-}
+}

data/minecraft/tags/damage_type/bypasses_enchantments.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "tusb:unreasonable"
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
-}
+}

data/minecraft/tags/damage_type/bypasses_resistance.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "tusb:unreasonable"
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
-}
+}

data/minecraft/tags/damage_type/bypasses_shield.json

@@ -1,5 +1,5 @@
 {
   "values": [
-    "tusb:unreasonable"
+    "#entity:unreasonable"
   ]
-}
+}

data/minecraft/tags/damage_type/no_knockback.json

@@ -1,7 +1,7 @@
 {
   "values": [
-    "entity:physical",
-    "entity:magic",
-    "entity:unreasonable"
+    "#entity:physical",
+    "#entity:magic",
+    "#entity:unreasonable"
   ]
 }