From c2ff9ca14f285b5b6ee9e66ac5e637640ff2eb5b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 31 Oct 2024 16:31:27 +0000 Subject: [PATCH 01/74] Update Declares from ProjectTSB/TheSkyBlessing@340f0c8ac7dc00934cd3171f535632db6de172d6 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index bbcd08d588..e2eb125130 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -200,6 +200,8 @@ #declare function lib:array/mask from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/mask.mcfunction#L1 #declare function lib:array/mask_inverted from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/mask_inverted.mcfunction#L1 #declare function lib:array/math/add from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/add.mcfunction#L1 + #declare function lib:array/math/max from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/max.mcfunction#L1 + #declare function lib:array/math/min from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/min.mcfunction#L1 #declare function lib:array/math/scalar_multiply from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/scalar_multiply.mcfunction#L1 #declare function lib:array/math/sqr from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/sqr.mcfunction#L1 #declare function lib:array/math/sub from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/functions/array/math/sub.mcfunction#L1 From b125db5fcc5634c099abf4aa4051c8fbb731b3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 3 Nov 2024 17:46:27 +0900 Subject: [PATCH 02/74] =?UTF-8?q?=F0=9F=A9=B9=20IMP-Doc=E3=81=AE=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=83=BC=E3=81=AE=E3=83=9F=E3=82=B9=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#290)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0332.aurora_missile/tick/.mcfunction | 2 +- .../functions/object/2001.custom_effect/summon/debug.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction index fdcdc7ed27..3c244e6b68 100644 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0332.aurora_missile/tick/1 +#> asset:mob/0332.aurora_missile/tick/ # # Mobのtick時の処理 # diff --git a/Asset/data/asset/functions/object/2001.custom_effect/summon/debug.mcfunction b/Asset/data/asset/functions/object/2001.custom_effect/summon/debug.mcfunction index 253f6f3fa1..1b4ad0fc9e 100644 --- a/Asset/data/asset/functions/object/2001.custom_effect/summon/debug.mcfunction +++ b/Asset/data/asset/functions/object/2001.custom_effect/summon/debug.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/2001.custom_effect/summon/debug +#> asset:object/2001.custom_effect/summon/debug # # 動作チェック用の召喚処理 使い終わったら消してもいいかも # From 3ac43ff9fffb2f5b2417797af9c980f7598f890a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 3 Nov 2024 18:11:47 +0900 Subject: [PATCH 03/74] =?UTF-8?q?=F0=9F=9A=B8=20=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=81=AE=E7=A0=B4=E5=A3=8A=E9=9F=B3=E3=81=8C?= =?UTF-8?q?=E9=B3=B4=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#186)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/0003.humanity/give/2.give.mcfunction | 4 +++- .../artifact/0012.sketchy_herb/give/2.give.mcfunction | 4 +++- .../artifact/0043.fruit_of_wisdom/give/2.give.mcfunction | 4 +++- .../functions/artifact/0135.amrita/give/2.give.mcfunction | 4 +++- .../functions/artifact/0136.hi_amrita/give/2.give.mcfunction | 4 +++- .../artifact/0137.aure_amrita/give/2.give.mcfunction | 4 +++- .../artifact/0138.mystica_amrita/give/2.give.mcfunction | 4 +++- .../asset/functions/artifact/0139.soma/give/2.give.mcfunction | 4 +++- .../functions/artifact/0140.hi_soma/give/2.give.mcfunction | 4 +++- .../functions/artifact/0141.aure_soma/give/2.give.mcfunction | 4 +++- .../artifact/0142.mystica_soma/give/2.give.mcfunction | 4 +++- .../functions/artifact/0143.nectar/give/2.give.mcfunction | 4 +++- .../functions/artifact/0144.hi_nectar/give/2.give.mcfunction | 4 +++- .../artifact/0145.aure_nectar/give/2.give.mcfunction | 4 +++- .../artifact/0146.mystica_nectar/give/2.give.mcfunction | 4 +++- .../artifact/0159.extracted_mp_bottle/give/2.give.mcfunction | 4 +++- .../artifact/0185.increased_cookie/give/2.give.mcfunction | 4 +++- .../trigger/3.main.mcfunction | 3 +-- .../asset/functions/artifact/0217.fish/give/2.give.mcfunction | 4 +++- .../artifact/0245.skewered_meat/give/2.give.mcfunction | 4 +++- .../artifact/0272.infinity_food/give/2.give.mcfunction | 4 +++- .../artifact/0437.only_the_crabs_know/give/2.give.mcfunction | 4 +++- .../functions/artifact/0454.kinoko/give/2.give.mcfunction | 4 +++- .../functions/artifact/0454.kinoko/trigger/3.main.mcfunction | 1 - .../functions/artifact/0455.takenoko/give/2.give.mcfunction | 4 +++- .../artifact/0455.takenoko/trigger/3.main.mcfunction | 3 +-- .../0456.potion_of_stalling_power/give/2.give.mcfunction | 4 +++- .../artifact/0515.time_medicine/give/2.give.mcfunction | 4 +++- .../artifact/0608.u_and_w_06_empty/give/2.give.mcfunction | 4 +++- .../artifact/0608.u_and_w_06_empty/trigger/3.main.mcfunction | 3 +-- .../artifact/0617.blue_jelly_fragment/give/2.give.mcfunction | 4 +++- .../functions/artifact/0771.milk_pack/give/2.give.mcfunction | 4 +++- .../artifact/0949.ft_139_rifle_reload/give/2.give.mcfunction | 4 +++- .../0949.ft_139_rifle_reload/trigger/3.main.mcfunction | 3 +-- 34 files changed, 91 insertions(+), 38 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0003.humanity/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0003.humanity/give/2.give.mcfunction index aa3ebeaf00..e0343494a9 100644 --- a/Asset/data/asset/functions/artifact/0003.humanity/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0003.humanity/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0012.sketchy_herb/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0012.sketchy_herb/give/2.give.mcfunction index eaf0afafeb..63517fd0da 100644 --- a/Asset/data/asset/functions/artifact/0012.sketchy_herb/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0012.sketchy_herb/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction index 8a3535b5c4..c89b9c2111 100644 --- a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {HideFlags:63,Enchantments:[{id:unbreaking,lvl:1s}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0135.amrita/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0135.amrita/give/2.give.mcfunction index a1094354b3..194fd96130 100644 --- a/Asset/data/asset/functions/artifact/0135.amrita/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0135.amrita/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:16318239,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0136.hi_amrita/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0136.hi_amrita/give/2.give.mcfunction index b164a72f78..a68af82073 100644 --- a/Asset/data/asset/functions/artifact/0136.hi_amrita/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0136.hi_amrita/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:16318239,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0137.aure_amrita/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0137.aure_amrita/give/2.give.mcfunction index afa47ccc3b..0354cce33e 100644 --- a/Asset/data/asset/functions/artifact/0137.aure_amrita/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0137.aure_amrita/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:16318239,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0138.mystica_amrita/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0138.mystica_amrita/give/2.give.mcfunction index ab68dbd4e9..f79e054ebc 100644 --- a/Asset/data/asset/functions/artifact/0138.mystica_amrita/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0138.mystica_amrita/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:16318239,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0139.soma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0139.soma/give/2.give.mcfunction index ff644d56d8..f65c55dc9c 100644 --- a/Asset/data/asset/functions/artifact/0139.soma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0139.soma/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:697855,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0140.hi_soma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0140.hi_soma/give/2.give.mcfunction index a74e84ad3b..a4f691d558 100644 --- a/Asset/data/asset/functions/artifact/0140.hi_soma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0140.hi_soma/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:697855,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0141.aure_soma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0141.aure_soma/give/2.give.mcfunction index 8671f90b73..11846ac519 100644 --- a/Asset/data/asset/functions/artifact/0141.aure_soma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0141.aure_soma/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:697855,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0142.mystica_soma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0142.mystica_soma/give/2.give.mcfunction index a1ed73d207..a20456fafd 100644 --- a/Asset/data/asset/functions/artifact/0142.mystica_soma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0142.mystica_soma/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:697855,HideFlags:32} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0143.nectar/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0143.nectar/give/2.give.mcfunction index 333c2be9af..3735ec794f 100644 --- a/Asset/data/asset/functions/artifact/0143.nectar/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0143.nectar/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:32,CustomPotionColor:15220575} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0144.hi_nectar/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0144.hi_nectar/give/2.give.mcfunction index 0b5253ea75..b5fdac1ff0 100644 --- a/Asset/data/asset/functions/artifact/0144.hi_nectar/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0144.hi_nectar/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:32,CustomPotionColor:15220575} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0145.aure_nectar/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0145.aure_nectar/give/2.give.mcfunction index 118b501722..ace3862a51 100644 --- a/Asset/data/asset/functions/artifact/0145.aure_nectar/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0145.aure_nectar/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:32,CustomPotionColor:15220575} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0146.mystica_nectar/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0146.mystica_nectar/give/2.give.mcfunction index 5cb702411f..742ffa663a 100644 --- a/Asset/data/asset/functions/artifact/0146.mystica_nectar/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0146.mystica_nectar/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:32,CustomPotionColor:15220575} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/give/2.give.mcfunction index 9bf0c2c59b..e1be9f2c1e 100644 --- a/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:14024944,HideFlags:63} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0185.increased_cookie/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0185.increased_cookie/give/2.give.mcfunction index 0dfbba67b7..0d96909147 100644 --- a/Asset/data/asset/functions/artifact/0185.increased_cookie/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0185.increased_cookie/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/trigger/3.main.mcfunction index 0acc815a84..90fb54d1da 100644 --- a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/trigger/3.main.mcfunction @@ -14,5 +14,4 @@ function lib:mp/set # 演出 playsound ogg:random.levelup player @s ~ ~ ~ 1 1 1 - stopsound @s * entity.item.break - particle totem_of_undying ~ ~1.5 ~ 0.5 1 0.5 0 100 force @s \ No newline at end of file + particle totem_of_undying ~ ~1.5 ~ 0.5 1 0.5 0 100 force @s diff --git a/Asset/data/asset/functions/artifact/0217.fish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0217.fish/give/2.give.mcfunction index a8bba182e1..7070855844 100644 --- a/Asset/data/asset/functions/artifact/0217.fish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0217.fish/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0245.skewered_meat/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0245.skewered_meat/give/2.give.mcfunction index cb278d03f6..8cb2556276 100644 --- a/Asset/data/asset/functions/artifact/0245.skewered_meat/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0245.skewered_meat/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0272.infinity_food/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0272.infinity_food/give/2.give.mcfunction index 08f1d0be54..b4dfe3cb2f 100644 --- a/Asset/data/asset/functions/artifact/0272.infinity_food/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0272.infinity_food/give/2.give.mcfunction @@ -51,10 +51,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/give/2.give.mcfunction index 9b5b847976..79a99e6f52 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction index 860a213d17..1197557462 100644 --- a/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:63,Enchantments:[{id:unbreaking,lvl:1s}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0454.kinoko/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0454.kinoko/trigger/3.main.mcfunction index 5234a42f7c..c652e96746 100644 --- a/Asset/data/asset/functions/artifact/0454.kinoko/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0454.kinoko/trigger/3.main.mcfunction @@ -9,7 +9,6 @@ # ここから先は神器側の効果の処理を書く # 演出 - stopsound @s * entity.item.break tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> き の こ 万 歳 ！"}] # 処理 function api:modifier/max_health/get diff --git a/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction index 4eece31ebf..d9e0aa8033 100644 --- a/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:63,Enchantments:[{id:unbreaking,lvl:1s}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0455.takenoko/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0455.takenoko/trigger/3.main.mcfunction index 8087235481..d73f9bb5ec 100644 --- a/Asset/data/asset/functions/artifact/0455.takenoko/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0455.takenoko/trigger/3.main.mcfunction @@ -9,11 +9,10 @@ # ここから先は神器側の効果の処理を書く # 演出 - stopsound @s * entity.item.break tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> た け の こ 万 歳 ！"}] # 処理 function api:data_get/health execute store result storage lib: Argument.Heal double 0.01 run data get storage api: Health 50 function lib:heal/modifier function lib:heal/ - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/give/2.give.mcfunction index 3fdc88456b..1fd4f1d5cc 100644 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:14024944,HideFlags:63} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction index 913ca4f68e..b990270c97 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:63,CustomPotionColor:16777215} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/give/2.give.mcfunction index 0ebf02712e..1f1b285c97 100644 --- a/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/trigger/3.main.mcfunction index 8d309bb340..3faeb16f86 100644 --- a/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0608.u_and_w_06_empty/trigger/3.main.mcfunction @@ -8,8 +8,7 @@ function asset:artifact/common/use/mainhand # ここから先は神器側の効果の処理を書く - stopsound @a * entity.item.break playsound block.iron_trapdoor.close player @a ~ ~ ~ 1 0.5 playsound entity.horse.armor player @p ~ ~ ~ 0.6 0.6 data modify storage api: Argument.ID set value 607 - function api:artifact/give/from_id \ No newline at end of file + function api:artifact/give/from_id diff --git a/Asset/data/asset/functions/artifact/0617.blue_jelly_fragment/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0617.blue_jelly_fragment/give/2.give.mcfunction index fde6b0a41d..8061ae9b5a 100644 --- a/Asset/data/asset/functions/artifact/0617.blue_jelly_fragment/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0617.blue_jelly_fragment/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {CustomPotionColor:1267320} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0771.milk_pack/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0771.milk_pack/give/2.give.mcfunction index 7fcc2993e2..d1015b9ae8 100644 --- a/Asset/data/asset/functions/artifact/0771.milk_pack/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0771.milk_pack/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:63,CustomPotionColor:16777215} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/give/2.give.mcfunction index 593b9f2025..785c3b6095 100644 --- a/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/trigger/3.main.mcfunction index e4e7a40e25..ea090adb84 100644 --- a/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0949.ft_139_rifle_reload/trigger/3.main.mcfunction @@ -10,9 +10,8 @@ # ここから先は神器側の効果の処理を書く # ここから先は神器側の効果の処理を書く - stopsound @a * entity.item.break playsound block.iron_trapdoor.close player @a ~ ~ ~ 1 0.5 playsound entity.horse.armor player @p ~ ~ ~ 0.6 0.6 data modify storage api: Argument.ID set value 948 - function api:artifact/give/from_id \ No newline at end of file + function api:artifact/give/from_id From d20715cabba9fa08207998b120aff42f80730bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:04:39 +0900 Subject: [PATCH 04/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A87?= =?UTF-8?q?69]=20=E3=82=B7=E3=82=A7=E3=82=A4=E3=82=AD=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=82=B9=E3=83=97=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E3=81=AE?= =?UTF-8?q?=E7=81=AB=E5=8A=9B=E3=82=92=E8=AA=BF=E6=95=B4=20(#169)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0769.shaking_splash/give/2.give.mcfunction | 4 ++-- .../artifact/0769.shaking_splash/trigger/5.beam.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0769.shaking_splash/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0769.shaking_splash/give/2.give.mcfunction index 2157b3db43..f59ddc9dc8 100644 --- a/Asset/data/asset/functions/artifact/0769.shaking_splash/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0769.shaking_splash/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [450] + data modify storage asset:artifact AttackInfo.Damage set value [360,450] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/5.beam.mcfunction b/Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/5.beam.mcfunction index 7f6b31a2b8..6339206667 100644 --- a/Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/5.beam.mcfunction +++ b/Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/5.beam.mcfunction @@ -16,7 +16,7 @@ execute anchored eyes positioned ^-0.35 ^-0.25 ^0.5 run function asset:artifact/0769.shaking_splash/trigger/beam_recursive # ダメージ - data modify storage api: Argument.Damage set value 450.0f + data modify storage api: Argument.Damage set value 360.0f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier From e005ebd284e51658bfa7078a4700cdbbadb5d2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:06:12 +0900 Subject: [PATCH 05/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A87?= =?UTF-8?q?24]=20=E5=BF=98=E5=8D=B4=E3=81=AE=E7=99=BD=E9=9B=AA=E3=81=AE?= =?UTF-8?q?=E3=83=95=E3=83=AB=E3=82=BB=E3=83=83=E3=83=88=E6=99=82=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E6=92=83=E3=81=AE=E5=AF=BE=E8=B1=A1=E3=82=921?= =?UTF-8?q?=E4=BD=93=E3=81=AE=E3=81=BF=E3=81=AB=20(#170)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0724.oblivious_snow/trigger/fullset/attack.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0724.oblivious_snow/trigger/fullset/attack.mcfunction b/Asset/data/asset/functions/artifact/0724.oblivious_snow/trigger/fullset/attack.mcfunction index d471fed52f..00a07bcc5a 100644 --- a/Asset/data/asset/functions/artifact/0724.oblivious_snow/trigger/fullset/attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0724.oblivious_snow/trigger/fullset/attack.mcfunction @@ -17,6 +17,6 @@ data modify storage lib: Argument.AttackType set value "Physical" data modify storage lib: Argument.ElementType set value "Water" function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run function lib:damage/ + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64,sort=nearest,limit=1] run function lib:damage/ # リセット function lib:damage/reset From 0441d26bd02a8e770e68f5294826fe3bf0cedfd8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 8 Nov 2024 15:19:09 +0000 Subject: [PATCH 06/74] Update Declares from ProjectTSB/TheSkyBlessing@32ec85ce0af55f19c45b9d7d201af76873cc9fa3 [regenerate cache] --- .../data/minecraft/functions/declares.d.mcfunction | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index e2eb125130..507551f6e2 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -160,6 +160,9 @@ #declare function api:modifier/defense/water/add from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/defense/water/add.mcfunction#L1 #declare function api:modifier/defense/water/get from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/defense/water/get.mcfunction#L1 #declare function api:modifier/defense/water/remove from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/defense/water/remove.mcfunction#L1 + #declare function api:modifier/fall_damage/add from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/fall_damage/add.mcfunction#L1 + #declare function api:modifier/fall_damage/get from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/fall_damage/get.mcfunction#L1 + #declare function api:modifier/fall_damage/remove from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/fall_damage/remove.mcfunction#L1 #declare function api:modifier/heal/add from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/heal/add.mcfunction#L1 #declare function api:modifier/heal/get from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/heal/get.mcfunction#L1 #declare function api:modifier/heal/remove from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/heal/remove.mcfunction#L1 @@ -913,22 +916,22 @@ # function asset_manager:island/dispel/boss/* # function asset_manager:object/triggers/tick # function asset:object/** +# asset_manager:mob/triggers/ +# asset_manager:mob/triggers/death/ +# asset:mob/** +# function asset_manager:mob/common_tag/anti_void_action/** # core:tick/player/ # player_manager:vanilla_attack # asset_manager:artifact/triggers/** # asset:artifact/** # asset_manager:teleporter/tick/** # core:handler/attack -# asset_manager:mob/triggers/ -# asset_manager:mob/triggers/death/ -# asset:mob/** -# function asset_manager:mob/common_tag/anti_void_action/** # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction#L33 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/_index.d.mcfunction#L6 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/object/_index.d.mcfunction#L35 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/tick/player/.mcfunction#L15 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L44 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L95 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/tick/player/.mcfunction#L15 #declare tag this #> declare From e7df7d699634aa5476ceb35a9ad8f7091d0d8e2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 8 Nov 2024 18:08:06 +0000 Subject: [PATCH 07/74] Update Declares from ProjectTSB/TheSkyBlessing@593515bea7af3ac27d9791320e684e2bb9a258c4 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 2 -- 1 file changed, 2 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 507551f6e2..1759ba9e0e 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -519,8 +519,6 @@ #declare predicate lib:weather/is_raining from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/predicates/weather/is_raining.json#L1 #declare predicate lib:weather/is_sunny from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/predicates/weather/is_sunny.json#L1 #declare predicate lib:weather/is_thundering from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/predicates/weather/is_thundering.json#L1 - #declare predicate player_manager:god/flora/has_high_lvl_regeneration from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/predicates/god/flora/has_high_lvl_regeneration.json#L1 - #declare predicate player_manager:god/nyaptov/has_high_lvl_slow_falling from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/predicates/god/nyaptov/has_high_lvl_slow_falling.json#L1 #declare predicate player_manager:is_believe/flora from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/predicates/is_believe/flora.json#L1 #declare predicate player_manager:is_believe/null from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/predicates/is_believe/null.json#L1 #declare predicate player_manager:is_believe/nyaptov from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/predicates/is_believe/nyaptov.json#L1 From b06c660870bea5a6750529bf8783d53cce2bcb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 10 Nov 2024 08:41:40 +0900 Subject: [PATCH 08/74] =?UTF-8?q?=F0=9F=94=A5=20Mob=E3=81=AE=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=82=92?= =?UTF-8?q?=E7=A0=B4=E5=A3=8A=20(#342)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 43 +------------------ .../mob/0005.thief/summon/.mcfunction | 2 +- .../mob/0007.ectoplasm/summon/.mcfunction | 2 +- .../0013.cluster_creeper/summon/.mcfunction | 2 +- .../mob/0015.guardian/summon/.mcfunction | 2 +- .../mob/0016.shirker/summon/.mcfunction | 2 +- .../mob/0017.fire_bird/summon/.mcfunction | 2 +- .../mob/0019.horus_priest/summon/.mcfunction | 2 +- .../mob/0021.demon_eye/summon/.mcfunction | 2 +- .../mob/0022.red_knight/summon/.mcfunction | 2 +- .../0023.chainsaw_zombie/summon/.mcfunction | 2 +- .../mob/0026.vein/summon/.mcfunction | 2 +- .../mob/0027.skull_sniper/summon/.mcfunction | 2 +- .../0029.skeleton_archer/summon/.mcfunction | 2 +- .../mob/0030.warped/summon/.mcfunction | 2 +- .../mob/0031.tomb_robbing/summon/.mcfunction | 2 +- .../mob/0037.fire_spreader/summon/.mcfunction | 2 +- .../mob/0038.laser_eye/summon/.mcfunction | 2 +- .../0046.clock_of_despair/summon/.mcfunction | 2 +- .../mob/0047.the_heretic/summon/.mcfunction | 2 +- .../0049.ice_obstructor/summon/.mcfunction | 2 +- .../mob/0053.executioners/summon/.mcfunction | 2 +- .../0054.pumpkin_meteor/summon/.mcfunction | 2 +- .../mob/0055.hetukedah/summon/.mcfunction | 2 +- .../0056.thunder_trifler/summon/.mcfunction | 2 +- .../mob/0057.none_fighter/summon/.mcfunction | 2 +- .../mob/0058.divide_haze/summon/.mcfunction | 2 +- .../0059.jack_o_lantern/summon/.mcfunction | 2 +- .../0060.self_destructor/summon/.mcfunction | 2 +- .../mob/0061.stray/summon/.mcfunction | 2 +- .../mob/0062.drowned/summon/.mcfunction | 2 +- .../mob/0063.ghost/summon/.mcfunction | 2 +- .../mob/0064.artery/summon/.mcfunction | 2 +- .../mob/0065.night_shadow/summon/.mcfunction | 2 +- .../mob/0073.clutch_spider/summon/.mcfunction | 2 +- .../0074.watermelon_bomber/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../mob/0080.fukotsu/summon/.mcfunction | 2 +- .../mob/0081.snow_cloud/summon/.mcfunction | 2 +- .../0083.thunder_trifler/summon/.mcfunction | 2 +- .../0084.falcios_priest/summon/.mcfunction | 2 +- .../mob/0089.decapitation/summon/.mcfunction | 2 +- .../mob/0090.decapitation/summon/.mcfunction | 2 +- .../mob/0092.red_rose/summon/.mcfunction | 2 +- .../mob/0104.mad_scientist/summon/.mcfunction | 2 +- .../mob/0107.dark_ender/summon/.mcfunction | 2 +- .../mob/0114.jewel_hunter/summon/.mcfunction | 2 +- .../mob/0120.convict/summon/.mcfunction | 2 +- .../mob/0124.skull_harpy/summon/.mcfunction | 2 +- .../mob/0129.lexiel/summon/.mcfunction | 2 +- .../mob/0131.haruclaire/summon/.mcfunction | 2 +- .../mob/0138.combat_turret/summon/.mcfunction | 2 +- .../mob/0139.blast_eye/summon/.mcfunction | 2 +- .../mob/0141.honey_archer/summon/.mcfunction | 2 +- .../mob/0142.honey_soldier/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../0147.prismarine_slayer/summon/.mcfunction | 2 +- .../0148.prismarine_atlatl/summon/.mcfunction | 2 +- .../mob/0150.contamination/summon/.mcfunction | 2 +- .../mob/0151.recombined/summon/.mcfunction | 2 +- .../mob/0152.desire/summon/.mcfunction | 2 +- .../mob/0153.domination/summon/.mcfunction | 2 +- .../mob/0154.ruin/summon/.mcfunction | 2 +- .../mob/0155.immorality/summon/.mcfunction | 2 +- .../mob/0156.infringement/summon/.mcfunction | 2 +- .../0159.freeze_guardian/summon/.mcfunction | 2 +- .../mob/0160.freeze_archer/summon/.mcfunction | 2 +- .../mob/0161.lumberjack/summon/.mcfunction | 2 +- .../mob/0166.flying_potion/summon/.mcfunction | 2 +- .../mob/0169.blaze/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../mob/0174.burning_blaze/summon/.mcfunction | 2 +- .../mob/0175.queen_bee/summon/.mcfunction | 2 +- .../mob/0176.killer_bee/summon/.mcfunction | 2 +- .../mob/0177.pillager/summon/.mcfunction | 2 +- .../mob/0178.vindicator/summon/.mcfunction | 2 +- .../mob/0179.trindicator/summon/.mcfunction | 2 +- .../0181.magic_bookshelf/summon/.mcfunction | 2 +- .../mob/0182.skull_raven/summon/.mcfunction | 2 +- .../mob/0185.tutankhamen/summon/.mcfunction | 2 +- .../mob/0186.ferocious_bee/summon/.mcfunction | 2 +- .../mob/0187.flame_mage/summon/.mcfunction | 2 +- .../mob/0189.water_mage/summon/.mcfunction | 2 +- .../mob/0190.thunder_mage/summon/.mcfunction | 2 +- .../mob/0202.hunters_dream/summon/.mcfunction | 2 +- .../mob/0206.skull_basher/summon/.mcfunction | 2 +- .../mob/0210.aurora_eye/summon/.mcfunction | 2 +- .../mob/0216.gray_guardian/summon/.mcfunction | 2 +- .../mob/0217.medousa_eye/summon/.mcfunction | 2 +- .../mob/0219.aorta/summon/.mcfunction | 2 +- .../mob/0220.vena_cana/summon/.mcfunction | 2 +- .../mob/0224.pumpkin_ghost/summon/.mcfunction | 2 +- .../mob/0227.frost_eye/summon/.mcfunction | 2 +- .../mob/0228.frost_eye/summon/.mcfunction | 2 +- .../mob/0232.honey_leader/summon/.mcfunction | 2 +- .../mob/0233.honey_flyer/summon/.mcfunction | 2 +- .../mob/0234.walleye/summon/.mcfunction | 2 +- .../0235.orange_thrower/summon/.mcfunction | 2 +- .../mob/0236.ksitigarbha/summon/.mcfunction | 2 +- .../mob/0237.lunatic_mage/summon/.mcfunction | 2 +- .../0238.poltergeist_armor/summon/.mcfunction | 2 +- .../0239.poltergeist_bow/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../0244.ignition_spider/summon/.mcfunction | 2 +- .../mob/0245.fire_creeper/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../mob/0254.headless/summon/.mcfunction | 2 +- .../0255.dependence_eye/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../0259.shadow_stalker/summon/.mcfunction | 2 +- .../mob/0261.laser_eye_mk2/summon/.mcfunction | 2 +- .../mob/0262.frestchika/summon/.mcfunction | 2 +- .../mob/0264.dark_summoner/summon/.mcfunction | 2 +- .../mob/0265.dark_familiar/summon/.mcfunction | 2 +- .../mob/0269.goblins/summon/.mcfunction | 2 +- .../mob/0270.who_hate/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../mob/0273.hell_blade/summon/.mcfunction | 2 +- .../0274.death_saw_jiki/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../mob/0283.guardian/summon/.mcfunction | 2 +- .../0287.burning_stomper/summon/.mcfunction | 2 +- .../mob/0292.trample_bot/summon/.mcfunction | 2 +- .../mob/0302.call_gun/summon/.mcfunction | 2 +- .../mob/0330.aurora_reaper/summon/.mcfunction | 2 +- .../0331.aurora_sorcerer/summon/.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../0363.white_spellbook/summon/.mcfunction | 2 +- .../mob/10001.sandbag2/summon/.mcfunction | 2 +- .../mob/1004.tultaria/summon/.mcfunction | 2 +- .../mob/1005.blue_star/summon/.mcfunction | 2 +- .../mob/1006.green_star/summon/.mcfunction | 2 +- .../mob/1007.red_star/summon/.mcfunction | 2 +- .../mob/1008.yellow_star/summon/.mcfunction | 2 +- .../loot_tables/mob/death/0005.thief.json | 29 ------------- .../loot_tables/mob/death/0007.ectoplasm.json | 29 ------------- .../mob/death/0013.cluster_creeper.json | 29 ------------- .../loot_tables/mob/death/0015.guardian.json | 29 ------------- .../loot_tables/mob/death/0016.shirker.json | 29 ------------- .../loot_tables/mob/death/0017.fire_bird.json | 29 ------------- .../mob/death/0019.horus_priest.json | 29 ------------- .../loot_tables/mob/death/0021.demon_eye.json | 20 --------- .../mob/death/0022.red_knight.json | 20 --------- .../mob/death/0023.chainsaw_zombie.json | 29 ------------- .../loot_tables/mob/death/0026.vein.json | 20 --------- .../mob/death/0027.skull_sniper.json | 29 ------------- .../mob/death/0029.skeleton_archer.json | 29 ------------- .../loot_tables/mob/death/0030.warped.json | 29 ------------- .../mob/death/0031.tomb_robbing.json | 29 ------------- .../mob/death/0037.fire_spreader.json | 20 --------- .../loot_tables/mob/death/0038.laser_eye.json | 20 --------- .../mob/death/0046.clock_of_despair.json | 20 --------- .../mob/death/0047.the_heretic.json | 20 --------- .../mob/death/0049.ice_obstructor.json | 20 --------- .../mob/death/0053.executioners.json | 29 ------------- .../mob/death/0054.pumpkin_meteor.json | 20 --------- .../loot_tables/mob/death/0055.hetukedah.json | 20 --------- .../mob/death/0056.thunder_trifler.json | 20 --------- .../mob/death/0057.none_fighter.json | 20 --------- .../mob/death/0058.divide_haze.json | 20 --------- .../mob/death/0059.jack_o_lantern.json | 20 --------- .../mob/death/0060.self_destructor.json | 20 --------- .../loot_tables/mob/death/0061.stray.json | 29 ------------- .../loot_tables/mob/death/0062.drowned.json | 29 ------------- .../loot_tables/mob/death/0063.ghost.json | 20 --------- .../loot_tables/mob/death/0064.artery.json | 20 --------- .../mob/death/0065.night_shadow.json | 29 ------------- .../mob/death/0073.clutch_spider.json | 29 ------------- .../mob/death/0074.watermelon_bomber.json | 20 --------- .../death/0076.golden_watermelon_bomber.json | 20 --------- .../mob/death/0078.messenger_of_thunder.json | 20 --------- .../loot_tables/mob/death/0080.fukotsu.json | 29 ------------- .../mob/death/0081.snow_cloud.json | 20 --------- .../mob/death/0083.thunder_trifler.json | 20 --------- .../mob/death/0084.falcios_priest.json | 29 ------------- .../mob/death/0089.decapitation.json | 29 ------------- .../mob/death/0090.decapitation.json | 29 ------------- .../loot_tables/mob/death/0092.red_rose.json | 29 ------------- .../mob/death/0104.mad_scientist.json | 29 ------------- .../mob/death/0107.dark_ender.json | 29 ------------- .../mob/death/0114.jewel_hunter.json | 20 --------- .../loot_tables/mob/death/0120.convict.json | 29 ------------- .../mob/death/0124.skull_harpy.json | 29 ------------- .../loot_tables/mob/death/0129.lexiel.json | 20 --------- .../mob/death/0131.haruclaire.json | 20 --------- .../mob/death/0138.combat_turret.json | 20 --------- .../loot_tables/mob/death/0139.blast_eye.json | 20 --------- .../mob/death/0141.honey_archer.json | 20 --------- .../mob/death/0142.honey_soldier.json | 20 --------- .../mob/death/0146.prismarine_warrior.json | 20 --------- .../mob/death/0147.prismarine_slayer.json | 20 --------- .../mob/death/0148.prismarine_atlatl.json | 20 --------- .../mob/death/0150.contamination.json | 20 --------- .../mob/death/0151.recombined.json | 20 --------- .../loot_tables/mob/death/0152.desire.json | 20 --------- .../mob/death/0153.domination.json | 20 --------- .../loot_tables/mob/death/0154.ruin.json | 20 --------- .../mob/death/0155.immorality.json | 20 --------- .../mob/death/0156.infringement.json | 20 --------- .../mob/death/0159.freeze_guardian.json | 20 --------- .../mob/death/0160.freeze_archer.json | 20 --------- .../mob/death/0161.lumberjack.json | 20 --------- .../mob/death/0162.sheep_chan.json | 17 +------- .../mob/death/0166.flying_potion.json | 20 --------- .../loot_tables/mob/death/0169.blaze.json | 29 ------------- .../death/0171.lumberjack_of_blue_forest.json | 20 --------- .../mob/death/0174.burning_blaze.json | 20 --------- .../loot_tables/mob/death/0175.queen_bee.json | 20 --------- .../mob/death/0176.killer_bee.json | 20 --------- .../loot_tables/mob/death/0177.pillager.json | 29 ------------- .../mob/death/0178.vindicator.json | 29 ------------- .../mob/death/0179.trindicator.json | 29 ------------- .../mob/death/0181.magic_bookshelf.json | 20 --------- .../mob/death/0182.skull_raven.json | 29 ------------- .../mob/death/0185.tutankhamen.json | 20 --------- .../mob/death/0186.ferocious_bee.json | 20 --------- .../mob/death/0187.flame_mage.json | 20 --------- .../mob/death/0189.water_mage.json | 20 --------- .../mob/death/0190.thunder_mage.json | 20 --------- .../mob/death/0202.hunters_dream.json | 20 --------- .../mob/death/0204.infernal_watcher.json | 17 +------- .../mob/death/0205.skull_soldier.json | 17 +------- .../mob/death/0206.skull_basher.json | 29 ------------- .../mob/death/0210.aurora_eye.json | 20 --------- .../mob/death/0216.gray_guardian.json | 20 --------- .../mob/death/0217.medousa_eye.json | 20 --------- .../loot_tables/mob/death/0219.aorta.json | 20 --------- .../loot_tables/mob/death/0220.vena_cana.json | 20 --------- .../mob/death/0224.pumpkin_ghost.json | 20 --------- .../loot_tables/mob/death/0227.frost_eye.json | 20 --------- .../loot_tables/mob/death/0228.frost_eye.json | 29 ------------- .../mob/death/0232.honey_leader.json | 20 --------- .../mob/death/0233.honey_flyer.json | 20 --------- .../loot_tables/mob/death/0234.walleye.json | 20 --------- .../mob/death/0235.orange_thrower.json | 20 --------- .../mob/death/0236.ksitigarbha.json | 20 --------- .../mob/death/0237.lunatic_mage.json | 20 --------- .../mob/death/0238.poltergeist_armor.json | 20 --------- .../mob/death/0239.poltergeist_bow.json | 20 --------- .../death/0241.poltergeist_subspecies.json | 20 --------- .../0242.poltergeist_subspecies_bow.json | 20 --------- .../mob/death/0244.ignition_spider.json | 29 ------------- .../mob/death/0245.fire_creeper.json | 29 ------------- .../mob/death/0253.parasitic_soldiers.json | 20 --------- .../loot_tables/mob/death/0254.headless.json | 20 --------- .../mob/death/0255.dependence_eye.json | 20 --------- .../mob/death/0257.distortion_spellbook.json | 20 --------- .../mob/death/0259.shadow_stalker.json | 20 --------- .../mob/death/0261.laser_eye_mk2.json | 20 --------- .../mob/death/0262.frestchika.json | 29 ------------- .../mob/death/0264.dark_summoner.json | 20 --------- .../mob/death/0265.dark_familiar.json | 20 --------- .../loot_tables/mob/death/0269.goblins.json | 29 ------------- .../loot_tables/mob/death/0270.who_hate.json | 29 ------------- .../mob/death/0271.indomitable_warrior.json | 29 ------------- .../mob/death/0273.hell_blade.json | 20 --------- .../mob/death/0274.death_saw_jiki.json | 20 --------- .../death/0280.the_desire_for_burning.json | 29 ------------- .../loot_tables/mob/death/0283.guardian.json | 29 ------------- .../mob/death/0287.burning_stomper.json | 29 ------------- .../mob/death/0292.trample_bot.json | 20 --------- .../loot_tables/mob/death/0302.call_gun.json | 20 --------- .../mob/death/0330.aurora_reaper.json | 20 --------- .../mob/death/0331.aurora_sorcerer.json | 20 --------- .../mob/death/0336.cherry_blossom_fairy.json | 20 --------- .../mob/death/0363.white_spellbook.json | 20 --------- .../loot_tables/mob/death/1004.tultaria.json | 20 --------- .../loot_tables/mob/death/1005.blue_star.json | 20 --------- .../mob/death/1006.green_star.json | 20 --------- .../loot_tables/mob/death/1007.red_star.json | 20 --------- .../mob/death/1008.yellow_star.json | 20 --------- 273 files changed, 139 insertions(+), 3283 deletions(-) delete mode 100644 Asset/data/asset/loot_tables/mob/death/0005.thief.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0007.ectoplasm.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0013.cluster_creeper.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0015.guardian.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0016.shirker.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0017.fire_bird.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0019.horus_priest.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0021.demon_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0022.red_knight.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0023.chainsaw_zombie.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0026.vein.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0027.skull_sniper.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0029.skeleton_archer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0030.warped.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0031.tomb_robbing.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0037.fire_spreader.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0038.laser_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0046.clock_of_despair.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0047.the_heretic.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0049.ice_obstructor.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0053.executioners.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0054.pumpkin_meteor.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0055.hetukedah.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0056.thunder_trifler.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0057.none_fighter.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0058.divide_haze.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0059.jack_o_lantern.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0060.self_destructor.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0061.stray.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0062.drowned.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0063.ghost.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0064.artery.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0065.night_shadow.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0073.clutch_spider.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0074.watermelon_bomber.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0076.golden_watermelon_bomber.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0078.messenger_of_thunder.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0080.fukotsu.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0081.snow_cloud.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0083.thunder_trifler.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0084.falcios_priest.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0089.decapitation.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0090.decapitation.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0092.red_rose.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0104.mad_scientist.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0107.dark_ender.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0114.jewel_hunter.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0120.convict.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0124.skull_harpy.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0129.lexiel.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0131.haruclaire.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0138.combat_turret.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0139.blast_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0141.honey_archer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0142.honey_soldier.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0146.prismarine_warrior.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0147.prismarine_slayer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0148.prismarine_atlatl.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0150.contamination.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0151.recombined.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0152.desire.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0153.domination.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0154.ruin.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0155.immorality.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0156.infringement.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0159.freeze_guardian.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0160.freeze_archer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0161.lumberjack.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0166.flying_potion.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0169.blaze.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0171.lumberjack_of_blue_forest.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0174.burning_blaze.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0175.queen_bee.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0176.killer_bee.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0177.pillager.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0178.vindicator.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0179.trindicator.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0181.magic_bookshelf.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0182.skull_raven.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0185.tutankhamen.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0186.ferocious_bee.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0187.flame_mage.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0189.water_mage.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0190.thunder_mage.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0202.hunters_dream.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0206.skull_basher.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0210.aurora_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0216.gray_guardian.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0217.medousa_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0219.aorta.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0220.vena_cana.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0224.pumpkin_ghost.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0227.frost_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0228.frost_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0232.honey_leader.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0233.honey_flyer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0234.walleye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0235.orange_thrower.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0236.ksitigarbha.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0237.lunatic_mage.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0238.poltergeist_armor.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0239.poltergeist_bow.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0241.poltergeist_subspecies.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0242.poltergeist_subspecies_bow.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0244.ignition_spider.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0245.fire_creeper.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0253.parasitic_soldiers.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0254.headless.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0255.dependence_eye.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0257.distortion_spellbook.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0259.shadow_stalker.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0261.laser_eye_mk2.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0262.frestchika.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0264.dark_summoner.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0265.dark_familiar.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0269.goblins.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0270.who_hate.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0271.indomitable_warrior.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0273.hell_blade.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0274.death_saw_jiki.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0280.the_desire_for_burning.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0283.guardian.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0287.burning_stomper.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0292.trample_bot.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0302.call_gun.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0330.aurora_reaper.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0331.aurora_sorcerer.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0336.cherry_blossom_fairy.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/0363.white_spellbook.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/1004.tultaria.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/1005.blue_star.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/1006.green_star.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/1007.red_star.json delete mode 100644 Asset/data/asset/loot_tables/mob/death/1008.yellow_star.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 9298a88d16..fa986481d1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1643,47 +1643,6 @@ " data modify storage api: Argument.ID set value %id%", " function api:mob/summon" ] - }, - { - "type": "file", - "rel": "data/asset/loot_tables/mob/death/%namespace%.json", - "content": { - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:%id%}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/%entity%" - } - ] - } - ] - } - } - ], - "customQuestion": [ - { - "name": "id", - "question": "MobのID", - "pattern": "[1-9][0-9]*", - "patternErrorMessage": "数値のみが許されるよ" } ] }, @@ -1701,7 +1660,7 @@ "# @within asset:mob/alias/%id%/summon", "", "# 元となるEntityを召喚する", - " summon %entity% ~ ~ ~ {Tags:[\"MobInit\"],DeathLootTable:\"asset:mob/death/%namespace%\"}", + " summon %entity% ~ ~ ~ {Tags:[\"MobInit\"]}", "" ] }, diff --git a/Asset/data/asset/functions/mob/0005.thief/summon/.mcfunction b/Asset/data/asset/functions/mob/0005.thief/summon/.mcfunction index 32f89f6ef3..c86db826e8 100644 --- a/Asset/data/asset/functions/mob/0005.thief/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0005.thief/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0005.thief/summon/ # @within asset:mob/alias/5/summon -summon vindicator ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0005.thief"} +summon vindicator ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0007.ectoplasm/summon/.mcfunction b/Asset/data/asset/functions/mob/0007.ectoplasm/summon/.mcfunction index e4cb52ac0c..7550802b5d 100644 --- a/Asset/data/asset/functions/mob/0007.ectoplasm/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0007.ectoplasm/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0007.ectoplasm/summon/ # @within asset:mob/alias/7/summon -summon vex ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0007.ectoplasm"} +summon vex ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0013.cluster_creeper/summon/.mcfunction b/Asset/data/asset/functions/mob/0013.cluster_creeper/summon/.mcfunction index 56b3437570..7069da465a 100644 --- a/Asset/data/asset/functions/mob/0013.cluster_creeper/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0013.cluster_creeper/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0013.cluster_creeper/summon/ # @within asset:mob/alias/13/summon -summon creeper ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0013.cluster_creeper"} +summon creeper ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0015.guardian/summon/.mcfunction b/Asset/data/asset/functions/mob/0015.guardian/summon/.mcfunction index a2f4aae298..d9e4f2a569 100644 --- a/Asset/data/asset/functions/mob/0015.guardian/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0015.guardian/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0015.guardian/summon/ # @within asset:mob/alias/15/summon -summon guardian ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0015.guardian"} +summon guardian ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0016.shirker/summon/.mcfunction b/Asset/data/asset/functions/mob/0016.shirker/summon/.mcfunction index 21211e2977..e69a5f38c5 100644 --- a/Asset/data/asset/functions/mob/0016.shirker/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0016.shirker/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0016.shirker/summon/ # @within asset:mob/alias/16/summon -summon elder_guardian ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0016.shirker"} +summon elder_guardian ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0017.fire_bird/summon/.mcfunction b/Asset/data/asset/functions/mob/0017.fire_bird/summon/.mcfunction index 3c80edee72..bbdbc8f4be 100644 --- a/Asset/data/asset/functions/mob/0017.fire_bird/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0017.fire_bird/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0017.fire_bird/summon/ # @within asset:mob/alias/17/summon -summon phantom ~ ~ ~ {Size:1,Tags:["MobInit","AntiBurn"],DeathLootTable:"asset:mob/death/0017.fire_bird"} +summon phantom ~ ~ ~ {Size:1,Tags:["MobInit","AntiBurn"]} diff --git a/Asset/data/asset/functions/mob/0019.horus_priest/summon/.mcfunction b/Asset/data/asset/functions/mob/0019.horus_priest/summon/.mcfunction index ebcc5ba69c..4294d21364 100644 --- a/Asset/data/asset/functions/mob/0019.horus_priest/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0019.horus_priest/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0019.horus_priest/summon/ # @within asset:mob/alias/19/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0019.horus_priest"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0021.demon_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0021.demon_eye/summon/.mcfunction index 278de58e0c..433092ca4b 100644 --- a/Asset/data/asset/functions/mob/0021.demon_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0021.demon_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0021.demon_eye/summon/ # @within asset:mob/alias/21/summon -summon zombie ~ ~ ~ {Silent:1b,DeathLootTable:"asset:mob/death/0021.demon_eye",Tags:["MobInit","Enemy","AlwaysInvisible","AlwaysSlowFall"],Passengers:[{id:"minecraft:area_effect_cloud",Duration:-1,Age:-2147483648,WaitTime:-2147483648,Tags:["21.Rotater","AutoKillWhenDieVehicle","AssetMob"]}]} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","Enemy","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"empty",Passengers:[{id:"minecraft:area_effect_cloud",Duration:-1,Age:-2147483648,WaitTime:-2147483648,Tags:["21.Rotater","AutoKillWhenDieVehicle","AssetMob"]}]} diff --git a/Asset/data/asset/functions/mob/0022.red_knight/summon/.mcfunction b/Asset/data/asset/functions/mob/0022.red_knight/summon/.mcfunction index ed46ab41b3..372c6b75a2 100644 --- a/Asset/data/asset/functions/mob/0022.red_knight/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0022.red_knight/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0022.red_knight/summon/ # @within asset:mob/alias/22/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","M.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0022.red_knight"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","M.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0023.chainsaw_zombie/summon/.mcfunction b/Asset/data/asset/functions/mob/0023.chainsaw_zombie/summon/.mcfunction index 0a62e2db70..0603cbdf44 100644 --- a/Asset/data/asset/functions/mob/0023.chainsaw_zombie/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0023.chainsaw_zombie/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0023.chainsaw_zombie/summon/ # @within asset:mob/alias/23/summon -summon zombie ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0023.chainsaw_zombie"} +summon zombie ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0026.vein/summon/.mcfunction b/Asset/data/asset/functions/mob/0026.vein/summon/.mcfunction index da109757ec..9615ea826a 100644 --- a/Asset/data/asset/functions/mob/0026.vein/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0026.vein/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0026.vein/summon/ # @within asset:mob/alias/26/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"asset:mob/death/0026.vein"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0027.skull_sniper/summon/.mcfunction b/Asset/data/asset/functions/mob/0027.skull_sniper/summon/.mcfunction index ebbe42623c..4cdead845c 100644 --- a/Asset/data/asset/functions/mob/0027.skull_sniper/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0027.skull_sniper/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0027.skull_sniper/summon/ # @within asset:mob/alias/27/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0027.skull_sniper"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0029.skeleton_archer/summon/.mcfunction b/Asset/data/asset/functions/mob/0029.skeleton_archer/summon/.mcfunction index 5e2a463d14..c341da7489 100644 --- a/Asset/data/asset/functions/mob/0029.skeleton_archer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0029.skeleton_archer/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0029.skeleton_archer/summon/ # @within asset:mob/alias/29/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0029.skeleton_archer"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0030.warped/summon/.mcfunction b/Asset/data/asset/functions/mob/0030.warped/summon/.mcfunction index 3ea9b38457..418512e6dc 100644 --- a/Asset/data/asset/functions/mob/0030.warped/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0030.warped/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0030.warped/summon/ # @within asset:mob/alias/30/summon -summon drowned ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0030.warped"} +summon drowned ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0031.tomb_robbing/summon/.mcfunction b/Asset/data/asset/functions/mob/0031.tomb_robbing/summon/.mcfunction index 9a7995f5aa..dacf79eef3 100644 --- a/Asset/data/asset/functions/mob/0031.tomb_robbing/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0031.tomb_robbing/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0031.tomb_robbing/summon/ # @within asset:mob/alias/31/summon -summon vindicator ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0031.tomb_robbing"} +summon vindicator ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0037.fire_spreader/summon/.mcfunction b/Asset/data/asset/functions/mob/0037.fire_spreader/summon/.mcfunction index 0cf1a3f81d..e0b23e7588 100644 --- a/Asset/data/asset/functions/mob/0037.fire_spreader/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0037.fire_spreader/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0037.fire_spreader/summon/ # @within asset:mob/alias/37/summon -summon skeleton ~ ~ ~ {Silent:1b,active_effects:[{id:"fire_resistance",amplifier:0b,duration:200000,show_particles:0b}],Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0037.fire_spreader",} +summon skeleton ~ ~ ~ {Silent:1b,active_effects:[{id:"fire_resistance",amplifier:0b,duration:200000,show_particles:0b}],Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0038.laser_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0038.laser_eye/summon/.mcfunction index 60f0f389b3..72e7c2637d 100644 --- a/Asset/data/asset/functions/mob/0038.laser_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0038.laser_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0038.laser_eye/summon/ # @within asset:mob/alias/38/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0038.laser_eye",NoGravity:1b,Silent:1b,NoAI:1b} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],NoGravity:1b,Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0046.clock_of_despair/summon/.mcfunction b/Asset/data/asset/functions/mob/0046.clock_of_despair/summon/.mcfunction index 6a2e3deebd..9d24c9468e 100644 --- a/Asset/data/asset/functions/mob/0046.clock_of_despair/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0046.clock_of_despair/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0046.clock_of_despair/summon/ # @within asset:mob/alias/46/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","Immovable","1A.Clock"],NoAI:1b,Silent:1b,DeathLootTable:"asset:mob/death/0046.clock_of_despair"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","Immovable","1A.Clock"],NoAI:1b,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0047.the_heretic/summon/.mcfunction b/Asset/data/asset/functions/mob/0047.the_heretic/summon/.mcfunction index 00edc6c7a4..6dca04b617 100644 --- a/Asset/data/asset/functions/mob/0047.the_heretic/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0047.the_heretic/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0047.the_heretic/summon/ # @within asset:mob/alias/47/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","1B.First"],DeathLootTable:"asset:mob/death/0047.the_heretic"} +summon skeleton ~ ~ ~ {Tags:["MobInit","1B.First"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0049.ice_obstructor/summon/.mcfunction b/Asset/data/asset/functions/mob/0049.ice_obstructor/summon/.mcfunction index d84dc8ed24..ee35ea19ff 100644 --- a/Asset/data/asset/functions/mob/0049.ice_obstructor/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0049.ice_obstructor/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0049.ice_obstructor/summon/ # @within asset:mob/alias/49/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0049.ice_obstructor"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0053.executioners/summon/.mcfunction b/Asset/data/asset/functions/mob/0053.executioners/summon/.mcfunction index 026c070714..9e9f62506f 100644 --- a/Asset/data/asset/functions/mob/0053.executioners/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0053.executioners/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0053.executioners/summon/ # @within asset:mob/alias/53/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0053.executioners"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0054.pumpkin_meteor/summon/.mcfunction b/Asset/data/asset/functions/mob/0054.pumpkin_meteor/summon/.mcfunction index ec2ab7c6da..fcec97fda8 100644 --- a/Asset/data/asset/functions/mob/0054.pumpkin_meteor/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0054.pumpkin_meteor/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0054.pumpkin_meteor/summon/ # @within asset:mob/alias/54/summon -summon zombie ~ ~-100 ~ {DeathTime:19s,Tags:["MobInit","AlwaysInvisible"],Silent:1b,NoAI:1b,IsBaby:0b,DeathLootTable:"asset:mob/death/0054.pumpkin_meteor"} +summon zombie ~ ~-100 ~ {DeathTime:19s,Tags:["MobInit","AlwaysInvisible"],Silent:1b,NoAI:1b,IsBaby:0b} diff --git a/Asset/data/asset/functions/mob/0055.hetukedah/summon/.mcfunction b/Asset/data/asset/functions/mob/0055.hetukedah/summon/.mcfunction index 655c2b4aa5..e53b9d4645 100644 --- a/Asset/data/asset/functions/mob/0055.hetukedah/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0055.hetukedah/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0055.hetukedah/summon/ # @within asset:mob/alias/55/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"asset:mob/death/0055.hetukedah"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0056.thunder_trifler/summon/.mcfunction b/Asset/data/asset/functions/mob/0056.thunder_trifler/summon/.mcfunction index 43381995c0..f800b18d5f 100644 --- a/Asset/data/asset/functions/mob/0056.thunder_trifler/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0056.thunder_trifler/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/56/summon # 元となるMobを召喚する - summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0056.thunder_trifler"} + summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0057.none_fighter/summon/.mcfunction b/Asset/data/asset/functions/mob/0057.none_fighter/summon/.mcfunction index ceb2df72f5..788715ec92 100644 --- a/Asset/data/asset/functions/mob/0057.none_fighter/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0057.none_fighter/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0057.none_fighter/summon/ # @within asset:mob/alias/57/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0057.none_fighter"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0058.divide_haze/summon/.mcfunction b/Asset/data/asset/functions/mob/0058.divide_haze/summon/.mcfunction index 0b5ee83f4d..3f72c028db 100644 --- a/Asset/data/asset/functions/mob/0058.divide_haze/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0058.divide_haze/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0058.divide_haze/summon/ # @within asset:mob/alias/58/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0058.divide_haze"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn","AlwaysSlowFall"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/summon/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/summon/.mcfunction index 1994b4b101..bb835d3ee7 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0059.jack_o_lantern/summon/ # @within asset:mob/alias/59/summon -summon husk ~ ~-100 ~ {DeathTime:19s,Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"asset:mob/death/0059.jack_o_lantern"} +summon husk ~ ~-100 ~ {DeathTime:19s,Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0060.self_destructor/summon/.mcfunction b/Asset/data/asset/functions/mob/0060.self_destructor/summon/.mcfunction index ae0b28d21d..d7e1055955 100644 --- a/Asset/data/asset/functions/mob/0060.self_destructor/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0060.self_destructor/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0060.self_destructor/summon/ # @within asset:mob/alias/60/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0060.self_destructor"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0061.stray/summon/.mcfunction b/Asset/data/asset/functions/mob/0061.stray/summon/.mcfunction index 8c75ece8ef..218c6404d2 100644 --- a/Asset/data/asset/functions/mob/0061.stray/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0061.stray/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0061.stray/summon/ # @within asset:mob/alias/61/summon -summon stray ~ ~ ~ {Tags:["MobInit","AntiBurn"],DeathLootTable:"asset:mob/death/0061.stray"} +summon stray ~ ~ ~ {Tags:["MobInit","AntiBurn"]} diff --git a/Asset/data/asset/functions/mob/0062.drowned/summon/.mcfunction b/Asset/data/asset/functions/mob/0062.drowned/summon/.mcfunction index b735e779db..19d8789b7a 100644 --- a/Asset/data/asset/functions/mob/0062.drowned/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0062.drowned/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0062.drowned/summon/ # @within asset:mob/alias/62/summon -summon drowned ~ ~ ~ {Tags:["MobInit","AntiBurn"],DeathLootTable:"asset:mob/death/0062.drowned"} +summon drowned ~ ~ ~ {Tags:["MobInit","AntiBurn"]} diff --git a/Asset/data/asset/functions/mob/0063.ghost/summon/.mcfunction b/Asset/data/asset/functions/mob/0063.ghost/summon/.mcfunction index 6451fb22c3..84f6edd0df 100644 --- a/Asset/data/asset/functions/mob/0063.ghost/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0063.ghost/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0063.ghost/summon/ # @within asset:mob/alias/63/summon -summon stray ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0063.ghost"} +summon stray ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0064.artery/summon/.mcfunction b/Asset/data/asset/functions/mob/0064.artery/summon/.mcfunction index 305a0ca9c5..9e66ac9329 100644 --- a/Asset/data/asset/functions/mob/0064.artery/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0064.artery/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0064.artery/summon/ # @within asset:mob/alias/64/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"asset:mob/death/0064.artery"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0065.night_shadow/summon/.mcfunction b/Asset/data/asset/functions/mob/0065.night_shadow/summon/.mcfunction index a284251604..3a381bdebd 100644 --- a/Asset/data/asset/functions/mob/0065.night_shadow/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0065.night_shadow/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0065.night_shadow/summon/ # @within asset:mob/alias/65/summon -summon phantom ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"asset:mob/death/0065.night_shadow"} +summon phantom ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"]} diff --git a/Asset/data/asset/functions/mob/0073.clutch_spider/summon/.mcfunction b/Asset/data/asset/functions/mob/0073.clutch_spider/summon/.mcfunction index e16973d7f7..1ef060f7cb 100644 --- a/Asset/data/asset/functions/mob/0073.clutch_spider/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0073.clutch_spider/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0073.clutch_spider/summon/ # @within asset:mob/alias/73/summon -summon spider ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0073.clutch_spider"} +summon spider ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0074.watermelon_bomber/summon/.mcfunction b/Asset/data/asset/functions/mob/0074.watermelon_bomber/summon/.mcfunction index 383a6b04d4..c4a9bbfb30 100644 --- a/Asset/data/asset/functions/mob/0074.watermelon_bomber/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0074.watermelon_bomber/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/74/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0074.watermelon_bomber"} + summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0076.golden_watermelon_bomber/summon/.mcfunction b/Asset/data/asset/functions/mob/0076.golden_watermelon_bomber/summon/.mcfunction index 70d7c565f3..534e89c019 100644 --- a/Asset/data/asset/functions/mob/0076.golden_watermelon_bomber/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0076.golden_watermelon_bomber/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/76/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0076.golden_watermelon_bomber"} + summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/summon/.mcfunction b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/summon/.mcfunction index fd373dc2d3..196db4743e 100644 --- a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0078.messenger_of_thunder/summon/ # @within asset:mob/alias/78/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"asset:mob/death/0078.messenger_of_thunder"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiVoid"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0080.fukotsu/summon/.mcfunction b/Asset/data/asset/functions/mob/0080.fukotsu/summon/.mcfunction index cfb85021f4..5ace853e5c 100644 --- a/Asset/data/asset/functions/mob/0080.fukotsu/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0080.fukotsu/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0080.fukotsu/summon/ # @within asset:mob/alias/80/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0080.fukotsu"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0081.snow_cloud/summon/.mcfunction b/Asset/data/asset/functions/mob/0081.snow_cloud/summon/.mcfunction index 6ea6828f28..2b5424756d 100644 --- a/Asset/data/asset/functions/mob/0081.snow_cloud/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0081.snow_cloud/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0081.snow_cloud/summon/ # @within asset:mob/alias/81/summon -summon polar_bear ~ ~ ~ {Silent:1b,NoAI:1b,NoGravity:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"asset:mob/death/0081.snow_cloud"} +summon polar_bear ~ ~ ~ {Silent:1b,NoAI:1b,NoGravity:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction b/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction index 8eac7e562e..17c5308a3f 100644 --- a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/83/summon # 元となるMobを召喚する - summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0083.thunder_trifler"} + summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0084.falcios_priest/summon/.mcfunction b/Asset/data/asset/functions/mob/0084.falcios_priest/summon/.mcfunction index 039affedf9..c53a4dc036 100644 --- a/Asset/data/asset/functions/mob/0084.falcios_priest/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0084.falcios_priest/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/84/summon # 元となるMobを召喚する - summon wither_skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0084.falcios_priest"} + summon wither_skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0089.decapitation/summon/.mcfunction b/Asset/data/asset/functions/mob/0089.decapitation/summon/.mcfunction index a50606017f..14b87717cc 100644 --- a/Asset/data/asset/functions/mob/0089.decapitation/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0089.decapitation/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0089.decapitation/summon/ # @within asset:mob/alias/89/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0089.decapitation"} +summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"]} diff --git a/Asset/data/asset/functions/mob/0090.decapitation/summon/.mcfunction b/Asset/data/asset/functions/mob/0090.decapitation/summon/.mcfunction index e86cdd9117..c6bae88880 100644 --- a/Asset/data/asset/functions/mob/0090.decapitation/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0090.decapitation/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0090.decapitation/summon/ # @within asset:mob/alias/90/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0090.decapitation"} +summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"]} diff --git a/Asset/data/asset/functions/mob/0092.red_rose/summon/.mcfunction b/Asset/data/asset/functions/mob/0092.red_rose/summon/.mcfunction index b97071f225..a4daf98f85 100644 --- a/Asset/data/asset/functions/mob/0092.red_rose/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0092.red_rose/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0092.red_rose/summon/ # @within asset:mob/alias/92/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysBurn"],Silent:1b,active_effects:[{id:"fire_resistance",ambient:0b,duration:2147483647}],DeathLootTable:"asset:mob/death/0092.red_rose"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysBurn"],Silent:1b,active_effects:[{id:"fire_resistance",ambient:0b,duration:2147483647}],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0104.mad_scientist/summon/.mcfunction b/Asset/data/asset/functions/mob/0104.mad_scientist/summon/.mcfunction index d035587625..d34e64b0dc 100644 --- a/Asset/data/asset/functions/mob/0104.mad_scientist/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0104.mad_scientist/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0104.mad_scientist/summon/ # @within asset:mob/alias/104/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiVoid"],DeathLootTable:"asset:mob/death/0104.mad_scientist"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiVoid"]} diff --git a/Asset/data/asset/functions/mob/0107.dark_ender/summon/.mcfunction b/Asset/data/asset/functions/mob/0107.dark_ender/summon/.mcfunction index 8d601b576a..56fa5040b6 100644 --- a/Asset/data/asset/functions/mob/0107.dark_ender/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0107.dark_ender/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0107.dark_ender/summon/ # @within asset:mob/alias/107/summon -summon enderman ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0107.dark_ender"} +summon enderman ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"]} diff --git a/Asset/data/asset/functions/mob/0114.jewel_hunter/summon/.mcfunction b/Asset/data/asset/functions/mob/0114.jewel_hunter/summon/.mcfunction index 27bcd918cc..d9958af6ba 100644 --- a/Asset/data/asset/functions/mob/0114.jewel_hunter/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0114.jewel_hunter/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0114.jewel_hunter/summon/ # @within asset:mob/alias/114/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0114.jewel_hunter"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0120.convict/summon/.mcfunction b/Asset/data/asset/functions/mob/0120.convict/summon/.mcfunction index b748615fb8..c4046d81aa 100644 --- a/Asset/data/asset/functions/mob/0120.convict/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0120.convict/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0120.convict/summon/ # @within asset:mob/alias/120/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3C.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0120.convict"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3C.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b} diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/summon/.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/summon/.mcfunction index 806cc2ac35..3c01bd61a6 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0124.skull_harpy/summon/ # @within asset:mob/alias/124/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysSlowFall"],NoGravity:1b,DeathLootTable:"asset:mob/death/0124.skull_harpy"} +summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysSlowFall"],NoGravity:1b} diff --git a/Asset/data/asset/functions/mob/0129.lexiel/summon/.mcfunction b/Asset/data/asset/functions/mob/0129.lexiel/summon/.mcfunction index 6ff700e3e9..c402e21bab 100644 --- a/Asset/data/asset/functions/mob/0129.lexiel/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0129.lexiel/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0129.lexiel/summon/ # @within asset:mob/alias/129/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3L.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0129.lexiel"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3L.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0131.haruclaire/summon/.mcfunction b/Asset/data/asset/functions/mob/0131.haruclaire/summon/.mcfunction index f95a8a51b5..9baab445b1 100644 --- a/Asset/data/asset/functions/mob/0131.haruclaire/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0131.haruclaire/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0131.haruclaire/summon/ # @within asset:mob/alias/131/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3N.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0131.haruclaire"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","3N.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0138.combat_turret/summon/.mcfunction b/Asset/data/asset/functions/mob/0138.combat_turret/summon/.mcfunction index 01b751217d..45e1a66d44 100644 --- a/Asset/data/asset/functions/mob/0138.combat_turret/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0138.combat_turret/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0138.combat_turret/summon/ # @within asset:mob/alias/138/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,active_effects:[{id:"slow_falling",amplifier:0b,duration:2147483647,show_particles:0b}],DeathLootTable:"asset:mob/death/0138.combat_turret"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,active_effects:[{id:"slow_falling",amplifier:0b,duration:2147483647,show_particles:0b}],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/summon/.mcfunction index 3fab3ecee5..ec0b356cce 100644 --- a/Asset/data/asset/functions/mob/0139.blast_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0139.blast_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0139.blast_eye/summon/ # @within asset:mob/alias/139/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],Silent:1b,DeathLootTable:"asset:mob/death/0139.blast_eye"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0141.honey_archer/summon/.mcfunction b/Asset/data/asset/functions/mob/0141.honey_archer/summon/.mcfunction index ffd02c5378..b6921fb8f4 100644 --- a/Asset/data/asset/functions/mob/0141.honey_archer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0141.honey_archer/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0141.honey_archer/summon/ # @within asset:mob/alias/141/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0141.honey_archer"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0142.honey_soldier/summon/.mcfunction b/Asset/data/asset/functions/mob/0142.honey_soldier/summon/.mcfunction index dd61332c03..8a1a863d39 100644 --- a/Asset/data/asset/functions/mob/0142.honey_soldier/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0142.honey_soldier/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0142.honey_soldier/summon/ # @within asset:mob/alias/142/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0142.honey_soldier"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0146.prismarine_warrior/summon/.mcfunction b/Asset/data/asset/functions/mob/0146.prismarine_warrior/summon/.mcfunction index becc8093fc..4b5064cd66 100644 --- a/Asset/data/asset/functions/mob/0146.prismarine_warrior/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0146.prismarine_warrior/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0146.prismarine_warrior/summon/ # @within asset:mob/alias/146/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0146.prismarine_warrior"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0147.prismarine_slayer/summon/.mcfunction b/Asset/data/asset/functions/mob/0147.prismarine_slayer/summon/.mcfunction index 4b4cdd20ab..7991046dd7 100644 --- a/Asset/data/asset/functions/mob/0147.prismarine_slayer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0147.prismarine_slayer/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0147.prismarine_slayer/summon/ # @within asset:mob/alias/147/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0147.prismarine_slayer"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0148.prismarine_atlatl/summon/.mcfunction b/Asset/data/asset/functions/mob/0148.prismarine_atlatl/summon/.mcfunction index c1968ffe9b..b78256574a 100644 --- a/Asset/data/asset/functions/mob/0148.prismarine_atlatl/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0148.prismarine_atlatl/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0148.prismarine_atlatl/summon/ # @within asset:mob/alias/148/summon -summon drowned ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0148.prismarine_atlatl"} +summon drowned ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0150.contamination/summon/.mcfunction b/Asset/data/asset/functions/mob/0150.contamination/summon/.mcfunction index 4c7df48783..fd2c40a6e6 100644 --- a/Asset/data/asset/functions/mob/0150.contamination/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0150.contamination/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0150.contamination/summon/ # @within asset:mob/alias/150/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0150.contamination"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0151.recombined/summon/.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/summon/.mcfunction index 31c7fabafb..fc8a6710d0 100644 --- a/Asset/data/asset/functions/mob/0151.recombined/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0151.recombined/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0151.recombined/summon/ # @within asset:mob/alias/151/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"asset:mob/death/0151.recombined"} +summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0152.desire/summon/.mcfunction b/Asset/data/asset/functions/mob/0152.desire/summon/.mcfunction index 81096b2ca2..55b415b3a0 100644 --- a/Asset/data/asset/functions/mob/0152.desire/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0152.desire/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0152.desire/summon/ # @within asset:mob/alias/152/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0152.desire"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0153.domination/summon/.mcfunction b/Asset/data/asset/functions/mob/0153.domination/summon/.mcfunction index 438bf884e1..48617312ce 100644 --- a/Asset/data/asset/functions/mob/0153.domination/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0153.domination/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0153.domination/summon/ # @within asset:mob/alias/153/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"asset:mob/death/0153.domination"} +summon skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0154.ruin/summon/.mcfunction b/Asset/data/asset/functions/mob/0154.ruin/summon/.mcfunction index 75b7e88cbd..5d564307bd 100644 --- a/Asset/data/asset/functions/mob/0154.ruin/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0154.ruin/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0154.ruin/summon/ # @within asset:mob/alias/154/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0154.ruin"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0155.immorality/summon/.mcfunction b/Asset/data/asset/functions/mob/0155.immorality/summon/.mcfunction index 066796113b..305f7d0dab 100644 --- a/Asset/data/asset/functions/mob/0155.immorality/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0155.immorality/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0155.immorality/summon/ # @within asset:mob/alias/155/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathTime:19s,DeathLootTable:"asset:mob/death/0155.immorality"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathTime:19s,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0156.infringement/summon/.mcfunction b/Asset/data/asset/functions/mob/0156.infringement/summon/.mcfunction index 2b31ccf2fe..f79d1abe73 100644 --- a/Asset/data/asset/functions/mob/0156.infringement/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0156.infringement/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0156.infringement/summon/ # @within asset:mob/alias/156/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"asset:mob/death/0156.infringement"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0159.freeze_guardian/summon/.mcfunction b/Asset/data/asset/functions/mob/0159.freeze_guardian/summon/.mcfunction index c31e07ba32..325144a9c7 100644 --- a/Asset/data/asset/functions/mob/0159.freeze_guardian/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0159.freeze_guardian/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0159.freeze_guardian/summon/ # @within asset:mob/alias/159/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0159.freeze_guardian"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0160.freeze_archer/summon/.mcfunction b/Asset/data/asset/functions/mob/0160.freeze_archer/summon/.mcfunction index b98a4bffa4..878bd44f66 100644 --- a/Asset/data/asset/functions/mob/0160.freeze_archer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0160.freeze_archer/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0160.freeze_archer/summon/ # @within asset:mob/alias/160/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0160.freeze_archer"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0161.lumberjack/summon/.mcfunction b/Asset/data/asset/functions/mob/0161.lumberjack/summon/.mcfunction index 930142f0b2..fe2b2d8781 100644 --- a/Asset/data/asset/functions/mob/0161.lumberjack/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0161.lumberjack/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0161.lumberjack/summon/ # @within asset:mob/alias/161/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0161.lumberjack"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0166.flying_potion/summon/.mcfunction b/Asset/data/asset/functions/mob/0166.flying_potion/summon/.mcfunction index ca8417ba7b..51dc4dd561 100644 --- a/Asset/data/asset/functions/mob/0166.flying_potion/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0166.flying_potion/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0166.flying_potion/summon/ # @within asset:mob/alias/166/summon -summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0166.flying_potion",Passengers:[{id:"minecraft:potion",Tags:["4M.Potion","AutoKillWhenDieVehicle","AssetMob"],Item:{id:"minecraft:splash_potion",Count:1b,tag:{CustomPotionColor:7289855}}}]} +summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"minecraft:potion",Tags:["4M.Potion","AutoKillWhenDieVehicle","AssetMob"],Item:{id:"minecraft:splash_potion",Count:1b,tag:{CustomPotionColor:7289855}}}]} diff --git a/Asset/data/asset/functions/mob/0169.blaze/summon/.mcfunction b/Asset/data/asset/functions/mob/0169.blaze/summon/.mcfunction index 0f18abd3d3..ee8216342b 100644 --- a/Asset/data/asset/functions/mob/0169.blaze/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0169.blaze/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0169.blaze/summon/ # @within asset:mob/alias/169/summon -summon blaze ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0169.blaze"} +summon blaze ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0171.lumberjack_of_blue_forest/summon/.mcfunction b/Asset/data/asset/functions/mob/0171.lumberjack_of_blue_forest/summon/.mcfunction index c9376634cd..200027aae6 100644 --- a/Asset/data/asset/functions/mob/0171.lumberjack_of_blue_forest/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0171.lumberjack_of_blue_forest/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0171.lumberjack_of_blue_forest/summon/ # @within asset:mob/alias/171/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"asset:mob/death/0171.lumberjack_of_blue_forest"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0174.burning_blaze/summon/.mcfunction b/Asset/data/asset/functions/mob/0174.burning_blaze/summon/.mcfunction index 2fecf0169a..bd8a97005d 100644 --- a/Asset/data/asset/functions/mob/0174.burning_blaze/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0174.burning_blaze/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0174.burning_blaze/summon/ # @within asset:mob/alias/174/summon -summon blaze ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0174.burning_blaze"} +summon blaze ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/summon/.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/summon/.mcfunction index 7f79b93376..1554c63870 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0175.queen_bee/summon/ # @within asset:mob/alias/175/summon -summon ravager ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","4V.Angel"],NoAI:1b,Silent:1b,PersistenceRequired:1b,DeathLootTable:"asset:mob/death/0175.queen_bee"} +summon ravager ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","4V.Angel"],NoAI:1b,Silent:1b,PersistenceRequired:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0176.killer_bee/summon/.mcfunction b/Asset/data/asset/functions/mob/0176.killer_bee/summon/.mcfunction index 1d1cbf7aaf..d6d1b2c874 100644 --- a/Asset/data/asset/functions/mob/0176.killer_bee/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0176.killer_bee/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0176.killer_bee/summon/ # @within asset:mob/alias/176/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],NoGravity:1b,NoAI:1b,Silent:1b,IsBaby:1b,DeathLootTable:"asset:mob/death/0176.killer_bee"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],NoGravity:1b,NoAI:1b,Silent:1b,IsBaby:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0177.pillager/summon/.mcfunction b/Asset/data/asset/functions/mob/0177.pillager/summon/.mcfunction index f1e7433e0b..07adea2463 100644 --- a/Asset/data/asset/functions/mob/0177.pillager/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0177.pillager/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0177.pillager/summon/ # @within asset:mob/alias/177/summon -summon pillager ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0177.pillager"} +summon pillager ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0178.vindicator/summon/.mcfunction b/Asset/data/asset/functions/mob/0178.vindicator/summon/.mcfunction index f1fb075c96..517038fee1 100644 --- a/Asset/data/asset/functions/mob/0178.vindicator/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0178.vindicator/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0178.vindicator/summon/ # @within asset:mob/alias/178/summon -summon vindicator ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0178.vindicator"} +summon vindicator ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0179.trindicator/summon/.mcfunction b/Asset/data/asset/functions/mob/0179.trindicator/summon/.mcfunction index e8172f71e8..cdb380c853 100644 --- a/Asset/data/asset/functions/mob/0179.trindicator/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0179.trindicator/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0179.trindicator/summon/ # @within asset:mob/alias/179/summon -summon vindicator ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0179.trindicator"} +summon vindicator ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0181.magic_bookshelf/summon/.mcfunction b/Asset/data/asset/functions/mob/0181.magic_bookshelf/summon/.mcfunction index 632389e03c..5dfb925851 100644 --- a/Asset/data/asset/functions/mob/0181.magic_bookshelf/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0181.magic_bookshelf/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/181/summon # 元となるMobを召喚する - summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0181.magic_bookshelf"} + summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/summon/.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/summon/.mcfunction index 892f86217d..c488f2d9c9 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0182.skull_raven/summon/ # @within asset:mob/alias/182/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysSlowFall"],NoGravity:1b,DeathLootTable:"asset:mob/death/0182.skull_raven"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysSlowFall"],NoGravity:1b} diff --git a/Asset/data/asset/functions/mob/0185.tutankhamen/summon/.mcfunction b/Asset/data/asset/functions/mob/0185.tutankhamen/summon/.mcfunction index fda678f8fd..84a8e50107 100644 --- a/Asset/data/asset/functions/mob/0185.tutankhamen/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0185.tutankhamen/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0185.tutankhamen/summon/ # @within asset:mob/alias/185/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AntiVoid"],DeathLootTable:"asset:mob/death/0185.tutankhamen"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AntiVoid"]} diff --git a/Asset/data/asset/functions/mob/0186.ferocious_bee/summon/.mcfunction b/Asset/data/asset/functions/mob/0186.ferocious_bee/summon/.mcfunction index 10d6917678..035bb2f98f 100644 --- a/Asset/data/asset/functions/mob/0186.ferocious_bee/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0186.ferocious_bee/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0186.ferocious_bee/summon/ # @within asset:mob/alias/186/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],NoGravity:1b,NoAI:1b,Silent:1b,IsBaby:1b,DeathLootTable:"asset:mob/death/0186.ferocious_bee"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],NoGravity:1b,NoAI:1b,Silent:1b,IsBaby:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0187.flame_mage/summon/.mcfunction b/Asset/data/asset/functions/mob/0187.flame_mage/summon/.mcfunction index 35d49acc27..21f3cb9a21 100644 --- a/Asset/data/asset/functions/mob/0187.flame_mage/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0187.flame_mage/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/187/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0187.flame_mage"} + summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0189.water_mage/summon/.mcfunction b/Asset/data/asset/functions/mob/0189.water_mage/summon/.mcfunction index 55647ba142..208f912001 100644 --- a/Asset/data/asset/functions/mob/0189.water_mage/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0189.water_mage/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0189.water_mage/summon/ # @within asset:mob/alias/189/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0189.water_mage"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0190.thunder_mage/summon/.mcfunction b/Asset/data/asset/functions/mob/0190.thunder_mage/summon/.mcfunction index c75da9d633..28708726b5 100644 --- a/Asset/data/asset/functions/mob/0190.thunder_mage/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0190.thunder_mage/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0190.thunder_mage/summon/ # @within asset:mob/alias/190/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],Silent:1b,DeathLootTable:"asset:mob/death/0190.thunder_mage"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0202.hunters_dream/summon/.mcfunction b/Asset/data/asset/functions/mob/0202.hunters_dream/summon/.mcfunction index f8d66e3cbc..e84a392374 100644 --- a/Asset/data/asset/functions/mob/0202.hunters_dream/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0202.hunters_dream/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0202.hunters_dream/summon/ # @within asset:mob/alias/202/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0202.hunters_dream"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0206.skull_basher/summon/.mcfunction b/Asset/data/asset/functions/mob/0206.skull_basher/summon/.mcfunction index 51a982fb79..79d046d572 100644 --- a/Asset/data/asset/functions/mob/0206.skull_basher/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0206.skull_basher/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0206.skull_basher/summon/ # @within asset:mob/alias/206/summon -summon skeleton ~ ~ ~ {Tags:["MobInit","5Q.Melee"],DeathLootTable:"asset:mob/death/0206.skull_basher"} +summon skeleton ~ ~ ~ {Tags:["MobInit","5Q.Melee"]} diff --git a/Asset/data/asset/functions/mob/0210.aurora_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0210.aurora_eye/summon/.mcfunction index 5490ec1fea..3799563625 100644 --- a/Asset/data/asset/functions/mob/0210.aurora_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0210.aurora_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0210.aurora_eye/summon/ # @within asset:mob/alias/210/summon -summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0210.aurora_eye"} +summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0216.gray_guardian/summon/.mcfunction b/Asset/data/asset/functions/mob/0216.gray_guardian/summon/.mcfunction index 25db680dc1..5dc5cb92e8 100644 --- a/Asset/data/asset/functions/mob/0216.gray_guardian/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0216.gray_guardian/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0216.gray_guardian/summon/ # @within asset:mob/alias/216/summon -summon iron_golem ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","60.Angel"],NoAI:1b,Silent:1b,PersistenceRequired:1b,DeathLootTable:"asset:mob/death/0216.gray_guardian"} +summon iron_golem ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","60.Angel"],NoAI:1b,Silent:1b,PersistenceRequired:1b} diff --git a/Asset/data/asset/functions/mob/0217.medousa_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0217.medousa_eye/summon/.mcfunction index 10c89c58b4..e303b35702 100644 --- a/Asset/data/asset/functions/mob/0217.medousa_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0217.medousa_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0217.medousa_eye/summon/ # @within asset:mob/alias/217/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiBurn","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0217.medousa_eye"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiBurn","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0219.aorta/summon/.mcfunction b/Asset/data/asset/functions/mob/0219.aorta/summon/.mcfunction index 0eaade00b1..68b9a147b4 100644 --- a/Asset/data/asset/functions/mob/0219.aorta/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0219.aorta/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/219/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"asset:mob/death/0219.aorta"} + summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0220.vena_cana/summon/.mcfunction b/Asset/data/asset/functions/mob/0220.vena_cana/summon/.mcfunction index 206ff8195f..bdb6432b5d 100644 --- a/Asset/data/asset/functions/mob/0220.vena_cana/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0220.vena_cana/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0220.vena_cana/summon/ # @within asset:mob/alias/220/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiBurn","AntiFallDamage"],DeathLootTable:"asset:mob/death/0220.vena_cana"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AntiBurn","AntiFallDamage"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0224.pumpkin_ghost/summon/.mcfunction b/Asset/data/asset/functions/mob/0224.pumpkin_ghost/summon/.mcfunction index 81732de9e4..266b369e9c 100644 --- a/Asset/data/asset/functions/mob/0224.pumpkin_ghost/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0224.pumpkin_ghost/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0224.pumpkin_ghost/summon/ # @within asset:mob/alias/224/summon -summon husk ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"asset:mob/death/0224.pumpkin_ghost"} +summon husk ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0227.frost_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0227.frost_eye/summon/.mcfunction index 15b4b0559f..07ef4d80a0 100644 --- a/Asset/data/asset/functions/mob/0227.frost_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0227.frost_eye/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/227/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0227.frost_eye"} + summon zombie ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction index 67fa6a3d13..981d0b88df 100644 --- a/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/228/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0228.frost_eye"} + summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0232.honey_leader/summon/.mcfunction b/Asset/data/asset/functions/mob/0232.honey_leader/summon/.mcfunction index 33635198f5..d920bec242 100644 --- a/Asset/data/asset/functions/mob/0232.honey_leader/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0232.honey_leader/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0232.honey_leader/summon/ # @within asset:mob/alias/232/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0232.honey_leader"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0233.honey_flyer/summon/.mcfunction b/Asset/data/asset/functions/mob/0233.honey_flyer/summon/.mcfunction index fa3b0b1cef..b40c429adb 100644 --- a/Asset/data/asset/functions/mob/0233.honey_flyer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0233.honey_flyer/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0233.honey_flyer/summon/ # @within asset:mob/alias/233/summon -summon skeleton ~ ~ ~ {Silent:1b,NoGravity:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0233.honey_flyer"} +summon skeleton ~ ~ ~ {Silent:1b,NoGravity:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0234.walleye/summon/.mcfunction b/Asset/data/asset/functions/mob/0234.walleye/summon/.mcfunction index a22875b710..99e8fdce8a 100644 --- a/Asset/data/asset/functions/mob/0234.walleye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0234.walleye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0234.walleye/summon/ # @within asset:mob/alias/234/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AntiBurn","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0234.walleye",Silent:1b,NoAI:1b} +summon zombie ~ ~ ~ {Tags:["MobInit","AntiBurn","AlwaysInvisible"],Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0235.orange_thrower/summon/.mcfunction b/Asset/data/asset/functions/mob/0235.orange_thrower/summon/.mcfunction index 5dc335d335..7e2e07031a 100644 --- a/Asset/data/asset/functions/mob/0235.orange_thrower/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0235.orange_thrower/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0235.orange_thrower/summon/ # @within asset:mob/alias/235/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0235.orange_thrower"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0236.ksitigarbha/summon/.mcfunction b/Asset/data/asset/functions/mob/0236.ksitigarbha/summon/.mcfunction index 36146ca23e..ce610d2127 100644 --- a/Asset/data/asset/functions/mob/0236.ksitigarbha/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0236.ksitigarbha/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0236.ksitigarbha/summon/ # @within asset:mob/alias/236/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AntiBurn","6K.LinkInit","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0236.ksitigarbha",Silent:1b,IsBaby:0b} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AntiBurn","6K.LinkInit","AlwaysSlowFall"],Silent:1b,IsBaby:0b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0237.lunatic_mage/summon/.mcfunction b/Asset/data/asset/functions/mob/0237.lunatic_mage/summon/.mcfunction index ff2873c729..fa6bf927e7 100644 --- a/Asset/data/asset/functions/mob/0237.lunatic_mage/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0237.lunatic_mage/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0237.lunatic_mage/summon/ # @within asset:mob/alias/237/summon -summon husk ~ ~-100 ~ {DeathTime:19s,Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall","AntiVoid"],DeathLootTable:"asset:mob/death/0237.lunatic_mage"} +summon husk ~ ~-100 ~ {DeathTime:19s,Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall","AntiVoid"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0238.poltergeist_armor/summon/.mcfunction b/Asset/data/asset/functions/mob/0238.poltergeist_armor/summon/.mcfunction index 8625304dc9..3825d9e88e 100644 --- a/Asset/data/asset/functions/mob/0238.poltergeist_armor/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0238.poltergeist_armor/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0238.poltergeist_armor/summon/ # @within asset:mob/alias/238/summon -summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"asset:mob/death/0238.poltergeist_armor"} +summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0239.poltergeist_bow/summon/.mcfunction b/Asset/data/asset/functions/mob/0239.poltergeist_bow/summon/.mcfunction index 069166ccc5..a9b056a5f4 100644 --- a/Asset/data/asset/functions/mob/0239.poltergeist_bow/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0239.poltergeist_bow/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0239.poltergeist_bow/summon/ # @within asset:mob/alias/239/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"asset:mob/death/0239.poltergeist_bow"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AntiBurn"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0241.poltergeist_subspecies/summon/.mcfunction b/Asset/data/asset/functions/mob/0241.poltergeist_subspecies/summon/.mcfunction index b905301304..e34186f392 100644 --- a/Asset/data/asset/functions/mob/0241.poltergeist_subspecies/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0241.poltergeist_subspecies/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0241.poltergeist_subspecies/summon/ # @within asset:mob/alias/241/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0241.poltergeist_subspecies",Silent:1b} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0242.poltergeist_subspecies_bow/summon/.mcfunction b/Asset/data/asset/functions/mob/0242.poltergeist_subspecies_bow/summon/.mcfunction index f61e630990..f3aba25dc1 100644 --- a/Asset/data/asset/functions/mob/0242.poltergeist_subspecies_bow/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0242.poltergeist_subspecies_bow/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0242.poltergeist_subspecies_bow/summon/ # @within asset:mob/alias/242/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0242.poltergeist_subspecies_bow",Silent:1b} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0244.ignition_spider/summon/.mcfunction b/Asset/data/asset/functions/mob/0244.ignition_spider/summon/.mcfunction index 985c40a238..503c53e85f 100644 --- a/Asset/data/asset/functions/mob/0244.ignition_spider/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0244.ignition_spider/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0244.ignition_spider/summon/ # @within asset:mob/alias/244/summon -summon spider ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0244.ignition_spider"} +summon spider ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0245.fire_creeper/summon/.mcfunction b/Asset/data/asset/functions/mob/0245.fire_creeper/summon/.mcfunction index c314e324fe..3e1b67bfb5 100644 --- a/Asset/data/asset/functions/mob/0245.fire_creeper/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0245.fire_creeper/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0245.fire_creeper/summon/ # @within asset:mob/alias/245/summon -summon creeper ~ ~ ~ {Tags:["MobInit"],HasVisualFire:1b,Fuse:100s,ExplosionRadius:0b,DeathLootTable:"asset:mob/death/0245.fire_creeper",Passengers:[{id:"minecraft:falling_block",BlockState:{Name:"minecraft:fire"},NoGravity:1b,Time:2147483647,Tags:["AutoKillWhenDieVehicle","AssetMob"]}]} +summon creeper ~ ~ ~ {Tags:["MobInit"],HasVisualFire:1b,Fuse:100s,ExplosionRadius:0b,Passengers:[{id:"minecraft:falling_block",BlockState:{Name:"minecraft:fire"},NoGravity:1b,Time:2147483647,Tags:["AutoKillWhenDieVehicle","AssetMob"]}]} diff --git a/Asset/data/asset/functions/mob/0253.parasitic_soldiers/summon/.mcfunction b/Asset/data/asset/functions/mob/0253.parasitic_soldiers/summon/.mcfunction index a8fc46106c..3beb024dfb 100644 --- a/Asset/data/asset/functions/mob/0253.parasitic_soldiers/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0253.parasitic_soldiers/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0253.parasitic_soldiers/summon/ # @within asset:mob/alias/253/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathTime:19s,DeathLootTable:"asset:mob/death/0253.parasitic_soldiers"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathTime:19s,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0254.headless/summon/.mcfunction b/Asset/data/asset/functions/mob/0254.headless/summon/.mcfunction index 571f2c2547..c56d93e512 100644 --- a/Asset/data/asset/functions/mob/0254.headless/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0254.headless/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0254.headless/summon/ # @within asset:mob/alias/254/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0254.headless",active_effects:[{id:"jump_boost",amplifier:3b,duration:2147483647,show_particles:0b}]} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],active_effects:[{id:"jump_boost",amplifier:3b,duration:2147483647,show_particles:0b}]} diff --git a/Asset/data/asset/functions/mob/0255.dependence_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0255.dependence_eye/summon/.mcfunction index 8bb7ee4f72..8d8949ddc9 100644 --- a/Asset/data/asset/functions/mob/0255.dependence_eye/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0255.dependence_eye/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0255.dependence_eye/summon/ # @within asset:mob/alias/255/summon -summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0255.dependence_eye",Tags:["MobInit","Enemy","AlwaysInvisible"]} +summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","Enemy","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0257.distortion_spellbook/summon/.mcfunction b/Asset/data/asset/functions/mob/0257.distortion_spellbook/summon/.mcfunction index d7e629318e..3c51677f60 100644 --- a/Asset/data/asset/functions/mob/0257.distortion_spellbook/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0257.distortion_spellbook/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0257.distortion_spellbook/summon/ # @within asset:mob/alias/257/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],NoAI:1b,Silent:1b,DeathLootTable:"asset:mob/death/0257.distortion_spellbook"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],NoAI:1b,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0259.shadow_stalker/summon/.mcfunction b/Asset/data/asset/functions/mob/0259.shadow_stalker/summon/.mcfunction index c93e45448f..21ac0cac4b 100644 --- a/Asset/data/asset/functions/mob/0259.shadow_stalker/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0259.shadow_stalker/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0259.shadow_stalker/summon/ # @within asset:mob/alias/259/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","77.Dark"],Silent:1b,DeathLootTable:"asset:mob/death/0259.shadow_stalker"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","77.Dark"],Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/summon/.mcfunction b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/summon/.mcfunction index 726725be10..a808a482a8 100644 --- a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0261.laser_eye_mk2/summon/ # @within asset:mob/alias/261/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0261.laser_eye_mk2"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0262.frestchika/summon/.mcfunction b/Asset/data/asset/functions/mob/0262.frestchika/summon/.mcfunction index 0a50ea0faf..5559b58df5 100644 --- a/Asset/data/asset/functions/mob/0262.frestchika/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0262.frestchika/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0262.frestchika/summon/ # @within asset:mob/alias/262/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","7A.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/0262.frestchika"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","7A.Angel"],PersistenceRequired:1b,Silent:1b,NoAI:1b} diff --git a/Asset/data/asset/functions/mob/0264.dark_summoner/summon/.mcfunction b/Asset/data/asset/functions/mob/0264.dark_summoner/summon/.mcfunction index 1b1d5bac76..0f04166909 100644 --- a/Asset/data/asset/functions/mob/0264.dark_summoner/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0264.dark_summoner/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/264/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"asset:mob/death/0264.dark_summoner"} + summon zombie ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/summon/.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/summon/.mcfunction index d0298824c4..b85e9b79dc 100644 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0265.dark_familiar/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/265/summon # 元となるMobを召喚する -summon husk ~ ~ ~ {NoAI:1b,Team:"NoCollision",Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathTime:19s,DeathLootTable:"asset:mob/death/0265.dark_familiar",IsBaby:1b,Silent:1b} +summon husk ~ ~ ~ {NoAI:1b,Team:"NoCollision",Tags:["MobInit","AlwaysInvisible","AlwaysSlowFall"],DeathTime:19s,IsBaby:1b,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0269.goblins/summon/.mcfunction b/Asset/data/asset/functions/mob/0269.goblins/summon/.mcfunction index f5b1fab97f..e12637519b 100644 --- a/Asset/data/asset/functions/mob/0269.goblins/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0269.goblins/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0269.goblins/summon/ # @within asset:mob/alias/269/summon -summon zombified_piglin ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0269.goblins"} +summon zombified_piglin ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0270.who_hate/summon/.mcfunction b/Asset/data/asset/functions/mob/0270.who_hate/summon/.mcfunction index f70244d0a3..8b0e5e68a0 100644 --- a/Asset/data/asset/functions/mob/0270.who_hate/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0270.who_hate/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0270.who_hate/summon/ # @within asset:mob/alias/270/summon -summon zombified_piglin ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],active_effects:[{id:"jump_boost",amplifier:3b,duration:2147483647,show_particles:0b}],DeathLootTable:"asset:mob/death/0270.who_hate"} +summon zombified_piglin ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],active_effects:[{id:"jump_boost",amplifier:3b,duration:2147483647,show_particles:0b}],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0271.indomitable_warrior/summon/.mcfunction b/Asset/data/asset/functions/mob/0271.indomitable_warrior/summon/.mcfunction index 29dc660932..96e7f80f0d 100644 --- a/Asset/data/asset/functions/mob/0271.indomitable_warrior/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0271.indomitable_warrior/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0271.indomitable_warrior/summon/ # @within asset:mob/alias/271/summon -summon zombified_piglin ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0271.indomitable_warrior"} +summon zombified_piglin ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0273.hell_blade/summon/.mcfunction b/Asset/data/asset/functions/mob/0273.hell_blade/summon/.mcfunction index 8b36125fd8..bc2959905e 100644 --- a/Asset/data/asset/functions/mob/0273.hell_blade/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0273.hell_blade/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0273.hell_blade/summon/ # @within asset:mob/alias/273/summon -summon zombie ~ ~ ~ {Tags:["7L.Init","MobInit","AntiBurn","AntiFallDamage","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0273.hell_blade",IsBaby:1b,Silent:1b} +summon zombie ~ ~ ~ {Tags:["7L.Init","MobInit","AntiBurn","AntiFallDamage","AlwaysInvisible"],IsBaby:1b,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0274.death_saw_jiki/summon/.mcfunction b/Asset/data/asset/functions/mob/0274.death_saw_jiki/summon/.mcfunction index ca0800c385..328b37ccdd 100644 --- a/Asset/data/asset/functions/mob/0274.death_saw_jiki/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0274.death_saw_jiki/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0274.death_saw_jiki/summon/ # @within asset:mob/alias/274/summon -summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],IsBaby:1b,NoAI:1b,Silent:1b,DeathLootTable:"asset:mob/death/0274.death_saw_jiki"} +summon zombie ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],IsBaby:1b,NoAI:1b,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0280.the_desire_for_burning/summon/.mcfunction b/Asset/data/asset/functions/mob/0280.the_desire_for_burning/summon/.mcfunction index 6968cb9b8a..47b884f3c1 100644 --- a/Asset/data/asset/functions/mob/0280.the_desire_for_burning/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0280.the_desire_for_burning/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0280.the_desire_for_burning/summon/ # @within asset:mob/alias/280/summon -summon blaze ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0280.the_desire_for_burning"} +summon blaze ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0283.guardian/summon/.mcfunction b/Asset/data/asset/functions/mob/0283.guardian/summon/.mcfunction index 52fab987ed..fd2e28b87f 100644 --- a/Asset/data/asset/functions/mob/0283.guardian/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0283.guardian/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0283.guardian/summon/ # @within asset:mob/alias/283/summon -summon guardian ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"asset:mob/death/0283.guardian"} +summon guardian ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0287.burning_stomper/summon/.mcfunction b/Asset/data/asset/functions/mob/0287.burning_stomper/summon/.mcfunction index 9f5958a356..9799b83720 100644 --- a/Asset/data/asset/functions/mob/0287.burning_stomper/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0287.burning_stomper/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0287.burning_stomper/summon/ # @within asset:mob/alias/287/summon -summon wither_skeleton ~ ~ ~ {CustomNameVisible:0b,Tags:["MobInit","AlwaysInvisible","AntiFallDamage"],DeathLootTable:"asset:mob/death/0287.burning_stomper"} +summon wither_skeleton ~ ~ ~ {CustomNameVisible:0b,Tags:["MobInit","AlwaysInvisible","AntiFallDamage"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0292.trample_bot/summon/.mcfunction b/Asset/data/asset/functions/mob/0292.trample_bot/summon/.mcfunction index 792c232816..9416d2cf04 100644 --- a/Asset/data/asset/functions/mob/0292.trample_bot/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0292.trample_bot/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0292.trample_bot/summon/ # @within asset:mob/alias/292/summon -summon skeleton ~ ~ ~ {Silent:1b,CustomNameVisible:0b,Tags:["MobInit","AlwaysInvisible","AntiFallDamage"],DeathLootTable:"asset:mob/death/0292.trample_bot"} +summon skeleton ~ ~ ~ {Silent:1b,CustomNameVisible:0b,Tags:["MobInit","AlwaysInvisible","AntiFallDamage"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0302.call_gun/summon/.mcfunction b/Asset/data/asset/functions/mob/0302.call_gun/summon/.mcfunction index 7030645208..4ebda5a223 100644 --- a/Asset/data/asset/functions/mob/0302.call_gun/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0302.call_gun/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0302.call_gun/summon/ # @within asset:mob/alias/302/summon -summon zombie ~ ~ ~ {Tags:["MobInit","8E.Gun","AlwaysInvisible"],NoAI:1b,Silent:1b,Invulnerable:1b,NoGravity:1b,DeathLootTable:"asset:mob/death/0302.call_gun"} +summon zombie ~ ~ ~ {Tags:["MobInit","8E.Gun","AlwaysInvisible"],NoAI:1b,Silent:1b,Invulnerable:1b,NoGravity:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0330.aurora_reaper/summon/.mcfunction b/Asset/data/asset/functions/mob/0330.aurora_reaper/summon/.mcfunction index 07bb686bf8..6054644c81 100644 --- a/Asset/data/asset/functions/mob/0330.aurora_reaper/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0330.aurora_reaper/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0330.aurora_reaper/summon/ # @within asset:mob/alias/330/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0330.aurora_reaper"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/summon/.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/summon/.mcfunction index bba18b17ba..39e2929ce5 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/331/summon # 元となるMobを召喚する - summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0331.aurora_sorcerer"} + summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/summon/.mcfunction b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/summon/.mcfunction index 6a0613e14b..38cfc89220 100644 --- a/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0336.cherry_blossom_fairy/summon/ # @within asset:mob/alias/336/summon -summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0336.cherry_blossom_fairy"} +summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0363.white_spellbook/summon/.mcfunction b/Asset/data/asset/functions/mob/0363.white_spellbook/summon/.mcfunction index fc5c56acec..c1ddbce861 100644 --- a/Asset/data/asset/functions/mob/0363.white_spellbook/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0363.white_spellbook/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/363/summon # 元となるMobを召喚する - summon zombie ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0363.white_spellbook"} + summon zombie ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/10001.sandbag2/summon/.mcfunction b/Asset/data/asset/functions/mob/10001.sandbag2/summon/.mcfunction index 62b5ccc124..104c54ae59 100644 --- a/Asset/data/asset/functions/mob/10001.sandbag2/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/10001.sandbag2/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/10001.sandbag2/summon/ # @within asset:mob/alias/10001/summon -summon skeleton ~ ~ ~ {Tags:["MobInit"],DeathLootTable:"empty"} +summon skeleton ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/1004.tultaria/summon/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/summon/.mcfunction index e06d5b42a2..c325ac2aeb 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/1004.tultaria/summon/ # @within asset:mob/alias/1004/summon -summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","RW.Boss"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"asset:mob/death/1004.tultaria"} +summon wither_skeleton ~ ~ ~ {Tags:["MobInit","AlwaysInvisible","RW.Boss"],PersistenceRequired:1b,Silent:1b,NoAI:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/1005.blue_star/summon/.mcfunction b/Asset/data/asset/functions/mob/1005.blue_star/summon/.mcfunction index bcf59e195d..f21c5c1874 100644 --- a/Asset/data/asset/functions/mob/1005.blue_star/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/1005.blue_star/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/1005.blue_star/summon/ # @within asset:mob/alias/1005/summon -summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"asset:mob/death/1005.blue_star"} +summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/1006.green_star/summon/.mcfunction b/Asset/data/asset/functions/mob/1006.green_star/summon/.mcfunction index 2a91308474..dc41f6952a 100644 --- a/Asset/data/asset/functions/mob/1006.green_star/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/1006.green_star/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/1006.green_star/summon/ # @within asset:mob/alias/1006/summon -summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"asset:mob/death/1006.green_star"} +summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/1007.red_star/summon/.mcfunction b/Asset/data/asset/functions/mob/1007.red_star/summon/.mcfunction index 7945086678..074e627ac3 100644 --- a/Asset/data/asset/functions/mob/1007.red_star/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/1007.red_star/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/1007.red_star/summon/ # @within asset:mob/alias/1007/summon -summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"asset:mob/death/1007.red_star"} +summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/1008.yellow_star/summon/.mcfunction b/Asset/data/asset/functions/mob/1008.yellow_star/summon/.mcfunction index 813a8ac2de..1d01a260fc 100644 --- a/Asset/data/asset/functions/mob/1008.yellow_star/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/1008.yellow_star/summon/.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/1008.yellow_star/summon/ # @within asset:mob/alias/1008/summon -summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"asset:mob/death/1008.yellow_star"} +summon vex ~ ~ ~ {Tags:["MobInit","AlwaysInvisible"],LifeTicks:1,Silent:1b,DeathLootTable:"empty"} diff --git a/Asset/data/asset/loot_tables/mob/death/0005.thief.json b/Asset/data/asset/loot_tables/mob/death/0005.thief.json deleted file mode 100644 index fe56fb5060..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0005.thief.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:5}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/vindicator" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0007.ectoplasm.json b/Asset/data/asset/loot_tables/mob/death/0007.ectoplasm.json deleted file mode 100644 index 25c5d74290..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0007.ectoplasm.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:7}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/vex" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0013.cluster_creeper.json b/Asset/data/asset/loot_tables/mob/death/0013.cluster_creeper.json deleted file mode 100644 index 4368bbb908..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0013.cluster_creeper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:13}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/creeper" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0015.guardian.json b/Asset/data/asset/loot_tables/mob/death/0015.guardian.json deleted file mode 100644 index f3bbe2c854..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0015.guardian.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:15}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/guardian" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0016.shirker.json b/Asset/data/asset/loot_tables/mob/death/0016.shirker.json deleted file mode 100644 index a2544a7d9e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0016.shirker.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:16}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/elder_guardian" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0017.fire_bird.json b/Asset/data/asset/loot_tables/mob/death/0017.fire_bird.json deleted file mode 100644 index d73ad419b4..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0017.fire_bird.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:17}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/phantom" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0019.horus_priest.json b/Asset/data/asset/loot_tables/mob/death/0019.horus_priest.json deleted file mode 100644 index fdacb52196..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0019.horus_priest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:19}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0021.demon_eye.json b/Asset/data/asset/loot_tables/mob/death/0021.demon_eye.json deleted file mode 100644 index df4af725ca..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0021.demon_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:21}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0022.red_knight.json b/Asset/data/asset/loot_tables/mob/death/0022.red_knight.json deleted file mode 100644 index e363cd3882..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0022.red_knight.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:22}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0023.chainsaw_zombie.json b/Asset/data/asset/loot_tables/mob/death/0023.chainsaw_zombie.json deleted file mode 100644 index 86b2196061..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0023.chainsaw_zombie.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:23}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombie" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0026.vein.json b/Asset/data/asset/loot_tables/mob/death/0026.vein.json deleted file mode 100644 index d1f4563b03..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0026.vein.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:26}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0027.skull_sniper.json b/Asset/data/asset/loot_tables/mob/death/0027.skull_sniper.json deleted file mode 100644 index 4f9fbf7d64..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0027.skull_sniper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:27}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0029.skeleton_archer.json b/Asset/data/asset/loot_tables/mob/death/0029.skeleton_archer.json deleted file mode 100644 index ae7d8f7cd5..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0029.skeleton_archer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:29}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0030.warped.json b/Asset/data/asset/loot_tables/mob/death/0030.warped.json deleted file mode 100644 index e964ac9d1e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0030.warped.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:30}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/drowned" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0031.tomb_robbing.json b/Asset/data/asset/loot_tables/mob/death/0031.tomb_robbing.json deleted file mode 100644 index 029d34e324..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0031.tomb_robbing.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:31}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/vindicator" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0037.fire_spreader.json b/Asset/data/asset/loot_tables/mob/death/0037.fire_spreader.json deleted file mode 100644 index 1e9f20cae9..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0037.fire_spreader.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:37}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0038.laser_eye.json b/Asset/data/asset/loot_tables/mob/death/0038.laser_eye.json deleted file mode 100644 index 2642e1462d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0038.laser_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:38}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0046.clock_of_despair.json b/Asset/data/asset/loot_tables/mob/death/0046.clock_of_despair.json deleted file mode 100644 index 080060a19d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0046.clock_of_despair.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:46}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0047.the_heretic.json b/Asset/data/asset/loot_tables/mob/death/0047.the_heretic.json deleted file mode 100644 index 1868f6dbad..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0047.the_heretic.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:47}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0049.ice_obstructor.json b/Asset/data/asset/loot_tables/mob/death/0049.ice_obstructor.json deleted file mode 100644 index 5deb32a84f..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0049.ice_obstructor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:49}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0053.executioners.json b/Asset/data/asset/loot_tables/mob/death/0053.executioners.json deleted file mode 100644 index 837c797b0b..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0053.executioners.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:53}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0054.pumpkin_meteor.json b/Asset/data/asset/loot_tables/mob/death/0054.pumpkin_meteor.json deleted file mode 100644 index dc42600a33..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0054.pumpkin_meteor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:54}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0055.hetukedah.json b/Asset/data/asset/loot_tables/mob/death/0055.hetukedah.json deleted file mode 100644 index b7c10946ab..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0055.hetukedah.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:55}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0056.thunder_trifler.json b/Asset/data/asset/loot_tables/mob/death/0056.thunder_trifler.json deleted file mode 100644 index be17e0cdfb..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0056.thunder_trifler.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:56}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0057.none_fighter.json b/Asset/data/asset/loot_tables/mob/death/0057.none_fighter.json deleted file mode 100644 index 0125af2ef0..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0057.none_fighter.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:57}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0058.divide_haze.json b/Asset/data/asset/loot_tables/mob/death/0058.divide_haze.json deleted file mode 100644 index 9619f20902..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0058.divide_haze.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:58}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0059.jack_o_lantern.json b/Asset/data/asset/loot_tables/mob/death/0059.jack_o_lantern.json deleted file mode 100644 index 235d7f647c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0059.jack_o_lantern.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:59}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0060.self_destructor.json b/Asset/data/asset/loot_tables/mob/death/0060.self_destructor.json deleted file mode 100644 index c99c83aad6..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0060.self_destructor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:60}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0061.stray.json b/Asset/data/asset/loot_tables/mob/death/0061.stray.json deleted file mode 100644 index dedad2836b..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0061.stray.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:61}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/stray" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0062.drowned.json b/Asset/data/asset/loot_tables/mob/death/0062.drowned.json deleted file mode 100644 index f6fee67c78..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0062.drowned.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:62}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/drowned" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0063.ghost.json b/Asset/data/asset/loot_tables/mob/death/0063.ghost.json deleted file mode 100644 index 0ee981b1b1..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0063.ghost.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:63}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0064.artery.json b/Asset/data/asset/loot_tables/mob/death/0064.artery.json deleted file mode 100644 index 6a71d3778e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0064.artery.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:64}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0065.night_shadow.json b/Asset/data/asset/loot_tables/mob/death/0065.night_shadow.json deleted file mode 100644 index fd283ba653..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0065.night_shadow.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:65}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/phantom" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0073.clutch_spider.json b/Asset/data/asset/loot_tables/mob/death/0073.clutch_spider.json deleted file mode 100644 index 4249ad35a4..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0073.clutch_spider.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:73}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/spider" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0074.watermelon_bomber.json b/Asset/data/asset/loot_tables/mob/death/0074.watermelon_bomber.json deleted file mode 100644 index 0fb0174456..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0074.watermelon_bomber.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:74}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0076.golden_watermelon_bomber.json b/Asset/data/asset/loot_tables/mob/death/0076.golden_watermelon_bomber.json deleted file mode 100644 index 07a16c3004..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0076.golden_watermelon_bomber.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:76}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0078.messenger_of_thunder.json b/Asset/data/asset/loot_tables/mob/death/0078.messenger_of_thunder.json deleted file mode 100644 index 3524c3597c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0078.messenger_of_thunder.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:78}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0080.fukotsu.json b/Asset/data/asset/loot_tables/mob/death/0080.fukotsu.json deleted file mode 100644 index e8948d1d75..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0080.fukotsu.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:80}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0081.snow_cloud.json b/Asset/data/asset/loot_tables/mob/death/0081.snow_cloud.json deleted file mode 100644 index dff9443414..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0081.snow_cloud.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:81}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0083.thunder_trifler.json b/Asset/data/asset/loot_tables/mob/death/0083.thunder_trifler.json deleted file mode 100644 index 9dc10abe56..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0083.thunder_trifler.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:83}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0084.falcios_priest.json b/Asset/data/asset/loot_tables/mob/death/0084.falcios_priest.json deleted file mode 100644 index c313a085be..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0084.falcios_priest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:84}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0089.decapitation.json b/Asset/data/asset/loot_tables/mob/death/0089.decapitation.json deleted file mode 100644 index 21c32d51ac..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0089.decapitation.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:89}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0090.decapitation.json b/Asset/data/asset/loot_tables/mob/death/0090.decapitation.json deleted file mode 100644 index d4c922ebb4..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0090.decapitation.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:90}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0092.red_rose.json b/Asset/data/asset/loot_tables/mob/death/0092.red_rose.json deleted file mode 100644 index 1107b7d936..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0092.red_rose.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:92}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombie" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0104.mad_scientist.json b/Asset/data/asset/loot_tables/mob/death/0104.mad_scientist.json deleted file mode 100644 index e2b2cf7464..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0104.mad_scientist.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:104}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0107.dark_ender.json b/Asset/data/asset/loot_tables/mob/death/0107.dark_ender.json deleted file mode 100644 index 67749e5fbc..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0107.dark_ender.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:107}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/enderman" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0114.jewel_hunter.json b/Asset/data/asset/loot_tables/mob/death/0114.jewel_hunter.json deleted file mode 100644 index 5c12e75d61..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0114.jewel_hunter.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:114}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0120.convict.json b/Asset/data/asset/loot_tables/mob/death/0120.convict.json deleted file mode 100644 index f1f40b2512..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0120.convict.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:120}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0124.skull_harpy.json b/Asset/data/asset/loot_tables/mob/death/0124.skull_harpy.json deleted file mode 100644 index 5549af3897..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0124.skull_harpy.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:124}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0129.lexiel.json b/Asset/data/asset/loot_tables/mob/death/0129.lexiel.json deleted file mode 100644 index 3a4bf3244e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0129.lexiel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:129}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0131.haruclaire.json b/Asset/data/asset/loot_tables/mob/death/0131.haruclaire.json deleted file mode 100644 index 63e7a2f622..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0131.haruclaire.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:131}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0138.combat_turret.json b/Asset/data/asset/loot_tables/mob/death/0138.combat_turret.json deleted file mode 100644 index 328cea1b03..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0138.combat_turret.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:138}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0139.blast_eye.json b/Asset/data/asset/loot_tables/mob/death/0139.blast_eye.json deleted file mode 100644 index a0e6c22300..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0139.blast_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:139}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0141.honey_archer.json b/Asset/data/asset/loot_tables/mob/death/0141.honey_archer.json deleted file mode 100644 index 8fd95669f2..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0141.honey_archer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:141}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0142.honey_soldier.json b/Asset/data/asset/loot_tables/mob/death/0142.honey_soldier.json deleted file mode 100644 index 5571e2e1c6..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0142.honey_soldier.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:142}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0146.prismarine_warrior.json b/Asset/data/asset/loot_tables/mob/death/0146.prismarine_warrior.json deleted file mode 100644 index 2b303454fb..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0146.prismarine_warrior.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:146}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0147.prismarine_slayer.json b/Asset/data/asset/loot_tables/mob/death/0147.prismarine_slayer.json deleted file mode 100644 index a8676c4b56..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0147.prismarine_slayer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:147}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0148.prismarine_atlatl.json b/Asset/data/asset/loot_tables/mob/death/0148.prismarine_atlatl.json deleted file mode 100644 index eb25c83cc0..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0148.prismarine_atlatl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:148}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0150.contamination.json b/Asset/data/asset/loot_tables/mob/death/0150.contamination.json deleted file mode 100644 index 3d34e07a08..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0150.contamination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:150}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0151.recombined.json b/Asset/data/asset/loot_tables/mob/death/0151.recombined.json deleted file mode 100644 index 430c277bf1..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0151.recombined.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:151}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0152.desire.json b/Asset/data/asset/loot_tables/mob/death/0152.desire.json deleted file mode 100644 index c30b07bc7d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0152.desire.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:152}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0153.domination.json b/Asset/data/asset/loot_tables/mob/death/0153.domination.json deleted file mode 100644 index 13028aac7e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0153.domination.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:153}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0154.ruin.json b/Asset/data/asset/loot_tables/mob/death/0154.ruin.json deleted file mode 100644 index df2d7367b3..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0154.ruin.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:154}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0155.immorality.json b/Asset/data/asset/loot_tables/mob/death/0155.immorality.json deleted file mode 100644 index 684b0c9733..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0155.immorality.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:155}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0156.infringement.json b/Asset/data/asset/loot_tables/mob/death/0156.infringement.json deleted file mode 100644 index 3fe5111040..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0156.infringement.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:156}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0159.freeze_guardian.json b/Asset/data/asset/loot_tables/mob/death/0159.freeze_guardian.json deleted file mode 100644 index e72617ef56..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0159.freeze_guardian.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:159}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0160.freeze_archer.json b/Asset/data/asset/loot_tables/mob/death/0160.freeze_archer.json deleted file mode 100644 index 1c9ea77177..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0160.freeze_archer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:160}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0161.lumberjack.json b/Asset/data/asset/loot_tables/mob/death/0161.lumberjack.json deleted file mode 100644 index b50e99876e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0161.lumberjack.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:161}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0162.sheep_chan.json b/Asset/data/asset/loot_tables/mob/death/0162.sheep_chan.json index c9cbc248c4..94e7c795db 100644 --- a/Asset/data/asset/loot_tables/mob/death/0162.sheep_chan.json +++ b/Asset/data/asset/loot_tables/mob/death/0162.sheep_chan.json @@ -1,21 +1,6 @@ { "type": "minecraft:entity", "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:162}}" - } - ] - } - ] - }, { "rolls": 1, "entries": [ @@ -116,4 +101,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/loot_tables/mob/death/0166.flying_potion.json b/Asset/data/asset/loot_tables/mob/death/0166.flying_potion.json deleted file mode 100644 index 8f7cafa97e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0166.flying_potion.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:166}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0169.blaze.json b/Asset/data/asset/loot_tables/mob/death/0169.blaze.json deleted file mode 100644 index da7e1de0be..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0169.blaze.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:169}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/blaze" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0171.lumberjack_of_blue_forest.json b/Asset/data/asset/loot_tables/mob/death/0171.lumberjack_of_blue_forest.json deleted file mode 100644 index 8293a71b8a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0171.lumberjack_of_blue_forest.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:171}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0174.burning_blaze.json b/Asset/data/asset/loot_tables/mob/death/0174.burning_blaze.json deleted file mode 100644 index 8c04b34724..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0174.burning_blaze.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:174}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0175.queen_bee.json b/Asset/data/asset/loot_tables/mob/death/0175.queen_bee.json deleted file mode 100644 index 622528b9a5..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0175.queen_bee.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:175}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0176.killer_bee.json b/Asset/data/asset/loot_tables/mob/death/0176.killer_bee.json deleted file mode 100644 index 9c2047a76d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0176.killer_bee.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:176}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0177.pillager.json b/Asset/data/asset/loot_tables/mob/death/0177.pillager.json deleted file mode 100644 index 8d16b06fcd..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0177.pillager.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:177}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/pillager" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0178.vindicator.json b/Asset/data/asset/loot_tables/mob/death/0178.vindicator.json deleted file mode 100644 index 3021d7cfeb..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0178.vindicator.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:178}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/pillager" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0179.trindicator.json b/Asset/data/asset/loot_tables/mob/death/0179.trindicator.json deleted file mode 100644 index 0462b07284..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0179.trindicator.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:179}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/pillager" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0181.magic_bookshelf.json b/Asset/data/asset/loot_tables/mob/death/0181.magic_bookshelf.json deleted file mode 100644 index a0d7b55f6d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0181.magic_bookshelf.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:181}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0182.skull_raven.json b/Asset/data/asset/loot_tables/mob/death/0182.skull_raven.json deleted file mode 100644 index 7d712a1107..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0182.skull_raven.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:182}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0185.tutankhamen.json b/Asset/data/asset/loot_tables/mob/death/0185.tutankhamen.json deleted file mode 100644 index 1f6347222a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0185.tutankhamen.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:185}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0186.ferocious_bee.json b/Asset/data/asset/loot_tables/mob/death/0186.ferocious_bee.json deleted file mode 100644 index 62a34a1cdc..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0186.ferocious_bee.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:186}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0187.flame_mage.json b/Asset/data/asset/loot_tables/mob/death/0187.flame_mage.json deleted file mode 100644 index 64d87d6515..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0187.flame_mage.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:187}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0189.water_mage.json b/Asset/data/asset/loot_tables/mob/death/0189.water_mage.json deleted file mode 100644 index 298c939809..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0189.water_mage.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:189}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0190.thunder_mage.json b/Asset/data/asset/loot_tables/mob/death/0190.thunder_mage.json deleted file mode 100644 index 0dbde3489a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0190.thunder_mage.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:190}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0202.hunters_dream.json b/Asset/data/asset/loot_tables/mob/death/0202.hunters_dream.json deleted file mode 100644 index b1359215b0..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0202.hunters_dream.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:202}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0204.infernal_watcher.json b/Asset/data/asset/loot_tables/mob/death/0204.infernal_watcher.json index 9b5f1dbda5..0616747a35 100644 --- a/Asset/data/asset/loot_tables/mob/death/0204.infernal_watcher.json +++ b/Asset/data/asset/loot_tables/mob/death/0204.infernal_watcher.json @@ -1,21 +1,6 @@ { "type": "minecraft:entity", "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "minecraft:set_nbt", - "tag": "{TSB:{ID:204}}" - } - ] - } - ] - }, { "rolls": { "min": 1, @@ -34,4 +19,4 @@ ] } ] - } \ No newline at end of file + } diff --git a/Asset/data/asset/loot_tables/mob/death/0205.skull_soldier.json b/Asset/data/asset/loot_tables/mob/death/0205.skull_soldier.json index dbd754f9fc..d54b8791c4 100644 --- a/Asset/data/asset/loot_tables/mob/death/0205.skull_soldier.json +++ b/Asset/data/asset/loot_tables/mob/death/0205.skull_soldier.json @@ -1,21 +1,6 @@ { "type": "entity", "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:205}}" - } - ] - } - ] - }, { "rolls": 1, "entries": [ @@ -52,4 +37,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/loot_tables/mob/death/0206.skull_basher.json b/Asset/data/asset/loot_tables/mob/death/0206.skull_basher.json deleted file mode 100644 index 026fceae45..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0206.skull_basher.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:206}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0210.aurora_eye.json b/Asset/data/asset/loot_tables/mob/death/0210.aurora_eye.json deleted file mode 100644 index e91cd753a3..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0210.aurora_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:210}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0216.gray_guardian.json b/Asset/data/asset/loot_tables/mob/death/0216.gray_guardian.json deleted file mode 100644 index 6fd6b12f8f..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0216.gray_guardian.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:216}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0217.medousa_eye.json b/Asset/data/asset/loot_tables/mob/death/0217.medousa_eye.json deleted file mode 100644 index 6853c158a1..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0217.medousa_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:217}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0219.aorta.json b/Asset/data/asset/loot_tables/mob/death/0219.aorta.json deleted file mode 100644 index 0d9ff96c0e..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0219.aorta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:219}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0220.vena_cana.json b/Asset/data/asset/loot_tables/mob/death/0220.vena_cana.json deleted file mode 100644 index f571cf243a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0220.vena_cana.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:220}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0224.pumpkin_ghost.json b/Asset/data/asset/loot_tables/mob/death/0224.pumpkin_ghost.json deleted file mode 100644 index 62b6e2b6ab..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0224.pumpkin_ghost.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:224}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0227.frost_eye.json b/Asset/data/asset/loot_tables/mob/death/0227.frost_eye.json deleted file mode 100644 index cec3c6988d..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0227.frost_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:227}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0228.frost_eye.json b/Asset/data/asset/loot_tables/mob/death/0228.frost_eye.json deleted file mode 100644 index 957fb4087a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0228.frost_eye.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:228}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombie" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0232.honey_leader.json b/Asset/data/asset/loot_tables/mob/death/0232.honey_leader.json deleted file mode 100644 index 0a23e5f58a..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0232.honey_leader.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:232}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0233.honey_flyer.json b/Asset/data/asset/loot_tables/mob/death/0233.honey_flyer.json deleted file mode 100644 index 81ddbc0aa3..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0233.honey_flyer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:233}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0234.walleye.json b/Asset/data/asset/loot_tables/mob/death/0234.walleye.json deleted file mode 100644 index 0ecbcea484..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0234.walleye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:234}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0235.orange_thrower.json b/Asset/data/asset/loot_tables/mob/death/0235.orange_thrower.json deleted file mode 100644 index c8c91d6ec2..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0235.orange_thrower.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:235}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0236.ksitigarbha.json b/Asset/data/asset/loot_tables/mob/death/0236.ksitigarbha.json deleted file mode 100644 index ae1bbe1bdc..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0236.ksitigarbha.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:236}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0237.lunatic_mage.json b/Asset/data/asset/loot_tables/mob/death/0237.lunatic_mage.json deleted file mode 100644 index 9b62b4e1d1..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0237.lunatic_mage.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:237}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0238.poltergeist_armor.json b/Asset/data/asset/loot_tables/mob/death/0238.poltergeist_armor.json deleted file mode 100644 index 0bc84831aa..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0238.poltergeist_armor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:238}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0239.poltergeist_bow.json b/Asset/data/asset/loot_tables/mob/death/0239.poltergeist_bow.json deleted file mode 100644 index 6977e05bec..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0239.poltergeist_bow.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:239}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0241.poltergeist_subspecies.json b/Asset/data/asset/loot_tables/mob/death/0241.poltergeist_subspecies.json deleted file mode 100644 index 36584c3541..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0241.poltergeist_subspecies.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:241}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0242.poltergeist_subspecies_bow.json b/Asset/data/asset/loot_tables/mob/death/0242.poltergeist_subspecies_bow.json deleted file mode 100644 index 0c664a9519..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0242.poltergeist_subspecies_bow.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:242}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0244.ignition_spider.json b/Asset/data/asset/loot_tables/mob/death/0244.ignition_spider.json deleted file mode 100644 index ab203c0726..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0244.ignition_spider.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:244}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/spider" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0245.fire_creeper.json b/Asset/data/asset/loot_tables/mob/death/0245.fire_creeper.json deleted file mode 100644 index 438989a097..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0245.fire_creeper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:245}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/creeper" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0253.parasitic_soldiers.json b/Asset/data/asset/loot_tables/mob/death/0253.parasitic_soldiers.json deleted file mode 100644 index bb047f2106..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0253.parasitic_soldiers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:253}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0254.headless.json b/Asset/data/asset/loot_tables/mob/death/0254.headless.json deleted file mode 100644 index 99ffd44141..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0254.headless.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:254}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0255.dependence_eye.json b/Asset/data/asset/loot_tables/mob/death/0255.dependence_eye.json deleted file mode 100644 index 89458d96eb..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0255.dependence_eye.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:255}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0257.distortion_spellbook.json b/Asset/data/asset/loot_tables/mob/death/0257.distortion_spellbook.json deleted file mode 100644 index 1371509486..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0257.distortion_spellbook.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:257}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0259.shadow_stalker.json b/Asset/data/asset/loot_tables/mob/death/0259.shadow_stalker.json deleted file mode 100644 index a3b67e5bad..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0259.shadow_stalker.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:259}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0261.laser_eye_mk2.json b/Asset/data/asset/loot_tables/mob/death/0261.laser_eye_mk2.json deleted file mode 100644 index 8e8c47f22c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0261.laser_eye_mk2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:261}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0262.frestchika.json b/Asset/data/asset/loot_tables/mob/death/0262.frestchika.json deleted file mode 100644 index a2ab337377..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0262.frestchika.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:262}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0264.dark_summoner.json b/Asset/data/asset/loot_tables/mob/death/0264.dark_summoner.json deleted file mode 100644 index c5e582fbaa..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0264.dark_summoner.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:264}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0265.dark_familiar.json b/Asset/data/asset/loot_tables/mob/death/0265.dark_familiar.json deleted file mode 100644 index 07b4fc755c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0265.dark_familiar.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:265}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0269.goblins.json b/Asset/data/asset/loot_tables/mob/death/0269.goblins.json deleted file mode 100644 index f36438b0c2..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0269.goblins.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:269}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombified_piglin" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0270.who_hate.json b/Asset/data/asset/loot_tables/mob/death/0270.who_hate.json deleted file mode 100644 index f36438b0c2..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0270.who_hate.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:269}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombified_piglin" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0271.indomitable_warrior.json b/Asset/data/asset/loot_tables/mob/death/0271.indomitable_warrior.json deleted file mode 100644 index f36438b0c2..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0271.indomitable_warrior.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:269}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/zombified_piglin" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0273.hell_blade.json b/Asset/data/asset/loot_tables/mob/death/0273.hell_blade.json deleted file mode 100644 index db4f082518..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0273.hell_blade.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:273}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0274.death_saw_jiki.json b/Asset/data/asset/loot_tables/mob/death/0274.death_saw_jiki.json deleted file mode 100644 index 412daedadd..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0274.death_saw_jiki.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:274}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/0280.the_desire_for_burning.json b/Asset/data/asset/loot_tables/mob/death/0280.the_desire_for_burning.json deleted file mode 100644 index 6fad81be7c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0280.the_desire_for_burning.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:280}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/blaze" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0283.guardian.json b/Asset/data/asset/loot_tables/mob/death/0283.guardian.json deleted file mode 100644 index d53223d6e5..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0283.guardian.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:283}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/guardian" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0287.burning_stomper.json b/Asset/data/asset/loot_tables/mob/death/0287.burning_stomper.json deleted file mode 100644 index b8e1b3b32f..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0287.burning_stomper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:287}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0292.trample_bot.json b/Asset/data/asset/loot_tables/mob/death/0292.trample_bot.json deleted file mode 100644 index b3752bc7b3..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0292.trample_bot.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:292}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0302.call_gun.json b/Asset/data/asset/loot_tables/mob/death/0302.call_gun.json deleted file mode 100644 index da44f86973..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0302.call_gun.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:302}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0330.aurora_reaper.json b/Asset/data/asset/loot_tables/mob/death/0330.aurora_reaper.json deleted file mode 100644 index 4710000b94..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0330.aurora_reaper.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:330}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0331.aurora_sorcerer.json b/Asset/data/asset/loot_tables/mob/death/0331.aurora_sorcerer.json deleted file mode 100644 index 0d3e3906b0..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0331.aurora_sorcerer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:331}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0336.cherry_blossom_fairy.json b/Asset/data/asset/loot_tables/mob/death/0336.cherry_blossom_fairy.json deleted file mode 100644 index aa311a8734..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0336.cherry_blossom_fairy.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:336}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0363.white_spellbook.json b/Asset/data/asset/loot_tables/mob/death/0363.white_spellbook.json deleted file mode 100644 index 4bcc34a865..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0363.white_spellbook.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:363}}" - } - ] - } - ] - } - ] -} diff --git a/Asset/data/asset/loot_tables/mob/death/1004.tultaria.json b/Asset/data/asset/loot_tables/mob/death/1004.tultaria.json deleted file mode 100644 index 7ce0d8f2d9..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/1004.tultaria.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:1004}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/1005.blue_star.json b/Asset/data/asset/loot_tables/mob/death/1005.blue_star.json deleted file mode 100644 index f5d2451c9c..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/1005.blue_star.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:1005}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/1006.green_star.json b/Asset/data/asset/loot_tables/mob/death/1006.green_star.json deleted file mode 100644 index bf9b15af40..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/1006.green_star.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:1006}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/1007.red_star.json b/Asset/data/asset/loot_tables/mob/death/1007.red_star.json deleted file mode 100644 index 3563c6b6f0..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/1007.red_star.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:1007}}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/1008.yellow_star.json b/Asset/data/asset/loot_tables/mob/death/1008.yellow_star.json deleted file mode 100644 index 258420b6ce..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/1008.yellow_star.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:1008}}" - } - ] - } - ] - } - ] -} \ No newline at end of file From 98ab041b1d70d64e3ab67a0774a6d9fb38327856 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 10 Nov 2024 07:04:46 +0000 Subject: [PATCH 09/74] Update Declares from ProjectTSB/TheSkyBlessing@c33ddc875708cedadd546fc750b53dfa4ea981e4 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 1759ba9e0e..4ce41e4a09 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -882,12 +882,12 @@ #> declare # @within -# function core:migration/v0.1.4/ # asset:teleporter/*/* # asset:teleporter/common/register # asset_manager:teleporter/** -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/migration/v0.1.4/.mcfunction#L12 +# function core:migration/v0.1.4/ # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction#L9 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/migration/v0.1.4/.mcfunction#L12 #declare storage asset:teleporter #> declare From 095e40ada8c099c59af1e082bfc9e498ecedce6c Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:44:51 +0900 Subject: [PATCH 10/74] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20[=E7=A5=9E=E5=99=A81?= =?UTF-8?q?9]=20=E8=81=96=E6=9B=B8=E3=81=AE=E8=AA=A4=E5=AD=97=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#344)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 4 ++-- .../give/2.give.mcfunction | 6 +++--- .../{0019.scriputre => 0019.scripture}/register.mcfunction | 2 +- .../trigger/1.trigger.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 6 +++--- Asset/data/asset/tags/functions/artifact/attack/melee.json | 2 +- Asset/data/asset/tags/functions/artifact/give.json | 2 +- Asset/data/asset/tags/functions/artifact/register.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/give/1.trigger.mcfunction (67%) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/give/2.give.mcfunction (95%) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/register.mcfunction (79%) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/trigger/1.trigger.mcfunction (75%) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/trigger/2.check_condition.mcfunction (75%) rename Asset/data/asset/functions/artifact/{0019.scriputre => 0019.scripture}/trigger/3.main.mcfunction (85%) diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/give/1.trigger.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0019.scriputre/give/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/give/1.trigger.mcfunction index a21ed7e2cb..f21134fafd 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/give/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/give/1.trigger.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/0019.scriputre/give/1.trigger +#> asset:artifact/0019.scripture/give/1.trigger # # 神器の取得処理の呼び出し時に実行されるfunction # # @within tag/function asset:artifact/give -execute if data storage asset:context {id:19} run function asset:artifact/0019.scriputre/give/2.give +execute if data storage asset:context {id:19} run function asset:artifact/0019.scripture/give/2.give diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/give/2.give.mcfunction similarity index 95% rename from Asset/data/asset/functions/artifact/0019.scriputre/give/2.give.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/give/2.give.mcfunction index 2d3092a5d5..50d6d6ccb8 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/give/2.give.mcfunction @@ -1,9 +1,9 @@ -#> asset:artifact/0019.scriputre/give/2.give +#> asset:artifact/0019.scripture/give/2.give # # 神器の作成部 ここでID等を定義する # # @user -# @within function asset:artifact/0019.scriputre/give/1.trigger +# @within function asset:artifact/0019.scripture/give/1.trigger # 神器の説明や消費MPなどをここで設定する。 # 最後にasset:artifact/common/giveを実行することで入手可能。 @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/register.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/register.mcfunction similarity index 79% rename from Asset/data/asset/functions/artifact/0019.scriputre/register.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/register.mcfunction index b4ae4de851..ebd20e2ad8 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/register.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/0019.scriputre/register +#> asset:artifact/0019.scripture/register # # 神器プールへの登録処理 # diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/trigger/1.trigger.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/0019.scriputre/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/trigger/1.trigger.mcfunction index 2a720132d3..4f8787e747 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/trigger/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0019.scriputre/trigger/1.trigger +#> asset:artifact/0019.scripture/trigger/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのauto/feet/legs/chest/head/mainhand/offhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{mainhand:19} run function asset:artifact/0019.scriputre/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{mainhand:19} run function asset:artifact/0019.scripture/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/trigger/2.check_condition.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/0019.scriputre/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/trigger/2.check_condition.mcfunction index 53990e7629..6d5275ac10 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/trigger/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/0019.scriputre/trigger/2.check_condition +#> asset:artifact/0019.scripture/trigger/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0019.scriputre/trigger/1.trigger +# @within function asset:artifact/0019.scripture/trigger/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0019.scriputre/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0019.scripture/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/trigger/3.main.mcfunction similarity index 85% rename from Asset/data/asset/functions/artifact/0019.scriputre/trigger/3.main.mcfunction rename to Asset/data/asset/functions/artifact/0019.scripture/trigger/3.main.mcfunction index 84cc167a48..8227ad5741 100644 --- a/Asset/data/asset/functions/artifact/0019.scriputre/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/trigger/3.main.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0019.scriputre/trigger/3.main +#> asset:artifact/0019.scripture/trigger/3.main # # 神器のメイン処理部 # -# @within function asset:artifact/0019.scriputre/trigger/2.check_condition +# @within function asset:artifact/0019.scripture/trigger/2.check_condition # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/use/mainhand @@ -13,4 +13,4 @@ execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle end_rod ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..10] # SE - playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 20 1 \ No newline at end of file + playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 20 1 diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json index ac8c037634..7afe5db550 100644 --- a/Asset/data/asset/tags/functions/artifact/attack/melee.json +++ b/Asset/data/asset/tags/functions/artifact/attack/melee.json @@ -25,7 +25,7 @@ "asset:artifact/0910.ignite/trigger/1.trigger", "asset:artifact/0077.swords_of_waterfall_climbing/trigger/1.trigger", "asset:artifact/0017.harmful_books/trigger/1.trigger", - "asset:artifact/0019.scriputre/trigger/1.trigger", + "asset:artifact/0019.scripture/trigger/1.trigger", "asset:artifact/0273.tonbo_gaeri/trigger/1.trigger", "asset:artifact/0288.lamentation_sword/trigger/1.trigger", "asset:artifact/0073.suzuran_charm/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 9da6d1a772..eea8cd72d8 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -196,7 +196,7 @@ "asset:artifact/0012.sketchy_herb/give/1.trigger", "asset:artifact/0016.golem_core/give/1.trigger", "asset:artifact/0017.harmful_books/give/1.trigger", - "asset:artifact/0019.scriputre/give/1.trigger", + "asset:artifact/0019.scripture/give/1.trigger", "asset:artifact/0022.amen_ra_rod/give/1.trigger", "asset:artifact/0033.magic_shield/give/1.trigger", "asset:artifact/0035.malleus_maleficarum/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 5c00e187f9..fe53f3e942 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -8,7 +8,7 @@ "asset:artifact/0012.sketchy_herb/register", "asset:artifact/0016.golem_core/register", "asset:artifact/0017.harmful_books/register", - "asset:artifact/0019.scriputre/register", + "asset:artifact/0019.scripture/register", "asset:artifact/0022.amen_ra_rod/register", "asset:artifact/0033.magic_shield/register", "asset:artifact/0035.malleus_maleficarum/register", From f4c43cb64d3c7b064c4041d9274be664d1a4e34b Mon Sep 17 00:00:00 2001 From: Ella Coat <111664173+EllaCoat@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:44:20 +0900 Subject: [PATCH 11/74] =?UTF-8?q?=F0=9F=8D=B1=20[Object2063]=20=E6=B1=8E?= =?UTF-8?q?=E7=94=A8=E5=86=86=E5=BD=A2=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=A2=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=9F?= =?UTF-8?q?=20(#334)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2063.damage_area/_index.d.mcfunction | 6 +++++ .../object/2063.damage_area/init/.mcfunction | 23 +++++++++++++++++++ .../2063.damage_area/register.mcfunction | 20 ++++++++++++++++ .../2063.damage_area/summon/.mcfunction | 8 +++++++ .../2063.damage_area/summon/debug.mcfunction | 10 ++++++++ .../object/2063.damage_area/tick/.mcfunction | 19 +++++++++++++++ .../object/alias/2063/init.mcfunction | 8 +++++++ .../object/alias/2063/register.mcfunction | 8 +++++++ .../object/alias/2063/summon.mcfunction | 8 +++++++ .../object/alias/2063/tick.mcfunction | 8 +++++++ 10 files changed, 118 insertions(+) create mode 100644 Asset/data/asset/functions/object/2063.damage_area/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2063.damage_area/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2063.damage_area/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2063.damage_area/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2063.damage_area/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2063.damage_area/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2063/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2063/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2063/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2063/tick.mcfunction diff --git a/Asset/data/asset/functions/object/2063.damage_area/_index.d.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/_index.d.mcfunction new file mode 100644 index 0000000000..813c03ccfb --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/2063.damage_area/_index.d +# @private + +#> tag +# @within function asset:object/2063.damage_area/** + #declare scoreholder $2063.Temp diff --git a/Asset/data/asset/functions/object/2063.damage_area/init/.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/init/.mcfunction new file mode 100644 index 0000000000..b292266aba --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/init/.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/2063.damage_area/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2063/init + +# 設定項目（FieldOverride） + # Color : エフェクトの色。leather_horse_armorの色であるため、16777215が白。 + # Scale : エフェクトの大きさ。[5f,5f,0.01f]がデフォルト。 + # Tick : 何Tick後にダメージを与えるかを指定する。ただしこのオブジェクトはあくまでも見た目だけなのでダメージ処理は自前で。 + +# 外円にmergeを行う + data modify storage asset:temp 2063.item.tag.display.color set from storage asset:context this.Color + data modify storage asset:temp 2063.transformation.scale set from storage asset:context this.Scale + data modify entity @s {} merge from storage asset:temp 2063 + +# 内円にmergeを先に行っておく + data modify storage asset:temp 2063.interpolation_duration set from storage asset:context this.Tick + data modify storage asset:temp 2063.start_interpolation set value 0 + data modify storage asset:context this.Merge set from storage asset:temp 2063 + +# データリセット + data remove storage asset:temp 2063 diff --git a/Asset/data/asset/functions/object/2063.damage_area/register.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/register.mcfunction new file mode 100644 index 0000000000..bf7ed0dc4a --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2063.damage_area/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2063/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + data modify storage asset:object ExtendsSafe set value true +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 2063 +# フィールド(オプション) + data modify storage asset:object Field.Color set value 0 + data modify storage asset:object Field.Scale set value [5f,5f,0.01f] + data modify storage asset:object Field.Tick set value 20 diff --git a/Asset/data/asset/functions/object/2063.damage_area/summon/.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/summon/.mcfunction new file mode 100644 index 0000000000..705ddaac86 --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2063.damage_area/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2063/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit"],interpolation_duration:0,teleport_duration:1,brightness:{sky:15,block:15},transformation:{left_rotation:[0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0.01f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:0},CustomModelData:20382}},Passengers:[{id:"item_display",Tags:["AllowProcessingCommonTag","AutoKillWhenDieVehicle"],interpolation_duration:1,teleport_duration:1,brightness:{sky:15,block:15},transformation:{left_rotation:[0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.01f,0f],scale:[0f,0f,0.01f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:0},CustomModelData:20383}}}]} diff --git a/Asset/data/asset/functions/object/2063.damage_area/summon/debug.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/summon/debug.mcfunction new file mode 100644 index 0000000000..7fe7740969 --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2063.damage_area/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2063 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2063.damage_area/tick/.mcfunction b/Asset/data/asset/functions/object/2063.damage_area/tick/.mcfunction new file mode 100644 index 0000000000..3ac0bd7e9e --- /dev/null +++ b/Asset/data/asset/functions/object/2063.damage_area/tick/.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/2063.damage_area/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2063/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 拡大を1tick遅らせる + execute if score @s General.Object.Tick matches 2 on passengers run data modify entity @s {} merge from storage asset:context this.Merge + +# データからTickを取り出す + execute store result score $2063.Temp General.Object.Tick run data get storage asset:context this.Tick + scoreboard players add $2063.Temp General.Object.Tick 4 + execute if score $2063.Temp General.Object.Tick <= @s General.Object.Tick run kill @s + +# $2063.Tempのリセット + scoreboard players reset $2063.Temp General.Object.Tick diff --git a/Asset/data/asset/functions/object/alias/2063/init.mcfunction b/Asset/data/asset/functions/object/alias/2063/init.mcfunction new file mode 100644 index 0000000000..05ebaee2f8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2063/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2063/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2063.damage_area/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2063/register.mcfunction b/Asset/data/asset/functions/object/alias/2063/register.mcfunction new file mode 100644 index 0000000000..20d9b23bbd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2063/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2063/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2063.damage_area/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2063/summon.mcfunction b/Asset/data/asset/functions/object/alias/2063/summon.mcfunction new file mode 100644 index 0000000000..0787135e88 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2063/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2063/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2063.damage_area/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2063/tick.mcfunction b/Asset/data/asset/functions/object/alias/2063/tick.mcfunction new file mode 100644 index 0000000000..26f5a5c037 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2063/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2063/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2063.damage_area/tick/ \ No newline at end of file From 1fbc5e325d8ebe489b2b334c2a2f848d5ac4cdec Mon Sep 17 00:00:00 2001 From: yavu <64401500+yavu@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:44:52 +0900 Subject: [PATCH 12/74] =?UTF-8?q?=F0=9F=9A=B8=20=E7=A5=9E=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E5=B7=A6=E5=8F=B3=E3=81=AEobfuscated=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4=20(#343)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../give/2.give.mcfunction | 4 ++-- .../give/2.give.mcfunction | 4 ++-- .../0105.secret_meat/give/2.give.mcfunction | 2 +- .../give/2.give.mcfunction | 2 +- .../give/2.give.mcfunction | 4 ++-- .../0247.heavenly_herb/give/2.give.mcfunction | 4 ++-- .../give/2.give.mcfunction | 4 ++-- .../give/2.give.mcfunction | 4 ++-- .../give/2.give.mcfunction | 4 ++-- .../0454.kinoko/give/2.give.mcfunction | 2 +- .../0455.takenoko/give/2.give.mcfunction | 2 +- .../1037.grand_flame/give/2.give.mcfunction | 22 +++++++++---------- .../give/2.give.mcfunction | 18 +++++++-------- 14 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction index c89b9c2111..d5bcd32c4d 100644 --- a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:apple" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"fruit ","color":"dark_aqua","obfuscated": true},{"text":"叡智の果実","color":"aqua","obfuscated": false},{"text":" tiurf","color":"dark_aqua","obfuscated": true}]' + data modify storage asset:artifact Name set value '[{"text":"叡智の果実","color":"aqua"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"大空の楽園に実る"},{"text":"禁断の果実","color":"light_purple"}]','[{"text":"口にすれば"},{"text":"膨大な魔力","color":"aqua"},{"text":"を得られるが、","color":"white"}]','[{"text":"代償として","color":"white"},{"text":"生命力","color":"light_purple"},{"text":"を失ってしまう。","color":"white"}]'] # MP以外の消費物 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/give/2.give.mcfunction index b83bba4851..cdb7333bd2 100644 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"X","color":"red","bold":true,"obfuscated":true},{"text":"x","color":"blue","obfuscated":true},{"text":"_","color":"gold","obfuscated":true},{"text":"エレメンタルソード","color":"yellow","obfuscated":false},{"text":"_","color":"gold","obfuscated":true},{"text":"x","color":"blue","obfuscated":true},{"text":"X","color":"red","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"エレメンタルソード","color":"yellow","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"攻撃の度に属性の変わる剣"}'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ data modify storage asset:artifact CustomNBT set value {Enchantments:[{}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/give/2.give.mcfunction index e43e934abd..94c04c49c2 100644 --- a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"flying","color":"black","obfuscated":true},{"text":"- 飛竜落としの術 -","color":"yellow","obfuscated":false,"bold":true},{"text":"dragon","color":"black","obfuscated":true,"bold":false}]' + data modify storage asset:artifact Name set value '[{"text":"飛竜落としの術","color":"yellow","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"嘗て天を翔け世界を波乱に貶めた"}]','[{"text":"龍を討ち落としたとされる神器"}]'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0105.secret_meat/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0105.secret_meat/give/2.give.mcfunction index a32c6bc01a..ba18c9dcc0 100644 --- a/Asset/data/asset/functions/artifact/0105.secret_meat/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0105.secret_meat/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:rotten_flesh" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"nazoniku","color":"dark_purple","obfuscated":true},{"text":" 謎肉 ","color":"light_purple","obfuscated":false},{"text":"ukinozan","color":"dark_purple","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"謎肉","color":"light_purple"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"謎に包まれた肉。なんの動物かもわからない。"}]','[{"text":"食べると全回復し、攻撃力とMP回復量が上昇するが"}]','[{"text":"回復を拒むようになる。"}]','[{"text":"また、効果が終わった時には反動を受ける。"}]'] # MP以外の消費物 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/give/2.give.mcfunction index 0ed31a9717..4c01172bdd 100644 --- a/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"4","color":"light_purple","obfuscated":true},{"text":"生命、宇宙、そして万物についての究極の疑問の答え","color":"dark_purple","obfuscated":false},{"text":"2","color":"light_purple","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"生命、宇宙、そして万物についての究極の疑問の答え","color":"light_purple"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"750万年かけて計算した生命、宇宙、そして万物についての","color":"white","italic":false}]','[{"text":"究極の疑問の答えを自身のMPに一定時間代入し続ける。","color":"white","italic":false}]'] # MP以外の消費物 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/give/2.give.mcfunction index 75782ad8d9..b4ea1583b1 100644 --- a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"esrever ","color":"blue","obfuscated":true},{"text":"逆","color":"dark_aqua","obfuscated":false},{"text":"転","color":"aqua","obfuscated":false},{"text":"写","color":"dark_aqua","obfuscated":false},{"text":"魔","color":"aqua","obfuscated":false},{"text":"素","color":"dark_aqua","obfuscated":false},{"text":" reverse","color":"blue","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"逆","color":"dark_aqua"},{"text":"転","color":"aqua"},{"text":"写","color":"dark_aqua"},{"text":"魔","color":"aqua"},{"text":"素","color":"dark_aqua"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"オフハンドの神器の対価を自らの魔力にする"}]'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0247.heavenly_herb/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0247.heavenly_herb/give/2.give.mcfunction index 843b577399..3b4345636f 100644 --- a/Asset/data/asset/functions/artifact/0247.heavenly_herb/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0247.heavenly_herb/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:feather" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"hea ","color":"white","obfuscated":true},{"text":"天国草","color":"yellow","obfuscated":false},{"text":" ven","color":"white","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"天国草","color":"yellow"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"傷を即座に癒す効能があるが、"}','{"text":"5%の確率で昇天してしまう。"}'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0288.lamentation_sword/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0288.lamentation_sword/give/2.give.mcfunction index 97f65ffe46..b876d21f6f 100644 --- a/Asset/data/asset/functions/artifact/0288.lamentation_sword/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0288.lamentation_sword/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"Help","color":"dark_purple","obfuscated":true},{"text":"嘆きの剣","obfuscated":false},{"text":"Help","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"嘆きの剣","color":"dark_purple"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"嘆く狂人を"},{"text":"助","color":"dark_red","bold":true,"obfuscated":true},{"text":"すり潰し、型に流し込んで作ら"},{"text":"け","color":"dark_red","bold":true,"obfuscated":true},{"text":"れた剣。"},{"text":"て","color":"dark_red","bold":true,"obfuscated":true}]','[{"text":"未だに嘆"},{"text":"痛","color":"dark_red","bold":true,"obfuscated":true},{"text":"き続"},{"text":"い","color":"dark_red","bold":true,"obfuscated":true},{"text":"ける"}]'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/give/2.give.mcfunction index 46b8561e60..1c50a38e76 100644 --- a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"r","obfuscated":true,"color":"green"},{"text":"a","color":"aqua"},{"text":"i","color":"dark_aqua"},{"text":"n","color":"blue"},{"text":"b","color":"dark_purple"},{"text":"o","color":"gold"},{"text":"w","color":"yellow"},{"text":" 極虹の水晶 ","color":"light_purple","obfuscated":false},{"text":"c","obfuscated":true,"color":"yellow"},{"text":"r","color":"gold"},{"text":"y","color":"dark_purple"},{"text":"s","color":"blue"},{"text":"t","color":"dark_aqua"},{"text":"a","color":"aqua"},{"text":"l","color":"green"}]' + data modify storage asset:artifact Name set value '[{"text":"極虹の水晶","color":"light_purple"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"潤いと七色の輝きに満ちた結晶"}]','[{"text":"§2§o翠の魂§r§oは§b§o水§r§oに謡い"}]','[{"text":"§b§o蒼き水§r§oは§4§o焔§r§oを鎮める"}]','[{"text":"§4§o紅き焔§r§oは§6§o稲妻§r§oを焦し"}]','[{"text":"§6§o金の雷§r§oは§2§o草木§r§oに光を齎す"}]'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/give/2.give.mcfunction index 0cdaa2a2d9..f4e3b26f2b 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"天","obfuscated":true,"color":"blue"},{"text":" 天鍵杖 ","obfuscated":false,"color":"aqua"},{"text":"鍵","obfuscated":true,"color":"blue"}]' + data modify storage asset:artifact Name set value '[{"text":"天鍵杖","color":"aqua"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"天候を固定し、その力を授かる。"}','{"text":"時雨 驟雨 零雨 五月","color":"gray"}','{"text":"淡雪 霙 野分に唄え","color":"gray"}','{"text":"東風 南風 北風 西風","color":"gray"}','{"text":"夜風を散らし 晴嵐に舞え","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction index 1197557462..3c471c0365 100644 --- a/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0454.kinoko/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:cooked_beef" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"kinoko","color":"yellow","obfuscated":true,"bold":true},{"text":" きのこの山 ","color":"gold","obfuscated":false},{"text":"umauma","color":"yellow","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"きのこの山","color":"gold","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"持ちやすい。しかもうまい！"}]'] # MP以外の消費物 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction index d9e0aa8033..54135a4529 100644 --- a/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0455.takenoko/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:cooked_chicken" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"tknoko","color":"dark_green","obfuscated":true,"bold":true},{"text":" たけのこの里 ","color":"green","obfuscated":false},{"text":"umauma","color":"dark_green","obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"たけのこの里","color":"green","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['[{"text":"食べやすい。しかもうまい！"}]'] # MP以外の消費物 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/1037.grand_flame/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1037.grand_flame/give/2.give.mcfunction index 65cd052b81..853f7db9be 100644 --- a/Asset/data/asset/functions/artifact/1037.grand_flame/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1037.grand_flame/give/2.give.mcfunction @@ -13,19 +13,19 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"T","color":"#3B0E09","bold":true,"obfuscated":true},{"text":"S","color":"#6B1910","bold":true,"obfuscated":true},{"text":"B","color":"#992417","bold":true,"obfuscated":true},{"text":"グランド・フレイム","color":"#e23724","bold":true,"obfuscated":false},{"text":"B","color":"#992417","bold":true,"obfuscated":true},{"text":"S","color":"#6B1910","bold":true,"obfuscated":true},{"text":"T","color":"#3B0E09","bold":true,"obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"グランド・フレイム","color":"#e23724","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"その杖の先から放たれる灼熱の炎は","color":"#FFAB03"}','{"text":"歯向かう者すべてを焼き尽くすだろう","color":"#FFAB03"}','{"text":"自身のHPが多いほど相手に与えるダメージが増える","color":"white"}'] # MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value + # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value + # data modify storage asset:artifact RemainingCount set value # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "auto" # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 660 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -33,27 +33,27 @@ # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.ElementType set value [Fire] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value + # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value 5 -# MP消費量 (int) +# MP消費量 (int) data modify storage asset:artifact MPCost set value 30 # MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value + # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) data modify storage asset:artifact LocalCooldown set value 75 # グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value + # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value + # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + # data modify storage asset:artifact DisableMPMessage set value # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban","Nyaptov"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1045.mini_black_hole/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1045.mini_black_hole/give/2.give.mcfunction index 5a1c61a593..9ba1ae2245 100644 --- a/Asset/data/asset/functions/artifact/1045.mini_black_hole/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1045.mini_black_hole/give/2.give.mcfunction @@ -13,11 +13,11 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"T","color":"#32004F","bold":true,"obfuscated":true},{"text":"S","color":"#59008C","bold":true,"obfuscated":true},{"text":"B","color":"#7E00C7","bold":true,"obfuscated":true},{"text":"ブラックホール・ミニ","color":"#A100FF","bold":true,"obfuscated":false},{"text":"B","color":"#7E00C7","bold":true,"obfuscated":true},{"text":"S","color":"#59008C","bold":true,"obfuscated":true},{"text":"T","color":"#32004F","bold":true,"obfuscated":true}]' + data modify storage asset:artifact Name set value '[{"text":"ブラックホール・ミニ","color":"#A100FF","bold":true}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"小さな紫の弾を前方に発射する","color":"white","italic":false}','{"text":"弾は着弾した瞬間にブラックホールを生み出し、","color":"white","italic":false}','{"text":"周囲の敵を無慈悲に吸い込む","color":"white","italic":false}','{"text":"宇宙の破壊力に叶うものはいないだろうに","color":"#B973FF","italic":false}'] # MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value + # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) data modify storage asset:artifact RemainingCount set value 66 # 神器を発動できるスロット (string) Wikiを参照 @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 125 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -38,22 +38,22 @@ data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value 7 -# MP消費量 (int) +# MP消費量 (int) data modify storage asset:artifact MPCost set value 100 # MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value + # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) data modify storage asset:artifact LocalCooldown set value 400 # グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value + # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value + # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + # data modify storage asset:artifact DisableMPMessage set value # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Nyaptov","Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give From fa7d4917455619679a1cca765d114c5710e24838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:07:59 +0900 Subject: [PATCH 13/74] =?UTF-8?q?=F0=9F=90=9B=20[=E7=A5=9E=E5=99=A8822]=20?= =?UTF-8?q?=E6=98=9F=E3=81=AE=E9=9F=B3=E3=81=AELore=E3=81=AEtrue=E3=81=AE?= =?UTF-8?q?=E3=83=80=E3=83=96=E3=83=AB=E3=82=AF=E3=82=A9=E3=83=BC=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=20(#348)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0822.sound_of_a_star/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0822.sound_of_a_star/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0822.sound_of_a_star/give/2.give.mcfunction index b81d07f501..dd41330ebe 100644 --- a/Asset/data/asset/functions/artifact/0822.sound_of_a_star/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0822.sound_of_a_star/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"星の音","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"前方に星を発射する。","color":"gray"}]','[{"text":"使用時のMPの割合により、","color":"gray"}]','[{"text":"発射する星の数が変化する。","color":"gray"}]','[{"text":"「やがて星となって再会しよう。」","color":"gray","italic":"true"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"前方に星を発射する。","color":"gray"}]','[{"text":"使用時のMPの割合により、","color":"gray"}]','[{"text":"発射する星の数が変化する。","color":"gray"}]','[{"text":"「やがて星となって再会しよう。」","color":"gray","italic":true}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give From c788ec3d10cdc3b32dc8abe1f7333ec5d8cdde61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 12 Nov 2024 10:52:21 +0000 Subject: [PATCH 14/74] Update Declares from ProjectTSB/TheSkyBlessing@714db8184605faac0f874256cb2990272275a06c [regenerate cache] --- .../minecraft/functions/declares.d.mcfunction | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 4ce41e4a09..3624d09160 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -288,15 +288,15 @@ #declare function score_to_health:restore from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/ScoreToHealth/data/score_to_health/functions/restore.mcfunction#L1 #declare function world_manager:gimmick/ending_portal/open from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/world_manager/functions/gimmick/ending_portal/open.mcfunction#L1 #declare item_modifier lib:break_item from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/item_modifiers/break_item.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/attack_info from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/attack_info.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/condition from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/condition.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/cooldown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/cooldown.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/cost_item from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/cost_item.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/god from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/god.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/mp_cost from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/mp_cost.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/mp_require from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/mp_require.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/special_cooldown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/special_cooldown.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/trigger from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/trigger.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/0.trigger from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/0.trigger.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/1.condition from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/1.condition.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/2.attack_info from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/2.attack_info.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/3.mp_require from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/3.mp_require.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/4.mp_cost from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/4.mp_cost.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/5.cost_item from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/5.cost_item.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/6.cooldown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/6.cooldown.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/6.cooldown_duration from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/6.cooldown_duration.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/7.god from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/7.god.json#L1 #declare loot_table asset_manager:artifact/get_lore from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/get_lore.json#L1 #declare loot_table asset_manager:artifact/get_name/ from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/get_name/.json#L1 #declare loot_table asset_manager:artifact/get_name/has_remain from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/get_name/has_remain.json#L1 @@ -323,15 +323,15 @@ #declare loot_table minecraft:blocks/stone from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/blocks/stone.json#L1 #declare loot_table minecraft:empty from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/empty.json#L1 #declare loot_table player_manager:lost_item/give_all/name_to_textcomponent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/loot_tables/lost_item/give_all/name_to_textcomponent.json#L1 - #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L120 - #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L105 - #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L228 - #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L162 - #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L161 - #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L126 - #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L176 - #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L101 - #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L125 + #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L126 + #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L111 + #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L234 + #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L168 + #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L167 + #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L132 + #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L182 + #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L107 + #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L131 #declare predicate api:area/is_breakable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/area/is_breakable.json#L1 #declare predicate api:global_vars/difficulty/easy from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json#L1 #declare predicate api:global_vars/difficulty/hard from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json#L1 @@ -698,7 +698,7 @@ #declare tag/item lib:pickaxes/level-4-mineable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/pickaxes/level-4-mineable.json#L1 #declare tag/item lib:potions from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/potions.json#L1 #declare tag/item lib:usable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/usable.json#L1 - #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L93 + #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L99 #> declare # @within function asset:artifact/*/*/2.check_condition @@ -1036,8 +1036,8 @@ #> declare # @within function asset:object/** -#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L181 +#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L187 #> declare # @within function asset:mob/** -#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L186 +#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L192 From 098927ea317ba6b358aea9d1f084baaa3711385b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 14 Nov 2024 13:51:05 +0000 Subject: [PATCH 15/74] Update Declares from ProjectTSB/TheSkyBlessing@9821e44c740a3cdd2d9c1bffe2eed9cc880578b0 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 3624d09160..a8dc053578 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -293,9 +293,10 @@ #declare loot_table asset_manager:artifact/generate_lore/2.attack_info from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/2.attack_info.json#L1 #declare loot_table asset_manager:artifact/generate_lore/3.mp_require from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/3.mp_require.json#L1 #declare loot_table asset_manager:artifact/generate_lore/4.mp_cost from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/4.mp_cost.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/5.cost_item from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/5.cost_item.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/6.cooldown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/6.cooldown.json#L1 - #declare loot_table asset_manager:artifact/generate_lore/6.cooldown_duration from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/6.cooldown_duration.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/5.mp_heal_when_hit from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/5.mp_heal_when_hit.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/6.cost_item from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/6.cost_item.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/7.cooldown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/7.cooldown.json#L1 + #declare loot_table asset_manager:artifact/generate_lore/7.cooldown_duration from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/7.cooldown_duration.json#L1 #declare loot_table asset_manager:artifact/generate_lore/7.god from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/generate_lore/7.god.json#L1 #declare loot_table asset_manager:artifact/get_lore from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/get_lore.json#L1 #declare loot_table asset_manager:artifact/get_name/ from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/loot_tables/artifact/get_name/.json#L1 From 7f740efd41f9574423ba465f0481dc35e17a34cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:28:15 +0900 Subject: [PATCH 16/74] =?UTF-8?q?=F0=9F=A9=B9=20[=E7=A5=9E=E5=99=A81043]?= =?UTF-8?q?=20=E3=82=AC=E3=83=B3=E3=83=9E=E3=83=AC=E3=82=A4=E3=81=AE?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E5=87=A6=E7=90=86=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#355)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1043.gamma_ray/trigger/6.cast.mcfunction | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.cast.mcfunction b/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.cast.mcfunction index 6f58995585..a826afc2ba 100644 --- a/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.cast.mcfunction +++ b/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.cast.mcfunction @@ -19,14 +19,15 @@ scoreboard players operation $SZ.Damage Temporary = @s SZ.CastTick scoreboard players operation $SZ.Damage Temporary *= @s SZ.CastTick scoreboard players operation $SZ.Damage Temporary /= $5 Const - execute store result storage lib: Argument.Damage float 1 run scoreboard players operation $SZ.Damage Temporary += $200 Const + execute store result storage api: Argument.Damage float 1 run scoreboard players operation $SZ.Damage Temporary += $200 Const # ダメージ - data modify storage lib: Argument.AttackType set value "Magic" - data modify storage lib: Argument.ElementType set value "None" - function lib:damage/modifier - execute as @e[tag=SZ.Landing,distance=..28] run function lib:damage/ - + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + function api:damage/modifier + execute as @e[type=#lib:living,tag=SZ.Landing,distance=..28] run function api:damage/ + function api:damage/reset + # 演出 execute if score @s SZ.CastTick matches 0..20 anchored eyes run function asset:artifact/1043.gamma_ray/trigger/cast_vfx/1 execute if score @s SZ.CastTick matches 21..40 anchored eyes run function asset:artifact/1043.gamma_ray/trigger/cast_vfx/2 @@ -45,7 +46,7 @@ execute if score @s SZ.CastTick matches 101.. anchored eyes run playsound entity.warden.sonic_boom player @a[distance=..32] ~ ~ ~ 1 1.99 # リセット - function lib:damage/reset tag @s remove SZ.Cast tag @e[tag=SZ.Landing,distance=..28] remove SZ.Landing - scoreboard players reset @s SZ.CastTick \ No newline at end of file + scoreboard players reset @s SZ.CastTick + scoreboard players reset $SZ.Damage Temporary From bf026fa4d7d0d60c8c8a56baecec28f5dfe1f504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:34:10 +0900 Subject: [PATCH 17/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[Mob124=20&=20182]?= =?UTF-8?q?=20=E3=82=B9=E3=82=AB=E3=83=AB=E3=83=8F=E3=83=BC=E3=83=94?= =?UTF-8?q?=E3=82=A3=20&=20=E3=83=AC=E3=82=A4=E3=83=96=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E8=AB=B8=E3=80=85=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0124.skull_harpy/attack/.mcfunction | 19 +++++--------- .../mob/0124.skull_harpy/hurt/.mcfunction | 17 ++++++------ .../0124.skull_harpy/hurt/escape.mcfunction | 19 ++++++++++++++ .../{0.load.mcfunction => load.mcfunction} | 4 +-- .../mob/0124.skull_harpy/tick/.mcfunction | 4 +-- ....1.motion.mcfunction => motion.mcfunction} | 4 +-- .../mob/0182.skull_raven/attack/.mcfunction | 26 +++++++------------ .../mob/0182.skull_raven/hurt/.mcfunction | 11 ++++++-- ...knockback.mcfunction => escape.mcfunction} | 8 +++--- .../{0.load.mcfunction => load.mcfunction} | 4 +-- .../mob/0182.skull_raven/tick/.mcfunction | 4 +-- ...{3.motion.mcfunction => motion.mcfunction} | 4 +-- Asset/data/asset/tags/functions/mob/load.json | 4 +-- 13 files changed, 69 insertions(+), 59 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0124.skull_harpy/hurt/escape.mcfunction rename Asset/data/asset/functions/mob/0124.skull_harpy/{0.load.mcfunction => load.mcfunction} (66%) rename Asset/data/asset/functions/mob/0124.skull_harpy/tick/{2.1.motion.mcfunction => motion.mcfunction} (91%) rename Asset/data/asset/functions/mob/0182.skull_raven/hurt/{knockback.mcfunction => escape.mcfunction} (71%) rename Asset/data/asset/functions/mob/0182.skull_raven/{0.load.mcfunction => load.mcfunction} (66%) rename Asset/data/asset/functions/mob/0182.skull_raven/tick/{3.motion.mcfunction => motion.mcfunction} (91%) diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/attack/.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/attack/.mcfunction index 4e9baef3e3..3b88cb39b5 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/attack/.mcfunction @@ -7,7 +7,6 @@ # バニラの攻撃じゃなかったら return execute unless data storage asset:context Attack{IsVanilla:true} run return fail - # 演出 execute at @p[tag=Victim] run particle minecraft:dust 1 1 0 2 ~ ~ ~ 0.8 0.8 0.8 0.1 20 normal @a execute at @p[tag=Victim] run playsound minecraft:entity.firework_rocket.twinkle hostile @a ~ ~ ~ 0.7 1.5 0 @@ -16,15 +15,9 @@ execute if predicate api:global_vars/difficulty/min/hard at @p[tag=Victim,distance=..60] run summon area_effect_cloud ~ ~ ~ {Particle:"cloud",Radius:0.5f,Duration:6,Age:4,effects:[{id:"levitation",amplifier:10b,duration:5,show_particles:1b}]} # 引数の設定 - # 与えるダメージ - data modify storage lib: Argument.Damage set value 8.0d - # 第一属性 - data modify storage lib: Argument.AttackType set value "Magic" - # 第二属性 - data modify storage lib: Argument.ElementType set value "Thunder" -# 補正functionを実行 - function lib:damage/modifier -# ダメージ対象 - execute as @p[tag=Victim] run function lib:damage/ -# リセット - function lib:damage/reset + data modify storage api: Argument.Damage set value 8.0d + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Thunder" + function api:damage/modifier + execute as @p[tag=Victim] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/.mcfunction index f1c795fcc8..75cac5611b 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/.mcfunction @@ -4,13 +4,12 @@ # # @within function asset:mob/alias/124/hurt -# 演出 - particle minecraft:cloud ~ ~1 ~ 0 0 0 0.4 20 - playsound entity.ender_dragon.flap hostile @a ~ ~ ~ 1 1.3 +#> Private +# @private + #declare score_holder $Cooldown -# プレイヤーから離れる - data modify storage lib: Argument.VectorMagnitude set value 1 - execute facing entity @p eyes rotated ~180 -10 run function lib:motion/ - -# リセット - data remove storage lib: Argument +# 最後に被ダメしたTickから50Tick経っていれば逃げる + execute store result score $Cooldown Temporary run time query gametime + scoreboard players operation $Cooldown Temporary -= @s 3G.LatestEscapeTick + execute if score $Cooldown Temporary matches 50.. run function asset:mob/0124.skull_harpy/hurt/escape + scoreboard players reset $Cooldown Temporary diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/escape.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/escape.mcfunction new file mode 100644 index 0000000000..5d0851d667 --- /dev/null +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/hurt/escape.mcfunction @@ -0,0 +1,19 @@ +#> asset:mob/0124.skull_harpy/hurt/escape +# +# 逃げる +# +# @within function asset:mob/0124.skull_harpy/hurt/ + +# 演出 + particle minecraft:cloud ~ ~1 ~ 0 0 0 0.4 20 + playsound entity.ender_dragon.flap hostile @a ~ ~ ~ 1 1.3 + +# 最後に逃げたTickを保存 + execute store result score @s 3G.LatestEscapeTick run time query gametime + +# プレイヤーから離れる + data modify storage lib: Argument.VectorMagnitude set value 1 + execute facing entity @p[tag=Attacker] eyes rotated ~180 -10 run function lib:motion/ + +# リセット + data remove storage lib: Argument diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/0.load.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/load.mcfunction similarity index 66% rename from Asset/data/asset/functions/mob/0124.skull_harpy/0.load.mcfunction rename to Asset/data/asset/functions/mob/0124.skull_harpy/load.mcfunction index c5747a7dbc..a93f3e750c 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/0.load.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/load.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0124.skull_harpy/0.load +#> asset:mob/0124.skull_harpy/load # # MOBに利用するスコアボード等の初期化処理 # @@ -6,4 +6,4 @@ #> 定義類はここに # @within function asset:mob/0124.skull_harpy/** - scoreboard objectives add 3G.Tick dummy + scoreboard objectives add 3G.LatestEscapeTick dummy diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/tick/.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/tick/.mcfunction index 5d588f2ee6..06e22cffdf 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/tick/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/alias/124/tick # スコア付与 - scoreboard players add @s 3G.Tick 1 + scoreboard players add @s General.Mob.Tick 1 # 周囲にプレイヤーがいる時、80tickに一度実行する - execute if score @s 3G.Tick matches 80.. if entity @a[gamemode=!spectator,distance=..32] run function asset:mob/0124.skull_harpy/tick/2.1.motion + execute if score @s General.Mob.Tick matches 80.. if entity @a[gamemode=!spectator,distance=..32] run function asset:mob/0124.skull_harpy/tick/motion diff --git a/Asset/data/asset/functions/mob/0124.skull_harpy/tick/2.1.motion.mcfunction b/Asset/data/asset/functions/mob/0124.skull_harpy/tick/motion.mcfunction similarity index 91% rename from Asset/data/asset/functions/mob/0124.skull_harpy/tick/2.1.motion.mcfunction rename to Asset/data/asset/functions/mob/0124.skull_harpy/tick/motion.mcfunction index 0334db0952..6937dcf817 100644 --- a/Asset/data/asset/functions/mob/0124.skull_harpy/tick/2.1.motion.mcfunction +++ b/Asset/data/asset/functions/mob/0124.skull_harpy/tick/motion.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0124.skull_harpy/tick/2.1.motion +#> asset:mob/0124.skull_harpy/tick/motion # # # @@ -29,4 +29,4 @@ # タグを消す tag @a remove Target # スコアを消す - scoreboard players reset @s 3G.Tick + scoreboard players reset @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/attack/.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/attack/.mcfunction index ad2e33e46c..b45fa0f2d0 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/attack/.mcfunction @@ -7,7 +7,6 @@ # バニラの攻撃じゃなかったら return execute unless data storage asset:context Attack{IsVanilla:true} run return fail - # 演出 execute at @p[tag=Victim,distance=..60] run particle minecraft:lava ~ ~0.5 ~ 0.8 0.8 0.8 0.1 20 normal @p execute at @p[tag=Victim,distance=..60] run playsound minecraft:entity.blaze.shoot hostile @a ~ ~ ~ 0.8 0.8 0 @@ -15,19 +14,12 @@ # ハードなら打ち上げ execute if predicate api:global_vars/difficulty/min/hard at @p[tag=Victim,distance=..60] run summon area_effect_cloud ~ ~ ~ {Particle:"cloud",Radius:0.5f,Duration:6,Age:4,effects:[{id:"levitation",amplifier:20b,duration:5,show_particles:1b}]} -# 引数の設定 - # 与えるダメージ - data modify storage lib: Argument.Damage set value 16.0d - # 第一属性 - data modify storage lib: Argument.AttackType set value "Physical" - # 第二属性 - data modify storage lib: Argument.ElementType set value "Fire" -# デスログ - data modify storage lib: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって燃え尽き、灰となった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - data modify storage lib: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって魂諸共焼失した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' -# 補正functionを実行 - function lib:damage/modifier -# ダメージ対象 - execute as @p[tag=Victim,distance=..60] run function lib:damage/ -# リセット - function lib:damage/reset +# ダメージ + data modify storage api: Argument.Damage set value 16.0d + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Fire" + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって燃え尽き、灰となった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって魂諸共焼失した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + function api:damage/modifier + execute as @p[tag=Victim,distance=..60] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/hurt/.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/hurt/.mcfunction index 8ba7186f89..00d8c64766 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/hurt/.mcfunction @@ -4,5 +4,12 @@ # # @within function asset:mob/alias/182/hurt -# ハードかつ30%の確率でプレイヤーから離れる - execute if predicate api:global_vars/difficulty/min/hard if predicate lib:random_pass_per/30 run function asset:mob/0182.skull_raven/hurt/knockback +#> Private +# @private + #declare score_holder $Cooldown + +# 最後に被ダメしたTickから50Tick経っていれば逃げる + execute store result score $Cooldown Temporary run time query gametime + scoreboard players operation $Cooldown Temporary -= @s 52.LatestEscapeTick + execute if score $Cooldown Temporary matches 50.. run function asset:mob/0182.skull_raven/hurt/escape + scoreboard players reset $Cooldown Temporary diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/hurt/knockback.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/hurt/escape.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0182.skull_raven/hurt/knockback.mcfunction rename to Asset/data/asset/functions/mob/0182.skull_raven/hurt/escape.mcfunction index def2b3e133..a79b744bb7 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/hurt/knockback.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/hurt/escape.mcfunction @@ -1,6 +1,6 @@ -#> asset:mob/0182.skull_raven/hurt/knockback -# +#> asset:mob/0182.skull_raven/hurt/escape # +# 逃げる # # @within function asset:mob/0182.skull_raven/hurt/ @@ -8,8 +8,8 @@ particle minecraft:cloud ~ ~1 ~ 0 0 0 0.4 20 playsound entity.ender_dragon.flap hostile @a ~ ~ ~ 1 0.4 0 -# 浮遊を自分に付与 - effect give @s levitation 1 8 true +# 最後に逃げたTickを保存 + execute store result score @s 52.LatestEscapeTick run time query gametime # プレイヤーから離れる data modify storage lib: Argument.VectorMagnitude set value 1.5 diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/0.load.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/load.mcfunction similarity index 66% rename from Asset/data/asset/functions/mob/0182.skull_raven/0.load.mcfunction rename to Asset/data/asset/functions/mob/0182.skull_raven/load.mcfunction index 8a187f5966..549ebf8e40 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/0.load.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/load.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0182.skull_raven/0.load +#> asset:mob/0182.skull_raven/load # # MOBに利用するスコアボード等の初期化処理 # @@ -6,4 +6,4 @@ #> 定義類はここに # @within function asset:mob/0182.skull_raven/** - scoreboard objectives add 52.Tick dummy + scoreboard objectives add 52.LatestEscapeTick dummy diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/tick/.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/tick/.mcfunction index 5d814a7f4f..4d01ea6434 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/tick/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/alias/182/tick # スコア付与 - scoreboard players add @s 52.Tick 1 + scoreboard players add @s General.Mob.Tick 1 # 周囲にプレイヤーがいる時、50tickに一度実行する - execute if score @s 52.Tick matches 50.. if entity @a[gamemode=!spectator,distance=..32] run function asset:mob/0182.skull_raven/tick/3.motion + execute if score @s General.Mob.Tick matches 50.. if entity @a[gamemode=!spectator,distance=..32] run function asset:mob/0182.skull_raven/tick/motion diff --git a/Asset/data/asset/functions/mob/0182.skull_raven/tick/3.motion.mcfunction b/Asset/data/asset/functions/mob/0182.skull_raven/tick/motion.mcfunction similarity index 91% rename from Asset/data/asset/functions/mob/0182.skull_raven/tick/3.motion.mcfunction rename to Asset/data/asset/functions/mob/0182.skull_raven/tick/motion.mcfunction index 5df13f333e..bbd2006ccb 100644 --- a/Asset/data/asset/functions/mob/0182.skull_raven/tick/3.motion.mcfunction +++ b/Asset/data/asset/functions/mob/0182.skull_raven/tick/motion.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0182.skull_raven/tick/3.motion +#> asset:mob/0182.skull_raven/tick/motion # # # @@ -29,4 +29,4 @@ # タグを消す tag @a remove Target # スコアリセット - scoreboard players reset @s 52.Tick + scoreboard players reset @s General.Mob.Tick diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index 8d1aa45c2c..c7877581e0 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -74,7 +74,7 @@ "asset:mob/0175.queen_bee/0.load", "asset:mob/0115.jewel_bullet/0.load", "asset:mob/0065.night_shadow/0.load", - "asset:mob/0124.skull_harpy/0.load", + "asset:mob/0124.skull_harpy/load", "asset:mob/0129.lexiel/0.load", "asset:mob/0092.red_rose/0.load", "asset:mob/0073.clutch_spider/0.load", @@ -88,7 +88,7 @@ "asset:mob/0191.thunder_magic/0.load", "asset:mob/0185.tutankhamen/0.load", "asset:mob/0156.infringement/0.load", - "asset:mob/0182.skull_raven/0.load", + "asset:mob/0182.skull_raven/load", "asset:mob/0081.snow_cloud/0.load", "asset:mob/0059.jack_o_lantern/0.load", "asset:mob/0139.blast_eye/0.load" From be479088f734ae0448abd06ba719a944a69f7f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:34:54 +0900 Subject: [PATCH 18/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A82?= =?UTF-8?q?17]=20=E3=81=8A=E3=81=95=E3=81=8B=E3=81=AA=E3=81=AE=E5=9B=9E?= =?UTF-8?q?=E5=BE=A9=E9=87=8F=E3=82=92=E8=AA=BF=E6=95=B4=20(#345)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0217.fish/trigger/3.main.mcfunction | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0217.fish/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0217.fish/trigger/3.main.mcfunction index 47aabfb600..42cff9e130 100644 --- a/Asset/data/asset/functions/artifact/0217.fish/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0217.fish/trigger/3.main.mcfunction @@ -9,14 +9,16 @@ # ここから先は神器側の効果の処理を書く -# 回復する量 = 全回復 - data modify storage lib: Argument.Heal set value 10000f -# 実行者対象 - function lib:heal/modifier - function lib:heal/ -# リセット - function lib:heal/reset +# 最大体力を取得 + function api:modifier/max_health/get + +# 最大体力だけ固定回復 + data modify storage api: Argument.Heal set from storage api: Return.MaxHealth + data modify storage api: Argument.FixedHeal set value true + function api:heal/modifier + function api:heal/ + function api:heal/reset # 演出 execute at @s run playsound entity.cat.ambient player @a[distance=..10] ~ ~ ~ 3 1 - execute at @s run tellraw @a[distance=..10] {"text":"ネコの気配を感じる……？","color":"white"} \ No newline at end of file + execute at @s run tellraw @a[distance=..10] {"text":"ネコの気配を感じる……？","color":"white"} From 272fe854ac1faab567367640a79cf9e5935dbecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:37:24 +0900 Subject: [PATCH 19/74] =?UTF-8?q?=F0=9F=9A=B8=20[=E7=A5=9E=E5=99=A873]=20?= =?UTF-8?q?=E3=82=B9=E3=82=BA=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?= =?UTF-8?q?=E3=83=A0=E3=81=AE=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC=E8=AA=AC?= =?UTF-8?q?=E6=98=8E=E3=82=92=E4=BF=AE=E6=AD=A3=20(#316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0073.suzuran_charm/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction index 8df329d51f..a1db6707a5 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "mainhand" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onAttack" + data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) @@ -56,4 +56,4 @@ data modify storage asset:artifact CustomNBT set value {HideFlags:6,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0,Operation:0,UUID:[I;1,1,73,1],Slot:"mainhand"},{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I;1,1,73,1]}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give From 5174c123682b41b980a4dae4a75b50f99dad69ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:37:57 +0900 Subject: [PATCH 20/74] =?UTF-8?q?=F0=9F=A9=B9=20[=E7=A5=9E=E5=99=A8730]=20?= =?UTF-8?q?=E6=B9=96=E9=8F=A1=E6=98=A0=E5=A4=A9=E3=81=8Cgive.json=E3=81=AB?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#315)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Asset/data/asset/tags/functions/artifact/give.json | 1 + 1 file changed, 1 insertion(+) diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index eea8cd72d8..bdfb4b226f 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/0730.lake_reflecting_starry_sky/give/1.trigger", "asset:artifact/0002.blessing/give/1.trigger", "asset:artifact/1108.white_lily_of_priestess/give/1.trigger", "asset:artifact/1106.rainbow_candy/give/1.trigger", From 5ffdae0a20a5a87ab3182a27d0740bc67587d15a Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:42:06 +0900 Subject: [PATCH 21/74] =?UTF-8?q?:bug:=20[=E7=A5=9E=E5=99=A857]=20?= =?UTF-8?q?=E3=82=A8=E3=83=AC=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=AB=E3=82=BD?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=AE=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E8=A3=9C=E6=AD=A3=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#287)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> --- .../trigger/3.1.fireattack.mcfunction | 23 ----------------- .../trigger/3.2.waterattack.mcfunction | 25 ------------------- .../trigger/3.3.thunderattack.mcfunction | 23 ----------------- .../trigger/3.main.mcfunction | 25 ++++++++++++++----- .../trigger/vfx/fire.mcfunction | 9 +++++++ .../trigger/vfx/thunder.mcfunction | 9 +++++++ .../trigger/vfx/water.mcfunction | 11 ++++++++ 7 files changed, 48 insertions(+), 77 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.1.fireattack.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.2.waterattack.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.3.thunderattack.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/fire.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/thunder.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/water.mcfunction diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.1.fireattack.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.1.fireattack.mcfunction deleted file mode 100644 index d90052c5e5..0000000000 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.1.fireattack.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0057.elemental_sword/trigger/3.1.fireattack -# -# 火属性 -# -# @within function asset:artifact/0057.elemental_sword/trigger/3.main - - -# 演出 - particle minecraft:flame ~ ~0.5 ~ 0 0.5 0 0.1 100 - playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.6 - -# ダメージ設定 - # 与えるダメージ = 30 - data modify storage lib: Argument.Damage set value 80.0f - # 第一属性 - data modify storage lib: Argument.AttackType set value "Physical" - # 第二属性 - data modify storage lib: Argument.ElementType set value "Fire" - # ダメージ - function lib:damage/modifier - function lib:damage/ -# リセット - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.2.waterattack.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.2.waterattack.mcfunction deleted file mode 100644 index 5847724fa9..0000000000 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.2.waterattack.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -#> asset:artifact/0057.elemental_sword/trigger/3.2.waterattack -# -# 水属性 -# -# @within function asset:artifact/0057.elemental_sword/trigger/3.main - - -# 演出 - particle minecraft:falling_water ~ ~1 ~ 0.4 1 0.4 1 100 - particle minecraft:bubble_pop ~ ~0.5 ~ 0 0 0 0.2 100 - playsound minecraft:item.bucket.fill player @a ~ ~ ~ 1 1 - playsound minecraft:entity.generic.swim player @a ~ ~ ~ 1 1 - -# ダメージ設定 - # 与えるダメージ = 30 - data modify storage lib: Argument.Damage set value 80.0f - # 第一属性 - data modify storage lib: Argument.AttackType set value "Physical" - # 第二属性 - data modify storage lib: Argument.ElementType set value "Water" - # ダメージ - function lib:damage/modifier - function lib:damage/ -# リセット - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.3.thunderattack.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.3.thunderattack.mcfunction deleted file mode 100644 index e5ef252644..0000000000 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.3.thunderattack.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0057.elemental_sword/trigger/3.3.thunderattack -# -# 雷属性 -# -# @within function asset:artifact/0057.elemental_sword/trigger/3.main - - - # 演出 - particle crit ~ ~3 ~ 0.025 3 0.025 0 100 normal @a - playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 - -# ダメージ設定 - # 与えるダメージ = 30 - data modify storage lib: Argument.Damage set value 80.0f - # 第一属性 - data modify storage lib: Argument.AttackType set value "Physical" - # 第二属性 - data modify storage lib: Argument.ElementType set value "Thunder" - # ダメージ - function lib:damage/modifier - function lib:damage/ -# リセット - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.main.mcfunction index 8e856c3af3..5796116bac 100644 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/3.main.mcfunction @@ -3,6 +3,7 @@ # 神器のメイン処理部 # # @within function asset:artifact/0057.elemental_sword/trigger/2.check_condition + #> private # @private #declare score_holder $ElementalSwordAttack @@ -17,9 +18,21 @@ execute store result score $ElementalSwordAttack Temporary run data get storage asset:context Items.mainhand.tag.TSB.RemainingCount # 使用回数を3で剰余算 scoreboard players operation $ElementalSwordAttack Temporary %= $3 Const - # 属性を変える - execute if score $ElementalSwordAttack Temporary matches 0 as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run function asset:artifact/0057.elemental_sword/trigger/3.1.fireattack - execute if score $ElementalSwordAttack Temporary matches 1 as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run function asset:artifact/0057.elemental_sword/trigger/3.2.waterattack - execute if score $ElementalSwordAttack Temporary matches 2 as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run function asset:artifact/0057.elemental_sword/trigger/3.3.thunderattack - # リセット - scoreboard players reset $ElementalSwordAttack Temporary \ No newline at end of file + +# 属性それぞれの演出 + execute if score $ElementalSwordAttack Temporary matches 0 at @e[type=#lib:living,tag=Victim,distance=..10] run function asset:artifact/0057.elemental_sword/trigger/vfx/fire + execute if score $ElementalSwordAttack Temporary matches 1 at @e[type=#lib:living,tag=Victim,distance=..10] run function asset:artifact/0057.elemental_sword/trigger/vfx/water + execute if score $ElementalSwordAttack Temporary matches 2 at @e[type=#lib:living,tag=Victim,distance=..10] run function asset:artifact/0057.elemental_sword/trigger/vfx/thunder + +# ダメージ + data modify storage api: Argument.Damage set value 80.0f + data modify storage api: Argument.AttackType set value "Physical" + execute if score $ElementalSwordAttack Temporary matches 0 run data modify storage api: Argument.ElementType set value "Fire" + execute if score $ElementalSwordAttack Temporary matches 1 run data modify storage api: Argument.ElementType set value "Water" + execute if score $ElementalSwordAttack Temporary matches 2 run data modify storage api: Argument.ElementType set value "Thunder" + function api:damage/modifier + execute as @e[type=#lib:living,tag=Victim,distance=..10] run function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $ElementalSwordAttack Temporary diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/fire.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/fire.mcfunction new file mode 100644 index 0000000000..43925cba80 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/fire.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0057.elemental_sword/trigger/vfx/fire +# +# 火属性 +# +# @within function asset:artifact/0057.elemental_sword/trigger/3.main + +# 演出 + particle minecraft:flame ~ ~0.5 ~ 0 0.5 0 0.1 100 + playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.6 diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/thunder.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/thunder.mcfunction new file mode 100644 index 0000000000..cc3bb04cb6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/thunder.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0057.elemental_sword/trigger/vfx/thunder +# +# 雷属性 +# +# @within function asset:artifact/0057.elemental_sword/trigger/3.main + +# 演出 + particle crit ~ ~3 ~ 0.025 3 0.025 0 100 normal @a + playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/water.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/water.mcfunction new file mode 100644 index 0000000000..07a3615615 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/trigger/vfx/water.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/0057.elemental_sword/trigger/vfx/water +# +# 水属性 +# +# @within function asset:artifact/0057.elemental_sword/trigger/3.main + +# 演出 + particle minecraft:falling_water ~ ~1 ~ 0.4 1 0.4 1 100 + particle minecraft:bubble_pop ~ ~0.5 ~ 0 0 0 0.2 100 + playsound minecraft:item.bucket.fill player @a ~ ~ ~ 1 1 + playsound minecraft:entity.generic.swim player @a ~ ~ ~ 1 1 From f4d1e0fcc83fc0cb13fae6a05fc4aea01e43cb59 Mon Sep 17 00:00:00 2001 From: Chuzume <46894504+Chuzume@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:43:05 +0900 Subject: [PATCH 22/74] =?UTF-8?q?=F0=9F=94=A7=20=E3=83=86=E3=83=B3?= =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=81=8CObject=E3=81=AETic?= =?UTF-8?q?k=E3=81=AE=E5=8F=AF=E5=90=A6=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E7=94=9F=E6=88=90=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=20(#285)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index fa986481d1..6e631a5b3e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2511,6 +2511,8 @@ " # data modify storage asset:object ExtendsSafe set value ", "# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean)", " data modify storage asset:object IsAbstract set value false", + "# Tickするかどうか(boolean) (オプション)", + " # data modify storage asset:object IsTicking set value ", "", "# ID (int)", " data modify storage asset:object ID set value %id%", From 705ba6b446b9f042210eb9ae70f60f5d3e7219ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:46:56 +0900 Subject: [PATCH 23/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A81?= =?UTF-8?q?075]=20=E5=A6=96=E7=B2=BE=E3=81=AE=E5=B0=8F=E7=93=B6=E3=81=AE?= =?UTF-8?q?=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=20(#252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1075.fairy_vial/give/2.give.mcfunction | 2 +- .../1075.fairy_vial/trigger/3.main.mcfunction | 6 ++--- ...nction => 4.find_target_player.mcfunction} | 18 ++++++------- .../trigger/5.get_health.mcfunction | 11 -------- .../trigger/5.get_lost_health.mcfunction | 25 +++++++++++++++++++ 5 files changed, 38 insertions(+), 24 deletions(-) rename Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/{4.find_lowest_health_player.mcfunction => 4.find_target_player.mcfunction} (52%) delete mode 100644 Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_health.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_lost_health.mcfunction diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction index 33bbab683d..69bb739eca 100644 --- a/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"妖精の小瓶","color":"#FFC9F3"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、自身と周囲の2名の体力を","color":"white"}','{"text":"自身の最大体力の5%分回復する。","color":"white"}','{"text":"(現在体力の最も低いプレイヤーを優先)","color":"white"}','{"text":"小さな妖精が入っている小瓶。","color":"gray"}','{"text":"淡いピンク色の光に揺らめいている。","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、自身と周囲の2名の体力を","color":"white"}','{"text":"自身の最大体力の5%分回復する。","color":"white"}','{"text":"(体力を最も失ったプレイヤーを優先)","color":"white"}','{"text":"小さな妖精が入っている小瓶。","color":"gray"}','{"text":"淡いピンク色の光に揺らめいている。","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/3.main.mcfunction index 51b4963518..864a079af7 100644 --- a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/3.main.mcfunction @@ -13,9 +13,9 @@ # 回復対象：使用者と20m以内の現在体力の低いプレイヤー2名 tag @s add HealTarget -# 現在体力の低いプレイヤー2名を特定してTagを付与 - execute if entity @p[tag=!HealTarget,distance=..20] run function asset:artifact/1075.fairy_vial/trigger/4.find_lowest_health_player - execute if entity @p[tag=!HealTarget,distance=..20] run function asset:artifact/1075.fairy_vial/trigger/4.find_lowest_health_player +# 体力の最も失ったプレイヤー2名を特定してTagを付与 + execute if entity @p[tag=!HealTarget,distance=..20] run function asset:artifact/1075.fairy_vial/trigger/4.find_target_player + execute if entity @p[tag=!HealTarget,distance=..20] run function asset:artifact/1075.fairy_vial/trigger/4.find_target_player # 回復対象の位置で演出 # playsoundは回復対象にのみ聞こえる 妖精っぽくて良くない？ diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_lowest_health_player.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_target_player.mcfunction similarity index 52% rename from Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_lowest_health_player.mcfunction rename to Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_target_player.mcfunction index cada5a202d..0df015decb 100644 --- a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_lowest_health_player.mcfunction +++ b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/4.find_target_player.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/1075.fairy_vial/trigger/4.find_lowest_health_player +#> asset:artifact/1075.fairy_vial/trigger/4.find_target_player # # 現在体力の低いプレイヤーを見つける # @@ -7,7 +7,7 @@ #> Private # @private #declare tag SearchTarget - #declare score_holder $LowestHealth + #declare score_holder $MostLostHealth # 検索対象：回復対象ではなく最も現在体力割合の低いプレイヤー @@ -15,19 +15,19 @@ tag @a[tag=!HealTarget,distance=..20] add SearchTarget # 各プレイヤーの現在体力をスコアへ代入 - execute as @a[tag=SearchTarget] store result score @s Temporary run function asset:artifact/1075.fairy_vial/trigger/5.get_health + execute as @a[tag=SearchTarget] store result score @s Temporary run function asset:artifact/1075.fairy_vial/trigger/5.get_lost_health -# $LowestHealthの初期値として対象プレイヤーの内1名の体力を代入 - execute unless score $LowestHealth Temporary matches 1.. as @a[tag=SearchTarget,limit=1] store result score $LowestHealth Temporary run scoreboard players get @s Temporary +# $MostLostHealthの初期値として対象プレイヤーの内1名の体力を代入 + execute unless score $MostLostHealth Temporary matches 1.. as @p[tag=SearchTarget] store result score $MostLostHealth Temporary run scoreboard players get @s Temporary -# 全員の体力と比較する - execute as @a[tag=SearchTarget] run scoreboard players operation $LowestHealth Temporary < @s Temporary +# 近い順に全員の体力と比較する + execute as @a[tag=SearchTarget,sort=nearest] run scoreboard players operation $MostLostHealth Temporary < @s Temporary # 特定したプレイヤーにTagを付与 # SearchTargetとHealTargetを両立するプレイヤーがいるのは、検索対象のプレイヤーを特定済みの場合のみ - execute as @a[tag=SearchTarget] unless entity @p[tag=SearchTarget,tag=HealTarget] if score @s Temporary = $LowestHealth Temporary run tag @s add HealTarget + execute as @a[tag=SearchTarget] unless entity @p[tag=SearchTarget,tag=HealTarget] if score @s Temporary = $MostLostHealth Temporary run tag @s add HealTarget # リセット scoreboard players reset @a[tag=SearchTarget] Temporary tag @a[tag=SearchTarget] remove SearchTarget - scoreboard players reset $LowestHealth Temporary \ No newline at end of file + scoreboard players reset $MostLostHealth Temporary diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_health.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_health.mcfunction deleted file mode 100644 index 9a94aea6fd..0000000000 --- a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_health.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:artifact/1075.fairy_vial/trigger/5.get_health -# -# 実行者の現在体力を返す -# -# @within function asset:artifact/1075.fairy_vial/trigger/4.find_lowest_health_player - -# 現在体力を取得 - function api:data_get/health - -# 現在体力の10倍を返り値として返す - return run data get storage api: Health 10 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_lost_health.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_lost_health.mcfunction new file mode 100644 index 0000000000..f399d2bb95 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1075.fairy_vial/trigger/5.get_lost_health.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/1075.fairy_vial/trigger/5.get_lost_health +# +# 実行者の現在体力を返す +# +# @within function asset:artifact/1075.fairy_vial/trigger/4.find_target_player + +#> Private +# @private + #declare score_holder $CurrentHealth + #declare score_holder $MaxHealth + +# 現在体力を取得 + function api:data_get/health + execute store result score $CurrentHealth Temporary run data get storage api: Health 10 + +# 最大体力を取得 + function api:modifier/max_health/get + execute store result score $MaxHealth Temporary run data get storage api: Return.MaxHealth 10 + +# 失った体力の10倍を返り値として返す + return run scoreboard players operation $MaxHealth Temporary -= $CurrentHealth Temporary + +# リセット + scoreboard players reset $CurrentHealth Temporary + scoreboard players reset $MaxHealth Temporary From 2cd0dbd9daf155e8d15cee69571c02d9459721f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:47:37 +0900 Subject: [PATCH 24/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[Mob56,83]=20?= =?UTF-8?q?=E9=9B=B7=E5=BC=84=E8=80=85=E3=81=AE=E3=83=8A=E3=83=BC=E3=83=95?= =?UTF-8?q?=20(#245)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0056.thunder_trifler/register.mcfunction | 6 +++--- .../functions/mob/0083.thunder_trifler/register.mcfunction | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/mob/0056.thunder_trifler/register.mcfunction b/Asset/data/asset/functions/mob/0056.thunder_trifler/register.mcfunction index 32dd7ac847..3151cbe7e0 100644 --- a/Asset/data/asset/functions/mob/0056.thunder_trifler/register.mcfunction +++ b/Asset/data/asset/functions/mob/0056.thunder_trifler/register.mcfunction @@ -54,11 +54,11 @@ # 魔法倍率 (float) (オプション) data modify storage asset:mob Resist.Magic set value 1 # 火倍率 (float) (オプション) - data modify storage asset:mob Resist.Fire set value 0.75 + data modify storage asset:mob Resist.Fire set value 1 # 水倍率 (float) (オプション) - data modify storage asset:mob Resist.Water set value 0.75 + data modify storage asset:mob Resist.Water set value 1 # 雷倍率 (float) (オプション) - data modify storage asset:mob Resist.Thunder set value 0.25 + data modify storage asset:mob Resist.Thunder set value 0.5 # フィールド # [ダメージ量、MP減少量の計算に必要な値] diff --git a/Asset/data/asset/functions/mob/0083.thunder_trifler/register.mcfunction b/Asset/data/asset/functions/mob/0083.thunder_trifler/register.mcfunction index 12ed7e3b06..85c48e8369 100644 --- a/Asset/data/asset/functions/mob/0083.thunder_trifler/register.mcfunction +++ b/Asset/data/asset/functions/mob/0083.thunder_trifler/register.mcfunction @@ -16,4 +16,4 @@ # フィールド # [ダメージ量、MP減少量の計算に必要な値] - data modify storage asset:mob Field set value [34,6] + data modify storage asset:mob Field set value [25,6] From dcfac3295dbbc713b2ad670eceb3fd5a76a030dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 02:59:54 +0900 Subject: [PATCH 25/74] =?UTF-8?q?=F0=9F=9A=B8=20[=E7=A5=9E=E5=99=A81078]?= =?UTF-8?q?=20=E3=83=94=E3=82=B8=E3=83=A7=E3=83=B3=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AE=E6=BC=94=E5=87=BA=E3=81=AE=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=20(#217)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1078.pigeon_blood/trigger/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1078.pigeon_blood/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1078.pigeon_blood/trigger/3.main.mcfunction index 6c3161cf1a..93bcb5ba19 100644 --- a/Asset/data/asset/functions/artifact/1078.pigeon_blood/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1078.pigeon_blood/trigger/3.main.mcfunction @@ -64,7 +64,7 @@ execute if predicate lib:random_pass_per/20 run tag @s add Critical # クリティカル演出 - execute if entity @s[tag=Critical] anchored eyes positioned ^ ^ ^ run particle note ~ ~0.4 ~ 0 0 0 1 1 normal @a + execute if entity @s[tag=Critical] anchored eyes positioned ^ ^ ^ run particle note ~ ~0.4 ~ 0.22 0 0 1 0 normal @a execute if entity @s[tag=Critical] at @e[type=#lib:living,tag=Victim,distance=..10] run particle end_rod ~ ~1.2 ~ 0 0 0 0.25 30 # ダメージ From cbc3a98a383d61e189fb43ac427fbca926d6442b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:08:06 +0900 Subject: [PATCH 26/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A81?= =?UTF-8?q?088]=20=E6=B5=84=E8=97=8D=E3=81=AE=E7=B4=AB=E9=99=BD=E8=8A=B1?= =?UTF-8?q?=E3=81=AE=E5=8A=B9=E6=9E=9C=E5=A4=89=E6=9B=B4=E3=81=A8=E3=83=9F?= =?UTF-8?q?=E3=82=B9=E4=BF=AE=E6=AD=A3=20(#196)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 20 +++++++++++++----- ...nd_highest_water_attack_player.mcfunction} | 8 +++---- .../trigger/4.set_effect_target.mcfunction | 21 ------------------- ...=> 5.get_water_attack_modifier.mcfunction} | 4 ++-- ...ct.mcfunction => 6.give_effect.mcfunction} | 4 ++-- .../trigger/vfx.mcfunction | 2 +- 7 files changed, 25 insertions(+), 36 deletions(-) rename Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/{5.find_highest_water_attack_player.mcfunction => 4.find_highest_water_attack_player.mcfunction} (87%) delete mode 100644 Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.set_effect_target.mcfunction rename Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/{6.get_water_attack_modifier.mcfunction => 5.get_water_attack_modifier.mcfunction} (73%) rename Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/{7.give_effect.mcfunction => 6.give_effect.mcfunction} (80%) diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction index 5a2c00ace9..8c69317a05 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"浄藍の紫陽花","color":"#83aaf7"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、解除可能なデバフを1つ解除する。","color":"white"}','{"text":"この効果後にデバフが付与されていない場合","color":"white"}','[{"text":"自身と周囲の1名に","color":"white"},{"text":"水攻撃+10%","color":"aqua"},{"text":"を10秒間付与する。","color":"white"}]','{"text":"(水攻撃補正の最も高いプレイヤーを優先)","color":"white"}','{"text":"雨の中にだけ咲く、深い藍色の紫陽花。","color":"gray"}','{"text":"穢れを浄化し、雨に還す力を持つ。","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、解除可能なデバフを1つ解除し","color":"white"}','[{"text":"自身と周囲の1名に","color":"white"},{"text":"水攻撃+10%","color":"aqua"},{"text":"を10秒間付与する。","color":"white"}]','{"text":"(水攻撃補正の最も高いプレイヤーを優先)","color":"white"}','{"text":"雨の中にだけ咲く、深い藍色の紫陽花。","color":"gray"}','{"text":"穢れを浄化し、雨に還す力を持つ。","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/3.main.mcfunction index dca83372de..581dd3e524 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/3.main.mcfunction @@ -25,11 +25,21 @@ # 自身のデバフの数をチェック function api:entity/mob/effect/get/size/bad -# デバフの数が0ならバフを付与 -# デバフが解除されるのは1tick後のためスコアで(デバフ数-1)して判定する - execute store result score $DebuffCount Temporary run data get storage api: Return.EffectSize.Bad - scoreboard players remove $DebuffCount Temporary 1 - execute if score $DebuffCount Temporary matches ..0 run function asset:artifact/1088.purifying_hydrangea/trigger/4.set_effect_target +#> Private +# @private + #declare tag BuffTarget + +# 自身にバフ対象のTagを付与する + tag @s add BuffTarget + +# 周囲の水攻撃補正が最も高いプレイヤーにTagを付与する + execute if entity @p[tag=!BuffTarget,distance=..20] run function asset:artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player + +# バフを付与する + execute as @a[tag=BuffTarget] at @s run function asset:artifact/1088.purifying_hydrangea/trigger/6.give_effect + +# Tag削除 + tag @a[tag=BuffTarget] remove BuffTarget # リセット scoreboard players reset $DebuffCount Temporary diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player.mcfunction similarity index 87% rename from Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player.mcfunction rename to Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player.mcfunction index 09c069b975..87823df09e 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player +#> asset:artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player # # 水攻撃補正が最も高いプレイヤーを検索する # -# @within function asset:artifact/1088.purifying_hydrangea/trigger/4.set_effect_target +# @within function asset:artifact/1088.purifying_hydrangea/trigger/3.main #> Private # @private @@ -14,8 +14,8 @@ # 検索対象にTagを付与 tag @a[tag=!BuffTarget,distance=..20] add SearchTarget -# 各プレイヤーの現在体力をスコアへ代入 - execute as @a[tag=SearchTarget] store result score @s Temporary run function asset:artifact/1088.purifying_hydrangea/trigger/6.get_water_attack_modifier +# 各プレイヤーの水攻撃補正をスコアへ代入 + execute as @a[tag=SearchTarget] store result score @s Temporary run function asset:artifact/1088.purifying_hydrangea/trigger/5.get_water_attack_modifier # 全員の水攻撃補正と比較する execute as @a[tag=SearchTarget] run scoreboard players operation $HighestWaterAttack Temporary > @s Temporary diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.set_effect_target.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.set_effect_target.mcfunction deleted file mode 100644 index 4c5f2f3dc4..0000000000 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/4.set_effect_target.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:artifact/1088.purifying_hydrangea/trigger/4.set_effect_target -# -# バフを付与する対象を設定する -# -# @within function asset:artifact/1088.purifying_hydrangea/trigger/3.main - -#> Private -# @private - #declare tag BuffTarget - -# 自身にバフ対象のTagを付与する - tag @s add BuffTarget - -# 周囲の水攻撃補正が最も高いプレイヤーにTagを付与する - execute unless entity @p[tag=!BuffTarget,distance=..20] run function asset:artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player - -# バフを付与する - execute as @a[tag=BuffTarget] at @s run function asset:artifact/1088.purifying_hydrangea/trigger/7.give_effect - -# Tag削除 - tag @a[tag=BuffTarget] remove BuffTarget diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.get_water_attack_modifier.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.get_water_attack_modifier.mcfunction similarity index 73% rename from Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.get_water_attack_modifier.mcfunction rename to Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.get_water_attack_modifier.mcfunction index 4a3a8ac61f..0995b070c0 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.get_water_attack_modifier.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/5.get_water_attack_modifier.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1088.purifying_hydrangea/trigger/6.get_water_attack_modifier +#> asset:artifact/1088.purifying_hydrangea/trigger/5.get_water_attack_modifier # # 実行者の水攻撃補正を返す # -# @within function asset:artifact/1088.purifying_hydrangea/trigger/5.find_highest_water_attack_player +# @within function asset:artifact/1088.purifying_hydrangea/trigger/4.find_highest_water_attack_player # 水攻撃補正を取得 function api:modifier/attack/water/get diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/7.give_effect.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.give_effect.mcfunction similarity index 80% rename from Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/7.give_effect.mcfunction rename to Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.give_effect.mcfunction index 828053958f..5d44662de8 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/7.give_effect.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/6.give_effect.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1088.purifying_hydrangea/trigger/7.give_effect +#> asset:artifact/1088.purifying_hydrangea/trigger/6.give_effect # # バフを付与する # -# @within function asset:artifact/1088.purifying_hydrangea/trigger/4.set_effect_target +# @within function asset:artifact/1088.purifying_hydrangea/trigger/3.main # 使用者ではないなら演出 execute if entity @s[tag=!this] run function asset:artifact/1088.purifying_hydrangea/trigger/vfx diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/vfx.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/vfx.mcfunction index 28dae47e2a..f6de51f944 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/vfx.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/trigger/vfx.mcfunction @@ -4,7 +4,7 @@ # # @within function # asset:artifact/1088.purifying_hydrangea/trigger/3.main -# asset:artifact/1088.purifying_hydrangea/trigger/7.give_effect +# asset:artifact/1088.purifying_hydrangea/trigger/6.give_effect # 演出 particle rain ~ ~1.5 ~ 0.6 1 0.6 0 120 normal @a From c6dd223ae51dff3394819b5e59690f837967ce5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:14:30 +0900 Subject: [PATCH 27/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A87?= =?UTF-8?q?19]=20=E7=A5=9E=E9=B3=B4=E3=82=8A=E3=81=AE=E5=BE=A1=E5=89=A3?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 8 +++---- .../trigger/3.main.mcfunction | 24 +++++++++---------- .../trigger/vfx/random_rotation.mcfunction | 19 ++++++++------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/give/2.give.mcfunction index 408297bd73..8f4b04d939 100644 --- a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [650,850] + data modify storage asset:artifact AttackInfo.Damage set value [1600,2000] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -39,15 +39,15 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 10 + data modify storage asset:artifact MPCost set value 45 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) - data modify storage asset:artifact LocalCooldown set value 10 + data modify storage asset:artifact LocalCooldown set value 24 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value + data modify storage asset:artifact DisableCooldownMessage set value true # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value # 扱える神 (string[]) Wikiを参照 diff --git a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction index 333157aa0d..2535a74097 100644 --- a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction @@ -11,29 +11,29 @@ #> Private # @private - #declare score_holder $201 + #declare score_holder $401 # 演出 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] positioned ~ ~0.3 ~ run function asset:artifact/0719.sword_of_divine_sound/trigger/vfx/ -# 201を定義 - scoreboard players set $201 Temporary 201 +# 401を定義 + scoreboard players set $401 Temporary 401 # 疑似乱数取得 execute store result score $Random Temporary run function lib:random/ # ほしい範囲に剰余算 - scoreboard players operation $Random Temporary %= $201 Temporary + scoreboard players operation $Random Temporary %= $401 Temporary # 最低値を加算 - scoreboard players add $Random Temporary 650 + scoreboard players add $Random Temporary 1600 # 設定 - execute store result storage lib: Argument.Damage float 1.0 run scoreboard players get $Random Temporary - data modify storage lib: Argument.AttackType set value "Physical" - data modify storage lib: Argument.ElementType set value "Thunder" - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function lib:damage/ + execute store result storage api: Argument.Damage int 1.0 run scoreboard players get $Random Temporary + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Thunder" + function api:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + function api:damage/reset # リセット - function lib:damage/reset scoreboard players reset $Random Temporary - scoreboard players reset $201 Temporary \ No newline at end of file + scoreboard players reset $401 Temporary diff --git a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/vfx/random_rotation.mcfunction b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/vfx/random_rotation.mcfunction index 00687a0a7b..74a86e5f88 100644 --- a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/vfx/random_rotation.mcfunction +++ b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/vfx/random_rotation.mcfunction @@ -7,17 +7,18 @@ # 疑似乱数取得 execute store result score $Random Temporary run function lib:random/ # ほしい範囲に剰余算 - scoreboard players operation $Random Temporary %= $10 Const + scoreboard players operation $Random Temporary %= $9 Const # 値に応じて角度を変えて再帰 x_rotationが入っている部分は雷の向きが水平になりすぎるのを防ぐため - execute if score $Random Temporary matches 0 if entity @s run tp @s ~ ~ ~ ~ ~10 - execute if score $Random Temporary matches 1 if entity @s run tp @s ~ ~ ~ ~ ~20 - execute if score $Random Temporary matches 2 if entity @s run tp @s ~ ~ ~ ~ ~30 - execute if score $Random Temporary matches 3 if entity @s run tp @s ~ ~ ~ ~ ~40 - execute if score $Random Temporary matches 4 if entity @s run tp @s ~ ~ ~ ~ ~-10 - execute if score $Random Temporary matches 5 if entity @s run tp @s ~ ~ ~ ~ ~-20 - execute if score $Random Temporary matches 6 if entity @s run tp @s ~ ~ ~ ~ ~-30 - execute if score $Random Temporary matches 7 if entity @s run tp @s ~ ~ ~ ~ ~-40 + execute if score $Random Temporary matches 0 if entity @s run tp @s ~ ~ ~ ~ ~0 + execute if score $Random Temporary matches 1 if entity @s run tp @s ~ ~ ~ ~ ~10 + execute if score $Random Temporary matches 2 if entity @s run tp @s ~ ~ ~ ~ ~20 + execute if score $Random Temporary matches 3 if entity @s run tp @s ~ ~ ~ ~ ~30 + execute if score $Random Temporary matches 4 if entity @s run tp @s ~ ~ ~ ~ ~40 + execute if score $Random Temporary matches 5 if entity @s run tp @s ~ ~ ~ ~ ~-10 + execute if score $Random Temporary matches 6 if entity @s run tp @s ~ ~ ~ ~ ~-20 + execute if score $Random Temporary matches 7 if entity @s run tp @s ~ ~ ~ ~ ~-30 + execute if score $Random Temporary matches 8 if entity @s run tp @s ~ ~ ~ ~ ~-40 # 再帰 execute at @s run function asset:artifact/0719.sword_of_divine_sound/trigger/vfx/lightning From 07d5089803d1fee5fa3bd66b19be1b29f90477db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:16:14 +0900 Subject: [PATCH 28/74] =?UTF-8?q?=F0=9F=9A=B8=20[=E7=A5=9E=E5=99=A8973]=20?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=AB:=20=E3=83=90=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A5=E3=82=B9=E3=83=94=E3=83=AA=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=AE=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=8F=AF=E3=83=A1=E3=83=83?= =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E4=BB=95=E6=A7=98=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction index 6084dfff78..e57b96fbcf 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction @@ -8,9 +8,10 @@ function asset:artifact/common/check_condition/auto # 既に召喚済みなら使えない。ファミリアと違って召喚するのは一匹だが、合わせておくと都合がいいし、Lintを通すのも楽 - execute at @e[type=armor_stand,tag=R1.Spirit] if score @s UserID = @e[type=armor_stand,tag=R1.Spirit,distance=..0.01,sort=nearest,limit=1] R1.UserID run tag @s add R1.CannotUse + execute if entity @s[tag=CanUsed] as @e[type=armor_stand,tag=R1.Spirit] if score @s R1.UserID = @p[tag=this] UserID run tag @p[tag=this] add R1.CannotUse + execute if entity @s[tag=R1.CannotUse] run tag @s remove CanUsed execute if entity @s[tag=R1.CannotUse] run function asset:artifact/0973.call_rod_spirit/trigger/3.cannot_use # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0973.call_rod_spirit/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0973.call_rod_spirit/trigger/3.main From e5d50505f0531d005fb669d4b18b2904ab99d2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:17:41 +0900 Subject: [PATCH 29/74] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[=E7=A5=9E=E5=99=A81?= =?UTF-8?q?083]=20=E7=A5=9E=E8=A8=97=E3=81=AE=E5=88=BB=E3=81=BE=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E7=9F=B3=E6=9D=BF=E3=81=AE=E5=87=A6=E7=90=86=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20(#205)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/4.buff.mcfunction | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1083.tablet_of_oracle/trigger/4.buff.mcfunction b/Asset/data/asset/functions/artifact/1083.tablet_of_oracle/trigger/4.buff.mcfunction index c39657be37..a15a136421 100644 --- a/Asset/data/asset/functions/artifact/1083.tablet_of_oracle/trigger/4.buff.mcfunction +++ b/Asset/data/asset/functions/artifact/1083.tablet_of_oracle/trigger/4.buff.mcfunction @@ -4,28 +4,45 @@ # # @within function asset:artifact/1083.tablet_of_oracle/trigger/3.main -# 4種のうちランダムなバフ2つを付与する +#> Private +# @private + #declare score_holder $Random -# セッション開ける - function lib:array/session/open +# 4種のうちランダムなバフ2つを付与する # ID候補リスト - data modify storage lib: Array set value [248,249,250,251] + data modify storage asset:temp Random set value [248,249,250,251] -# シャッフルする - function lib:array/shuffle +# 0~3の乱数を取得する + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $4 Const -# 配列を移しておく - data modify storage asset:temp U3.Array set from storage lib: Array +# (乱数)番目のIDのEffectのIDを代入する + execute if score $Random Temporary matches 0 run data modify storage api: Argument.ID set from storage asset:temp Random[0] + execute if score $Random Temporary matches 1 run data modify storage api: Argument.ID set from storage asset:temp Random[1] + execute if score $Random Temporary matches 2 run data modify storage api: Argument.ID set from storage asset:temp Random[2] + execute if score $Random Temporary matches 3 run data modify storage api: Argument.ID set from storage asset:temp Random[3] -# セッションを閉じる - function lib:array/session/close +# (乱数)番目のIDを配列から削除 + execute if score $Random Temporary matches 0 run data modify storage api: Argument.ID set from storage asset:temp Random[0] + execute if score $Random Temporary matches 1 run data modify storage api: Argument.ID set from storage asset:temp Random[1] + execute if score $Random Temporary matches 2 run data modify storage api: Argument.ID set from storage asset:temp Random[2] + execute if score $Random Temporary matches 3 run data modify storage api: Argument.ID set from storage asset:temp Random[3] -# 配列の前二つのIDのEffectを付与する - execute store result storage api: Argument.ID int 1 run data get storage asset:temp U3.Array[0] +# 付与する function api:entity/mob/effect/give - execute store result storage api: Argument.ID int 1 run data get storage asset:temp U3.Array[1] + +# 0~2の乱数を取得する + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $3 Const + +# (乱数)番目のIDのEffectのIDを代入する + execute if score $Random Temporary matches 0 run data modify storage api: Argument.ID set from storage asset:temp Random[0] + execute if score $Random Temporary matches 1 run data modify storage api: Argument.ID set from storage asset:temp Random[1] + execute if score $Random Temporary matches 2 run data modify storage api: Argument.ID set from storage asset:temp Random[2] + +# 付与する function api:entity/mob/effect/give # リセット - data remove storage asset:temp U3.Array + data remove storage asset:temp Random From e83f3b9cedcdc626a481df805230a9502af8df5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 03:31:05 +0900 Subject: [PATCH 30/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A81?= =?UTF-8?q?054]=20=E6=80=A5=E9=80=9F=E5=85=85=E9=9B=BB=E3=83=90=E3=83=83?= =?UTF-8?q?=E3=83=86=E3=83=AA=E3=83=BC=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 6 +++--- .../effect/0214.quick_charge/register.mcfunction | 2 +- .../effect/0214.quick_charge/tick/.mcfunction | 14 +++++++++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction index f88b188c72..15cb66ee1f 100644 --- a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"急速充電バッテリー","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、MPを最大値の50%分回復し、","color":"white"}','{"text":"雷攻撃+15%とMP回復量+15%を10秒間得る。","color":"white"}','{"text":"我が社の誇るこのバッテリーなら、","color":"gray"}','{"text":"充電切れ間近でもすぐに回復して差し上げます！","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"MPを急速に50%分回復し、雷攻撃+15%を10秒間得る。","color":"white"}','{"text":"我が社の誇るこのバッテリーなら、","color":"gray"}','{"text":"充電切れ間近でもすぐに回復して差し上げます！","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction index 644b60e756..11be21dc65 100644 --- a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction @@ -17,9 +17,9 @@ function api:mp/get_max # MPを最大値の50%分回復する - execute store result score $Fluctuation Lib run data get storage api: Return.MaxMP 0.5 - function lib:mp/fluctuation + #execute store result score $Fluctuation Lib run data get storage api: Return.MaxMP 0.5 + #function lib:mp/fluctuation # 急速充電を付与 data modify storage api: Argument.ID set value 214 - function api:entity/mob/effect/give \ No newline at end of file + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction b/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction index 8ef7a870d5..40729445ac 100644 --- a/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction +++ b/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction @@ -11,7 +11,7 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"急速充電","color":"yellow"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value '{"text":"雷属性与ダメージとMP回復量が上昇する"}' + data modify storage asset:effect Description set value '{"text":"継続的にMPを回復し、雷属性与ダメージが上昇する"}' # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 200 # スタック (int) (default = API || 1) diff --git a/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction b/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction index 0bfe733f66..4f8cc6a14a 100644 --- a/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction @@ -4,5 +4,17 @@ # # @within function asset:effect/0214.quick_charge/_/tick +#> Private +# @private + #declare score_holder $Interval + # 演出 - particle electric_spark ~ ~1.2 ~ 0.8 0.6 0.8 0 2 normal @a \ No newline at end of file + particle electric_spark ~ ~1.2 ~ 0.8 0.6 0.8 0 2 normal @a + +# 4tickに1回MPを1%回復する + execute store result score $Interval Temporary run data get storage asset:context Duration + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run function api:mp/get_max + execute if score $Interval Temporary matches 0 store result storage api: Argument.Fluctuation double 0.01 run data get storage api: Return.MaxMP + execute if score $Interval Temporary matches 0 run function api:mp/fluctuation + scoreboard players reset $Interval From b67c136767d2b2d494ff1d7fe55b50e576a13ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:57:44 +0900 Subject: [PATCH 31/74] =?UTF-8?q?:bento:=20[Effect210-211]=20=E8=96=84?= =?UTF-8?q?=E3=82=8C=E3=82=86=E3=81=8F=E9=80=9F=E3=81=95=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=20(#225)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/0.load.mcfunction | 9 ----- .../trigger/3.1.effect.mcfunction | 16 --------- .../trigger/3.2.effect_player.mcfunction | 26 -------------- .../trigger/3.main.mcfunction | 33 ++++++----------- .../trigger/rejoin_process.mcfunction | 8 ----- .../effect/0210.fading_speed/_/end.mcfunction | 7 ++++ .../0210.fading_speed/_/given.mcfunction | 7 ++++ .../0210.fading_speed/_/re-given.mcfunction | 7 ++++ .../0210.fading_speed/_/register.mcfunction | 7 ++++ .../0210.fading_speed/_/remove.mcfunction | 7 ++++ .../0210.fading_speed/_/tick.mcfunction | 7 ++++ .../effect/0210.fading_speed/end/.mcfunction | 12 +++++++ .../0210.fading_speed/given/.mcfunction | 8 +++++ .../effect/0210.fading_speed/load.mcfunction | 10 ++++++ .../0210.fading_speed/modifier/add.mcfunction | 10 ++++++ .../modifier/remove.mcfunction | 14 ++++++++ .../0210.fading_speed/re-given/.mcfunction | 28 +++++++++++++++ .../0210.fading_speed/register.mcfunction | 35 +++++++++++++++++++ .../0210.fading_speed/remove/.mcfunction | 8 +++++ .../effect/0210.fading_speed/tick/.mcfunction | 23 ++++++++++++ .../effect/0211.fading_speed/_/end.mcfunction | 7 ++++ .../0211.fading_speed/_/given.mcfunction | 7 ++++ .../0211.fading_speed/_/re-given.mcfunction | 7 ++++ .../0211.fading_speed/_/register.mcfunction | 7 ++++ .../0211.fading_speed/_/remove.mcfunction | 7 ++++ .../effect/0211.fading_speed/end/.mcfunction | 8 +++++ .../0211.fading_speed/given/.mcfunction | 9 +++++ .../0211.fading_speed/modifier/add.mcfunction | 9 +++++ .../modifier/remove.mcfunction | 11 ++++++ .../0211.fading_speed/re-given/.mcfunction | 23 ++++++++++++ .../0211.fading_speed/register.mcfunction | 35 +++++++++++++++++++ .../0211.fading_speed/remove/.mcfunction | 8 +++++ .../asset/tags/functions/artifact/load.json | 1 - .../data/asset/tags/functions/effect/end.json | 4 ++- .../asset/tags/functions/effect/given.json | 4 ++- .../asset/tags/functions/effect/load.json | 5 +-- .../asset/tags/functions/effect/re-given.json | 6 ++-- .../asset/tags/functions/effect/register.json | 4 ++- .../asset/tags/functions/effect/remove.json | 4 ++- .../asset/tags/functions/effect/tick.json | 3 +- Asset/data/asset/tags/functions/rejoin.json | 1 - 41 files changed, 360 insertions(+), 92 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/0.load.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.1.effect.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/load.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0210.fading_speed/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0211.fading_speed/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/0.load.mcfunction deleted file mode 100644 index 5f89b706d2..0000000000 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0456.potion_of_stalling_power/trigger/0.load -# -# 神器に利用するスコアボード等の初期化処理 -# -# @within tag/function asset:artifact/load - -#> Objective -# @within function asset:artifact/0456.potion_of_stalling_power/trigger/** - scoreboard objectives add CO.Tick dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.1.effect.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.1.effect.mcfunction deleted file mode 100644 index 05b5c03730..0000000000 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.1.effect.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect -# -# 神器のメイン処理部 -# -# @within function -# asset:artifact/0456.potion_of_stalling_power/trigger/3.main -# asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect -# asset:artifact/0456.potion_of_stalling_power/trigger/rejoin_process - -# ここから先は神器側の効果の処理を書く - -# 効果 - execute as @a[scores={CO.Tick=1..}] run function asset:artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player - -# 再起 - execute if entity @a[scores={CO.Tick=1..},limit=1] run schedule function asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect 1t \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player.mcfunction deleted file mode 100644 index 385d6d2862..0000000000 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset:artifact/0456.potion_of_stalling_power/trigger/3.2.effect_player -# -# 神器のメイン処理部 -# -# @within function -# asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect - -# ここから先は神器側の効果の処理を書く - -# 効果 - effect give @s[scores={CO.Tick=2400}] speed 20 9 - effect give @s[scores={CO.Tick=2000}] speed 20 5 - effect give @s[scores={CO.Tick=1800}] speed 20 2 - effect give @s[scores={CO.Tick=1400}] speed 20 0 - effect give @s[scores={CO.Tick=1000}] slowness 20 1 - effect give @s[scores={CO.Tick=600}] slowness 30 10 - effect give @s[scores={CO.Tick=400}] blindness 20 1 - -# スコア減らす - scoreboard players remove @s[scores={CO.Tick=1..}] CO.Tick 1 - -# スコアリセット - scoreboard players reset @s[scores={CO.Tick=0}] CO.Tick - -# 死んだ場合消す - scoreboard players reset @s[tag=Death,scores={CO.Tick=1..}] CO.Tick \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.main.mcfunction index 1584ed5310..bd59241084 100644 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/3.main.mcfunction @@ -9,27 +9,16 @@ # ここから先は神器側の効果の処理を書く -# 時間内にもう一度つかった愚か者へのダメージ - # ダメージセット - data modify storage lib: Argument.Damage set value 10.0f - data modify storage lib: Argument.AttackType set value "Physical" - data modify storage lib: Argument.FixedDamage set value true - # ダメージを与える - execute as @s[scores={CO.Tick=1..}] run function lib:damage/ - # リセット - function lib:damage/reset +# 薄れゆく速さデバフ(ID:211)があるかどうかチェックする + #data modify storage api: Argument.ID set value 211 + #function api:entity/mob/effect/get/from_id -# 演出 - execute if entity @s[scores={CO.Tick=1..}] run particle minecraft:dragon_breath ~ ~1 ~ 0.1 0.1 0.1 0.03 100 - execute if entity @s[scores={CO.Tick=1..}] run playsound minecraft:entity.evoker.prepare_summon player @a +# デバフがなければ薄れゆく速さバフ(ID:210)を、あればデバフ(ID:211)を付与 + #execute unless data storage api: Return.Effect run data modify storage api: Argument.ID set value 210 + #execute if data storage api: Return.Effect run data modify storage api: Argument.ID set value 211 -# 一回エフェクトを消す - effect clear @s speed - effect clear @s slowness - effect clear @s[scores={CO.Tick=..400}] blindness - -# セットする - scoreboard players set @s CO.Tick 2400 - -# スタート - schedule function asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect 1t \ No newline at end of file +# 薄れゆく速さバフを付与 +# EffectAssetのendのタイミングでエフェクトをgiveしても上手くいかないため +# TODO: 治り次第直す + data modify storage api: Argument.ID set value 210 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/rejoin_process.mcfunction deleted file mode 100644 index ccf86a23c8..0000000000 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0456.potion_of_stalling_power/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -#リログ処理 - execute if entity @s[scores={CO.Tick=1..}] run function asset:artifact/0456.potion_of_stalling_power/trigger/3.1.effect \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/end.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/end.mcfunction new file mode 100644 index 0000000000..6c2848538e --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/given.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/given.mcfunction new file mode 100644 index 0000000000..b1771933c2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/re-given.mcfunction new file mode 100644 index 0000000000..35ae36cd1e --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/register.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/register.mcfunction new file mode 100644 index 0000000000..1406876f74 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/remove.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/remove.mcfunction new file mode 100644 index 0000000000..5223c1af59 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/_/tick.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/_/tick.mcfunction new file mode 100644 index 0000000000..5adcba0791 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0210.fading_speed/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:210} run function asset:effect/0210.fading_speed/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/end/.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/end/.mcfunction new file mode 100644 index 0000000000..aeff3b4348 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/end/.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0210.fading_speed/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0210.fading_speed/_/end + +# 補正を削除する + function asset:effect/0210.fading_speed/modifier/remove + +# 効果時間終了時、デバフを付与 + data modify storage api: Argument.ID set value 211 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/given/.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/given/.mcfunction new file mode 100644 index 0000000000..2651fda6c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0210.fading_speed/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0210.fading_speed/_/given + +# 補正を付与する + function asset:effect/0210.fading_speed/modifier/add diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/load.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/load.mcfunction new file mode 100644 index 0000000000..2c16b57e78 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/load.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0210.fading_speed/load +# +# Effectに利用するスコアボード等の初期化処理 +# ※ExtendsSafeを有効化した状態での使用は非推奨です +# +# @within tag/function asset:effect/load + +#> 定義類はここに +# @within function asset:effect/0210.fading_speed/** + scoreboard objectives add 5U.Tick dummy diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/modifier/add.mcfunction new file mode 100644 index 0000000000..6473ecdcc9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/modifier/add.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0210.fading_speed/modifier/add +# +# 補正を付与する +# +# @within function +# asset:effect/0210.fading_speed/given/ +# asset:effect/0210.fading_speed/re-given/ + +# 移動速度+80% + attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-00d200000000 "210.FadingSpeed" 0.8 multiply diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/modifier/remove.mcfunction new file mode 100644 index 0000000000..ca07ac4be1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/modifier/remove.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0210.fading_speed/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0210.fading_speed/end/ +# asset:effect/0210.fading_speed/re-given/ +# asset:effect/0210.fading_speed/remove/ + +# 移動速度バフを削除 + attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d200000000 + +# ついでにスコアもリセット + scoreboard players reset @s 5U.Tick diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/re-given/.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/re-given/.mcfunction new file mode 100644 index 0000000000..d89024d21c --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/re-given/.mcfunction @@ -0,0 +1,28 @@ +#> asset:effect/0210.fading_speed/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0210.fading_speed/_/re-given + +# 演出 + particle minecraft:dragon_breath ~ ~1 ~ 0.1 0.1 0.1 0.03 100 + playsound minecraft:entity.evoker.prepare_summon player @a + +# 最大体力の20%分の固定ダメージを受ける +# 5U.Tickが800以上なら50%の割合ダメージに変化 + execute store result storage api: Argument.Damage double 0.2 run attribute @s generic.max_health get + execute if entity @s[scores={5U.Tick=800..}] store result storage api: Argument.Damage double 0.5 run attribute @s generic.max_health get + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.FixedDamage set value true + data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは速度の代償を払った","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' + function api:damage/ + function api:damage/reset + +# スコアを初期化 + scoreboard players reset @s 5U.Tick + +# 補正を削除 + function asset:effect/0210.fading_speed/modifier/remove + +# 補正を付与 + function asset:effect/0210.fading_speed/modifier/add diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/register.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/register.mcfunction new file mode 100644 index 0000000000..aa366e2c13 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0210.fading_speed/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0210.fading_speed/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 210 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"薄れゆく速さ"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value '{"text":"移動速度が極端に上昇するが、徐々に低下していく"}' +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 1000 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/remove/.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/remove/.mcfunction new file mode 100644 index 0000000000..6c6f9859d4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0210.fading_speed/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0210.fading_speed/_/remove + +# 補正を削除する + function asset:effect/0210.fading_speed/modifier/remove diff --git a/Asset/data/asset/functions/effect/0210.fading_speed/tick/.mcfunction b/Asset/data/asset/functions/effect/0210.fading_speed/tick/.mcfunction new file mode 100644 index 0000000000..0394505e2c --- /dev/null +++ b/Asset/data/asset/functions/effect/0210.fading_speed/tick/.mcfunction @@ -0,0 +1,23 @@ +#> asset:effect/0210.fading_speed/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0210.fading_speed/_/tick + +# スコア + scoreboard players add @s 5U.Tick 1 + +# 初期速度 +80% +# 200tick経過するごとに移動速度-20% +# 0 - 199 80% +# 200 - 399 60% +# 400 - 599 40% +# 600 - 799 20% +# 800 - 999 0% + execute if entity @s[scores={5U.Tick=200}] run attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d200000000 + execute if entity @s[scores={5U.Tick=200}] run attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-00d200000000 "210.FadingSpeed" 0.6 multiply + execute if entity @s[scores={5U.Tick=400}] run attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d200000000 + execute if entity @s[scores={5U.Tick=400}] run attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-00d200000000 "210.FadingSpeed" 0.4 multiply + execute if entity @s[scores={5U.Tick=600}] run attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d200000000 + execute if entity @s[scores={5U.Tick=600}] run attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-00d200000000 "210.FadingSpeed" 0.2 multiply + execute if entity @s[scores={5U.Tick=800}] run attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d200000000 diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/_/end.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/_/end.mcfunction new file mode 100644 index 0000000000..d50163c456 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0211.fading_speed/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:211} run function asset:effect/0211.fading_speed/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/_/given.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/_/given.mcfunction new file mode 100644 index 0000000000..aca574c81d --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0211.fading_speed/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:211} run function asset:effect/0211.fading_speed/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/_/re-given.mcfunction new file mode 100644 index 0000000000..3e7cadbe5f --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0211.fading_speed/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:211} run function asset:effect/0211.fading_speed/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/_/register.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/_/register.mcfunction new file mode 100644 index 0000000000..6cbb5ec1f3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0211.fading_speed/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:211} run function asset:effect/0211.fading_speed/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/_/remove.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/_/remove.mcfunction new file mode 100644 index 0000000000..9635d7a118 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0211.fading_speed/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:211} run function asset:effect/0211.fading_speed/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/end/.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/end/.mcfunction new file mode 100644 index 0000000000..d6c1359e60 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0211.fading_speed/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0211.fading_speed/_/end + +# 補正を削除する + function asset:effect/0211.fading_speed/modifier/remove diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/given/.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/given/.mcfunction new file mode 100644 index 0000000000..c1e38027dc --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/given/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0211.fading_speed/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0211.fading_speed/_/given + +# 補正を付与する + function asset:effect/0211.fading_speed/modifier/add + diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/modifier/add.mcfunction new file mode 100644 index 0000000000..ad32fb6bdd --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/modifier/add.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0211.fading_speed/modifier/add +# +# 補正を付与する +# +# @within function asset:effect/0211.fading_speed/given/ + +# 移動速度低下-20% + attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-00d300000000 "211.fading_speed" -0.2 multiply + diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/modifier/remove.mcfunction new file mode 100644 index 0000000000..215ed451df --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0211.fading_speed/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0211.fading_speed/end/ +# asset:effect/0211.fading_speed/re-given/ +# asset:effect/0211.fading_speed/remove/ + +# 移動速度デバフを削除 + attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-00d300000000 diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/re-given/.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/re-given/.mcfunction new file mode 100644 index 0000000000..663f1876bc --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/re-given/.mcfunction @@ -0,0 +1,23 @@ +#> asset:effect/0211.fading_speed/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0211.fading_speed/_/re-given + +# 演出 + particle minecraft:dragon_breath ~ ~1 ~ 0.1 0.1 0.1 0.03 100 + playsound minecraft:entity.evoker.prepare_summon player @a + +# 最大体力の50%分の固定ダメージを受ける + execute store result storage api: Argument.Damage double 0.5 run attribute @s generic.max_health get + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.FixedDamage set value true + data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは速度の代償を払った","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' + function api:damage/ + function api:damage/reset + +# 薄れゆく速さデバフを解除し、薄れゆく速さバフを付与 + data modify storage api: Argument.ID set value 211 + function api:entity/mob/effect/remove/from_id + data modify storage api: Argument.ID set value 210 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/register.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/register.mcfunction new file mode 100644 index 0000000000..2777bf77c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0211.fading_speed/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0211.fading_speed/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 211 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"薄れゆく速さ"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value '{"text":"移動速度が大きく低下する"}' +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 400 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 400 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0211.fading_speed/remove/.mcfunction b/Asset/data/asset/functions/effect/0211.fading_speed/remove/.mcfunction new file mode 100644 index 0000000000..40b88e6129 --- /dev/null +++ b/Asset/data/asset/functions/effect/0211.fading_speed/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0211.fading_speed/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0211.fading_speed/_/remove + +# 補正を削除する + function asset:effect/0211.fading_speed/modifier/remove diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index 66f0947310..4c712e16cb 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -49,7 +49,6 @@ "asset:artifact/0152.call_cat/trigger/0.load", "asset:artifact/0295.call_elemental_familiar/trigger/0.load", "asset:artifact/0278.reveille/trigger/0.load", - "asset:artifact/0456.potion_of_stalling_power/trigger/0.load", "asset:artifact/0078.self_destruct_order/trigger/0.load", "asset:artifact/0573.final_prism/trigger/0.load", "asset:artifact/0210.terra_blade/trigger/0.load", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index a312ed37d7..b4a0e8c52e 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -33,6 +33,8 @@ "asset:effect/0608.sinking/_/end", "asset:effect/0612.infringement/_/end", "asset:effect/0613.white_curse/_/end", + "asset:effect/0210.fading_speed/_/end", + "asset:effect/0211.fading_speed/_/end", "asset:effect/0203.secret_meat/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 0f5b86caa4..d7cd4490c5 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -31,6 +31,8 @@ "asset:effect/0608.sinking/_/given", "asset:effect/0612.infringement/_/given", "asset:effect/0613.white_curse/_/given", + "asset:effect/0211.fading_speed/_/given", + "asset:effect/0210.fading_speed/_/given", "asset:effect/0203.secret_meat/_/given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/load.json b/Asset/data/asset/tags/functions/effect/load.json index 2d25c8f4e6..fef4eaa086 100644 --- a/Asset/data/asset/tags/functions/effect/load.json +++ b/Asset/data/asset/tags/functions/effect/load.json @@ -1,5 +1,6 @@ { "values": [ - "asset:effect/0605.aurora_corrosion/load" + "asset:effect/0605.aurora_corrosion/load", + "asset:effect/0210.fading_speed/load" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index 0e31070541..19ebd203f1 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -9,6 +9,8 @@ "asset:effect/0607.sedation/_/re-given", "asset:effect/0608.sinking/_/re-given", "asset:effect/0612.infringement/_/re-given", - "asset:effect/0613.white_curse/_/re-given" + "asset:effect/0613.white_curse/_/re-given", + "asset:effect/0211.fading_speed/_/re-given", + "asset:effect/0210.fading_speed/_/re-given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index ab1ab74627..067f598329 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -37,6 +37,8 @@ "asset:effect/0608.sinking/_/register", "asset:effect/0612.infringement/_/register", "asset:effect/0613.white_curse/_/register", + "asset:effect/0210.fading_speed/_/register", + "asset:effect/0211.fading_speed/_/register", "asset:effect/0203.secret_meat/_/register" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index eddf384632..9fc87ab5a7 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -31,6 +31,8 @@ "asset:effect/0608.sinking/_/remove", "asset:effect/0612.infringement/_/remove", "asset:effect/0613.white_curse/_/remove", + "asset:effect/0210.fading_speed/_/remove", + "asset:effect/0211.fading_speed/_/remove", "asset:effect/0203.secret_meat/_/remove" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 07f93c5dd0..6beb6ac7fc 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -29,6 +29,7 @@ "asset:effect/0608.sinking/_/tick", "asset:effect/0612.infringement/_/tick", "asset:effect/0613.white_curse/_/tick", + "asset:effect/0210.fading_speed/_/tick", "asset:effect/0203.secret_meat/_/tick" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index 634c515fb2..0c6eb4fa82 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -52,7 +52,6 @@ "asset:artifact/0033.magic_shield/trigger/rejoin_process", "asset:artifact/0077.swords_of_waterfall_climbing/trigger/rejoin_process", "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", - "asset:artifact/0456.potion_of_stalling_power/trigger/rejoin_process", "asset:mob/0129.lexiel/rejoin_process", "asset:artifact/0261.holy_symbol_lv.1/trigger/rejoin_process", "asset:artifact/0265.holy_symbol_lv.5/trigger/rejoin_process", From 58ae12352053dc9cf9a46c0e85fb9a839497fe1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:04:05 +0900 Subject: [PATCH 32/74] =?UTF-8?q?=E2=9A=96=EF=B8=8F=20[=E7=A5=9E=E5=99=A88?= =?UTF-8?q?98=20&=20Effect261]=20=E7=96=BE=E9=A2=A8=E3=81=AE=E3=83=9A?= =?UTF-8?q?=E3=83=B3=E3=83=80=E3=83=B3=E3=83=88=E3=81=AE=E3=83=AA=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=82=AF=20(#230)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0898.gale_pendant/give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 5 +-- .../trigger/add_modifier.mcfunction | 27 -------------- .../0898.gale_pendant/trigger/buff.mcfunction | 18 ++++++++++ .../trigger/dis_equip/main.mcfunction | 6 ++-- .../0261.gale_blessing/_/end.mcfunction | 7 ++++ .../0261.gale_blessing/_/given.mcfunction | 7 ++++ .../0261.gale_blessing/_/re-given.mcfunction | 7 ++++ .../0261.gale_blessing/_/register.mcfunction | 7 ++++ .../0261.gale_blessing/_/remove.mcfunction | 7 ++++ .../0261.gale_blessing/_/tick.mcfunction | 7 ++++ .../0261.gale_blessing/_index.d.mcfunction | 6 ++++ .../effect/0261.gale_blessing/end/.mcfunction | 8 +++++ .../0261.gale_blessing/given/.mcfunction | 8 +++++ .../modfier/add.m.mcfunction | 12 +++++++ .../0261.gale_blessing/modfier/add.mcfunction | 15 ++++++++ .../modfier/remove.mcfunction | 15 ++++++++ .../0261.gale_blessing/re-given/.mcfunction | 9 +++++ .../0261.gale_blessing/register.mcfunction | 35 +++++++++++++++++++ .../0261.gale_blessing/remove/.mcfunction | 8 +++++ .../0261.gale_blessing/tick/.mcfunction | 13 +++++++ .../data/asset/tags/functions/effect/end.json | 1 + .../asset/tags/functions/effect/given.json | 1 + .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 1 + .../asset/tags/functions/effect/remove.json | 1 + .../asset/tags/functions/effect/tick.json | 1 + 27 files changed, 202 insertions(+), 35 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/add_modifier.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/buff.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.m.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/modfier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0261.gale_blessing/tick/.mcfunction diff --git a/Asset/data/asset/functions/artifact/0898.gale_pendant/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0898.gale_pendant/give/2.give.mcfunction index 8e1236d015..376a0503f2 100644 --- a/Asset/data/asset/functions/artifact/0898.gale_pendant/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0898.gale_pendant/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"疾風のペンダント","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"風の力を蓄えたペンダント"}','{"text":"付けると体が軽くなる"}'] + data modify storage asset:artifact Lore set value ['{"text":"非戦闘時、移動速度が大きく上昇する。","color":"white"}','{"text":"風の力を蓄えたペンダント。","color":"gray"}','{"text":"付けると体が軽くなる。","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/3.main.mcfunction index e7507b20e5..8329dece01 100644 --- a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/3.main.mcfunction @@ -12,5 +12,6 @@ # VFX playsound block.beacon.activate player @a ~ ~ ~ 1 1.3 particle dust 0.2 0.9 10000000 0.7 ~ ~1 ~ 0.5 0.8 0.5 1 100 -# 補正を追加 - function asset:artifact/0898.gale_pendant/trigger/add_modifier \ No newline at end of file + +# バフを付与 + function asset:artifact/0898.gale_pendant/trigger/buff diff --git a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/add_modifier.mcfunction b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/add_modifier.mcfunction deleted file mode 100644 index db2b5c0585..0000000000 --- a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/add_modifier.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -#> asset:artifact/0898.gale_pendant/trigger/add_modifier -# -# -# -# @within function asset:artifact/0898.gale_pendant/trigger/**main - -#> 個数 -# @private -#declare score_holder $Count - -# 補正を削除 - attribute @s generic.movement_speed modifier remove 1-0-1-0-38200000007 -# 個数を取得 - execute store result score $Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:898}}}] -# 速度増加を付与する - execute if score $Count Temporary matches 1 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 0.2 multiply_base - execute if score $Count Temporary matches 2 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 0.4 multiply_base - execute if score $Count Temporary matches 3 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 0.6 multiply_base - execute if score $Count Temporary matches 4 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 0.8 multiply_base - execute if score $Count Temporary matches 5 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 1.0 multiply_base - execute if score $Count Temporary matches 6 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 1.2 multiply_base - execute if score $Count Temporary matches 7 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 1.4 multiply_base - execute if score $Count Temporary matches 8 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 1.6 multiply_base - execute if score $Count Temporary matches 9 run attribute @s generic.movement_speed modifier add 1-0-1-0-38200000007 "898" 1.8 multiply_base - -# リセット - scoreboard players reset $Count Temporary \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/buff.mcfunction b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/buff.mcfunction new file mode 100644 index 0000000000..996dcc8069 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/buff.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/0898.gale_pendant/trigger/buff +# +# バフを付与する +# +# @within function asset:artifact/0898.gale_pendant/trigger/**main + +# バフを解除する + data modify storage api: Argument.ID set value 261 + function api:entity/mob/effect/remove/from_id + +# 所持数が0ならreturn + execute unless data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:898}}}] run return 0 + +# 疾風の加護(ID:261)を付与する +# Stack = 所持数 + data modify storage api: Argument.ID set value 261 + execute store result storage api: Argument.Stack int 1 if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:898}}}] + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/dis_equip/main.mcfunction index d53356133d..a7311c4be8 100644 --- a/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0898.gale_pendant/trigger/dis_equip/main.mcfunction @@ -4,7 +4,5 @@ # # @within function asset:artifact/0898.gale_pendant/trigger/dis_equip/ -# 補正を削除 - attribute @s generic.movement_speed modifier remove 1-0-1-0-38200000007 -# 補正を追加 - execute unless entity @s[tag=!DevPrivilege,predicate=!player_manager:is_believe/flora,predicate=!player_manager:is_believe/nyaptov] run function asset:artifact/0898.gale_pendant/trigger/add_modifier \ No newline at end of file +# バフを付与 + execute unless entity @s[tag=!DevPrivilege,predicate=!player_manager:is_believe/flora,predicate=!player_manager:is_believe/nyaptov] run function asset:artifact/0898.gale_pendant/trigger/buff diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/end.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/end.mcfunction new file mode 100644 index 0000000000..a1109a6051 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/given.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/given.mcfunction new file mode 100644 index 0000000000..5cdc65a71d --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/re-given.mcfunction new file mode 100644 index 0000000000..8057039c79 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/register.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/register.mcfunction new file mode 100644 index 0000000000..f6c8559885 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/remove.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/remove.mcfunction new file mode 100644 index 0000000000..cba032786b --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_/tick.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_/tick.mcfunction new file mode 100644 index 0000000000..80a2c1e285 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0261.gale_blessing/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:261} run function asset:effect/0261.gale_blessing/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/_index.d.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/_index.d.mcfunction new file mode 100644 index 0000000000..0861fdd25f --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0261.gale_blessing/_index.d +# @private + +#> 0261.gale_blessing +# @within function asset:effect/0261.gale_blessing/** + #declare tag 79.InBattle diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/end/.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/end/.mcfunction new file mode 100644 index 0000000000..3a41a8a12c --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0261.gale_blessing/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0261.gale_blessing/_/end + +# 補正を削除する + function asset:effect/0261.gale_blessing/modfier/remove diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/given/.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/given/.mcfunction new file mode 100644 index 0000000000..c5be75fc3d --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0261.gale_blessing/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0261.gale_blessing/_/given + +# 補正を付与する + function asset:effect/0261.gale_blessing/modfier/add diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.m.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.m.mcfunction new file mode 100644 index 0000000000..dade615948 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.m.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0261.gale_blessing/modfier/add.m +# +# 補正を付与する +# +# @input args +# Value: double +# +# @within function asset:effect/0261.gale_blessing/modfier/add + +# 移動速度バフ付与 +# 装備時にのみ付与されるエフェクトであるため、multiplyではなくmultiply_base + $attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-010500000000 "261.Speed" $(Value) multiply_base diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.mcfunction new file mode 100644 index 0000000000..7678787483 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/add.mcfunction @@ -0,0 +1,15 @@ +#> asset:effect/0261.gale_blessing/modfier/add +# +# 補正を付与する +# +# @within function +# asset:effect/0261.gale_blessing/given/ +# asset:effect/0261.gale_blessing/re-given/ +# asset:effect/0261.gale_blessing/tick/ + +# 移動速度を(40*Stack)%付与 + execute store result storage asset:temp Effect.Value double 0.4 run data get storage asset:context Stack 1 + function asset:effect/0261.gale_blessing/modfier/add.m with storage asset:temp Effect + +# リセット + data remove storage asset:temp Effect diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/remove.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/remove.mcfunction new file mode 100644 index 0000000000..c05dda2ba7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/modfier/remove.mcfunction @@ -0,0 +1,15 @@ +#> asset:effect/0261.gale_blessing/modfier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0261.gale_blessing/end/ +# asset:effect/0261.gale_blessing/re-given/ +# asset:effect/0261.gale_blessing/remove/ +# asset:effect/0261.gale_blessing/tick/ + +# 移動速度バフ削除 + attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-010500000000 + +# Tag削除 + tag @s remove 79.InBattle diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/re-given/.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/re-given/.mcfunction new file mode 100644 index 0000000000..1f7fa3c712 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/re-given/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0261.gale_blessing/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0261.gale_blessing/_/re-given + +# 補正を削除し、再度付与 + function asset:effect/0261.gale_blessing/modfier/remove + function asset:effect/0261.gale_blessing/modfier/add diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/register.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/register.mcfunction new file mode 100644 index 0000000000..717aebb377 --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0261.gale_blessing/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0261.gale_blessing/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 261 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"疾風の加護","color":"aqua"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"非戦闘時、移動速度が大きく上昇する"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/remove/.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/remove/.mcfunction new file mode 100644 index 0000000000..356676cc9f --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0261.gale_blessing/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0261.gale_blessing/_/remove + +# 補正を削除する + function asset:effect/0261.gale_blessing/modfier/remove diff --git a/Asset/data/asset/functions/effect/0261.gale_blessing/tick/.mcfunction b/Asset/data/asset/functions/effect/0261.gale_blessing/tick/.mcfunction new file mode 100644 index 0000000000..1dba7c11fa --- /dev/null +++ b/Asset/data/asset/functions/effect/0261.gale_blessing/tick/.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0261.gale_blessing/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0261.gale_blessing/_/tick + +# 戦闘中ならバフを解除 + execute if predicate lib:in_battle if entity @s[tag=!79.InBattle] run function asset:effect/0261.gale_blessing/modfier/remove + execute if predicate lib:in_battle if entity @s[tag=!79.InBattle] run tag @s add 79.InBattle + +# 戦闘が解除されたらバフを付与 + execute unless predicate lib:in_battle if entity @s[tag=79.InBattle] run function asset:effect/0261.gale_blessing/modfier/add + execute unless predicate lib:in_battle if entity @s[tag=79.InBattle] run tag @s remove 79.InBattle diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index b4a0e8c52e..d85f3704da 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -33,6 +33,7 @@ "asset:effect/0608.sinking/_/end", "asset:effect/0612.infringement/_/end", "asset:effect/0613.white_curse/_/end", + "asset:effect/0261.gale_blessing/_/end", "asset:effect/0210.fading_speed/_/end", "asset:effect/0211.fading_speed/_/end", "asset:effect/0203.secret_meat/_/end" diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index d7cd4490c5..638bc465e5 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -31,6 +31,7 @@ "asset:effect/0608.sinking/_/given", "asset:effect/0612.infringement/_/given", "asset:effect/0613.white_curse/_/given", + "asset:effect/0261.gale_blessing/_/given", "asset:effect/0211.fading_speed/_/given", "asset:effect/0210.fading_speed/_/given", "asset:effect/0203.secret_meat/_/given" diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index 19ebd203f1..a1ae8da052 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -10,7 +10,8 @@ "asset:effect/0608.sinking/_/re-given", "asset:effect/0612.infringement/_/re-given", "asset:effect/0613.white_curse/_/re-given", + "asset:effect/0261.gale_blessing/_/re-given" "asset:effect/0211.fading_speed/_/re-given", "asset:effect/0210.fading_speed/_/re-given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 067f598329..58f40ced25 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -37,6 +37,7 @@ "asset:effect/0608.sinking/_/register", "asset:effect/0612.infringement/_/register", "asset:effect/0613.white_curse/_/register", + "asset:effect/0261.gale_blessing/_/register", "asset:effect/0210.fading_speed/_/register", "asset:effect/0211.fading_speed/_/register", "asset:effect/0203.secret_meat/_/register" diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 9fc87ab5a7..cef1eaf18c 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -31,6 +31,7 @@ "asset:effect/0608.sinking/_/remove", "asset:effect/0612.infringement/_/remove", "asset:effect/0613.white_curse/_/remove", + "asset:effect/0261.gale_blessing/_/remove", "asset:effect/0210.fading_speed/_/remove", "asset:effect/0211.fading_speed/_/remove", "asset:effect/0203.secret_meat/_/remove" diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 6beb6ac7fc..a9ee249c62 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -29,6 +29,7 @@ "asset:effect/0608.sinking/_/tick", "asset:effect/0612.infringement/_/tick", "asset:effect/0613.white_curse/_/tick", + "asset:effect/0261.gale_blessing/_/tick", "asset:effect/0210.fading_speed/_/tick", "asset:effect/0203.secret_meat/_/tick" ] From 4f57ee1a7bdabc07bf42fff0ea147c243a28b0f2 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 08:51:09 +0900 Subject: [PATCH 33/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81145]?= =?UTF-8?q?=20=E3=83=8A=E3=83=BC=E3=82=B9=E3=82=B3=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1145.nurse_call/give/1.trigger.mcfunction | 7 +++ .../1145.nurse_call/give/2.give.mcfunction | 61 +++++++++++++++++++ .../1145.nurse_call/register.mcfunction | 7 +++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1145.nurse_call/trigger/3.main.mcfunction | 16 +++++ .../object/1060.medic/init/.mcfunction | 11 ++++ .../object/1060.medic/register.mcfunction | 20 ++++++ .../object/1060.medic/summon/.mcfunction | 8 +++ .../object/1060.medic/summon/debug.mcfunction | 10 +++ .../1060.medic/summon/macro.m.mcfunction | 7 +++ .../object/1060.medic/tick/.mcfunction | 35 +++++++++++ .../object/1060.medic/tick/circle.mcfunction | 33 ++++++++++ .../object/1060.medic/tick/heal.mcfunction | 26 ++++++++ .../object/1060.medic/tick/remove.mcfunction | 11 ++++ .../object/1060.medic/tick/vfx.mcfunction | 11 ++++ .../object/alias/1060/init.mcfunction | 8 +++ .../object/alias/1060/register.mcfunction | 8 +++ .../object/alias/1060/summon.mcfunction | 8 +++ .../object/alias/1060/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 23 files changed, 321 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1145.nurse_call/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/summon/macro.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/tick/circle.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/tick/heal.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/tick/remove.mcfunction create mode 100644 Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1060/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1060/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1060/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1060/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/give/1.trigger.mcfunction new file mode 100644 index 0000000000..3e568cce46 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1145.nurse_call/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1145} run function asset:artifact/1145.nurse_call/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/give/2.give.mcfunction new file mode 100644 index 0000000000..dbd3c100e2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1145.nurse_call/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1145.nurse_call/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1145 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ナースコール","color":"#FFFFFF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"一定時間回復をしてくれるメディックを召喚する"}','{"text":" "}','{"text":"彼女はあなたのためにその身を削る","color":"gray"}','{"text":"自己犠牲のもとに、彼女の治癒は成り立つ","color":"gray"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 190 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 500 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/register.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/register.mcfunction new file mode 100644 index 0000000000..bb39ca8193 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1145.nurse_call/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1145] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..8526b82ad7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1145.nurse_call/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1145} run function asset:artifact/1145.nurse_call/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..54c167cd48 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1145.nurse_call/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1145.nurse_call/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1145.nurse_call/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/3.main.mcfunction new file mode 100644 index 0000000000..3cad2e4645 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1145.nurse_call/trigger/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1145.nurse_call/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1145.nurse_call/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 召喚 + data modify storage api: Argument.ID set value 1060 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/object/1060.medic/init/.mcfunction b/Asset/data/asset/functions/object/1060.medic/init/.mcfunction new file mode 100644 index 0000000000..2f4989084d --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/init/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1060.medic/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1060/init + + +# 演出 + playsound minecraft:entity.puffer_fish.death neutral @a ~ ~ ~ 1 1.5 + playsound minecraft:entity.allay.hurt neutral @a ~ ~ ~ 1 1.4 + particle cloud ~ ~1.4 ~ 0 0.5 0 0.05 20 diff --git a/Asset/data/asset/functions/object/1060.medic/register.mcfunction b/Asset/data/asset/functions/object/1060.medic/register.mcfunction new file mode 100644 index 0000000000..744257e344 --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1060.medic/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1060/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 1060 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1060.medic/summon/.mcfunction b/Asset/data/asset/functions/object/1060.medic/summon/.mcfunction new file mode 100644 index 0000000000..c7466cbb16 --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1060.medic/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1060/summon + +# 元となるEntityを召喚する + function asset:object/1060.medic/summon/macro.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1060.medic/summon/debug.mcfunction b/Asset/data/asset/functions/object/1060.medic/summon/debug.mcfunction new file mode 100644 index 0000000000..dcef2c8edc --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1060.medic/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1060 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1060.medic/summon/macro.m.mcfunction b/Asset/data/asset/functions/object/1060.medic/summon/macro.m.mcfunction new file mode 100644 index 0000000000..e2358bdc18 --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/summon/macro.m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1060.medic/summon/macro.m +# +# +# +# @within function asset:object/1060.medic/summon/ + + $summon armor_stand ~ ~ ~ {Marker:1b,Invisible:1b,NoBasePlate:1b,Tags:["ObjectInit","Friend"],Pose:{LeftArm:[323f,36f,0f],RightArm:[321f,322f,0f]},DisabledSlots:4144959,HandItems:[{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20441}},{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20442}}],ArmorItems:[{},{},{},{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20440}}],Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/1060.medic/tick/.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/.mcfunction new file mode 100644 index 0000000000..e377ae74b2 --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/tick/.mcfunction @@ -0,0 +1,35 @@ +#> asset:object/1060.medic/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1060/tick + +#> private +# @private + #declare score_holder $Interval + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + + +# 40tickおきに実行するやつ +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Object.Tick +# 40tickおきに実行 + scoreboard players operation $Interval Temporary %= $40 Const + execute if score $Interval Temporary matches 0 run function asset:object/1060.medic/tick/heal +# リセット + scoreboard players reset $Interval + +# 4tickおきに実行するやつ +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Object.Tick +# 4tickおきに実行 + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 rotated ~ 0 positioned ~ ~0.4 ~ run function asset:object/1060.medic/tick/circle +# リセット + scoreboard players reset $Interval + + +# 消滅処理 + execute if score @s General.Object.Tick matches 400.. run function asset:object/1060.medic/tick/remove diff --git a/Asset/data/asset/functions/object/1060.medic/tick/circle.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/circle.mcfunction new file mode 100644 index 0000000000..89cb10c6df --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/tick/circle.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/1060.medic/tick/circle +# +# +# +# @within function asset:object/1060.medic/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAKykAsARgJwAcATHQLQMCMKHNAZvy7smNAGwt2XUZS6kAzCjgoADJTAEAdgEMAtgmSAwxQAEXDWBjaMegM5JwKAPaFNEJC0oElruBntgAN21sQgNwAA8kFQIoKIBfOIJrUjRCO0RPMBsIKzdEaLA4bGw0GBsDLhUCjEcciAMCtBsAUWLS8uaAR0Jg7CgAZUslckR+YPKEgF0gA_3 +# 円 1 +particle composter ^0 ^ ^-5 0 0 0 0 1 +particle composter ^1.24345 ^ ^-4.84292 0 0 0 0 1 +particle composter ^2.40877 ^ ^-4.38153 0 0 0 0 1 +particle composter ^3.42274 ^ ^-3.64484 0 0 0 0 1 +particle composter ^4.22164 ^ ^-2.67913 0 0 0 0 1 +particle composter ^4.75528 ^ ^-1.54508 0 0 0 0 1 +particle composter ^4.99013 ^ ^-0.31395 0 0 0 0 1 +particle composter ^4.91144 ^ ^0.93691 0 0 0 0 1 +particle composter ^4.52414 ^ ^2.1289 0 0 0 0 1 +particle composter ^3.85257 ^ ^3.18712 0 0 0 0 1 +particle composter ^2.93893 ^ ^4.04508 0 0 0 0 1 +particle composter ^1.84062 ^ ^4.64888 0 0 0 0 1 +particle composter ^0.62667 ^ ^4.96057 0 0 0 0 1 +particle composter ^-0.62667 ^ ^4.96057 0 0 0 0 1 +particle composter ^-1.84062 ^ ^4.64888 0 0 0 0 1 +particle composter ^-2.93893 ^ ^4.04508 0 0 0 0 1 +particle composter ^-3.85257 ^ ^3.18712 0 0 0 0 1 +particle composter ^-4.52414 ^ ^2.1289 0 0 0 0 1 +particle composter ^-4.91144 ^ ^0.93691 0 0 0 0 1 +particle composter ^-4.99013 ^ ^-0.31395 0 0 0 0 1 +particle composter ^-4.75528 ^ ^-1.54508 0 0 0 0 1 +particle composter ^-4.22164 ^ ^-2.67913 0 0 0 0 1 +particle composter ^-3.42274 ^ ^-3.64484 0 0 0 0 1 +particle composter ^-2.40877 ^ ^-4.38153 0 0 0 0 1 +particle composter ^-1.24345 ^ ^-4.84292 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1060.medic/tick/heal.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/heal.mcfunction new file mode 100644 index 0000000000..9c9c715c3a --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/tick/heal.mcfunction @@ -0,0 +1,26 @@ +#> asset:object/1060.medic/tick/heal +# +# +# +# @within function asset:object/1060.medic/tick/ + +#> private +# @private + #declare score_holder $OwnerID + +# 演出 + execute at @a[distance=..5] run function asset:object/1060.medic/tick/vfx + +# 確率で声を出す。 + execute if predicate lib:random_pass_per/30 run playsound minecraft:entity.allay.hurt neutral @a ~ ~ ~ 1 1.4 + +# HP回復量 + data modify storage api: Argument.Heal set value 10f +# 補正 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run function api:heal/modifier +# 実行 + execute as @a[distance=..5] run function api:heal/ +# リセット + function api:heal/reset + scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/object/1060.medic/tick/remove.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/remove.mcfunction new file mode 100644 index 0000000000..502f0531d6 --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/tick/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1060.medic/tick/remove +# +# +# +# @within function asset:object/1060.medic/tick/ + +# 演出 + playsound minecraft:entity.allay.death neutral @a ~ ~ ~ 1 1.6 + particle minecraft:enchant ~ ~1 ~ 0.2 0.5 0.2 0 100 +# 死 + kill @s diff --git a/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction new file mode 100644 index 0000000000..5208a4647f --- /dev/null +++ b/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1060.medic/tick/heal +# +# +# +# @within function asset:object/1060.medic/tick/heal + +# 演出 + particle dust 0.8 1 0.753 1 ~ ~1.5 ~ 0.3 0.5 0.3 0 20 + playsound entity.breeze.inhale neutral @a ~ ~ ~ 1 1 + playsound minecraft:block.beacon.activate neutral @a ~ ~ ~ 1 2 + playsound ogg:mob.vex.idle1 neutral @a ~ ~ ~ 0.8 0 0 diff --git a/Asset/data/asset/functions/object/alias/1060/init.mcfunction b/Asset/data/asset/functions/object/alias/1060/init.mcfunction new file mode 100644 index 0000000000..4fa9c3e632 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1060/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1060/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1060.medic/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1060/register.mcfunction b/Asset/data/asset/functions/object/alias/1060/register.mcfunction new file mode 100644 index 0000000000..97714a10b7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1060/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1060/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1060.medic/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1060/summon.mcfunction b/Asset/data/asset/functions/object/alias/1060/summon.mcfunction new file mode 100644 index 0000000000..cb70501196 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1060/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1060/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1060.medic/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1060/tick.mcfunction b/Asset/data/asset/functions/object/alias/1060/tick.mcfunction new file mode 100644 index 0000000000..1da5a22d72 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1060/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1060/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1060.medic/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 4cb0d676c9..318b034dce 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1145.nurse_call/trigger/1.trigger", "asset:artifact/0002.blessing/trigger/1.trigger", "asset:artifact/1024.brave_rod/trigger/1.trigger", "asset:artifact/0999.sextaple_ultima/trigger/1.trigger", @@ -124,4 +125,4 @@ "asset:artifact/0269.holy_symbol_lv.10/trigger/1.trigger", "asset:artifact/0270.angel_ray_lv.10/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index bdfb4b226f..f7a5c250f4 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1145.nurse_call/give/1.trigger", "asset:artifact/0730.lake_reflecting_starry_sky/give/1.trigger", "asset:artifact/0002.blessing/give/1.trigger", "asset:artifact/1108.white_lily_of_priestess/give/1.trigger", @@ -382,4 +383,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index fe53f3e942..ae885b6a55 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1145.nurse_call/register", "asset:artifact/0003.humanity/register", "asset:artifact/0005.musket_matchlock/register", "asset:artifact/0007.nitrogen_fixater/register", @@ -253,4 +254,4 @@ "asset:artifact/1106.rainbow_candy/register", "asset:artifact/1108.white_lily_of_priestess/register" ] -} +} \ No newline at end of file From 716f0ababe3be551b6141be0c5193c03f63df3db Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:17:23 +0900 Subject: [PATCH 34/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81142]?= =?UTF-8?q?=20=E8=8B=B1=E9=9C=8A=E3=81=AE=E6=9B=B8=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=20(#379)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../give/1.trigger.mcfunction | 7 +++ .../1142.book_of_hero/give/2.give.mcfunction | 61 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 15 +++++ .../1059.book_of_hero/_index.d.mcfunction | 7 +++ .../object/1059.book_of_hero/init/.mcfunction | 9 +++ .../object/1059.book_of_hero/load.mcfunction | 9 +++ .../1059.book_of_hero/register.mcfunction | 20 ++++++ .../1059.book_of_hero/summon/.mcfunction | 8 +++ .../1059.book_of_hero/summon/debug.mcfunction | 10 +++ .../object/1059.book_of_hero/tick/.mcfunction | 51 ++++++++++++++++ .../1059.book_of_hero/tick/attack.mcfunction | 48 +++++++++++++++ .../tick/calc_damage.mcfunction | 18 ++++++ .../1059.book_of_hero/tick/vfx.mcfunction | 12 ++++ .../object/alias/1059/init.mcfunction | 8 +++ .../object/alias/1059/register.mcfunction | 8 +++ .../object/alias/1059/summon.mcfunction | 8 +++ .../object/alias/1059/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + .../asset/tags/functions/object/load.json | 3 +- 22 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1142.book_of_hero/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1142.book_of_hero/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/tick/calc_damage.mcfunction create mode 100644 Asset/data/asset/functions/object/1059.book_of_hero/tick/vfx.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1059/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1059/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1059/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1059/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1142.book_of_hero/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1142.book_of_hero/give/1.trigger.mcfunction new file mode 100644 index 0000000000..bcd4aced10 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1142.book_of_hero/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1142.book_of_hero/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1142} run function asset:artifact/1142.book_of_hero/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1142.book_of_hero/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1142.book_of_hero/give/2.give.mcfunction new file mode 100644 index 0000000000..28fdd5b6e5 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1142.book_of_hero/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1142.book_of_hero/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1142.book_of_hero/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1142 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"英霊の書","color":"white"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"あなたと共に強くなる本。","color":"white"}','{"text":"心強い味方になるだろう。","color":"white"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value "???" +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 80 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 300 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..725bf75de0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1142.book_of_hero/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1142} run function asset:artifact/1142.book_of_hero/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..d22d211d87 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1142.book_of_hero/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1142.book_of_hero/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1142.book_of_hero/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/3.main.mcfunction new file mode 100644 index 0000000000..ef664f51ad --- /dev/null +++ b/Asset/data/asset/functions/artifact/1142.book_of_hero/trigger/3.main.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1142.book_of_hero/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1142.book_of_hero/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 召喚 + data modify storage api: Argument.ID set value 1059 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/_index.d.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/_index.d.mcfunction new file mode 100644 index 0000000000..4e0f7bff47 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1059.book_of_hero/_index.d +# @private + +#> tag +# @within function asset:object/1059.book_of_hero/** + #declare score_holder $OwnerID + #declare tag 1059.OwnerPlayer diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/init/.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/init/.mcfunction new file mode 100644 index 0000000000..98ad0d607f --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/init/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1059.book_of_hero/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1059/init + +# 召喚演出 + playsound minecraft:entity.zombie_villager.cure neutral @a ~ ~ ~ 1 2 + particle reverse_portal ~ ~1 ~ 0.2 0.2 0.2 0.4 50 diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/load.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/load.mcfunction new file mode 100644 index 0000000000..35710867f0 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1059.book_of_hero/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1059.book_of_hero/** + scoreboard objectives add 1059.ActionTime dummy diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/register.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/register.mcfunction new file mode 100644 index 0000000000..e2f74bd164 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1059.book_of_hero/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1059/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 1059 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/summon/.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/summon/.mcfunction new file mode 100644 index 0000000000..530ee856b2 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1059.book_of_hero/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1059/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit","Friend"],teleport_duration:1,item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16101097},CustomModelData:20138}}} diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/summon/debug.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/summon/debug.mcfunction new file mode 100644 index 0000000000..42a71a7194 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1059.book_of_hero/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1059 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction new file mode 100644 index 0000000000..1addad4875 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction @@ -0,0 +1,51 @@ +#> asset:object/1059.book_of_hero/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1059/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 同IDのプレイヤーを特定 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a[distance=..60] if score $OwnerID Temporary = @p UserID as @p run tag @s add 1059.OwnerPlayer + +# だいたい本からコピー。 +# パーティクル + particle enchant ~ ~ ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] + +# 接地で上を向く + execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + +# 周囲にプレイヤーがいない場合、プレイヤーを追尾 + execute unless entity @p[tag=1059.OwnerPlayer,distance=..8] facing entity @p[tag=1059.OwnerPlayer] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ + +# 周囲にプレイヤーがいる場合、かつ敵がいない場合、プレイヤーを追尾 + execute if entity @p[tag=1059.OwnerPlayer,distance=..8] unless entity @e[type=#lib:living,tag=Enemy,distance=..6] facing entity @p[tag=1059.OwnerPlayer] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ + +# 周囲にプレイヤーがいて、かつ敵が近くにいる場合、範囲内なら敵を追う + execute if entity @p[tag=1059.OwnerPlayer,distance=..8] if entity @e[type=#lib:living,tag=Enemy,distance=..6] facing entity @e[type=#lib:living,distance=..6,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ + + +# スコア増やす + scoreboard players add @s 1059.ActionTime 1 +# 敵が周囲にいてスコア達したら実行 + execute if score @s 1059.ActionTime matches 40.. if entity @e[type=#lib:living,tag=Enemy,distance=..10] run function asset:object/1059.book_of_hero/tick/attack +# 敵が周囲にいない状態でスコア達したらスコア戻す + execute if score @s 1059.ActionTime matches 40.. unless entity @e[type=#lib:living,tag=Enemy,distance=..10] run scoreboard players set @s 1059.ActionTime 0 + +# カベにぶつかった際の処理 + execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + +# リセット + scoreboard players reset $OwnerID Temporary + tag @a[tag=1059.OwnerPlayer,distance=..80] add 1059.OwnerPlayer + +# 離れ過ぎたら消える + execute unless entity @a[tag=1059.OwnerPlayer,distance=..70] run kill @s + +# 消滅処理 + kill @s[scores={General.Object.Tick=300..}] diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction new file mode 100644 index 0000000000..34ad60e539 --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction @@ -0,0 +1,48 @@ +#> asset:object/1059.book_of_hero/tick/attack +# +# +# +# @within function asset:object/1059.book_of_hero/tick/ + +#> private +# @private + #declare score_holder $Progress + #declare score_holder $Damage + #declare score_holder $Level + +# 演出 + execute at @e[type=#lib:living,tag=Enemy,distance=..10,sort=nearest,limit=1] run function asset:object/1059.book_of_hero/tick/vfx + +# 変数 + function api:global_vars/game_progress + execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + +# レベル計算（0-20） + scoreboard players operation $Level Temporary = $Progress Temporary + scoreboard players operation $Level Temporary /= $5 Const + execute if score $Level Temporary matches 21.. run scoreboard players set $Level Temporary 20 + +# ダメージ計算 (20 * 1.2^(レベル-1)) + scoreboard players set $Damage Temporary 20 + execute if score $Level Temporary matches 1.. run function asset:object/1059.book_of_hero/tick/calc_damage + +# ダメージを適用 + execute store result storage api: Argument.Damage float 1 run scoreboard players get $Damage Temporary + +# デバッグメッセージ + # tellraw @a [{"text":"Progress: "},{"score":{"name":"$Progress","objective":"Temporary"}},{"text":" Level: "},{"score":{"name":"$Level","objective":"Temporary"}},{"text":" Damage: "},{"score":{"name":"$Damage","objective":"Temporary"}}] + +# 属性 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" +# ダメージ + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute as @p[tag=1059.OwnerPlayer] run function api:damage/modifier + execute as @e[type=#lib:living,tag=Enemy,distance=..10,sort=nearest,limit=1] run function api:damage/ + +# リセット + function api:damage/reset + scoreboard players set @s 1059.ActionTime 0 + scoreboard players reset $Damage Temporary + scoreboard players reset $Level Temporary + scoreboard players reset $Progress Temporary diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/calc_damage.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/calc_damage.mcfunction new file mode 100644 index 0000000000..1ee26bb1fa --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/calc_damage.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1059.book_of_hero/tick/calc_damage +# +# +# +# @within function +# asset:object/1059.book_of_hero/tick/attack +# asset:object/1059.book_of_hero/tick/calc_damage + +#> private +# @private + #declare score_holder $Damage + #declare score_holder $Level + +# ダメージ計算 (20 * 1.2^(レベル-1)) 再起するらしい +scoreboard players operation $Damage Temporary *= $12 Const +scoreboard players operation $Damage Temporary /= $10 Const +scoreboard players remove $Level Temporary 1 +execute if score $Level Temporary matches 1.. run function asset:object/1059.book_of_hero/tick/calc_damage diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/vfx.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/vfx.mcfunction new file mode 100644 index 0000000000..4faed7485b --- /dev/null +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/vfx.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1059.book_of_hero/tick/vfx +# +# +# +# @within function asset:object/1059.book_of_hero/tick/attack + +particle enchant ~ ~0.5 ~ 0 0.5 0 0 20 +particle end_rod ~ ~0.5 ~ 0 0.5 0 0.13 10 +particle explosion ~ ~ ~ 0 0 0 0 0 + +playsound entity.generic.explode neutral @a ~ ~ ~ 1 2 +playsound minecraft:entity.puffer_fish.hurt neutral @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/object/alias/1059/init.mcfunction b/Asset/data/asset/functions/object/alias/1059/init.mcfunction new file mode 100644 index 0000000000..d67df490f3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1059/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1059/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1059.book_of_hero/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1059/register.mcfunction b/Asset/data/asset/functions/object/alias/1059/register.mcfunction new file mode 100644 index 0000000000..57c886a152 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1059/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1059/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1059.book_of_hero/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1059/summon.mcfunction b/Asset/data/asset/functions/object/alias/1059/summon.mcfunction new file mode 100644 index 0000000000..25ccefee1a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1059/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1059/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1059.book_of_hero/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1059/tick.mcfunction b/Asset/data/asset/functions/object/alias/1059/tick.mcfunction new file mode 100644 index 0000000000..7b4cb4d0b7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1059/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1059/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1059.book_of_hero/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 318b034dce..3cb810ca89 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1142.book_of_hero/trigger/1.trigger", "asset:artifact/1145.nurse_call/trigger/1.trigger", "asset:artifact/0002.blessing/trigger/1.trigger", "asset:artifact/1024.brave_rod/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f7a5c250f4..bcda3f47f4 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1142.book_of_hero/give/1.trigger", "asset:artifact/1145.nurse_call/give/1.trigger", "asset:artifact/0730.lake_reflecting_starry_sky/give/1.trigger", "asset:artifact/0002.blessing/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index ecf8a09fc1..b1d07d3932 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,6 +1,7 @@ { "values": [ + "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load", "asset:object/0001.abstract_projectile/load" ] -} +} \ No newline at end of file From 58d474fd58668a04d16c54e990d057a352c40839 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:18:23 +0900 Subject: [PATCH 35/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81123]?= =?UTF-8?q?=20=E3=83=A9=E3=82=A4=E3=83=89=E3=83=9F=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92=E4=BD=9C=E6=88=90=20(#330)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 +++ .../1123.ride_missile/give/2.give.mcfunction | 61 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 16 +++++ .../1054.ride_missile/_index.d.mcfunction | 6 ++ .../object/1054.ride_missile/init/.mcfunction | 25 ++++++++ .../1054.ride_missile/register.mcfunction | 18 ++++++ .../1054.ride_missile/summon/.mcfunction | 8 +++ .../1054.ride_missile/summon/debug.mcfunction | 10 +++ .../summon/macro.m.mcfunction | 7 +++ .../object/1054.ride_missile/tick/.mcfunction | 43 +++++++++++++ .../1054.ride_missile/tick/kill.mcfunction | 17 ++++++ .../object/alias/1054/init.mcfunction | 8 +++ .../object/alias/1054/register.mcfunction | 8 +++ .../object/alias/1054/summon.mcfunction | 8 +++ .../object/alias/1054/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + 19 files changed, 272 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1123.ride_missile/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1123.ride_missile/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1123.ride_missile/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1123.ride_missile/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1123.ride_missile/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/summon/macro.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1054.ride_missile/tick/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1054/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1054/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1054/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1054/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1123.ride_missile/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1123.ride_missile/give/1.trigger.mcfunction new file mode 100644 index 0000000000..1f32e0b1a2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1123.ride_missile/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1123.ride_missile/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1123} run function asset:artifact/1123.ride_missile/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1123.ride_missile/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1123.ride_missile/give/2.give.mcfunction new file mode 100644 index 0000000000..d07290aaa9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1123.ride_missile/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1123.ride_missile/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1123.ride_missile/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1123 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ライドミサイル","color":"white","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"乗って飛ぶことのできるロケットを召喚できる"}','{"text":"64ブロック程度なら飛べる"}','{"text":"爆発しても痛くない"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 60 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 360 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..9e9b6765f9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1123.ride_missile/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1123} run function asset:artifact/1123.ride_missile/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..433db62826 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1123.ride_missile/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1123.ride_missile/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1123.ride_missile/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/3.main.mcfunction new file mode 100644 index 0000000000..0aedcc2df3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1123.ride_missile/trigger/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1123.ride_missile/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1123.ride_missile/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 召喚する + data modify storage api: Argument.ID set value 1054 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute positioned ~ ~0.75 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/object/1054.ride_missile/_index.d.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/_index.d.mcfunction new file mode 100644 index 0000000000..3f40237b0f --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1054.ride_missile/_index.d +# @private + +#> tag +# @within function asset:object/1054.ride_missile/** + #declare tag 1054.Owner diff --git a/Asset/data/asset/functions/object/1054.ride_missile/init/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/init/.mcfunction new file mode 100644 index 0000000000..4550335641 --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/init/.mcfunction @@ -0,0 +1,25 @@ +#> asset:object/1054.ride_missile/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1054/init + +#> private +# @private + #declare score_holder $OwnerID + #declare tag 1054.Init + +# 演出 + playsound minecraft:entity.firework_rocket.launch player @a ~ ~ ~ 1 1 + +# タグ付け + tag @s add 1054.Init + +# プレイヤーをライドさせる + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run ride @s mount @e[tag=1054.Init,distance=..2,sort=nearest,limit=1] + +# タグ消す + tag @s remove 1054.Init +# リセット + scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/object/1054.ride_missile/register.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/register.mcfunction new file mode 100644 index 0000000000..d6c093137f --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1054.ride_missile/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1054/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1054 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1054.ride_missile/summon/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/summon/.mcfunction new file mode 100644 index 0000000000..c55003d32b --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1054.ride_missile/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1054/summon + +# 元となるEntityを召喚する + function asset:object/1054.ride_missile/summon/macro.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1054.ride_missile/summon/debug.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/summon/debug.mcfunction new file mode 100644 index 0000000000..3108e60624 --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1054.ride_missile/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1054 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1054.ride_missile/summon/macro.m.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/summon/macro.m.mcfunction new file mode 100644 index 0000000000..2daba7af11 --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/summon/macro.m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1054.ride_missile/summon/macro.m +# +# +# +# @within function asset:object/1054.ride_missile/summon/ + +$summon item_display ~ ~ ~ {teleport_duration:1,item_display:"head",Tags:["ObjectInit"],item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20407}},Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/1054.ride_missile/tick/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/tick/.mcfunction new file mode 100644 index 0000000000..18dc338f9c --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/tick/.mcfunction @@ -0,0 +1,43 @@ +#> asset:object/1054.ride_missile/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1054/tick + +#> private +# @private + #declare score_holder $OwnerID + #declare tag 1054.Target + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 演出 + particle flame ^ ^ ^-0.2 0 0 0 0 0 + particle smoke ^ ^ ^-0.2 0 0 0 0 0 + +# プレイヤーを紐づけ + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run tag @s add 1054.Owner + +# ブロック判定 + execute unless block ^ ^ ^0.5 #lib:no_collision run function asset:object/1054.ride_missile/tick/kill + execute unless block ^ ^ ^1 #lib:no_collision run function asset:object/1054.ride_missile/tick/kill + +# プレイヤーの前方にマーカーを召喚し、それを狙って追尾する + execute at @p[tag=1054.Owner,distance=..64] positioned ^ ^ ^64 run summon marker ~ ~ ~ {Tags:["1054.Target"]} + execute facing entity @e[type=marker,tag=1054.Target,distance=..200,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-1500 facing entity @s eyes positioned as @s run tp @s ^ ^ ^1 ~ ~ + +# マーカー消す + kill @e[type=marker,tag=1054.Target,distance=..200] + +# 消える前には警告音 + execute if score @s General.Object.Tick matches 44.. run playsound minecraft:block.note_block.harp player @a ~ ~ ~ 1 2 + +# 消滅処理 + execute if score @s General.Object.Tick matches 64.. run function asset:object/1054.ride_missile/tick/kill + execute unless entity @p[tag=1054.Owner,distance=..64] run function asset:object/1054.ride_missile/tick/kill + +# リセット + scoreboard players reset $OwnerID Temporary + tag @p[tag=1054.Owner] remove 1054.Owner diff --git a/Asset/data/asset/functions/object/1054.ride_missile/tick/kill.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/tick/kill.mcfunction new file mode 100644 index 0000000000..abcced34b9 --- /dev/null +++ b/Asset/data/asset/functions/object/1054.ride_missile/tick/kill.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1054.ride_missile/tick/kill +# +# +# +# @within function asset:object/1054.ride_missile/tick/ + +# 演出 + particle explosion ~ ~ ~ 0.3 0.3 0.3 1 10 + particle explosion_emitter ~ ~ ~ 0 0 0 1 1 force + playsound entity.generic.explode player @a ~ ~ ~ 1 1 + +# 隠し要素。10m以上離れた上で、ブロックに着弾したら音を鳴らす。その場所に到達できるかのチェックができる！ + execute if entity @p[tag=1054.Owner,distance=10..] unless block ^ ^ ^0.5 #lib:no_collision run playsound entity.arrow.hit_player player @p[tag=1054.Owner] ~ ~ ~ 0.3 0 0.3 + execute if entity @p[tag=1054.Owner,distance=10..] unless block ^ ^ ^1 #lib:no_collision run playsound entity.arrow.hit_player player @p[tag=1054.Owner] ~ ~ ~ 0.3 0 0.3 + +# 殺す + kill @s diff --git a/Asset/data/asset/functions/object/alias/1054/init.mcfunction b/Asset/data/asset/functions/object/alias/1054/init.mcfunction new file mode 100644 index 0000000000..788b04aa60 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1054/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1054/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1054.ride_missile/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1054/register.mcfunction b/Asset/data/asset/functions/object/alias/1054/register.mcfunction new file mode 100644 index 0000000000..dbe0ae6f61 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1054/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1054/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1054.ride_missile/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1054/summon.mcfunction b/Asset/data/asset/functions/object/alias/1054/summon.mcfunction new file mode 100644 index 0000000000..1a31103f1d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1054/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1054/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1054.ride_missile/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1054/tick.mcfunction b/Asset/data/asset/functions/object/alias/1054/tick.mcfunction new file mode 100644 index 0000000000..34cea2c4c8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1054/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1054/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1054.ride_missile/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 3cb810ca89..9f3c198153 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1123.ride_missile/trigger/1.trigger", "asset:artifact/1142.book_of_hero/trigger/1.trigger", "asset:artifact/1145.nurse_call/trigger/1.trigger", "asset:artifact/0002.blessing/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index bcda3f47f4..168377400a 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1123.ride_missile/give/1.trigger", "asset:artifact/1142.book_of_hero/give/1.trigger", "asset:artifact/1145.nurse_call/give/1.trigger", "asset:artifact/0730.lake_reflecting_starry_sky/give/1.trigger", From 9103033afc4d27be4cda6f1df962f13459575b6d Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:18:34 +0900 Subject: [PATCH 36/74] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[=E7=A5=9E=E5=99=A89?= =?UTF-8?q?73]=20=E3=83=90=E3=83=A9=E3=83=BC=E3=82=B8=E3=83=A5=E3=82=B9?= =?UTF-8?q?=E3=83=94=E3=83=AA=E3=83=83=E3=83=88=E3=82=92object=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E8=A1=8C=20(#328)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 4 +- .../trigger/0.load.mcfunction | 15 ---- .../trigger/2.check_condition.mcfunction | 6 -- .../trigger/3.cannot_use.mcfunction | 15 ---- .../trigger/3.main.mcfunction | 13 +--- .../trigger/4.summon_spirit.mcfunction | 25 ------- .../trigger/_index.d.mcfunction | 13 ---- .../trigger/fairy/1.init.mcfunction | 24 ------ .../trigger/fairy/2.tick.mcfunction | 14 ---- .../trigger/fairy/3.main.mcfunction | 75 ------------------- .../trigger/fairy/4.shoot.mcfunction | 30 -------- .../trigger/rejoin_process.mcfunction | 9 --- .../trigger/shot/1.init.mcfunction | 35 --------- .../trigger/shot/2.tick.mcfunction | 14 ---- .../trigger/shot/3.main.mcfunction | 14 ---- .../trigger/shot/4.move.mcfunction | 32 -------- .../trigger/shot/6.break.mcfunction | 13 ---- .../1029.barrage_spirit/_index.d.mcfunction | 9 +++ .../1029.barrage_spirit/init/.mcfunction | 49 ++++++++++++ .../1029.barrage_spirit/load.mcfunction | 11 +++ .../1029.barrage_spirit/register.mcfunction | 18 +++++ .../1029.barrage_spirit/summon/.mcfunction | 8 ++ .../summon/debug.mcfunction | 10 +++ .../1029.barrage_spirit/tick/.mcfunction | 67 +++++++++++++++++ .../tick/disapper.mcfunction} | 6 +- .../1029.barrage_spirit/tick/shoot.mcfunction | 21 ++++++ .../detect_hit_block/.mcfunction | 8 ++ .../detect_hit_entity/.mcfunction | 8 ++ .../init/.mcfunction | 34 +++++++++ .../kill/.mcfunction | 13 ++++ .../kill/damage.mcfunction} | 18 +++-- .../recursive/.mcfunction | 8 ++ .../register.mcfunction | 18 +++++ .../summon/.mcfunction | 8 ++ .../summon/debug.mcfunction | 10 +++ .../tick/.mcfunction | 17 +++++ .../object/alias/1029/init.mcfunction | 8 ++ .../object/alias/1029/register.mcfunction | 8 ++ .../object/alias/1029/summon.mcfunction | 8 ++ .../object/alias/1029/tick.mcfunction | 8 ++ .../alias/1030/detect_hit_block.mcfunction | 8 ++ .../alias/1030/detect_hit_entity.mcfunction | 8 ++ .../object/alias/1030/init.mcfunction | 8 ++ .../object/alias/1030/kill.mcfunction | 8 ++ .../object/alias/1030/recursive.mcfunction | 8 ++ .../object/alias/1030/register.mcfunction | 8 ++ .../object/alias/1030/summon.mcfunction | 8 ++ .../object/alias/1030/tick.mcfunction | 8 ++ .../asset/tags/functions/artifact/load.json | 1 - .../asset/tags/functions/object/load.json | 1 + Asset/data/asset/tags/functions/rejoin.json | 1 - 51 files changed, 434 insertions(+), 357 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/0.load.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.cannot_use.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/4.summon_spirit.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/1.init.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/2.tick.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/3.main.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/4.shoot.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/rejoin_process.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/1.init.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/2.tick.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/3.main.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/4.move.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/6.break.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction rename Asset/data/asset/functions/{artifact/0973.call_rod_spirit/trigger/fairy/5.disapper.mcfunction => object/1029.barrage_spirit/tick/disapper.mcfunction} (66%) create mode 100644 Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction rename Asset/data/asset/functions/{artifact/0973.call_rod_spirit/trigger/shot/5.hit.mcfunction => object/1030.barrage_spirit_bullet/kill/damage.mcfunction} (69%) create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1030.barrage_spirit_bullet/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1029/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1029/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1029/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1029/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/detect_hit_block.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1030/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/give/2.give.mcfunction index 3248a008bb..954c61a3d2 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"コール: バラージュスピリット","color":"light_purple"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"付近の敵に魔法攻撃を行う精霊を呼び出す。","color":"white"}','{"text":"既に召喚した状態では使用できない。","color":"white"}','{"text":"\\"私が手伝ってあげる！\\"","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"付近の敵に魔法攻撃を行う精霊を呼び出す。","color":"white"}','{"text":"一匹までしか召喚できない。","color":"white"}','{"text":"\\"私が手伝ってあげる！\\"","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/0.load.mcfunction deleted file mode 100644 index 8db4081bd3..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/0.load.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/0.load -# -# 神器に利用するスコアボード等の初期化処理 -# -# @within tag/function asset:artifact/load - -#> Objective -# @within asset:artifact/0973.call_rod_spirit/trigger/** - scoreboard objectives add R1.Tick dummy - scoreboard objectives add R1.LifeTime dummy - scoreboard objectives add R1.UserID dummy - scoreboard objectives add R1.ShotCount dummy - scoreboard objectives add R1.Speed dummy - scoreboard objectives add R1.Range dummy - scoreboard objectives add R1.MoveTimesPerTick dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction index e57b96fbcf..90ee873bc0 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/2.check_condition.mcfunction @@ -7,11 +7,5 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto -# 既に召喚済みなら使えない。ファミリアと違って召喚するのは一匹だが、合わせておくと都合がいいし、Lintを通すのも楽 - execute if entity @s[tag=CanUsed] as @e[type=armor_stand,tag=R1.Spirit] if score @s R1.UserID = @p[tag=this] UserID run tag @p[tag=this] add R1.CannotUse - - execute if entity @s[tag=R1.CannotUse] run tag @s remove CanUsed - execute if entity @s[tag=R1.CannotUse] run function asset:artifact/0973.call_rod_spirit/trigger/3.cannot_use - # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0973.call_rod_spirit/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.cannot_use.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.cannot_use.mcfunction deleted file mode 100644 index f235654ad5..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.cannot_use.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/3.cannot_use -# -# -# -# @within function asset:artifact/0973.call_rod_spirit/trigger/2.check_condition - -# 効果音 - playsound minecraft:block.note_block.bass player @s ~ ~ ~ 5 1 - playsound minecraft:block.stone_button.click_on player @s ~ ~ ~ 2 1.5 - -# メッセージ - tellraw @s [{"text":"既に召喚しています。","color":"red"}] - -# リセット - tag @s remove R1.CannotUse \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.main.mcfunction index 0bce7b09a4..b0aa4a399c 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/3.main.mcfunction @@ -9,17 +9,12 @@ # ここから先は神器側の効果の処理を書く -# 精霊召喚 - function asset:artifact/0973.call_rod_spirit/trigger/4.summon_spirit - -# 精霊Init - execute as @e[type=armor_stand,tag=R1.SpiritInit,distance=..5] at @s run function asset:artifact/0973.call_rod_spirit/trigger/fairy/1.init - +# 召喚 + data modify storage api: Argument.ID set value 1029 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon # 音とパーティクル neutralになってるのは妖精側の音だから playsound minecraft:entity.experience_orb.pickup player @a ~ ~ ~ 2 1.75 playsound minecraft:entity.ender_eye.death player @a ~ ~ ~ 2 1 playsound minecraft:block.amethyst_cluster.break neutral @a ~ ~ ~ 1.5 1.5 playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1 2 - -# 精霊さんを動かす - schedule function asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick 1t \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/4.summon_spirit.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/4.summon_spirit.mcfunction deleted file mode 100644 index 47ad3f7078..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/4.summon_spirit.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/4.summon_spirit -# -# かわいいかわいいオバケを召喚 -# -# @within function asset:artifact/0973.call_rod_spirit/trigger/3.main - -# 本体を召喚 - execute rotated ~ 0 run summon armor_stand ^-2 ^ ^-2 {DisabledSlots:4144959,Invisible:1b,NoGravity:1b,Small:1b,Tags:["R1.SpiritInit","Friend"]} - -# 疑似乱数取得 - execute store result score $Random Temporary run function lib:random/ - -# ほしい範囲に剰余算 - scoreboard players operation $Random Temporary %= $6 Const - -# メッセージ - execute if score $Random Temporary matches 0 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Hello!","font":"illageralt"}] - execute if score $Random Temporary matches 1 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"I will help you!","font":"illageralt"}] - execute if score $Random Temporary matches 2 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Where is your enemies?","font":"illageralt"}] - execute if score $Random Temporary matches 3 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Let us do it!","font":"illageralt"}] - execute if score $Random Temporary matches 4 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"I am ready!","font":"illageralt"}] - execute if score $Random Temporary matches 5 run tellraw @s [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"My master!","font":"illageralt"}] - -# リセット - scoreboard players reset $Random Temporary \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/_index.d.mcfunction deleted file mode 100644 index b291a78a97..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/_index.d.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/_index.d -# @private - -#> tags -# @within function asset:artifact/0973.call_rod_spirit/trigger/** - #declare tag R1.Spirit - #declare tag R1.SpiritInit - #declare tag R1.Shot - #declare tag R1.ShotInit - #declare tag R1.IDCopyBase - #declare tag R1.Hit - #declare tag R1.CannotUse - #declare tag R1.AttackMode \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/1.init.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/1.init.mcfunction deleted file mode 100644 index b039417558..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/1.init.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/fairy/1.init -# -# -# -# @within function asset:artifact/0973.call_rod_spirit/trigger/3.main - -# パーティクル - particle poof ~ ~0.5 ~ 0.1 0.1 0.1 0.05 10 - -# 体力設定 - scoreboard players set @s R1.LifeTime 400 - -# 頭防具 - item replace entity @s armor.head with stick{CustomModelData:20229} - -# 使用者のユーザーIDをコピー - scoreboard players operation @s R1.UserID = @p[tag=this] UserID - -# いきなり攻撃はしない - scoreboard players set @s R1.Tick -20 - -# タグ整備 - tag @s remove R1.SpiritInit - tag @s add R1.Spirit \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/2.tick.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/2.tick.mcfunction deleted file mode 100644 index 0850ec8a68..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/2.tick.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick -# -# scheduleでループする、妖精を動かすコマンド。 -# -# @within function -# asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick -# asset:artifact/0973.call_rod_spirit/trigger/3.main -# asset:artifact/0973.call_rod_spirit/trigger/rejoin_process - -# エンティティに実行させる - execute as @e[type=armor_stand,tag=R1.Spirit] at @s run function asset:artifact/0973.call_rod_spirit/trigger/fairy/3.main - -# エンティティがいればループ - execute if entity @e[type=armor_stand,tag=R1.Spirit,limit=1] run schedule function asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick 1t \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/3.main.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/3.main.mcfunction deleted file mode 100644 index b90d1acf64..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/3.main.mcfunction +++ /dev/null @@ -1,75 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/fairy/3.main -# -# ゴーストちゃんの動作部分 -# -# @within asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick - -#> ゴーストちゃんの移動先を決定するマーカーのタグ、持ち主のプレイヤーのタグ -# @private - #declare tag R1.MoveMarker - #declare tag R1.MoveMarkerInit - #declare tag R1.OwnerMarker - #declare tag R1.OwnerPlayer - -# 同IDのプレイヤーを特定 - execute at @a[distance=..60] if score @s R1.UserID = @p UserID run tag @p add R1.OwnerPlayer - -# マスターにMarkerを召喚する - execute at @p[tag=R1.OwnerPlayer,distance=..60] rotated ~ 0 run summon marker ^-1 ^1 ^-1 {Tags:[R1.MoveMarker,R1.MoveMarkerInit]} - -# MarkerにID付与 - scoreboard players operation @e[type=marker,tag=R1.MoveMarkerInit,distance=..60,sort=nearest,limit=1] R1.UserID = @s R1.UserID - tag @e[type=marker,tag=R1.MoveMarkerInit,distance=..60,sort=nearest,limit=1] remove R1.MoveMarkerInit - -# 同IDのマーカーを特定 - execute at @e[type=marker,tag=R1.MoveMarker,distance=..60] if score @s R1.UserID = @e[type=marker,tag=R1.MoveMarker,distance=..0.01,sort=nearest,limit=1] R1.UserID run tag @e[type=marker,tag=R1.MoveMarker,distance=..0.01,sort=nearest,limit=1] add R1.OwnerMarker - -# マスターのマーカーに誘導移動 - execute facing entity @e[type=marker,tag=R1.OwnerMarker,distance=1..60,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.23 ~ ~ - -# マーカーが近づいたらゆっくりと向かう - execute facing entity @e[type=marker,tag=R1.OwnerMarker,distance=0.5..1,limit=1] eyes run tp @s ^ ^ ^0.1 - -# 付近に敵がいたら攻撃モードへと移行 - execute if entity @e[type=#lib:living,tag=Enemy,distance=..15] run tag @s add R1.AttackMode - -# 付近に敵がいたらそっちへの攻撃を優先 - execute facing entity @e[type=#lib:living,tag=Enemy,distance=..15,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.05 ~ ~ - -# ポーズ - # (待機) - item replace entity @s[tag=!R1.AttackMode] armor.head with stick{CustomModelData:20236} - - # (射撃) - item replace entity @s[tag=R1.AttackMode] armor.head with stick{CustomModelData:20229} - -# パーティクル - execute rotated ~ 0 run particle minecraft:dust 1 1 1 0.5 ^ ^ ^-0.2 0.07 0.07 0.07 0 1 force @a[distance=..60] - execute rotated ~ 0 run particle minecraft:dust 0.592 0.722 0.918 1 ^ ^ ^-0.2 0.1 0.1 0.1 0 1 - execute if predicate lib:random_pass_per/30 rotated ~ 0 run particle minecraft:soul_fire_flame ^ ^ ^-0.2 0.1 0.1 0.1 0 1 - -# 付近に敵がいるならスコア加算 - scoreboard players add @s[tag=R1.AttackMode] R1.Tick 1 - -# 魔法攻撃 - execute if entity @s[scores={R1.Tick=2..}] rotated ~ 0 positioned ^0.1 ^0.8 ^0.5 run function asset:artifact/0973.call_rod_spirit/trigger/fairy/4.shoot - -# 撃ちまくったら休憩 - execute if entity @s[scores={R1.ShotCount=3..}] run scoreboard players set @s R1.Tick -10 - execute if entity @s[scores={R1.ShotCount=3..}] run scoreboard players reset @s R1.ShotCount - -# 付近に敵がいないならスコアリセット - scoreboard players reset @s[tag=!R1.AttackMode] R1.Tick - scoreboard players reset @s[tag=!R1.AttackMode] R1.ShotCount - -# 離れ過ぎると消える - execute unless entity @e[type=marker,tag=R1.OwnerMarker,distance=..60,limit=1] run function asset:artifact/0973.call_rod_spirit/trigger/fairy/5.disapper - -# ヘルス - scoreboard players remove @s R1.LifeTime 1 - execute if score @s R1.LifeTime matches 0 run function asset:artifact/0973.call_rod_spirit/trigger/fairy/5.disapper - -# リセット - kill @e[type=marker,tag=R1.MoveMarker] - tag @a[tag=R1.OwnerPlayer] remove R1.OwnerPlayer - tag @s[tag=R1.AttackMode] remove R1.AttackMode \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/4.shoot.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/4.shoot.mcfunction deleted file mode 100644 index 00a83a0bef..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/4.shoot.mcfunction +++ /dev/null @@ -1,30 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/fairy/4.shoot -# -# ショット発射！ -# -# @within asset:artifact/0973.call_rod_spirit/trigger/fairy/3.main - -# タグ付与 - tag @s add R1.IDCopyBase - -# ショットを撃つ - summon armor_stand ~ ~ ~ {Marker:1b,Invisible:1b,Tags:["R1.ShotInit"],Passengers:[{id:"minecraft:snowball",NoGravity:1b,Tags:["AllowProcessingCommonTag","AutoKillWhenDieVehicle","Uninterferable"],Item:{id:"minecraft:potion",Count:1b,tag:{CustomModelData:20234,CustomPotionColor:10274303}}}]} - -# カウントを増やす - scoreboard players add @s R1.ShotCount 1 - -# ショットのInit発動 - execute as @e[type=armor_stand,tag=R1.ShotInit,distance=..0.01] at @s run function asset:artifact/0973.call_rod_spirit/trigger/shot/1.init - -# scheduleループ開始 - schedule function asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick 1t - -# サウンド - playsound minecraft:entity.shulker_bullet.hurt neutral @a ~ ~ ~ 1.5 2 - playsound minecraft:block.amethyst_cluster.break neutral @a ~ ~ ~ 1.5 1.5 - playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1.5 2 - -# リセット - scoreboard players reset @s R1.Tick - - tag @s remove R1.IDCopyBase \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/rejoin_process.mcfunction deleted file mode 100644 index 5418217efd..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# このfunctionをループさせる - execute if entity @e[type=armor_stand,tag=R1.Spirit,limit=1] run schedule function asset:artifact/0973.call_rod_spirit/trigger/fairy/2.tick 1t - execute if entity @e[type=armor_stand,tag=R1.Shot,limit=1] run schedule function asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick 1t \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/1.init.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/1.init.mcfunction deleted file mode 100644 index 1c477a3393..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/1.init.mcfunction +++ /dev/null @@ -1,35 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/1.init -# -# 付近の敵へと向きを変える -# -# @within function asset:artifact/0973.call_rod_spirit/trigger/fairy/4.shoot - -#> SpreadLib -# @private -#declare tag SpreadMarker - -# IDコピー - scoreboard players operation @s R1.UserID = @e[type=armor_stand,tag=R1.IDCopyBase,distance=..1,sort=nearest,limit=1] R1.UserID - -# ステータス設定 - # 速度と飛距離 - scoreboard players set @s R1.Range 200 - scoreboard players set @s R1.Speed 8 - - # 拡散値 - data modify storage lib: Argument.Distance set value 15 - data modify storage lib: Argument.Spread set value 3 - -# 拡散させるEntityを召喚する - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - -# 拡散 - execute facing entity @e[tag=Enemy,distance=..20,sort=nearest,limit=1] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle - -# マーカーの方を向き、タグを変更 - execute facing entity @e[type=marker,tag=SpreadMarker,distance=..20,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~5 - tag @s remove R1.ShotInit - tag @s add R1.Shot - -# リセット - kill @e[type=marker,tag=SpreadMarker,distance=..20] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/2.tick.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/2.tick.mcfunction deleted file mode 100644 index 498588d6f2..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/2.tick.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick -# -# ショット動かすやつ -# -# @within function -# asset:artifact/0973.call_rod_spirit/trigger/fairy/4.shoot -# asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick -# asset:artifact/0973.call_rod_spirit/trigger/rejoin_process - -# エンティティに実行させる - execute as @e[type=armor_stand,tag=R1.Shot] at @s run function asset:artifact/0973.call_rod_spirit/trigger/shot/3.main - -# エンティティがいればループ - execute if entity @e[type=armor_stand,tag=R1.Shot,limit=1] run schedule function asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick 1t \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/3.main.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/3.main.mcfunction deleted file mode 100644 index d62c012180..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/3.main.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/3.main -# -# ショットが飛んでいく！ -# -# @within function -# asset:artifact/0973.call_rod_spirit/trigger/shot/2.tick -# asset:artifact/0973.call_rod_spirit/trigger/shot/3.main - -# パーティクル - particle minecraft:electric_spark ~ ~ ~ 0 0 0 0 1 force @a[distance=..30] - particle dust 1000000000 100000000 100000000 0.7 ~ ~ ~ 0.05 0.05 0.05 0 1 - -# 再帰移動 - function asset:artifact/0973.call_rod_spirit/trigger/shot/4.move \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/4.move.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/4.move.mcfunction deleted file mode 100644 index d31e81b883..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/4.move.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/4.move -# -# 再帰加速 -# -# @within function -# asset:artifact/0973.call_rod_spirit/trigger/shot/3.main -# asset:artifact/0973.call_rod_spirit/trigger/shot/4.move - -# パーティクル - particle dust 0.776 0.91 1 0.3 ~ ~ ~ 0 0 0 0 1 - -# 再帰カウントが0なら弾速からセット - execute unless entity @s[scores={R1.MoveTimesPerTick=1..,R1.Range=1..}] run scoreboard players operation @s R1.MoveTimesPerTick = @s R1.Speed - -# 前進 - tp @s ^ ^ ^0.1 ~ ~ - -# スコア減算 - scoreboard players remove @s R1.MoveTimesPerTick 1 - scoreboard players remove @s R1.Range 1 - -# 壁の衝突判定 - execute unless block ~ ~ ~ #lib:no_collision run function asset:artifact/0973.call_rod_spirit/trigger/shot/6.break - -# キル - execute if entity @s[scores={R1.Range=0}] run function asset:artifact/0973.call_rod_spirit/trigger/shot/6.break - -# モブに接触 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] positioned ~0.5 ~0.5 ~0.5 run function asset:artifact/0973.call_rod_spirit/trigger/shot/5.hit - -# 再帰 - execute if entity @s[scores={R1.MoveTimesPerTick=1..,R1.Range=1..}] at @s run function asset:artifact/0973.call_rod_spirit/trigger/shot/4.move \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/6.break.mcfunction b/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/6.break.mcfunction deleted file mode 100644 index 3b1fb83d73..0000000000 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/6.break.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/6.break -# -# -# -# @within function -# asset:artifact/0973.call_rod_spirit/trigger/shot/4.move -# asset:artifact/0973.call_rod_spirit/trigger/shot/5.hit - -# 演出 - particle minecraft:electric_spark ~ ~ ~ 0 0 0 0.5 5 - -# キル - kill @s \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/_index.d.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/_index.d.mcfunction new file mode 100644 index 0000000000..b96ab0594c --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/_index.d.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1029.barrage_spirit/_index.d +# @private + +#> tag +# @within function asset:object/1029.barrage_spirit/** + #declare tag 1029.Spirit + #declare tag 1029.AttackMode + #declare tag 1029.OwnerPlayer + #declare score_holder $OwnerID diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/init/.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/init/.mcfunction new file mode 100644 index 0000000000..c7f2871a2a --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/init/.mcfunction @@ -0,0 +1,49 @@ +#> asset:object/1029.barrage_spirit/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1029/init + +#> Private +# @private + #declare score_holder $Random + #declare tag 1029.SpiritInit + +# 自分に一時的なタグ付け + tag @s add 1029.SpiritInit +# 同IDのプレイヤーを特定 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a[distance=..60] if score $OwnerID Temporary = @p UserID as @p run tag @s add 1029.OwnerPlayer +# 自身にもIDをいれる + scoreboard players operation @s 1029.UserID = @p[tag=1029.OwnerPlayer] UserID +# もし仮に、他に召喚してるバラージュがいるならぶっ殺す（こういう処理しか思いつかんかった） + execute as @e[type=armor_stand,scores={ObjectID=1029}] at @s if score @p[tag=1029.OwnerPlayer] UserID = @e[type=armor_stand,scores={ObjectID=1029},distance=..0.01,sort=nearest,limit=1] 1029.UserID run kill @s[tag=!1029.SpiritInit] + +# 疑似乱数取得 + execute store result score $Random Temporary run function lib:random/ + +# ほしい範囲に剰余算 + scoreboard players operation $Random Temporary %= $6 Const + +# メッセージ + execute if score $Random Temporary matches 0 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Hello!","font":"illageralt"}] + execute if score $Random Temporary matches 1 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"I will help you!","font":"illageralt"}] + execute if score $Random Temporary matches 2 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Where is your enemies?","font":"illageralt"}] + execute if score $Random Temporary matches 3 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"Let us do it!","font":"illageralt"}] + execute if score $Random Temporary matches 4 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"I am ready!","font":"illageralt"}] + execute if score $Random Temporary matches 5 run tellraw @p[tag=1029.OwnerPlayer] [{"text":"<","color":"white"},{"text":"Spirit","color":"#a9b9ca"},{"text":"> ","color":"white"},{"text":"My master!","font":"illageralt"}] + +# パーティクル + particle poof ~ ~0.5 ~ 0.1 0.1 0.1 0.05 10 + +# 頭防具 + item replace entity @s armor.head with stick{CustomModelData:20229} + +# いきなり攻撃はしない + scoreboard players set @s 1029.ActionTime -20 + +# リセット + scoreboard players reset $Random Temporary + scoreboard players reset $OwnerID Temporary + tag @s remove 1029.SpiritInit + tag @a remove 1029.OwnerPlayer diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/load.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/load.mcfunction new file mode 100644 index 0000000000..497db370db --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/load.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1029.barrage_spirit/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1029.barrage_spirit/** + scoreboard objectives add 1029.ActionTime dummy + scoreboard objectives add 1029.ShotCount dummy + scoreboard objectives add 1029.UserID dummy diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/register.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/register.mcfunction new file mode 100644 index 0000000000..fc56d7b712 --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1029.barrage_spirit/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1029/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1029 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/summon/.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/summon/.mcfunction new file mode 100644 index 0000000000..bde899a2a7 --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1029.barrage_spirit/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1029/summon + +# 元となるEntityを召喚する + summon armor_stand ^ ^ ^ {DisabledSlots:4144959,Invisible:1b,NoGravity:1b,Small:1b,Tags:["ObjectInit","Friend"]} diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/summon/debug.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/summon/debug.mcfunction new file mode 100644 index 0000000000..dd27099a57 --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1029.barrage_spirit/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1029 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction new file mode 100644 index 0000000000..ca6a9340ce --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction @@ -0,0 +1,67 @@ +#> asset:object/1029.barrage_spirit/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1029/tick + +#> ゴーストちゃんの移動先を決定するマーカーのタグ +# @private + #declare tag MoveMarker + +# 同IDのプレイヤーを特定 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a[distance=..60] if score $OwnerID Temporary = @p UserID as @p run tag @s add 1029.OwnerPlayer + +# マスターにMarkerを召喚する + execute at @p[tag=1029.OwnerPlayer,distance=..60] rotated ~ 0 run summon marker ^-1 ^1 ^-1 {Tags:[MoveMarker]} + +# マスターのマーカーに誘導移動 + execute facing entity @e[type=marker,tag=MoveMarker,distance=1..60,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.23 ~ ~ + +# マーカーが近づいたらゆっくりと向かう + execute facing entity @e[type=marker,tag=MoveMarker,distance=0.5..1,limit=1] eyes run tp @s ^ ^ ^0.1 + +# 付近に敵がいたら攻撃モードへと移行 + execute if entity @e[type=#lib:living,tag=Enemy,distance=..15] run tag @s add 1029.AttackMode + +# 付近に敵がいたらそっちへの攻撃を優先 + execute facing entity @e[type=#lib:living,tag=Enemy,distance=..15,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.05 ~ ~ + +# ポーズ + # (待機) + item replace entity @s[tag=!1029.AttackMode] armor.head with stick{CustomModelData:20236} + + # (射撃) + item replace entity @s[tag=1029.AttackMode] armor.head with stick{CustomModelData:20229} + +# パーティクル + execute rotated ~ 0 run particle minecraft:dust 1 1 1 0.5 ^ ^ ^-0.2 0.07 0.07 0.07 0 1 force @a[distance=..60] + execute rotated ~ 0 run particle minecraft:dust 0.592 0.722 0.918 1 ^ ^ ^-0.2 0.1 0.1 0.1 0 1 + execute if predicate lib:random_pass_per/30 rotated ~ 0 run particle minecraft:soul_fire_flame ^ ^ ^-0.2 0.1 0.1 0.1 0 1 + +# 付近に敵がいるならスコア加算 + scoreboard players add @s[tag=1029.AttackMode] 1029.ActionTime 1 + +# 魔法攻撃 + execute if entity @s[scores={1029.ActionTime=2..}] rotated ~ 0 positioned ^0.1 ^0.8 ^0.5 run function asset:object/1029.barrage_spirit/tick/shoot + +# 撃ちまくったら休憩 + execute if entity @s[scores={1029.ShotCount=3..}] run scoreboard players set @s 1029.ActionTime -10 + execute if entity @s[scores={1029.ShotCount=3..}] run scoreboard players reset @s 1029.ShotCount + +# 付近に敵がいないならスコアリセット + scoreboard players reset @s[tag=!1029.AttackMode] 1029.ActionTime + scoreboard players reset @s[tag=!1029.AttackMode] 1029.ShotCount + +# 離れ過ぎると消える + execute unless entity @e[type=marker,tag=MoveMarker,distance=..60,limit=1] run function asset:object/1029.barrage_spirit/tick/disapper + +# ヘルス + scoreboard players add @s General.Object.Tick 1 + execute if score @s General.Object.Tick matches 400 run function asset:object/1029.barrage_spirit/tick/disapper + +# リセット + kill @e[type=marker,tag=MoveMarker] + tag @a[tag=1029.OwnerPlayer] remove 1029.OwnerPlayer + tag @s[tag=1029.AttackMode] remove 1029.AttackMode + scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/5.disapper.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/disapper.mcfunction similarity index 66% rename from Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/5.disapper.mcfunction rename to Asset/data/asset/functions/object/1029.barrage_spirit/tick/disapper.mcfunction index 22f6605e43..5f556fe2c4 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/fairy/5.disapper.mcfunction +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/disapper.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/fairy/5.disapper +#> asset:object/1029.barrage_spirit/tick/disapper # # 消滅処理 # -# @within function asset:artifact/0973.call_rod_spirit/trigger/fairy/3.main +# @within function asset:object/1029.barrage_spirit/tick/ # 演出 playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1.5 2 @@ -11,4 +11,4 @@ particle minecraft:soul_fire_flame ~ ~0.5 ~ 0 0 0 0.05 10 # キル - kill @s \ No newline at end of file + kill @s diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction new file mode 100644 index 0000000000..75da3ab017 --- /dev/null +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1029.barrage_spirit/tick/shoot +# +# ショット発射！ +# +# @within asset:object/1029.barrage_spirit/tick/ + +# 弾を召喚する + data modify storage api: Argument.ID set value 1030 + execute as @p[tag=1029.OwnerPlayer] store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute as @p[tag=1029.OwnerPlayer] run function api:object/summon + +# カウントを増やす + scoreboard players add @s 1029.ShotCount 1 + +# サウンド + playsound minecraft:entity.shulker_bullet.hurt neutral @a ~ ~ ~ 1.5 2 + playsound minecraft:block.amethyst_cluster.break neutral @a ~ ~ ~ 1.5 1.5 + playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1.5 2 + +# リセット + scoreboard players reset @s 1029.ActionTime diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..d8bde9ebe3 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_block/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1030.barrage_spirit_bullet/detect_hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1030/detect_hit_block + +# 判定 + execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..e11eb53975 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1030.barrage_spirit_bullet/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1030/detect_hit_entity + +# 判定 + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/init/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/init/.mcfunction new file mode 100644 index 0000000000..e5fddc3a0f --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/init/.mcfunction @@ -0,0 +1,34 @@ +#> asset:object/1030.barrage_spirit_bullet/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1030/init + +#> private +# @private + #declare tag SpreadMarker + +# フィールドのデータからスコアを設定 + data modify storage asset:context this.Speed set value 2 + data modify storage asset:context this.Range set value 60 + +# デフォルト値0.5 + data modify storage asset:context this.MovePerStep set value 0.5 + +# 拡散値 + data modify storage lib: Argument.Distance set value 15 + data modify storage lib: Argument.Spread set value 3 + +# 拡散させるEntityを召喚する + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + +# 拡散 + execute facing entity @e[tag=Enemy,distance=..20,sort=nearest,limit=1] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle + +# マーカーの方を向き、タグを変更 + execute facing entity @e[type=marker,tag=SpreadMarker,distance=..20,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~5 +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..20] + data remove storage lib: Argument + + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction new file mode 100644 index 0000000000..834afb7ee1 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1030.barrage_spirit_bullet/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1030/kill + +# ダメージ + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run function asset:object/1030.barrage_spirit_bullet/kill/damage + +# 演出 + particle minecraft:electric_spark ~ ~ ~ 0 0 0 0.5 5 +# 死ぬ + kill @s diff --git a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/5.hit.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/damage.mcfunction similarity index 69% rename from Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/5.hit.mcfunction rename to Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/damage.mcfunction index f660873178..ff2cb4e399 100644 --- a/Asset/data/asset/functions/artifact/0973.call_rod_spirit/trigger/shot/5.hit.mcfunction +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/damage.mcfunction @@ -1,8 +1,13 @@ -#> asset:artifact/0973.call_rod_spirit/trigger/shot/5.hit +#> asset:object/1030.barrage_spirit_bullet/kill/damage # -# ショットヒット時 # -# @within function asset:artifact/0973.call_rod_spirit/trigger/shot/4.move +# +# @within function asset:object/1030.barrage_spirit_bullet/kill/ + +#> private +# @private + #declare score_holder $RandomDamage + #declare score_holder $OwnerID # ダメージ値設定 #ダメージブレのための処理 @@ -20,7 +25,8 @@ data modify storage lib: Argument.ElementType set value "None" # マスターとして補正functionを実行 - execute at @a if score @s R1.UserID = @p UserID as @p run function lib:damage/modifier + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run function lib:damage/modifier # ダメージ実行 execute as @e[tag=Enemy,tag=!Uninterferable,distance=..3,sort=nearest,limit=1] run function lib:damage/ @@ -28,6 +34,4 @@ # リセット function lib:damage/reset scoreboard players reset $RandomDamage Temporary - -# キル - function asset:artifact/0973.call_rod_spirit/trigger/shot/6.break + scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/recursive/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/recursive/.mcfunction new file mode 100644 index 0000000000..dfd125b927 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1030.barrage_spirit_bullet/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1030/recursive + +# パーティクル + particle dust 0.776 0.91 1 0.3 ~ ~ ~ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/register.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/register.mcfunction new file mode 100644 index 0000000000..d007dbb92c --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1030.barrage_spirit_bullet/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1030/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1030 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/.mcfunction new file mode 100644 index 0000000000..9b0658d115 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1030.barrage_spirit_bullet/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1030/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit"],teleport_duration:1,billboard:"center",item:{id:"minecraft:potion",Count:1b,tag:{CustomModelData:20234,CustomPotionColor:10274303}}} diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/debug.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/debug.mcfunction new file mode 100644 index 0000000000..9a5e2690a5 --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1030.barrage_spirit_bullet/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1030 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/tick/.mcfunction new file mode 100644 index 0000000000..2cc10b688e --- /dev/null +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/tick/.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1030.barrage_spirit_bullet/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1030/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# パーティクル + particle minecraft:electric_spark ~ ~ ~ 0 0 0 0 1 force @a[distance=..30] + particle dust 1000000000 100000000 100000000 0.7 ~ ~ ~ 0.05 0.05 0.05 0 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=100..}] + + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/alias/1029/init.mcfunction b/Asset/data/asset/functions/object/alias/1029/init.mcfunction new file mode 100644 index 0000000000..9cc4a89768 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1029/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1029/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1029.barrage_spirit/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1029/register.mcfunction b/Asset/data/asset/functions/object/alias/1029/register.mcfunction new file mode 100644 index 0000000000..cdfaeace62 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1029/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1029/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1029.barrage_spirit/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1029/summon.mcfunction b/Asset/data/asset/functions/object/alias/1029/summon.mcfunction new file mode 100644 index 0000000000..9f45f21d0d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1029/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1029/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1029.barrage_spirit/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1029/tick.mcfunction b/Asset/data/asset/functions/object/alias/1029/tick.mcfunction new file mode 100644 index 0000000000..7a5b3513ac --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1029/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1029/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1029.barrage_spirit/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/1030/detect_hit_block.mcfunction new file mode 100644 index 0000000000..772bd178fd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/detect_hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1030/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..9fb171a09e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/detect_hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/init.mcfunction b/Asset/data/asset/functions/object/alias/1030/init.mcfunction new file mode 100644 index 0000000000..a54f6e3ab7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/kill.mcfunction b/Asset/data/asset/functions/object/alias/1030/kill.mcfunction new file mode 100644 index 0000000000..d4392069a3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/kill/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1030/recursive.mcfunction new file mode 100644 index 0000000000..6f2b95eb4c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/recursive/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/register.mcfunction b/Asset/data/asset/functions/object/alias/1030/register.mcfunction new file mode 100644 index 0000000000..19c7dad917 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/summon.mcfunction b/Asset/data/asset/functions/object/alias/1030/summon.mcfunction new file mode 100644 index 0000000000..0571f17920 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1030/tick.mcfunction b/Asset/data/asset/functions/object/alias/1030/tick.mcfunction new file mode 100644 index 0000000000..e63f21636b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1030/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1030/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1030.barrage_spirit_bullet/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index 4c712e16cb..1ce49b59bb 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -34,7 +34,6 @@ "asset:artifact/0976.brave_sword/trigger/0.load", "asset:artifact/0953.meteor_rain/trigger/0.load", "asset:artifact/0981.soulfire_burst/trigger/0.load", - "asset:artifact/0973.call_rod_spirit/trigger/0.load", "asset:artifact/0233.reversal/trigger/0.load", "asset:artifact/0172.icicle/trigger/0.load", "asset:artifact/0793.queen_bee_rocket/trigger/0.load", diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index b1d07d3932..bb7e17ae42 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1029.barrage_spirit/load", "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load", "asset:object/0001.abstract_projectile/load" diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index 0c6eb4fa82..bc91e286b7 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -30,7 +30,6 @@ "asset:artifact/0953.meteor_rain/trigger/rejoin_process", "asset:artifact/0981.soulfire_burst/trigger/rejoin_process", "asset:artifact/0295.call_elemental_familiar/trigger/rejoin_process", - "asset:artifact/0973.call_rod_spirit/trigger/rejoin_process", "asset:mob/0120.convict/rejoin_process", "asset:artifact/0172.icicle/trigger/rejoin_process", "asset:artifact/0793.queen_bee_rocket/trigger/rejoin_process", From 524e4db0676c7b60f4298c0fbb40d925c1db0a77 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:39:48 +0900 Subject: [PATCH 37/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81119]?= =?UTF-8?q?=20=E3=82=B3=E3=83=BC=E3=83=AB:=E3=83=A1=E3=82=A4=E3=83=89?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=20(#314)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../1119.call_maid/give/1.trigger.mcfunction | 7 +++ .../1119.call_maid/give/2.give.mcfunction | 61 +++++++++++++++++++ .../1119.call_maid/register.mcfunction | 7 +++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1119.call_maid/trigger/3.main.mcfunction | 15 +++++ .../object/1052.maid/_index.d.mcfunction | 11 ++++ .../object/1052.maid/init/.mcfunction | 43 +++++++++++++ .../object/1052.maid/load.mcfunction | 10 +++ .../object/1052.maid/register.mcfunction | 18 ++++++ .../object/1052.maid/summon/.mcfunction | 8 +++ .../object/1052.maid/summon/debug.mcfunction | 10 +++ .../object/1052.maid/tick/.mcfunction | 35 +++++++++++ .../object/1052.maid/tick/action.mcfunction | 18 ++++++ .../object/1052.maid/tick/kill.mcfunction | 13 ++++ .../1052.maid/tick/shot/damage.mcfunction | 21 +++++++ .../1052.maid/tick/shot/loop.mcfunction | 24 ++++++++ .../1052.maid/tick/shot/main.mcfunction | 20 ++++++ .../object/alias/1052/init.mcfunction | 8 +++ .../object/alias/1052/register.mcfunction | 8 +++ .../object/alias/1052/summon.mcfunction | 8 +++ .../object/alias/1052/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + .../tags/functions/artifact/register.json | 1 + .../asset/tags/functions/object/load.json | 1 + Asset/data/tsb_armor/trim_pattern/20400.json | 7 +++ 27 files changed, 384 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1119.call_maid/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction create mode 100644 Asset/data/asset/functions/object/1052.maid/tick/shot/main.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1052/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1052/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1052/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1052/tick.mcfunction create mode 100644 Asset/data/tsb_armor/trim_pattern/20400.json diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/give/1.trigger.mcfunction new file mode 100644 index 0000000000..abb1765c29 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1119.call_maid/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1119} run function asset:artifact/1119.call_maid/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/give/2.give.mcfunction new file mode 100644 index 0000000000..d715675488 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1119.call_maid/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1119.call_maid/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1119 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"コール:メイド","color":"#F2E6D8"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"貴方のために戦うメイドを召喚する"}','{}','{"text":"従者の使命を果たします","color":"gray"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [5] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 14 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 30 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 30 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/register.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/register.mcfunction new file mode 100644 index 0000000000..fc03f22768 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1119.call_maid/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[1] append value [1119] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..54ecc4b65a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1119.call_maid/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1119} run function asset:artifact/1119.call_maid/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..4f0be2f572 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1119.call_maid/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1119.call_maid/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1119.call_maid/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1119.call_maid/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/3.main.mcfunction new file mode 100644 index 0000000000..0683e6f12b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1119.call_maid/trigger/3.main.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1119.call_maid/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1119.call_maid/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 召喚 + data modify storage api: Argument.ID set value 1052 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/object/1052.maid/_index.d.mcfunction b/Asset/data/asset/functions/object/1052.maid/_index.d.mcfunction new file mode 100644 index 0000000000..a2be9dee44 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/_index.d.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1052.maid/_index.d +# @private + +#> tag +# @within function asset:object/1052.maid/** + #declare score_holder $OwnerID + #declare tag 1052.Owner + #declare tag 1052.Init + + #declare tag Landing + #declare tag LandingTarget diff --git a/Asset/data/asset/functions/object/1052.maid/init/.mcfunction b/Asset/data/asset/functions/object/1052.maid/init/.mcfunction new file mode 100644 index 0000000000..1cc1430ea1 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/init/.mcfunction @@ -0,0 +1,43 @@ +#> asset:object/1052.maid/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1052/init + +#> private +# @private + #declare score_holder $Random + +# 召喚演出 + playsound minecraft:entity.zombie_villager.cure neutral @a ~ ~ ~ 1 2 + particle reverse_portal ~ ~1 ~ 0.2 0.2 0.2 0.4 50 + +# 一時的にタグ付け + tag @s add 1052.Init +# 召喚者が殴る(意味ある？これ。なんか敵対してる気がしないんだけど。まあそもそも召喚してすぐ敵対するしええか...) + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run damage @e[type=zombie,tag=1052.Init,distance=..10,sort=nearest,limit=1] 1 fireball by @s + data modify entity @s Invulnerable set value 1 + +# 頭をランダムにするぅ！ +# 疑似乱数取得 + execute store result score $Random Temporary run function lib:random/ +# ほしい範囲に剰余算するやーつ + scoreboard players operation $Random Temporary %= $4 Const +# デバッグのコマンド + #scoreboard players set $Random Temporary 0 + +# 頭選択 + #execute if score $Random Temporary matches 0 run デフォルト頭 + execute if score $Random Temporary matches 0 run data modify entity @s CustomName set value "リィス" + execute if score $Random Temporary matches 1 run item replace entity @s armor.head with stick{CustomModelData:20404} 1 + execute if score $Random Temporary matches 1 run data modify entity @s CustomName set value "トリナ" + execute if score $Random Temporary matches 2 run item replace entity @s armor.head with stick{CustomModelData:20405} 1 + execute if score $Random Temporary matches 2 run data modify entity @s CustomName set value "アルギス" + execute if score $Random Temporary matches 3 run item replace entity @s armor.head with stick{CustomModelData:20406} 1 + execute if score $Random Temporary matches 3 run data modify entity @s CustomName set value "ティクリエ" + +# リセット + scoreboard players reset $OwnerID Temporary + scoreboard players reset $Random Temporary + tag @s remove 1052.Init diff --git a/Asset/data/asset/functions/object/1052.maid/load.mcfunction b/Asset/data/asset/functions/object/1052.maid/load.mcfunction new file mode 100644 index 0000000000..dce8322709 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/load.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1052.maid/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1052.maid/** + scoreboard objectives add 1052.ActionTime dummy + scoreboard objectives add 1052.ShotCount dummy diff --git a/Asset/data/asset/functions/object/1052.maid/register.mcfunction b/Asset/data/asset/functions/object/1052.maid/register.mcfunction new file mode 100644 index 0000000000..6fc0c49ccc --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1052.maid/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1052/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1052 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1052.maid/summon/.mcfunction b/Asset/data/asset/functions/object/1052.maid/summon/.mcfunction new file mode 100644 index 0000000000..251d97d79f --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1052.maid/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1052/summon + +# 元となるEntityを召喚する + summon zombie ~ ~ ~ {Silent:1b,DeathTime:19s,Health:9999f,Tags:["Friend","ObjectInit"],HandItems:[{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20401}},{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20402}}],ArmorItems:[{},{id:"minecraft:chainmail_leggings",Count:1b,tag:{Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:20400"}}},{id:"minecraft:chainmail_chestplate",Count:1b,tag:{Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:20400"}}},{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20403}}],Attributes:[{Name:"generic.max_health",Base:9999d},{Name:"generic.follow_range",Base:32d},{Name:"generic.knockback_resistance",Base:0.8},{Name:"generic.movement_speed",Base:0.4},{Name:"generic.attack_damage",Base:-99d}]} diff --git a/Asset/data/asset/functions/object/1052.maid/summon/debug.mcfunction b/Asset/data/asset/functions/object/1052.maid/summon/debug.mcfunction new file mode 100644 index 0000000000..2cd48874f6 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1052.maid/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1052 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction new file mode 100644 index 0000000000..00741343b1 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction @@ -0,0 +1,35 @@ +#> asset:object/1052.maid/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1052/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 何があっても透明化 + effect give @s invisibility infinite 1 true + +# タグとチーム消す（initできえねぇーーー） + tag @s remove Enemy + team leave @s + +# 召喚者に一時的にタグ付け + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run tag @s add 1052.Owner + +# 召喚者が近くにいるなら、止まる + execute if entity @a[tag=1052.Owner,distance=..5] run effect give @s slowness 1 127 true + +# 敵が近くにいたら、射撃用意 + execute if entity @a[tag=1052.Owner,distance=..5] if entity @e[type=#lib:hostile,tag=Enemy,distance=..14] run function asset:object/1052.maid/tick/action + +# 召喚者が離れ過ぎたら死ぬ + execute unless entity @a[tag=1052.Owner,distance=..30] run function asset:object/1052.maid/tick/kill + + +# 召喚者のタグを削除 + tag @a[tag=1052.Owner] remove 1052.Owner + +# 消滅処理 + execute if score @s General.Object.Tick matches 1000.. run function asset:object/1052.maid/tick/kill diff --git a/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction new file mode 100644 index 0000000000..4f21138b60 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1052.maid/tick/action +# +# +# +# @within function asset:object/1052.maid/tick/ + +# 敵の方向を見る + tp @s ~ ~ ~ facing entity @e[type=#lib:hostile,tag=Enemy,distance=..14,sort=nearest,limit=1] + +# スコアを増やしていく + scoreboard players add @s 1052.ActionTime 1 + +# 一定のスコアに達したら発砲 + execute if score @s 1052.ActionTime matches 3.. run function asset:object/1052.maid/tick/shot/main + +# 一定回数撃ったらクールダウンを入れる + execute if score @s 1052.ShotCount matches 6.. run scoreboard players set @s 1052.ActionTime -50 + execute if score @s 1052.ShotCount matches 6.. run scoreboard players set @s 1052.ShotCount 0 diff --git a/Asset/data/asset/functions/object/1052.maid/tick/kill.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/kill.mcfunction new file mode 100644 index 0000000000..2acb73a926 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/kill.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1052.maid/tick/kill +# +# +# +# @within function asset:object/1052.maid/tick/ + +# 演出 + playsound minecraft:entity.allay.death neutral @a ~ ~ ~ 1 2 + particle minecraft:enchant ~ ~1 ~ 0.2 0.5 0.2 0 100 + +# TPして死ぬ + tp ~ -9999 ~ + kill @s diff --git a/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction new file mode 100644 index 0000000000..cee82cb591 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1052.maid/tick/shot/damage +# +# +# +# @within function asset:object/1052.maid/tick/shot/loop + +# ダメージ設定 + # 与えるダメージ + data modify storage lib: Argument.Damage set value 5 + # 属性 + data modify storage lib: Argument.AttackType set value "Physical" + data modify storage lib: Argument.ElementType set value "None" + # ダメージ + execute as @p[tag=1052.Owner] run function lib:damage/modifier + execute as @e[type=#lib:living,tag=Enemy,tag=LandingTarget,distance=..60,sort=nearest,limit=1] run function lib:damage/ +# リセット + scoreboard players reset $OwnerID Temporary + function lib:damage/reset + +# 着弾タグを消す + tag @e[type=#lib:living,tag=Enemy,tag=LandingTarget,distance=..60,sort=nearest,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction new file mode 100644 index 0000000000..101bc397e7 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1052.maid/tick/shot/loop +# +# +# +# @within function +# asset:object/1052.maid/tick/shot/main +# asset:object/1052.maid/tick/shot/loop + + +# 着弾検知 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + +# ターゲットにタグ付与 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run tag @e[type=#lib:living,tag=Enemy,dx=0,limit=1] add LandingTarget + +# 演出 + particle minecraft:dust 0.122 0.122 0.122 0.7 ~ ~ ~ 0 0 0 0 0 + +# 着弾 + execute if entity @s[tag=Landing] run function asset:object/1052.maid/tick/shot/damage + +# 再起 + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:object/1052.maid/tick/shot/loop diff --git a/Asset/data/asset/functions/object/1052.maid/tick/shot/main.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/shot/main.mcfunction new file mode 100644 index 0000000000..d032ac3909 --- /dev/null +++ b/Asset/data/asset/functions/object/1052.maid/tick/shot/main.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1052.maid/tick/shot/main +# +# +# +# @within function asset:object/1052.maid/tick/action + + +# スコア + scoreboard players set @s 1052.ActionTime 0 + scoreboard players add @s 1052.ShotCount 1 + +# 音ならす + playsound minecraft:entity.zombie.attack_wooden_door neutral @a ~ ~ ~ 1 2 + playsound minecraft:entity.generic.explode neutral @a ~ ~ ~ 0.8 2 + +# 撃つ + execute facing entity @e[type=#lib:hostile,tag=Enemy,distance=..14,sort=nearest,limit=1] feet positioned ~ ~-0.425 ~ anchored eyes positioned ^ ^ ^ run function asset:object/1052.maid/tick/shot/loop + +# リセット + tag @s remove Landing diff --git a/Asset/data/asset/functions/object/alias/1052/init.mcfunction b/Asset/data/asset/functions/object/alias/1052/init.mcfunction new file mode 100644 index 0000000000..cc5eb52b70 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1052/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1052/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1052.maid/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1052/register.mcfunction b/Asset/data/asset/functions/object/alias/1052/register.mcfunction new file mode 100644 index 0000000000..fe57be846f --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1052/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1052/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1052.maid/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1052/summon.mcfunction b/Asset/data/asset/functions/object/alias/1052/summon.mcfunction new file mode 100644 index 0000000000..dbda8da8aa --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1052/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1052/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1052.maid/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1052/tick.mcfunction b/Asset/data/asset/functions/object/alias/1052/tick.mcfunction new file mode 100644 index 0000000000..b5d6ae458c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1052/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1052/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1052.maid/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 9f3c198153..14f7c5b45b 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1119.call_maid/trigger/1.trigger", "asset:artifact/1123.ride_missile/trigger/1.trigger", "asset:artifact/1142.book_of_hero/trigger/1.trigger", "asset:artifact/1145.nurse_call/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 168377400a..c1c75d6bee 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1119.call_maid/give/1.trigger", "asset:artifact/1123.ride_missile/give/1.trigger", "asset:artifact/1142.book_of_hero/give/1.trigger", "asset:artifact/1145.nurse_call/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index ae885b6a55..cde90db483 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1119.call_maid/register", "asset:artifact/1145.nurse_call/register", "asset:artifact/0003.humanity/register", "asset:artifact/0005.musket_matchlock/register", diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index bb7e17ae42..09a66d158f 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1052.maid/load", "asset:object/1029.barrage_spirit/load", "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load", diff --git a/Asset/data/tsb_armor/trim_pattern/20400.json b/Asset/data/tsb_armor/trim_pattern/20400.json new file mode 100644 index 0000000000..cdfabce449 --- /dev/null +++ b/Asset/data/tsb_armor/trim_pattern/20400.json @@ -0,0 +1,7 @@ +{ + "asset_id": "tsb_armor:20400", + "description": { + "translate": "trim_pattern.tsb_armor.20400" + }, + "template_item": "minecraft:barrier" +} From ca2024a4b75f0dffd83d07e2734400563c633a85 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:20:19 +0900 Subject: [PATCH 38/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81118]?= =?UTF-8?q?=20=E6=99=82=E5=BB=BB=E3=82=8A=E3=82=92=E4=BD=9C=E6=88=90=20(#3?= =?UTF-8?q?04)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../trigger/3.main.mcfunction | 2 +- .../give/1.trigger.mcfunction | 7 +++ .../1118.time_samsara/give/2.give.mcfunction | 60 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 15 +++++ .../trigger/3.main.mcfunction | 13 ++++ .../trigger/_index.d.mcfunction | 6 ++ .../trigger/summon.mcfunction | 21 +++++++ .../1051.time_laser/_index.d.mcfunction | 7 +++ .../object/1051.time_laser/init/.mcfunction | 12 ++++ .../1051.time_laser/register.mcfunction | 18 ++++++ .../object/1051.time_laser/summon/.mcfunction | 8 +++ .../1051.time_laser/summon/debug.mcfunction | 10 ++++ .../1051.time_laser/summon/macro.m.mcfunction | 7 +++ .../object/1051.time_laser/tick/.mcfunction | 33 ++++++++++ .../1051.time_laser/tick/damage.mcfunction | 26 ++++++++ .../1051.time_laser/tick/loop.mcfunction | 26 ++++++++ .../object/alias/1051/init.mcfunction | 8 +++ .../object/alias/1051/register.mcfunction | 8 +++ .../object/alias/1051/summon.mcfunction | 8 +++ .../object/alias/1051/tick.mcfunction | 8 +++ .../asset/tags/functions/artifact/give.json | 1 + .../asset/tags/functions/artifact/tick.json | 3 +- Asset/data/tsb_armor/trim_pattern/1118.json | 7 +++ 24 files changed, 320 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/trigger/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/summon/macro.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction create mode 100644 Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1051/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1051/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1051/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1051/tick.mcfunction create mode 100644 Asset/data/tsb_armor/trim_pattern/1118.json diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/3.main.mcfunction index 54cdc20edc..4e924610db 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/3.main.mcfunction @@ -32,4 +32,4 @@ tag @e[tag=25.Hit] remove 25.Hit # 着地後にエフェクトを消す処理 - schedule function asset:artifact/0077.swords_of_waterfall_climbing/trigger/3.1.effectclear 1t replace \ No newline at end of file + schedule function asset:artifact/0077.swords_of_waterfall_climbing/trigger/3.1.effectclear 1t replace diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/give/1.trigger.mcfunction new file mode 100644 index 0000000000..3c3a4bb0e9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1118.time_samsara/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1118} run function asset:artifact/1118.time_samsara/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/give/2.give.mcfunction new file mode 100644 index 0000000000..8a5e75983f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/give/2.give.mcfunction @@ -0,0 +1,60 @@ +#> asset:artifact/1118.time_samsara/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1118.time_samsara/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1118 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"時廻り","color":"#E17DFF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"絶望感のある置き時計"}','{"text":"頭に被ると周囲のモブを勝手に攻撃する"}','{"text":"鐘の音がなる...","color":"gray"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [25] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value never +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 20 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 30 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 240 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableCooldownMessage set value true +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableMPMessage set value true +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:132,Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,1118,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,1118,6],Slot:"head"}],Trim:{material:"minecraft:iron",pattern:"tsb_armor:1118"}} +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..5cacdac560 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1118.time_samsara/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのheadに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{head:1118} run function asset:artifact/1118.time_samsara/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..33150a84b3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1118.time_samsara/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1118.time_samsara/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/head +# 他にアイテム等確認する場合はここに書く + +# 発動範囲内に敵がいない時は発動しない。これはプレイヤーが意識する必要がないため発動条件として書かない。 + execute unless entity @e[type=#lib:living,tag=Enemy,distance=..20] run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1118.time_samsara/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction new file mode 100644 index 0000000000..82ccc61274 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1118.time_samsara/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1118.time_samsara/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/head + +# ここから先は神器側の効果の処理を書く + +# 近くのモブのうちランダムな野郎を狙って撃つ + execute at @e[type=#lib:living,tag=Enemy,distance=..20,sort=random,limit=1] positioned ~ ~1 ~ run function asset:artifact/1118.time_samsara/trigger/summon diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/_index.d.mcfunction new file mode 100644 index 0000000000..3f6ee38b4e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1118.time_samsara/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1118.time_samsara/trigger/** + #declare tag SpreadMarker diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction new file mode 100644 index 0000000000..216c3cce56 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1118.time_samsara/trigger/summon +# +# +# +# @within function asset:artifact/1118.time_samsara/trigger/3.main + +# 拡散用marker召喚 + execute as @e[type=#lib:living,distance=..30,sort=nearest,limit=1] anchored eyes run summon marker ^ ^ ^ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Bounds set value [[3d,3d],[1d,1d],[3d,3d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..30] at @s run function lib:spread_entity/ +# 拡散用マーカーが敵を見る + execute as @e[type=marker,tag=SpreadMarker,distance=..30] at @s run tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,distance=..30,sort=nearest,limit=1] eyes + +# 召喚 + data modify storage api: Argument.ID set value 1051 + execute as @e[type=marker,tag=SpreadMarker,distance=..30,limit=1] at @s run data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute at @e[type=marker,tag=SpreadMarker,distance=..30] facing entity @e[type=#lib:living,tag=Enemy,distance=..30,sort=nearest,limit=1] eyes positioned ^ ^ ^-3 run function api:object/summon + +# 前方拡散をキル + kill @e[type=marker,tag=SpreadMarker,distance=..30] diff --git a/Asset/data/asset/functions/object/1051.time_laser/_index.d.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/_index.d.mcfunction new file mode 100644 index 0000000000..08904c51a2 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1051.time_laser/_index.d +# @private + +#> tag +# @within function asset:object/1051.time_laser/** + #declare tag LandingTarget + #declare tag Landing diff --git a/Asset/data/asset/functions/object/1051.time_laser/init/.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/init/.mcfunction new file mode 100644 index 0000000000..a93932c8f1 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/init/.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1051.time_laser/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1051/init + +# 演出 + playsound minecraft:block.bell.use player @a ~ ~ ~ 2 0.5 + + particle minecraft:dust 1 1 1 1 ~ ~ ~ 0.5 0.5 0.5 0 40 + particle minecraft:electric_spark ~ ~ ~ 0.15 0.15 0.15 0.6 49 + particle end_rod ~ ~ ~ 0 0 0 0.6 30 diff --git a/Asset/data/asset/functions/object/1051.time_laser/register.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/register.mcfunction new file mode 100644 index 0000000000..6fd8604c72 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1051.time_laser/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1051/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1051 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1051.time_laser/summon/.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/summon/.mcfunction new file mode 100644 index 0000000000..dd1403f601 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1051.time_laser/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1051/summon + +# 元となるEntityを召喚する + function asset:object/1051.time_laser/summon/macro.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1051.time_laser/summon/debug.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/summon/debug.mcfunction new file mode 100644 index 0000000000..32010e52b8 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1051.time_laser/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1051 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1051.time_laser/summon/macro.m.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/summon/macro.m.mcfunction new file mode 100644 index 0000000000..27fc5f25cd --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/summon/macro.m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1051.time_laser/summon/macro.m +# +# +# +# @within function asset:object/1051.time_laser/summon/ + +$summon item_display ~ ~ ~ {Tags:["ObjectInit"],start_interpolation:0,interpolation_duration:10,glow_color_override:1b,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20226}},Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction new file mode 100644 index 0000000000..79ee1e345b --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/1051.time_laser/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1051/tick + +#> private +# @private +#declare score_holder $IntervalTime + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + + execute if score @s General.Object.Tick matches 2 run data modify entity @s transformation.scale set value [1f,1f,1f] + execute if score @s General.Object.Tick matches 70 run data modify entity @s start_interpolation set value 0 + execute if score @s General.Object.Tick matches 70 run data modify entity @s transformation.scale set value [0f,0f,0f] + +# 2tick毎のVFX + scoreboard players operation $IntervalTime Temporary = @s General.Object.Tick + scoreboard players operation $IntervalTime Temporary %= $2 Const + execute if score @s General.Object.Tick matches ..60 if score $IntervalTime Temporary matches 0 run playsound minecraft:block.stone_button.click_on player @a ~ ~ ~ 0.6 1.4 + scoreboard players reset $IntervalTime Temporary + +# 演出 + playsound minecraft:block.stone_button.click_on player @a ~ ~ ~ 0.6 1.4 + execute if score @s General.Object.Tick matches 20.. run playsound item.spyglass.use player @a ~ ~ ~ 1 1.4 +# レーザー撃つ + execute if score @s General.Object.Tick matches 20..60 run function asset:object/1051.time_laser/tick/loop + tag @s remove Landing + + +# 消滅処理 + kill @s[scores={General.Object.Tick=80..}] diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction new file mode 100644 index 0000000000..6089e4da99 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction @@ -0,0 +1,26 @@ +#> asset:object/1051.time_laser/tick/damage +# +# +# +# @within function asset:object/1051.time_laser/tick/loop + +#> private +# @private + #declare score_holder $OwnerID + +# ダメージ設定 + # 与えるダメージ + data modify storage lib: Argument.Damage set value 25 + # 属性 + data modify storage lib: Argument.AttackType set value "Magic" + data modify storage lib: Argument.ElementType set value "None" + # ダメージ + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run function lib:damage/modifier + execute as @e[type=#lib:living,tag=Enemy,tag=LandingTarget,sort=nearest] run function lib:damage/ +# リセット + scoreboard players reset $OwnerID Temporary + function lib:damage/reset + +# 着弾タグを消す + tag @e[type=#lib:living,tag=Enemy,tag=LandingTarget,sort=nearest] remove LandingTarget diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction new file mode 100644 index 0000000000..b6bb6aa609 --- /dev/null +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction @@ -0,0 +1,26 @@ +#> asset:object/1051.time_laser/tick/loop +# +# +# +# @within function +# asset:object/1051.time_laser/tick/ +# asset:object/1051.time_laser/tick/loop + +# 演出 + particle minecraft:dust 1 1 1 1 ~ ~ ~ 0.1 0.1 0.1 0 1 + particle minecraft:electric_spark ~ ~ ~ 0.15 0.15 0.15 0.1 2 + execute if predicate lib:random_pass_per/5 run particle minecraft:end_rod ~ ~ ~ 0.15 0.15 0.15 0 1 + execute if predicate lib:random_pass_per/25 run particle minecraft:glow ~ ~ ~ 0.15 0.15 0.15 0 1 + +# 着弾検知 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run tag @s add Landing + execute unless block ^ ^ ^1 #lib:no_collision run tag @s add Landing + +# ターゲットにタグ付与 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run tag @e[type=#lib:living,tag=Enemy,dx=0] add LandingTarget + +# 着弾 + execute if entity @s[tag=Landing] run function asset:object/1051.time_laser/tick/damage + +# 再起 + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..10] run function asset:object/1051.time_laser/tick/loop diff --git a/Asset/data/asset/functions/object/alias/1051/init.mcfunction b/Asset/data/asset/functions/object/alias/1051/init.mcfunction new file mode 100644 index 0000000000..a6f6b28009 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1051/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1051/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1051.time_laser/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1051/register.mcfunction b/Asset/data/asset/functions/object/alias/1051/register.mcfunction new file mode 100644 index 0000000000..346c02b599 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1051/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1051/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1051.time_laser/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1051/summon.mcfunction b/Asset/data/asset/functions/object/alias/1051/summon.mcfunction new file mode 100644 index 0000000000..faaa6b3ca2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1051/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1051/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1051.time_laser/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1051/tick.mcfunction b/Asset/data/asset/functions/object/alias/1051/tick.mcfunction new file mode 100644 index 0000000000..fc967a2b56 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1051/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1051/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1051.time_laser/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index c1c75d6bee..39beff4eec 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1118.time_samsara/give/1.trigger", "asset:artifact/1119.call_maid/give/1.trigger", "asset:artifact/1123.ride_missile/give/1.trigger", "asset:artifact/1142.book_of_hero/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 0b5dbed0a1..37e1ce08ef 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1118.time_samsara/trigger/1.trigger", "asset:artifact/0928.ankh/trigger/1.trigger", "asset:artifact/1057.great_demon_head/trigger/tick/1.trigger", "asset:artifact/1074.farothdal/trigger/1.trigger", @@ -20,4 +21,4 @@ "asset:artifact/0468.raging_demon/trigger/1.trigger", "asset:artifact/0563.heartland/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/tsb_armor/trim_pattern/1118.json b/Asset/data/tsb_armor/trim_pattern/1118.json new file mode 100644 index 0000000000..7f9954ef40 --- /dev/null +++ b/Asset/data/tsb_armor/trim_pattern/1118.json @@ -0,0 +1,7 @@ +{ + "asset_id": "tsb_armor:1118", + "description": { + "translate": "trim_pattern.tsb_armor.1118" + }, + "template_item": "minecraft:barrier" +} From a6534f54465d5413baae4ee3acc4d9cd6028ac72 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:59:03 +0900 Subject: [PATCH 39/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81112]?= =?UTF-8?q?=20=E8=AA=93=E3=81=84=E3=81=AE=E6=9D=96=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=20(#288)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../1112.lexiel_rod/give/1.trigger.mcfunction | 7 + .../1112.lexiel_rod/give/2.give.mcfunction | 61 +++++++ .../trigger/1.trigger.mcfunction | 8 + .../trigger/2.check_condition.mcfunction | 12 ++ .../1112.lexiel_rod/trigger/3.main.mcfunction | 23 +++ .../1112.lexiel_rod/trigger/summon.mcfunction | 28 +++ .../detect_hit_block/.mcfunction | 8 + .../detect_hit_entity/.mcfunction | 8 + .../1049.lexiel_rod_fireball/init/.mcfunction | 14 ++ .../1049.lexiel_rod_fireball/kill/.mcfunction | 31 ++++ .../kill/vfx.mcfunction | 172 ++++++++++++++++++ .../recursive/.mcfunction | 9 + .../register.mcfunction | 18 ++ .../summon/.mcfunction | 8 + .../summon/debug.mcfunction | 10 + .../summon/macro.m.mcfunction | 8 + .../1049.lexiel_rod_fireball/tick/.mcfunction | 17 ++ .../alias/1049/detect_hit_block.mcfunction | 8 + .../alias/1049/detect_hit_entity.mcfunction | 8 + .../object/alias/1049/init.mcfunction | 8 + .../object/alias/1049/kill.mcfunction | 8 + .../object/alias/1049/recursive.mcfunction | 8 + .../object/alias/1049/register.mcfunction | 8 + .../object/alias/1049/summon.mcfunction | 8 + .../object/alias/1049/tick.mcfunction | 8 + .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + 27 files changed, 508 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/vfx.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/detect_hit_block.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1049/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/1.trigger.mcfunction new file mode 100644 index 0000000000..c694c61dc5 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1112.lexiel_rod/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1112} run function asset:artifact/1112.lexiel_rod/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/2.give.mcfunction new file mode 100644 index 0000000000..fcb23633d7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1112.lexiel_rod/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1112.lexiel_rod/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1112 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"誓いの杖","color":"light_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"火球を3つ飛ばす。"}','{"text":"レクシエルが初めて貰った杖。","color":"gray"}','{"text":"だいぶ使い込まれているようだ。","color":"gray"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [250] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value every +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 3 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 30 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 20 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..56b0020c73 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1112.lexiel_rod/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1112} run function asset:artifact/1112.lexiel_rod/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..b352db1b5b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1112.lexiel_rod/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1112.lexiel_rod/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1112.lexiel_rod/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/3.main.mcfunction new file mode 100644 index 0000000000..afec61a3aa --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/3.main.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1112.lexiel_rod/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1112.lexiel_rod/trigger/2.check_condition + +#> private +# @private + #declare tag SpreadMarker + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 演出 + playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1.5 0.8 + playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1.5 1.2 + playsound minecraft:block.soul_sand.step player @a ~ ~ ~ 1.5 0.7 +# 三発だす + execute anchored eyes positioned ^-0.35 ^-0.25 ^0.5 run function asset:artifact/1112.lexiel_rod/trigger/summon + execute anchored eyes positioned ^-0.35 ^-0.25 ^0.5 run function asset:artifact/1112.lexiel_rod/trigger/summon + execute anchored eyes positioned ^-0.35 ^-0.25 ^0.5 run function asset:artifact/1112.lexiel_rod/trigger/summon diff --git a/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/summon.mcfunction new file mode 100644 index 0000000000..3458c8550c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1112.lexiel_rod/trigger/summon.mcfunction @@ -0,0 +1,28 @@ +#> asset:artifact/1112.lexiel_rod/trigger/summon +# +# +# +# @within function asset:artifact/1112.lexiel_rod/trigger/3.main + +#> private +# @private + #declare tag SpreadMarker + +# 前方拡散 + execute positioned ^ ^ ^1 run summon marker ^ ^ ^ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Distance set value 1.0 + data modify storage lib: Argument.Spread set value 1.2 + execute as @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] run function lib:forward_spreader/circle + +# Markerに自分の方を向かせた上で反対を向かせる +# これにより本体の向きを一切変えずに本体からMarkerへの方向がMarkerのRotationに入る + execute as @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] at @s facing entity @p[tag=this] eyes facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ + +# 召喚 + data modify storage api: Argument.ID set value 1049 + execute as @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] at @s run data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute positioned ^ ^ ^1 run function api:object/summon + +# 前方拡散Markerをkill + kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..f4b53cdb30 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1049.lexiel_rod_fireball/detect_hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1049/detect_hit_block + +# 判定 + execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..c288af3ca6 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1049.lexiel_rod_fireball/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1049/detect_hit_entity + +# 判定 + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/init/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/init/.mcfunction new file mode 100644 index 0000000000..57bdfab38a --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/init/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1049.lexiel_rod_fireball/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1049/init + +# フィールドのデータからスコアを設定 + data modify storage asset:context this.Speed set value 2 + data modify storage asset:context this.Range set value 32 + +# デフォルト値0.5 + data modify storage asset:context this.MovePerStep set value 0.5 + + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/.mcfunction new file mode 100644 index 0000000000..746694a395 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/.mcfunction @@ -0,0 +1,31 @@ +#> asset:object/1049.lexiel_rod_fireball/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1049/kill + +#> private +# @private + #declare score_holder $OwnerID + +# 演出 + function asset:object/1049.lexiel_rod_fireball/kill/vfx + +# ダメージを与える +# ダメージ設定 + # 与えるダメージ + data modify storage lib: Argument.Damage set value 250.0f + # 魔法属性 + data modify storage lib: Argument.AttackType set value "Magic" + # 属性 + data modify storage lib: Argument.ElementType set value "Fire" + # ダメージ + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute at @a if score $OwnerID Temporary = @p UserID as @p run function lib:damage/modifier + execute as @e[type=#lib:living,tag=Enemy,distance=..3] run function lib:damage/ +# リセット + function lib:damage/reset + scoreboard players reset $OwnerID Temporary + +# キル + kill @s diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/vfx.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/vfx.mcfunction new file mode 100644 index 0000000000..8d2d179b7f --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/vfx.mcfunction @@ -0,0 +1,172 @@ +#> asset:object/1049.lexiel_rod_fireball/kill/vfx +# +# +# +# @within function asset:object/1049.lexiel_rod_fireball/kill/ + +particle minecraft:explosion ~ ~ ~ 0.3 0 0.3 0 10 +particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 100 +playsound entity.lightning_bolt.impact hostile @a ~ ~ ~ 1 0 + +particle flame ~ ~ ~ 0.000000 -0.190904 0.000000 1 0 +particle flame ~ ~ ~ 0.138140 -0.085376 0.100363 1 0 +particle flame ~ ~ ~ -0.052764 -0.085376 0.162393 1 0 +particle flame ~ ~ ~ -0.170750 -0.085375 0.000000 1 0 +particle flame ~ ~ ~ -0.052764 -0.085376 -0.162393 1 0 +particle flame ~ ~ ~ 0.138140 -0.085376 -0.100363 1 0 +particle flame ~ ~ ~ 0.052764 0.085376 0.162393 1 0 +particle flame ~ ~ ~ -0.138140 0.085376 0.100363 1 0 +particle flame ~ ~ ~ -0.138140 0.085376 -0.100363 1 0 +particle flame ~ ~ ~ 0.052764 0.085376 -0.162393 1 0 +particle flame ~ ~ ~ 0.170750 0.085375 0.000000 1 0 +particle flame ~ ~ ~ 0.000000 0.190905 0.000000 1 0 +particle flame ~ ~ ~ -0.044447 -0.125523 0.136795 1 0 +particle flame ~ ~ ~ -0.031013 -0.162394 0.095451 1 0 +particle flame ~ ~ ~ -0.014815 -0.184786 0.045598 1 0 +particle flame ~ ~ ~ 0.038788 -0.184786 0.028181 1 0 +particle flame ~ ~ ~ 0.081196 -0.162394 0.058992 1 0 +particle flame ~ ~ ~ 0.116365 -0.125523 0.084543 1 0 +particle flame ~ ~ ~ 0.101550 -0.095892 0.130142 1 0 +particle flame ~ ~ ~ 0.050183 -0.100366 0.154444 1 0 +particle flame ~ ~ ~ -0.005658 -0.095892 0.164977 1 0 +particle flame ~ ~ ~ 0.155154 -0.095891 -0.056362 1 0 +particle flame ~ ~ ~ 0.162393 -0.100365 0.000000 1 0 +particle flame ~ ~ ~ 0.155154 -0.095891 0.056362 1 0 +particle flame ~ ~ ~ 0.038788 -0.184786 -0.028181 1 0 +particle flame ~ ~ ~ 0.081196 -0.162394 -0.058992 1 0 +particle flame ~ ~ ~ 0.116365 -0.125523 -0.084543 1 0 +particle flame ~ ~ ~ -0.143835 -0.125523 0.000000 1 0 +particle flame ~ ~ ~ -0.100364 -0.162393 0.000000 1 0 +particle flame ~ ~ ~ -0.047945 -0.184786 0.000000 1 0 +particle flame ~ ~ ~ -0.092392 -0.095892 0.136795 1 0 +particle flame ~ ~ ~ -0.131378 -0.100365 0.095452 1 0 +particle flame ~ ~ ~ -0.158651 -0.095891 0.045598 1 0 +particle flame ~ ~ ~ -0.044447 -0.125523 -0.136795 1 0 +particle flame ~ ~ ~ -0.031013 -0.162394 -0.095451 1 0 +particle flame ~ ~ ~ -0.014815 -0.184786 -0.045598 1 0 +particle flame ~ ~ ~ -0.158651 -0.095891 -0.045598 1 0 +particle flame ~ ~ ~ -0.131378 -0.100365 -0.095452 1 0 +particle flame ~ ~ ~ -0.092392 -0.095892 -0.136795 1 0 +particle flame ~ ~ ~ -0.005658 -0.095892 -0.164977 1 0 +particle flame ~ ~ ~ 0.050183 -0.100366 -0.154444 1 0 +particle flame ~ ~ ~ 0.101550 -0.095892 -0.130142 1 0 +particle flame ~ ~ ~ 0.182624 0.047946 0.028181 1 0 +particle flame ~ ~ ~ 0.181561 0.000000 0.058992 1 0 +particle flame ~ ~ ~ 0.164311 -0.047946 0.084544 1 0 +particle flame ~ ~ ~ 0.164311 -0.047946 -0.084543 1 0 +particle flame ~ ~ ~ 0.181561 0.000000 -0.058992 1 0 +particle flame ~ ~ ~ 0.182624 0.047946 -0.028181 1 0 +particle flame ~ ~ ~ 0.029631 0.047946 0.182394 1 0 +particle flame ~ ~ ~ 0.000000 0.000000 0.190905 1 0 +particle flame ~ ~ ~ -0.029631 -0.047946 0.182394 1 0 +particle flame ~ ~ ~ 0.131182 -0.047946 0.130143 1 0 +particle flame ~ ~ ~ 0.112211 0.000000 0.154445 1 0 +particle flame ~ ~ ~ 0.083236 0.047946 0.164977 1 0 +particle flame ~ ~ ~ -0.164311 0.047946 0.084544 1 0 +particle flame ~ ~ ~ -0.181561 0.000000 0.058992 1 0 +particle flame ~ ~ ~ -0.182624 -0.047946 0.028181 1 0 +particle flame ~ ~ ~ -0.083236 -0.047946 0.164977 1 0 +particle flame ~ ~ ~ -0.112211 0.000000 0.154445 1 0 +particle flame ~ ~ ~ -0.131182 0.047946 0.130143 1 0 +particle flame ~ ~ ~ -0.131182 0.047946 -0.130143 1 0 +particle flame ~ ~ ~ -0.112211 0.000000 -0.154445 1 0 +particle flame ~ ~ ~ -0.083236 -0.047946 -0.164977 1 0 +particle flame ~ ~ ~ -0.182624 -0.047946 -0.028181 1 0 +particle flame ~ ~ ~ -0.181561 0.000000 -0.058992 1 0 +particle flame ~ ~ ~ -0.164311 0.047946 -0.084543 1 0 +particle flame ~ ~ ~ 0.083236 0.047946 -0.164977 1 0 +particle flame ~ ~ ~ 0.112211 0.000000 -0.154445 1 0 +particle flame ~ ~ ~ 0.131182 -0.047946 -0.130143 1 0 +particle flame ~ ~ ~ -0.029631 -0.047946 -0.182394 1 0 +particle flame ~ ~ ~ 0.000000 0.000000 -0.190904 1 0 +particle flame ~ ~ ~ 0.029631 0.047946 -0.182394 1 0 +particle flame ~ ~ ~ 0.158651 0.095891 0.045598 1 0 +particle flame ~ ~ ~ 0.131379 0.100365 0.095452 1 0 +particle flame ~ ~ ~ 0.092392 0.095892 0.136795 1 0 +particle flame ~ ~ ~ 0.005658 0.095892 0.164977 1 0 +particle flame ~ ~ ~ -0.050183 0.100366 0.154444 1 0 +particle flame ~ ~ ~ -0.101550 0.095892 0.130142 1 0 +particle flame ~ ~ ~ -0.155154 0.095891 0.056362 1 0 +particle flame ~ ~ ~ -0.162392 0.100365 0.000000 1 0 +particle flame ~ ~ ~ -0.155154 0.095891 -0.056362 1 0 +particle flame ~ ~ ~ -0.101550 0.095892 -0.130142 1 0 +particle flame ~ ~ ~ -0.050183 0.100366 -0.154444 1 0 +particle flame ~ ~ ~ 0.005658 0.095892 -0.164977 1 0 +particle flame ~ ~ ~ 0.092392 0.095892 -0.136795 1 0 +particle flame ~ ~ ~ 0.131379 0.100365 -0.095452 1 0 +particle flame ~ ~ ~ 0.158651 0.095891 -0.045598 1 0 +particle flame ~ ~ ~ 0.014815 0.184786 0.045598 1 0 +particle flame ~ ~ ~ 0.031014 0.162394 0.095451 1 0 +particle flame ~ ~ ~ 0.044447 0.125523 0.136795 1 0 +particle flame ~ ~ ~ 0.143835 0.125523 0.000000 1 0 +particle flame ~ ~ ~ 0.100364 0.162393 0.000000 1 0 +particle flame ~ ~ ~ 0.047945 0.184786 0.000000 1 0 +particle flame ~ ~ ~ -0.038788 0.184786 0.028181 1 0 +particle flame ~ ~ ~ -0.081196 0.162394 0.058992 1 0 +particle flame ~ ~ ~ -0.116365 0.125523 0.084543 1 0 +particle flame ~ ~ ~ -0.038788 0.184786 -0.028181 1 0 +particle flame ~ ~ ~ -0.081196 0.162394 -0.058992 1 0 +particle flame ~ ~ ~ -0.116365 0.125523 -0.084543 1 0 +particle flame ~ ~ ~ 0.014815 0.184786 -0.045598 1 0 +particle flame ~ ~ ~ 0.031014 0.162394 -0.095451 1 0 +particle flame ~ ~ ~ 0.044447 0.125523 -0.136795 1 0 +particle flame ~ ~ ~ 0.069069 0.170751 -0.050182 1 0 +particle flame ~ ~ ~ 0.121834 0.138140 -0.050182 1 0 +particle flame ~ ~ ~ 0.085374 0.138141 -0.100364 1 0 +particle flame ~ ~ ~ -0.026382 0.170751 -0.081195 1 0 +particle flame ~ ~ ~ -0.010078 0.138141 -0.131378 1 0 +particle flame ~ ~ ~ -0.069070 0.138141 -0.112210 1 0 +particle flame ~ ~ ~ -0.085374 0.170751 0.000000 1 0 +particle flame ~ ~ ~ -0.128062 0.138141 -0.031014 1 0 +particle flame ~ ~ ~ -0.128062 0.138141 0.031014 1 0 +particle flame ~ ~ ~ -0.026382 0.170751 0.081195 1 0 +particle flame ~ ~ ~ -0.069070 0.138141 0.112210 1 0 +particle flame ~ ~ ~ -0.010078 0.138141 0.131378 1 0 +particle flame ~ ~ ~ 0.069069 0.170751 0.050182 1 0 +particle flame ~ ~ ~ 0.085374 0.138141 0.100364 1 0 +particle flame ~ ~ ~ 0.121834 0.138140 0.050182 1 0 +particle flame ~ ~ ~ 0.164522 0.052765 -0.081196 1 0 +particle flame ~ ~ ~ 0.154445 0.000000 -0.112210 1 0 +particle flame ~ ~ ~ 0.128063 0.052766 -0.131378 1 0 +particle flame ~ ~ ~ -0.026383 0.052765 -0.181561 1 0 +particle flame ~ ~ ~ -0.058993 -0.000000 -0.181561 1 0 +particle flame ~ ~ ~ -0.085375 0.052765 -0.162393 1 0 +particle flame ~ ~ ~ -0.180827 0.052765 -0.031014 1 0 +particle flame ~ ~ ~ -0.190904 0.000000 0.000000 1 0 +particle flame ~ ~ ~ -0.180827 0.052765 0.031014 1 0 +particle flame ~ ~ ~ -0.085375 0.052765 0.162393 1 0 +particle flame ~ ~ ~ -0.058993 -0.000000 0.181561 1 0 +particle flame ~ ~ ~ -0.026383 0.052765 0.181561 1 0 +particle flame ~ ~ ~ 0.128063 0.052765 0.131379 1 0 +particle flame ~ ~ ~ 0.154445 -0.000000 0.112210 1 0 +particle flame ~ ~ ~ 0.164522 0.052765 0.081196 1 0 +particle flame ~ ~ ~ 0.058993 0.000000 -0.181561 1 0 +particle flame ~ ~ ~ 0.085376 -0.052766 -0.162393 1 0 +particle flame ~ ~ ~ 0.026383 -0.052766 -0.181561 1 0 +particle flame ~ ~ ~ -0.154445 0.000000 -0.112210 1 0 +particle flame ~ ~ ~ -0.128062 -0.052765 -0.131379 1 0 +particle flame ~ ~ ~ -0.164522 -0.052765 -0.081196 1 0 +particle flame ~ ~ ~ -0.154445 0.000000 0.112211 1 0 +particle flame ~ ~ ~ -0.164522 -0.052765 0.081196 1 0 +particle flame ~ ~ ~ -0.128062 -0.052765 0.131379 1 0 +particle flame ~ ~ ~ 0.058993 0.000000 0.181561 1 0 +particle flame ~ ~ ~ 0.026383 -0.052766 0.181561 1 0 +particle flame ~ ~ ~ 0.085376 -0.052766 0.162393 1 0 +particle flame ~ ~ ~ 0.190905 0.000000 0.000000 1 0 +particle flame ~ ~ ~ 0.180827 -0.052765 0.031014 1 0 +particle flame ~ ~ ~ 0.180827 -0.052765 -0.031014 1 0 +particle flame ~ ~ ~ 0.069070 -0.138141 -0.112210 1 0 +particle flame ~ ~ ~ 0.026382 -0.170751 -0.081196 1 0 +particle flame ~ ~ ~ 0.010078 -0.138141 -0.131378 1 0 +particle flame ~ ~ ~ -0.085375 -0.138141 -0.100364 1 0 +particle flame ~ ~ ~ -0.069069 -0.170750 -0.050182 1 0 +particle flame ~ ~ ~ -0.121834 -0.138140 -0.050182 1 0 +particle flame ~ ~ ~ -0.121834 -0.138140 0.050182 1 0 +particle flame ~ ~ ~ -0.069070 -0.170750 0.050182 1 0 +particle flame ~ ~ ~ -0.085375 -0.138140 0.100364 1 0 +particle flame ~ ~ ~ 0.128062 -0.138141 -0.031014 1 0 +particle flame ~ ~ ~ 0.128062 -0.138140 0.031014 1 0 +particle flame ~ ~ ~ 0.085375 -0.170750 0.000000 1 0 +particle flame ~ ~ ~ 0.010078 -0.138141 0.131378 1 0 +particle flame ~ ~ ~ 0.026383 -0.170751 0.081196 1 0 +particle flame ~ ~ ~ 0.069070 -0.138141 0.112210 1 0 diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/recursive/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/recursive/.mcfunction new file mode 100644 index 0000000000..4798fe7875 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/recursive/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1049.lexiel_rod_fireball/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1049/recursive + +# particle + execute if predicate lib:random_pass_per/30 run particle flame ~ ~0.2 ~ 0 0 0 0.01 2 + execute if predicate lib:random_pass_per/30 run particle smoke ~ ~0.2 ~ 0 0 0 0.01 3 diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/register.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/register.mcfunction new file mode 100644 index 0000000000..0abd6288b6 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1049.lexiel_rod_fireball/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1049/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 1049 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/.mcfunction new file mode 100644 index 0000000000..04d6ae82fa --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1049.lexiel_rod_fireball/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1049/summon + +# 元となるEntityを召喚する + function asset:object/1049.lexiel_rod_fireball/summon/macro.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/debug.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/debug.mcfunction new file mode 100644 index 0000000000..174420b309 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1049.lexiel_rod_fireball/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1049 + function api:object/summon diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction new file mode 100644 index 0000000000..85618a0522 --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1049.lexiel_rod_fireball/summon/.m +# +# +# +# @within function asset:object/1049.lexiel_rod_fireball/summon/ + +# 元となるEntityを召喚する + $summon item_display ~ ~ ~ {billboard:"fixed",teleport_duration:1,Tags:["ObjectInit"],item:{id:"minecraft:fire_charge",Count:1b},Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction new file mode 100644 index 0000000000..fc183b26fb --- /dev/null +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1049.lexiel_rod_fireball/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1049/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=1000..}] + +# ちょっと追尾 + execute facing entity @e[type=#lib:living,tag=Enemy,distance=..10,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^ ~ ~ + + + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/alias/1049/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/1049/detect_hit_block.mcfunction new file mode 100644 index 0000000000..208e01b0c0 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/detect_hit_block/ diff --git a/Asset/data/asset/functions/object/alias/1049/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1049/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..6352aa7344 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/detect_hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1049/init.mcfunction b/Asset/data/asset/functions/object/alias/1049/init.mcfunction new file mode 100644 index 0000000000..8c78946117 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/init/ diff --git a/Asset/data/asset/functions/object/alias/1049/kill.mcfunction b/Asset/data/asset/functions/object/alias/1049/kill.mcfunction new file mode 100644 index 0000000000..ef94f24a83 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/kill/ diff --git a/Asset/data/asset/functions/object/alias/1049/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1049/recursive.mcfunction new file mode 100644 index 0000000000..de539c9a00 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/recursive/ diff --git a/Asset/data/asset/functions/object/alias/1049/register.mcfunction b/Asset/data/asset/functions/object/alias/1049/register.mcfunction new file mode 100644 index 0000000000..00c49a15d8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/register diff --git a/Asset/data/asset/functions/object/alias/1049/summon.mcfunction b/Asset/data/asset/functions/object/alias/1049/summon.mcfunction new file mode 100644 index 0000000000..90a5c02a1c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/summon/ diff --git a/Asset/data/asset/functions/object/alias/1049/tick.mcfunction b/Asset/data/asset/functions/object/alias/1049/tick.mcfunction new file mode 100644 index 0000000000..29611bcbaa --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1049/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1049/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1049.lexiel_rod_fireball/tick/ diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 14f7c5b45b..93ed1e0095 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1112.lexiel_rod/trigger/1.trigger", "asset:artifact/1119.call_maid/trigger/1.trigger", "asset:artifact/1123.ride_missile/trigger/1.trigger", "asset:artifact/1142.book_of_hero/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 39beff4eec..6b82dcc76c 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1112.lexiel_rod/give/1.trigger", "asset:artifact/1118.time_samsara/give/1.trigger", "asset:artifact/1119.call_maid/give/1.trigger", "asset:artifact/1123.ride_missile/give/1.trigger", From b84eb3cde09b61ed4141171e1587d4af0708e0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 21 Nov 2024 06:43:21 +0900 Subject: [PATCH 40/74] =?UTF-8?q?=F0=9F=90=9B=20tag/function=E3=81=AEre-gi?= =?UTF-8?q?ven=E3=81=AB=E5=95=8F=E9=A1=8C=E3=81=8C=E3=81=82=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#382)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Asset/data/asset/tags/functions/effect/re-given.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index a1ae8da052..76a25fbdb5 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -10,7 +10,7 @@ "asset:effect/0608.sinking/_/re-given", "asset:effect/0612.infringement/_/re-given", "asset:effect/0613.white_curse/_/re-given", - "asset:effect/0261.gale_blessing/_/re-given" + "asset:effect/0261.gale_blessing/_/re-given", "asset:effect/0211.fading_speed/_/re-given", "asset:effect/0210.fading_speed/_/re-given" ] From 960a37ea2dfb15a8d7b30e9d1327b185e36f6f61 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:54:25 +0900 Subject: [PATCH 41/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81085]?= =?UTF-8?q?=20=E3=83=9F=E3=82=A2=E3=83=86=E3=82=A3=E3=82=A2=E3=82=BC?= =?UTF-8?q?=E3=83=B3=E3=83=AB=E3=82=AF=E3=82=92=E4=BD=9C=E6=88=90=20(#279)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 +++ .../give/2.give.mcfunction | 61 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 23 +++++++ .../trigger/dis_equip/.mcfunction | 7 +++ .../trigger/dis_equip/main.mcfunction | 12 ++++ .../tags/functions/artifact/dis_equip.json | 1 + .../asset/tags/functions/artifact/equip.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + 10 files changed, 133 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/1.trigger.mcfunction new file mode 100644 index 0000000000..838e7fa0c4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1085.mia_tia_zen_luc/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1085} run function asset:artifact/1085.mia_tia_zen_luc/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/2.give.mcfunction new file mode 100644 index 0000000000..e212468af4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1085.mia_tia_zen_luc/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1085.mia_tia_zen_luc/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1085 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ミアティアゼンルク","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"魔力を増強する手"}','{"text":"移動速度を半減し、魔法攻撃力を+15%する"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "offhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "equipping" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..40e6a75058 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1085.mia_tia_zen_luc/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのoffhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{offhand:1085} run function asset:artifact/1085.mia_tia_zen_luc/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..fa530c49fb --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1085.mia_tia_zen_luc/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1085.mia_tia_zen_luc/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1085.mia_tia_zen_luc/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/3.main.mcfunction new file mode 100644 index 0000000000..6b0fd2f0cb --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/3.main.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1085.mia_tia_zen_luc/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1085.mia_tia_zen_luc/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/offhand + +# ここから先は神器側の効果の処理を書く + +# 演出 + particle dragon_breath ~ ~0.5 ~ 2 0 2 0 100 + playsound entity.ravager.death player @a ~ ~ ~ 1 2 + +# 魔法攻撃+15% + data modify storage api: Argument.UUID set value [I;1,1,1085,2] + data modify storage api: Argument.Amount set value 0.15 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/magic/add + +#移動速度下げる + attribute @s minecraft:generic.movement_speed modifier add 1-0-1-0-43d00000002 "1085" -0.5 multiply_base diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..8183d1c4a2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{offhand:1085} run function asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main.mcfunction new file mode 100644 index 0000000000..c0c57f0f9a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/ + +# 魔法攻撃戻す + data modify storage api: Argument.UUID set value [I;1,1,1085,2] + function api:modifier/attack/magic/remove + +#移動速度戻す + attribute @s minecraft:generic.movement_speed modifier remove 1-0-1-0-43d00000002 diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index e2f7a1d9b4..5031b2d5d8 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/", "asset:artifact/1032.life_charm/trigger/dis_equip/", "asset:artifact/0667.soul_fire_armor/trigger/dis_equip/", "asset:artifact/0666.soul_fire_armor/trigger/dis_equip/", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 908275cef7..c008976185 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1085.mia_tia_zen_luc/trigger/1.trigger", "asset:artifact/1032.life_charm/trigger/1.trigger", "asset:artifact/0667.soul_fire_armor/trigger/1.trigger", "asset:artifact/0666.soul_fire_armor/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 6b82dcc76c..bf1abbc4d9 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1085.mia_tia_zen_luc/give/1.trigger", "asset:artifact/1112.lexiel_rod/give/1.trigger", "asset:artifact/1118.time_samsara/give/1.trigger", "asset:artifact/1119.call_maid/give/1.trigger", From 8217bc961862c5002bd2f164531a923419d012cd Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:53:25 +0900 Subject: [PATCH 42/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81084]?= =?UTF-8?q?=20=E3=83=9F=E3=82=A2=E3=82=BE=E3=83=AB=E3=83=AB=E3=82=AF?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=20(#278)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 +++ .../1084.mia_zoru_luc/give/2.give.mcfunction | 61 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 18 ++++++ .../trigger/dis_equip/.mcfunction | 7 +++ .../trigger/dis_equip/main.mcfunction | 9 +++ .../0619.hand_of_destruction/_/end.mcfunction | 7 +++ .../_/register.mcfunction | 7 +++ .../_/remove.mcfunction | 7 +++ .../_/tick.mcfunction | 7 +++ .../0619.hand_of_destruction/end/.mcfunction | 7 +++ .../register.mcfunction | 35 +++++++++++ .../remove/.mcfunction | 7 +++ .../0619.hand_of_destruction/tick/.mcfunction | 7 +++ .../tags/functions/artifact/dis_equip.json | 1 + .../asset/tags/functions/artifact/equip.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + .../data/asset/tags/functions/effect/end.json | 2 + .../asset/tags/functions/effect/register.json | 2 + .../asset/tags/functions/effect/remove.json | 2 + .../asset/tags/functions/effect/tick.json | 2 + 22 files changed, 217 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/main.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0619.hand_of_destruction/tick/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/1.trigger.mcfunction new file mode 100644 index 0000000000..29ce37f625 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1084.mia_zoru_luc/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1084} run function asset:artifact/1084.mia_zoru_luc/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/2.give.mcfunction new file mode 100644 index 0000000000..df5e5a8a51 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1084.mia_zoru_luc/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1084.mia_zoru_luc/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1084 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:golden_pickaxe" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ミアゾルルク","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"破壊を象徴する手"}','{"text":"採掘速度を上昇させる"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "equipping" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,HideFlags:4} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..1ccc245483 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1084.mia_zoru_luc/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1084} run function asset:artifact/1084.mia_zoru_luc/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..d90424d690 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1084.mia_zoru_luc/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1084.mia_zoru_luc/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1084.mia_zoru_luc/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/3.main.mcfunction new file mode 100644 index 0000000000..9805a815dd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/3.main.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1084.mia_zoru_luc/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1084.mia_zoru_luc/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 演出 + playsound entity.ravager.hurt player @a ~ ~ ~ 1 0.7 + particle block redstone_block ~ ~1.3 ~ 0 0 0 1 20 + +# エフェクトを付与 + data modify storage api: Argument.ID set value 619 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..5786e32cd9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1084.mia_zoru_luc/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{mainhand:1084} run function asset:artifact/1084.mia_zoru_luc/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/main.mcfunction new file mode 100644 index 0000000000..34b4bd8b2d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1084.mia_zoru_luc/trigger/dis_equip/main.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1084.mia_zoru_luc/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1084.mia_zoru_luc/trigger/dis_equip/ + +# エフェクトを削除 + data modify storage api: Argument.ID set value 619 + function api:entity/mob/effect/remove/from_id diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/end.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/end.mcfunction new file mode 100644 index 0000000000..7cf13a338e --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:619} run function asset:effect/0619.hand_of_destruction/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/register.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/register.mcfunction new file mode 100644 index 0000000000..09b0373086 --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:619} run function asset:effect/0619.hand_of_destruction/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/remove.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/remove.mcfunction new file mode 100644 index 0000000000..88825f92db --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:619} run function asset:effect/0619.hand_of_destruction/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/tick.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/tick.mcfunction new file mode 100644 index 0000000000..406ff67847 --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:619} run function asset:effect/0619.hand_of_destruction/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/end/.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/end/.mcfunction new file mode 100644 index 0000000000..3b0dbc4e2a --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/end/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0619.hand_of_destruction/_/end + +effect clear @s haste diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/register.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/register.mcfunction new file mode 100644 index 0000000000..b981228613 --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0619.hand_of_destruction/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0619.hand_of_destruction/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 619 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"破壊の手"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"採掘速度が上昇する。"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/remove/.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/remove/.mcfunction new file mode 100644 index 0000000000..745c70ffff --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/remove/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0619.hand_of_destruction/_/remove + +effect clear @s haste diff --git a/Asset/data/asset/functions/effect/0619.hand_of_destruction/tick/.mcfunction b/Asset/data/asset/functions/effect/0619.hand_of_destruction/tick/.mcfunction new file mode 100644 index 0000000000..a2220ec0eb --- /dev/null +++ b/Asset/data/asset/functions/effect/0619.hand_of_destruction/tick/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0619.hand_of_destruction/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0619.hand_of_destruction/_/tick + +effect give @s haste infinite 3 true diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 5031b2d5d8..424a7b869d 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1084.mia_zoru_luc/trigger/dis_equip/", "asset:artifact/1085.mia_tia_zen_luc/trigger/dis_equip/", "asset:artifact/1032.life_charm/trigger/dis_equip/", "asset:artifact/0667.soul_fire_armor/trigger/dis_equip/", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index c008976185..5790e10638 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1084.mia_zoru_luc/trigger/1.trigger", "asset:artifact/1085.mia_tia_zen_luc/trigger/1.trigger", "asset:artifact/1032.life_charm/trigger/1.trigger", "asset:artifact/0667.soul_fire_armor/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index bf1abbc4d9..78b37ad202 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1084.mia_zoru_luc/give/1.trigger", "asset:artifact/1085.mia_tia_zen_luc/give/1.trigger", "asset:artifact/1112.lexiel_rod/give/1.trigger", "asset:artifact/1118.time_samsara/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index d85f3704da..87c99dd133 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -33,6 +33,8 @@ "asset:effect/0608.sinking/_/end", "asset:effect/0612.infringement/_/end", "asset:effect/0613.white_curse/_/end", + "asset:effect/0203.secret_meat/_/end", + "asset:effect/0619.hand_of_destruction/_/end", "asset:effect/0261.gale_blessing/_/end", "asset:effect/0210.fading_speed/_/end", "asset:effect/0211.fading_speed/_/end", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 58f40ced25..78053160c7 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -37,6 +37,8 @@ "asset:effect/0608.sinking/_/register", "asset:effect/0612.infringement/_/register", "asset:effect/0613.white_curse/_/register", + "asset:effect/0203.secret_meat/_/register", + "asset:effect/0619.hand_of_destruction/_/register", "asset:effect/0261.gale_blessing/_/register", "asset:effect/0210.fading_speed/_/register", "asset:effect/0211.fading_speed/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index cef1eaf18c..afef7c7fb3 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -31,6 +31,8 @@ "asset:effect/0608.sinking/_/remove", "asset:effect/0612.infringement/_/remove", "asset:effect/0613.white_curse/_/remove", + "asset:effect/0203.secret_meat/_/remove", + "asset:effect/0619.hand_of_destruction/_/remove", "asset:effect/0261.gale_blessing/_/remove", "asset:effect/0210.fading_speed/_/remove", "asset:effect/0211.fading_speed/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index a9ee249c62..1715e56305 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -29,6 +29,8 @@ "asset:effect/0608.sinking/_/tick", "asset:effect/0612.infringement/_/tick", "asset:effect/0613.white_curse/_/tick", + "asset:effect/0203.secret_meat/_/tick", + "asset:effect/0619.hand_of_destruction/_/tick", "asset:effect/0261.gale_blessing/_/tick", "asset:effect/0210.fading_speed/_/tick", "asset:effect/0203.secret_meat/_/tick" From a943e5bfd4bd862589d5b705968c1516e3e6fee1 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:56:33 +0900 Subject: [PATCH 43/74] =?UTF-8?q?=F0=9F=8D=B1=20[=E7=A5=9E=E5=99=A81028]?= =?UTF-8?q?=20=E6=96=AC=E9=A6=96=E6=96=A7=E3=82=92=E4=BD=9C=E6=88=90=20(#3?= =?UTF-8?q?60)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../give/1.trigger.mcfunction | 7 + .../give/2.give.mcfunction | 61 ++++++++ .../trigger/1.trigger.mcfunction | 8 ++ .../trigger/2.check_condition.mcfunction | 12 ++ .../trigger/3.main.mcfunction | 14 ++ .../trigger/4.damage.mcfunction | 28 ++++ .../trigger/5.damage2.mcfunction | 29 ++++ .../trigger/particle.mcfunction | 133 ++++++++++++++++++ .../tags/functions/artifact/attack/melee.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + 10 files changed, 294 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/particle.mcfunction diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/give/1.trigger.mcfunction new file mode 100644 index 0000000000..32b5a3d1c8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1028.executioner_axe/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1028} run function asset:artifact/1028.executioner_axe/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/give/2.give.mcfunction new file mode 100644 index 0000000000..1a1e59293d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/give/2.give.mcfunction @@ -0,0 +1,61 @@ +#> asset:artifact/1028.executioner_axe/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1028.executioner_axe/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1028 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"斬首斧","color":"dark_red"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"後ろを向いている敵に大ダメージを与える","color":"white"}','{"text":"この斧を振り上げし時、我は科人に永久の生を祈らん","color":"gray"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onAttackByMelee" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [1200,2300] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 40 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 60 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..b7751d9048 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1028.executioner_axe/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1028} run function asset:artifact/1028.executioner_axe/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..e6b7b056a3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1028.executioner_axe/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1028.executioner_axe/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1028.executioner_axe/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/3.main.mcfunction new file mode 100644 index 0000000000..3df44a2d4c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/3.main.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1028.executioner_axe/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1028.executioner_axe/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +#殴った対象が後ろを向いているかどうかを見る + execute at @e[type=#lib:living,tag=Victim,distance=..5] rotated ~ 0 positioned ^ ^ ^50 if entity @s[distance=..50] at @s run function asset:artifact/1028.executioner_axe/trigger/4.damage + execute at @e[type=#lib:living,tag=Victim,distance=..5] rotated ~ 0 positioned ^ ^ ^50 unless entity @s[distance=..50] at @s run function asset:artifact/1028.executioner_axe/trigger/5.damage2 diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction new file mode 100644 index 0000000000..74d002cf39 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction @@ -0,0 +1,28 @@ +#> asset:artifact/1028.executioner_axe/trigger/4.damage +# +# +# +# @within function asset:artifact/1028.executioner_axe/trigger/3.main + +# 演出 + execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle + execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 10 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + +# 近接で殴った相手にダメ +# ダメージセット + data modify storage lib: Argument.Damage set value 1200.0f +# 第一属性 + data modify storage lib: Argument.AttackType set value "Physical" +# 第二属性 + data modify storage lib: Argument.ElementType set value "None" +# 補正functionを実行 + function lib:damage/modifier +# ダメージを与える + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ +# リセット + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction new file mode 100644 index 0000000000..5bd9c1c9b2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction @@ -0,0 +1,29 @@ +#> asset:artifact/1028.executioner_axe/trigger/5.damage2 +# +# +# +# @within function asset:artifact/1028.executioner_axe/trigger/3.main + +# 演出 + execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle + execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 100 + playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 + +# 近接で殴った相手にダメ +# ダメージセット + data modify storage lib: Argument.Damage set value 2300.0f +# 第一属性 + data modify storage lib: Argument.AttackType set value "Physical" +# 第二属性 + data modify storage lib: Argument.ElementType set value "None" +# 補正functionを実行 + function lib:damage/modifier +# ダメージを与える + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ +# リセット + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/particle.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/particle.mcfunction new file mode 100644 index 0000000000..046cc04d1b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/particle.mcfunction @@ -0,0 +1,133 @@ +#> asset:artifact/1028.executioner_axe/trigger/particle +# +# +# +# @within function asset:artifact/1028.executioner_axe/trigger/** + + +# 外4 +particle dust 0.894 0.196 0.196 1.3 ^1.96457 ^-1.96457 ^0.12107 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.90211 ^-1.90211 ^0.30353 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.80965 ^-1.80965 ^0.47867 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.68866 ^-1.68866 ^0.64374 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.54103 ^-1.54103 ^0.79614 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.36909 ^-1.36909 ^0.93345 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^1.17557 ^-1.17557 ^1.05353 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^0.96351 ^-0.96351 ^1.15446 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^0.73625 ^-0.73625 ^1.23466 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^0.49738 ^-0.49738 ^1.29287 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^0.25067 ^-0.25067 ^1.32817 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^0 ^0 ^1.34 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-0.25067 ^0.25067 ^1.32817 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-0.49738 ^0.49738 ^1.29287 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-0.73625 ^0.73625 ^1.23466 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-0.96351 ^0.96351 ^1.15446 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.17557 ^1.17557 ^1.05353 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.36909 ^1.36909 ^0.93345 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.54103 ^1.54103 ^0.79614 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.68866 ^1.68866 ^0.64374 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.80965 ^1.80965 ^0.47867 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.90211 ^1.90211 ^0.30353 0 0 0 0 1 +particle dust 0.894 0.196 0.196 1.3 ^-1.96457 ^1.96457 ^0.12107 0 0 0 0 1 +# 最外 +particle dust 0.522 0.035 0.035 1.3 ^2 ^-2 ^0 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.98904 ^-1.98904 ^0.20906 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.9563 ^-1.9563 ^0.41582 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.90211 ^-1.90211 ^0.61803 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.82709 ^-1.82709 ^0.81347 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.73205 ^-1.73205 ^1 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.61803 ^-1.61803 ^1.17557 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.48629 ^-1.48629 ^1.33826 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.33826 ^-1.33826 ^1.48629 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1.17557 ^-1.17557 ^1.61803 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^1 ^-1 ^1.73205 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^0.81347 ^-0.81347 ^1.82709 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^0.61803 ^-0.61803 ^1.90211 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^0.41582 ^-0.41582 ^1.9563 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^0.20906 ^-0.20906 ^1.98904 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^0 ^0 ^2 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-0.20906 ^0.20906 ^1.98904 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-0.41582 ^0.41582 ^1.9563 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-0.61803 ^0.61803 ^1.90211 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-0.81347 ^0.81347 ^1.82709 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1 ^1 ^1.73205 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.17557 ^1.17557 ^1.61803 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.33826 ^1.33826 ^1.48629 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.48629 ^1.48629 ^1.33826 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.61803 ^1.61803 ^1.17557 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.73205 ^1.73205 ^1 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.82709 ^1.82709 ^0.81347 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.90211 ^1.90211 ^0.61803 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.9563 ^1.9563 ^0.41582 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-1.98904 ^1.98904 ^0.20906 0 0 0 0 1 +particle dust 0.522 0.035 0.035 1.3 ^-2 ^2 ^0 0 0 0 0 1 +# 最内 +particle dust 1 0.161 0.161 1.3 ^1.87964 ^-1.87964 ^0.053 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^1.77049 ^-1.77049 ^0.25297 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^1.6329 ^-1.6329 ^0.43457 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^1.47224 ^-1.47224 ^0.59614 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^1.29222 ^-1.29222 ^0.7359 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^1.09734 ^-1.09734 ^0.85406 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^0.89058 ^-0.89058 ^0.95 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^0.67527 ^-0.67527 ^1.02484 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^0.45344 ^-0.45344 ^1.07737 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^0.2277 ^-0.2277 ^1.10904 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^0 ^0 ^1.12 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-0.2277 ^0.2277 ^1.10904 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-0.45344 ^0.45344 ^1.07737 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-0.67527 ^0.67527 ^1.02484 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-0.89058 ^0.89058 ^0.95 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.09734 ^1.09734 ^0.85406 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.29222 ^1.29222 ^0.7359 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.47224 ^1.47224 ^0.59614 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.6329 ^1.6329 ^0.43457 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.77049 ^1.77049 ^0.25297 0 0 0 0 1 +particle dust 1 0.161 0.161 1.3 ^-1.87964 ^1.87964 ^0.053 0 0 0 0 1 +# 外2 +particle dust 0.871 0.192 0.192 1.3 ^1.96457 ^-1.96457 ^0.23228 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.90211 ^-1.90211 ^0.46095 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.80965 ^-1.80965 ^0.68047 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.68866 ^-1.68866 ^0.88735 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.54103 ^-1.54103 ^1.07836 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.36909 ^-1.36909 ^1.25046 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^1.17557 ^-1.17557 ^1.40095 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^0.96351 ^-0.96351 ^1.52746 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^0.73625 ^-0.73625 ^1.62798 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^0.49738 ^-0.49738 ^1.70094 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^0.25067 ^-0.25067 ^1.74518 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^0 ^0 ^1.76 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-0.25067 ^0.25067 ^1.74518 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-0.49738 ^0.49738 ^1.70094 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-0.73625 ^0.73625 ^1.62798 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-0.96351 ^0.96351 ^1.52746 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.17557 ^1.17557 ^1.40095 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.36909 ^1.36909 ^1.25046 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.54103 ^1.54103 ^1.07836 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.68866 ^1.68866 ^0.88735 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.80965 ^1.80965 ^0.68047 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.90211 ^1.90211 ^0.46095 0 0 0 0 1 +particle dust 0.871 0.192 0.192 1.3 ^-1.96457 ^1.96457 ^0.23228 0 0 0 0 1 +# 外3 +particle dust 0.675 0.133 0.133 1.3 ^1.96457 ^-1.96457 ^0.1923 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.90211 ^-1.90211 ^0.40151 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.80965 ^-1.80965 ^0.60234 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.68866 ^-1.68866 ^0.79162 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.54103 ^-1.54103 ^0.96637 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.36909 ^-1.36909 ^1.12383 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^1.17557 ^-1.17557 ^1.26151 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^0.96351 ^-0.96351 ^1.37725 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^0.73625 ^-0.73625 ^1.46922 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^0.49738 ^-0.49738 ^1.53596 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^0.25067 ^-0.25067 ^1.57644 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^0 ^0 ^1.59 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-0.25067 ^0.25067 ^1.57644 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-0.49738 ^0.49738 ^1.53596 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-0.73625 ^0.73625 ^1.46922 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-0.96351 ^0.96351 ^1.37725 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.17557 ^1.17557 ^1.26151 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.36909 ^1.36909 ^1.12383 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.54103 ^1.54103 ^0.96637 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.68866 ^1.68866 ^0.79162 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.80965 ^1.80965 ^0.60234 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.90211 ^1.90211 ^0.40151 0 0 0 0 1 +particle dust 0.675 0.133 0.133 1.3 ^-1.96457 ^1.96457 ^0.1923 0 0 0 0 1 \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json index 7afe5db550..f1bc1323a2 100644 --- a/Asset/data/asset/tags/functions/artifact/attack/melee.json +++ b/Asset/data/asset/tags/functions/artifact/attack/melee.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1028.executioner_axe/trigger/1.trigger", "asset:artifact/0600.xtal/trigger/1.trigger", "asset:artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger", "asset:artifact/1078.pigeon_blood/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 78b37ad202..67b2d834ec 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1028.executioner_axe/give/1.trigger", "asset:artifact/1084.mia_zoru_luc/give/1.trigger", "asset:artifact/1085.mia_tia_zen_luc/give/1.trigger", "asset:artifact/1112.lexiel_rod/give/1.trigger", From c8ba0cd9f5e15de5c9c528e98e4199633aaa762e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 21:16:25 +0900 Subject: [PATCH 44/74] =?UTF-8?q?=F0=9F=94=A7=20=E3=83=86=E3=83=B3?= =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=81=AE=E3=83=9F=E3=82=B9?= =?UTF-8?q?=E3=81=AA=E3=81=A9=E3=82=92=E4=BF=AE=E6=AD=A3=20(#385)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6e631a5b3e..f8b9c4a92f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1774,7 +1774,7 @@ ] }, { - "label": "MOB/テンプレート: _index.d ", + "label": "Mob/テンプレート: _index.d ", "generates": [ { "type": "file", @@ -1791,7 +1791,7 @@ ] }, { - "label": "MOB/トリガー: 攻撃", + "label": "Mob/トリガー: 攻撃", "generates": [ { "type": "file", @@ -1830,7 +1830,7 @@ ] }, { - "label": "MOB/トリガー: 被ダメージ", + "label": "Mob/トリガー: 被ダメージ", "generates": [ { "type": "file", @@ -1869,7 +1869,7 @@ ] }, { - "label": "MOB/トリガー: 死亡", + "label": "Mob/トリガー: 死亡", "generates": [ { "type": "file", @@ -1986,7 +1986,7 @@ ] }, { - "label": "MOB/特殊トリガー: 再Join", + "label": "Mob/特殊トリガー: 再Join", "generates": [ { "type": "file", @@ -2016,7 +2016,7 @@ ] }, { - "label": "MOB/特殊トリガー: remove", + "label": "Mob/特殊トリガー: remove", "generates": [ { "type": "file", @@ -2507,9 +2507,9 @@ "# 継承(オプション)", " # data modify storage asset:object Extends append value ", " # function asset:object/extends", - "# 他のモブに継承されることを許可するか (boolean) (オプション)", + "# 他のObjectに継承されることを許可するか (boolean) (オプション)", " # data modify storage asset:object ExtendsSafe set value ", - "# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean)", + "# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean)", " data modify storage asset:object IsAbstract set value false", "# Tickするかどうか(boolean) (オプション)", " # data modify storage asset:object IsTicking set value ", @@ -2561,7 +2561,7 @@ ] }, { - "label": "Object/ 召喚処理", + "label": "Object/召喚処理", "generates": [ { "type": "file", From 6c10776ccdd8cb75d8474897bca0c1e317aa7d76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 22 Nov 2024 17:35:21 +0000 Subject: [PATCH 45/74] Update Declares from ProjectTSB/TheSkyBlessing@63109a3ea307ba16528df990f970611caad2ea1c [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index a8dc053578..7ceec953b1 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -192,6 +192,7 @@ #declare function api:spawner/subtract_hp from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/spawner/subtract_hp.mcfunction#L1 #declare function api:teleporter/set_activation_state/from_id from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_id.mcfunction#L1 #declare function api:teleporter/set_activation_state/from_nearest from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction#L1 + #declare function asset_manager:teleporter/tick/vfx/star/blink/3.m from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/3.m.mcfunction#L1 #declare function asset:object/example.1/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.1/summon/debug.mcfunction#L1 #declare function asset:object/example.2/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.2/summon/debug.mcfunction#L1 #declare function asset:object/example.3/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.3/summon/debug.mcfunction#L1 @@ -326,7 +327,7 @@ #declare loot_table player_manager:lost_item/give_all/name_to_textcomponent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/loot_tables/lost_item/give_all/name_to_textcomponent.json#L1 #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L126 #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L111 - #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L234 + #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L236 #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L168 #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L167 #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L132 @@ -883,12 +884,16 @@ #> declare # @within +# function core:migration/v0.1.4/ # asset:teleporter/*/* # asset:teleporter/common/register # asset_manager:teleporter/** -# function core:migration/v0.1.4/ -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction#L9 +# function minecraft:tests/summon_teleporters/ +# function minecraft:tests/summon_teleporters/reset # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/migration/v0.1.4/.mcfunction#L12 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction#L9 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/.mcfunction#L56 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/reset.mcfunction#L10 #declare storage asset:teleporter #> declare From 969e5ab736ad815bb3b5f79352e5f59765b1b9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 16:04:45 +0900 Subject: [PATCH 46/74] =?UTF-8?q?=F0=9F=A9=B9=20=E4=B8=80=E9=83=A8Object?= =?UTF-8?q?=E3=81=AE=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=81=AE=E3=83=9F?= =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3=20(#383)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction | 2 +- .../data/asset/functions/object/1060.medic/tick/vfx.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction index 85618a0522..42d1f75b15 100644 --- a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/summon/macro.m.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1049.lexiel_rod_fireball/summon/.m +#> asset:object/1049.lexiel_rod_fireball/summon/macro.m # # # diff --git a/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction b/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction index 5208a4647f..a8a7243684 100644 --- a/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction +++ b/Asset/data/asset/functions/object/1060.medic/tick/vfx.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1060.medic/tick/heal +#> asset:object/1060.medic/tick/vfx # # # From cef9180bcf9df09d436d932d5703096d753eedb9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 23 Nov 2024 07:14:58 +0000 Subject: [PATCH 47/74] Update Declares from ProjectTSB/TheSkyBlessing@a8c83a5b173b64e18cd5bb7158a5f8c60309da78 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 7ceec953b1..00e989af5f 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -192,10 +192,6 @@ #declare function api:spawner/subtract_hp from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/spawner/subtract_hp.mcfunction#L1 #declare function api:teleporter/set_activation_state/from_id from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_id.mcfunction#L1 #declare function api:teleporter/set_activation_state/from_nearest from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction#L1 - #declare function asset_manager:teleporter/tick/vfx/star/blink/3.m from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/3.m.mcfunction#L1 - #declare function asset:object/example.1/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.1/summon/debug.mcfunction#L1 - #declare function asset:object/example.2/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.2/summon/debug.mcfunction#L1 - #declare function asset:object/example.3/summon/debug from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/object/example.3/summon/debug.mcfunction#L1 #declare function debug:stopwatch.start from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/debug/functions/stopwatch.start.mcfunction#L1 #declare function debug:stopwatch.stop from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/debug/functions/stopwatch.stop.mcfunction#L1 #declare function debug:tps/watch from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/debug/functions/tps/watch.mcfunction#L1 From a80f274da63d146e71bfe073666349eb0ff8cf42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 02:30:55 +0900 Subject: [PATCH 48/74] =?UTF-8?q?=F0=9F=8D=B1=20[Effect201]=20=E3=83=9E?= =?UTF-8?q?=E3=82=B8=E3=83=83=E3=82=AF=E3=82=B7=E3=83=BC=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=81=AE=E4=BD=9C=E6=88=90=20(#192)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0033.magic_shield/give/2.give.mcfunction | 8 ++--- .../trigger/1.1.damage_trigger.mcfunction | 8 ----- .../trigger/2.check_condition.mcfunction | 6 +--- .../trigger/3.1.loop.mcfunction | 14 -------- .../trigger/3.2.damage.mcfunction | 12 ------- .../trigger/3.main.mcfunction | 8 ++--- .../trigger/_index.d.mcfunction | 6 ---- .../trigger/rejoin_process.mcfunction | 8 ----- .../effect/0201.magic_shield/_/end.mcfunction | 7 ++++ .../0201.magic_shield/_/given.mcfunction | 7 ++++ .../0201.magic_shield/_/re-given.mcfunction | 7 ++++ .../0201.magic_shield/_/register.mcfunction | 7 ++++ .../0201.magic_shield/_/remove.mcfunction | 7 ++++ .../0201.magic_shield/_/tick.mcfunction | 7 ++++ .../0201.magic_shield/barrier/add.mcfunction | 21 +++++++++++ .../barrier/break.mcfunction | 9 +++++ .../barrier/remove.mcfunction | 13 +++++++ .../effect/0201.magic_shield/end/.mcfunction | 8 +++++ .../0201.magic_shield/given/.mcfunction | 8 +++++ .../0201.magic_shield/re-given/.mcfunction | 8 +++++ .../0201.magic_shield/register.mcfunction | 35 +++++++++++++++++++ .../0201.magic_shield/remove/.mcfunction | 8 +++++ .../effect/0201.magic_shield/tick/.mcfunction | 8 +++++ .../asset/tags/functions/artifact/damage.json | 1 - .../data/asset/tags/functions/effect/end.json | 5 +-- .../asset/tags/functions/effect/given.json | 5 +-- .../asset/tags/functions/effect/re-given.json | 5 +-- .../asset/tags/functions/effect/register.json | 1 + .../asset/tags/functions/effect/remove.json | 5 +-- .../asset/tags/functions/effect/tick.json | 1 + Asset/data/asset/tags/functions/rejoin.json | 1 - 31 files changed, 182 insertions(+), 72 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/trigger/1.1.damage_trigger.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.1.loop.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.2.damage.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/trigger/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/trigger/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/barrier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/barrier/break.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/barrier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0201.magic_shield/tick/.mcfunction diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/give/2.give.mcfunction index 64a85c13ac..95a046facf 100644 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0033.magic_shield/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"マジックシールド","color":"green"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"食らうダメージを1度だけ"},{"text":"80%軽減","color":"green"},{"text":"する"}]'] + data modify storage asset:artifact Lore set value ['{"text":"一度だけ攻撃を防ぐバリアを20得る"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -39,11 +39,11 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 + data modify storage asset:artifact MPCost set value 32 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) - data modify storage asset:artifact LocalCooldown set value 100 + data modify storage asset:artifact LocalCooldown set value 1200 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/1.1.damage_trigger.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/1.1.damage_trigger.mcfunction deleted file mode 100644 index 4f38fdcc43..0000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/1.1.damage_trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0033.magic_shield/trigger/1.1.damage_trigger -# -# 殴られたときに発動 -# -# @within tag/function asset:artifact/** - -# 殴られたら発動 - execute if entity @s[tag=X.MagicShield] run function asset:artifact/0033.magic_shield/trigger/3.2.damage \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/2.check_condition.mcfunction index 620b90745c..f314c30e29 100644 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/2.check_condition.mcfunction @@ -8,9 +8,5 @@ function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く -# 既に発動中の場合発動しない - execute if entity @s[tag=X.MagicShield] run tellraw @s {"text":"既に効果が発動しています","color":"gold"} - execute if entity @s[tag=X.MagicShield] run tag @s remove CanUsed - # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0033.magic_shield/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0033.magic_shield/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.1.loop.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.1.loop.mcfunction deleted file mode 100644 index 20825bd91b..0000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.1.loop.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0033.magic_shield/trigger/3.1.loop -# -# ループ -# -# @within function -# asset:artifact/0033.magic_shield/trigger/3.main -# asset:artifact/0033.magic_shield/trigger/rejoin_process -# asset:artifact/0033.magic_shield/trigger/3.1.loop - -# 効果を与える - effect give @a[tag=X.MagicShield] resistance 1 3 - -# 再帰 - execute if entity @a[tag=X.MagicShield,limit=1] run schedule function asset:artifact/0033.magic_shield/trigger/3.1.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.2.damage.mcfunction deleted file mode 100644 index d9741eae60..0000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.2.damage.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0033.magic_shield/trigger/3.2.damage -# -# -# -# @within function asset:artifact/0033.magic_shield/trigger/1.1.damage_trigger - -# 演出 - particle block iron_block ~ ~1 ~ 0.5 0.5 0.5 0.2 60 - playsound block.glass.break player @a ~ ~ ~ 1 0.6 0 - -# タグ消し - tag @s remove X.MagicShield \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.main.mcfunction index 8882ccad9f..1e2d7fc568 100644 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/3.main.mcfunction @@ -13,8 +13,6 @@ playsound block.anvil.use player @a ~ ~ ~ 0.5 0.5 0 particle enchanted_hit ~ ~1 ~ 0.2 0.2 0.2 1 30 -# プレイヤーにタグを付与 - tag @s add X.MagicShield - -# 再帰先へ飛ばす - function asset:artifact/0033.magic_shield/trigger/3.1.loop \ No newline at end of file +# プレイヤーにバフを付与 + data modify storage api: Argument.ID set value 201 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/_index.d.mcfunction deleted file mode 100644 index 1cf07a4f98..0000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0033.magic_shield/trigger/_index.d -# @private - -#> tag -# @within function asset:artifact/0033.magic_shield/trigger/** - #declare tag X.MagicShield \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/rejoin_process.mcfunction deleted file mode 100644 index dcff89044a..0000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0033.magic_shield/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# 発動中のプレイヤーがいる場合再帰先へ飛ばす - execute if entity @a[tag=X.MagicShield] run function asset:artifact/0033.magic_shield/trigger/3.1.loop \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/end.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/end.mcfunction new file mode 100644 index 0000000000..5b06f4ba14 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/given.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/given.mcfunction new file mode 100644 index 0000000000..fe61c53d0e --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/re-given.mcfunction new file mode 100644 index 0000000000..6d13643dde --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/register.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/register.mcfunction new file mode 100644 index 0000000000..21bbe6fff4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/remove.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/remove.mcfunction new file mode 100644 index 0000000000..31cd7a3a5b --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/_/tick.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/_/tick.mcfunction new file mode 100644 index 0000000000..ec42388c6d --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0201.magic_shield/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:201} run function asset:effect/0201.magic_shield/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/add.mcfunction new file mode 100644 index 0000000000..a7d33fed65 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/add.mcfunction @@ -0,0 +1,21 @@ +#> asset:effect/0201.magic_shield/barrier/add +# +# バリアを付与する +# +# @within function +# asset:effect/0201.magic_shield/given/ +# asset:effect/0201.magic_shield/re-given/ + +# 本体バリア + data modify storage api: Argument.Amount set value 19.9 + data modify storage api: Argument.UUID set value [I;1,3,201,0] + data modify storage api: Argument.Priority set value 1 + data modify storage api: Argument.WipedCallback set value "" + function api:entity/player/absorption/add + +# 被ダメ判定検知用バリア + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.UUID set value [I;1,3,201,1] + data modify storage api: Argument.Priority set value 10 + data modify storage api: Argument.WipedCallback set value "asset:effect/0201.magic_shield/barrier/break" + function api:entity/player/absorption/add diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/barrier/break.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/break.mcfunction new file mode 100644 index 0000000000..22f8a862c1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/break.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0201.magic_shield/barrier/break +# +# バリア破壊時の処理 +# +# @within function asset:effect/0201.magic_shield/barrier/add + +# このエフェクトを削除 + data modify storage api: Argument.ID set value 201 + function api:entity/mob/effect/remove/from_id diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/barrier/remove.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/remove.mcfunction new file mode 100644 index 0000000000..292d0c4f53 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/barrier/remove.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0201.magic_shield/barrier/remove +# +# バリアを削除する +# +# @within function +# asset:effect/0201.magic_shield/end/ +# asset:effect/0201.magic_shield/remove/ + +# バリア削除 + data modify storage api: Argument.UUID set value [I;1,3,201,0] + function api:entity/player/absorption/remove + data modify storage api: Argument.UUID set value [I;1,3,201,1] + function api:entity/player/absorption/remove diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/end/.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/end/.mcfunction new file mode 100644 index 0000000000..7b29a8f2ad --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0201.magic_shield/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0201.magic_shield/_/end + +# バリアを削除する + function asset:effect/0201.magic_shield/barrier/remove diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/given/.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/given/.mcfunction new file mode 100644 index 0000000000..af878e42fb --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0201.magic_shield/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0201.magic_shield/_/given + +# バリアを付与する + function asset:effect/0201.magic_shield/barrier/add diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/re-given/.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/re-given/.mcfunction new file mode 100644 index 0000000000..72eb13cfb8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0201.magic_shield/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0201.magic_shield/_/re-given + +# バリア上書き + function asset:effect/0201.magic_shield/barrier/add diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/register.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/register.mcfunction new file mode 100644 index 0000000000..6c6783012b --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0201.magic_shield/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0201.magic_shield/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 201 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"マジックシールド","color":"green"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"一度だけダメージを吸収する","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 600 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 600 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/remove/.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/remove/.mcfunction new file mode 100644 index 0000000000..ceee6e1421 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0201.magic_shield/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0201.magic_shield/_/remove + +# バリアを削除する + function asset:effect/0201.magic_shield/barrier/remove diff --git a/Asset/data/asset/functions/effect/0201.magic_shield/tick/.mcfunction b/Asset/data/asset/functions/effect/0201.magic_shield/tick/.mcfunction new file mode 100644 index 0000000000..11930bc975 --- /dev/null +++ b/Asset/data/asset/functions/effect/0201.magic_shield/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0201.magic_shield/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0201.magic_shield/_/tick + +# 演出 + execute if predicate lib:random_pass_per/40 run particle enchanted_hit ~ ~1.2 ~ 0.4 0.4 0.4 0 1 normal @a diff --git a/Asset/data/asset/tags/functions/artifact/damage.json b/Asset/data/asset/tags/functions/artifact/damage.json index 863875c63a..5ee6495bf2 100644 --- a/Asset/data/asset/tags/functions/artifact/damage.json +++ b/Asset/data/asset/tags/functions/artifact/damage.json @@ -6,7 +6,6 @@ "asset:artifact/0920.dal_i_thalion/trigger/1.trigger", "asset:artifact/0247.heavenly_herb/trigger/1.trigger", "asset:artifact/0277.nudist_carnival/trigger/1.trigger", - "asset:artifact/0033.magic_shield/trigger/1.1.damage_trigger", "asset:artifact/0201.cowardly_soul/trigger/1.trigger", "asset:artifact/0529.safety_helmet/trigger/1.trigger" ] diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 87c99dd133..c297135d22 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -38,6 +38,7 @@ "asset:effect/0261.gale_blessing/_/end", "asset:effect/0210.fading_speed/_/end", "asset:effect/0211.fading_speed/_/end", - "asset:effect/0203.secret_meat/_/end" + "asset:effect/0203.secret_meat/_/end", + "asset:effect/0201.magic_shield/_/end" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 638bc465e5..b7377cc709 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -34,6 +34,7 @@ "asset:effect/0261.gale_blessing/_/given", "asset:effect/0211.fading_speed/_/given", "asset:effect/0210.fading_speed/_/given", - "asset:effect/0203.secret_meat/_/given" + "asset:effect/0203.secret_meat/_/given", + "asset:effect/0201.magic_shield/_/given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index 76a25fbdb5..ce2507c85d 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -12,6 +12,7 @@ "asset:effect/0613.white_curse/_/re-given", "asset:effect/0261.gale_blessing/_/re-given", "asset:effect/0211.fading_speed/_/re-given", - "asset:effect/0210.fading_speed/_/re-given" + "asset:effect/0210.fading_speed/_/re-given", + "asset:effect/0201.magic_shield/_/re-given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 78053160c7..242e5707b0 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -36,6 +36,7 @@ "asset:effect/0607.sedation/_/register", "asset:effect/0608.sinking/_/register", "asset:effect/0612.infringement/_/register", + "asset:effect/0201.magic_shield/_/register", "asset:effect/0613.white_curse/_/register", "asset:effect/0203.secret_meat/_/register", "asset:effect/0619.hand_of_destruction/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index afef7c7fb3..9cb0ef5044 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -36,6 +36,7 @@ "asset:effect/0261.gale_blessing/_/remove", "asset:effect/0210.fading_speed/_/remove", "asset:effect/0211.fading_speed/_/remove", - "asset:effect/0203.secret_meat/_/remove" + "asset:effect/0203.secret_meat/_/remove", + "asset:effect/0201.magic_shield/_/remove" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 1715e56305..83900f2405 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -28,6 +28,7 @@ "asset:effect/0607.sedation/_/tick", "asset:effect/0608.sinking/_/tick", "asset:effect/0612.infringement/_/tick", + "asset:effect/0201.magic_shield/_/tick", "asset:effect/0613.white_curse/_/tick", "asset:effect/0203.secret_meat/_/tick", "asset:effect/0619.hand_of_destruction/_/tick", diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index bc91e286b7..edb5a10efc 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -48,7 +48,6 @@ "asset:artifact/0369.fire_magic/trigger/rejoin_process", "asset:artifact/0210.terra_blade/trigger/rejoin_process", "asset:artifact/0035.malleus_maleficarum/trigger/rejoin_process", - "asset:artifact/0033.magic_shield/trigger/rejoin_process", "asset:artifact/0077.swords_of_waterfall_climbing/trigger/rejoin_process", "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", "asset:mob/0129.lexiel/rejoin_process", From b3367100818998a46d7630fbf8d6fef1bfd35573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:44:18 +0900 Subject: [PATCH 49/74] =?UTF-8?q?=F0=9F=94=A5=20[Mob83]=20=E5=BC=B7?= =?UTF-8?q?=E5=8C=96=E9=9B=B7=E5=BC=84=E8=80=85=E3=81=AE=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AA=E9=83=A8=E5=88=86=E3=82=92=E5=89=8A=E9=99=A4=20(#377)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0083.thunder_trifler/summon/.mcfunction | 8 -------- .../mob/0083.thunder_trifler/summon/debug.mcfunction | 10 ---------- .../asset/functions/mob/alias/83/summon.mcfunction | 4 ---- 3 files changed, 22 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0083.thunder_trifler/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/83/summon.mcfunction diff --git a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction b/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction deleted file mode 100644 index 17c5308a3f..0000000000 --- a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0083.thunder_trifler/summon/ -# -# Mob召喚処理の呼び出し時に実行されるfunction -# -# @within asset:mob/alias/83/summon - -# 元となるMobを召喚する - summon skeleton ~ ~ ~ {Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/debug.mcfunction deleted file mode 100644 index cc77d826f8..0000000000 --- a/Asset/data/asset/functions/mob/0083.thunder_trifler/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0083.thunder_trifler/summon/debug -# -# モブの動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# モブを召喚 - data modify storage api: Argument.ID set value 83 - function api:mob/summon diff --git a/Asset/data/asset/functions/mob/alias/83/summon.mcfunction b/Asset/data/asset/functions/mob/alias/83/summon.mcfunction deleted file mode 100644 index f81055ea11..0000000000 --- a/Asset/data/asset/functions/mob/alias/83/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/83/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0083.thunder_trifler/summon/ From 0a3321d5f498632a03a4bc5046af597d6987b85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 12:44:50 +0900 Subject: [PATCH 50/74] =?UTF-8?q?=F0=9F=94=A5=20[Mob228]=20=E5=BC=B7?= =?UTF-8?q?=E5=8C=96=E3=83=95=E3=83=AD=E3=82=B9=E3=83=88=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=81=AE=E4=B8=8D=E8=A6=81=E3=81=AA=E9=83=A8=E5=88=86=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4=20(#378)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0228.frost_eye/summon/.mcfunction | 8 -------- .../mob/0228.frost_eye/summon/debug.mcfunction | 10 ---------- .../asset/functions/mob/alias/228/summon.mcfunction | 4 ---- 3 files changed, 22 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0228.frost_eye/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/228/summon.mcfunction diff --git a/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction b/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction deleted file mode 100644 index 981d0b88df..0000000000 --- a/Asset/data/asset/functions/mob/0228.frost_eye/summon/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0228.frost_eye/summon/ -# -# Mob召喚処理の呼び出し時に実行されるfunction -# -# @within asset:mob/alias/228/summon - -# 元となるMobを召喚する - summon zombie ~ ~ ~ {Silent:1b,NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/functions/mob/0228.frost_eye/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0228.frost_eye/summon/debug.mcfunction deleted file mode 100644 index 27f5aba3b9..0000000000 --- a/Asset/data/asset/functions/mob/0228.frost_eye/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0228.frost_eye/summon/debug -# -# モブの動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# モブを召喚 - data modify storage api: Argument.ID set value 228 - function api:mob/summon diff --git a/Asset/data/asset/functions/mob/alias/228/summon.mcfunction b/Asset/data/asset/functions/mob/alias/228/summon.mcfunction deleted file mode 100644 index ab1ef6fb84..0000000000 --- a/Asset/data/asset/functions/mob/alias/228/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/228/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0228.frost_eye/summon/ From 72bd737cc739854aa18b64c47109a8a3fce12200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:16:04 +0900 Subject: [PATCH 51/74] =?UTF-8?q?=F0=9F=9A=9A=20[Object2081]=20=E6=A1=9C?= =?UTF-8?q?=E5=90=B9=E9=9B=AA=E3=82=92Object=E3=81=B8=E7=A7=BB=E8=A1=8C=20?= =?UTF-8?q?(#375)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attack/.mcfunction | 12 +---- .../attack/summon_shower.mcfunction | 31 +++++++++++ .../0.load.mcfunction | 9 ---- .../_index.d.mcfunction | 6 --- .../register.mcfunction | 54 ------------------- .../summon/.mcfunction | 4 -- .../tick/.mcfunction | 35 ------------ .../mob/alias/337/register.mcfunction | 4 -- .../functions/mob/alias/337/summon.mcfunction | 4 -- .../functions/mob/alias/337/tick.mcfunction | 4 -- .../_index.d.mcfunction | 7 +++ .../detect_hit_entity/.mcfunction | 14 +++++ .../hit_entity/.mcfunction} | 17 +++--- .../init/.mcfunction | 13 +++++ .../register.mcfunction | 20 +++++++ .../summon/.mcfunction | 8 +++ .../summon/debug.mcfunction | 10 ++++ .../tick/.mcfunction | 36 +++++++++++++ .../tick/vfx.mcfunction} | 22 ++++---- .../alias/2081/detect_hit_entity.mcfunction | 8 +++ .../object/alias/2081/hit_entity.mcfunction | 8 +++ .../object/alias/2081/init.mcfunction | 8 +++ .../object/alias/2081/register.mcfunction | 8 +++ .../object/alias/2081/summon.mcfunction | 8 +++ .../object/alias/2081/tick.mcfunction | 8 +++ Asset/data/asset/tags/functions/mob/load.json | 1 - 26 files changed, 209 insertions(+), 150 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/summon_shower.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/0.load.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/337/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/337/summon.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/337/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/detect_hit_entity/.mcfunction rename Asset/data/asset/functions/{mob/0337.shower_of_cherry_blossoms/tick/4.attack.mcfunction => object/2081.shower_of_cherry_blossoms/hit_entity/.mcfunction} (55%) create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/.mcfunction rename Asset/data/asset/functions/{mob/0337.shower_of_cherry_blossoms/tick/3.vfx.mcfunction => object/2081.shower_of_cherry_blossoms/tick/vfx.mcfunction} (86%) create mode 100644 Asset/data/asset/functions/object/alias/2081/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2081/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2081/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2081/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2081/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2081/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/.mcfunction b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/.mcfunction index 70a3c0a1fb..194d69ebbb 100644 --- a/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/.mcfunction @@ -7,7 +7,6 @@ # バニラの攻撃じゃなかったら return execute unless data storage asset:context Attack{IsVanilla:true} run return fail - # 演出 execute at @p[tag=Victim,distance=..60] run particle cherry_leaves ~ ~1 ~ 0.5 1 0.5 0 20 normal @p execute at @p[tag=Victim,distance=..60] run playsound ogg:ambient.nether.crimson_forest.shine3 hostile @s ~ ~ ~ 2 2 0 @@ -22,12 +21,5 @@ execute as @p[tag=Victim,distance=..60] run function api:damage/ function api:damage/reset -# 確率で桜吹雪を生み出す -# ハードなら確定 - data modify storage api: Argument.ID set value 337 - execute at @p[tag=Victim,distance=..60] unless entity @e[type=marker,scores={MobID=337},distance=..6] if predicate api:global_vars/difficulty/max/normal if predicate lib:random_pass_per/50 run function api:mob/summon - execute at @p[tag=Victim,distance=..60] unless entity @e[type=marker,scores={MobID=337},distance=..6] if predicate api:global_vars/difficulty/min/hard run function api:mob/summon - -# 周りにワープさせてから近づかせる - data modify storage lib: Argument.Bounds set value [[5d,5d],[0d,0d],[5d,5d]] - execute as @e[type=marker,scores={MobID=337},distance=..60,limit=1] at @s run function lib:spread_entity/ +# 攻撃対象の周囲に桜吹雪がないときに桜吹雪を生み出す + execute at @p[tag=Victim,distance=..60] unless entity @e[type=marker,scores={ObjectID=2081},distance=..6] run function asset:mob/0336.cherry_blossom_fairy/attack/summon_shower diff --git a/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/summon_shower.mcfunction b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/summon_shower.mcfunction new file mode 100644 index 0000000000..e322d9ec07 --- /dev/null +++ b/Asset/data/asset/functions/mob/0336.cherry_blossom_fairy/attack/summon_shower.mcfunction @@ -0,0 +1,31 @@ +#> asset:mob/0336.cherry_blossom_fairy/attack/summon_shower +# +# 桜吹雪を召喚 +# +# @within function asset:mob/0336.cherry_blossom_fairy/attack/ + +#> Private +# @private + #declare tag SpreadMarker + +# 桜吹雪を召喚する +# ノーマル以下では50% ハード以上で確定 + +# ノーマル以下なら50%でreturn + execute if predicate api:global_vars/difficulty/max/normal if predicate lib:random_pass_per/50 run return 0 + +# SpreadMarkerを召喚 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + +# SpreadMarkerを拡散 + data modify storage lib: Argument.Bounds set value [[5d,5d],[0d,0d],[5d,5d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] at @s run function lib:spread_entity/ + +# 拡散した座標で召喚する + data modify storage api: Argument.ID set value 2081 + data modify storage api: Argument.FieldOverride.Damage set value 3.0f + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID + execute at @e[type=marker,tag=SpreadMarker,distance=..8] run function api:object/summon + +# SpreadMarkerをkill + kill @e[type=marker,tag=SpreadMarker,distance=..8] diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/0.load.mcfunction b/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/0.load.mcfunction deleted file mode 100644 index e96637caf8..0000000000 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/0.load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0337.shower_of_cherry_blossoms/** - scoreboard objectives add 9D.LifeTime dummy diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/_index.d.mcfunction b/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/_index.d.mcfunction deleted file mode 100644 index af8592d5b2..0000000000 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/_index.d -# @private - -#> tag -# @within function asset:mob/0337.shower_of_cherry_blossoms/** - #declare tag 9D.Landing diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/register.mcfunction b/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/register.mcfunction deleted file mode 100644 index e319efecd5..0000000000 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/register.mcfunction +++ /dev/null @@ -1,54 +0,0 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/register -# @within asset:mob/alias/337/register - -# ID (int) - data modify storage asset:mob ID set value 337 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Projectile" -# 干渉可能か否か (boolean) - data modify storage asset:mob Interferable set value false -# 名前 (TextComponentString) (オプション) - data modify storage asset:mob Name set from entity @s CustomName -# 武器 - # メインハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Mainhand set value - # オフハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Offhand set value -# 武器ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob WeaponDropChances set value -# 防具 - # 頭 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Head set value - # 胴 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Chest set value - # 脚 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Legs set value - # 足 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Feet set value -# 防具ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob ArmorDropChances set value -# 体力 (double) (オプション) - # data modify storage asset:mob Health set value -# 攻撃力 (double) (オプション) - # data modify storage asset:mob AttackDamage set value -# 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち - # data modify storage asset:mob Defense set value -# 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす - # data modify storage asset:mob SpecialDefense set value -# 移動速度 (double) (オプション) - # data modify storage asset:mob Speed set value -# 索敵範囲 (double) (オプション) - # data modify storage asset:mob FollowRange set value -# ノックバック耐性 (double) (オプション) - # data modify storage asset:mob KnockBackResist set value -# 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る - # 物理倍率 (float) (オプション) - # data modify storage asset:mob Resist.Physical set value - # 魔法倍率 (float) (オプション) - # data modify storage asset:mob Resist.Magic set value - # 火倍率 (float) (オプション) - # data modify storage asset:mob Resist.Fire set value - # 水倍率 (float) (オプション) - # data modify storage asset:mob Resist.Water set value - # 雷倍率 (float) (オプション) - # data modify storage asset:mob Resist.Thunder set value diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/summon/.mcfunction b/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/summon/.mcfunction deleted file mode 100644 index bf1b4dfbcc..0000000000 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/summon/.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/summon/ -# @within asset:mob/alias/337/summon - -summon marker ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/.mcfunction b/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/.mcfunction deleted file mode 100644 index 8a48049063..0000000000 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/.mcfunction +++ /dev/null @@ -1,35 +0,0 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/tick/ -# -# Mobのtick時の処理 -# -# @within function asset:mob/alias/337/tick - -#> Val -# @private - #declare score_holder $9D.LifeTime - -# スコアボード追加 - scoreboard players add @s 9D.LifeTime 1 - -# 回転 - tp @s ~ ~ ~ ~2 ~ - -# 追尾する - execute facing entity @a[tag=!PlayerShouldInvulnerable,sort=nearest,limit=1] feet positioned ^ ^ ^0.05 rotated as @s run tp @s ^ ^ ^ ~ ~ - -# 4Tickに1回演出 - scoreboard players operation $9D.LifeTime Temporary = @s 9D.LifeTime - scoreboard players operation $9D.LifeTime Temporary %= $4 Const - execute if score $9D.LifeTime Temporary matches 0 run function asset:mob/0337.shower_of_cherry_blossoms/tick/3.vfx - -# 4Tickに1回ダメージ判定 - execute if score $9D.LifeTime Temporary matches 0 as @a[tag=!PlayerShouldInvulnerable,distance=..1] run tag @s add 9D.Landing - execute if score $9D.LifeTime Temporary matches 0 positioned ~ ~1.5 ~ as @a[tag=!PlayerShouldInvulnerable,distance=..2] run tag @s add 9D.Landing - execute if score $9D.LifeTime Temporary matches 0 positioned ~ ~5 ~ as @a[tag=!PlayerShouldInvulnerable,distance=..3] run tag @s add 9D.Landing - execute as @a[tag=9D.Landing,distance=..16] run function asset:mob/0337.shower_of_cherry_blossoms/tick/4.attack - -# 100TickでKill - kill @s[scores={9D.LifeTime=81..}] - -# リセット - scoreboard players reset $9D.LifeTime Temporary diff --git a/Asset/data/asset/functions/mob/alias/337/register.mcfunction b/Asset/data/asset/functions/mob/alias/337/register.mcfunction deleted file mode 100644 index 21e949466b..0000000000 --- a/Asset/data/asset/functions/mob/alias/337/register.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/337/register -# @within asset_manager:mob/register/register.m - -function asset:mob/0337.shower_of_cherry_blossoms/register diff --git a/Asset/data/asset/functions/mob/alias/337/summon.mcfunction b/Asset/data/asset/functions/mob/alias/337/summon.mcfunction deleted file mode 100644 index e8496bf57b..0000000000 --- a/Asset/data/asset/functions/mob/alias/337/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/337/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0337.shower_of_cherry_blossoms/summon/ diff --git a/Asset/data/asset/functions/mob/alias/337/tick.mcfunction b/Asset/data/asset/functions/mob/alias/337/tick.mcfunction deleted file mode 100644 index ce591d7774..0000000000 --- a/Asset/data/asset/functions/mob/alias/337/tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/337/tick -# @within asset_manager:mob/tick/tick.m - -function asset:mob/0337.shower_of_cherry_blossoms/tick/ diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/_index.d.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/_index.d.mcfunction new file mode 100644 index 0000000000..929a315bdd --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/2081.shower_of_cherry_blossoms/_index.d +# @private + +#> tag +# @within function asset:object/2081.shower_of_cherry_blossoms/** + #declare tag 2081.HitCheck + #declare tag 2081.Target diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..77f10dec20 --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/detect_hit_entity/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/2081.shower_of_cherry_blossoms/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2081/detect_hit_entity + +# HitCheckがあるときのみ判定 +# 範囲内のプレイヤーにTagを付与しておく + execute if entity @s[tag=2081.HitCheck] run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2081.Target + execute if entity @s[tag=2081.HitCheck] positioned ~ ~1.5 ~ run tag @a[tag=!PlayerShouldInvulnerable,distance=..2] add 2081.Target + execute if entity @s[tag=2081.HitCheck] positioned ~ ~5 ~ run tag @a[tag=!PlayerShouldInvulnerable,distance=..3] add 2081.Target + +# ターゲットのプレイヤーがいればIsHitEntityをtrueに + execute if entity @p[tag=2081.Target,distance=..10] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/4.attack.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/hit_entity/.mcfunction similarity index 55% rename from Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/4.attack.mcfunction rename to Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/hit_entity/.mcfunction index 75bf80480c..3142fe636f 100644 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/4.attack.mcfunction +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/hit_entity/.mcfunction @@ -1,18 +1,19 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/tick/4.attack +#> asset:object/2081.shower_of_cherry_blossoms/hit_entity/ # -# 桜吹雪の攻撃 +# 継承先などから実行される処理 # -# @within function asset:mob/0337.shower_of_cherry_blossoms/tick/ +# @within asset:object/alias/2081/hit_entity # ダメージ - data modify storage api: Argument.Damage set value 3.0d + data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって桜の木の下に埋められた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは桜の木を切り倒した罪を背負いながら、%2$sによって倒された","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - execute as @e[type=#lib:living,tag=this,distance=..16,limit=1] run function api:damage/modifier - function api:damage/ + data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID + function api:damage/modifier_manual + execute as @a[tag=2081.Target,distance=..10] run function api:damage/ function api:damage/reset -# タグ外し - tag @s remove 9D.Landing +# プレイヤーのターゲットTagを削除 + tag @a[tag=2081.Target,distance=..10] remove 2081.Target diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/init/.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/init/.mcfunction new file mode 100644 index 0000000000..cbdd10ff27 --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/init/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/2081.shower_of_cherry_blossoms/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2081/init + +# スピード関連の設定 + data modify storage asset:context this.Speed set value 1 + data modify storage asset:context this.Range set value 100 + data modify storage asset:context this.MovePerStep set value 0.05 + +# スーパーメソッド呼び出し + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/register.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/register.mcfunction new file mode 100644 index 0000000000..766d7bbf0f --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2081.shower_of_cherry_blossoms/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2081/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2081 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/.mcfunction new file mode 100644 index 0000000000..f000a6bba0 --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2081.shower_of_cherry_blossoms/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2081/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/debug.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/debug.mcfunction new file mode 100644 index 0000000000..1379948365 --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2081.shower_of_cherry_blossoms/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2081 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/.mcfunction new file mode 100644 index 0000000000..565bee5025 --- /dev/null +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/.mcfunction @@ -0,0 +1,36 @@ +#> asset:object/2081.shower_of_cherry_blossoms/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2081/tick + +#> Val +# @private + #declare score_holder $Interval + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 回転 + tp @s ~ ~ ~ ~2 ~ + +# 近くのプレイヤーの方を向く + execute at @s facing entity @a[tag=!PlayerShouldInvulnerable,sort=nearest,limit=1] feet positioned ^ ^ ^0.05 rotated as @s run tp @s ^ ^ ^ ~ ~ + +# 4Tickに1回演出 + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 at @s run function asset:object/2081.shower_of_cherry_blossoms/tick/vfx + +# 4Tickに1回ヒット判定 + execute if score $Interval Temporary matches 0 run tag @s add 2081.HitCheck + +# スーパーメソッド呼び出し + execute at @s run function asset:object/super.tick + +# リセット + scoreboard players reset $Interval Temporary + tag @s[tag=2081.HitCheck] remove 2081.HitCheck + +# 消滅処理 + kill @s[scores={General.Object.Tick=100..}] diff --git a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/3.vfx.mcfunction b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/vfx.mcfunction similarity index 86% rename from Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/3.vfx.mcfunction rename to Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/vfx.mcfunction index 9ea49afa26..04e4142527 100644 --- a/Asset/data/asset/functions/mob/0337.shower_of_cherry_blossoms/tick/3.vfx.mcfunction +++ b/Asset/data/asset/functions/object/2081.shower_of_cherry_blossoms/tick/vfx.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0337.shower_of_cherry_blossoms/tick/3.vfx +#> asset:object/2081.shower_of_cherry_blossoms/tick/vfx # -# 演出 # -# @within function asset:mob/0337.shower_of_cherry_blossoms/tick/ +# +# @within function asset:object/2081.shower_of_cherry_blossoms/tick/ # Spiral.002 particle cherry_leaves ^-1.0 ^0.0 ^0.0 0 0 0 0 1 @@ -39,12 +39,12 @@ particle cherry_leaves ^-2.077 ^8.0 ^-2.077 0 0 0 0 1 particle cherry_leaves ^-3.0 ^8.258 ^0.0 0 0 0 0 1 # 平面 - particle sweep_attack ^-0.0 ^0.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^8.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^1.333 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^2.667 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^4.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^5.333 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] - particle sweep_attack ^-0.0 ^6.667 ^0.0 0.2 0.2 0.2 0.0 1 normal @a[distance=..32] + particle sweep_attack ^-0.0 ^0.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^8.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^1.333 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^2.667 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^4.0 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^5.333 ^0.0 0.2 0.2 0.2 0.0 1 normal @a + particle sweep_attack ^-0.0 ^6.667 ^0.0 0.2 0.2 0.2 0.0 1 normal @a # 音 - playsound item.elytra.flying hostile @a[distance=..16] ~ ~ ~ 0.5 2 0 + playsound item.elytra.flying hostile @a ~ ~ ~ 0.5 2 0 diff --git a/Asset/data/asset/functions/object/alias/2081/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2081/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..2b8a767b1e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/detect_hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2081/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2081/hit_entity.mcfunction new file mode 100644 index 0000000000..50346f6b2b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2081/init.mcfunction b/Asset/data/asset/functions/object/alias/2081/init.mcfunction new file mode 100644 index 0000000000..e8615adfb9 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2081/register.mcfunction b/Asset/data/asset/functions/object/alias/2081/register.mcfunction new file mode 100644 index 0000000000..17de67792b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2081/summon.mcfunction b/Asset/data/asset/functions/object/alias/2081/summon.mcfunction new file mode 100644 index 0000000000..9accc640df --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2081/tick.mcfunction b/Asset/data/asset/functions/object/alias/2081/tick.mcfunction new file mode 100644 index 0000000000..7b3147c60e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2081/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2081/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2081.shower_of_cherry_blossoms/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index c7877581e0..83483972d3 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -22,7 +22,6 @@ "asset:mob/0060.self_destructor/0.load", "asset:mob/0055.hetukedah/0.load", "asset:mob/0046.clock_of_despair/0.load", - "asset:mob/0337.shower_of_cherry_blossoms/0.load", "asset:mob/0332.aurora_missile/load", "asset:mob/0331.aurora_sorcerer/load", "asset:mob/0330.aurora_reaper/0.load", From 2a95a30bd11f71f8603bd4e3ce54087e3c677be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:23:50 +0900 Subject: [PATCH 52/74] =?UTF-8?q?[=E7=A5=9E=E5=99=A8796]=20Log4Shell?= =?UTF-8?q?=E3=81=AEURL=E3=82=92=E5=A4=89=E6=9B=B4=20(#373)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../functions/artifact/0796.log4shell/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0796.log4shell/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0796.log4shell/give/2.give.mcfunction index c8b3dc5bd7..4f605ba796 100644 --- a/Asset/data/asset/functions/artifact/0796.log4shell/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0796.log4shell/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"Log4Shell","color":"white"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"原木を消費して弾丸を発射する。"}','{"text":"${jndi:ldap://tsb.com/sacred_tresure}","color":"dark_purple","italic":false}'] + data modify storage asset:artifact Lore set value ['{"text":"原木を消費して弾丸を発射する。"}','{"text":"${jndi:ldap://tsb.example.com/artifact}","color":"dark_purple","italic":false}'] # MP以外の消費物 (TextComponentString) (オプション) data modify storage asset:artifact CostText set value '[{"text":"原木"},{"text":" x1"}]' # 使用回数 (int) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give From b3fd8163e7bf30e2227dd2598659e86d229f697f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 15:36:40 +0900 Subject: [PATCH 53/74] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[Mob114]=20=E3=82=B8?= =?UTF-8?q?=E3=83=A5=E3=82=A8=E3=83=AB=E3=83=8F=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=8F=8A=E3=81=B3=E5=8F=8D=E5=B0=84?= =?UTF-8?q?=E5=BC=BE=E3=82=92Object=E3=81=B8=E7=A7=BB=E8=A1=8C=20(#371)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0114.jewel_hunter/hurt/.mcfunction | 10 +++- .../hurt/3.reflect.mcfunction | 17 ------ .../0114.jewel_hunter/hurt/reflect.mcfunction | 39 ++++++++++++++ .../hurt/reflect_cooldown.mcfunction | 33 ++++++++++++ .../mob/0115.jewel_bullet/0.load.mcfunction | 9 ---- .../mob/0115.jewel_bullet/_index.d.mcfunction | 6 --- .../mob/0115.jewel_bullet/register.mcfunction | 54 ------------------- .../mob/0115.jewel_bullet/summon/.mcfunction | 4 -- .../mob/0115.jewel_bullet/tick/.mcfunction | 21 -------- .../tick/3.move_recursive.mcfunction | 23 -------- .../0115.jewel_bullet/tick/4.hit.mcfunction | 37 ------------- .../mob/alias/115/register.mcfunction | 4 -- .../functions/mob/alias/115/summon.mcfunction | 4 -- .../functions/mob/alias/115/tick.mcfunction | 4 -- .../detect_hit_block/.mcfunction | 7 +++ .../2071.jewel_bullet/hit_entity/.mcfunction | 20 +++++++ .../object/2071.jewel_bullet/init/.mcfunction | 14 +++++ .../2071.jewel_bullet/recursive/.mcfunction | 8 +++ .../2071.jewel_bullet/register.mcfunction | 21 ++++++++ .../2071.jewel_bullet/summon/.m.mcfunction | 10 ++++ .../2071.jewel_bullet/summon/.mcfunction | 8 +++ .../2071.jewel_bullet/summon/debug.mcfunction | 10 ++++ .../object/2071.jewel_bullet/tick/.mcfunction | 11 ++++ .../alias/2071/detect_hit_block.mcfunction | 8 +++ .../object/alias/2071/hit_entity.mcfunction | 8 +++ .../object/alias/2071/init.mcfunction | 8 +++ .../object/alias/2071/recursive.mcfunction | 8 +++ .../object/alias/2071/register.mcfunction | 8 +++ .../object/alias/2071/summon.mcfunction | 8 +++ .../object/alias/2071/tick.mcfunction | 8 +++ Asset/data/asset/tags/functions/mob/load.json | 1 - 31 files changed, 245 insertions(+), 186 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/3.reflect.mcfunction create mode 100644 Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect.mcfunction create mode 100644 Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect_cooldown.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/0.load.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/tick/3.move_recursive.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0115.jewel_bullet/tick/4.hit.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/115/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/115/summon.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/115/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/detect_hit_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2071.jewel_bullet/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/detect_hit_block.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2071/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/.mcfunction b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/.mcfunction index 6d074d99a4..cfcffb4540 100644 --- a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/.mcfunction @@ -4,9 +4,15 @@ # # @within function asset:mob/alias/114/hurt +#> Private +# @private + #declare score_holder $LatestReflectTick + #declare score_holder $CurrentTick + #declare tag CanReflect + # 演出 particle minecraft:dust 8 1 8 1 ~ ~1.2 ~ 0.5 0.4 0.5 1 50 normal @a playsound minecraft:block.amethyst_cluster.step hostile @a ~ ~ ~ 1 1 0 -# Attackerが離れた場所にいる場合、Attackerに反射攻撃 - execute unless entity @p[tag=Attacker,distance=..5] anchored eyes facing entity @p[tag=Attacker,distance=..32] eyes anchored feet positioned ^ ^ ^ run function asset:mob/0114.jewel_hunter/hurt/3.reflect +# Attackerが離れた場所にいる場合、Attackerに反射攻撃する + execute unless entity @p[tag=Attacker,distance=..5] run function asset:mob/0114.jewel_hunter/hurt/reflect_cooldown diff --git a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/3.reflect.mcfunction b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/3.reflect.mcfunction deleted file mode 100644 index cf05ad90cd..0000000000 --- a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/3.reflect.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> asset:mob/0114.jewel_hunter/hurt/3.reflect -# -# -# -# @within function asset:mob/0114.jewel_hunter/hurt/ - -#> Private -# @private - #declare tag 35.Already - -# Projectileを召喚 - data modify storage api: Argument.ID set value 115 - function api:mob/summon - -# 方向合わせ - tp @e[type=marker,tag=!35.Already,scores={MobID=115},distance=..0.1,sort=nearest,limit=1] ~ ~ ~ ~ ~ - tag @e[type=marker,tag=!35.Already,scores={MobID=115},distance=..0.1,sort=nearest,limit=1] add 35.Already diff --git a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect.mcfunction b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect.mcfunction new file mode 100644 index 0000000000..437dc0ed21 --- /dev/null +++ b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect.mcfunction @@ -0,0 +1,39 @@ +#> asset:mob/0114.jewel_hunter/hurt/reflect +# +# 反射攻撃 +# +# @within function asset:mob/0114.jewel_hunter/hurt/reflect_cooldown + +#> Private +# @private + #declare score_holder $Difficulty + +# Attackerの方を向く + tp @s ~ ~ ~ facing entity @p[tag=Attacker] eyes + +# 難易度値に比例した弾速にする +# ノーマルまではSpeedは2固定 +# それ以上なら難易度値だけ弾速が上がる + function api:global_vars/get_difficulty + data modify storage api: Argument.FieldOverride.Speed set from storage api: Return.Difficulty + execute if predicate api:global_vars/difficulty/max/normal run data modify storage api: Argument.FieldOverride.Speed set value 2 + +# ダメージ設定 +# ノーマルまではダメージを3に固定 +# ハード以上なら5 *(難易度値 - 1)にする + function api:global_vars/get_difficulty + execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty + execute store result storage api: Argument.FieldOverride.Damage int 5 run scoreboard players remove $Difficulty Temporary 1 + execute if predicate api:global_vars/difficulty/max/normal run data modify storage api: Argument.FieldOverride.Damage set value 3 + +# Object召喚 + data modify storage api: Argument.ID set value 2071 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=skeleton,tag=this,distance=..3,limit=1] MobUUID + function api:object/summon + +# リセット + scoreboard players reset $Difficulty Temporary + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect_cooldown.mcfunction b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect_cooldown.mcfunction new file mode 100644 index 0000000000..094b73aef5 --- /dev/null +++ b/Asset/data/asset/functions/mob/0114.jewel_hunter/hurt/reflect_cooldown.mcfunction @@ -0,0 +1,33 @@ +#> asset:mob/0114.jewel_hunter/hurt/reflect_cooldown +# +# +# +# @within function asset:mob/0114.jewel_hunter/hurt/ + +#> Private +# @private + #declare score_holder $LatestReflectTick + #declare score_holder $CurrentTick + #declare tag CanReflect + +# 反射攻撃のクールダウン設定 +# 必要なスコアを取得 + execute store result score $LatestReflectTick Temporary run data get storage asset:context this.LatestReflectTick + execute store result score $CurrentTick Temporary run time query gametime + +# イージーで50Tick,ノーマルで20Tick、ハード以上で5Tick + scoreboard players operation $CurrentTick Temporary -= $LatestReflectTick Temporary + execute if predicate api:global_vars/difficulty/easy if score $CurrentTick Temporary matches 50.. run tag @s add CanReflect + execute if predicate api:global_vars/difficulty/normal if score $CurrentTick Temporary matches 20.. run tag @s add CanReflect + execute if predicate api:global_vars/difficulty/min/hard if score $CurrentTick Temporary matches 5.. run tag @s add CanReflect + +# 反射攻撃実行 + execute if entity @s[tag=CanReflect] anchored eyes facing entity @p[tag=Attacker,distance=..32] eyes anchored feet positioned ^ ^1 ^ summon marker run function asset:mob/0114.jewel_hunter/hurt/reflect + +# 反射したTickを記録 + execute if entity @s[tag=CanReflect] store result storage asset:context this.LatestReflectTick int 1 run time query gametime + +# リセット + scoreboard players reset $LatestReflectTick Temporary + scoreboard players reset $CurrentTick Temporary + tag @s[tag=CanReflect] remove CanReflect diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/0.load.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/0.load.mcfunction deleted file mode 100644 index c23047f66a..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0115.jewel_bullet/0.load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0115.jewel_bullet/** - scoreboard objectives add 36.Tick dummy diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/_index.d.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/_index.d.mcfunction deleted file mode 100644 index 67208f30bf..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:mob/0115.jewel_bullet/_index.d -# @private - -#> tag -# @within function asset:mob/0115.jewel_bullet/** - #declare score_holder $RecursiveCount diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/register.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/register.mcfunction deleted file mode 100644 index ff253ee66a..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/register.mcfunction +++ /dev/null @@ -1,54 +0,0 @@ -#> asset:mob/0115.jewel_bullet/register -# @within asset:mob/alias/115/register - -# ID (int) - data modify storage asset:mob ID set value 115 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Projectile" -# 干渉可能か否か (boolean) - data modify storage asset:mob Interferable set value false -# 名前 (TextComponentString) (オプション) - data modify storage asset:mob Name set from entity @s CustomName -# 武器 - # メインハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Mainhand set value - # オフハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Offhand set value -# 武器ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob WeaponDropChances set value -# 防具 - # 頭 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Head set value - # 胴 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Chest set value - # 脚 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Legs set value - # 足 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Feet set value -# 防具ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob ArmorDropChances set value -# 体力 (double) (オプション) - # data modify storage asset:mob Health set value -# 攻撃力 (double) (オプション) - # data modify storage asset:mob AttackDamage set value -# 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち - # data modify storage asset:mob Defense set value -# 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす - # data modify storage asset:mob SpecialDefense set value -# 移動速度 (double) (オプション) - # data modify storage asset:mob Speed set value -# 索敵範囲 (double) (オプション) - # data modify storage asset:mob FollowRange set value -# ノックバック耐性 (double) (オプション) - # data modify storage asset:mob KnockBackResist set value -# 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る - # 物理倍率 (float) (オプション) - # data modify storage asset:mob Resist.Physical set value - # 魔法倍率 (float) (オプション) - # data modify storage asset:mob Resist.Magic set value - # 火倍率 (float) (オプション) - # data modify storage asset:mob Resist.Fire set value - # 水倍率 (float) (オプション) - # data modify storage asset:mob Resist.Water set value - # 雷倍率 (float) (オプション) - # data modify storage asset:mob Resist.Thunder set value diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/summon/.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/summon/.mcfunction deleted file mode 100644 index 78b35458d1..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/summon/.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/0115.jewel_bullet/summon/ -# @within asset:mob/alias/115/summon - -summon marker ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/.mcfunction deleted file mode 100644 index 86c9caebad..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:mob/0115.jewel_bullet/tick/ -# -# Mobのtick時の処理 -# -# @within function asset:mob/alias/115/tick - -# スコア - scoreboard players add @s 36.Tick 1 - -# 演出 - particle minecraft:dust 8 1 8 1.5 ~ ~1.2 ~ 0.25 0.25 0.25 1 3 normal @a - playsound minecraft:block.amethyst_cluster.step hostile @a ~ ~ ~ 0.4 1 0 - -# 移動とヒット処理 - function asset:mob/0115.jewel_bullet/tick/3.move_recursive - -# 再帰用スコアのリセット - scoreboard players reset $RecursiveCount Temporary - -# 消滅 - execute if entity @s[scores={36.Tick=32..}] run kill @s diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/3.move_recursive.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/3.move_recursive.mcfunction deleted file mode 100644 index 5cf0906957..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/3.move_recursive.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:mob/0115.jewel_bullet/tick/3.move_recursive -# -# 再帰処理で前方へ進む -# -# @within function -# asset:mob/0115.jewel_bullet/tick/ -# asset:mob/0115.jewel_bullet/tick/3.move_recursive - -# 演出 - particle minecraft:dust 8 1 8 1.5 ~ ~1.2 ~ 0.25 0.25 0.25 1 1 normal @a - -# 前方へ進む - execute if predicate api:global_vars/difficulty/max/normal run tp @s ^ ^ ^0.2 - execute if predicate api:global_vars/difficulty/min/hard run tp @s ^ ^ ^0.375 - -# ヒット処理 - execute positioned ~-0.5 ~ ~-0.5 if entity @p[gamemode=!spectator,dx=0] run function asset:mob/0115.jewel_bullet/tick/4.hit - -# 再帰用スコア - scoreboard players add $RecursiveCount Temporary 1 - -# 4回まで再帰 - execute if score $RecursiveCount Temporary matches ..4 at @s run function asset:mob/0115.jewel_bullet/tick/3.move_recursive diff --git a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/4.hit.mcfunction b/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/4.hit.mcfunction deleted file mode 100644 index 7362b9c611..0000000000 --- a/Asset/data/asset/functions/mob/0115.jewel_bullet/tick/4.hit.mcfunction +++ /dev/null @@ -1,37 +0,0 @@ -#> asset:mob/0115.jewel_bullet/tick/4.hit -# -# -# -# @within function asset:mob/0115.jewel_bullet/tick/3.move_recursive - -#> Private -# @private - #declare score_holder $DamageValue - -# 難易度値を取得し、ダメージを計算する -# $DamageValue = 5(N -1) ただしノーマル以下では3に固定する - function api:global_vars/get_difficulty - execute store result score $DamageValue Temporary run data get storage api: Return.Difficulty - scoreboard players remove $DamageValue Temporary 1 - -# ダメージ - execute store result storage lib: Argument.Damage double 5.0 run scoreboard players get $DamageValue Temporary - execute if predicate api:global_vars/difficulty/max/normal run data modify storage lib: Argument.Damage set value 3.0 - data modify storage lib: Argument.AttackType set value "Physical" - data modify storage lib: Argument.ElementType set value "None" - data modify storage lib: Argument.FixedDamage set value 1b -# デスログ - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sの宝石の煌めきにやられた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sの宝石の価値に敗北した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' -# 補正 - function lib:damage/modifier -# 実行 - execute as @a[tag=!PlayerShouldInvulnerable,dx=0] run function lib:damage/ -# リセット - function lib:damage/reset - -# スコアのリセット - scoreboard players reset $DamageValue Temporary - -# 消滅 - kill @s diff --git a/Asset/data/asset/functions/mob/alias/115/register.mcfunction b/Asset/data/asset/functions/mob/alias/115/register.mcfunction deleted file mode 100644 index 880774b823..0000000000 --- a/Asset/data/asset/functions/mob/alias/115/register.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/115/register -# @within asset_manager:mob/register/register.m - -function asset:mob/0115.jewel_bullet/register diff --git a/Asset/data/asset/functions/mob/alias/115/summon.mcfunction b/Asset/data/asset/functions/mob/alias/115/summon.mcfunction deleted file mode 100644 index c68e2693ef..0000000000 --- a/Asset/data/asset/functions/mob/alias/115/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/115/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0115.jewel_bullet/summon/ diff --git a/Asset/data/asset/functions/mob/alias/115/tick.mcfunction b/Asset/data/asset/functions/mob/alias/115/tick.mcfunction deleted file mode 100644 index da4a735daf..0000000000 --- a/Asset/data/asset/functions/mob/alias/115/tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/115/tick -# @within asset_manager:mob/tick/tick.m - -function asset:mob/0115.jewel_bullet/tick/ diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..2c2c607417 --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/detect_hit_block/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/2071.jewel_bullet/detect_hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2071/detect_hit_block + +# 何もしない diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/hit_entity/.mcfunction new file mode 100644 index 0000000000..b7936ca2e8 --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/hit_entity/.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2071.jewel_bullet/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2071/hit_entity + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.FixedDamage set value 1b + data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sの宝石の煌めきにやられた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"api:","interpret":true}]}]' + data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sの宝石の価値に敗北した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"api:","interpret":true}]}]' + data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID + function api:damage/modifier_manual + execute positioned ~-0.5 ~-0.5 ~-0.5 as @a[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/ + function api:damage/reset + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/init/.mcfunction new file mode 100644 index 0000000000..12e6b5e61f --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/init/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/2071.jewel_bullet/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2071/init + +# スピード関連の設定 +# Speedはフィールドで設定する + # data modify storage asset:context this.Speed set value 0 + data modify storage asset:context this.Range set value 128 + data modify storage asset:context this.MovePerStep set value 0.4 + +# 継承 + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/recursive/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/recursive/.mcfunction new file mode 100644 index 0000000000..33610632ee --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2071.jewel_bullet/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2071/recursive + +# 演出 + particle minecraft:dust 8 1 8 1.5 ~ ~ ~ 0.25 0.25 0.25 1 2 normal @a diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/register.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/register.mcfunction new file mode 100644 index 0000000000..24c9fc654f --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/register.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/2071.jewel_bullet/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2071/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2071 +# フィールド(オプション) + data modify storage asset:object Field.Rotation set value [0.0f,0.0f] + data modify storage asset:object Field.Speed set value 2 diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.m.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.m.mcfunction new file mode 100644 index 0000000000..9704065fce --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.m.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2071.jewel_bullet/summon/.m +# +# マクロを使って召喚する +# +# @input args: +# Rotation : double @ 2 +# @within function asset:object/2071.jewel_bullet/summon/ + +# 元となるEntityを召喚する + $summon marker ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.mcfunction new file mode 100644 index 0000000000..384361253d --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2071.jewel_bullet/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2071/summon + +# 元となるEntityを召喚する + function asset:object/2071.jewel_bullet/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/summon/debug.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/debug.mcfunction new file mode 100644 index 0000000000..30aea88f7c --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2071.jewel_bullet/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2071 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2071.jewel_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2071.jewel_bullet/tick/.mcfunction new file mode 100644 index 0000000000..75d348cff8 --- /dev/null +++ b/Asset/data/asset/functions/object/2071.jewel_bullet/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2071.jewel_bullet/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2071/tick + +# 演出 + playsound minecraft:block.amethyst_cluster.step hostile @a ~ ~ ~ 0.4 1 0 + +# スーパーメソッド呼び出し + function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/alias/2071/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/2071/detect_hit_block.mcfunction new file mode 100644 index 0000000000..b737ecb9e7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2071.jewel_bullet/detect_hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2071/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2071/hit_entity.mcfunction new file mode 100644 index 0000000000..bff023e308 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2071.jewel_bullet/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2071/init.mcfunction b/Asset/data/asset/functions/object/alias/2071/init.mcfunction new file mode 100644 index 0000000000..f080cfdd7b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2071.jewel_bullet/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2071/recursive.mcfunction b/Asset/data/asset/functions/object/alias/2071/recursive.mcfunction new file mode 100644 index 0000000000..773ab07331 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2071.jewel_bullet/recursive/ diff --git a/Asset/data/asset/functions/object/alias/2071/register.mcfunction b/Asset/data/asset/functions/object/alias/2071/register.mcfunction new file mode 100644 index 0000000000..389854a362 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2071.jewel_bullet/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2071/summon.mcfunction b/Asset/data/asset/functions/object/alias/2071/summon.mcfunction new file mode 100644 index 0000000000..7947698b38 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2071.jewel_bullet/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2071/tick.mcfunction b/Asset/data/asset/functions/object/alias/2071/tick.mcfunction new file mode 100644 index 0000000000..e786814df4 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2071/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2071/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2071.jewel_bullet/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index 83483972d3..ec8037b470 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -71,7 +71,6 @@ "asset:mob/0104.mad_scientist/0.load", "asset:mob/0105.potion_projectile/0.load", "asset:mob/0175.queen_bee/0.load", - "asset:mob/0115.jewel_bullet/0.load", "asset:mob/0065.night_shadow/0.load", "asset:mob/0124.skull_harpy/load", "asset:mob/0129.lexiel/0.load", From 4cd05cb20260d49fda29b5ab8c4caa1fae38eb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 15:45:18 +0900 Subject: [PATCH 54/74] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[Object2078]=20?= =?UTF-8?q?=E3=83=80=E3=83=BC=E3=82=AF=E3=82=B5=E3=83=A2=E3=83=8A=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E9=AD=94=E6=B3=95=E3=82=92=E4=BD=9C=E6=88=90=20(#372)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0265.dark_familiar/load.mcfunction | 9 ----- .../0265.dark_familiar/register.mcfunction | 2 +- .../mob/0265.dark_familiar/tick/.mcfunction | 8 ++-- .../0265.dark_familiar/tick/shoot.mcfunction | 38 +++++++++++++++++-- .../0266.small_dark_ball/_index.d.mcfunction | 8 ---- .../mob/0266.small_dark_ball/init/.mcfunction | 29 -------------- .../mob/0266.small_dark_ball/load.mcfunction | 9 ----- .../0266.small_dark_ball/register.mcfunction | 25 ------------ .../0266.small_dark_ball/summon/.mcfunction | 8 ---- .../summon/debug.mcfunction | 10 ----- .../mob/0266.small_dark_ball/tick/.mcfunction | 18 --------- .../0266.small_dark_ball/tick/hit.mcfunction | 21 ---------- .../0266.small_dark_ball/tick/move.mcfunction | 21 ---------- .../functions/mob/alias/266/init.mcfunction | 4 -- .../mob/alias/266/register.mcfunction | 4 -- .../functions/mob/alias/266/summon.mcfunction | 4 -- .../functions/mob/alias/266/tick.mcfunction | 4 -- .../2078.dark_bullet/hit_entity/.mcfunction | 17 +++++++++ .../object/2078.dark_bullet/init/.mcfunction | 14 +++++++ .../2078.dark_bullet/recursive/.mcfunction | 8 ++++ .../2078.dark_bullet/register.mcfunction | 20 ++++++++++ .../2078.dark_bullet/summon/.m.mcfunction | 10 +++++ .../2078.dark_bullet/summon/.mcfunction | 8 ++++ .../2078.dark_bullet/summon/debug.mcfunction | 10 +++++ .../object/alias/2078/hit_entity.mcfunction | 8 ++++ .../object/alias/2078/init.mcfunction | 8 ++++ .../object/alias/2078/recursive.mcfunction | 8 ++++ .../object/alias/2078/register.mcfunction | 8 ++++ .../object/alias/2078/summon.mcfunction | 8 ++++ Asset/data/asset/tags/functions/mob/load.json | 2 - 30 files changed, 167 insertions(+), 184 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0265.dark_familiar/load.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/init/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/load.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/tick/hit.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0266.small_dark_ball/tick/move.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/266/init.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/266/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/266/summon.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/266/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2078.dark_bullet/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2078/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2078/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2078/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2078/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2078/summon.mcfunction diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/load.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/load.mcfunction deleted file mode 100644 index 969b3dd1f3..0000000000 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0265.dark_familiar/load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0265.dark_familiar/** - scoreboard objectives add 7D.Tick dummy diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/register.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/register.mcfunction index 328e46fb21..d783a7c47f 100644 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/register.mcfunction +++ b/Asset/data/asset/functions/mob/0265.dark_familiar/register.mcfunction @@ -65,4 +65,4 @@ # data modify storage asset:mob Resist.Thunder set value # フィールド - # data modify storage asset:mob Field set value {} + data modify storage asset:mob Field.Damage set value 20.0f diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction index 90e773441e..6ce68ae608 100644 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction @@ -27,13 +27,13 @@ execute positioned ~ ~1.68 ~ unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 # スコア - scoreboard players add @s 7D.Tick 1 + scoreboard players add @s General.Mob.Tick 1 # 消える - execute if entity @s[scores={7D.Tick=200..}] run function asset:mob/0265.dark_familiar/tick/kill + execute if entity @s[scores={General.Mob.Tick=200..}] run function asset:mob/0265.dark_familiar/tick/kill # 一定間隔で攻撃 召喚してすぐは攻撃しないようにしている - scoreboard players operation $Interval Temporary = @s 7D.Tick + scoreboard players operation $Interval Temporary = @s General.Mob.Tick scoreboard players operation $Interval Temporary %= $40 Const - execute if score $Interval Temporary matches 0 run function asset:mob/0265.dark_familiar/tick/shoot + execute if score $Interval Temporary matches 0 anchored eyes positioned ^ ^ ^ summon marker run function asset:mob/0265.dark_familiar/tick/shoot scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/shoot.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/shoot.mcfunction index 8df9502206..1c0c2bad0e 100644 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/shoot.mcfunction @@ -4,11 +4,43 @@ # # @within function asset:mob/0265.dark_familiar/tick/ -# 召喚 - data modify storage api: Argument.ID set value 266 - execute anchored eyes positioned ^ ^ ^ run function api:mob/summon +#> Private +# @private + #declare tag SpreadMarker # サウンド playsound minecraft:entity.shulker_bullet.hurt hostile @a ~ ~ ~ 1.5 2 playsound minecraft:block.amethyst_cluster.break hostile @a ~ ~ ~ 1.5 1.5 playsound minecraft:entity.vex.ambient hostile @a ~ ~ ~ 1.5 2 + +# プレイヤーの方を見る + tp @s ~ ~ ~ facing entity @p feet + +# 拡散させるEntityを召喚する + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + +# ステータス設定 + data modify storage lib: Argument.Distance set value 5 + data modify storage lib: Argument.Spread set value 1 + +# 拡散 + execute facing entity @p[gamemode=!spectator,distance=..30] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle + execute facing entity @e[type=marker,tag=SpreadMarker,limit=1] eyes run tp @s ~ ~ ~ ~ ~ + +# マーカーをkill + kill @e[type=marker,tag=SpreadMarker] + +# 速度設定 +# ハード以上なら確率で低速になる + data modify storage api: Argument.FieldOverride.Speed set value 2 + execute if predicate api:global_vars/difficulty/min/hard if predicate lib:random_pass_per/50 run data modify storage api: Argument.FieldOverride.Speed set value 1 + +# 召喚 + data modify storage api: Argument.ID set value 2078 + data modify storage api: Argument.FieldOverride.Damage set value 20.0f + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=husk,tag=this,distance=..3,limit=1] MobUUID + function api:object/summon + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/_index.d.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/_index.d.mcfunction deleted file mode 100644 index cf738a561b..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0266.small_dark_ball/_index.d -# @private - -#> tag -# @within function asset:mob/0266.small_dark_ball/** - #declare score_holder $Recursive - #declare tag 7E.SlowBullet - #declare tag 7E.Hit diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/init/.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/init/.mcfunction deleted file mode 100644 index 4d316ceb34..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/init/.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#> asset:mob/0266.small_dark_ball/init/ -# -# Mob召喚時のInit処理 -# -# @within function asset:mob/alias/266/init - -#> SpreadLib -# @private - #declare tag SpreadMarker - -# ハード以上なら確率で低速弾になる - execute if predicate lib:random_pass_per/50 run tag @s add 7E.SlowBullet - -# こっち向く - execute facing entity @p[gamemode=!spectator,distance=..30] eyes run tp @s ~ ~ ~ ~ ~ - -# 拡散させるEntityを召喚する - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - -# ステータス設定 - data modify storage lib: Argument.Distance set value 5 - data modify storage lib: Argument.Spread set value 1 - -# 拡散 - execute facing entity @p[gamemode=!spectator,distance=..30] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle - execute facing entity @e[type=marker,tag=SpreadMarker,limit=1] eyes run tp @s ~ ~ ~ ~ ~ - -# マーカーをkill - kill @e[type=marker,tag=SpreadMarker] diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/load.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/load.mcfunction deleted file mode 100644 index 53ab8c081b..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0266.small_dark_ball/load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0266.small_dark_ball/** - scoreboard objectives add 7E.Tick dummy diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/register.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/register.mcfunction deleted file mode 100644 index 879eaf4b30..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/register.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -#> asset:mob/0266.small_dark_ball/register -# -# Mobのデータを指定 -# -# @within function asset:mob/alias/266/register - -# 継承 (int) (オプション) - # data modify storage asset:mob Extends append value - # function asset:mob/extends - -# 他のモブに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:mob ExtendsSafe set value true -# ID (int) - data modify storage asset:mob ID set value 266 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Projectile" -# 干渉可能か否か (boolean) - data modify storage asset:mob Interferable set value false -# 名前 (TextComponentString) (オプション) - data modify storage asset:mob Name set from entity @s CustomName -# Mobの説明文 (TextComponentString[]) (オプション) - # data modify storage asset:mob Lore set value - -# フィールド - # data modify storage asset:mob Field set value {} diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/.mcfunction deleted file mode 100644 index ddc90d4c8a..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0266.small_dark_ball/summon/ -# -# Mob召喚処理の呼び出し時に実行されるfunction -# -# @within asset:mob/alias/266/summon - -# 元となるMobを召喚する - summon item_display ~ ~ ~ {Tags:["MobInit"],teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20216}},billboard:center,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5f,0.5f,0.5f]}} diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/debug.mcfunction deleted file mode 100644 index 9d5a335fea..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0266.small_dark_ball/summon/debug -# -# モブの動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# モブを召喚 - data modify storage api: Argument.ID set value 266 - function api:mob/summon diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/.mcfunction deleted file mode 100644 index 848a9cb360..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:mob/0266.small_dark_ball/tick/ -# -# Mobのtick時の処理 -# -# @within function asset:mob/alias/266/tick - -# スコア - scoreboard players add @s 7E.Tick 1 - -# パーティクル - particle minecraft:witch ~ ~ ~ 0 0 0 0 1 normal @a - -# 移動 - function asset:mob/0266.small_dark_ball/tick/move - scoreboard players reset $Recursive Temporary - -# キル - execute if entity @s[scores={7E.Tick=80..}] run kill @s diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/hit.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/hit.mcfunction deleted file mode 100644 index b7f1f1cf5f..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/hit.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:mob/0266.small_dark_ball/tick/hit -# -# ヒット処理 -# -# @within asset:mob/0266.small_dark_ball/tick/move - -# ダメージ - data modify storage api: Argument.Damage set value 20.0f - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.ElementType set value "None" - function api:damage/modifier - execute as @p[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/ - function api:damage/reset - -# ヒットタグ -# こうしないと何故かヒット判定が複数発生する(???) - tag @s add 7E.Hit - -# 消滅 - particle minecraft:reverse_portal ~ ~ ~ 0 0 0 0.1 10 - kill @s diff --git a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/move.mcfunction b/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/move.mcfunction deleted file mode 100644 index d4e7661f57..0000000000 --- a/Asset/data/asset/functions/mob/0266.small_dark_ball/tick/move.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:mob/0266.small_dark_ball/tick/move -# -# 再帰処理で移動する -# -# @within function -# asset:mob/0266.small_dark_ball/tick/ -# asset:mob/0266.small_dark_ball/tick/move - -# 前進 - execute if entity @s[tag=!7E.SlowBullet] run tp @s ^ ^ ^0.1 ~ ~ - execute if entity @s[tag=7E.SlowBullet] run tp @s ^ ^ ^0.05 ~ ~ - -# プレイヤーの衝突判定 - execute at @s positioned ~-0.5 ~0.0 ~-0.5 if entity @p[dx=0] run function asset:mob/0266.small_dark_ball/tick/hit - -# 壁の衝突判定 - execute unless block ~ ~ ~ #lib:no_collision run function asset:mob/0266.small_dark_ball/tick/hit - -# 再帰 - scoreboard players add $Recursive Temporary 1 - execute if entity @s[tag=!7E.Hit] if score $Recursive Temporary matches ..5 at @s run function asset:mob/0266.small_dark_ball/tick/move diff --git a/Asset/data/asset/functions/mob/alias/266/init.mcfunction b/Asset/data/asset/functions/mob/alias/266/init.mcfunction deleted file mode 100644 index b1005df7b0..0000000000 --- a/Asset/data/asset/functions/mob/alias/266/init.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/266/init -# @within asset_manager:mob/init/init.m - -function asset:mob/0266.small_dark_ball/init/ diff --git a/Asset/data/asset/functions/mob/alias/266/register.mcfunction b/Asset/data/asset/functions/mob/alias/266/register.mcfunction deleted file mode 100644 index cc3b0e2771..0000000000 --- a/Asset/data/asset/functions/mob/alias/266/register.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/266/register -# @within asset_manager:mob/register/register.m - -function asset:mob/0266.small_dark_ball/register diff --git a/Asset/data/asset/functions/mob/alias/266/summon.mcfunction b/Asset/data/asset/functions/mob/alias/266/summon.mcfunction deleted file mode 100644 index dfae1108aa..0000000000 --- a/Asset/data/asset/functions/mob/alias/266/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/266/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0266.small_dark_ball/summon/ diff --git a/Asset/data/asset/functions/mob/alias/266/tick.mcfunction b/Asset/data/asset/functions/mob/alias/266/tick.mcfunction deleted file mode 100644 index ff4d879974..0000000000 --- a/Asset/data/asset/functions/mob/alias/266/tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/266/tick -# @within asset_manager:mob/tick/tick.m - -function asset:mob/0266.small_dark_ball/tick/ diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/hit_entity/.mcfunction new file mode 100644 index 0000000000..97132cec55 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/hit_entity/.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/2078.dark_bullet/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2078/hit_entity + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID + function api:damage/modifier_manual + execute positioned ~-0.5 ~-0.5 ~-0.5 as @p[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/ + function api:damage/reset + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/init/.mcfunction new file mode 100644 index 0000000000..0a85a3eb14 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/init/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/2078.dark_bullet/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2078/init + +# スピード関連の設定 +# Speedはフィールドで設定する + # data modify storage asset:context this.Speed set value 0 + data modify storage asset:context this.Range set value 128 + data modify storage asset:context this.MovePerStep set value 0.4 + +# 継承 + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/recursive/.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/recursive/.mcfunction new file mode 100644 index 0000000000..0f169e2069 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2078.dark_bullet/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2078/recursive + +# パーティクル + particle minecraft:witch ~ ~ ~ 0 0 0 0 1 normal @a diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/register.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/register.mcfunction new file mode 100644 index 0000000000..4f094e35cc --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2078.dark_bullet/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2078/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2078 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/summon/.m.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/summon/.m.mcfunction new file mode 100644 index 0000000000..2fd1b64682 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/summon/.m.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2078.dark_bullet/summon/.m +# +# マクロを使って召喚する +# +# @input args: +# Rotation : double @ 2 +# @within function asset:object/2078.dark_bullet/summon/ + +# 元となるEntityを召喚する + $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20216}},billboard:center,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5f,0.5f,0.5f]}} diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/summon/.mcfunction new file mode 100644 index 0000000000..a662eb7305 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2078.dark_bullet/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2078/summon + +# 元となるEntityを召喚する + function asset:object/2078.dark_bullet/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2078.dark_bullet/summon/debug.mcfunction b/Asset/data/asset/functions/object/2078.dark_bullet/summon/debug.mcfunction new file mode 100644 index 0000000000..3a968d5ef0 --- /dev/null +++ b/Asset/data/asset/functions/object/2078.dark_bullet/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2078.dark_bullet/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2078 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2078/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2078/hit_entity.mcfunction new file mode 100644 index 0000000000..381d59a6de --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2078/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2078/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2078.dark_bullet/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2078/init.mcfunction b/Asset/data/asset/functions/object/alias/2078/init.mcfunction new file mode 100644 index 0000000000..19719afa1e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2078/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2078/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2078.dark_bullet/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2078/recursive.mcfunction b/Asset/data/asset/functions/object/alias/2078/recursive.mcfunction new file mode 100644 index 0000000000..91382fb9e2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2078/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2078/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2078.dark_bullet/recursive/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2078/register.mcfunction b/Asset/data/asset/functions/object/alias/2078/register.mcfunction new file mode 100644 index 0000000000..21a23621e2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2078/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2078/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2078.dark_bullet/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2078/summon.mcfunction b/Asset/data/asset/functions/object/alias/2078/summon.mcfunction new file mode 100644 index 0000000000..f7f70b6fb6 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2078/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2078/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2078.dark_bullet/summon/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index ec8037b470..f890fe9bf4 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -1,7 +1,5 @@ { "values": [ - "asset:mob/0266.small_dark_ball/load", - "asset:mob/0265.dark_familiar/load", "asset:mob/0264.dark_summoner/load", "asset:mob/0188.fireball/load", "asset:mob/0187.flame_mage/load", From e5f1c0eb642d1591ef20116128e441be1bc9366e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 16:05:44 +0900 Subject: [PATCH 55/74] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[Object2080]=20?= =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=AD=E3=83=A9=E3=83=9F=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=92Object=E3=81=B8=E7=A7=BB=E8=A1=8C=20(#374)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: はいいろ --- .../mob/0331.aurora_sorcerer/init/.mcfunction | 2 +- .../mob/0331.aurora_sorcerer/load.mcfunction | 1 - .../0331.aurora_sorcerer/register.mcfunction | 2 +- .../mob/0331.aurora_sorcerer/tick/.mcfunction | 6 +-- .../tick/2.shoot.mcfunction | 21 ---------- .../tick/reset.mcfunction | 4 +- .../tick/shoot.mcfunction | 20 ++++++++++ .../tick/summon.mcfunction | 25 ++++++++++++ .../tick/vfx/circle1.mcfunction | 2 +- .../tick/vfx/circle2.mcfunction | 2 +- .../tick/vfx/circle3.mcfunction | 2 +- .../mob/0332.aurora_missile/init/.mcfunction | 8 ---- .../mob/0332.aurora_missile/load.mcfunction | 9 ----- .../0332.aurora_missile/register.mcfunction | 23 ----------- .../0332.aurora_missile/summon/.mcfunction | 8 ---- .../summon/debug.mcfunction | 10 ----- .../mob/0332.aurora_missile/tick/.mcfunction | 14 ------- .../tick/2.normal.mcfunction | 32 ---------------- .../tick/3.hard.mcfunction | 27 ------------- .../0332.aurora_missile/tick/4.hit.mcfunction | 33 ---------------- .../tick/5.mp_reduce.mcfunction | 29 -------------- .../functions/mob/alias/332/init.mcfunction | 4 -- .../mob/alias/332/register.mcfunction | 4 -- .../functions/mob/alias/332/summon.mcfunction | 4 -- .../functions/mob/alias/332/tick.mcfunction | 4 -- .../2080.aurora_missile/_index.d.mcfunction | 8 ++++ .../detect_hit_block/.mcfunction | 9 +++++ .../2080.aurora_missile/hit_block/.mcfunction | 14 +++++++ .../2080.aurora_missile/init/.mcfunction | 18 +++++++++ .../2080.aurora_missile/kill/.mcfunction | 38 +++++++++++++++++++ .../kill/mp_reduce.mcfunction | 25 ++++++++++++ .../kill/vfx/enhanced.mcfunction} | 4 +- .../kill/vfx/normal.mcfunction} | 4 +- .../2080.aurora_missile/register.mcfunction | 20 ++++++++++ .../2080.aurora_missile/summon/.m.mcfunction | 10 +++++ .../2080.aurora_missile/summon/.mcfunction | 8 ++++ .../summon/debug.mcfunction | 10 +++++ .../2080.aurora_missile/tick/.mcfunction | 20 ++++++++++ .../tick/enhanced.mcfunction | 23 +++++++++++ .../tick/normal.mcfunction | 24 ++++++++++++ .../alias/2080/detect_hit_block.mcfunction | 8 ++++ .../object/alias/2080/hit_block.mcfunction | 8 ++++ .../object/alias/2080/init.mcfunction | 8 ++++ .../object/alias/2080/kill.mcfunction | 8 ++++ .../object/alias/2080/register.mcfunction | 8 ++++ .../object/alias/2080/summon.mcfunction | 8 ++++ .../object/alias/2080/tick.mcfunction | 8 ++++ Asset/data/asset/tags/functions/mob/load.json | 1 - 48 files changed, 342 insertions(+), 246 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/2.shoot.mcfunction create mode 100644 Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/shoot.mcfunction create mode 100644 Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/init/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/load.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/tick/2.normal.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/tick/3.hard.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/tick/4.hit.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0332.aurora_missile/tick/5.mp_reduce.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/332/init.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/332/register.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/332/summon.mcfunction delete mode 100644 Asset/data/asset/functions/mob/alias/332/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/kill/mp_reduce.mcfunction rename Asset/data/asset/functions/{mob/0332.aurora_missile/tick/vfx/2.mcfunction => object/2080.aurora_missile/kill/vfx/enhanced.mcfunction} (98%) rename Asset/data/asset/functions/{mob/0332.aurora_missile/tick/vfx/1.mcfunction => object/2080.aurora_missile/kill/vfx/normal.mcfunction} (97%) create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/detect_hit_block.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2080/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/init/.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/init/.mcfunction index 02085c8a2e..68f8e131c6 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/init/.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/alias/331/init # スコア設定 - scoreboard players set @s 97.Skill -60 + scoreboard players set @s General.Mob.Tick -60 diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/load.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/load.mcfunction index 76fd53fb8c..5c1e52099b 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/load.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/load.mcfunction @@ -6,6 +6,5 @@ #> 定義類はここに # @within function asset:mob/0331.aurora_sorcerer/** - scoreboard objectives add 97.Skill dummy scoreboard objectives add 97.MotionCT dummy scoreboard objectives add 97.MotionCount dummy diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/register.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/register.mcfunction index f874f1b692..3a1245d522 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/register.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/register.mcfunction @@ -60,4 +60,4 @@ # 雷倍率 (float) (オプション) data modify storage asset:mob Resist.Thunder set value 0 # フィールド - # data modify storage asset:mob Field set value {} + data modify storage asset:mob Field.Damage set value 32f diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/.mcfunction index d6c73ee374..390088285c 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/.mcfunction @@ -17,11 +17,11 @@ execute if entity @s[scores={97.MotionCount=60..}] run function asset:mob/0331.aurora_sorcerer/tick/backstep # スコア制御 - scoreboard players add @s 97.Skill 1 + scoreboard players add @s General.Mob.Tick 1 execute if entity @s[scores={97.MotionCT=1..}] run scoreboard players remove @s 97.MotionCT 1 # ノクバ耐性を最大にする - execute if entity @s[scores={97.Skill=0}] run attribute @s generic.knockback_resistance base set 10 + execute if entity @s[scores={General.Mob.Tick=0}] run attribute @s generic.knockback_resistance base set 10 # スキル実行 - execute if entity @s[scores={97.Skill=0..}] run function asset:mob/0331.aurora_sorcerer/tick/2.shoot + execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0331.aurora_sorcerer/tick/shoot diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/2.shoot.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/2.shoot.mcfunction deleted file mode 100644 index 554feecf0f..0000000000 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/2.shoot.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:mob/0331.aurora_sorcerer/tick/2.shoot -# -# オーロラ弾発射時の処理 -# -# @within function asset:mob/0331.aurora_sorcerer/tick/ - -# 鈍足 - effect give @s slowness 1 4 true - -# 予備動作 - execute if entity @s[scores={97.Skill=1..3}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle1 - execute if entity @s[scores={97.Skill=4..6}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle2 - execute if entity @s[scores={97.Skill=7..9}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle3 - execute if entity @s[scores={97.Skill=1..9}] run playsound block.beacon.activate hostile @a ~ ~ ~ 0.7 1.9 0 - -# 召喚 - execute if entity @s[scores={97.Skill=10}] run data modify storage api: Argument.ID set value 332 - execute if entity @s[scores={97.Skill=10}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function api:mob/summon - -# リセット - execute if entity @s[scores={97.Skill=25..}] run function asset:mob/0331.aurora_sorcerer/tick/reset diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/reset.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/reset.mcfunction index 498473db84..56c314158a 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/reset.mcfunction @@ -2,9 +2,9 @@ # # リセット処理 # -# @within function asset:mob/0331.aurora_sorcerer/tick/2.shoot +# @within function asset:mob/0331.aurora_sorcerer/tick/shoot # リセット - scoreboard players set @s 97.Skill -60 + scoreboard players set @s General.Mob.Tick -60 attribute @s generic.knockback_resistance base set 0 effect clear @s slowness diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/shoot.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/shoot.mcfunction new file mode 100644 index 0000000000..e68b52a1c1 --- /dev/null +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/shoot.mcfunction @@ -0,0 +1,20 @@ +#> asset:mob/0331.aurora_sorcerer/tick/shoot +# +# オーロラ弾発射時の処理 +# +# @within function asset:mob/0331.aurora_sorcerer/tick/ + +# 鈍足 + effect give @s slowness 1 4 true + +# 予備動作 + execute if entity @s[scores={General.Mob.Tick=1..3}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle1 + execute if entity @s[scores={General.Mob.Tick=4..6}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle2 + execute if entity @s[scores={General.Mob.Tick=7..9}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 run function asset:mob/0331.aurora_sorcerer/tick/vfx/circle3 + execute if entity @s[scores={General.Mob.Tick=1..9}] run playsound block.beacon.activate hostile @a ~ ~ ~ 0.7 1.9 0 + +# 召喚 + execute if entity @s[scores={General.Mob.Tick=10}] anchored eyes facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^0.4 summon marker run function asset:mob/0331.aurora_sorcerer/tick/summon + +# リセット + execute if entity @s[scores={General.Mob.Tick=25..}] run function asset:mob/0331.aurora_sorcerer/tick/reset diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction new file mode 100644 index 0000000000..a3d84fad52 --- /dev/null +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction @@ -0,0 +1,25 @@ +#> asset:mob/0331.aurora_sorcerer/tick/summon +# +# 弾を召喚する +# +# @within function asset:mob/0331.aurora_sorcerer/tick/shoot + +# 最寄りのプレイヤーの方を見る + tp @s ~ ~ ~ facing entity @p eyes + +# (難易度値 * 2.5)をフィールドへ代入 + function api:global_vars/get_difficulty + execute store result storage api: Argument.FieldOverride.MPReducePer float 2.5 run data get storage api: Return.Difficulty + +# ハードなら強化設定をtrueに + execute if predicate api:global_vars/difficulty/min/hard run data modify storage api: Argument.FieldOverride.Enhanced set value true + +# 召喚 + data modify storage api: Argument.ID set value 2080 + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=skeleton,tag=this,distance=..3,limit=1] MobUUID + function api:object/summon + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle1.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle1.mcfunction index d33d981faa..119e3b2caf 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle1.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle1.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:mob/0331.aurora_sorcerer/tick/2.shoot +# @within function asset:mob/0331.aurora_sorcerer/tick/shoot # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwDsARgGwAct1jAtIwEycBmbALPzgBDNsJ4pSHAJwAGUrU6lpKHjwCsYAgDthAWwTJAYYoACSlrAxhGfQGck4FAHtC2iEk6MCKOG7gYHMAA3YWxCQ3AADyRZAigYgF8EghtSNEJ7REoAOk4CWwhrd0RYsDhsbDQYW0NKWVKMJ0KIQ1K0WwBRCqqajoBHQlDsKABlKx9yRB5QmqSAXSA_3 # 円 1 diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle2.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle2.mcfunction index 5e71cf4b8f..5793072633 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle2.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle2.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:mob/0331.aurora_sorcerer/tick/2.shoot +# @within function asset:mob/0331.aurora_sorcerer/tick/shoot # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwDsARgGwAct1jAtIwEycBmbALPzgBDNsJ4pSHAJwAGUrU6lpKHjwCsYAgDthAWwTJAYYoACSlrAxhGfQGck4FAHtC2iEk6MCKOG7gYHMAA3YWxCQ3AADyRZAigYgF8EghtSNEJ7RFkAOmkCWwhrdyyCOGxsNBhbQ0pZWLAMJ0KIQ3q0WwBRcsrqjoBHQlDsKABlKx9yRB5Q6qSAXSA_3 # 円 1 diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle3.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle3.mcfunction index 2e52c11ed9..721a28bfa8 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle3.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/vfx/circle3.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:mob/0331.aurora_sorcerer/tick/2.shoot +# @within function asset:mob/0331.aurora_sorcerer/tick/shoot # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwDsARgGwAct1jAtIwEycBmbALPzgBDNsJ4pSHAJwAGUrU6lpKHjwCsYAgDthAWwTJAYYoACSlrAxhGfQGck4FAHtC2iEk6MCKOG7gYHMAA3YWxCQ3AADyRZAigYgF8EghtSNEJ7RFkAOnoCWwhrdyyCOGxsNBhbQ0pZWLAMJ0KIQ3q0WwBRcsrqjoBHQlDsKABlKx9yRB5Q6qSAXSA_3 # 円 1 diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/init/.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/init/.mcfunction deleted file mode 100644 index d09974e3dc..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/init/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0332.aurora_missile/init/ -# -# Mob召喚時のInit処理 -# -# @within function asset:mob/alias/332/init - -# プレイヤーの方向を見る - tp @s ~ ~ ~ facing entity @p eyes diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/load.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/load.mcfunction deleted file mode 100644 index d8fd267c8e..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0332.aurora_missile/load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0332.aurora_missile/** - scoreboard objectives add 98.Tick dummy diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/register.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/register.mcfunction deleted file mode 100644 index 99e4156768..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/register.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:mob/0332.aurora_missile/register -# -# Mobのデータを指定 -# -# @within function asset:mob/alias/332/register - -# 継承 (int) (オプション) - # data modify storage asset:mob Extends append value - # function asset:mob/extends - -# 他のモブに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:mob ExtendsSafe set value true -# ID (int) - data modify storage asset:mob ID set value 332 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Projectile" -# 干渉可能か否か (boolean) - data modify storage asset:mob Interferable set value false -# 名前 (TextComponentString) (オプション) - data modify storage asset:mob Name set from entity @s CustomName - -# フィールド - # data modify storage asset:mob Field set value {} diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/summon/.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/summon/.mcfunction deleted file mode 100644 index 7e16ed6b19..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/summon/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0332.aurora_missile/summon/ -# -# Mob召喚処理の呼び出し時に実行されるfunction -# -# @within asset:mob/alias/332/summon - -# 元となるMobを召喚する - summon marker ~ ~ ~ {Tags:["MobInit"]} diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/summon/debug.mcfunction deleted file mode 100644 index 6b9f46f682..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0332.aurora_missile/summon/debug -# -# モブの動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# モブを召喚 - data modify storage api: Argument.ID set value 332 - function api:mob/summon diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction deleted file mode 100644 index 3c244e6b68..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:mob/0332.aurora_missile/tick/ -# -# Mobのtick時の処理 -# -# @within function asset:mob/alias/332/tick - -# スコア - scoreboard players add @s 98.Tick 1 - -# ノーマル以下 - execute if predicate api:global_vars/difficulty/max/normal run function asset:mob/0332.aurora_missile/tick/2.normal - -# ハード以上 - execute if predicate api:global_vars/difficulty/min/hard run function asset:mob/0332.aurora_missile/tick/3.hard diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/2.normal.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/2.normal.mcfunction deleted file mode 100644 index 2b2e717046..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/2.normal.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:mob/0332.aurora_missile/tick/2.normal -# -# ノーマル以下のtick処理 -# -# @within function asset:mob/0332.aurora_missile/tick/ - -# 演出 - execute if entity @s[scores={98.Tick=..19}] run particle dust_color_transition 0 0.408 0.361 1 0 0.114 0.478 ~ ~ ~ 0 0 0 0 3 normal @a - execute if entity @s[scores={98.Tick=20..}] run particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Temp Temporary = @s 98.Tick - scoreboard players operation $Temp Temporary %= $4 Const - execute if score $Temp Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Temp Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={98.Tick=..20}] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.35 ~ ~ - -# それ以降は前進する - execute if entity @s[scores={98.Tick=21..}] run tp @s ^ ^ ^0.5 - -# 誘導状態でヒットした場合消滅 - execute if entity @s[scores={98.Tick=..19}] unless block ^ ^ ^0.5 #lib:no_collision run kill @s - execute if entity @s[scores={98.Tick=..19}] positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,dx=0] run kill @s - -# 直進状態でブロックかプレイヤーにヒットで爆発する - execute if entity @s[scores={98.Tick=20..}] unless block ^ ^ ^0.5 #lib:no_collision run function asset:mob/0332.aurora_missile/tick/4.hit - execute if entity @s[scores={98.Tick=20..}] positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,dx=0] run function asset:mob/0332.aurora_missile/tick/4.hit - -# 消滅 - execute if entity @s[scores={98.Tick=50..}] run kill @s diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/3.hard.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/3.hard.mcfunction deleted file mode 100644 index 4c794b0635..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/3.hard.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -#> asset:mob/0332.aurora_missile/tick/3.hard -# -# ハード以上でのtick処理 -# -# @within function asset:mob/0332.aurora_missile/tick/ - -# 演出 - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Temp Temporary = @s 98.Tick - scoreboard players operation $Temp Temporary %= $4 Const - execute if score $Temp Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Temp Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={98.Tick=..20}] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.7 ~ ~ - -# それ以降は前進する - execute if entity @s[scores={98.Tick=21..}] run tp @s ^ ^ ^1 - -# ブロックかプレイヤーにヒットで爆発する - execute unless block ^ ^ ^0.5 #lib:no_collision run function asset:mob/0332.aurora_missile/tick/4.hit - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,dx=0] run function asset:mob/0332.aurora_missile/tick/4.hit - -# 消滅 - execute if entity @s[scores={98.Tick=50..}] run kill @s diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/4.hit.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/4.hit.mcfunction deleted file mode 100644 index 8d85b36de7..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/4.hit.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -#> asset:mob/0332.aurora_missile/tick/4.hit -# -# ヒット時の処理 -# -# @within function -# asset:mob/0332.aurora_missile/tick/2.normal -# asset:mob/0332.aurora_missile/tick/3.hard - -# 演出 - execute if predicate api:global_vars/difficulty/max/normal rotated ~ 0 positioned ~ ~0.3 ~ run function asset:mob/0332.aurora_missile/tick/vfx/1 - execute if predicate api:global_vars/difficulty/min/hard rotated ~ 0 positioned ~ ~0.3 ~ run function asset:mob/0332.aurora_missile/tick/vfx/2 - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 - playsound entity.evoker.prepare_summon hostile @a ~ ~ ~ 0.8 1.5 0 - -# ダメージ -# ハード以上で範囲拡大 - data modify storage api: Argument.Damage set value 32f - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.ElementType set value "Thunder" - data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによってオーロラの魔法の中に消えた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって空の塵になった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - function api:damage/modifier - execute if predicate api:global_vars/difficulty/max/normal as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function api:damage/ - execute if predicate api:global_vars/difficulty/min/hard as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function api:damage/ - function api:damage/reset - -# 各プレイヤーのMPを減らす -# ハード以上で範囲拡大 - execute if predicate api:global_vars/difficulty/max/normal as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function asset:mob/0332.aurora_missile/tick/5.mp_reduce - execute if predicate api:global_vars/difficulty/min/hard as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function asset:mob/0332.aurora_missile/tick/5.mp_reduce - -# 消滅 - kill @s diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/5.mp_reduce.mcfunction b/Asset/data/asset/functions/mob/0332.aurora_missile/tick/5.mp_reduce.mcfunction deleted file mode 100644 index 301153d986..0000000000 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/5.mp_reduce.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#> asset:mob/0332.aurora_missile/tick/5.mp_reduce -# -# 実行プレイヤーのMPを減らす -# -# @within function asset:mob/0332.aurora_missile/tick/4.hit - -#> Private -# @private - #declare score_holder $MPReduce MP減少量 - #declare score_holder $Difficulty 難易度値 - -# MPを割合で減らす -# MP減少量 = (最大MPの2.5% * Effectのスタック数) - -# 対象の最大MPの2.5%の100倍を取得 - function api:mp/get_max - execute store result score $MPReduce Temporary run data get storage api: Return.MaxMP 2.5 - -# 難易度値を取得 - function api:global_vars/get_difficulty - execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty - -# 最大MPの(2.5 x 難易度値)%分MPを減少させる - execute store result storage api: Argument.Fluctuation float -0.01 run scoreboard players operation $MPReduce Temporary *= $Difficulty Temporary - function api:mp/fluctuation - -# リセット - scoreboard players reset $MPReduce Temporary - scoreboard players reset $Difficulty Temporary diff --git a/Asset/data/asset/functions/mob/alias/332/init.mcfunction b/Asset/data/asset/functions/mob/alias/332/init.mcfunction deleted file mode 100644 index 5598a88dc2..0000000000 --- a/Asset/data/asset/functions/mob/alias/332/init.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/332/init -# @within asset_manager:mob/init/init.m - -function asset:mob/0332.aurora_missile/init/ diff --git a/Asset/data/asset/functions/mob/alias/332/register.mcfunction b/Asset/data/asset/functions/mob/alias/332/register.mcfunction deleted file mode 100644 index 223e6b96fa..0000000000 --- a/Asset/data/asset/functions/mob/alias/332/register.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/332/register -# @within asset_manager:mob/register/register.m - -function asset:mob/0332.aurora_missile/register diff --git a/Asset/data/asset/functions/mob/alias/332/summon.mcfunction b/Asset/data/asset/functions/mob/alias/332/summon.mcfunction deleted file mode 100644 index b73cf96f30..0000000000 --- a/Asset/data/asset/functions/mob/alias/332/summon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/332/summon -# @within asset_manager:mob/summon/summon.m - -function asset:mob/0332.aurora_missile/summon/ diff --git a/Asset/data/asset/functions/mob/alias/332/tick.mcfunction b/Asset/data/asset/functions/mob/alias/332/tick.mcfunction deleted file mode 100644 index c0cdd82f01..0000000000 --- a/Asset/data/asset/functions/mob/alias/332/tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> asset:mob/alias/332/tick -# @within asset_manager:mob/tick/tick.m - -function asset:mob/0332.aurora_missile/tick/ diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction new file mode 100644 index 0000000000..ab99d446cd --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2080.aurora_missile/_index.d +# @private + +#> tag +# @within function asset:object/2080.aurora_missile/** + #declare score_holder $Interval + #declare tag 2080.Enhanced + #declare tag 2080.AlreadyHit diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..ed53f7722f --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2080.aurora_missile/detect_hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2080/detect_hit_block + +# 判定 + execute if entity @s[tag=!2080.Enhanced] unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=2080.Enhanced] unless block ^ ^ ^0.7 #lib:no_collision run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction new file mode 100644 index 0000000000..d469ec68e6 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/2080.aurora_missile/hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2080/hit_block + +# Enhanced:trueではないかつ、スコアが一定値以下の場合はkillメソッドとは別で消滅する + execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=..19}] run kill @s + +# Enhanced:trueではなかつ、スコアが一定値以上の場合はkillメソッド呼び出し + execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=20..}] run function asset:object/call.m {method:kill} + +# Enhanced:trueなら問答無用でkillメソッド呼び出し + execute if data storage asset:context this{Enhanced:true} run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction new file mode 100644 index 0000000000..8dbaf4ba2f --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/2080.aurora_missile/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2080/init + +# Enhanced:trueならTagを付与 + execute if data storage asset:context this{Enhanced:true} run tag @s add 2080.Enhanced + +# スピード設定 + data modify storage asset:context this.Speed set value 1 + data modify storage asset:context this.Range set value 50 +# Enhancedタグがあるか否かでMovePerStepを変える + execute if entity @s[tag=!2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.35 + execute if entity @s[tag=2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.5 + +# スーパーメソッド呼び出し + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/.mcfunction new file mode 100644 index 0000000000..f23181ec7d --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/.mcfunction @@ -0,0 +1,38 @@ +#> asset:object/2080.aurora_missile/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2080/kill + +# 実行済みならreturn + execute if entity @s[tag=2080.AlreadyHit] run return 0 + +# Tagを付与 + tag @s add 2080.AlreadyHit + +# 演出 + execute if entity @s[tag=!2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/normal + execute if entity @s[tag=2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/enhanced + particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 + playsound entity.evoker.prepare_summon hostile @a ~ ~ ~ 0.8 1.5 0 + +# ダメージ +# Enhancedタグがによって範囲が変わる + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Thunder" + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによってオーロラの魔法の中に消えた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって空の塵になった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID + function api:damage/modifier_manual + execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function api:damage/ + execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function api:damage/ + function api:damage/reset + +# 各プレイヤーのMPを減らす +# Enhancedによって範囲が変わる + execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function asset:object/2080.aurora_missile/kill/mp_reduce + execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function asset:object/2080.aurora_missile/kill/mp_reduce + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/mp_reduce.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/mp_reduce.mcfunction new file mode 100644 index 0000000000..1c158823fe --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/mp_reduce.mcfunction @@ -0,0 +1,25 @@ +#> asset:object/2080.aurora_missile/kill/mp_reduce +# +# MPを割合で減らす +# +# @within function asset:object/2080.aurora_missile/kill/ + +#> Private +# @private + #declare score_holder $MaxMP + #declare score_holder $ReducePer + +# 対象の最大MPを取得 + function api:mp/get_max + execute store result score $MaxMP Temporary run data get storage api: Return.MaxMP + +# フィールドから減少割合を取得 + execute store result score $ReducePer Temporary run data get storage asset:context this.MPReducePer 10 + +# ($ReducePer)%分MPを減少させる + execute store result storage api: Argument.Fluctuation double -0.001 run scoreboard players operation $MaxMP Temporary *= $ReducePer Temporary + function api:mp/fluctuation + +# リセット + scoreboard players reset $MaxMP Temporary + scoreboard players reset $ReducePer Temporary diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/2.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction similarity index 98% rename from Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/2.mcfunction rename to Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction index 7a486d77fc..fc022e03a6 100644 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/2.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0332.aurora_missile/tick/vfx/2 +#> asset:object/2080.aurora_missile/kill/vfx/enhanced # # # -# @within function asset:mob/0332.aurora_missile/tick/4.hit +# @within function asset:object/2080.aurora_missile/kill/ # 円 1 particle dust 0.000 1.000 0.949 3 ^0 ^ ^-3 0 0 0 0 1 diff --git a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/1.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction similarity index 97% rename from Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/1.mcfunction rename to Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction index 5c7bbcb1d5..f141f07d29 100644 --- a/Asset/data/asset/functions/mob/0332.aurora_missile/tick/vfx/1.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0332.aurora_missile/tick/vfx/1 +#> asset:object/2080.aurora_missile/kill/vfx/normal # # # -# @within function asset:mob/0332.aurora_missile/tick/4.hit +# @within function asset:object/2080.aurora_missile/kill/ # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGwCGArCtQMwCcALALTXMBMADO61oBGSuwBGAdgBmHXqXrdatZrV5ihYAgDtqAWwTJAYYoACDQRjUMegM5JwKAPaEtEJK14EUcF3Ax2wAG7U2IQG4AAeSB5gUFEAvnEEVqRohLaIjATWEJauiNFw2NhoMNYGQrzRGA45EAbRaNYAokUlZU0AjoTB2FAAyhZe5IhSwWUJeODQ8BToWLiaRCTDVHAAHKTczMxSAmKMu6w7tOLUpGLscNyMa6xrEtxCErTUizr6FCbcixZWuun2JwuJCMbiebx1PyIcBBEJhMCRfIEWL5CZgZKpdJgsDZXJRAiFYqlcqVJI1ah1fFgRotIntLo9fqDODDUbYcaJKawAyoTA4fBLMizFASRhyZTsFSUZgCOBCDjMRiMITsFC8MXyRgoVRwKRvPQ8kyMH6WGz+RzOPLcVjgnxQmHBUL+RHRFG8NEYtJIIRZHIYPIFVrE72k9HkylI6nNIP07pFJnUIZINkcyaQbmzPkLAjEIXIMRyq4SCQXIQqC6sOAscS0biiW5y7hrRikK6MCT6j5GYysE1-AGoIF5ES2yH+WFO6EIqluj1nTFRAB0tF9eMjhLaJKq4fqBBpMbgnTjvQGiZZybGcASAF0gA_3 # 円 2 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction new file mode 100644 index 0000000000..8615ae3b55 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2080.aurora_missile/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2080/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2080 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/summon/.m.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/summon/.m.mcfunction new file mode 100644 index 0000000000..2ef26c9d42 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/summon/.m.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2080.aurora_missile/summon/.m +# +# マクロを使って召喚する +# +# @input args: +# Rotation : double @ 2 +# @within function asset:object/2080.aurora_missile/summon/ + +# 元となるEntityを召喚する + $summon marker ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation)} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/summon/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/summon/.mcfunction new file mode 100644 index 0000000000..da283b60d2 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2080.aurora_missile/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2080/summon + +# 元となるEntityを召喚する + function asset:object/2080.aurora_missile/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/summon/debug.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/summon/debug.mcfunction new file mode 100644 index 0000000000..c093cfd936 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2080.aurora_missile/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2080 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction new file mode 100644 index 0000000000..048fa0fd2b --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2080.aurora_missile/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2080/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 通常 + execute if entity @s[tag=!2080.Enhanced] run function asset:object/2080.aurora_missile/tick/normal + +# 強化版 + execute if entity @s[tag=2080.Enhanced] run function asset:object/2080.aurora_missile/tick/enhanced + +# スーパーメソッド呼び出し + execute at @s run function asset:object/super.tick + +# 消滅処理 + kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction new file mode 100644 index 0000000000..7d16c4b919 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/2080.aurora_missile/tick/enhanced +# +# +# +# @within function asset:object/2080.aurora_missile/tick/ + +# 演出 + particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a + +# 一定間隔でplaysound + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 + scoreboard players reset $Interval Temporary + +# 最初の20tickは誘導弾になる + execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ + +# それ以降は前進する + execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.7 + +# 消滅 + execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction new file mode 100644 index 0000000000..703e36fe50 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/2080.aurora_missile/tick/normal +# +# +# +# @within function asset:object/2080.aurora_missile/tick/ + +# 演出 + execute if entity @s[scores={General.Object.Tick=..19}] run particle dust_color_transition 0 0.408 0.361 1 0 0.114 0.478 ~ ~ ~ 0 0 0 0 3 normal @a + execute if entity @s[scores={General.Object.Tick=20..}] run particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a + +# 一定間隔でplaysound + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 + scoreboard players reset $Interval Temporary + +# 最初の20tickは誘導弾になる + execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ + +# それ以降は前進する + execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.5 + +# 消滅 + execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/alias/2080/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/2080/detect_hit_block.mcfunction new file mode 100644 index 0000000000..6b9386baf6 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2080.aurora_missile/detect_hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction b/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction new file mode 100644 index 0000000000..3cda717118 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2080.aurora_missile/hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/init.mcfunction b/Asset/data/asset/functions/object/alias/2080/init.mcfunction new file mode 100644 index 0000000000..7dcfe2584b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2080.aurora_missile/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/kill.mcfunction b/Asset/data/asset/functions/object/alias/2080/kill.mcfunction new file mode 100644 index 0000000000..3b1a7c29eb --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2080.aurora_missile/kill/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/register.mcfunction b/Asset/data/asset/functions/object/alias/2080/register.mcfunction new file mode 100644 index 0000000000..68a8c7d360 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2080.aurora_missile/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/summon.mcfunction b/Asset/data/asset/functions/object/alias/2080/summon.mcfunction new file mode 100644 index 0000000000..065fd6b327 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2080.aurora_missile/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/tick.mcfunction b/Asset/data/asset/functions/object/alias/2080/tick.mcfunction new file mode 100644 index 0000000000..964d9a6b98 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2080/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2080/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2080.aurora_missile/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index f890fe9bf4..90704e74e0 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -20,7 +20,6 @@ "asset:mob/0060.self_destructor/0.load", "asset:mob/0055.hetukedah/0.load", "asset:mob/0046.clock_of_despair/0.load", - "asset:mob/0332.aurora_missile/load", "asset:mob/0331.aurora_sorcerer/load", "asset:mob/0330.aurora_reaper/0.load", "asset:mob/0176.killer_bee/0.load", From 9191ecd8db61bf3a46a99bd1ce751e3236df9a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sun, 24 Nov 2024 18:45:39 +0900 Subject: [PATCH 56/74] =?UTF-8?q?:bento:=20[Effect101]=20=E4=B8=8E?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E4=BD=8E=E4=B8=8B=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=95=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0101.attack_base_debuff/_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/re-given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../0101.attack_base_debuff/end/.mcfunction | 8 +++++ .../0101.attack_base_debuff/given/.mcfunction | 8 +++++ .../modifier/add.mcfunction | 8 +++++ .../modifier/remove.mcfunction | 6 ++++ .../re-given/.mcfunction | 10 ++++++ .../register.mcfunction | 35 +++++++++++++++++++ .../remove/.mcfunction | 8 +++++ .../data/asset/tags/functions/effect/end.json | 6 ++-- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 2 +- .../asset/tags/functions/effect/remove.json | 6 ++-- .../asset/tags/functions/effect/tick.json | 3 +- 18 files changed, 130 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0101.attack_base_debuff/remove/.mcfunction diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/end.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/end.mcfunction new file mode 100644 index 0000000000..6f64634881 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0101.attack_base_debuff/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:101} run function asset:effect/0101.attack_base_debuff/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/given.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/given.mcfunction new file mode 100644 index 0000000000..35e70361f9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0101.attack_base_debuff/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:101} run function asset:effect/0101.attack_base_debuff/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/re-given.mcfunction new file mode 100644 index 0000000000..0efb0efb77 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0101.attack_base_debuff/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:101} run function asset:effect/0101.attack_base_debuff/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/register.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/register.mcfunction new file mode 100644 index 0000000000..39c23fd0f8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0101.attack_base_debuff/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:101} run function asset:effect/0101.attack_base_debuff/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/remove.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/remove.mcfunction new file mode 100644 index 0000000000..ce062a82f3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0101.attack_base_debuff/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:101} run function asset:effect/0101.attack_base_debuff/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/end/.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/end/.mcfunction new file mode 100644 index 0000000000..b9ea35da73 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0101.attack_base_debuff/end/ +# +# +# +# @within function asset:effect/0101.attack_base_debuff/_/end + +# 補正をリセット + function asset:effect/0101.attack_base_debuff/modifier/remove diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/given/.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/given/.mcfunction new file mode 100644 index 0000000000..a62e333643 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0101.attack_base_debuff/given/ +# +# +# +# @within function asset:effect/0101.attack_base_debuff/_/given + +# 補正を付与 + function asset:effect/0101.attack_base_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/add.mcfunction new file mode 100644 index 0000000000..7ae2ec01c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/add.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0101.attack_base_debuff/modifier/add +# @within function asset:effect/0101.attack_base_debuff/*/* + +# N*5%の基礎攻撃力低下 + data modify storage api: Argument.UUID set value [I;1,3,101,0] + execute store result storage api: Argument.Amount double -0.05 run data get storage asset:context Stack 1 + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/attack/base/add diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/remove.mcfunction new file mode 100644 index 0000000000..441d6fefb1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/modifier/remove.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0101.attack_base_debuff/modifier/remove +# @within function asset:effect/0101.attack_base_debuff/*/* + +# 補正を削除 + data modify storage api: Argument.UUID set value [I;1,3,101,0] + function api:modifier/attack/base/remove diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/re-given/.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/re-given/.mcfunction new file mode 100644 index 0000000000..77fcec3325 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/re-given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0101.attack_base_debuff/re-given/ +# +# +# +# @within function asset:effect/0101.attack_base_debuff/_/re-given + +# 補正をリセット + function asset:effect/0101.attack_base_debuff/modifier/remove +# 補正を付与 + function asset:effect/0101.attack_base_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction new file mode 100644 index 0000000000..2d3d62c125 --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0101.attack_base_debuff/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0101.attack_base_debuff/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 101 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"与ダメージ低下"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"与ダメージが低下する。"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 100 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/remove/.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/remove/.mcfunction new file mode 100644 index 0000000000..ecad0069be --- /dev/null +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0101.attack_base_debuff/remove/ +# +# +# +# @within function asset:effect/0101.attack_base_debuff/_/remove + +# 補正をリセット + function asset:effect/0101.attack_base_debuff/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index c297135d22..b84a4f21cb 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -38,7 +38,7 @@ "asset:effect/0261.gale_blessing/_/end", "asset:effect/0210.fading_speed/_/end", "asset:effect/0211.fading_speed/_/end", - "asset:effect/0203.secret_meat/_/end", - "asset:effect/0201.magic_shield/_/end" + "asset:effect/0201.magic_shield/_/end", + "asset:effect/0101.attack_base_debuff/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index b7377cc709..ca792631bf 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -35,6 +35,7 @@ "asset:effect/0211.fading_speed/_/given", "asset:effect/0210.fading_speed/_/given", "asset:effect/0203.secret_meat/_/given", - "asset:effect/0201.magic_shield/_/given" + "asset:effect/0201.magic_shield/_/given", + "asset:effect/0101.attack_base_debuff/_/given" ] } \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index ce2507c85d..5686466c53 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -13,6 +13,7 @@ "asset:effect/0261.gale_blessing/_/re-given", "asset:effect/0211.fading_speed/_/re-given", "asset:effect/0210.fading_speed/_/re-given", - "asset:effect/0201.magic_shield/_/re-given" + "asset:effect/0201.magic_shield/_/re-given", + "asset:effect/0101.attack_base_debuff/_/re-given" ] } \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 242e5707b0..784aecbd4d 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -43,6 +43,6 @@ "asset:effect/0261.gale_blessing/_/register", "asset:effect/0210.fading_speed/_/register", "asset:effect/0211.fading_speed/_/register", - "asset:effect/0203.secret_meat/_/register" + "asset:effect/0101.attack_base_debuff/_/register" ] } diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 9cb0ef5044..e028e574bb 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -36,7 +36,7 @@ "asset:effect/0261.gale_blessing/_/remove", "asset:effect/0210.fading_speed/_/remove", "asset:effect/0211.fading_speed/_/remove", - "asset:effect/0203.secret_meat/_/remove", - "asset:effect/0201.magic_shield/_/remove" + "asset:effect/0201.magic_shield/_/remove", + "asset:effect/0101.attack_base_debuff/_/remove" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 83900f2405..52c80b5fe2 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -33,7 +33,6 @@ "asset:effect/0203.secret_meat/_/tick", "asset:effect/0619.hand_of_destruction/_/tick", "asset:effect/0261.gale_blessing/_/tick", - "asset:effect/0210.fading_speed/_/tick", - "asset:effect/0203.secret_meat/_/tick" + "asset:effect/0210.fading_speed/_/tick" ] } From a6bb7cae778d8a29accf4f3ea1ed63f9c2ed1303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sun, 24 Nov 2024 18:56:31 +0900 Subject: [PATCH 57/74] =?UTF-8?q?:bento:=20[Effect107]=20=E8=A2=AB?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E4=B8=8A=E6=98=87=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=95=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0107.defense_base_debuff/_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/re-given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../0107.defense_base_debuff/end/.mcfunction | 8 +++++ .../given/.mcfunction | 8 +++++ .../modifier/add.mcfunction | 8 +++++ .../modifier/remove.mcfunction | 6 ++++ .../re-given/.mcfunction | 10 ++++++ .../register.mcfunction | 35 +++++++++++++++++++ .../remove/.mcfunction | 8 +++++ .../data/asset/tags/functions/effect/end.json | 7 ++-- .../asset/tags/functions/effect/given.json | 6 ++-- .../asset/tags/functions/effect/re-given.json | 6 ++-- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 7 ++-- 17 files changed, 136 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0107.defense_base_debuff/remove/.mcfunction diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/end.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/end.mcfunction new file mode 100644 index 0000000000..c6c0fa7e18 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0107.defense_base_debuff/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:107} run function asset:effect/0107.defense_base_debuff/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/given.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/given.mcfunction new file mode 100644 index 0000000000..a4ae54542d --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0107.defense_base_debuff/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:107} run function asset:effect/0107.defense_base_debuff/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/re-given.mcfunction new file mode 100644 index 0000000000..717e881c9e --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0107.defense_base_debuff/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:107} run function asset:effect/0107.defense_base_debuff/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/register.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/register.mcfunction new file mode 100644 index 0000000000..a16b4ee136 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0107.defense_base_debuff/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:107} run function asset:effect/0107.defense_base_debuff/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/remove.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/remove.mcfunction new file mode 100644 index 0000000000..a40daab818 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0107.defense_base_debuff/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:107} run function asset:effect/0107.defense_base_debuff/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/end/.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/end/.mcfunction new file mode 100644 index 0000000000..4bea7926dc --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0107.defense_base_debuff/end/ +# +# +# +# @within function asset:effect/0107.defense_base_debuff/_/end + +# 補正をリセット + function asset:effect/0107.defense_base_debuff/modifier/remove diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/given/.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/given/.mcfunction new file mode 100644 index 0000000000..61f0ba38c9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0107.defense_base_debuff/given/ +# +# +# +# @within function asset:effect/0107.defense_base_debuff/_/given + +# 補正を付与 + function asset:effect/0107.defense_base_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/add.mcfunction new file mode 100644 index 0000000000..ea54ce0686 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/add.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0107.defense_base_debuff/modifier/add +# @within function asset:effect/0107.defense_base_debuff/*/* + +# N*5%の基礎耐性減少 + data modify storage api: Argument.UUID set value [I;1,3,107,0] + execute store result storage api: Argument.Amount double -0.05 run data get storage asset:context Stack 1 + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/remove.mcfunction new file mode 100644 index 0000000000..7c879d02d2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/modifier/remove.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0107.defense_base_debuff/modifier/remove +# @within function asset:effect/0107.defense_base_debuff/*/* + +# 補正を削除 + data modify storage api: Argument.UUID set value [I;1,3,107,0] + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/re-given/.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/re-given/.mcfunction new file mode 100644 index 0000000000..d97c873999 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/re-given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0107.defense_base_debuff/re-given/ +# +# +# +# @within function asset:effect/0107.defense_base_debuff/_/re-given + +# 補正をリセット + function asset:effect/0107.defense_base_debuff/modifier/remove +# 補正を付与 + function asset:effect/0107.defense_base_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/register.mcfunction new file mode 100644 index 0000000000..e58fe33210 --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0107.defense_base_debuff/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0107.defense_base_debuff/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 107 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"被ダメージ上昇"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"被ダメージが上昇する"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 100 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0107.defense_base_debuff/remove/.mcfunction b/Asset/data/asset/functions/effect/0107.defense_base_debuff/remove/.mcfunction new file mode 100644 index 0000000000..076718246f --- /dev/null +++ b/Asset/data/asset/functions/effect/0107.defense_base_debuff/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0107.defense_base_debuff/remove/ +# +# +# +# @within function asset:effect/0107.defense_base_debuff/_/remove + +# 補正をリセット + function asset:effect/0107.defense_base_debuff/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index c297135d22..41edd30048 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -38,7 +38,8 @@ "asset:effect/0261.gale_blessing/_/end", "asset:effect/0210.fading_speed/_/end", "asset:effect/0211.fading_speed/_/end", - "asset:effect/0203.secret_meat/_/end", - "asset:effect/0201.magic_shield/_/end" + "asset:effect/0201.magic_shield/_/end", + "asset:effect/0101.attack_base_debuff/_/end", + "asset:effect/0107.defense_base_debuff/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index b7377cc709..12d6062e0e 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -35,6 +35,8 @@ "asset:effect/0211.fading_speed/_/given", "asset:effect/0210.fading_speed/_/given", "asset:effect/0203.secret_meat/_/given", - "asset:effect/0201.magic_shield/_/given" + "asset:effect/0201.magic_shield/_/given", + "asset:effect/0101.attack_base_debuff/_/given", + "asset:effect/0107.defense_base_debuff/_/given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index ce2507c85d..19a973864d 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -13,6 +13,8 @@ "asset:effect/0261.gale_blessing/_/re-given", "asset:effect/0211.fading_speed/_/re-given", "asset:effect/0210.fading_speed/_/re-given", - "asset:effect/0201.magic_shield/_/re-given" + "asset:effect/0201.magic_shield/_/re-given", + "asset:effect/0101.attack_base_debuff/_/re-given", + "asset:effect/0107.defense_base_debuff/_/re-given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 242e5707b0..a767b77971 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -43,6 +43,7 @@ "asset:effect/0261.gale_blessing/_/register", "asset:effect/0210.fading_speed/_/register", "asset:effect/0211.fading_speed/_/register", - "asset:effect/0203.secret_meat/_/register" + "asset:effect/0101.attack_base_debuff/_/register", + "asset:effect/0107.defense_base_debuff/_/register" ] } diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 9cb0ef5044..99fc4f3b59 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -36,7 +36,8 @@ "asset:effect/0261.gale_blessing/_/remove", "asset:effect/0210.fading_speed/_/remove", "asset:effect/0211.fading_speed/_/remove", - "asset:effect/0203.secret_meat/_/remove", - "asset:effect/0201.magic_shield/_/remove" + "asset:effect/0201.magic_shield/_/remove", + "asset:effect/0101.attack_base_debuff/_/remove", + "asset:effect/0107.defense_base_debuff/_/remove" ] -} \ No newline at end of file +} From eae7353b43d8cfcfbd1733e1b7353a5d6c97ffdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sun, 24 Nov 2024 18:58:39 +0900 Subject: [PATCH 58/74] =?UTF-8?q?:adhesive=5Fbandage:=20=E6=8F=90=E6=A1=88?= =?UTF-8?q?=E3=81=AA=E3=81=A9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0101.attack_base_debuff/register.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction index 2d3d62c125..96148bb527 100644 --- a/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction @@ -11,11 +11,11 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"与ダメージ低下"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text":"与ダメージが低下する。"}'] + data modify storage asset:effect Description set value ['{"text":"与ダメージが低下する"}'] # 効果時間 (int) (default = API || error) # data modify storage asset:effect Duration set value # スタック (int) (default = API || 1) - data modify storage asset:effect Stack set value 1 + # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") # data modify storage asset:effect DurationOperation set value # スタックの操作方法 (default = API || "replace") From 38daee54cfaa5ff1cd1d0a525876edec589cbe61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 19:13:48 +0900 Subject: [PATCH 59/74] =?UTF-8?q?=F0=9F=A9=B9=20asset:temp=E3=81=A7?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E3=81=AA=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=8C=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#391)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0002.blessing/give/get_random_name.mcfunction | 3 ++- .../artifact/0137.aure_amrita/trigger/3.main.mcfunction | 2 +- .../artifact/0138.mystica_amrita/trigger/3.main.mcfunction | 2 +- .../artifact/0141.aure_soma/trigger/3.main.mcfunction | 2 +- .../artifact/0142.mystica_soma/trigger/3.main.mcfunction | 2 +- .../trigger/schedule/3.landing.mcfunction | 6 +++--- .../artifact/1048.thunder_storm/trigger/5.tick.mcfunction | 2 +- .../functions/object/2001.custom_effect/tick/.mcfunction | 4 ++-- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction index b08efca81b..35cd413e90 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction @@ -24,4 +24,5 @@ data modify storage asset:temp 02.Name set from storage lib: Array[-1] # リセット function lib:array/session/close - scoreboard players reset $CandidatesLength \ No newline at end of file + scoreboard players reset $CandidatesLength + data remove storage asset:temp 02 diff --git a/Asset/data/asset/functions/artifact/0137.aure_amrita/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0137.aure_amrita/trigger/3.main.mcfunction index 2586632431..9b7a0a4e41 100644 --- a/Asset/data/asset/functions/artifact/0137.aure_amrita/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0137.aure_amrita/trigger/3.main.mcfunction @@ -23,4 +23,4 @@ function lib:mp/fluctuation # リセット - data remove storage asset:temp 3T.Temp \ No newline at end of file + data remove storage asset:temp 3T diff --git a/Asset/data/asset/functions/artifact/0138.mystica_amrita/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0138.mystica_amrita/trigger/3.main.mcfunction index 227d0b3631..038982d7f7 100644 --- a/Asset/data/asset/functions/artifact/0138.mystica_amrita/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0138.mystica_amrita/trigger/3.main.mcfunction @@ -23,4 +23,4 @@ function lib:mp/fluctuation # リセット - data remove storage asset:temp 3U.Temp \ No newline at end of file + data remove storage asset:temp 3U diff --git a/Asset/data/asset/functions/artifact/0141.aure_soma/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0141.aure_soma/trigger/3.main.mcfunction index af6d196194..6399ec9cff 100644 --- a/Asset/data/asset/functions/artifact/0141.aure_soma/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0141.aure_soma/trigger/3.main.mcfunction @@ -31,4 +31,4 @@ # リセット function lib:heal/reset - data remove storage asset:temp 3X.Temp + data remove storage asset:temp 3X diff --git a/Asset/data/asset/functions/artifact/0142.mystica_soma/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0142.mystica_soma/trigger/3.main.mcfunction index 335a926a1d..c9191e1551 100644 --- a/Asset/data/asset/functions/artifact/0142.mystica_soma/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0142.mystica_soma/trigger/3.main.mcfunction @@ -27,4 +27,4 @@ # リセット function lib:heal/reset - data remove storage asset:temp 3Y.Temp + data remove storage asset:temp 3Y diff --git a/Asset/data/asset/functions/artifact/1045.mini_black_hole/trigger/schedule/3.landing.mcfunction b/Asset/data/asset/functions/artifact/1045.mini_black_hole/trigger/schedule/3.landing.mcfunction index bca15dcd40..809cd0ab95 100644 --- a/Asset/data/asset/functions/artifact/1045.mini_black_hole/trigger/schedule/3.landing.mcfunction +++ b/Asset/data/asset/functions/artifact/1045.mini_black_hole/trigger/schedule/3.landing.mcfunction @@ -22,7 +22,7 @@ scoreboard players operation $T1.LandingTick Temporary %= $4 Const execute store result storage asset:temp T1.Num float 0.1 run scoreboard players get @s T1.LandingTick execute if score $T1.LandingTick Temporary matches 0 run function asset:artifact/1045.mini_black_hole/trigger/schedule/3.1.search_mob.m with storage asset:temp T1 - data remove storage asset:temp T1.Num + data remove storage asset:temp T1 # ダメージ付与 # 第一属性 @@ -40,7 +40,7 @@ # 演出 execute store result storage asset:temp T1.Num int 1 run scoreboard players get @s T1.LandingTick function asset:artifact/1045.mini_black_hole/trigger/schedule/landing_vfx/m with storage asset:temp T1 - data remove storage asset:temp T1.Num + data remove storage asset:temp T1 # 音（着弾時） execute if score @s T1.LandingTick matches 1 run function asset:artifact/1045.mini_black_hole/trigger/schedule/3.2.landing_sound @@ -54,4 +54,4 @@ scoreboard players reset $T1.LandingTick Temporary tag @a[tag=T1.Owner] remove T1.Owner tag @e[tag=Enemy,tag=T1.Landing,distance=..8] remove T1.Landing - execute if score @s T1.LandingTick matches 80 run kill @s \ No newline at end of file + execute if score @s T1.LandingTick matches 80 run kill @s diff --git a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/5.tick.mcfunction b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/5.tick.mcfunction index baee84d181..25275976f4 100644 --- a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/5.tick.mcfunction +++ b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/5.tick.mcfunction @@ -11,7 +11,7 @@ # 演出 execute store result storage asset:temp T4.Num int 1 run scoreboard players get @s T4.Tick execute if score @s T4.Tick matches ..20 run function asset:artifact/1048.thunder_storm/trigger/vfx/m with storage asset:temp T4 - data remove storage asset:temp T4.Num + data remove storage asset:temp T4 # スコアが一定以上なら発動 execute if score @s T4.Tick matches 21.. run function asset:artifact/1048.thunder_storm/trigger/6.cast diff --git a/Asset/data/asset/functions/object/2001.custom_effect/tick/.mcfunction b/Asset/data/asset/functions/object/2001.custom_effect/tick/.mcfunction index 3a81a36bcf..cb535ff763 100644 --- a/Asset/data/asset/functions/object/2001.custom_effect/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2001.custom_effect/tick/.mcfunction @@ -18,7 +18,7 @@ execute unless data storage asset:temp 2001.Frame run kill @s # データを削除 - data remove storage asset:temp 2001.Frame - + data remove storage asset:temp 2001 + # 実装フラグを立てる data modify storage asset:object Implement set value true From ffb3f003e7c264bd74654bd94e7f306a0ef52cb7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 24 Nov 2024 10:47:16 +0000 Subject: [PATCH 60/74] Update Declares from ProjectTSB/TheSkyBlessing@859418ac4674b8cdc3c65fec49b0d53c5a259cf9 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 00e989af5f..3ac548af01 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -323,11 +323,11 @@ #declare loot_table player_manager:lost_item/give_all/name_to_textcomponent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/loot_tables/lost_item/give_all/name_to_textcomponent.json#L1 #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L126 #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L111 - #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L236 + #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L233 #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L168 #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L167 #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L132 - #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L182 + #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L179 #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L107 #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L131 #declare predicate api:area/is_breakable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/area/is_breakable.json#L1 @@ -1038,8 +1038,8 @@ #> declare # @within function asset:object/** -#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L187 +#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L184 #> declare # @within function asset:mob/** -#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L192 +#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L189 From 415ceab43b1808a6cec2cb79c3e787039fd40d54 Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sun, 24 Nov 2024 18:03:49 +0900 Subject: [PATCH 61/74] =?UTF-8?q?:construction:=20AbstractAngel=20?= =?UTF-8?q?=E3=81=AE=E3=83=99=E3=83=BC=E3=82=B9=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/2000.abstract_angel/register.mcfunction | 14 ++++++++++++++ .../functions/mob/alias/2000/register.mcfunction | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/register.mcfunction diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction new file mode 100644 index 0000000000..0fd94d5e16 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/2000.abstract_angel/register +# +# Mobのデータを指定 +# +# @within function asset:mob/alias/2000/register + +# 他のモブに継承されることを許可するか (boolean) (オプション) + data modify storage asset:mob ExtendsSafe set value true +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value true +# ID (int) + data modify storage asset:mob ID set value 2000 +# Type (string) Wikiを参照 + data modify storage asset:mob Type set value "Enemy.Boss" diff --git a/Asset/data/asset/functions/mob/alias/2000/register.mcfunction b/Asset/data/asset/functions/mob/alias/2000/register.mcfunction new file mode 100644 index 0000000000..79c2911692 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/register +# +# Mobのデータ指定処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/register.m + +# 元の登録処理を呼び出す + function asset:mob/2000.abstract_angel/register From 4bc2df18d3f2040f69228235ec1d4815c0d4fb3e Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sun, 24 Nov 2024 19:13:23 +0900 Subject: [PATCH 62/74] =?UTF-8?q?:sparkles:=20=E3=83=9C=E3=82=B9=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bossbar/add.m.mcfunction | 25 +++++++++++++++++++ .../bossbar/remove.m.mcfunction | 12 +++++++++ .../bossbar/update.m.mcfunction | 11 ++++++++ .../mob/2000.abstract_angel/death/.mcfunction | 12 +++++++++ .../mob/2000.abstract_angel/hurt/.mcfunction | 7 ++++++ .../mob/2000.abstract_angel/init/.mcfunction | 13 ++++++++++ .../2000.abstract_angel/register.mcfunction | 2 ++ .../2000.abstract_angel/remove/.mcfunction | 12 +++++++++ .../update_bossbar/.mcfunction | 12 +++++++++ .../functions/mob/alias/2000/death.mcfunction | 8 ++++++ .../functions/mob/alias/2000/hurt.mcfunction | 8 ++++++ .../functions/mob/alias/2000/init.mcfunction | 8 ++++++ .../mob/alias/2000/remove.mcfunction | 8 ++++++ .../mob/alias/2000/update_bossbar.mcfunction | 8 ++++++ Asset/data/asset/tags/functions/mob/load.json | 3 ++- 15 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/add.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/remove.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/update.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/death/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/hurt/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/init/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/remove/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/update_bossbar/.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/death.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/hurt.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/init.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/remove.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/update_bossbar.mcfunction diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/add.m.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/add.m.mcfunction new file mode 100644 index 0000000000..685b3da09b --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/add.m.mcfunction @@ -0,0 +1,25 @@ +#> asset:mob/2000.abstract_angel/bossbar/add.m +# +# +# @input args +# UUID: int +# Name: TextComponent +# @within function asset:mob/2000.abstract_angel/init/ + +#> Val +# @private +#declare score_holder $MaxHealth + +# ボスバーを作成する + $bossbar add asset:angel$(UUID) $(Name) +# 数値設定 + 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:angel$(UUID) value store result bossbar asset:angel$(UUID) max run scoreboard players get $MaxHealth Temporary +# 見た目設定 + $bossbar set asset:angel$(UUID) color pink + $bossbar set asset:angel$(UUID) style notched_10 +# ボスバーを表示する + $bossbar set asset:angel$(UUID) players @a +# リセット + scoreboard players reset $MaxHealth Temporary diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/remove.m.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/remove.m.mcfunction new file mode 100644 index 0000000000..93c08b84b7 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/remove.m.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/2000.abstract_angel/bossbar/remove.m +# +# +# +# @input args +# UUID: int +# @within function +# asset:mob/2000.abstract_angel/remove/ +# asset:mob/2000.abstract_angel/death/ + +# ボスバーを削除する + $bossbar remove asset:angel$(UUID) diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/update.m.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/update.m.mcfunction new file mode 100644 index 0000000000..c7e6a77220 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/bossbar/update.m.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/2000.abstract_angel/bossbar/update.m +# +# +# +# @input args +# UUID: int +# @within function asset:mob/2000.abstract_angel/update_bossbar/ + +# 数値設定 + function api:mob/get_health + $execute store result bossbar asset:angel$(UUID) value run data get storage api: Return.Health 100 diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/death/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/death/.mcfunction new file mode 100644 index 0000000000..3457112518 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/death/.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/2000.abstract_angel/death/ +# +# Mobの死亡時の処理 +# +# @within function asset:mob/alias/2000/death + +# Args 設定 + execute store result storage asset:temp Args.UUID int 1 run scoreboard players get @s MobUUID +# ボスバー作成 + function asset:mob/2000.abstract_angel/bossbar/remove.m with storage asset:temp Args +# リセット + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/hurt/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/hurt/.mcfunction new file mode 100644 index 0000000000..de2f5c7b74 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/hurt/.mcfunction @@ -0,0 +1,7 @@ +#> asset:mob/2000.abstract_angel/hurt/ +# +# Mobのダメージ時の処理 +# +# @within function asset:mob/alias/2000/hurt + +function asset:mob/call.m {method: "update_bossbar"} diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/init/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/init/.mcfunction new file mode 100644 index 0000000000..4fae1a7daf --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/init/.mcfunction @@ -0,0 +1,13 @@ +#> asset:mob/2000.abstract_angel/init/ +# +# Mobのinit時の処理 +# +# @within asset:mob/alias/2000/init + +# Args 設定 + data modify storage asset:temp Args.Name set from storage asset:context this.BossbarName + execute store result storage asset:temp Args.UUID int 1 run scoreboard players get @s MobUUID +# ボスバー作成 + function asset:mob/2000.abstract_angel/bossbar/add.m with storage asset:temp Args +# リセット + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction index 0fd94d5e16..969953c7ca 100644 --- a/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/register.mcfunction @@ -12,3 +12,5 @@ data modify storage asset:mob ID set value 2000 # Type (string) Wikiを参照 data modify storage asset:mob Type set value "Enemy.Boss" +# フィールド + data modify storage asset:mob Field.BossbarName set value '{"selector":"@s"}' diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/remove/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/remove/.mcfunction new file mode 100644 index 0000000000..7319c44d72 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/remove/.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/2000.abstract_angel/remove/ +# +# 天使が居なくなる際に実行される処理 +# +# @within asset:mob/alias/2000/remove + +# Args 設定 + execute store result storage asset:temp Args.UUID int 1 run scoreboard players get @s MobUUID +# ボスバー作成 + function asset:mob/2000.abstract_angel/bossbar/remove.m with storage asset:temp Args +# リセット + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/update_bossbar/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/update_bossbar/.mcfunction new file mode 100644 index 0000000000..7cbe590c7d --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/update_bossbar/.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/2000.abstract_angel/update_bossbar/ +# +# 継承先などから実行される処理 +# +# @within asset:mob/alias/2000/update_bossbar + +# Args 設定 + execute store result storage asset:temp Args.UUID int 1 run scoreboard players get @s MobUUID +# ボスバー作成 + function asset:mob/2000.abstract_angel/bossbar/update.m with storage asset:temp Args +# リセット + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/mob/alias/2000/death.mcfunction b/Asset/data/asset/functions/mob/alias/2000/death.mcfunction new file mode 100644 index 0000000000..ec1796a0b2 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/death.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/death +# +# Mobの死亡時の処理のエイリアス +# +# @within asset_manager:mob/triggers/death/death.m + +# 本来の処理を呼び出す + function asset:mob/2000.abstract_angel/death/ diff --git a/Asset/data/asset/functions/mob/alias/2000/hurt.mcfunction b/Asset/data/asset/functions/mob/alias/2000/hurt.mcfunction new file mode 100644 index 0000000000..5aa88f9fb3 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/hurt.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/hurt +# +# Mobのダメージ時の処理のエイリアス +# +# @within asset_manager:mob/triggers/hurt/hurt.m + +# 本来の処理を呼び出す + function asset:mob/2000.abstract_angel/hurt/ diff --git a/Asset/data/asset/functions/mob/alias/2000/init.mcfunction b/Asset/data/asset/functions/mob/alias/2000/init.mcfunction new file mode 100644 index 0000000000..6aee4ebfc8 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/init +# +# Init処理のエイリアス +# +# @within asset_manager:mob/triggers/init/init.m + +# 元のInit処理を呼び出す + function asset:mob/2000.abstract_angel/init/ diff --git a/Asset/data/asset/functions/mob/alias/2000/remove.mcfunction b/Asset/data/asset/functions/mob/alias/2000/remove.mcfunction new file mode 100644 index 0000000000..d08f944f36 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/remove.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/init +# +# Remove処理のエイリアス +# +# @within asset_manager:mob/remove/remove.m + +# 元のInit処理を呼び出す + function asset:mob/2000.abstract_angel/remove/ diff --git a/Asset/data/asset/functions/mob/alias/2000/update_bossbar.mcfunction b/Asset/data/asset/functions/mob/alias/2000/update_bossbar.mcfunction new file mode 100644 index 0000000000..22b32efb47 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/update_bossbar.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/update_bossbar +# +# メソッド処理のエイリアス +# +# @within asset_manager:mob/tick/tick.m + +# 本来の処理を呼び出す + function asset:mob/2000.abstract_angel/update_bossbar/ diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index 90704e74e0..cabdc2ec20 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:mob/2000.abstract_angel/load", "asset:mob/0264.dark_summoner/load", "asset:mob/0188.fireball/load", "asset:mob/0187.flame_mage/load", @@ -88,4 +89,4 @@ "asset:mob/0059.jack_o_lantern/0.load", "asset:mob/0139.blast_eye/0.load" ] -} +} \ No newline at end of file From a2eeff76b687fd1fd43d8a42db89b6d7f930e60d Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sun, 24 Nov 2024 19:13:31 +0900 Subject: [PATCH 63/74] =?UTF-8?q?:technologist:=20sandbag=20=E5=A4=A9?= =?UTF-8?q?=E4=BD=BF=E3=81=8C=20AbstractAngel=20=E3=82=92=E7=B6=99?= =?UTF-8?q?=E6=89=BF=E3=81=99=E3=82=8B=E7=94=A8=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/10010.sandbag1a/register.mcfunction | 8 ++++++-- .../functions/mob/10011.sandbag2a/register.mcfunction | 8 ++++++-- .../functions/mob/10012.sandbag3a/register.mcfunction | 8 ++++++-- .../functions/mob/10013.sandbag4a/register.mcfunction | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/mob/10010.sandbag1a/register.mcfunction b/Asset/data/asset/functions/mob/10010.sandbag1a/register.mcfunction index 1019687361..56e1b0a61c 100644 --- a/Asset/data/asset/functions/mob/10010.sandbag1a/register.mcfunction +++ b/Asset/data/asset/functions/mob/10010.sandbag1a/register.mcfunction @@ -1,10 +1,14 @@ #> asset:mob/10010.sandbag1a/register # @within asset:mob/alias/10010/register +# 継承 (int) (オプション) + data modify storage asset:mob Extends append value 2000 + function asset:mob/extends + +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false # ID (int) data modify storage asset:mob ID set value 10010 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Enemy.Boss" # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/mob/10011.sandbag2a/register.mcfunction b/Asset/data/asset/functions/mob/10011.sandbag2a/register.mcfunction index 5332f80b2b..acd6f9f73b 100644 --- a/Asset/data/asset/functions/mob/10011.sandbag2a/register.mcfunction +++ b/Asset/data/asset/functions/mob/10011.sandbag2a/register.mcfunction @@ -1,10 +1,14 @@ #> asset:mob/10011.sandbag2a/register # @within asset:mob/alias/10011/register +# 継承 (int) (オプション) + data modify storage asset:mob Extends append value 2000 + function asset:mob/extends + +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false # ID (int) data modify storage asset:mob ID set value 10011 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Enemy.Boss" # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/mob/10012.sandbag3a/register.mcfunction b/Asset/data/asset/functions/mob/10012.sandbag3a/register.mcfunction index 042a40a03f..abf6055b16 100644 --- a/Asset/data/asset/functions/mob/10012.sandbag3a/register.mcfunction +++ b/Asset/data/asset/functions/mob/10012.sandbag3a/register.mcfunction @@ -1,10 +1,14 @@ #> asset:mob/10012.sandbag3a/register # @within asset:mob/alias/10012/register +# 継承 (int) (オプション) + data modify storage asset:mob Extends append value 2000 + function asset:mob/extends + +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false # ID (int) data modify storage asset:mob ID set value 10012 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Enemy.Boss" # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/mob/10013.sandbag4a/register.mcfunction b/Asset/data/asset/functions/mob/10013.sandbag4a/register.mcfunction index 872ad6ca0a..6f44bf7a3a 100644 --- a/Asset/data/asset/functions/mob/10013.sandbag4a/register.mcfunction +++ b/Asset/data/asset/functions/mob/10013.sandbag4a/register.mcfunction @@ -1,10 +1,14 @@ #> asset:mob/10013.sandbag4a/register # @within asset:mob/alias/10013/register +# 継承 (int) (オプション) + data modify storage asset:mob Extends append value 2000 + function asset:mob/extends + +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false # ID (int) data modify storage asset:mob ID set value 10013 -# Type (string) Wikiを参照 - data modify storage asset:mob Type set value "Enemy.Boss" # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) From 664fd2ff6e7f007557d6af4517878c70d16f7602 Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sun, 24 Nov 2024 19:53:07 +0900 Subject: [PATCH 64/74] =?UTF-8?q?:balance=5Fscale:=20Blessless=20=E3=81=A7?= =?UTF-8?q?=E8=A2=AB=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E6=99=82=E3=81=AB?= =?UTF-8?q?=E8=A2=AB=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E4=B8=8A=E6=98=87?= =?UTF-8?q?=E3=81=8C=E4=BB=98=E4=B8=8E=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2000.abstract_angel/attack/.mcfunction | 11 ++++++++++ .../add_damage_increase_debug/.mcfunction | 20 +++++++++++++++++++ .../add_damage_increase_debug/add.mcfunction | 10 ++++++++++ .../mob/2000.abstract_angel/load.mcfunction | 9 +++++++++ .../mob/alias/2000/attack.mcfunction | 8 ++++++++ 5 files changed, 58 insertions(+) create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction create mode 100644 Asset/data/asset/functions/mob/2000.abstract_angel/load.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/2000/attack.mcfunction diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction new file mode 100644 index 0000000000..415aa76928 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/2000.abstract_angel/attack/ +# +# Mobの攻撃時の処理 +# +# @within function asset:mob/alias/2000/attack + +# バニラの攻撃じゃなかったら return + execute unless data storage asset:context Attack{IsVanilla:true} run return 0 + +# Blessless なら被ダメージ時にプレイヤーに被ダメージ上昇を付与する + execute if predicate api:global_vars/difficulty/min/hard as @a[tag=Victim] run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction new file mode 100644 index 0000000000..9fd1aa3e2c --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction @@ -0,0 +1,20 @@ +#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ +# +# +# +# @within function asset:mob/2000.abstract_angel/attack/ + +#> Private +# @private + #declare score_holder $Tick + #declare score_holder $LatestTick + +# 最後に被弾してから 1 秒経っていたら被ダメージ上昇を与える + execute store result score $LatestTick Temporary run scoreboard players get @s 1JK.LatestDamageIncreaseDebugAddTick + execute store result score $Tick Temporary run time query gametime + scoreboard players operation $LatestTick Temporary -= $Tick Temporary + execute if score $LatestTick Temporary matches ..-20 run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/add + execute if score $LatestTick Temporary matches ..-20 run scoreboard players operation @s 1JK.LatestDamageIncreaseDebugAddTick = $Tick Temporary +# リセット + scoreboard players reset $Tick Temporary + scoreboard players reset $LatestTick Temporary diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction new file mode 100644 index 0000000000..5dfeed8e85 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/add +# +# +# +# @within function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ + +data modify storage api: Argument.ID set value 107 +data modify storage api: Argument.Duration set value 600 +data modify storage api: Argument.StackOperation set value "add" +function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/load.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/load.mcfunction new file mode 100644 index 0000000000..e7b3bfb759 --- /dev/null +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:mob/2000.abstract_angel/load +# +# Mobに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:mob/load + +#> 定義類はここに +# @within function asset:mob/2000.abstract_angel/** + scoreboard objectives add 1JK.LatestDamageIncreaseDebugAddTick dummy diff --git a/Asset/data/asset/functions/mob/alias/2000/attack.mcfunction b/Asset/data/asset/functions/mob/alias/2000/attack.mcfunction new file mode 100644 index 0000000000..72097dca38 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/2000/attack.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/2000/attack +# +# Mobの攻撃時の処理のエイリアス +# +# @within asset_manager:mob/triggers/attack/attack.m + +# 本来の処理を呼び出す + function asset:mob/2000.abstract_angel/attack/ From 9bfe4a619668c8af16d3e33e54c6e7dfceab75e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 24 Nov 2024 15:32:41 +0000 Subject: [PATCH 65/74] Update Declares from ProjectTSB/TheSkyBlessing@1e5b5453ed5941d2d61b8e363f9be6e8c4ec714d [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 3ac548af01..4d8658465f 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -801,11 +801,19 @@ # @within function asset:effect/*/re-given/ #declare function asset:effect/super.re-given from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/effect/super.re-given.mcfunction#L1 +#> declare +# @within function asset:mob/*/init/ +#declare function asset:mob/super.init from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/mob/super.init.mcfunction#L1 + #> declare # @within function asset:mob/*/** #declare function asset:mob/call.m from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/mob/call.m.mcfunction#L1 #declare function asset:mob/super.method from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/mob/super.method.mcfunction#L1 +#> declare +# @within function asset:mob/*/remove/ +#declare function asset:mob/super.remove from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset/functions/mob/super.remove.mcfunction#L1 + #> declare # @within # function oh_*:** From c15ac12dce1a077ac6a5ed37435e6d8d5a08a3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 25 Nov 2024 00:33:17 +0900 Subject: [PATCH 66/74] =?UTF-8?q?=F0=9F=90=9B=20[Mob2000]=20=E5=A4=A9?= =?UTF-8?q?=E4=BD=BF=E6=8A=BD=E8=B1=A1=E3=82=92=E4=BF=AE=E6=AD=A3=20(#396)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/2000.abstract_angel/attack/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction index 415aa76928..6ad25168fa 100644 --- a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/alias/2000/attack # バニラの攻撃じゃなかったら return - execute unless data storage asset:context Attack{IsVanilla:true} run return 0 + execute if data storage asset:context Attack{IsVanilla:true} run return 0 # Blessless なら被ダメージ時にプレイヤーに被ダメージ上昇を付与する execute if predicate api:global_vars/difficulty/min/hard as @a[tag=Victim] run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ From 275e54d17f5805ee6bbfd7da7b9a45bc7476333f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:57:47 +0900 Subject: [PATCH 67/74] =?UTF-8?q?:adhesive=5Fbandage:=20[Effect101]=20?= =?UTF-8?q?=E6=94=BB=E6=92=83=E5=8A=9B=E4=BD=8E=E4=B8=8B=E3=82=A8=E3=83=95?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AEExtendsSafe=E3=82=92true?= =?UTF-8?q?=E3=81=AB=20(#397)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0101.attack_base_debuff/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction index 96148bb527..5b50dff77f 100644 --- a/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction +++ b/Asset/data/asset/functions/effect/0101.attack_base_debuff/register.mcfunction @@ -5,7 +5,7 @@ # @within function asset:effect/0101.attack_base_debuff/_/register # ExtendsSafe (boolean) (default = false) - # data modify storage asset:effect ExtendsSafe set value true + data modify storage asset:effect ExtendsSafe set value true # ID (int) data modify storage asset:effect ID set value 101 # 名前 (TextComponentString) From 7a1caf0dcc1af726e4f8f81e893503fa9cee1534 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 25 Nov 2024 14:07:58 +0000 Subject: [PATCH 68/74] Update Declares from ProjectTSB/TheSkyBlessing@3a5fff12c5fa2073f58cbd6c600ddd9308050625 [regenerate cache] --- Asset/data/minecraft/functions/declares.d.mcfunction | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 4d8658465f..7f541e794a 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -120,7 +120,9 @@ #declare function api:mob/get_health_percent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/get_health_percent.mcfunction#L1 #declare function api:mob/get_max_health from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/get_max_health.mcfunction#L1 #declare function api:mob/get_max_health_multiplier from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/get_max_health_multiplier.mcfunction#L1 + #declare function api:mob/kill from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/kill.mcfunction#L1 #declare function api:mob/lore/get from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/lore/get.mcfunction#L1 + #declare function api:mob/remove from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/remove.mcfunction#L1 #declare function api:mob/summon from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/mob/summon.mcfunction#L1 #declare function api:modifier/attack/base/add from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/attack/base/add.mcfunction#L1 #declare function api:modifier/attack/base/get from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/functions/modifier/attack/base/get.mcfunction#L1 @@ -924,22 +926,22 @@ # function asset_manager:island/dispel/boss/* # function asset_manager:object/triggers/tick # function asset:object/** -# asset_manager:mob/triggers/ -# asset_manager:mob/triggers/death/ -# asset:mob/** -# function asset_manager:mob/common_tag/anti_void_action/** # core:tick/player/ # player_manager:vanilla_attack # asset_manager:artifact/triggers/** # asset:artifact/** # asset_manager:teleporter/tick/** # core:handler/attack +# asset_manager:mob/triggers/ +# asset_manager:mob/triggers/death/ +# asset:mob/** +# function asset_manager:mob/common_tag/anti_void_action/** # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction#L33 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/_index.d.mcfunction#L6 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/object/_index.d.mcfunction#L35 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/tick/player/.mcfunction#L15 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L44 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L95 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/tick/player/.mcfunction#L15 #declare tag this #> declare From 95d43a7378dd9b82cdbb285e139720bdd97815fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:12:48 +0900 Subject: [PATCH 69/74] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=E5=A4=A9=E4=BD=BF?= =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E3=81=AEtypo=E3=82=92=E4=BF=AE=E6=AD=A3=20(#?= =?UTF-8?q?407)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/2000.abstract_angel/attack/.mcfunction | 2 +- .../.mcfunction | 4 ++-- .../add.mcfunction | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename Asset/data/asset/functions/mob/2000.abstract_angel/attack/{add_damage_increase_debug => add_damage_increase_debuff}/.mcfunction (98%) rename Asset/data/asset/functions/mob/2000.abstract_angel/attack/{add_damage_increase_debug => add_damage_increase_debuff}/add.mcfunction (92%) diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction index 6ad25168fa..e4024b6de2 100644 --- a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/.mcfunction @@ -8,4 +8,4 @@ execute if data storage asset:context Attack{IsVanilla:true} run return 0 # Blessless なら被ダメージ時にプレイヤーに被ダメージ上昇を付与する - execute if predicate api:global_vars/difficulty/min/hard as @a[tag=Victim] run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ + execute if predicate api:global_vars/difficulty/min/hard as @a[tag=Victim] run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debuff/ diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/.mcfunction similarity index 98% rename from Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction rename to Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/.mcfunction index 9fd1aa3e2c..804c331eef 100644 --- a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/.mcfunction +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ +#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debuff/ # # # @@ -13,7 +13,7 @@ execute store result score $LatestTick Temporary run scoreboard players get @s 1JK.LatestDamageIncreaseDebugAddTick execute store result score $Tick Temporary run time query gametime scoreboard players operation $LatestTick Temporary -= $Tick Temporary - execute if score $LatestTick Temporary matches ..-20 run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/add + execute if score $LatestTick Temporary matches ..-20 run function asset:mob/2000.abstract_angel/attack/add_damage_increase_debuff/add execute if score $LatestTick Temporary matches ..-20 run scoreboard players operation @s 1JK.LatestDamageIncreaseDebugAddTick = $Tick Temporary # リセット scoreboard players reset $Tick Temporary diff --git a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/add.mcfunction similarity index 92% rename from Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction rename to Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/add.mcfunction index 5dfeed8e85..2aead64cfe 100644 --- a/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debug/add.mcfunction +++ b/Asset/data/asset/functions/mob/2000.abstract_angel/attack/add_damage_increase_debuff/add.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/add +#> asset:mob/2000.abstract_angel/attack/add_damage_increase_debuff/add # # # -# @within function asset:mob/2000.abstract_angel/attack/add_damage_increase_debug/ +# @within function asset:mob/2000.abstract_angel/attack/add_damage_increase_debuff/ data modify storage api: Argument.ID set value 107 data modify storage api: Argument.Duration set value 600 From 82f2bfdd1a160938defb588e8d54f2ba08d0bc4c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 28 Nov 2024 16:59:54 +0000 Subject: [PATCH 70/74] Update Declares from ProjectTSB/TheSkyBlessing@e5431eccfe01e75dba29b6511b17845c08864039 [regenerate cache] --- .../minecraft/functions/declares.d.mcfunction | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 7f541e794a..26e46608aa 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -922,7 +922,6 @@ #> declare # @within -# asset_manager:spawner/tick/* # function asset_manager:island/dispel/boss/* # function asset_manager:object/triggers/tick # function asset:object/** @@ -936,12 +935,13 @@ # asset_manager:mob/triggers/death/ # asset:mob/** # function asset_manager:mob/common_tag/anti_void_action/** -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction#L33 +# asset_manager:spawner/tick/* # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/_index.d.mcfunction#L6 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/object/_index.d.mcfunction#L35 # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/tick/player/.mcfunction#L15 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L44 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L95 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L45 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L96 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction#L27 #declare tag this #> declare @@ -951,7 +951,7 @@ # asset_manager:mob/triggers/hurt/foreach # asset:mob/*/hurt/** # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction#L58 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L65 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L66 #declare tag Attacker #> declare @@ -962,7 +962,7 @@ # asset_manager:mob/triggers/attack/foreach # asset:mob/*/attack/** # from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction#L59 -# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L59 +# from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L60 #declare tag Victim #> declare @@ -994,15 +994,16 @@ # @within # function core:tick/ # function mob_manager:init/ +# function mob_manager:kill_entity # function asset:mob/** # function asset_manager:mob/** -#declare tag AssetMob from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L31 +#declare tag AssetMob from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L32 #> declare # @within # function core:tick/ # function asset:** -#declare tag AllowProcessingCommonTag from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L37 +#declare tag AllowProcessingCommonTag from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L38 #> declare # @within @@ -1010,23 +1011,23 @@ # asset_manager:artifact/triggers/attack/vanilla # api:damage/core/health_subtract/non-player/kill # asset:mob/*/death/** -#declare tag Killer from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L52 +#declare tag Killer from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L53 #> declare # @within # function asset_manager:mob/common_tag/* # function asset:** - #declare tag AllowRideBannedVehicle from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L77 - #declare tag AlwaysBurn from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L81 - #declare tag AlwaysInvisible from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L82 - #declare tag AlwaysSlowFall from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L83 - #declare tag AntiBurn from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L80 - #declare tag AntiFallDamage from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L78 - #declare tag AntiVoid from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L79 - #declare tag AutoKillWhenDiePassenger from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L85 - #declare tag AutoKillWhenDieVehicle from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L84 - #declare tag Drown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L87 - #declare tag Frozen from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L86 + #declare tag AllowRideBannedVehicle from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L78 + #declare tag AlwaysBurn from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L82 + #declare tag AlwaysInvisible from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L83 + #declare tag AlwaysSlowFall from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L84 + #declare tag AntiBurn from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L81 + #declare tag AntiFallDamage from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L79 + #declare tag AntiVoid from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L80 + #declare tag AutoKillWhenDiePassenger from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L86 + #declare tag AutoKillWhenDieVehicle from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L85 + #declare tag Drown from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L88 + #declare tag Frozen from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/asset_manager/functions/mob/_index.d.mcfunction#L87 #> declare # @within From 3e508a387a3338fabf4af09c55d6b22d7b18f7c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 29 Nov 2024 12:50:25 +0000 Subject: [PATCH 71/74] Update Declares from ProjectTSB/TheSkyBlessing@0593ac34d66dfd5a1fcd6d5f8e4d3ecf746ae4b8 [regenerate cache] --- .../minecraft/functions/declares.d.mcfunction | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 26e46608aa..165c28aa97 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -323,15 +323,15 @@ #declare loot_table minecraft:blocks/stone from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/blocks/stone.json#L1 #declare loot_table minecraft:empty from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/empty.json#L1 #declare loot_table player_manager:lost_item/give_all/name_to_textcomponent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/loot_tables/lost_item/give_all/name_to_textcomponent.json#L1 - #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L126 - #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L111 - #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L233 - #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L168 - #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L167 - #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L132 - #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L179 - #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L107 - #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L131 + #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L133 + #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L118 + #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L240 + #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L175 + #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L174 + #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L139 + #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L186 + #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L114 + #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L138 #declare predicate api:area/is_breakable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/area/is_breakable.json#L1 #declare predicate api:global_vars/difficulty/easy from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json#L1 #declare predicate api:global_vars/difficulty/hard from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json#L1 @@ -698,7 +698,7 @@ #declare tag/item lib:pickaxes/level-4-mineable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/pickaxes/level-4-mineable.json#L1 #declare tag/item lib:potions from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/potions.json#L1 #declare tag/item lib:usable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/usable.json#L1 - #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L99 + #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L106 #> declare # @within function asset:artifact/*/*/2.check_condition @@ -1049,8 +1049,8 @@ #> declare # @within function asset:object/** -#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L184 +#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L191 #> declare # @within function asset:mob/** -#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L189 +#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L196 From 847140d67449551563f707ed1ce0bc58966d93bd Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Fri, 29 Nov 2024 23:56:38 +0900 Subject: [PATCH 72/74] =?UTF-8?q?:balance=5Fscale:=20=E5=AF=BE=E7=89=A9?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=95=E3=83=AB=E3=81=AE=E5=B0=84=E7=A8=8B?= =?UTF-8?q?=E3=82=92=E3=83=8A=E3=83=BC=E3=83=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0212.anti_materiel_rifle/give/2.give.mcfunction | 4 ++-- .../0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/give/2.give.mcfunction index 53d71c8fba..06680926d2 100644 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/give/2.give.mcfunction @@ -37,7 +37,7 @@ # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackRange set value 80 + data modify storage asset:artifact AttackInfo.AttackRange set value 40 # MP消費量 (int) data modify storage asset:artifact MPCost set value 80 # MP必要量 (int) (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction index fb938feace..3b44090445 100644 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction @@ -22,7 +22,7 @@ execute if entity @s[tag=Landing] run function asset:artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_damage # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..80] run function asset:artifact/0212.anti_materiel_rifle/trigger/3.1.bullet + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..40] run function asset:artifact/0212.anti_materiel_rifle/trigger/3.1.bullet # タグを消す - tag @s remove Landing \ No newline at end of file + tag @s remove Landing From e3b407d8410b0c62ed16a210670fcca007523488 Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sat, 30 Nov 2024 06:07:56 +0900 Subject: [PATCH 73/74] =?UTF-8?q?:lipstick:=20TSB=20=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=92=20icon=20=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=A8=20artifact/1/info=20=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=B3=E3=83=88=E3=81=AB=E5=88=86=E9=9B=A2=E3=81=97?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=80=81=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E5=B9=85=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/get_defense_info.mcfunction | 24 +++++++++---------- .../trigger/print_defense_messages.mcfunction | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/get_defense_info.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/get_defense_info.mcfunction index 01bf9d24a5..d5ee94e7d6 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/get_defense_info.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/get_defense_info.mcfunction @@ -13,20 +13,20 @@ execute unless data storage asset:temp 01.Def run scoreboard players set $Defense Temporary 100 # 耐性値に応じてメッセージを変更 # 高い - execute if score $Defense Temporary matches 190.. run data modify storage asset:temp 01.Def set value '{"text":"a","font":"tsb"}' - execute if score $Defense Temporary matches 170..189 run data modify storage asset:temp 01.Def set value '{"text":"b","font":"tsb"}' - execute if score $Defense Temporary matches 150..169 run data modify storage asset:temp 01.Def set value '{"text":"c","font":"tsb"}' - execute if score $Defense Temporary matches 130..149 run data modify storage asset:temp 01.Def set value '{"text":"d","font":"tsb"}' - execute if score $Defense Temporary matches 110..129 run data modify storage asset:temp 01.Def set value '{"text":"e","font":"tsb"}' + execute if score $Defense Temporary matches 190.. run data modify storage asset:temp 01.Def set value '{"text":"a","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 170..189 run data modify storage asset:temp 01.Def set value '{"text":"b","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 150..169 run data modify storage asset:temp 01.Def set value '{"text":"c","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 130..149 run data modify storage asset:temp 01.Def set value '{"text":"d","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 110..129 run data modify storage asset:temp 01.Def set value '{"text":"e","font":"artifact/1/info"}' # 普通 - execute if score $Defense Temporary matches 90..109 run data modify storage asset:temp 01.Def set value '{"text":"f","font":"tsb"}' + execute if score $Defense Temporary matches 90..109 run data modify storage asset:temp 01.Def set value '{"text":"f","font":"artifact/1/info"}' # 低い - execute if score $Defense Temporary matches 70..89 run data modify storage asset:temp 01.Def set value '{"text":"g","font":"tsb"}' - execute if score $Defense Temporary matches 50..69 run data modify storage asset:temp 01.Def set value '{"text":"h","font":"tsb"}' - execute if score $Defense Temporary matches 30..49 run data modify storage asset:temp 01.Def set value '{"text":"i","font":"tsb"}' - execute if score $Defense Temporary matches 10..29 run data modify storage asset:temp 01.Def set value '{"text":"j","font":"tsb"}' - execute if score $Defense Temporary matches ..9 run data modify storage asset:temp 01.Def set value '{"text":"k","font":"tsb"}' + execute if score $Defense Temporary matches 70..89 run data modify storage asset:temp 01.Def set value '{"text":"g","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 50..69 run data modify storage asset:temp 01.Def set value '{"text":"h","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 30..49 run data modify storage asset:temp 01.Def set value '{"text":"i","font":"artifact/1/info"}' + execute if score $Defense Temporary matches 10..29 run data modify storage asset:temp 01.Def set value '{"text":"j","font":"artifact/1/info"}' + execute if score $Defense Temporary matches ..9 run data modify storage asset:temp 01.Def set value '{"text":"k","font":"artifact/1/info"}' # リセット - scoreboard players reset $Defense Temporary \ No newline at end of file + scoreboard players reset $Defense Temporary diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/print_defense_messages.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/print_defense_messages.mcfunction index c3f03f26d8..485eeb3f01 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/print_defense_messages.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/print_defense_messages.mcfunction @@ -31,10 +31,10 @@ scoreboard players operation $01.CurrentHP Temporary /= $100 Const # 表示する - execute if entity @s[tag=!Enemy.Boss] run tellraw @p[tag=this] [{"text":"\uE01A","font":"tsb"},{"text":" ","font":"default"},{"score":{"objective":"Temporary","name":"$01.CurrentHP"},"color":"white","font":"default"},{"text":" / ","color":"white","font":"default"},{"score":{"objective":"Temporary","name":"$01.MaxHP"},"color":"white","font":"default"},{"text":" (","font":"default"},{"score":{"objective":"Temporary","name":"$01.PercentHP"},"color":"white","font":"default"},{"text":"%)","font":"default"}] + execute if entity @s[tag=!Enemy.Boss] run tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"text":"♡","font":"artifact/1/info"},{"text":"\u0002","font":"space"},{"score":{"objective":"Temporary","name":"$01.CurrentHP"},"color":"white","font":"default"},{"text":"\u0002","font":"space"},{"text":"/","font":"default"},{"text":"\u0002","font":"space"},{"score":{"objective":"Temporary","name":"$01.MaxHP"},"color":"white","font":"default"},{"text":" (","font":"default"},{"score":{"objective":"Temporary","name":"$01.PercentHP"},"color":"white","font":"default"},{"text":"%)","font":"default"}] # 天使だったら今までのデータを気にせず秘匿 - execute if entity @s[tag=Enemy.Boss] run tellraw @p[tag=this] [{"text":"\uE01A","font":"tsb"},{"text":" ??? / ???","font":"default"},{"text":" (","font":"default"},{"score":{"objective":"Temporary","name":"$01.PercentHP"},"color":"white","font":"default"},{"text":"%)","font":"default"}] + execute if entity @s[tag=Enemy.Boss] run tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"text":"♡","font":"artifact/1/info"},{"text":"\u0002","font":"space"},{"text":"???","font":"default"},{"text":"\u0002","font":"space"},{"text":"/","font":"default"},{"text":"\u0002","font":"space"},{"text":"???","font":"default"},{"text":" (","font":"default"},{"score":{"objective":"Temporary","name":"$01.PercentHP"},"color":"white","font":"default"},{"text":"%)","font":"default"}] # 物理と魔法 # 物理耐性取得 @@ -52,7 +52,7 @@ data remove storage asset:temp 01.Def # 表示 - tellraw @p[tag=this] [{"text":"\uE018","font":"tsb"},{"storage":"asset:temp","nbt":"01.PhysicalDefense","interpret":true},{"text":" | ","font":"default"},{"text":"\uE019","font":"tsb"},{"storage":"asset:temp","nbt":"01.MagicDefense","interpret":true}] + tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Physical","interpret":true},{"storage":"asset:temp","nbt":"01.PhysicalDefense","interpret":true},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"asset:temp","nbt":"01.MagicDefense","interpret":true}] # 炎、水、雷 # 炎耐性取得 @@ -77,7 +77,7 @@ data remove storage asset:temp 01.Def # 表示 - tellraw @p[tag=this] [{"text":"\uE01C","font":"tsb"},{"storage":"asset:temp","nbt":"01.FireDefense","interpret":true},{"text":" | ","font":"default"},{"text":"\uE01D","font":"tsb"},{"storage":"asset:temp","nbt":"01.WaterDefense","interpret":true},{"text":" | ","font":"default"},{"text":"\uE01E","font":"tsb"},{"storage":"asset:temp","nbt":"01.ThunderDefense","interpret":true}] + tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Fire","interpret":true},{"storage":"asset:temp","nbt":"01.FireDefense","interpret":true},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Water","interpret":true},{"storage":"asset:temp","nbt":"01.WaterDefense","interpret":true},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Thunder","interpret":true},{"storage":"asset:temp","nbt":"01.ThunderDefense","interpret":true}] # 空行 tellraw @p[tag=this] {"text":" "} From af80a2d0357bb064df8052d07fd1e098e45f62cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 30 Nov 2024 06:25:58 +0000 Subject: [PATCH 74/74] Update Declares from ProjectTSB/TheSkyBlessing@a987d72552bb973ab5f0c2d12bc25ab9a1beadfe [regenerate cache] --- .../minecraft/functions/declares.d.mcfunction | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Asset/data/minecraft/functions/declares.d.mcfunction b/Asset/data/minecraft/functions/declares.d.mcfunction index 165c28aa97..3baa4cd736 100644 --- a/Asset/data/minecraft/functions/declares.d.mcfunction +++ b/Asset/data/minecraft/functions/declares.d.mcfunction @@ -323,15 +323,15 @@ #declare loot_table minecraft:blocks/stone from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/blocks/stone.json#L1 #declare loot_table minecraft:empty from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/minecraft/loot_tables/empty.json#L1 #declare loot_table player_manager:lost_item/give_all/name_to_textcomponent from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/player_manager/loot_tables/lost_item/give_all/name_to_textcomponent.json#L1 - #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L133 - #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L118 - #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L240 - #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L175 - #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L174 - #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L139 - #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L186 - #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L114 - #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L138 + #declare objective Const from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L137 + #declare objective Global from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L122 + #declare objective Lib from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L244 + #declare objective MobHealth from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L179 + #declare objective MobID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L178 + #declare objective MobUUID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L143 + #declare objective ObjectID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L190 + #declare objective Temporary from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L118 + #declare objective UserID from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L142 #declare predicate api:area/is_breakable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/area/is_breakable.json#L1 #declare predicate api:global_vars/difficulty/easy from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json#L1 #declare predicate api:global_vars/difficulty/hard from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json#L1 @@ -698,7 +698,7 @@ #declare tag/item lib:pickaxes/level-4-mineable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/pickaxes/level-4-mineable.json#L1 #declare tag/item lib:potions from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/potions.json#L1 #declare tag/item lib:usable from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/lib/tags/items/usable.json#L1 - #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L106 + #declare team NoCollision from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L110 #> declare # @within function asset:artifact/*/*/2.check_condition @@ -1049,8 +1049,8 @@ #> declare # @within function asset:object/** -#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L191 +#declare objective General.Object.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L195 #> declare # @within function asset:mob/** -#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L196 +#declare objective General.Mob.Tick from https://github.com/ProjectTSB/TheSkyBlessing/blob/master/TheSkyBlessing/data/core/functions/load_once.mcfunction#L200