diff --git a/data/enemy/functions/show_damage/health_minus.mcfunction b/data/enemy/functions/show_damage/health_minus.mcfunction index c29a7d0bb9..921b1333a4 100644 --- a/data/enemy/functions/show_damage/health_minus.mcfunction +++ b/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 diff --git a/data/enemy/functions/show_damage/health_plus.mcfunction b/data/enemy/functions/show_damage/health_plus.mcfunction index a3ebaef4bf..849c81696c 100644 --- a/data/enemy/functions/show_damage/health_plus.mcfunction +++ b/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 diff --git a/data/enemy/functions/show_damage/show.mcfunction b/data/enemy/functions/show_damage/show.mcfunction index 1d9d0880cc..415a3889b8 100644 --- a/data/enemy/functions/show_damage/show.mcfunction +++ b/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: diff --git a/data/enemy/loot_tables/weak_recover_element.json b/data/enemy/loot_tables/weak_recover_element.json deleted file mode 100644 index 939930c757..0000000000 --- a/data/enemy/loot_tables/weak_recover_element.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stick", - "functions": [ - { - "function": "minecraft:set_name", - "entity": "this", - "name": [ - { - "text": " " - }, - { - "storage": "mob_data:", - "nbt": "WeakElement[]", - "interpret": true, - "separator": { - "text": "" - } - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{CustomModelData:1}" - }, - { - "function": "minecraft:set_attributes", - "modifiers": [ - { - "attribute": "minecraft:generic.max_health", - "name": "", - "amount": 1, - "operation": "addition", - "slot": "mainhand" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/data/entity/function/spawn/apply_status/mob.mcfunction b/data/entity/function/spawn/apply_status/mob.mcfunction index 8d6547a346..e60adbc1d0 100644 --- a/data/entity/function/spawn/apply_status/mob.mcfunction +++ b/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 diff --git a/data/entity/function/spawn/set_spawner/each_mob.mcfunction b/data/entity/function/spawn/set_spawner/each_mob.mcfunction index 7be8ac226a..e8e1b914d8 100644 --- a/data/entity/function/spawn/set_spawner/each_mob.mcfunction +++ b/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 diff --git a/data/main/function/load_once.mcfunction b/data/main/function/load_once.mcfunction index 09216adbd1..82b5312627 100644 --- a/data/main/function/load_once.mcfunction +++ b/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"} diff --git a/data/makeup/functions/skill/enchant/elemental_damage/hit.mcfunction b/data/makeup/functions/skill/enchant/elemental_damage/hit.mcfunction deleted file mode 100644 index 8c8ae50928..0000000000 --- a/data/makeup/functions/skill/enchant/elemental_damage/hit.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -execute if score _ ElementFire matches 1.. run particle dust 100000000 0.3 0 1 ~ ~1 ~ 0.4 0.6 0.4 1 2 force -execute if score _ ElementIce matches 1.. run particle dust 0 -0.3 100000000 1 ~ ~1 ~ 0.4 0.6 0.4 1 2 force -execute if score _ ElementLightning matches 1.. run particle dust 100000000 -0.3 0 1 ~ ~1 ~ 0.4 0.6 0.4 1 2 force -execute if score _ ElementLight matches 1.. run particle dust 100000000 100000000 1 1 ~ ~1 ~ 0.4 0.6 0.4 1 2 force -execute if score _ ElementDark matches 1.. run particle dust -0.3 0 100000000 1 ~ ~1 ~ 0.4 0.6 0.4 1 2 force diff --git a/data/player/functions/trigger/hurt_entity/hit_projectile.mcfunction b/data/player/functions/trigger/hurt_entity/hit_projectile.mcfunction index eeef1f6749..12458c8a86 100644 --- a/data/player/functions/trigger/hurt_entity/hit_projectile.mcfunction +++ b/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 diff --git a/data/player/functions/trigger/hurt_entity/melee_attack.mcfunction b/data/player/functions/trigger/hurt_entity/melee_attack.mcfunction index ae28fdcd09..03a3d6be83 100644 --- a/data/player/functions/trigger/hurt_entity/melee_attack.mcfunction +++ b/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 diff --git a/data/skill/functions/act/common/libra/success.mcfunction b/data/skill/functions/act/common/libra/success.mcfunction index 9ae12991bb..c9cbb6c767 100644 --- a/data/skill/functions/act/common/libra/success.mcfunction +++ b/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 diff --git a/data/skill/functions/act/common/life_scouter/element_text.mcfunction b/data/skill/functions/act/common/life_scouter/element_text.mcfunction deleted file mode 100644 index 453ee1baba..0000000000 --- a/data/skill/functions/act/common/life_scouter/element_text.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -data modify storage skill: LifeScouter set value {Fire:'""',Ice:'""',Lightning:'""',Light:'""',Dark:'""'} - -# Fire -execute if score @s ElementFire matches 101.. run data modify storage skill: LifeScouter.Fire set value '{"text":"O","font":"element"}' -execute if score @s ElementFire matches 100 run data modify storage skill: LifeScouter.Fire set value '{"text":"o","font":"element"}' -execute if score @s ElementFire matches 1..99 run data modify storage skill: LifeScouter.Fire set value '{"text":"x","font":"element"}' -execute if score @s ElementFire matches ..0 run data modify storage skill: LifeScouter.Fire set value '{"text":"X","font":"element"}' -# Ice -execute if score @s ElementIce matches 101.. run data modify storage skill: LifeScouter.Ice set value '{"text":"O","font":"element"}' -execute if score @s ElementIce matches 100 run data modify storage skill: LifeScouter.Ice set value '{"text":"o","font":"element"}' -execute if score @s ElementIce matches 1..99 run data modify storage skill: LifeScouter.Ice set value '{"text":"x","font":"element"}' -execute if score @s ElementIce matches ..0 run data modify storage skill: LifeScouter.Ice set value '{"text":"X","font":"element"}' -# Lightning -execute if score @s ElementLightning matches 101.. run data modify storage skill: LifeScouter.Lightning set value '{"text":"O","font":"element"}' -execute if score @s ElementLightning matches 100 run data modify storage skill: LifeScouter.Lightning set value '{"text":"o","font":"element"}' -execute if score @s ElementLightning matches 1..99 run data modify storage skill: LifeScouter.Lightning set value '{"text":"x","font":"element"}' -execute if score @s ElementLightning matches ..0 run data modify storage skill: LifeScouter.Lightning set value '{"text":"X","font":"element"}' -# Light -execute if score @s ElementLight matches 101.. run data modify storage skill: LifeScouter.Light set value '{"text":"O","font":"element"}' -execute if score @s ElementLight matches 100 run data modify storage skill: LifeScouter.Light set value '{"text":"o","font":"element"}' -execute if score @s ElementLight matches 1..99 run data modify storage skill: LifeScouter.Light set value '{"text":"x","font":"element"}' -execute if score @s ElementLight matches ..0 run data modify storage skill: LifeScouter.Light set value '{"text":"X","font":"element"}' -# Dark -execute if score @s ElementDark matches 101.. run data modify storage skill: LifeScouter.Dark set value '{"text":"O","font":"element"}' -execute if score @s ElementDark matches 100 run data modify storage skill: LifeScouter.Dark set value '{"text":"o","font":"element"}' -execute if score @s ElementDark matches 1..99 run data modify storage skill: LifeScouter.Dark set value '{"text":"x","font":"element"}' -execute if score @s ElementDark matches ..0 run data modify storage skill: LifeScouter.Dark set value '{"text":"X","font":"element"}' - -data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LifeScouter merge from storage skill: LifeScouter diff --git a/data/skill/functions/act/common/life_scouter/success.mcfunction b/data/skill/functions/act/common/life_scouter/success.mcfunction index 966650dca5..699ea31715 100644 --- a/data/skill/functions/act/common/life_scouter/success.mcfunction +++ b/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 # 表示用テキストディスプレイ diff --git a/data/skill/functions/act/white_mage/sanctuary/apply_enemy.mcfunction b/data/skill/functions/act/white_mage/sanctuary/apply_enemy.mcfunction index 1dc6a9c6e1..0e655235ce 100644 --- a/data/skill/functions/act/white_mage/sanctuary/apply_enemy.mcfunction +++ b/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 #演出 diff --git a/data/skill/functions/enemy/change_status/.mcfunction b/data/skill/functions/enemy/change_status/.mcfunction index 2b651618c6..8e64234377 100644 --- a/data/skill/functions/enemy/change_status/.mcfunction +++ b/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 \ No newline at end of file +execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/bar_set diff --git a/data/skill/functions/enemy/change_status/element_dark.mcfunction b/data/skill/functions/enemy/change_status/element_dark.mcfunction deleted file mode 100644 index 0a941cb950..0000000000 --- a/data/skill/functions/enemy/change_status/element_dark.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#Set, Add -execute store result score @s Calc run data get storage mob_data: Call.ElementDark.Add -execute store result score @s _ run data get storage mob_data: Call.ElementDark.Range -execute unless score @s _ matches 0 run function skill:enemy/change_move/range -execute if data storage mob_data: Call.ElementDark.Set store result score @s ElementDark run data get storage mob_data: Call.ElementDark.Set -scoreboard players operation @s ElementDark += @s Calc -#Limit -execute if data storage mob_data: Call.ElementDark.Limit store result score @s _ run data get storage mob_data: Call.ElementDark.Limit -execute if score @s Calc matches 1.. if data storage mob_data: Call.ElementDark.Limit run scoreboard players operation @s ElementDark < @s _ -execute if score @s Calc matches ..-1 if data storage mob_data: Call.ElementDark.Limit run scoreboard players operation @s ElementDark > @s _ - -execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/element_text \ No newline at end of file diff --git a/data/skill/functions/enemy/change_status/element_fire.mcfunction b/data/skill/functions/enemy/change_status/element_fire.mcfunction deleted file mode 100644 index abfbf28d3d..0000000000 --- a/data/skill/functions/enemy/change_status/element_fire.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#Set, Add -execute store result score @s Calc run data get storage mob_data: Call.ElementFire.Add -execute store result score @s _ run data get storage mob_data: Call.ElementFire.Range -execute unless score @s _ matches 0 run function skill:enemy/change_move/range -execute if data storage mob_data: Call.ElementFire.Set store result score @s ElementFire run data get storage mob_data: Call.ElementFire.Set -scoreboard players operation @s ElementFire += @s Calc -#Limit -execute if data storage mob_data: Call.ElementFire.Limit store result score @s _ run data get storage mob_data: Call.ElementFire.Limit -execute if score @s Calc matches 1.. if data storage mob_data: Call.ElementFire.Limit run scoreboard players operation @s ElementFire < @s _ -execute if score @s Calc matches ..-1 if data storage mob_data: Call.ElementFire.Limit run scoreboard players operation @s ElementFire > @s _ - -execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/element_text \ No newline at end of file diff --git a/data/skill/functions/enemy/change_status/element_ice.mcfunction b/data/skill/functions/enemy/change_status/element_ice.mcfunction deleted file mode 100644 index 67e683469a..0000000000 --- a/data/skill/functions/enemy/change_status/element_ice.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#Set, Add -execute store result score @s Calc run data get storage mob_data: Call.ElementIce.Add -execute store result score @s _ run data get storage mob_data: Call.ElementIce.Range -execute unless score @s _ matches 0 run function skill:enemy/change_move/range -execute if data storage mob_data: Call.ElementIce.Set store result score @s ElementIce run data get storage mob_data: Call.ElementIce.Set -scoreboard players operation @s ElementIce += @s Calc -#Limit -execute if data storage mob_data: Call.ElementIce.Limit store result score @s _ run data get storage mob_data: Call.ElementIce.Limit -execute if score @s Calc matches 1.. if data storage mob_data: Call.ElementIce.Limit run scoreboard players operation @s ElementIce < @s _ -execute if score @s Calc matches ..-1 if data storage mob_data: Call.ElementIce.Limit run scoreboard players operation @s ElementIce > @s _ - -execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/element_text \ No newline at end of file diff --git a/data/skill/functions/enemy/change_status/element_light.mcfunction b/data/skill/functions/enemy/change_status/element_light.mcfunction deleted file mode 100644 index 450436cdfc..0000000000 --- a/data/skill/functions/enemy/change_status/element_light.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#Set, Add -execute store result score @s Calc run data get storage mob_data: Call.ElementLight.Add -execute store result score @s _ run data get storage mob_data: Call.ElementLight.Range -execute unless score @s _ matches 0 run function skill:enemy/change_move/range -execute if data storage mob_data: Call.ElementLight.Set store result score @s ElementLight run data get storage mob_data: Call.ElementLight.Set -scoreboard players operation @s ElementLight += @s Calc -#Limit -execute if data storage mob_data: Call.ElementLight.Limit store result score @s _ run data get storage mob_data: Call.ElementLight.Limit -execute if score @s Calc matches 1.. if data storage mob_data: Call.ElementLight.Limit run scoreboard players operation @s ElementLight < @s _ -execute if score @s Calc matches ..-1 if data storage mob_data: Call.ElementLight.Limit run scoreboard players operation @s ElementLight > @s _ - -execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/element_text \ No newline at end of file diff --git a/data/skill/functions/enemy/change_status/element_lightning.mcfunction b/data/skill/functions/enemy/change_status/element_lightning.mcfunction deleted file mode 100644 index fa18d33534..0000000000 --- a/data/skill/functions/enemy/change_status/element_lightning.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#Set, Add -execute store result score @s Calc run data get storage mob_data: Call.ElementLightning.Add -execute store result score @s _ run data get storage mob_data: Call.ElementLightning.Range -execute unless score @s _ matches 0 run function skill:enemy/change_move/range -execute if data storage mob_data: Call.ElementLightning.Set store result score @s ElementLightning run data get storage mob_data: Call.ElementLightning.Set -scoreboard players operation @s ElementLightning += @s Calc -#Limit -execute if data storage mob_data: Call.ElementLightning.Limit store result score @s _ run data get storage mob_data: Call.ElementLightning.Limit -execute if score @s Calc matches 1.. if data storage mob_data: Call.ElementLightning.Limit run scoreboard players operation @s ElementLightning < @s _ -execute if score @s Calc matches ..-1 if data storage mob_data: Call.ElementLightning.Limit run scoreboard players operation @s ElementLightning > @s _ - -execute if entity @s[tag=LifeScouter] run function skill:act/common/life_scouter/element_text \ No newline at end of file diff --git a/data/skill/loot_tables/life_scouter.json b/data/skill/loot_tables/life_scouter.json index 3a64a2e039..fc422228f0 100644 --- a/data/skill/loot_tables/life_scouter.json +++ b/data/skill/loot_tables/life_scouter.json @@ -23,37 +23,6 @@ "storage": "skill:", "nbt": "LifeScouter.HPBar", "interpret": true - }, - "\n", - { - "text": "fcnld", - "font": "element" - }, - "\n", - { - "storage": "skill:", - "nbt": "LifeScouter.Fire", - "interpret": true - }, - { - "storage": "skill:", - "nbt": "LifeScouter.Ice", - "interpret": true - }, - { - "storage": "skill:", - "nbt": "LifeScouter.Lightning", - "interpret": true - }, - { - "storage": "skill:", - "nbt": "LifeScouter.Light", - "interpret": true - }, - { - "storage": "skill:", - "nbt": "LifeScouter.Dark", - "interpret": true } ] ] @@ -63,4 +32,4 @@ ] } ] -} \ No newline at end of file +}