Skip to content

Commit af86165

Browse files
haiiro2gouhaiiro2gou
committed
🚚 FallDamage -> Defense.Fall
1 parent 227fa84 commit af86165

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎TheSkyBlessing/data/api/functions/modifier/core/fall_damage/add.mcfunction renamed to ‎TheSkyBlessing/data/api/functions/modifier/core/defense/fall/add.mcfunction

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#> api:modifier/core/fall_damage/add
1+
#> api:modifier/core/defense/fall/add
22
#
33
#
44
#
5-
# @within function api:modifier/fall_damage/add
5+
# @within function api:modifier/defense/fall/add
66

77
# UserStorage呼び出し
88
function oh_my_dat:please
99
# 無ければ入れる
10-
execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage[0] run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage set value []
10+
execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall[0] run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall set value []
1111
# 同じUUIDのModifierを削除する
12-
data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage
12+
data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall
1313
data modify storage api: NewModifiers set value []
1414
data remove storage api: Removed
1515
function api:modifier/core/common/remove_modifier
@@ -19,11 +19,11 @@
1919
data modify storage api: Modifiers[-1].UUID set from storage api: Argument.UUID
2020
execute store result storage api: Modifiers[-1].Amount double -0.001 run data get storage api: Argument.Amount 1000
2121
data modify storage api: Modifiers[-1].Operation set from storage api: Argument.Operation
22-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage set from storage api: Modifiers
22+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall set from storage api: Modifiers
2323
# データを更新
24-
data modify storage api: Base set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default.FallDamage
24+
data modify storage api: Base set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default.Defense.Fall
2525
function api:modifier/core/common/update_modifier/
26-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.FallDamage set from storage api: Modifier
26+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Defense.Fall set from storage api: Modifier
2727
# リセット
2828
data remove storage api: Base
2929
data remove storage api: Modifiers

‎TheSkyBlessing/data/api/functions/modifier/core/fall_damage/remove.mcfunction renamed to ‎TheSkyBlessing/data/api/functions/modifier/core/defense/fall/remove.mcfunction

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#> api:modifier/core/fall_damage/remove
1+
#> api:modifier/core/defense/fall/remove
22
#
33
#
44
#
5-
# @within function api:modifier/fall_damage/remove
5+
# @within function api:modifier/defense/fall/remove
66

77
# UserStorage呼び出し
88
function oh_my_dat:please
99
# 無ければ入れる
10-
data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage
10+
data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall
1111
# 配列の初期化
1212
data modify storage api: NewModifiers set value []
1313
data remove storage api: Removed
@@ -17,11 +17,11 @@
1717
execute store result storage api: Removed.Amount double -0.001 run data get storage api: Removed.Amount 1000
1818
# 新しい配列を戻す
1919
data modify storage api: Modifiers set from storage api: NewModifiers
20-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.FallDamage set from storage api: Modifiers
20+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Modifier.Defense.Fall set from storage api: Modifiers
2121
# データの更新
22-
data modify storage api: Base set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default.FallDamage
22+
data modify storage api: Base set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default.Defense.Fall
2323
function api:modifier/core/common/update_modifier/
24-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.FallDamage set from storage api: Modifier
24+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Defense.Fall set from storage api: Modifier
2525
# リセット
2626
data remove storage api: Base
2727
data remove storage api: Modifiers

‎TheSkyBlessing/data/api/functions/modifier/fall_damage/add.mcfunction renamed to ‎TheSkyBlessing/data/api/functions/modifier/defense/fall/add.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#> api:modifier/fall_damage/add
1+
#> api:modifier/defense/fall/add
22
#
33
#
44
#
@@ -13,7 +13,7 @@
1313
# データ検証
1414
function api:modifier/core/common/validate
1515
# データが正しいなら入れる
16-
execute if data storage api: Argument.UUID if data storage api: Argument.Amount if data storage api: Argument.Operation run function api:modifier/core/fall_damage/add
16+
execute if data storage api: Argument.UUID if data storage api: Argument.Amount if data storage api: Argument.Operation run function api:modifier/core/defense/fall/add
1717
# リセット
1818
data remove storage api: Argument.UUID
1919
data remove storage api: Argument.Amount

‎TheSkyBlessing/data/api/functions/modifier/defense/fall/get.mcfunction

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#> api:modifier/defense/fall/get
2+
#
3+
#
4+
#
5+
# @input as player
6+
# @output storage api:
7+
# Return.Defense.Fall : double
8+
# @api
9+
10+
function api:mob/apply_to_forward_target/with_idempotent.m {CB:"oh_my_dat:please",IsForwardedOnly:true}
11+
data remove storage api: Return.Defense.Fall
12+
data modify storage api: Return.Defense.Fall set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Defense.Fall

‎TheSkyBlessing/data/api/functions/modifier/fall_damage/remove.mcfunction renamed to ‎TheSkyBlessing/data/api/functions/modifier/defense/fall/remove.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#> api:modifier/fall_damage/remove
1+
#> api:modifier/defense/fall/remove
22
#
33
#
44
#
@@ -12,6 +12,6 @@
1212
# データ検証
1313
execute unless data storage api: Argument.UUID run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" UUID","color":"red"}]
1414
# データが正しいなら消す
15-
execute if data storage api: Argument.UUID run function api:modifier/core/fall_damage/remove
15+
execute if data storage api: Argument.UUID run function api:modifier/core/defense/fall/remove
1616
# リセット
1717
data remove storage api: Argument.UUID

‎TheSkyBlessing/data/api/functions/modifier/fall_damage/get.mcfunction

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎TheSkyBlessing/data/core/functions/handler/first_join.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# 無信仰にする
2020
execute unless predicate player_manager:is_believe/flora unless predicate player_manager:is_believe/nyaptov unless predicate player_manager:is_believe/rumor unless predicate player_manager:is_believe/urban unless predicate player_manager:is_believe/wi-ki run function player_manager:god/none/set_tag
2121
# ステータス初期化
22-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default set value {Heal:1d,ReceiveHeal:1d,Attack:{Base:1d,Physical:1d,Magic:1d,None:1d,Fire:1d,Water:1d,Thunder:1d},Defense:{Base:1d,Physical:1d,Magic:1d,None:1d,Fire:1d,Water:1d,Thunder:1d},MaxMP:100d,MPRegen:1d,MaxHealth:20d,FallDamage:1d}
22+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default set value {Heal:1d,ReceiveHeal:1d,Attack:{Base:1d,Physical:1d,Magic:1d,None:1d,Fire:1d,Water:1d,Thunder:1d},Defense:{Base:1d,Physical:1d,Magic:1d,None:1d,Fire:1d,Water:1d,Thunder:1d,Fall:1d},MaxMP:100d,MPRegen:1d,MaxHealth:20d}
2323
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Default
2424
# 神器クールダウンの初期化
2525
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown set value [{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0},{Value:-15,Max:0}]

‎TheSkyBlessing/data/player_manager/functions/fall_damage/deal_damage/get_vars.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
scoreboard players operation $FallDistance Temporary -= $YVec Temporary
2020

2121
# 落下ダメージ倍率の初期化
22-
execute store result score $DamageMultiplier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.FallDamage 10
22+
execute store result score $DamageMultiplier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Defense.Fall 10
2323
# ジャンプ力上昇のlvを取得する
2424
# $JumpBoost(e1) = max($JumpBoost(e1) ?? -1(e1)) + 1(e1), 0)
2525
function api:data_get/active_effects

‎TheSkyBlessing/data/player_manager/functions/god/nyaptov/believe.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
data modify storage api: Argument.UUID set value [2, 1, 1, 11]
2828
data modify storage api: Argument.Amount set value 1
2929
data modify storage api: Argument.Operation set value "multiply_base"
30-
function api:modifier/fall_damage/add
30+
function api:modifier/defense/fall/add
3131

3232
# 全装備を再チェック
3333
tag @s add Believe.Changed

‎TheSkyBlessing/data/player_manager/functions/god/nyaptov/unbelieve.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
function api:modifier/defense/water/remove
2020
# 落下ダメージ-100%
2121
data modify storage api: Argument.UUID set value [2, 1, 1, 11]
22-
function api:modifier/fall_damage/remove
22+
function api:modifier/defense/fall/remove

0 commit comments

Comments
 (0)