-
Notifications
You must be signed in to change notification settings - Fork 0
✨ [Artifact 1363] ヒドラの毒牙を作成 #1889
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
Merged
Merged
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
1f86d97
完成
Lapis-LJA 8bb0919
確率を20%に上昇
Lapis-LJA 2df1900
フレーバーテキストを調整
Lapis-LJA 5339eba
Merge branch 'master' into dev/lapis_artifact1363
Lapis-LJA d12ae70
範囲攻撃の場合を考慮しないように
Lapis-LJA b3e52e9
チェックの際にreturnを用いるように
Lapis-LJA 54f4520
仕様を大幅変更
Lapis-LJA b9b5c85
数値調整
Lapis-LJA 3369207
フレーバーテキストを調整
Lapis-LJA dd4bf88
攻撃に関しての情報を追加
Lapis-LJA 41a4097
赤シャードのプールに追加
Lapis-LJA d4ca32b
フレーバーテキストを調整
Lapis-LJA da7bfe6
テキストをまとめて調整
Lapis-LJA 549831b
CDを短縮しておく
Lapis-LJA 6c3d08f
テキストを調整
Lapis-LJA eacdd1a
Merge branch 'master' into dev/lapis_artifact1363
Lapis-LJA e3994a8
不要なstorage削除処理を削除
Lapis-LJA 76fea3c
Merge branch 'master' into dev/lapis_artifact1363
Lapis-LJA 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/1363.hydra_fang/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/1363.hydra_fang/give/1.trigger | ||
| # | ||
| # 神器の取得処理の呼び出し時に実行されるfunction | ||
| # | ||
| # @within tag/function asset:artifact/give | ||
|
|
||
| execute if data storage asset:context {id:1363} run function asset:artifact/1363.hydra_fang/give/2.give |
73 changes: 73 additions & 0 deletions
73
Asset/data/asset/functions/artifact/1363.hydra_fang/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,73 @@ | ||
| #> asset:artifact/1363.hydra_fang/give/2.give | ||
| # | ||
| # 神器の作成部 ここでID等を定義する | ||
| # | ||
| # @user | ||
| # @within function asset:artifact/1363.hydra_fang/give/1.trigger | ||
|
|
||
| # 神器の説明や消費MPなどをここで設定する。 | ||
| # 最後にasset:artifact/common/giveを実行することで入手可能。 | ||
|
|
||
| # 神器のID (int) スプレッドシートの値を入れる | ||
| data modify storage asset:artifact ID set value 1363 | ||
| # 神器のベースアイテム | ||
| data modify storage asset:artifact Item set value "minecraft:stick" | ||
| # 神器の名前 (TextComponentString) | ||
| data modify storage asset:artifact Name set value '{"text":"ヒドラの毒牙","color":"#0e8012"}' | ||
| # 神器の説明文 (TextComponentString[]) | ||
| data modify storage asset:artifact Lore set value ['{"text":"攻撃対象に与ダメージと同じ属性で","color":"white"}','{"text":"与ダメージ量の100%分の追撃を与える(最大1000)","color":"white"}','{"text":"このダメージは自身のステータス補正の影響を受けない","color":"white"}','{"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 "hotbar" | ||
| # 神器のトリガー (string) Wikiを参照 | ||
| data modify storage asset:artifact Trigger set value "onAttack" | ||
| # 効果が重複可能か否か (boolean) (オプション) | ||
| # data modify storage asset:artifact EnableDuplication set value | ||
| # 神器の発動条件 (TextComponentString) (オプション) | ||
| data modify storage asset:artifact Condition set value '{"text":"継続ダメージで攻撃","color":"white"}' | ||
| # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) | ||
| data modify storage asset:artifact AttackInfo.Damage set value [0,1000] | ||
| # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) | ||
| data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] | ||
| # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) | ||
| data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,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 | ||
| # MP消費量 (int) | ||
| data modify storage asset:artifact MPCost set value 5 | ||
| # MP必要量 (int) (オプション) | ||
| # data modify storage asset:artifact MPRequire set value | ||
| # MP回復量 (int) | ||
| # data modify storage asset:artifact MPHealWhenHit set value | ||
| # 神器のクールダウン (int) (オプション) | ||
| data modify storage asset:artifact LocalCooldown set value 10 | ||
| # 種別クールダウン ({Type: string, Duration: int}) (オプション) | ||
| # data modify storage asset:artifact TypeCooldown.Type set value | ||
| # data modify storage asset:artifact TypeCooldown.Duration set value | ||
| # 第二種別クールダウン ({Type: string, Duration: int}) (オプション) | ||
| # data modify storage asset:artifact SecondaryTypeCooldown.Type set value | ||
| # data modify storage asset:artifact SecondaryTypeCooldown.Duration set value | ||
| # グローバルクールダウン (int) (オプション) | ||
| # data modify storage asset:artifact SpecialCooldown set value | ||
| # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) | ||
| data modify storage asset:artifact DisableCooldownMessage set value true | ||
| # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) | ||
| data modify storage asset:artifact DisableMPMessage set value true | ||
| # 破壊時の音を鳴らさないかどうか (boolean) (オプション) | ||
| # data modify storage asset:artifact DisableBreakSound set value | ||
| # 扱える神 (string[]) Wikiを参照 | ||
| data modify storage asset:artifact CanUsedGod set value ["Urban", "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/1363.hydra_fang/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/1363.hydra_fang/register | ||
| # | ||
| # 神器プールへの登録処理 | ||
| # | ||
| # @within tag/function asset:artifact/register | ||
|
|
||
| data modify storage asset:artifact RarityRegistry[2] append value [1363] | ||
| data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [1363] |
8 changes: 8 additions & 0 deletions
8
Asset/data/asset/functions/artifact/1363.hydra_fang/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/1363.hydra_fang/trigger/1.trigger | ||
| # | ||
| # 指定したイベントタイミングで実行されるfunction | ||
| # | ||
| # @within tag/function asset:artifact/** | ||
|
|
||
| # storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する | ||
| execute if data storage asset:context id{hotbar:[1363]} run function asset:artifact/1363.hydra_fang/trigger/2.check_condition |
25 changes: 25 additions & 0 deletions
25
Asset/data/asset/functions/artifact/1363.hydra_fang/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,25 @@ | ||
| #> asset:artifact/1363.hydra_fang/trigger/2.check_condition | ||
| # | ||
| # 神器の発動条件をチェックします | ||
| # | ||
| # @within function asset:artifact/1363.hydra_fang/trigger/1.trigger | ||
|
|
||
| # ID指定する | ||
| data modify storage asset:artifact TargetID set value 1363 | ||
| # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く | ||
| function asset:artifact/common/check_condition/hotbar | ||
| # 他にアイテム等確認する場合はここに書く | ||
|
|
||
| # CanUsedでないならreturn | ||
| execute if entity @s[tag=!CanUsed] run return fail | ||
|
|
||
| # IsDoT:trueでないならreturn | ||
| execute unless data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed | ||
| execute if entity @s[tag=!CanUsed] run return fail | ||
|
|
||
| # Victimが64ブロック以内にいなければreturn | ||
| execute unless entity @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..64] run tag @s remove CanUsed | ||
| execute if entity @s[tag=!CanUsed] run return fail | ||
|
|
||
| # 3.main.mcfunctionを実行する | ||
| function asset:artifact/1363.hydra_fang/trigger/3.main | ||
24 changes: 24 additions & 0 deletions
24
Asset/data/asset/functions/artifact/1363.hydra_fang/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,24 @@ | ||
| #> asset:artifact/1363.hydra_fang/trigger/3.main | ||
| # | ||
| # 神器のメイン処理部 | ||
| # | ||
| # @within function asset:artifact/1363.hydra_fang/trigger/2.check_condition | ||
|
|
||
| # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う | ||
| function asset:artifact/common/use/hotbar | ||
|
|
||
| # ここから先は神器側の効果の処理を書く | ||
|
|
||
| # SingleDamageSession Open | ||
| function api:damage/single_damage_session/open | ||
|
|
||
| # 再帰でそれぞれに与えたダメージのN%分のダメージを与える | ||
| data modify storage asset:temp Temp.To set from storage asset:context Attack.To | ||
| data modify storage asset:temp Temp.Amounts set from storage asset:context Attack.Amounts | ||
| function asset:artifact/1363.hydra_fang/trigger/recursive | ||
|
|
||
| # SingleDamageSession Close | ||
| function api:damage/single_damage_session/close | ||
|
|
||
| # リセット | ||
| data remove storage asset:temp Temp |
30 changes: 30 additions & 0 deletions
30
Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/damage.m.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,30 @@ | ||
| #> asset:artifact/1363.hydra_fang/trigger/damage.m | ||
| # | ||
| # | ||
| # | ||
| # @within function asset:artifact/1363.hydra_fang/trigger/recursive | ||
|
|
||
| #> Private | ||
| # @private | ||
| #declare score_holder $Damage | ||
| #declare score_holder $MaxDamage | ||
|
|
||
| # ダメージ量を取得 | ||
| execute store result score $Damage Temporary run data get storage asset:temp Temp.Amounts[-1] 100 | ||
|
|
||
| # ダメージ上限 (100倍) | ||
| scoreboard players set $MaxDamage Temporary 100000 | ||
|
|
||
| # 自身のステータス補正を無視するダメージ | ||
| execute store result storage api: Argument.Damage float 0.01 run scoreboard players operation $Damage Temporary < $MaxDamage Temporary | ||
| data modify storage api: Argument.AttackType set from storage asset:context Attack.AttackType | ||
| data modify storage api: Argument.ElementType set from storage asset:context Attack.ElementType | ||
| data modify storage api: Argument.BypassModifier set value true | ||
| function api:damage/modifier | ||
| data modify storage api: Argument.BypassModifier set value false | ||
| $execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,scores={MobUUID=$(MobUUID)},distance=..64,limit=1] run function api:damage/ | ||
| function api:damage/reset | ||
|
|
||
| # リセット | ||
| scoreboard players reset $Damage Temporary | ||
| scoreboard players reset $MaxDamage Temporary |
18 changes: 18 additions & 0 deletions
18
Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/recursive.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/1363.hydra_fang/trigger/recursive | ||
| # | ||
| # | ||
| # | ||
| # @within function | ||
| # asset:artifact/1363.hydra_fang/trigger/3.main | ||
| # asset:artifact/1363.hydra_fang/trigger/recursive | ||
|
|
||
| # Attack.Toの最後尾のIDから順にダメージを与える | ||
| data modify storage asset:temp Temp.MobUUID set from storage asset:temp Temp.To[-1] | ||
| function asset:artifact/1363.hydra_fang/trigger/damage.m with storage asset:temp Temp | ||
|
|
||
| # 最後尾の要素を削除 | ||
| data remove storage asset:temp Temp.To[-1] | ||
| data remove storage asset:temp Temp.Amounts[-1] | ||
|
|
||
| # 要素がまだあれば再帰 | ||
| execute if data storage asset:temp Temp.To[0] run function asset:artifact/1363.hydra_fang/trigger/recursive |
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.
Uh oh!
There was an error while loading. Please reload this page.