diff --git a/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/1.trigger.mcfunction new file mode 100644 index 0000000000..4f26bf5aed --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1674.bouncy_launcher/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1674} run function asset:artifact/1674.bouncy_launcher/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/2.give.mcfunction new file mode 100644 index 0000000000..c662210df0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1674.bouncy_launcher/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1674.bouncy_launcher/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1674 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"バウンシーランチャー","color":"#FFA7D8"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"壁や床、敵で跳ね返る魔法のボールを発射する"}','{"text":"敵にあたった時35回まで近くの敵に向かって跳ね返る"}','{"text":"「スーパーボールって何なの?」","color":"gray"}','{"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 + # 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 [5] +# 攻撃に関する情報 -攻撃タイプ (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 30 +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + data modify storage asset:artifact MPHealWhenHit set value 1 +# 神器のクールダウン (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 "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/1674.bouncy_launcher/register.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/register.mcfunction new file mode 100644 index 0000000000..28bffce4e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1674.bouncy_launcher/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1674] +data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [1674] diff --git a/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..47b5e468b9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1674.bouncy_launcher/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:1674} run function asset:artifact/1674.bouncy_launcher/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..62ff102acd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1674.bouncy_launcher/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1674.bouncy_launcher/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/1674.bouncy_launcher/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/3.main.mcfunction new file mode 100644 index 0000000000..1be72bf9bd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1674.bouncy_launcher/trigger/3.main.mcfunction @@ -0,0 +1,24 @@ +#> asset:artifact/1674.bouncy_launcher/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1674.bouncy_launcher/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 召喚 + data modify storage api: Argument.ID set value 1204 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.Damage set value 5d + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + #反射回数上限 + data modify storage api: Argument.FieldOverride.ReflectionLimit set value 35 + #射程(Range*0.4m) + data modify storage api: Argument.FieldOverride.Range set value 75 + execute anchored eyes positioned ^ ^ ^ run function api:object/summon + +#vfx + execute anchored eyes positioned ^ ^ ^0.5 run playsound tsb_sounds:launcher_shot player @s ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/_index.d.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/_index.d.mcfunction new file mode 100644 index 0000000000..51ae98d268 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/_index.d.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1204.bouncy_ball/_index.d +# @private + +#> score_holder +# @within function asset:object/1204.bouncy_ball/** + #declare score_holder $HitEnemyID + +#> tag +# @within function asset:object/1204.bouncy_ball/** + #declare tag 1AI.Owner + #declare tag 1AI.HitEnemy diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..b1bc3fa5ce --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_block/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1204.bouncy_ball/detect_hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/detect_hit_block + +# 判定 + execute unless block ^ ^ ^0.4 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.8 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..ddafc39f9a --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/detect_hit_entity/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1204.bouncy_ball/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/detect_hit_entity + +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_block/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_block/.mcfunction new file mode 100644 index 0000000000..1b28631668 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_block/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1204.bouncy_ball/hit_block/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/hit_block + +# 反射距離を何ブロック先が埋まってるかで調整する + execute unless block ^ ^ ^0.8 #lib:no_collision/ run scoreboard players set $Speed Lib 8 + execute unless block ^ ^ ^0.4 #lib:no_collision/ run scoreboard players set $Speed Lib 4 + function lib:reflection_bullet/ +#vfx + playsound minecraft:block.slime_block.fall player @a ~ ~ ~ 1.0 1 0.0 +#当たった敵の情報をリセット + data modify storage asset:context this.HitEnemyID set value -1 diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/.mcfunction new file mode 100644 index 0000000000..0de5ac6531 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/.mcfunction @@ -0,0 +1,47 @@ +#> asset:object/1204.bouncy_ball/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/hit_entity + +#> private +# @private + #declare score_holder $OwnerID + +#Hitした敵にTagを付与 + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @s add 1AI.HitEnemy + +#直前にヒットしている敵ならリセットしてreturn + execute store result score $HitEnemyID Temporary run data get storage asset:context this.HitEnemyID + execute if score @e[tag=1AI.HitEnemy,tag=!ExtendedCollision,distance=..5,sort=nearest,limit=1] MobUUID = $HitEnemyID Temporary run return run function asset:object/1204.bouncy_ball/hit_entity/reset + execute if score @e[tag=1AI.HitEnemy,tag=ExtendedCollision,distance=..5,sort=nearest,limit=1] ForwardTargetMobUUID = $HitEnemyID Temporary run return run function asset:object/1204.bouncy_ball/hit_entity/reset +#vfx + playsound minecraft:block.slime_block.fall player @a ~ ~ ~ 1.0 1 0.0 + particle block pink_wool ~ ~ ~ 0 0 0 1 20 + +# オーナーの特定 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $OwnerID Temporary run tag @s add 1AI.Owner + +#ダメージ処理 + execute as @e[tag=1AI.HitEnemy,distance=..5,sort=nearest,limit=1] run function asset:object/1204.bouncy_ball/hit_entity/damage + +# 同じMobの本体・当たり判定も反射先の候補から外す + execute store result score $HitEnemyID Temporary run data get storage asset:context this.HitEnemyID + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!1AI.HitEnemy,distance=..12] if score @s MobUUID = $HitEnemyID Temporary run tag @s add 1AI.HitEnemy + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=ExtendedCollision,tag=!1AI.HitEnemy,distance=..12] if score @s ForwardTargetMobUUID = $HitEnemyID Temporary run tag @s add 1AI.HitEnemy + +# リセット + scoreboard players reset $OwnerID Temporary + scoreboard players reset $HitEnemyID Temporary + tag @a remove 1AI.Owner + +#反射回数が0になったら玉を消す + execute if data storage asset:context this{ReflectionLimit:0} run function asset:object/call.m {method:"kill"} + +#12m以内に敵がいるなら、向きを変える。そうでない時はランダムな向きに向く + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!1AI.HitEnemy,tag=!Uninterferable,distance=..12] run function asset:object/1204.bouncy_ball/hit_entity/reflect + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!1AI.HitEnemy,tag=!Uninterferable,distance=..12] run function asset:object/1204.bouncy_ball/hit_entity/random_direction + +#ヒットタグもリセット + tag @e[type=#lib:living_without_player,tag=1AI.HitEnemy,distance=..64] remove 1AI.HitEnemy diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/damage.mcfunction new file mode 100644 index 0000000000..d070410f9c --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/damage.mcfunction @@ -0,0 +1,30 @@ +#> asset:object/1204.bouncy_ball/hit_entity/damage +# +# +# +# @within function asset:object/1204.bouncy_ball/hit_entity/ + +#> private +# @private + #declare score_holder $Range + +#ヒットした敵のIDを取得 + execute if entity @s[tag=!ExtendedCollision] store result storage asset:context this.HitEnemyID int 1 run scoreboard players get @s MobUUID + execute if entity @s[tag=ExtendedCollision] store result storage asset:context this.HitEnemyID int 1 run scoreboard players get @s ForwardTargetMobUUID + +# ダメージ + 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" + execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + execute if entity @a[tag=1AI.Owner] as @a[tag=1AI.Owner] run function api:damage/modifier + function api:damage/ + function api:damage/reset + +# 射程を5だけ延長 + execute store result score $Range Temporary run data get storage asset:context this.RemainingRange 1 + scoreboard players operation $Range Temporary += $5 Const + execute store result storage asset:context this.RemainingRange int 1 run scoreboard players get $Range Temporary + +# リセット + scoreboard players reset $Range Temporary diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/random_direction.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/random_direction.mcfunction new file mode 100644 index 0000000000..e6cc015a85 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/random_direction.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1204.bouncy_ball/hit_entity/random_direction +# +# +# +# @within function asset:object/1204.bouncy_ball/hit_entity/ + +#> SpreadLib + # @private + #declare tag SpreadMarker + + # 拡散させるEntityを召喚する + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + # 拡散 + data modify storage lib: Argument.Bounds set value [[1d,1d],[0.4d,0.4d],[1d,1d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..3,limit=1] at @s run function lib:spread_entity/ + # 拡散させたEntityの位置に向く + tp @s ^ ^ ^ facing entity @e[type=marker,tag=SpreadMarker,distance=..3,limit=1] feet + # リセット + kill @e[type=marker,tag=SpreadMarker,distance=..3] diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reflect.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reflect.mcfunction new file mode 100644 index 0000000000..5bf0453a3f --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reflect.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1204.bouncy_ball/hit_entity/reflect +# +# +# +# @within function asset:object/1204.bouncy_ball/hit_entity/ + +#反射回数を1減らす + execute store result storage asset:context this.ReflectionLimit int 0.9999999999 run data get storage asset:context this.ReflectionLimit 1 +#向きを変える + tp @s ^ ^ ^ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!1AI.HitEnemy,tag=!Uninterferable,distance=..12,sort=random,limit=1] eyes diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reset.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reset.mcfunction new file mode 100644 index 0000000000..e4bddd85b6 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/hit_entity/reset.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1204.bouncy_ball/hit_entity/reset +# +# +# +# @within function asset:object/1204.bouncy_ball/hit_entity/ + +# リセット + scoreboard players reset $HitEnemyID Temporary + tag @e[type=#lib:living_without_player,distance=..5] remove 1AI.HitEnemy diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/kill/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/kill/.mcfunction new file mode 100644 index 0000000000..9e6b50e70b --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/kill/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1204.bouncy_ball/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/kill + +# 演出 + playsound tsb_sounds:rifle_shot neutral @a ~ ~ ~ 1 1.8 + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/recursive/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/recursive/.mcfunction new file mode 100644 index 0000000000..15d3521384 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1204.bouncy_ball/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1204/recursive + +# 演出 + particle dust 0.804 0.31 1 1 diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/register.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/register.mcfunction new file mode 100644 index 0000000000..130e7edd73 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/register.mcfunction @@ -0,0 +1,28 @@ +#> asset:object/1204.bouncy_ball/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1204/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(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 1204 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value + data modify storage asset:object Field.Speed set value 2 + data modify storage asset:object Field.Range set value 60 + data modify storage asset:object Field.MovePerStep set value 0.4 + data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.AdditionalMPHeal set value 1 + data modify storage asset:object Field.UserID set value -1 + data modify storage asset:object Field.ReflectionLimit set value 1 + data modify storage asset:object Field.HitEnemyID set value -1 diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/summon/.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/summon/.mcfunction new file mode 100644 index 0000000000..7f64f252f8 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1204.bouncy_ball/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1204/summon + +# 召喚 + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1204.bouncy_ball/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1204.bouncy_ball/summon/m.mcfunction b/Asset/data/asset/functions/object/1204.bouncy_ball/summon/m.mcfunction new file mode 100644 index 0000000000..15f21bf676 --- /dev/null +++ b/Asset/data/asset/functions/object/1204.bouncy_ball/summon/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1204.bouncy_ball/summon/m +# +# +# +# @within function asset:object/1204.bouncy_ball/summon/ + +# 元となるEntityを召喚する + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,billboard:"center",item:{id:"minecraft:potion",Count:1b,tag:{CustomModelData:20234,CustomPotionColor:16754647}}} diff --git a/Asset/data/asset/functions/object/alias/1204/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/1204/detect_hit_block.mcfunction new file mode 100644 index 0000000000..7ba79c4dff --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/detect_hit_block/ diff --git a/Asset/data/asset/functions/object/alias/1204/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1204/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..73235f7264 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/detect_hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1204/hit_block.mcfunction b/Asset/data/asset/functions/object/alias/1204/hit_block.mcfunction new file mode 100644 index 0000000000..34da62ad0e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/hit_block/ diff --git a/Asset/data/asset/functions/object/alias/1204/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1204/hit_entity.mcfunction new file mode 100644 index 0000000000..5569997efd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1204/kill.mcfunction b/Asset/data/asset/functions/object/alias/1204/kill.mcfunction new file mode 100644 index 0000000000..7f23603fb5 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/kill/ diff --git a/Asset/data/asset/functions/object/alias/1204/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1204/recursive.mcfunction new file mode 100644 index 0000000000..3f5550f018 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1204.bouncy_ball/recursive/ diff --git a/Asset/data/asset/functions/object/alias/1204/register.mcfunction b/Asset/data/asset/functions/object/alias/1204/register.mcfunction new file mode 100644 index 0000000000..e9e4409c23 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1204.bouncy_ball/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1204/summon.mcfunction b/Asset/data/asset/functions/object/alias/1204/summon.mcfunction new file mode 100644 index 0000000000..3bef308f7c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1204/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1204/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1204.bouncy_ball/summon/ \ 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 b52518691d..5985e377e7 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/1674.bouncy_launcher/trigger/1.trigger", "asset:artifact/1661.starlight_circle/trigger/1.trigger", "asset:artifact/1662.salmon_canon/trigger/1.trigger", "asset:artifact/1632.photon_burst/trigger/1.trigger", @@ -181,4 +182,4 @@ "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 a362a1954c..e0360eab27 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/1674.bouncy_launcher/give/1.trigger", "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1390.red_refraction_prism/give/1.trigger", "asset:artifact/1662.salmon_canon/give/1.trigger", @@ -568,4 +569,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 26a2324e12..3e69994f55 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/1674.bouncy_launcher/register", "asset:artifact/1661.starlight_circle/register", "asset:artifact/1662.salmon_canon/register", "asset:artifact/1626.years_magic_index/register", @@ -337,4 +338,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file