Skip to content

Commit 565ae45

Browse files
quikkuquikku
committed
Merge branch 'master' into dev/noname_301
2 parents cfbf95e + adee6ed commit 565ae45

File tree

621 files changed

+4784
-2043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

621 files changed

+4784
-2043
lines changed

‎.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,6 +1677,14 @@
16771677
" function api:mob/summon"
16781678
]
16791679
}
1680+
],
1681+
"customQuestion": [
1682+
{
1683+
"name": "id",
1684+
"question": "MobのID",
1685+
"pattern": "[1-9][0-9]*",
1686+
"patternErrorMessage": "数値のみが許されるよ"
1687+
}
16801688
]
16811689
},
16821690
{

‎Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# 候補リストの長さを取得
1717
execute store result score $CandidatesLength Temporary if data storage lib: Array[]
1818
# ターゲットの名前をランダムに決める
19-
execute store result score $Argument.Index Lib run function lib:random/
19+
execute store result score $Argument.Index Lib run random value 0..65535
2020
scoreboard players operation $Argument.Index Lib %= $CandidatesLength Temporary
2121
# 移動
2222
function lib:array/move

‎Asset/data/asset/functions/artifact/0003.humanity/trigger/2.check_condition.mcfunction

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@
88
function asset:artifact/common/check_condition/auto
99
# 他にアイテム等確認する場合はここに書く
1010

11+
# 猫の場合死ぬ
12+
# 現状だとCTがないので特に条件を考えずに実装している
13+
execute if predicate player_manager:is_believe/nyaptov run function asset:artifact/0003.humanity/trigger/nyaptov
14+
1115
# CanUsedタグをチェックして3.main.mcfunctionを実行する
12-
execute if entity @s[tag=CanUsed] run function asset:artifact/0003.humanity/trigger/3.main
16+
execute if entity @s[tag=CanUsed] run function asset:artifact/0003.humanity/trigger/3.main

‎Asset/data/asset/functions/artifact/0003.humanity/trigger/nyaptov.mcfunction

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#> asset:artifact/0003.humanity/trigger/nyaptov
2+
#
3+
#
4+
#
5+
# @within function asset:artifact/0003.humanity/trigger/2.check_condition
6+
7+
# 演出
8+
title @a title {"text":"YOU DIED","color":"red"}
9+
playsound block.beacon.power_select player @s ~ ~ ~ 1 0 1
10+
11+
# 致死量のダメージを受ける
12+
data modify storage api: Argument.Damage set value 9999
13+
data modify storage api: Argument.AttackType set value "Magic"
14+
data modify storage api: Argument.FixedDamage set value true
15+
data modify storage api: Argument.DeathMessage set value ['[{"translate": "%1$sは人間性を過剰に摂取した","with":[{"selector":"@s"}]}]']
16+
function api:damage/modifier
17+
function api:damage/
18+
function api:damage/reset

‎Asset/data/asset/functions/artifact/0022.amen_ra_rod/give/2.give.mcfunction

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
# 神器の名前 (TextComponentString)
1616
data modify storage asset:artifact Name set value '{"text":"アメン・ラーの杖","color":"yellow"}'
1717
# 神器の説明文 (TextComponentString[])
18-
data modify storage asset:artifact Lore set value ['{"text":"異邦の神が扱う杖"}','{"text":"周囲のMobを発光させる。"}']
18+
data modify storage asset:artifact Lore set value ['{"text":"異邦の神が扱う杖"}','{"text":"周囲のMobの位置に光る玉を顕現させる"}','{"text":"しゃがんで深く祈ることで"}','{"text":"効果時間は短くなるが、光玉が対象を追跡するようになる"}']
1919
# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
2020
# data modify storage asset:artifact ConsumeItem.Item set value
2121
# data modify storage asset:artifact ConsumeItem.Count set value
2222
# data modify storage asset:artifact ConsumeItem.Extra set value
2323
# 使用回数 (int) (オプション)
24-
data modify storage asset:artifact RemainingCount set value 100
24+
# data modify storage asset:artifact RemainingCount set value
2525
# 神器を発動できるスロット (string) Wikiを参照
2626
data modify storage asset:artifact Slot set value "auto"
2727
# 神器のトリガー (string) Wikiを参照
@@ -45,7 +45,7 @@
4545
# MP必要量 (int) (オプション)
4646
# data modify storage asset:artifact MPRequire set value
4747
# 神器のクールダウン (int) (オプション)
48-
# data modify storage asset:artifact LocalCooldown set value
48+
data modify storage asset:artifact LocalCooldown set value 200
4949
# 種別クールダウン ({Type: string, Duration: int}) (オプション)
5050
# data modify storage asset:artifact TypeCooldown.Type set value
5151
# data modify storage asset:artifact TypeCooldown.Duration set value

‎Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/3.main.mcfunction

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99

1010
# ここから先は神器側の効果の処理を書く
1111

12-
# 発光を付与
13-
effect give @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] minecraft:glowing 3 0 true
14-
15-
# パーティクル
16-
execute at @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] run particle end_rod ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..30]
17-
18-
# SE
19-
playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 20 1
12+
# 光玉を召喚
13+
execute if predicate lib:is_sneaking as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..15] at @s anchored eyes positioned ^ ^ ^ run function asset:artifact/0022.amen_ra_rod/trigger/summon_1
14+
execute unless predicate lib:is_sneaking at @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..15] anchored eyes positioned ^ ^ ^ run function asset:artifact/0022.amen_ra_rod/trigger/summon_2

‎Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/summon_1.mcfunction

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#> asset:artifact/0022.amen_ra_rod/trigger/summon_1
2+
#
3+
# 神器のメイン処理部
4+
#
5+
# @within function asset:artifact/0022.amen_ra_rod/trigger/3.main
6+
7+
data modify storage api: Argument.ID set value 1103
8+
data modify storage api: Argument.FieldOverride.Track set value true
9+
execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @s MobUUID
10+
data modify storage api: Argument.FieldOverride.Duration set value 100
11+
function api:object/summon

‎Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/summon_2.mcfunction

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#> asset:artifact/0022.amen_ra_rod/trigger/summon_2
2+
#
3+
# 神器のメイン処理部
4+
#
5+
# @within function asset:artifact/0022.amen_ra_rod/trigger/3.main
6+
7+
data modify storage api: Argument.ID set value 1103
8+
# data modify storage api: Argument.FieldOverride.Track set value false
9+
data modify storage api: Argument.FieldOverride.Duration set value 200
10+
function api:object/summon

‎Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# 神器の発動条件 (TextComponentString) (オプション)
3030
data modify storage asset:artifact Condition set value '[{"translate":"block.minecraft.lily_of_the_valley"},{"text":"を所持している"}]'
3131
# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
32-
data modify storage asset:artifact AttackInfo.Damage set value [200]
32+
data modify storage asset:artifact AttackInfo.Damage set value "50+25x8"
3333
# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
3434
data modify storage asset:artifact AttackInfo.AttackType set value [Physical]
3535
# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)

‎Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
# 敵にコンバラトキシンを付与
2222
data modify storage api: Argument.ID set value 205
23+
data modify storage api: Argument.FieldOverride.Damage set value 25
2324
execute store result storage api: Argument.FieldOverride.AppliedFrom int 1 run scoreboard players get @s UserID
2425
execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:entity/mob/effect/give
2526
function api:entity/mob/effect/reset

0 commit comments

Comments
 (0)