5属性耐性を削除 (#654)

data/enemy/functions/show_damage/health_minus.mcfunction

@@ -1,11 +1,3 @@
 
-scoreboard players set _ _ 0
-data modify storage mob_data: WeakElement set value []
-execute if entity @s[scores={ElementFire=101..},tag=ReceivedFireDamage] store success score _ _ run data modify storage mob_data: WeakElement append value '{"text":"f","font":"element"}'
-execute if entity @s[scores={ElementIce=101..},tag=ReceivedIceDamage] store success score _ _ run data modify storage mob_data: WeakElement append value '{"text":"c","font":"element"}'
-execute if entity @s[scores={ElementLightning=101..},tag=ReceivedLightningDamage] store success score _ _ run data modify storage mob_data: WeakElement append value '{"text":"n","font":"element"}'
-execute if entity @s[scores={ElementLight=101..},tag=ReceivedLightDamage] store success score _ _ run data modify storage mob_data: WeakElement append value '{"text":"l","font":"element"}'
-execute if entity @s[scores={ElementDark=101..},tag=ReceivedDarkDamage] store success score _ _ run data modify storage mob_data: WeakElement append value '{"text":"d","font":"element"}'
-execute if score _ _ matches 0 run data modify storage popup: data.format set value '{"text":"","color":"white"}'
-execute if score _ _ matches 1 run data modify storage popup: data.format set value '{"text":"","color":"#ffd300"}'
+data modify storage popup: data.format set value '{"text":"","color":"white"}'
 execute store result storage popup: data.value int 1 run scoreboard players get @s StoredDamage

data/enemy/functions/show_damage/health_plus.mcfunction

@@ -1,9 +1,3 @@
 
-data modify storage mob_data: WeakElement set value []
-execute if entity @s[scores={ElementFire=..-1},tag=ReceivedFireDamage] run data modify storage mob_data: WeakElement append value '{"text":"f","font":"element"}'
-execute if entity @s[scores={ElementIce=..-1},tag=ReceivedIceDamage] run data modify storage mob_data: WeakElement append value '{"text":"c","font":"element"}'
-execute if entity @s[scores={ElementLightning=..-1},tag=ReceivedLightningDamage] run data modify storage mob_data: WeakElement append value '{"text":"n","font":"element"}'
-execute if entity @s[scores={ElementLight=..-1},tag=ReceivedLightDamage] run data modify storage mob_data: WeakElement append value '{"text":"l","font":"element"}'
-execute if entity @s[scores={ElementDark=..-1},tag=ReceivedDarkDamage] run data modify storage mob_data: WeakElement append value '{"text":"d","font":"element"}'
 data modify storage popup: data.format set value '{"text":"","color":"#a8ff00"}'
 execute store result storage popup: data.value int 1 run scoreboard players get @s StoredDamage

data/enemy/functions/show_damage/show.mcfunction

@@ -4,8 +4,6 @@ execute if score @s StoredDamage matches 0.. run function enemy:show_damage/heal
 scoreboard players set _ _ -1
 scoreboard players operation @s StoredDamage *= _ _
 execute if score @s StoredDamage matches 1.. run function enemy:show_damage/health_plus
-execute in area:control_area run loot replace block 2 2 2 container.0 loot enemy:weak_recover_element
-execute in area:control_area run data modify storage popup: data.suffix set from block 2 2 2 Items[0].tag.display.Name
 execute as @a[distance=..32,limit=1,sort=nearest] run function #util:distance
 execute store result storage popup: data.size double 0.0001 run data get storage util: out 3333
 execute anchored eyes positioned ^ ^ ^ run function #popup:

data/entity/function/spawn/apply_status/mob.mcfunction

@@ -14,13 +14,6 @@ attribute @s minecraft:generic.max_absorption base set 2048
 data modify entity @s AbsorptionAmount set value 2048f
 data modify entity @s DeathTime set value 19s
 
-### 属性値
-execute store result score @s ElementFire run data get storage tusb_mob: "遅延ステータス"."ステータス"."炎属性値"
-execute store result score @s ElementIce run data get storage tusb_mob: "遅延ステータス"."ステータス"."氷属性値"
-execute store result score @s ElementLightning run data get storage tusb_mob: "遅延ステータス"."ステータス"."雷属性値"
-execute store result score @s ElementLight run data get storage tusb_mob: "遅延ステータス"."ステータス"."光属性値"
-execute store result score @s ElementDark run data get storage tusb_mob: "遅延ステータス"."ステータス"."闇属性値"
-
 ### ステータス
 function entity:spawn/apply_status/status/hp
 function entity:spawn/apply_status/status/mp

data/entity/function/spawn/set_spawner/each_mob.mcfunction

@@ -10,9 +10,6 @@ data modify entity @s Tags set from storage tusb_mob: MobTags[-1].Tags
 data remove storage tusb_mob: "即時ステータス"
 data remove storage tusb_mob: "遅延ステータス"
 
-# 属性値デフォルト
-data modify storage tusb_mob: "遅延ステータス"."ステータス" set value {"炎属性値":100,"氷属性値":100,"雷属性値":100,"光属性値":100,"闇属性値":100}
-
 # タグに応じて、データを取得する
 function #entity:spawn_data
 

data/main/function/load_once.mcfunction

@@ -19,11 +19,6 @@ function settings:main/define/gamerule
 
 ###ステータス
 scoreboard objectives add Level dummy {"text":"レベル"}
-scoreboard objectives add ElementFire dummy {"text":"炎属性値"}
-scoreboard objectives add ElementIce dummy {"text":"氷属性値"}
-scoreboard objectives add ElementLightning dummy {"text":"雷属性値"}
-scoreboard objectives add ElementLight dummy {"text":"光属性値"}
-scoreboard objectives add ElementDark dummy {"text":"闇属性値"}
 scoreboard objectives add HP dummy {"text":"HP"}
 scoreboard objectives add HPMax dummy {"text":"HP最大値"}
 scoreboard objectives add MP dummy {"text":"MP"}

data/player/functions/trigger/hurt_entity/hit_projectile.mcfunction

@@ -7,8 +7,5 @@ execute at 0-0-0-0-2 as @e[type=#entity:projectiles,limit=1,sort=nearest] run fu
 data modify storage skill: Damage set value {Hit:1b}
 execute at 0-0-0-0-2 as @e[tag=Enemy,nbt=!{AbsorptionAmount:1000000f},distance=0] run function skill:damage/apply/
 
-#属性ダメージ演出
-execute at 0-0-0-0-2 run function makeup:skill/enchant/elemental_damage/hit
-
 #狩人バースト用フラグ
 tag @s add BurstArrow

data/player/functions/trigger/hurt_entity/melee_attack.mcfunction

@@ -26,6 +26,3 @@ execute if data storage item: Item.tag.Skill{Trigger:"近接攻撃する"} run f
 
 #近接スキルの場合、物理ダメージはスキル側で計算するため0にする
 execute if data storage item: Item.tag.Skill.Damage{Melee:1b} at 0-0-0-0-2 run data modify entity @e[tag=Enemy,nbt=!{AbsorptionAmount:1000000f},distance=0,limit=1] AbsorptionAmount set value 1000000f
-
-#属性ダメージ演出
-execute at 0-0-0-0-2 run function makeup:skill/enchant/elemental_damage/hit

data/skill/functions/act/common/libra/success.mcfunction

@@ -2,7 +2,7 @@
 ### 補足成功
 
 tag @s add LibraCaster
-execute as @e[tag=Mob,distance=..0.01,sort=nearest,limit=1] run tellraw @a[tag=LibraCaster] [{"translate":"ライブラ：【 %1$s 】","with":[{"selector":"@s"}]},{"text":"\n"},{"translate":"基礎能力 | %1$s %2$s %3$s %4$s %5$s %6$s","hoverEvent":{"action":"show_text","contents":{"translate":"モブのLvによって変動する値。"}},"with":[[{"text":""},{"text":"h","font":"icon","color":"red","hoverEvent":{"action":"show_text","contents":{"translate":"体力"}}},{"text":" : "},{"score":{"objective":"HP","name":"@s"}},{"text":"/"},{"score":{"objective":"HPMax","name":"@s"}}],[{"text":""},{"text":"M","font":"icon","color":"aqua","hoverEvent":{"action":"show_text","contents":{"translate":"MP"}}},{"text":" : "},{"score":{"objective":"MP","name":"@s"}},{"text":"/"},{"score":{"objective":"MPMax","name":"@s"}}],[{"text":""},{"text":"p","font":"icon","color":"#b3414f","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"物理攻撃力"},"\n",{"translate":"殴りや投擲物の攻撃力"}]}}},{"text":" : "},{"score":{"objective":"Attack","name":"@s"}}],[{"text":""},{"text":"F","font":"icon","color":"#41b3a5","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"物理防御力"},"\n",{"translate":"殴りや投擲物に対する防御力"}]}}},{"text":" : "},{"score":{"objective":"Defense","name":"@s"}}],[{"text":""},{"text":"A","font":"icon","color":"#66b341","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"魔法攻撃力"},"\n",{"translate":"スキルの攻撃力"}]}}},{"text":" : "},{"score":{"objective":"SpecialAttack","name":"@s"}}],[{"text":""},{"text":"D","font":"icon","color":"#8e41b3","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"魔法防御力"},"\n",{"translate":"属性攻撃に対する防御力"}]}}},{"text":" : "},{"score":{"objective":"SpecialDefense","name":"@s"}}]]},{"text":"\n"},{"translate":"属性ダメージ倍率 | %1$s %2$s %3$s %4$s %5$s","hoverEvent":{"action":"show_text","contents":{"translate":"スキル、魔石の属性のダメージ倍率\n(50% = 0.5倍, 100% = 1倍, 150% = 1.5倍)\n(-%)であれば回復、0%で無効、100%以上であれば増加する。"}},"with":[[{"text":""},{"text":"f","font":"icon","color":"#FF4400","hoverEvent":{"action":"show_text","contents":{"translate":"炎属性耐性"}}},{"text":" : "},{"score":{"objective":"ElementFire","name":"@s"}},{"text":"%"}],[{"text":""},{"text":"c","font":"icon","color":"#08C4FF","hoverEvent":{"action":"show_text","contents":{"translate":"氷属性耐性"}}},{"text":" : "},{"score":{"objective":"ElementIce","name":"@s"}},{"text":"%"}],[{"text":""},{"text":"n","font":"icon","color":"#FFAD00","hoverEvent":{"action":"show_text","contents":{"translate":"雷属性耐性"}}},{"text":" : "},{"score":{"objective":"ElementLightning","name":"@s"}},{"text":"%"}],[{"text":""},{"text":"l","font":"icon","color":"#DBD4A6","hoverEvent":{"action":"show_text","contents":{"translate":"光属性耐性"}}},{"text":" : "},{"score":{"objective":"ElementLight","name":"@s"}},{"text":"%"}],[{"text":""},{"text":"d","font":"icon","color":"#8356A6","hoverEvent":{"action":"show_text","contents":{"translate":"闇属性耐性"}}},{"text":" : "},{"score":{"objective":"ElementDark","name":"@s"}},{"text":"%"}]]}]
+execute as @e[tag=Mob,distance=..0.01,sort=nearest,limit=1] run tellraw @a[tag=LibraCaster] [{"translate":"ライブラ：【 %1$s 】","with":[{"selector":"@s"}]},{"text":"\n"},{"translate":"基礎能力 | %1$s %2$s %3$s %4$s %5$s %6$s","hoverEvent":{"action":"show_text","contents":{"translate":"モブのLvによって変動する値。"}},"with":[[{"text":""},{"text":"h","font":"icon","color":"red","hoverEvent":{"action":"show_text","contents":{"translate":"体力"}}},{"text":" : "},{"score":{"objective":"HP","name":"@s"}},{"text":"/"},{"score":{"objective":"HPMax","name":"@s"}}],[{"text":""},{"text":"M","font":"icon","color":"aqua","hoverEvent":{"action":"show_text","contents":{"translate":"MP"}}},{"text":" : "},{"score":{"objective":"MP","name":"@s"}},{"text":"/"},{"score":{"objective":"MPMax","name":"@s"}}],[{"text":""},{"text":"p","font":"icon","color":"#b3414f","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"物理攻撃力"},"\n",{"translate":"殴りや投擲物の攻撃力"}]}}},{"text":" : "},{"score":{"objective":"Attack","name":"@s"}}],[{"text":""},{"text":"F","font":"icon","color":"#41b3a5","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"物理防御力"},"\n",{"translate":"殴りや投擲物に対する防御力"}]}}},{"text":" : "},{"score":{"objective":"Defense","name":"@s"}}],[{"text":""},{"text":"A","font":"icon","color":"#66b341","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"魔法攻撃力"},"\n",{"translate":"スキルの攻撃力"}]}}},{"text":" : "},{"score":{"objective":"SpecialAttack","name":"@s"}}],[{"text":""},{"text":"D","font":"icon","color":"#8e41b3","hoverEvent":{"action":"show_text","contents":{"text":"","extra":[{"translate":"魔法防御力"},"\n",{"translate":"属性攻撃に対する防御力"}]}}},{"text":" : "},{"score":{"objective":"SpecialDefense","name":"@s"}}]]}]
 tag @s remove LibraCaster
 
 function makeup:skill/act/common/libra/success

data/skill/functions/act/common/life_scouter/success.mcfunction

@@ -2,7 +2,6 @@
 
 function #oh_my_dat:please
 data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LifeScouter.OriginalName set from entity @s CustomName
-function skill:act/common/life_scouter/element_text
 tag @s add LifeScouter
 
 # 表示用テキストディスプレイ

data/skill/functions/act/white_mage/sanctuary/apply_enemy.mcfunction

@@ -1,23 +1,7 @@
 ##############################
-### サンクチュアリ 敵の属性耐性低下
+### サンクチュアリ 敵の属性耐性低下?
 ##############################
 
-#属性耐性をmin(+X|X)にする
-execute if score _ Level matches 1 run scoreboard players set _ Calc 15
-execute if score _ Level matches 2 run scoreboard players set _ Calc 30
-execute if score _ Level matches 3 run scoreboard players set _ Calc 45
-
-scoreboard players operation @s ElementFire += _ Calc
-scoreboard players operation @s ElementFire > _ Calc
-scoreboard players operation @s ElementIce += _ Calc
-scoreboard players operation @s ElementIce > _ Calc
-scoreboard players operation @s ElementLightning += _ Calc
-scoreboard players operation @s ElementLightning > _ Calc
-scoreboard players operation @s ElementLight += _ Calc
-scoreboard players operation @s ElementLight > _ Calc
-scoreboard players operation @s ElementDark += _ Calc
-scoreboard players operation @s ElementDark > _ Calc
-
 tag @s add SanctuaryApplied
 
 #演出

data/skill/functions/enemy/change_status/.mcfunction

@@ -1,11 +1,6 @@
 data modify storage tusb_mob: "遅延ステータス"."ステータス" set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4]."ステータス" 
 
 execute if data storage mob_data: Call.Level run function skill:enemy/change_status/level/
-execute if data storage mob_data: Call.ElementFire run function skill:enemy/change_status/element_fire
-execute if data storage mob_data: Call.ElementIce run function skill:enemy/change_status/element_ice
-execute if data storage mob_data: Call.ElementLightning run function skill:enemy/change_status/element_lightning
-execute if data storage mob_data: Call.ElementLight run function skill:enemy/change_status/element_light
-execute if data storage mob_data: Call.ElementDark run function skill:enemy/change_status/element_dark
 execute if data storage mob_data: Call.HP run function skill:enemy/change_status/hp
 execute if data storage mob_data: Call.MP run function skill:enemy/change_status/mp
 execute if data storage mob_data: Call.Attack run function skill:enemy/change_status/attack
@@ -17,4 +12,4 @@ execute if data storage mob_data: Call.SpecialDefense run function skill:enemy/c
 data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4]."ステータス" set from storage tusb_mob: "遅延ステータス"."ステータス"
 
 # ライフスカウター
-execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/bar_set
+execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/bar_set