From 4d775be82c7a64d5b925d8348cd8e05e44b7ac93 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Tue, 16 Jun 2026 00:25:12 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=83=86=E3=83=B3?= =?UTF-8?q?=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=81=AE=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0015.gasoline/give/1.trigger.mcfunction | 7 ++ .../0015.gasoline/give/2.give.mcfunction | 68 +++++++++++++++++++ .../0015.gasoline/melee/1.trigger.mcfunction | 8 +++ .../melee/2.check_condition.mcfunction | 12 ++++ .../0015.gasoline/melee/3.main.mcfunction | 11 +++ .../use_item/1.trigger.mcfunction | 8 +++ .../use_item/2.check_condition.mcfunction | 11 +++ .../0015.gasoline/use_item/3.main.mcfunction | 11 +++ .../tags/functions/artifact/attack/melee.json | 1 + .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/use_item.json | 1 + 11 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/melee/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/melee/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/use_item/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/1.trigger.mcfunction new file mode 100644 index 0000000000..a2200754b4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0015.gasoline/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:15} run function asset:artifact/0015.gasoline/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction new file mode 100644 index 0000000000..b23bbd18f8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/0015.gasoline/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/0015.gasoline/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 15 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:potion" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ガソリン","color":"red"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"攻撃した敵の火耐性を大きく下げる"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra 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 [40] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Water] +# 攻撃に関する情報 -防御無視 (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 +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 100 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "shortRange" + data modify storage asset:artifact TypeCooldown.Duration 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 "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/0015.gasoline/melee/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/1.trigger.mcfunction new file mode 100644 index 0000000000..70e949145b --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0015.gasoline/melee/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:15} run function asset:artifact/0015.gasoline/melee/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/2.check_condition.mcfunction new file mode 100644 index 0000000000..5b0b61ba18 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/0015.gasoline/melee/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/0015.gasoline/melee/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/0015.gasoline/melee/3.main diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction new file mode 100644 index 0000000000..ffeafb06b7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/0015.gasoline/melee/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0015.gasoline/melee/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + say test: 0015.gasoline_hit diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/1.trigger.mcfunction new file mode 100644 index 0000000000..71b0f55d2b --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0015.gasoline/use_item/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:15} run function asset:artifact/0015.gasoline/use_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction new file mode 100644 index 0000000000..0de22c768a --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/0015.gasoline/use_item/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/0015.gasoline/use_item/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto + tag @s add CanUsed +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/0015.gasoline/use_item/3.main diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction new file mode 100644 index 0000000000..5bd4401303 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/0015.gasoline/use_item/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0015.gasoline/use_item/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + #function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + say test: 0015.gasoline_use diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json index befbe3d3d1..65927d27aa 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/0015.gasoline/melee/1.trigger", "asset:artifact/1269.apocalypse/trigger/1.trigger", "asset:artifact/1209.sinful_scythe/trigger/1.trigger", "asset:artifact/1282.ice_axe/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f8f86c672d..280cbebee5 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/0015.gasoline/give/1.trigger", "asset:artifact/1409.mana_charm/give/1.trigger", "asset:artifact/1327.lunatic_torch/give/1.trigger", "asset:artifact/1332.bebebeam/give/1.trigger", @@ -533,4 +534,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/use_item.json b/Asset/data/asset/tags/functions/artifact/use_item.json index c5b6ee5715..e284d9d93f 100644 --- a/Asset/data/asset/tags/functions/artifact/use_item.json +++ b/Asset/data/asset/tags/functions/artifact/use_item.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/0015.gasoline/use_item/1.trigger", "asset:artifact/1343.coffee_milk_pack/trigger/1.trigger", "asset:artifact/1342.fruit_milk_pack/trigger/1.trigger", "asset:artifact/1401.yuzu/trigger/1.trigger", From 7643f923a69bae4fc277be7bf9df084fa31e923f Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Wed, 17 Jun 2026 00:39:12 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=E6=94=BB=E6=92=83=E6=99=82=E3=81=AE?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=80=81=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=81=AE=E4=BD=9C=E6=88=90=E3=81=AA=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0015.gasoline/give/2.give.mcfunction | 6 +-- .../0015.gasoline/melee/3.main.mcfunction | 17 +++++++- .../0015.gasoline/melee/particle.mcfunction | 21 ++++++++++ .../use_item/2.check_condition.mcfunction | 7 ++-- .../0015.gasoline/use_item/3.main.mcfunction | 12 +++++- .../effect/0372.gasoline/_/end.mcfunction | 7 ++++ .../effect/0372.gasoline/_/given.mcfunction | 7 ++++ .../0372.gasoline/_/register.mcfunction | 7 ++++ .../effect/0372.gasoline/_/remove.mcfunction | 7 ++++ .../effect/0372.gasoline/_/tick.mcfunction | 7 ++++ .../effect/0372.gasoline/end/.mcfunction | 8 ++++ .../effect/0372.gasoline/given/.mcfunction | 7 ++++ .../0372.gasoline/modifier/add.mcfunction | 11 ++++++ .../0372.gasoline/modifier/remove.mcfunction | 11 ++++++ .../effect/0372.gasoline/register.mcfunction | 39 +++++++++++++++++++ .../effect/0372.gasoline/remove/.mcfunction | 8 ++++ .../effect/0372.gasoline/tick/.mcfunction | 9 +++++ .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 3 +- .../asset/tags/functions/effect/tick.json | 3 +- 22 files changed, 191 insertions(+), 15 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction index b23bbd18f8..f3af49799c 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ガソリン","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"攻撃した敵の火耐性を大きく下げる"}'] + data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','{"text":"攻撃した敵の火耐性を大きく下げる"}','{"text":"⚠誤飲注意","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -50,7 +50,7 @@ data modify storage asset:artifact LocalCooldown set value 100 # 種別クールダウン ({Type: string, Duration: int}) (オプション) data modify storage asset:artifact TypeCooldown.Type set value "shortRange" - data modify storage asset:artifact TypeCooldown.Duration set value "60" + data modify storage asset:artifact TypeCooldown.Duration set value 40 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) @@ -62,7 +62,7 @@ # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - # data modify storage asset:artifact CustomNBT set value {} + data modify storage asset:artifact CustomNBT set value {HideFlags:32,CustomPotionColor:15220575} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction index ffeafb06b7..54dc4ca518 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction @@ -7,5 +7,18 @@ # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand -# ここから先は神器側の効果の処理を書く - say test: 0015.gasoline_hit +# パーティクル + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] positioned ~ ~1 ~ run function asset:artifact/0015.gasoline/melee/particle + +# 物理水属性ダメージ + data modify storage api: Argument.Damage set value 40.0f + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Water" + function api:damage/modifier + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ + function api:damage/reset +# デバフ付与 + data modify storage api: Argument.ID set value 372 + data modify storage api: Argument.Duration set value 200 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction new file mode 100644 index 0000000000..69121def8d --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/0015.gasoline/melee/particle +# +# 神器の演出 +# +# @within function asset:artifact/0015.gasoline/melee/3.main + + +# ここから先は神器側の効果の処理を書く +# ＝＝＝ ▼ 鈍い水音（サウンド） ▼ ＝＝＝ +# 1. ドロッと重い液体が地面に落ちる音（ハチミツの落下音を低音で） + #playsound minecraft:block.honey_block.fall player @a ~ ~ ~ 1.0 0.5 0 +# 2. 粘度の高い液体が撒き散らされる音（溶岩を撒く音） + playsound minecraft:item.bucket.empty_lava player @a ~ ~ ~ 0.8 0.8 0 +# 3. 濁って重い「バシャッ」という水音（通常飛沫を低ピッチで） + playsound minecraft:entity.generic.splash player @a ~ ~ ~ 0.1 0.6 0 + +# ＝＝＝ ▼ 油・ガソリンの飛沫（パーティクル） ▼ ＝＝＝ +# 4. 油のような濁った色（暗い黄土色〜黒）の細かい飛沫 + particle minecraft:dust 0.2 0.15 0.05 1.5 ~ ~ ~ 0.8 0.4 0.8 0.05 100 normal @a +# 5. ドロリとした質量のある液体の飛び散り（泥ブロックの破片を利用） + particle minecraft:block minecraft:mud ~ ~ ~ 0.6 0.4 0.6 0.15 50 normal @a diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction index 0de22c768a..447bb29421 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/2.check_condition.mcfunction @@ -5,7 +5,6 @@ # @within function asset:artifact/0015.gasoline/use_item/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く - function asset:artifact/common/check_condition/auto - tag @s add CanUsed -# CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0015.gasoline/use_item/3.main + #function asset:artifact/common/check_condition/auto +# 3.main.mcfunctionを実行する + function asset:artifact/0015.gasoline/use_item/3.main diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction index 5bd4401303..5ac6772bee 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction @@ -8,4 +8,14 @@ #function asset:artifact/common/use/auto # ここから先は神器側の効果の処理を書く - say test: 0015.gasoline_use +# 毒 + data modify storage api: Argument.ID set value 29 + data modify storage api: Argument.Duration set value 200 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset +# ダメージ + data modify storage api: Argument.Damage set value 10.0f + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.DeathMessage append value '[{"translate":"%1$sはガソリン中毒で死んだ","with":[{"selector":"@s"}]}]' + data modify storage api: Argument.DeathMessage append value '[{"translate":"%1$sは自分を車と勘違いした","with":[{"selector":"@s"}]}]' diff --git a/Asset/data/asset/functions/effect/0372.gasoline/_/end.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/_/end.mcfunction new file mode 100644 index 0000000000..057e063e4c --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:372} run function asset:effect/0372.gasoline/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0372.gasoline/_/given.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/_/given.mcfunction new file mode 100644 index 0000000000..35dd477317 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:372} run function asset:effect/0372.gasoline/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0372.gasoline/_/register.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/_/register.mcfunction new file mode 100644 index 0000000000..cd8164f6a8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:372} run function asset:effect/0372.gasoline/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0372.gasoline/_/remove.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/_/remove.mcfunction new file mode 100644 index 0000000000..e452368c2c --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:372} run function asset:effect/0372.gasoline/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0372.gasoline/_/tick.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/_/tick.mcfunction new file mode 100644 index 0000000000..4e1f5fe54f --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:372} run function asset:effect/0372.gasoline/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0372.gasoline/end/.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/end/.mcfunction new file mode 100644 index 0000000000..d41843db63 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0372.gasoline/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0372.gasoline/_/end + +# modifier削除 + function asset:effect/0372.gasoline/modifier/remove diff --git a/Asset/data/asset/functions/effect/0372.gasoline/given/.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/given/.mcfunction new file mode 100644 index 0000000000..1711c15458 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/given/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0372.gasoline/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0372.gasoline/_/given + + function asset:effect/0372.gasoline/modifier/add diff --git a/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction new file mode 100644 index 0000000000..557d038133 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0372.gasoline/modifier/add +# +# 補正を付与する +# +# @within function asset:effect/0372.gasoline/given/ + +# 火耐性低下 + data modify storage api: Argument.UUID set value [I;1,3,372,0] + data modify storage api: Argument.Amount set value -1 + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/defense/fire/add diff --git a/Asset/data/asset/functions/effect/0372.gasoline/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/modifier/remove.mcfunction new file mode 100644 index 0000000000..b15bcfcb50 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0372.gasoline/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0372.gasoline/end/ +# asset:effect/0372.gasoline/remove/ + +# 解除 + data modify storage api: Argument.UUID set value [I;1,3,372,0] + function api:modifier/defense/fire/remove diff --git a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction new file mode 100644 index 0000000000..56b0b2bc17 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0372.gasoline/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0372.gasoline/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 372 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ガソリン","color":"red"}' +# 説明文 (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 +# 悪い効果か否か (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 1 +# エフェクトをUIに表示するか (boolean) (default = true) + data modify storage asset:effect Visible set value true +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0372.gasoline/remove/.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/remove/.mcfunction new file mode 100644 index 0000000000..4219e3123c --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0372.gasoline/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0372.gasoline/_/remove + +# modifier削除 + function asset:effect/0372.gasoline/modifier/remove diff --git a/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction new file mode 100644 index 0000000000..aa6f315236 --- /dev/null +++ b/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0372.gasoline/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0372.gasoline/_/tick + +# パーティクル + #particle minecraft:dust 0.2 0.15 0.05 1.5 ~ ~1 ~ 0.4 0.4 0.4 0.05 2 normal @a + particle minecraft:block minecraft:mud ~ ~1 ~ 0.3 0.2 0.3 0.15 2 normal @a diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index f1d7e4cad3..b18575b449 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0372.gasoline/_/end", "asset:effect/0302.safety_check_complete/_/end", "asset:effect/0346.lunatic_time/_/end", "asset:effect/0360.calamity_bind/_/end", @@ -107,4 +108,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/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 83c1f83390..87f0bae0bb 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0372.gasoline/_/given", "asset:effect/0302.safety_check_complete/_/given", "asset:effect/0346.lunatic_time/_/given", "asset:effect/0352.kitsunebi/_/given", @@ -102,4 +103,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/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 6b88781689..653012dba1 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0372.gasoline/_/register", "asset:effect/0302.safety_check_complete/_/register", "asset:effect/0346.lunatic_time/_/register", "asset:effect/0352.kitsunebi/_/register", @@ -177,4 +178,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/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 ff55794d1d..04517740d5 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0372.gasoline/_/remove", "asset:effect/0302.safety_check_complete/_/remove", "asset:effect/0346.lunatic_time/_/remove", "asset:effect/0360.calamity_bind/_/remove", @@ -115,4 +116,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/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 bc1dc9e8e0..e12c63e618 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0372.gasoline/_/tick", "asset:effect/0346.lunatic_time/_/tick", "asset:effect/0352.kitsunebi/_/tick", "asset:effect/0351.nectar_regeneration/_/tick", @@ -104,4 +105,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file From 1dc4c63340d1ecfe5ad46e48c9d2e794e6890de6 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Wed, 17 Jun 2026 01:13:55 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=E3=83=90=E3=83=95=E3=81=AE=E8=89=B2?= =?UTF-8?q?=E3=81=AA=E3=81=A9=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0015.gasoline/melee/3.main.mcfunction | 2 +- .../artifact/0015.gasoline/melee/particle.mcfunction | 12 ++++-------- .../effect/0372.gasoline/modifier/add.mcfunction | 2 +- .../effect/0372.gasoline/register.mcfunction | 2 +- .../functions/effect/0372.gasoline/tick/.mcfunction | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction index 54dc4ca518..1a620de39a 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction @@ -17,7 +17,7 @@ function api:damage/modifier execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset -# デバフ付与 +# デバフ(ガソリン)付与 data modify storage api: Argument.ID set value 372 data modify storage api: Argument.Duration set value 200 execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction index 69121def8d..1602cdf5ed 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/particle.mcfunction @@ -6,16 +6,12 @@ # ここから先は神器側の効果の処理を書く -# ＝＝＝ ▼ 鈍い水音（サウンド） ▼ ＝＝＝ -# 1. ドロッと重い液体が地面に落ちる音（ハチミツの落下音を低音で） - #playsound minecraft:block.honey_block.fall player @a ~ ~ ~ 1.0 0.5 0 -# 2. 粘度の高い液体が撒き散らされる音（溶岩を撒く音） +# 粘度の高い液体が撒き散らされる音（溶岩を撒く音） playsound minecraft:item.bucket.empty_lava player @a ~ ~ ~ 0.8 0.8 0 -# 3. 濁って重い「バシャッ」という水音（通常飛沫を低ピッチで） +# 濁って重い「バシャッ」という水音（通常飛沫を低ピッチで） playsound minecraft:entity.generic.splash player @a ~ ~ ~ 0.1 0.6 0 -# ＝＝＝ ▼ 油・ガソリンの飛沫（パーティクル） ▼ ＝＝＝ -# 4. 油のような濁った色（暗い黄土色〜黒）の細かい飛沫 +# 油のような濁った色（暗い黄土色〜黒）の細かい飛沫 particle minecraft:dust 0.2 0.15 0.05 1.5 ~ ~ ~ 0.8 0.4 0.8 0.05 100 normal @a -# 5. ドロリとした質量のある液体の飛び散り（泥ブロックの破片を利用） +# ドロリとした質量のある液体の飛び散り（泥ブロックの破片を利用） particle minecraft:block minecraft:mud ~ ~ ~ 0.6 0.4 0.6 0.15 50 normal @a diff --git a/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction index 557d038133..5a85dfa474 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction @@ -6,6 +6,6 @@ # 火耐性低下 data modify storage api: Argument.UUID set value [I;1,3,372,0] - data modify storage api: Argument.Amount set value -1 + data modify storage api: Argument.Amount set value -0.3 data modify storage api: Argument.Operation set value "multiply" function api:modifier/defense/fire/add diff --git a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction index 56b0b2bc17..a139b8226b 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction @@ -9,7 +9,7 @@ # ID (int) data modify storage asset:effect ID set value 372 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text":"ガソリン","color":"red"}' + data modify storage asset:effect Name set value '{"text":"ガソリン","color":"#947C62"}' # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text":"火属性耐性が大きく低下する"}'] # 効果時間 (int) (default = API || error) diff --git a/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction index aa6f315236..7cbdfc369a 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/tick/.mcfunction @@ -4,6 +4,6 @@ # # @within function asset:effect/0372.gasoline/_/tick -# パーティクル +# ガソリンの垂れた感じのパーティクル #particle minecraft:dust 0.2 0.15 0.05 1.5 ~ ~1 ~ 0.4 0.4 0.4 0.05 2 normal @a particle minecraft:block minecraft:mud ~ ~1 ~ 0.3 0.2 0.3 0.15 2 normal @a From 108d7beb6a6a76250a905548cbf8a71f8da392fe Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Wed, 17 Jun 2026 17:08:32 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E6=8C=87=E6=91=98=E7=82=B9=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/0015.gasoline/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction index f3af49799c..d5fbca4d02 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ガソリン","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','{"text":"攻撃した敵の火耐性を大きく下げる"}','{"text":"⚠誤飲注意","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','{"text":"攻撃した敵の火耐性-30%","color":"red"}','{"text":"⚠誤飲注意","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From 2ca7713d63a179759e159044d27c6d4d52b30c90 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Wed, 17 Jun 2026 17:30:15 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=95=E9=87=8F?= =?UTF-8?q?=E3=81=AE=E5=AE=9A=E7=BE=A9=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/0015.gasoline/give/2.give.mcfunction | 2 +- .../functions/artifact/0015.gasoline/melee/3.main.mcfunction | 1 + .../functions/effect/0372.gasoline/modifier/add.mcfunction | 5 +++-- .../asset/functions/effect/0372.gasoline/register.mcfunction | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction index d5fbca4d02..b49eb5f364 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ガソリン","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','{"text":"攻撃した敵の火耐性-30%","color":"red"}','{"text":"⚠誤飲注意","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','[{"text":"攻撃した敵の","color":"white"},{"text":"火耐性-30%","color":"red"}]','{"text":"⚠誤飲注意","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction index 1a620de39a..4e4a5ff749 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/melee/3.main.mcfunction @@ -20,5 +20,6 @@ # デバフ(ガソリン)付与 data modify storage api: Argument.ID set value 372 data modify storage api: Argument.Duration set value 200 + data modify storage api: Argument.FieldOverride.Amount set value -0.3d execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction index 5a85dfa474..4e4ef86e2b 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/modifier/add.mcfunction @@ -6,6 +6,7 @@ # 火耐性低下 data modify storage api: Argument.UUID set value [I;1,3,372,0] - data modify storage api: Argument.Amount set value -0.3 - data modify storage api: Argument.Operation set value "multiply" + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + data modify storage api: Argument.Operation set value "add" function api:modifier/defense/fire/add diff --git a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction index a139b8226b..7c3f1edaa9 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction @@ -11,7 +11,7 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"ガソリン","color":"#947C62"}' # 説明文 (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) From 48b61f6da934eef9a34d238ee2c3eeaa1fa11f85 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 18:36:55 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=A9=9F=E7=99=BB?= =?UTF-8?q?=E9=8C=B2(lv1red)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/0015.gasoline/register.mcfunction | 8 ++++++++ Asset/data/asset/tags/functions/artifact/register.json | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/0015.gasoline/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/register.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/register.mcfunction new file mode 100644 index 0000000000..4aa847c337 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0015.gasoline/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0015.gasoline/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[1] append value [15] +data modify storage asset:artifact RarityRegistryWithColor.Red[1] append value [15] diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index bb157c2708..c91f7df5a9 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/0015.gasoline/register", "asset:artifact/1409.mana_charm/register", "asset:artifact/1327.lunatic_torch/register", "asset:artifact/1332.bebebeam/register", @@ -311,4 +312,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From 207aa3a0599a7700c581bbe24dc6c41d53a6f888 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 18:39:06 +0900 Subject: [PATCH 7/8] =?UTF-8?q?conflict=E3=81=AE=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Asset/data/asset/tags/functions/artifact/register.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index cce24be81b..15dcf56740 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,13 +1,10 @@ { "values": [ -<<<<<<< HEAD "asset:artifact/0015.gasoline/register", -======= "asset:artifact/1534.drop_in_the_bucket/register", "asset:artifact/1365.shaved_ice_blue_hawaii/register", "asset:artifact/1366.shaved_ice_melon/register", "asset:artifact/1364.shaved_ice_strawberry/register", ->>>>>>> dc6d9830a24210828f614293298d7b3d324711b2 "asset:artifact/1409.mana_charm/register", "asset:artifact/1327.lunatic_torch/register", "asset:artifact/1332.bebebeam/register", @@ -319,4 +316,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} \ No newline at end of file +} From 9c99ea3482de968ec192f01d4f7760f18a36c195 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 23:51:35 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E6=8C=87=E6=91=98=E7=82=B9=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/0015.gasoline/give/2.give.mcfunction | 2 +- .../artifact/0015.gasoline/use_item/3.main.mcfunction | 3 +++ .../asset/functions/effect/0372.gasoline/register.mcfunction | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction index b49eb5f364..74379c4670 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ガソリン","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','[{"text":"攻撃した敵の","color":"white"},{"text":"火耐性-30%","color":"red"}]','{"text":"⚠誤飲注意","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"大量のガソリンをぶっかけて攻撃する"}','[{"text":"攻撃した敵に","color":"white"},{"text":"火耐性-30%","color":"red"},{"text":"を10秒間付与する","color":"white"}]','{"text":"⚠誤飲注意","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction index 5ac6772bee..8b637f7072 100644 --- a/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0015.gasoline/use_item/3.main.mcfunction @@ -19,3 +19,6 @@ data modify storage api: Argument.ElementType set value "None" data modify storage api: Argument.DeathMessage append value '[{"translate":"%1$sはガソリン中毒で死んだ","with":[{"selector":"@s"}]}]' data modify storage api: Argument.DeathMessage append value '[{"translate":"%1$sは自分を車と勘違いした","with":[{"selector":"@s"}]}]' + function api:damage/modifier + function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction index 7c3f1edaa9..2e692140a7 100644 --- a/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction +++ b/Asset/data/asset/functions/effect/0372.gasoline/register.mcfunction @@ -29,11 +29,11 @@ # 死亡時のエフェクトの処理 (default = "remove") # data modify storage asset:effect ProcessOnDied set value # 消すのに必要なレベル (int) (default = 1) - data modify storage asset:effect RequireClearLv set value 1 + data modify storage asset:effect RequireClearLv set value 3 # エフェクトをUIに表示するか (boolean) (default = true) data modify storage asset:effect Visible set value true # エフェクトのスタックををUIに表示するか (boolean) (default = true) - # data modify storage asset:effect StackVisible set value + data modify storage asset:effect StackVisible set value false # フィールド # data modify storage asset:effect Field set value {}