Skip to content

Commit

Permalink
飛ぶ斬撃オブジェクト移行
Browse files Browse the repository at this point in the history
  • Loading branch information
mokkkk committed Jan 5, 2025
1 parent 4f3345e commit fc0df46
Show file tree
Hide file tree
Showing 21 changed files with 255 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
function asset:mob/0327.eclael/tick/app.general/12.end_guard_prepare

# デバッグ用強制再生
tag @s add 93.Skill.Latter.Shot
tag @s add 93.Phase.HardLatter
tag @s add 93.Skill.Latter.SpinSlash
# tag @s add 93.Phase.HardLatter
# tag @s add 93.Temp.MoveToLeft
# デバッグ用初期位置移動
# tp @s 187 210 14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
function lib:damage/reset

# 弾召喚
data modify storage api: Argument.ID set value 329
execute positioned ^ ^1 ^4 run function api:mob/summon
# data modify storage api: Argument.ID set value 329
# execute rotated ~-50 ~ positioned ^ ^1 ^4 run function api:mob/summon
# data modify storage api: Argument.ID set value 329
# execute rotated ~50 ~ positioned ^ ^1 ^4 run function api:mob/summon
# 弾召喚
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute positioned ^ ^1 ^4 run function api:object/summon
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
function lib:damage/reset

# 弾召喚
data modify storage api: Argument.ID set value 329
execute positioned ^ ^1 ^4 run function api:mob/summon
# 弾召喚
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute positioned ^ ^1 ^4 run function api:object/summon
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,39 @@


# 弾召喚
data modify storage api: Argument.ID set value 329
execute rotated ~ ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 329
execute rotated ~60 ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 329
execute rotated ~120 ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 329
execute rotated ~180 ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 329
execute rotated ~240 ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 329
execute rotated ~300 ~ positioned ^ ^1 ^7 run function api:mob/summon
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute at @s positioned ^ ^1 ^7 run function api:object/summon
execute at @s run tp @s ~ ~ ~ ~60 ~
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
function lib:damage/reset

# 弾召喚
data modify storage api: Argument.ID set value 329
execute positioned ^ ^1 ^4 run function api:mob/summon
# data modify storage api: Argument.ID set value 329
# execute rotated ~-50 ~ positioned ^ ^1 ^4 run function api:mob/summon
# data modify storage api: Argument.ID set value 329
# execute rotated ~50 ~ positioned ^ ^1 ^4 run function api:mob/summon
data modify storage api: Argument.ID set value 2190
data modify storage api: Argument.FieldOverride.Damage set value 40.0f
data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation
execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
execute positioned ^ ^1 ^4 run function api:object/summon
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:mob/0328.eclael_arrow/tick/attack
#> asset:object/2189.eclael_arrow/tick/attack
#
# 攻撃判定
#
# @within function asset:mob/0328.eclael_arrow/tick/move
# @within function asset:object/2189.eclael_arrow/tick/

# TODO:与えるダメージの調整
# ダメージ
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#> asset:object/2190.eclael_slashbeam/_index.d
# @private

#> tag
# @within function asset:object/2190.eclael_slashbeam/**
#declare tag 2190.Hit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#> asset:object/2190.eclael_slashbeam/init/
#
# Objectのinit時の処理
#
# @within asset:object/alias/2190/init
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#> asset:object/2190.eclael_slashbeam/load
# @private

#> tag
# @within function asset:object/2190.eclael_slashbeam/**
#declare
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#> asset:object/2190.eclael_slashbeam/register
#
# Objectのデータを指定
#
# @within function asset:object/alias/2190/register

# 継承(オプション)
# data modify storage asset:object Extends append value
# 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 2190
# フィールド(オプション)
# data modify storage asset:object Field.myValue set value
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/2190.eclael_slashbeam/summon/
#
# Object召喚処理の呼び出し時に実行されるfunction
#
# @within asset:object/alias/2190/summon

# 元となるEntityを召喚する
function asset:object/2190.eclael_slashbeam/summon/m with storage asset:context this
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:object/2190.eclael_slashbeam/summon/debug
#
# 動作チェック用の召喚処理 使い終わったら消してもいいかも
#
# @user
# @private

# 召喚
data modify storage api: Argument.ID set value 2190
function api:object/summon
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/2190.eclael_slashbeam/summon/m
#
# Object召喚処理の呼び出し時に実行されるfunction
#
# @within asset:object/2190.eclael_slashbeam/summon/

# 元となるEntityを召喚する
$summon marker ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation)}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#> asset:object/2190.eclael_slashbeam/tick/
#
# Objectのtick時の処理
#
# @within asset:object/alias/2190/tick

# Tick加算
scoreboard players add @s General.Object.Tick 1

# 演出
execute rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle

# 移動・攻撃処理
execute positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/move
# execute positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/move
tp @s ^ ^ ^2
execute if entity @a[tag=2190.Hit] as @a[tag=2190.Hit] at @s run function asset:object/2190.eclael_slashbeam/tick/attack

# 消滅処理
kill @s[scores={General.Object.Tick=30..}]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#> asset:object/2190.eclael_slashbeam/tick/attack
#
# 攻撃判定
#
# @within function asset:object/2190.eclael_slashbeam/tick/

# TODO:与えるダメージの調整
# ダメージ
data modify storage lib: Argument.Damage set value 40f
# 第一属性
data modify storage lib: Argument.AttackType set value "Magic"
# 第二属性
data modify storage lib: Argument.ElementType set value "Thunder"
# 補正functionを実行
function lib:damage/modifier
# 対象に
function lib:damage/
# リセット
function lib:damage/reset

# 終了
tag @a remove 2190.Hit
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:mob/0329.eclael_swordbeam/tick/move
#
# Mobのtick時の処理
#
# @within function asset:mob/0329.eclael_swordbeam/tick/

# プレイヤーが近くにいる場合,ダメージ発生
execute positioned ^-1 ^ ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
execute positioned ^ ^ ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
execute positioned ^1 ^ ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
execute positioned ^-1 ^-1 ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
execute positioned ^ ^-1 ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
execute positioned ^1 ^-1 ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add 2190.Hit
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#> asset:object/2190.eclael_slashbeam/tick/particle
#
# Mobのtick時の処理
#
# @within function asset:object/2190.eclael_slashbeam/tick/

# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYAhgMxEBGAZmXAGwC0FcATEcwCwAMcAdmYBOCgN7N2ARin1eAYwpTqA4WFwYyAWwTJAW74ACdurAwyAJ20BnJOHkB7PBghIpw3LXP2ttsADcyFDxdcAAPJF4AOilcKCRJSIBWAF9k3Ah7XwCgkLBwxCiYsDjEdiTU3HtaWis4FwLcajgALzQ4cyQKJNw0KwAhFrbzAFEARzxAlCgAZTN5OBJECHNg1IBdIA_3
# 線 2
particle dust 1 100000000 1 1 ^0.1 ^ ^-2.5 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.382 ^ ^-2.28965 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.65408 ^ ^-2.06664 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.91337 ^ ^-1.8289 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.15601 ^ ^-1.57423 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.37634 ^ ^-1.3001 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.56713 ^ ^-1.00474 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.71756 ^ ^-0.68704 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.81536 ^ ^-0.34956 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.85 ^ ^0 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.81536 ^ ^0.34956 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.71756 ^ ^0.68704 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.56713 ^ ^1.00474 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.37634 ^ ^1.3001 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.15601 ^ ^1.57423 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.91337 ^ ^1.8289 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.65408 ^ ^2.06664 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.382 ^ ^2.28965 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.1 ^ ^2.5 0.1 0.1 0.1 0 2
# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYAhgMxEBGAZmXAGwC0FcATEcwCwAMcAdmYBOCgN7N2ARin1eAYwpTqA4WFwYyAWwTJAW74ACdurAwyAJ20BnJOHkB7PBghIpw3LXP2ttsADcyFDxdcAAPJGZeADopXCgI9iiAVgBfFNwIe18AoJCwcMRImLikRNT0sHtaWis4F0ReXGo4AC80OHNSqIFcNCsAIVb28wBRAEc8QJQoAGUzeTgSRAhzYLSAXSA_3
# 線 2
particle dust 1 100000000 1 1 ^-0.1 ^ ^-2.5 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.13318 ^ ^-2.27381 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.35454 ^ ^-2.03605 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.56125 ^ ^-1.78547 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.74992 ^ ^-1.52107 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.91653 ^ ^-1.24229 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.05542 ^ ^-0.94873 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.16085 ^ ^-0.64163 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.22719 ^ ^-0.32383 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.25 ^ ^0 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.22719 ^ ^0.32383 0.1 0.1 0.1 0 2
particle dust 1 1 100000000 1 ^1.16085 ^ ^0.64163 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^1.05542 ^ ^0.94873 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.91653 ^ ^1.24229 0.1 0.1 0.1 0 2
particle dust 1 100000000 100000000 1 ^0.74992 ^ ^1.52107 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.56125 ^ ^1.78547 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.35454 ^ ^2.03605 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^0.13318 ^ ^2.27381 0.1 0.1 0.1 0 2
particle dust 1 100000000 1 1 ^-0.1 ^ ^2.5 0.1 0.1 0.1 0 2
8 changes: 8 additions & 0 deletions Asset/data/asset/functions/object/alias/2190/init.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/alias/2190/init
#
# Init処理のエイリアス
#
# @within asset_manager:object/init/init.m

# 元のInit処理を呼び出す
function asset:object/2190.eclael_slashbeam/init/
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/alias/2190/register
#
# Objectのデータ指定処理のエイリアス
#
# @within asset_manager:object/summon/register.m

# 元の登録処理を呼び出す
function asset:object/2190.eclael_slashbeam/register
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/alias/2190/summon
#
# Object召喚処理のエイリアス
#
# @within asset_manager:object/summon/summon.m

# 元の召喚処理を呼び出す
function asset:object/2190.eclael_slashbeam/summon/
8 changes: 8 additions & 0 deletions Asset/data/asset/functions/object/alias/2190/tick.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:object/alias/2190/tick
#
# Tick時処理のエイリアス
#
# @within asset_manager:object/tick/tick.m

# 元のTick処理を呼び出す
function asset:object/2190.eclael_slashbeam/tick/

0 comments on commit fc0df46

Please sign in to comment.