-
Notifications
You must be signed in to change notification settings - Fork 1
[Artifact 0101] グリモワールの作成 #2057
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
Open
ogachu0331
wants to merge
16
commits into
master
Choose a base branch
from
dev/ogachu_artifact101
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.
Open
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
c111f99
artifact0101グリモワールの作成
ogachu0331 f949112
Merge branch 'master' into dev/ogachu_artifact101
ogachu0331 c65927c
汎用演出の適用
ogachu0331 733e014
説明文の変更
ogachu0331 3bd028c
使用可能信仰の変更
ogachu0331 ab638c5
Merge branch 'master' into dev/ogachu_artifact101
ogachu0331 8b0e381
Merge branch 'master' into dev/ogachu_artifact101
ogachu0331 afec537
指摘点の修正
ogachu0331 7755cd6
Merge branch 'dev/ogachu_artifact101' of https://github.com/ProjectTS…
ogachu0331 04ed171
コメントアウトの修正
ogachu0331 9d3d1e0
指摘点の修正
ogachu0331 259e0ab
記述ミスの修正
ogachu0331 2e30426
構文エラーの修正
ogachu0331 e4e265e
Merge branch 'master' into dev/ogachu_artifact101
ogachu0331 763567b
加工機(lv2red)
ogachu0331 529108a
Merge branch 'dev/ogachu_artifact101' of https://github.com/ProjectTS…
ogachu0331 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
Asset/data/asset/functions/artifact/0101.grimoire/give/1.trigger.mcfunction
This file contains hidden or 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,7 @@ | ||
| #> asset:artifact/0101.grimoire/give/1.trigger | ||
| # | ||
| # 神器の取得処理の呼び出し時に実行されるfunction | ||
| # | ||
| # @within tag/function asset:artifact/give | ||
|
|
||
| execute if data storage asset:context {id:101} run function asset:artifact/0101.grimoire/give/2.give |
68 changes: 68 additions & 0 deletions
68
Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
This file contains hidden or 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,68 @@ | ||
| #> asset:artifact/0101.grimoire/give/2.give | ||
| # | ||
| # 神器の作成部 ここでID等を定義する | ||
| # | ||
| # @user | ||
| # @within function asset:artifact/0101.grimoire/give/1.trigger | ||
|
|
||
| # 神器の説明や消費MPなどをここで設定する。 | ||
| # 最後にasset:artifact/common/giveを実行することで入手可能。 | ||
|
|
||
| # 神器のID (int) スプレッドシートの値を入れる | ||
| data modify storage asset:artifact ID set value 101 | ||
| # 神器のベースアイテム | ||
| data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" | ||
| # 神器の名前 (TextComponentString) | ||
| data modify storage asset:artifact Name set value '{"text":"グリモワール","color":"dark_green"}' | ||
| # 神器の説明文 (TextComponentString[]) | ||
| data modify storage asset:artifact Lore set value ['{"text":"ランダムな属性の遠距離魔法を召喚する魔術書"}'] | ||
| # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) | ||
| # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' | ||
| # data modify storage asset:artifact ConsumeItem.Count set value 1 | ||
| # data modify storage asset:artifact ConsumeItem.Extra set value | ||
| # 使用回数 (int) (オプション) | ||
| # data modify storage asset:artifact RemainingCount set value | ||
| # 神器を発動できるスロット (string) Wikiを参照 | ||
| data modify storage asset:artifact Slot set value "mainhand" | ||
| # 神器のトリガー (string) Wikiを参照 | ||
| data modify storage asset:artifact Trigger set value "onClick" | ||
| # 神器の発動条件 (TextComponentString) (オプション) | ||
| # data modify storage asset:artifact Condition set value | ||
| # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) | ||
| data modify storage asset:artifact AttackInfo.Damage set value [80] | ||
| # 攻撃に関する情報 -攻撃タイプ (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 "every" | ||
| # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) | ||
| data modify storage asset:artifact AttackInfo.AttackRange set value 10 | ||
| # MP消費量 (int) | ||
| # data modify storage asset:artifact MPCost set value | ||
| # MP必要量 (int) (オプション) | ||
| # data modify storage asset:artifact MPRequire set value 20 | ||
| # MP回復量 (int) | ||
| data modify storage asset:artifact MPHealWhenHit set value 11 | ||
| # 神器のクールダウン (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 16 | ||
| # グローバルクールダウン (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","Rumor"] | ||
| # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) | ||
| # data modify storage asset:artifact CustomNBT set value {} | ||
|
|
||
| # 神器の入手用function | ||
| function asset:artifact/common/give |
8 changes: 8 additions & 0 deletions
8
Asset/data/asset/functions/artifact/0101.grimoire/register.mcfunction
This file contains hidden or 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:artifact/0101.grimoire/register | ||
| # | ||
| # 神器プールへの登録処理 | ||
| # | ||
| # @within tag/function asset:artifact/register | ||
|
|
||
| data modify storage asset:artifact RarityRegistry[2] append value [101] | ||
| data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [101] |
8 changes: 8 additions & 0 deletions
8
Asset/data/asset/functions/artifact/0101.grimoire/trigger/1.trigger.mcfunction
This file contains hidden or 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:artifact/0101.grimoire/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:101} run function asset:artifact/0101.grimoire/trigger/2.check_condition |
12 changes: 12 additions & 0 deletions
12
Asset/data/asset/functions/artifact/0101.grimoire/trigger/2.check_condition.mcfunction
This file contains hidden or 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,12 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/2.check_condition | ||
| # | ||
| # 神器の発動条件をチェックします | ||
| # | ||
| # @within function asset:artifact/0101.grimoire/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/0101.grimoire/trigger/3.main |
18 changes: 18 additions & 0 deletions
18
Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
This file contains hidden or 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,18 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/3.main | ||
| # | ||
| # 神器のメイン処理部 | ||
| # | ||
| # @within function asset:artifact/0101.grimoire/trigger/2.check_condition | ||
|
|
||
| # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う | ||
| function asset:artifact/common/use/mainhand | ||
|
|
||
| # ここから先は神器側の効果の処理を書く | ||
| # 音 | ||
| playsound item.book.page_turn player @a ~ ~ ~ | ||
| # 属性抽選 | ||
| execute store result storage asset:temp type int 1 run random value 0..2 | ||
| execute if data storage asset:temp {type:0} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/fire | ||
| execute if data storage asset:temp {type:1} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/water | ||
| execute if data storage asset:temp {type:2} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/thunder | ||
| data remove storage asset:temp type |
22 changes: 22 additions & 0 deletions
22
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
This file contains hidden or 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,22 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/ballet/fire | ||
| # | ||
| # 火の弾道 | ||
| # | ||
| # @within function | ||
| # asset:artifact/0101.grimoire/trigger/3.main | ||
| # asset:artifact/0101.grimoire/trigger/ballet/fire | ||
|
|
||
| # 弾道 | ||
| particle minecraft:dust 1 0 0 1 | ||
|
|
||
| # ブロックに当たったら起爆 | ||
| execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit | ||
|
|
||
| # 射程外に出ても起爆 | ||
| execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit | ||
|
|
||
| # 敵に当たってももちろん起爆 | ||
| execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit | ||
|
|
||
| # 起爆しないなら再起 | ||
| execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/fire |
19 changes: 19 additions & 0 deletions
19
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire_hit.mcfunction
This file contains hidden or 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:artifact/0101.grimoire/trigger/ballet/fire_hit | ||
| # | ||
| # 着弾処理 | ||
| # | ||
| # @within function asset:artifact/0101.grimoire/trigger/ballet/fire | ||
|
|
||
| # 演出 | ||
| particle minecraft:flame ~ ~1 ~ 0.5 0.5 0.5 0.05 40 | ||
| playsound item.firecharge.use player @a ~ ~ ~ | ||
| # 引数の設定 | ||
| data modify storage api: Argument.Damage set value 80f | ||
| data modify storage api: Argument.AttackType set value "Magic" | ||
| data modify storage api: Argument.ElementType set value "Fire" | ||
| # 補正functionを実行 | ||
| function api:damage/modifier | ||
| # 範囲ダメージ | ||
| execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/ | ||
| # リセット | ||
| function api:damage/reset | ||
22 changes: 22 additions & 0 deletions
22
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
This file contains hidden or 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,22 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/ballet/thunder | ||
| # | ||
| # 雷の弾道 | ||
| # | ||
| # @within function | ||
| # asset:artifact/0101.grimoire/trigger/3.main | ||
| # asset:artifact/0101.grimoire/trigger/ballet/thunder | ||
|
|
||
| # 弾道 | ||
| particle minecraft:dust 1 0.902 0 1 | ||
|
|
||
| # ブロックに当たったら起爆 | ||
| execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit | ||
|
|
||
| # 射程外に出ても起爆 | ||
| execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit | ||
|
|
||
| # 敵に当たってももちろん起爆 | ||
| execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit | ||
|
|
||
| # 起爆しないなら再起 | ||
| execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/thunder |
25 changes: 25 additions & 0 deletions
25
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder_hit.mcfunction
This file contains hidden or 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,25 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/ballet/thunder_hit | ||
| # | ||
| # 着弾処理 | ||
| # | ||
| # @within function asset:artifact/0101.grimoire/trigger/ballet/thunder | ||
|
|
||
| # 演出 | ||
| data modify storage api: Argument.ID set value 2257 | ||
| data modify storage api: Argument.FieldOverride.Scale set value 4f | ||
| function api:object/summon | ||
| playsound entity.generic.explode player @a ~ ~ ~ | ||
|
|
||
| # 引数の設定 | ||
| data modify storage api: Argument.Damage set value 80f | ||
| data modify storage api: Argument.AttackType set value "Magic" | ||
| data modify storage api: Argument.ElementType set value "Thunder" | ||
|
|
||
| # 補正functionを実行 | ||
| function api:damage/modifier | ||
|
|
||
| # 範囲ダメージ | ||
| execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/ | ||
| # リセット | ||
|
|
||
| function api:damage/reset |
22 changes: 22 additions & 0 deletions
22
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
This file contains hidden or 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,22 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/ballet/water | ||
| # | ||
| # 水の弾道 | ||
| # | ||
| # @within function | ||
| # asset:artifact/0101.grimoire/trigger/3.main | ||
| # asset:artifact/0101.grimoire/trigger/ballet/water | ||
|
|
||
| # 弾道 | ||
| particle minecraft:dust 0.133 0 1 1 | ||
|
|
||
| # ブロックに当たったら起爆 | ||
| execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit | ||
|
|
||
| # 射程外に出ても起爆 | ||
| execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit | ||
|
|
||
| # 敵に当たってももちろん起爆 | ||
| execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit | ||
|
|
||
| # 起爆しないなら再起 | ||
| execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/water |
25 changes: 25 additions & 0 deletions
25
Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water_hit.mcfunction
This file contains hidden or 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,25 @@ | ||
| #> asset:artifact/0101.grimoire/trigger/ballet/water_hit | ||
| # | ||
| # 着弾処理 | ||
| # | ||
| # @within function asset:artifact/0101.grimoire/trigger/ballet/water | ||
|
|
||
| # 演出 | ||
| data modify storage api: Argument.ID set value 2256 | ||
| data modify storage api: Argument.FieldOverride.Scale set value 4f | ||
| function api:object/summon | ||
| playsound entity.player.splash player @a ~ ~ ~ | ||
|
|
||
| # 引数の設定 | ||
| data modify storage api: Argument.Damage set value 80f | ||
| data modify storage api: Argument.AttackType set value "Magic" | ||
| data modify storage api: Argument.ElementType set value "Water" | ||
|
|
||
| # 補正functionを実行 | ||
| function api:damage/modifier | ||
|
|
||
| # 範囲ダメージ | ||
| execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/ | ||
|
|
||
| # リセット | ||
| function api:damage/reset |
1 change: 1 addition & 0 deletions
1
Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
ここもpositionedとdx=0を適用してやるべきかも~~~~
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.
どれくらいの攻撃範囲にしたい?それによって変わるね
Uh oh!
There was an error while loading. Please reload this page.
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.
ざっくり炸裂時のパーティクルと同じくらいの範囲ですかね