-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
【Object 2002~2025,2038,2064】ボスウサギのオブジェクト #474
Open
EllaCoat
wants to merge
12
commits into
master
Choose a base branch
from
dev/ella_rabbit_objects
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+5,701
−6
Open
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
4a62480
オブジェクト移行
EllaCoat e3d0148
修正
EllaCoat ae44a29
修正
EllaCoat 86eb821
apiに変更
EllaCoat 41ecca7
apiに変更
EllaCoat 9d3c899
指摘箇所を修正
EllaCoat 90cb0e6
Effectを移行するのを忘れていた
EllaCoat 995d922
lib: -> api:
EllaCoat bbeb9a4
Effectリセットを入れた
EllaCoat 2a9f025
指摘箇所を修正
EllaCoat 13faac1
ダメージ調整
EllaCoat 429bf1e
修正
EllaCoat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
6 changes: 6 additions & 0 deletions
6
Asset/data/asset/functions/object/2002.lighting_fast/_index.d.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#> asset:object/2002.lighting_fast/_index.d | ||
# @private | ||
|
||
#> tag | ||
# @within function asset:object/2002.lighting_fast/** | ||
#declare tag 2002.Landing |
9 changes: 9 additions & 0 deletions
9
Asset/data/asset/functions/object/2002.lighting_fast/init/.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#> asset:object/2002.lighting_fast/init/ | ||
# | ||
# Objectのinit時の処理 | ||
# | ||
# @within asset:object/alias/2002/init | ||
|
||
# ランダムな方向を向かせる(Y軸は固定) | ||
execute store result entity @s Rotation[0] float 0.01 run random value 0..36000 | ||
execute at @s run tp @s ~ ~ ~ ~ 0 |
17 changes: 17 additions & 0 deletions
17
Asset/data/asset/functions/object/2002.lighting_fast/register.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#> asset:object/2002.lighting_fast/register | ||
# | ||
# Objectのデータを指定 | ||
# | ||
# @within function asset:object/alias/2002/register | ||
|
||
# 継承(オプション) | ||
# data modify storage asset:object Extends append value | ||
# function asset:object/extends | ||
# 他のモブに継承されることを許可するか (boolean) (オプション) | ||
# data modify storage asset:object ExtendsSafe set value | ||
# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) | ||
data modify storage asset:object IsAbstract set value false | ||
# ID (int) | ||
data modify storage asset:object ID set value 2002 | ||
# フィールド | ||
# data modify storage asset:object Field.myValue set value |
8 changes: 8 additions & 0 deletions
8
Asset/data/asset/functions/object/2002.lighting_fast/summon/.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#> asset:object/2002.lighting_fast/summon/ | ||
# | ||
# Object召喚処理の呼び出し時に実行されるfunction | ||
# | ||
# @within asset:object/alias/2002/summon | ||
|
||
# 元となるEntityを召喚する | ||
summon item_display ~ ~ ~ {Tags:["ObjectInit"],interpolation_duration:0,teleport_duration:0,brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]},item:{id:"orange_stained_glass",Count:1b}} |
10 changes: 10 additions & 0 deletions
10
Asset/data/asset/functions/object/2002.lighting_fast/summon/debug.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#> asset:mob/2002.lighting_fast/summon/debug | ||
# | ||
# 動作チェック用の召喚処理 使い終わったら消してもいいかも | ||
# | ||
# @user | ||
# @private | ||
|
||
# 召喚 | ||
data modify storage api: Argument.ID set value 2002 | ||
function api:object/summon |
19 changes: 19 additions & 0 deletions
19
Asset/data/asset/functions/object/2002.lighting_fast/tick/.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#> asset:object/2002.lighting_fast/tick/ | ||
# | ||
# Objectのtick時の処理 | ||
# | ||
# @within asset:object/alias/2002/tick | ||
|
||
# Tick加算 | ||
scoreboard players add @s General.Object.Tick 1 | ||
|
||
# 2Tick目に見た目を表示 | ||
execute if score @s General.Object.Tick matches 2 run data modify entity @s transformation.scale set value [3f,0.1f,60f] | ||
execute if score @s General.Object.Tick matches 2 run data modify entity @s teleport_duration set value 1 | ||
|
||
# 近くのプレイヤーにゆっくりと近づく | ||
execute if score @s General.Object.Tick matches 2.. facing entity @p[tag=!PlayerShouldInvulnerable,distance=..30] feet positioned ^ ^ ^0.1 rotated as @s run tp @s ~ ~ ~ ~ ~ | ||
execute if predicate api:global_vars/difficulty/min/hard if score @s General.Object.Tick matches 2.. facing entity @p[tag=!PlayerShouldInvulnerable,distance=..30] feet positioned ^ ^ ^0.1 rotated as @s run tp @s ~ ~ ~ ~ ~ | ||
|
||
# 発動処理 | ||
execute if score @s General.Object.Tick matches 30.. run function asset:object/2002.lighting_fast/tick/cast |
53 changes: 53 additions & 0 deletions
53
Asset/data/asset/functions/object/2002.lighting_fast/tick/cast.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#> asset:object/2002.lighting_fast/tick/cast | ||
# | ||
# 発動処理 | ||
# | ||
# @within function asset:object/2002.lighting_fast/tick/ | ||
|
||
# 判定内にいるプレイヤーをタグ付け | ||
execute positioned ^ ^ ^0 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^3 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^6 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^9 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^12 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^15 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^18 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^21 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^24 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^27 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-3 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-6 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-9 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-12 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-15 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-18 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-21 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-24 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
execute positioned ^ ^ ^-27 positioned ~-1.5 ~-1.5 ~-1.5 as @a[tag=!PlayerShouldInvulnerable,dx=2,dy=2,dz=2] run tag @s add 2002.Landing | ||
|
||
# ダメージ | ||
# 引数の設定 | ||
# 与えるダメージ | ||
data modify storage lib: Argument.Damage set value 45.0f | ||
# 第一属性 | ||
data modify storage lib: Argument.AttackType set value "Physical" | ||
# 第二属性 | ||
data modify storage lib: Argument.ElementType set value "Thunder" | ||
# デスログ | ||
data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sの斬撃によってサイコロステーキになってしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' | ||
# 補正functionを実行 | ||
data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID | ||
function api:damage/modifier_manual | ||
# ダメージを与える | ||
execute as @a[tag=2002.Landing,distance=..100] at @s run function lib:damage/ | ||
# リセット | ||
function lib:damage/reset | ||
|
||
# タグ外し | ||
tag @a[tag=2002.Landing,distance=..100] remove 2002.Landing | ||
|
||
# パーティクル処理 | ||
execute positioned ^ ^1.5 ^ run function asset:object/2002.lighting_fast/tick/vfx | ||
|
||
# キル | ||
kill @s |
16 changes: 16 additions & 0 deletions
16
Asset/data/asset/functions/object/2002.lighting_fast/tick/sound.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#> asset:object/2002.lighting_fast/tick/sound | ||
# | ||
# 音を鳴らす | ||
# | ||
# @within function asset:object/2002.lighting_fast/tick/vfx | ||
|
||
# サウンド | ||
playsound entity.warden.sonic_boom hostile @a[distance=..32] ~ ~ ~ 2 1.5 0 | ||
playsound block.end_portal.spawn hostile @a[distance=..32] ~ ~ ~ 0.25 2 0.0 | ||
playsound block.respawn_anchor.deplete hostile @a[distance=..32] ~ ~ ~ 2 2 0.0 | ||
playsound block.respawn_anchor.deplete hostile @a[distance=..32] ~ ~ ~ 2 1.95 0.0 | ||
|
||
playsound item.trident.throw hostile @a[distance=..32] ~ ~ ~ 2 0 0 | ||
playsound entity.glow_squid.squirt hostile @a[distance=..32] ~ ~ ~ 2 2 0 | ||
playsound item.trident.return hostile @a[distance=..32] ~ ~ ~ 2 0 0 | ||
playsound item.trident.riptide_1 hostile @a[distance=..32] ~ ~ ~ 2 2 0 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DamageLibとDamageAPIが混ざってる
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
これは別に支障ないと思うよ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
あります
apiにしろ!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
後で一括置換するんでしょ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
挙動上の問題保証できないとこと(ちぇんちゃ)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
直せ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
どう直すか述べよ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
私は直す方法を知りません
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lib: Argument.hogeをapi: Argument.hogeに
lib:damage/hogeをapi:damage/hoge
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ダメージAPI以外のlib: Argumentを巻き込まないように注意ね