From 52d5fb85401d1852598c44c6fb8f86b49fcba807 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:17:58 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1332.bebebeam/give/1.trigger.mcfunction | 7 ++ .../1332.bebebeam/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1332.bebebeam/register.mcfunction | 7 ++ .../1332.bebebeam/trigger/0.load.mcfunction | 11 +++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1332.bebebeam/trigger/3.main.mcfunction | 29 ++++++++ .../1332.bebebeam/trigger/_index.d.mcfunction | 6 ++ .../1332.bebebeam/trigger/beam/.mcfunction | 30 ++++++++ .../trigger/beam/damage.mcfunction | 17 +++++ .../trigger/beam/recursive.mcfunction | 21 ++++++ .../trigger/beam/summon_object.mcfunction | 18 +++++ .../1332.bebebeam/trigger/loop/.mcfunction | 11 +++ .../trigger/loop/main.mcfunction | 24 +++++++ .../trigger/rejoin_process.mcfunction | 8 +++ .../1332.bebebeam/trigger/reset.mcfunction | 10 +++ .../artifact/click.carrot_on_a_stick.json | 6 +- .../asset/tags/functions/artifact/give.json | 3 +- .../asset/tags/functions/artifact/load.json | 3 +- .../tags/functions/artifact/register.json | 3 +- Asset/data/asset/tags/functions/rejoin.json | 3 +- 21 files changed, 297 insertions(+), 8 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/0.load.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/damage.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/give/1.trigger.mcfunction new file mode 100644 index 00000000000..bb7a084ab2d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1332.bebebeam/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1332} run function asset:artifact/1332.bebebeam/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction new file mode 100644 index 00000000000..85193b2cb6e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1332.bebebeam/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1332.bebebeam/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1332 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ビビビーム","color":"light_purple"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"translate":"%1$s・%2$s・%3$s属性の順で3連続でビームを放つ","color":"white","with":[{"text":"火","color":"red"},{"text":"水","color":"aqua"},{"text":"雷","color":"yellow"}]}]','{"text":"ホットバーに追加で1本持つたびに、発射数が1本増加する","color":"white"}'] +# 消費アイテム ({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 "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value "60-80x3" +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder] +# 攻撃に関する情報 -防御無視 (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 16 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 50 +# 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 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + 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 ["Flora", "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/1332.bebebeam/register.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/register.mcfunction new file mode 100644 index 00000000000..1e91c3c5e56 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1332.bebebeam/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1332] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/0.load.mcfunction new file mode 100644 index 00000000000..2f6088a1696 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/0.load.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1332.bebebeam/trigger/0.load +# +# 神器に利用するスコアボード等の初期化処理 +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @within function asset:artifact/1332.bebebeam/trigger/** + scoreboard objectives add 110.Tick dummy + scoreboard objectives add 110.Count dummy + scoreboard objectives add 110.Element dummy diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..c53d31ad0af --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1332.bebebeam/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:1332} run function asset:artifact/1332.bebebeam/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..3f966323ae0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1332.bebebeam/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1332.bebebeam/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/1332.bebebeam/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/3.main.mcfunction new file mode 100644 index 00000000000..47250de80bf --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/3.main.mcfunction @@ -0,0 +1,29 @@ +#> asset:artifact/1332.bebebeam/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1332.bebebeam/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 個数取得 + execute store result score @s 110.Count if data storage asset:context Items.hotbar[{tag:{TSB:{ID:1332}}}] + +# 個数+2を発射数とする + scoreboard players add @s 110.Count 2 + +# スコア初期化 + scoreboard players set @s 110.Tick 0 + scoreboard players set @s 110.Element -1 + +# まず1発発射する + function asset:artifact/1332.bebebeam/trigger/beam/ + +# ループ開始 + schedule function asset:artifact/1332.bebebeam/trigger/loop/ 1t replace + +# リセット + # scoreboard players reset @s 110.Count diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/_index.d.mcfunction new file mode 100644 index 00000000000..9b49a408a27 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1332.bebebeam/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1332.bebebeam/trigger/** + #declare score_holder $110.Range diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction new file mode 100644 index 00000000000..00283725552 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction @@ -0,0 +1,30 @@ +#> asset:artifact/1332.bebebeam/trigger/beam/ +# +# +# +# @within function +# asset:artifact/1332.bebebeam/trigger/3.main +# asset:artifact/1332.bebebeam/trigger/loop/main + +# 演出 + playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.3 1.5 + playsound ogg:block.respawn_anchor.deplete2 player @a ~ ~ ~ 0.7 1.5 + +# 発射数のデクリメント + scoreboard players remove @s 110.Count 1 + +# 属性管理スコアの管理 +# 0:火, 1:水, 2:雷 +# インクリメントし、3以上なら0に戻す + scoreboard players add @s 110.Element 1 + execute if score @s 110.Element matches 3.. run scoreboard players set @s 110.Element 0 + +# 再帰でヒット判定 兼 演出用に何ブロックまで視線が通っているかチェック + scoreboard players set $110.Range Temporary 0 + execute anchored eyes positioned ^ ^ ^ run function asset:artifact/1332.bebebeam/trigger/beam/recursive + +# レーザー演出Object召喚 + function asset:artifact/1332.bebebeam/trigger/beam/summon_object + +# リセット + scoreboard players reset $110.Range diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/damage.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/damage.mcfunction new file mode 100644 index 00000000000..ef5a46ce130 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/damage.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1332.bebebeam/trigger/beam/damage +# +# +# +# @within function asset:artifact/1332.bebebeam/trigger/beam/recursive + +# 属性設定 + execute if score @s 110.Element matches 0 run data modify storage api: Argument.ElementType set value "Fire" + execute if score @s 110.Element matches 1 run data modify storage api: Argument.ElementType set value "Water" + execute if score @s 110.Element matches 2 run data modify storage api: Argument.ElementType set value "Thunder" + +# ダメージ + execute store result storage api: Argument.Damage float 1 run random value 60..80 + data modify storage api: Argument.AttackType set value "Magic" + function api:damage/modifier + execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction new file mode 100644 index 00000000000..344fcb32690 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1332.bebebeam/trigger/beam/recursive +# +# +# +# @within function +# asset:artifact/1332.bebebeam/trigger/beam/ +# asset:artifact/1332.bebebeam/trigger/beam/recursive + +# Rangeのインクリメント + scoreboard players add $110.Range Temporary 1 + +# 演出 + execute if score @s 110.Element matches 0 run particle dust 0.8 0.4 0 0.5 ~ ~ ~ 0.05 0.05 0.05 0 1 + execute if score @s 110.Element matches 1 run particle dust 0.216 0.675 1 0.5 ~ ~ ~ 0.05 0.05 0.05 0 1 + execute if score @s 110.Element matches 2 run particle dust 1 0.976 0.337 0.5 ~ ~ ~ 0.05 0.05 0.05 0 1 + +# 敵がいたらダメージを与え、再帰終了 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run return run function asset:artifact/1332.bebebeam/trigger/beam/damage + +# 再帰 + execute if score $110.Range Temporary matches ..32 positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:artifact/1332.bebebeam/trigger/beam/recursive diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction new file mode 100644 index 00000000000..664a5ab398e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1332.bebebeam/trigger/beam/summon_object +# +# +# +# @within function asset:artifact/1332.bebebeam/trigger/beam/ + +# データ設定 + data modify storage api: Argument.ID set value 2168 + data modify storage api: Argument.FieldOverride set value {Scale:[0.25f,0f,0.25f],Color:0,DisappearInterpolation:2,LifeTime:7} + execute store result storage api: Argument.FieldOverride.Scale[1] float 1 run scoreboard players get $110.Range Temporary + +# 属性に応じて色を変える + execute if score @s 110.Element matches 0 run data modify storage api: Argument.FieldOverride.Color set value 16728852 + execute if score @s 110.Element matches 1 run data modify storage api: Argument.FieldOverride.Color set value 4685567 + execute if score @s 110.Element matches 2 run data modify storage api: Argument.FieldOverride.Color set value 16772431 + +# 召喚 + execute anchored eyes positioned ^ ^0 ^0.4 run function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/.mcfunction new file mode 100644 index 00000000000..b7a2435cdf4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1332.bebebeam/trigger/loop/ +# +# +# +# @within function +# asset:artifact/1332.bebebeam/trigger/3.main +# asset:artifact/1332.bebebeam/trigger/loop/main +# asset:artifact/1332.bebebeam/trigger/rejoin_process + +# + execute as @a[scores={110.Count=1..}] at @s run function asset:artifact/1332.bebebeam/trigger/loop/main diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction new file mode 100644 index 00000000000..08da7df7a91 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction @@ -0,0 +1,24 @@ +#> asset:artifact/1332.bebebeam/trigger/loop/main +# +# +# +# @within function asset:artifact/1332.bebebeam/trigger/loop/ + +#> Private +# @private + #declare score_holder $110.Interval + +# Tickのインクリメント + scoreboard players add @s 110.Tick 1 + +# Ntickに1回発射 + scoreboard players operation $110.Interval Temporary = @s 110.Tick + scoreboard players operation $110.Interval Temporary %= $3 Const + execute if score $110.Interval Temporary matches 0 run function asset:artifact/1332.bebebeam/trigger/beam/ + scoreboard players reset $110.Interval Temporary + +# Countが0ならリセット + execute if score @s 110.Count matches ..0 run function asset:artifact/1332.bebebeam/trigger/reset + +# ループ + schedule function asset:artifact/1332.bebebeam/trigger/loop/ 1t replace diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/rejoin_process.mcfunction new file mode 100644 index 00000000000..d40bd7aa2fe --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/rejoin_process.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1332.bebebeam/trigger/rejoin_process +# +# 使い方は必ずwikiを見ること +# +# @within tag/function asset:rejoin + +# ループ + schedule function asset:artifact/1332.bebebeam/trigger/loop/ 1t replace diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction new file mode 100644 index 00000000000..adeac8aa709 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1332.bebebeam/trigger/reset @s +# +# +# +# @within function asset:artifact/1332.bebebeam/trigger/loop/main + +# スコアを諸々リセット + scoreboard players reset @s 110.Tick + scoreboard players reset @s 110.Count + scoreboard players reset @s 110.Element 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 5864dbd3668..c9de5ff6588 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/1332.bebebeam/trigger/1.trigger", "asset:artifact/0005.musket_matchlock/trigger/1.trigger", "asset:artifact/0017.harmful_books/trigger/1.trigger", "asset:artifact/0075.whirlpool_wand/trigger/1.trigger", @@ -90,7 +91,6 @@ "asset:artifact/1265.thunder_ray/trigger/1.trigger", "asset:artifact/1270.raging_passion_pickaxe/trigger/1.trigger", "asset:artifact/1272.big_water_launcher/trigger/1.trigger", - "asset:artifact/0001.book_of_all-seeing/trigger/1.trigger", "asset:artifact/0002.blessing/trigger/1.trigger", "asset:artifact/0007.nitrogen_fixater/trigger/1.trigger", @@ -175,8 +175,6 @@ "asset:artifact/1284.quiver/trigger/1.trigger", "asset:artifact/1285.torch_bag/trigger/1.trigger", "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", - "asset:artifact/0019.scripture/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 f3eb0088574..658c6ba0006 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/1332.bebebeam/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,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/load.json b/Asset/data/asset/tags/functions/artifact/load.json index 0a71fdc1af4..b929e812c1e 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1332.bebebeam/trigger/0.load", "asset:artifact/1220.sacred_hardener/trigger/0.load", "asset:artifact/1269.apocalypse/trigger/0.load", "asset:artifact/1061.hekireki/trigger/0.load", @@ -59,4 +60,4 @@ "asset:artifact/0270.angel_ray_lv.10/trigger/0.load", "asset:artifact/0431.weather_lock_cane/trigger/0.load" ] -} +} \ 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 deba1661508..55303cdb0a6 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/1332.bebebeam/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ 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 ca398dcb160..1319842a09b 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1332.bebebeam/trigger/rejoin_process", "asset:artifact/1220.sacred_hardener/trigger/rejoin_process", "asset:artifact/1206.triple_sparkle_bomb/trigger/rejoin_process", "asset:artifact/1251.scale_of_arbit/trigger/rejoin_process", @@ -24,4 +25,4 @@ "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", "asset:artifact/0373.ice_sorcery/trigger/rejoin_process" ] -} +} \ No newline at end of file From 8363e32db1393b51962a0b28421e0f24d89fe747 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 10 Dec 2025 00:28:31 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=81=8C=E6=8B=A1=E6=95=A3=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1332.bebebeam/trigger/beam/.mcfunction | 20 ++++++++++--------- .../trigger/beam/recursive.mcfunction | 2 +- .../trigger/beam/shoot.mcfunction | 15 ++++++++++++++ .../trigger/beam/summon_object.mcfunction | 2 +- 4 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/shoot.mcfunction diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction index 00283725552..00babbde5d3 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction @@ -6,6 +6,10 @@ # asset:artifact/1332.bebebeam/trigger/3.main # asset:artifact/1332.bebebeam/trigger/loop/main +#> Private +# @private + #declare tag SpreadMarker + # 演出 playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.3 1.5 playsound ogg:block.respawn_anchor.deplete2 player @a ~ ~ ~ 0.7 1.5 @@ -19,12 +23,10 @@ scoreboard players add @s 110.Element 1 execute if score @s 110.Element matches 3.. run scoreboard players set @s 110.Element 0 -# 再帰でヒット判定 兼 演出用に何ブロックまで視線が通っているかチェック - scoreboard players set $110.Range Temporary 0 - execute anchored eyes positioned ^ ^ ^ run function asset:artifact/1332.bebebeam/trigger/beam/recursive - -# レーザー演出Object召喚 - function asset:artifact/1332.bebebeam/trigger/beam/summon_object - -# リセット - scoreboard players reset $110.Range +# 実行位置を拡散させランダムにする + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Distance set value 0.5 + data modify storage lib: Argument.Spread set value 0.5 + execute as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle + execute positioned as @e[type=marker,tag=SpreadMarker,limit=1] run function asset:artifact/1332.bebebeam/trigger/beam/shoot + kill @e[type=marker,tag=SpreadMarker,distance=..5] diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction index 344fcb32690..60cd9070370 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/recursive.mcfunction @@ -3,7 +3,7 @@ # # # @within function -# asset:artifact/1332.bebebeam/trigger/beam/ +# asset:artifact/1332.bebebeam/trigger/beam/shoot # asset:artifact/1332.bebebeam/trigger/beam/recursive # Rangeのインクリメント diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/shoot.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/shoot.mcfunction new file mode 100644 index 00000000000..6a3ca40ada3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/shoot.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1332.bebebeam/trigger/beam/shoot +# +# +# +# @within function asset:artifact/1332.bebebeam/trigger/beam/ + +# 再帰でヒット判定 兼 演出用に何ブロックまで視線が通っているかチェック + scoreboard players set $110.Range Temporary 0 + execute anchored eyes positioned ^ ^ ^ run function asset:artifact/1332.bebebeam/trigger/beam/recursive + +# レーザー演出Object召喚 + function asset:artifact/1332.bebebeam/trigger/beam/summon_object + +# リセット + scoreboard players reset $110.Range diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction index 664a5ab398e..a8b343c28cd 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/summon_object.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:artifact/1332.bebebeam/trigger/beam/ +# @within function asset:artifact/1332.bebebeam/trigger/beam/shoot # データ設定 data modify storage api: Argument.ID set value 2168 From 9deb7efb6d63acac5268be17672f3debd029947e 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: Wed, 10 Dec 2025 00:53:54 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=89=E3=81=AA=E3=81=A8=E3=81=93?= =?UTF-8?q?=E3=81=AB@s=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1332.bebebeam/trigger/reset.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction index adeac8aa709..00912a49036 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/reset.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/1332.bebebeam/trigger/reset @s +#> asset:artifact/1332.bebebeam/trigger/reset # # # From 1adc76914337b4fbe0139af0adcfa7b0796abbed Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 12 Dec 2025 23:32:34 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1332.bebebeam/give/2.give.mcfunction | 2 +- .../functions/artifact/1332.bebebeam/trigger/beam/.mcfunction | 2 +- .../artifact/1332.bebebeam/trigger/loop/main.mcfunction | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction index 85193b2cb6e..d9ddce947b9 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/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 ['[{"translate":"%1$s・%2$s・%3$s属性の順で3連続でビームを放つ","color":"white","with":[{"text":"火","color":"red"},{"text":"水","color":"aqua"},{"text":"雷","color":"yellow"}]}]','{"text":"ホットバーに追加で1本持つたびに、発射数が1本増加する","color":"white"}'] + data modify storage asset:artifact Lore set value ['[{"translate":"%1$s・%2$s・%3$s属性の順でに、連続でビームを放つ","color":"white","with":[{"text":"火","color":"red"},{"text":"水","color":"aqua"},{"text":"雷","color":"yellow"}]}]','{"text":"ホットバーに追加で1本持つたびに、発射数が1本増加する","color":"white"}'] # 消費アイテム ({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/1332.bebebeam/trigger/beam/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction index 00babbde5d3..b578c7f23b2 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction @@ -11,7 +11,7 @@ #declare tag SpreadMarker # 演出 - playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.3 1.5 + playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.3 1.8 playsound ogg:block.respawn_anchor.deplete2 player @a ~ ~ ~ 0.7 1.5 # 発射数のデクリメント diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction index 08da7df7a91..f8d1151536e 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/loop/main.mcfunction @@ -13,7 +13,7 @@ # Ntickに1回発射 scoreboard players operation $110.Interval Temporary = @s 110.Tick - scoreboard players operation $110.Interval Temporary %= $3 Const + scoreboard players operation $110.Interval Temporary %= $4 Const execute if score $110.Interval Temporary matches 0 run function asset:artifact/1332.bebebeam/trigger/beam/ scoreboard players reset $110.Interval Temporary From 763dd9c924e6396ff0aa670a80e640049c0b186a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 14 Dec 2025 15:50:39 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Lore=E3=82=92=E3=82=8F=E3=81=8B=E3=82=8A?= =?UTF-8?q?=E3=82=84=E3=81=99=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1332.bebebeam/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction index d9ddce947b9..e5063704291 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/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 ['[{"translate":"%1$s・%2$s・%3$s属性の順でに、連続でビームを放つ","color":"white","with":[{"text":"火","color":"red"},{"text":"水","color":"aqua"},{"text":"雷","color":"yellow"}]}]','{"text":"ホットバーに追加で1本持つたびに、発射数が1本増加する","color":"white"}'] + data modify storage asset:artifact Lore set value ['[{"translate":"%1$s・%2$s・%3$s属性の順に、連続でビームを放つ","color":"white","with":[{"text":"火","color":"red"},{"text":"水","color":"aqua"},{"text":"雷","color":"yellow"}]}]','[{"text":"この神器をホットバーに追加で1本持つたびに、発射数が1本増加する","color":"white"}]'] # 消費アイテム ({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 f47f86d5f149db6b8672488f10375f65ab4708b3 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 14 Dec 2025 16:12:25 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E9=9F=B3=E9=87=8F=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1332.bebebeam/trigger/beam/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction index b578c7f23b2..854307f1afc 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction @@ -11,7 +11,7 @@ #declare tag SpreadMarker # 演出 - playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.3 1.8 + playsound tsb_sounds:blaster2 player @a ~ ~ ~ 0.2 1.8 playsound ogg:block.respawn_anchor.deplete2 player @a ~ ~ ~ 0.7 1.5 # 発射数のデクリメント From d7b65dbfb2252ca65f56c88c43cdaae52e8b0fcc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 14 Dec 2025 16:16:17 +0900 Subject: [PATCH 7/7] =?UTF-8?q?distance=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1332.bebebeam/trigger/beam/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction index 854307f1afc..994f0124c7b 100644 --- a/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction +++ b/Asset/data/asset/functions/artifact/1332.bebebeam/trigger/beam/.mcfunction @@ -27,6 +27,6 @@ summon marker ~ ~ ~ {Tags:["SpreadMarker"]} data modify storage lib: Argument.Distance set value 0.5 data modify storage lib: Argument.Spread set value 0.5 - execute as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle - execute positioned as @e[type=marker,tag=SpreadMarker,limit=1] run function asset:artifact/1332.bebebeam/trigger/beam/shoot + execute as @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] run function lib:forward_spreader/circle + execute positioned as @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] run function asset:artifact/1332.bebebeam/trigger/beam/shoot kill @e[type=marker,tag=SpreadMarker,distance=..5]