Merge branch 'master' into rework/haiiro_artifact-trigger

Author: haiiro2gou

TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction

@@ -10,6 +10,13 @@
     function api:damage/core/get_status/
 # 与えるダメージの計算
     function api:damage/core/calc/
+# ダメージの補正
+    execute if data storage api: Argument{BypassModifier:false} store result storage api: Damage double 0.0001 run scoreboard players get $Damage Temporary
+    execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage.m {Side:"Defense"}
+    execute if data storage api: Argument{BypassModifier:false} store result score $Damage Temporary run data get storage api: ModifiedDamage 100
+    execute if data storage api: Argument{BypassModifier: true} run scoreboard players operation $Damage Temporary /= $100 Const
+# システム的なダメージ上限(9999.9/99999999(e4))チェック
+    execute if score $Damage Temporary matches 99999000.. run scoreboard players set $Damage Temporary 99999000
 # Mobに適用
     function api:damage/core/health_subtract/
 # リセット

TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction

@@ -21,11 +21,9 @@
     execute if score $Resistance Temporary matches 1.. run function api:damage/core/calc/resistance
 # エンチャントによる軽減計算部
     execute if score $EPF Temporary matches 1.. run function api:damage/core/calc/enchantment
-# システム的なダメージ上限(9999.9/99999999(e4))チェック
-    execute if score $Damage Temporary matches 99999000.. run scoreboard players set $Damage Temporary 99999000
 # Reset
     scoreboard players reset $isDefenseCalcSkip Temporary
     scoreboard players reset $defensePoints Temporary
     scoreboard players reset $toughness Temporary
     scoreboard players reset $EPF Temporary
-    scoreboard players reset $Resistance Temporary
+    scoreboard players reset $Resistance Temporary

TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction

@@ -6,9 +6,8 @@
 
 # 体力
     execute if entity @s[type=!player] store result score $Health Temporary run scoreboard players get @s MobHealth
-# ダメージ
-    execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/get_status/modify_and_get_damage
-    execute if data storage api: Argument{BypassModifier: true} store result score $Damage Temporary run data get storage api: Argument.Damage 100
+# ダメージを取得
+    execute store result score $Damage Temporary run data get storage api: Argument.Damage 100
 # 防御力
     execute if data storage api: Argument{BypassArmorDefense:false} store result score $defensePoints Temporary run attribute @s generic.armor get 100
     execute if data storage api: Argument{BypassArmorDefense: true} run scoreboard players set $defensePoints Temporary 0

TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction

@@ -9,8 +9,6 @@
     #declare score_holder $Fluctuation
     #declare tag UUIDAttacker
 
-# ダメージ量を補正
-    scoreboard players operation $Damage Temporary /= $100 Const
 # ダメージ表示
     scoreboard players set $Fluctuation Lib 0
     scoreboard players operation $Fluctuation Lib -= $Damage Temporary

TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction

@@ -7,11 +7,7 @@
 # 難易度補正を掛ける
     execute if data storage api: Argument{BypassDifficulty:false} run function api:damage/core/health_subtract/player/difficulty_modifier
 # 引数として代入
-    execute store result storage api: Argument.Fluctuation double -0.0001 run scoreboard players get $Damage Temporary
-    execute store result storage api: Argument.Attacker int 1 run scoreboard players get $LatestModifiedEntity MobUUID
-    # data modify storage api: Argument.AttackType set from storage api: Argument.AttackType
-    # data modify storage api: Argument.ElementType set from storage api: Argument.ElementType
-    # data modify storage api: Argument.DisableLog set from storage api: Argument.DisableLog
+    execute store result storage api: Argument.Fluctuation double -0.01 run scoreboard players get $Damage Temporary
 # onAttackのトリガー
     function api:damage/core/trigger_events/player/attack_and_damage/
 # 体力の減少を反映させる

TheSkyBlessing/data/api/functions/damage/core/health_subtract/player/.mcfunction

@@ -6,5 +6,7 @@
 
 # 攻撃者情報の記録
     scoreboard players operation $LatestModifiedEntity MobUUID = @s MobUUID
+    execute store result storage api: Argument.Attacker int 1 run scoreboard players get @s MobUUID
+    data modify storage api: Argument.AttackerType set value "non-player"
 # ModifierIndex をインクリメントする
     scoreboard players add $ModifierIndex Global 1

TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction

@@ -6,5 +6,7 @@
 
 # 攻撃者情報の記録
     execute store result score $LatestModifiedEntity MobUUID run data get storage api: Argument.MobUUID
+    execute store result storage api: Argument.Attacker int 1 run data get storage api: Argument.MobUUID
+    data modify storage api: Argument.AttackerType set value "non-player"
 # ModifierIndex をインクリメントする
     scoreboard players add $ModifierIndex Global 1

TheSkyBlessing/data/api/functions/damage/core/modify/non-player_manual.mcfunction

@@ -6,12 +6,13 @@
 
 # プレイヤー情報の記録
     scoreboard players operation $LatestModifiedUser UserID = @s UserID
+    execute store result storage api: Argument.Attacker int 1 run scoreboard players get @s UserID
+    data modify storage api: Argument.AttackerType set value "player"
 # ModifierIndex をインクリメントする
     scoreboard players add $ModifierIndex Global 1
 # ダメージに補正値を掛ける
-    execute if data storage api: Argument{BypassModifier:false} run function oh_my_dat:please
-    execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Attack
-    execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage
+    execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Damage set from storage api: Argument.Damage
+    execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage.m {Side:"Attack"}
     execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Argument.Damage set from storage api: ModifiedDamage
 # リセット
     data remove storage api: ModifiedDamage

TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction

@@ -1,10 +1,12 @@
-#> api:damage/core/modify_damage
+#> api:damage/core/modify_damage.m
 #
 # ダメージをapi: Modifiersを元に補正します
 #
+# @input args
+#   Side : "Attack" | "Defense"
 # @within function
 #   api:damage/core/modify/player
-#   api:damage/core/get_status/modify_and_get_damage
+#   api:damage/core/attack
 
 #> Temp
 # @private
@@ -16,7 +18,11 @@
 
 # 必要なデータの取得と加算
     # 元ダメージ
-        execute store result score $Damage Temporary run data get storage api: Argument.Damage 100
+        execute store result score $Damage Temporary run data get storage api: Damage 100
+    # 補正
+        function oh_my_dat:please
+        $data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.$(Side)
+# 補正値の計算
     # Base値による補正
         execute store result score $Modifier Temporary run data get storage api: Modifiers.Base 100
         execute unless data storage api: Modifiers.Base run scoreboard players set $Modifier Temporary 100
@@ -53,6 +59,7 @@
 # 代入
     execute store result storage api: ModifiedDamage double 0.0001 run scoreboard players get $Damage Temporary
 # リセット
+    data remove storage api: Damage
     data remove storage api: Modifiers
     scoreboard players reset $Damage Temporary
     scoreboard players reset $Modifier Temporary