Skip to content
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

✨ [Effect 29-30, 34] 継続ダメージ・回復エフェクトの実装 #841

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

haiiro2gou
Copy link
Member

@haiiro2gou haiiro2gou commented Jan 29, 2025

Fix #846
Fix #724
Fix #725
Fix #820
Related #1064

Blocked by ProjectTSB/TheSkyBlessing#1840

@haiiro2gou haiiro2gou changed the title ✨ [Effect 29-30] 毒とウィザーを体力依存ダメージに ✨ [Effect 29-30 34] 継続ダメージ・回復エフェクトの実装 Mar 6, 2025
@haiiro2gou haiiro2gou changed the title ✨ [Effect 29-30 34] 継続ダメージ・回復エフェクトの実装 ✨ [Effect 29-30, 34] 継続ダメージ・回復エフェクトの実装 Mar 6, 2025
@haiiro2gou haiiro2gou linked an issue Mar 6, 2025 that may be closed by this pull request
Copy link
Contributor

@Lapis-LJA Lapis-LJA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q.Effect34を継承した再生が全て割合になるのは意図している?
バランスに直結する問題なので少しどうかと思う

# ID (int)
data modify storage asset:effect ID set value 266
# 名前 (TextComponentString)
data modify storage asset:effect Name set value "大地の恵み"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TextComponentじゃなさそう
それと、防具名と一致してないのが気になる

Comment on lines +13 to +19

# $Healの方が大きいならそのまま
# LatestHealの方が大きいなら、スコアのデータをフィールドへ代入
execute if score $Heal Temporary < @s 301.LatestHeal store result storage asset:context this.Heal float 0.1 run scoreboard players get @s 301.LatestHeal
execute if score $Heal Temporary < @s 301.LatestHeal store result storage asset:context this.UserID float 0.1 run scoreboard players get @s 301.LatestUserID

# リセット
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

自分が書いたコードなのでアレなんだが、re-given前に付与されてたStackの方が大きいなら強制置き換えがあるべきかも

data modify storage api: Argument.BypassArmorToughness set value true
data modify storage api: Argument.BypassEnchantments set value true
data modify storage api: Argument.BypassDifficulty set value true
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.ActivateTriggerじゃなさそう
2.それにこれになんでトリガー呼び出しがないの?
3.デスログがないと死んだ際にバグりそう
4. #1030 とめちゃくちゃconflictしそう

data modify storage api: Argument.FixedHeal set value true
function api:heal/modifier
data modify storage api: Argument.FixedHeal set value false
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

data modify storage api: Argument.BypassArmorToughness set value true
data modify storage api: Argument.BypassEnchantments set value true
data modify storage api: Argument.BypassDifficulty set value true
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

@@ -13,6 +13,7 @@
data modify storage api: Argument.Damage set value 25.0f
data modify storage api: Argument.AttackType set value "Physical"
execute as @a if score @s UserID = $AppliedFrom Temporary run function api:damage/modifier
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

@@ -7,5 +7,6 @@
# 回復
data modify storage api: Argument.Heal set value 1.5f
function api:heal/modifier
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

@@ -14,6 +14,7 @@
data modify storage api: Argument.AttackType set value "Physical"
data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal
execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

data modify storage api: Argument.Heal set from storage asset:context this.Heal
execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier
function api:heal/
data modify storage api: Argument.ActivateTrigger set value false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
data modify storage api: Argument.ActivateTrigger set value false
data modify storage api: Argument.ApplyTrigger set value false

Comment on lines 10 to 12
# 周囲のプレイヤーにウィザー
effect give @a[gamemode=!spectator,distance=..1.2] wither 1 2 false
execute as @a[gamemode=!spectator,distance=..1.2] run function asset:mob/0058.divide_haze/tick/wither

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これ、修正前の処理っぽいのでconflictしてそう

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants