From a6777d49fe360c82337119cf8267a1f1fa49e06e Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sun, 24 Nov 2024 18:51:25 +0900 Subject: [PATCH] =?UTF-8?q?:fire:=20asset=5Fmanager=20=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=83=9C=E3=82=B9=E3=83=90=E3=83=BC=E3=81=AE=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/bossbar/init.mcfunction | 23 ------------------- .../functions/mob/bossbar/reset.mcfunction | 8 ------- .../functions/mob/bossbar/tick.mcfunction | 8 ------- .../functions/mob/summon/set_data.mcfunction | 2 -- .../functions/mob/tick/.mcfunction | 2 -- .../functions/mob/tick/global.mcfunction | 7 ------ .../data/core/functions/load_once.mcfunction | 3 --- .../data/core/functions/tick/.mcfunction | 2 -- 8 files changed, 55 deletions(-) delete mode 100644 TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction delete mode 100644 TheSkyBlessing/data/asset_manager/functions/mob/bossbar/reset.mcfunction delete mode 100644 TheSkyBlessing/data/asset_manager/functions/mob/bossbar/tick.mcfunction delete mode 100644 TheSkyBlessing/data/asset_manager/functions/mob/tick/global.mcfunction diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction deleted file mode 100644 index 6b39d45408..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset_manager:mob/bossbar/init -# -# -# -# @within function asset_manager:mob/summon/set_data - -#> Val -# @private -#declare score_holder $MaxHealth - -# 追跡対象の設定 - tag @e[type=#lib:living,tag=BossbarTarget] remove BossbarTarget - tag @s add BossbarTarget -# ボスバー名に天使の名前を入れる - bossbar set asset:bossbar name {"selector":"@s"} -# ボスバーに体力を設定する - execute store result score $MaxHealth Temporary run function api:mob/get_max_health - scoreboard players operation $MaxHealth Temporary *= $100 Const - execute store result bossbar asset:bossbar value store result bossbar asset:bossbar max run scoreboard players get $MaxHealth Temporary -# ボスバーを表示する - bossbar set asset:bossbar players @a -# リセット - scoreboard players reset $MaxHealth Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/reset.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/reset.mcfunction deleted file mode 100644 index b45529f860..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/reset.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset_manager:mob/bossbar/reset -# -# -# -# @within function asset_manager:mob/tick/global - -# 見えなくする - bossbar set asset:bossbar players \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/tick.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/tick.mcfunction deleted file mode 100644 index c2f62de04a..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/tick.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset_manager:mob/bossbar/tick -# -# -# -# @within function asset_manager:mob/tick/ - -# maxが100倍で入ってるので100倍で現在値を設定する - execute store result bossbar asset:bossbar value run scoreboard players get @s MobHealth diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/summon/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/summon/set_data.mcfunction index 8e89776644..3f7152703c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/summon/set_data.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/summon/set_data.mcfunction @@ -109,8 +109,6 @@ data modify storage api: Argument.Address set from storage asset:mob ID function api:rom/please data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4][-4].Mob.Lore set from storage asset:mob Lore -# ボスバーの表示 - execute if data storage asset:mob {Type:"Enemy.Boss"} run function asset_manager:mob/bossbar/init # データ初期化 function mob_manager:init/ # リセット diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/tick/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/tick/.mcfunction index ac572d119c..0a60ec5fff 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/tick/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/tick/.mcfunction @@ -8,5 +8,3 @@ function asset_manager:mob/common_tag/ # MOB周りのトリガー処理 function asset_manager:mob/triggers/ -# 天使のボスバー処理 - execute if entity @s[tag=BossbarTarget] run function asset_manager:mob/bossbar/tick \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/tick/global.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/tick/global.mcfunction deleted file mode 100644 index a80b2937ea..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/mob/tick/global.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset_manager:mob/tick/global -# -# -# -# @within function core:tick/ - -execute unless entity @e[type=#lib:living,tag=BossbarTarget] run function asset_manager:mob/bossbar/reset \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/load_once.mcfunction b/TheSkyBlessing/data/core/functions/load_once.mcfunction index 217810205e..28db2e73dc 100644 --- a/TheSkyBlessing/data/core/functions/load_once.mcfunction +++ b/TheSkyBlessing/data/core/functions/load_once.mcfunction @@ -171,11 +171,8 @@ team modify NoCollision collisionRule never # @within function # core:load_once # asset_manager:mob/** - bossbar add asset:bossbar {"text":""} scoreboard objectives add VoidActionTime dummy {"text":"汎用奈落耐性アクションの状態"} scoreboard objectives add VoidMobID dummy {"text":"耐性MobとAECの紐付け用"} - bossbar set asset:bossbar color pink - bossbar set asset:bossbar style notched_10 #> AssetManager: Object -Public # @public diff --git a/TheSkyBlessing/data/core/functions/tick/.mcfunction b/TheSkyBlessing/data/core/functions/tick/.mcfunction index 41e9b7e299..f45b47e255 100644 --- a/TheSkyBlessing/data/core/functions/tick/.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/.mcfunction @@ -54,8 +54,6 @@ function world_manager:gimmick/ # Mob処理部 - # AssetMobのグローバル処理 - function asset_manager:mob/tick/global # データ初期化部 execute as @e[type=#lib:living,type=!player,tag=!AlreadyInitMob] run function mob_manager:init/ # MobAsset処理