Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev/haiiro_artifact…
Browse files Browse the repository at this point in the history
…1066
  • Loading branch information
haiiro2gou committed Feb 11, 2024
2 parents 669a955 + 83ed5fb commit 5eb9974
Show file tree
Hide file tree
Showing 7 changed files with 474 additions and 8 deletions.
383 changes: 382 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1997,7 +1997,388 @@
"patternErrorMessage": "数値のみが許されるよ"
}
]
}
},
{
"label": "Effect/テンプレート",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/register.mcfunction",
"content": [
"#> asset:effect/%namespace%/register",
"#",
"# Effectのデータを指定",
"#",
"# @within function asset:effect/%namespace%/_/register",
"",
"# ExtendsSafe (boolean) (default = false)",
" data modify storage asset:effect ExtendsSafe set value true",
"# ID (int)",
" data modify storage asset:effect ID set value %id%",
"# 名前 (TextComponentString)",
" data modify storage asset:effect Name set value ",
"# 説明文 (TextComponentString[])",
" data modify storage asset:effect Description set value ",
"# 効果時間 (int) (default = API || error)",
" data modify storage asset:effect Duration set value ",
"# スタック (int) (default = API || 1)",
" # data modify storage asset:effect Stack set value ",
"# 効果時間の操作方法 (default = API || \"replace\")",
" # data modify storage asset:effect DurationOperation set value ",
"# スタックの操作方法 (default = API || \"replace\")",
" # data modify storage asset:effect StackOperation set value ",
"# 最大効果時間 (int) (default = 2147483647)",
" # data modify storage asset:effect MaxDuration set value ",
"# 最大スタック (int) (default = 2147483647)",
" # data modify storage asset:effect MaxStack set value ",
"# 悪い効果か否か (boolean)",
" data modify storage asset:effect IsBadEffect set value ",
"# 死亡時のエフェクトの処理 (default = \"remove\")",
" # data modify storage asset:effect ProcessOnDied set value ",
"# 消すのに必要なレベル (int) (default = 1)",
" # data modify storage asset:effect RequireClearLv set value ",
"",
"# フィールド",
" # data modify storage asset:effect Field.myValue set value "
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/register.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/register",
"#",
"#",
"#",
"# @within tag/function asset:effect/register",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/register"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/register.json",
"content": {
"values": [
"asset:effect/%namespace%/_/register"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/register"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
{
"label": "Effect/トリガー: 初期化処理",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/load.mcfunction",
"content": [
"#> asset:effect/%namespace%/load",
"#",
"# Effectに利用するスコアボード等の初期化処理",
"# ※ExtendsSafeを有効化した状態での使用は非推奨です",
"#",
"# @within tag/function asset:effect/load",
"",
"#> 定義類はここに",
"# @within function asset:effect/%namespace%/**",
" scoreboard objectives add "
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/load.json",
"content": {
"values": [
"asset:effect/%namespace%/load"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/load"
}
}
]
},
{
"label": "Effect/テンプレート: _index.d ",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_index.d.mcfunction",
"content": [
"#> asset:effect/%namespace%/_index.d",
"# @private",
"",
"#> %namespace%",
"# @within function asset:effect/%namespace%/**",
" #declare"
]
}
]
},
{
"label": "Effect/トリガー: 付与",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/given.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/given",
"#",
"# Effectが付与された時に実行されるfunction",
"#",
"# @within tag/function asset:effect/given",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/given/"
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/given/.mcfunction",
"content": [
"#> asset:effect/%namespace%/given/",
"#",
"# Effectが付与された時の処理",
"#",
"# @within function asset:effect/%namespace%/_/given"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/given.json",
"content": {
"values": [
"asset:effect/%namespace%/_/given"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/given"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
{
"label": "Effect/トリガー: 上書き",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/re-given.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/re-given",
"#",
"# Effectが上書きされた時に実行されるfunction",
"#",
"# @within tag/function asset:effect/re-given",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/re-given/"
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/re-given/.mcfunction",
"content": [
"#> asset:effect/%namespace%/re-given/",
"#",
"# Effectが上書きされた時の処理",
"#",
"# @within function asset:effect/%namespace%/_/re-given"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/re-given.json",
"content": {
"values": [
"asset:effect/%namespace%/_/re-given"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/re-given"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
{
"label": "Effect/トリガー: 終了",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/end.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/end",
"#",
"# Effectの効果の終了時に実行されるfunction",
"#",
"# @within tag/function asset:effect/end",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/end/"
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/end/.mcfunction",
"content": [
"#> asset:effect/%namespace%/end/",
"#",
"# Effectの効果が切れた時の処理",
"#",
"# @within function asset:effect/%namespace%/_/end"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/end.json",
"content": {
"values": [
"asset:effect/%namespace%/_/end"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/end"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
{
"label": "Effect/トリガー: 削除",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/remove.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/remove",
"#",
"# Effectが神器や牛乳によって削除された時に実行されるfunction",
"#",
"# @within tag/function asset:effect/remove",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/remove/"
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/remove/.mcfunction",
"content": [
"#> asset:effect/%namespace%/remove/",
"#",
"# Effectが削除された時の処理",
"#",
"# @within function asset:effect/%namespace%/_/remove"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/remove.json",
"content": {
"values": [
"asset:effect/%namespace%/_/remove"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/remove"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
{
"label": "Effect/トリガー: tick",
"generates": [
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/_/tick.mcfunction",
"content": [
"#> asset:effect/%namespace%/_/tick",
"#",
"# Effectが発動している間毎tick実行されるfunction",
"#",
"# @within tag/function asset:effect/tick",
"",
"execute if data storage asset:context {id:%id%} run function asset:effect/%namespace%/tick/"
]
},
{
"type": "file",
"rel": "data/asset/functions/effect/%namespace%/tick/.mcfunction",
"content": [
"#> asset:effect/%namespace%/tick/",
"#",
"# Effectのtick処理",
"#",
"# @within function asset:effect/%namespace%/_/tick"
]
},
{
"type": "file",
"rel": "data/asset/tags/functions/effect/tick.json",
"content": {
"values": [
"asset:effect/%namespace%/_/tick"
]
},
"append": {
"key": "values",
"elem": "asset:effect/%namespace%/_/tick"
}
}
],
"customQuestion": [
{
"name": "id",
"question": "EffectのID",
"pattern": "[1-9][0-9]*",
"patternErrorMessage": "数値のみが許されるよ"
}
]
},
],
"mcdutil.createDatapackTemplate.defaultFolder": false,
"mcdutil.createDatapackTemplate.defaultLoadAndTick": false,
Expand Down
Loading

0 comments on commit 5eb9974

Please sign in to comment.