diff --git a/logic/service/fight/effect/407.go b/logic/service/fight/effect/407.go new file mode 100644 index 000000000..1487a6480 --- /dev/null +++ b/logic/service/fight/effect/407.go @@ -0,0 +1,42 @@ +package effect + +import ( + "blazing/logic/service/fight/action" + "blazing/logic/service/fight/input" + "blazing/logic/service/fight/node" +) + +// 407 - 下回合起，每回合XX等级+n，持续m回合 +type Effect407 struct { + node.EffectNode +} + +func (e *Effect407) Skill_Use() bool { + // 创建一个延迟生效的效果，在下一回合开始生效 + effectType := int8(e.Args()[0].IntPart()) // XX类型 + effectValue := int8(e.Args()[1].IntPart()) // 等级+n + duration := int(e.Args()[2].IntPart()) // 持续m回合 + + e.GenSub(&Effect407_sub{ + effectType: effectType, + effectValue: effectValue, + }, duration) + + return true +} + +type Effect407_sub struct { + node.EffectNode + effectType int8 + effectValue int8 +} + +func (e *Effect407_sub) ActionStart(fattack *action.SelectSkillAction, sattack *action.SelectSkillAction) bool { + e.Ctx().Our.SetProp(e.Ctx().Our, e.effectType, e.effectValue) + return true + +} +func init() { + input.InitEffect(input.EffectType.Skill, 138, &Effect407{}) + +} diff --git a/logic/service/fight/effect/412.go b/logic/service/fight/effect/412.go new file mode 100644 index 000000000..15132d298 --- /dev/null +++ b/logic/service/fight/effect/412.go @@ -0,0 +1,27 @@ +package effect + +import ( + "blazing/logic/service/fight/input" + "blazing/logic/service/fight/node" +) + +// 412 - 若自身体力小于1/n，则每次攻击不消耗PP值 +type Effect412 struct { + node.EffectNode +} + +func (e *Effect412) HookPP(count *int) bool { + maxHp := e.Ctx().Our.CurrentPet.GetMaxHP() + currentHp := e.Ctx().Our.CurrentPet.GetHP() + threshold := maxHp.Div(e.Args()[0]) // 1/n + + if currentHp.Cmp(threshold) < 0 { + *count = 0 + } + return true +} + +func init() { + input.InitEffect(input.EffectType.Skill, 412, &Effect412{}) + +} diff --git a/logic/service/fight/effect/440.go b/logic/service/fight/effect/440.go new file mode 100644 index 000000000..70c17d8e4 --- /dev/null +++ b/logic/service/fight/effect/440.go @@ -0,0 +1,35 @@ +package effect + +import ( + "blazing/logic/service/fight/input" + "blazing/logic/service/fight/node" +) + +// 440 - n回合内对手使用技能消耗的PP值变为m倍 +type Effect440 struct { + node.EffectNode +} + +func (e *Effect440) Skill_Use() bool { + // 创建一个延迟生效的效果，在下一回合开始生效 + + e.Ctx().Opp.AddEffect(e.Ctx().Our, e.GenSub(&Effect440_sub{ + m: int(e.Args()[1].IntPart()), + }, int(e.Args()[0].IntPart()))) + return true +} + +type Effect440_sub struct { + node.EffectNode + m int +} + +func (e *Effect440_sub) HookPP(count *int) bool { + *count *= e.m // 把t指向的值取反，直接作用于外部变量 + return true +} + +func init() { + input.InitEffect(input.EffectType.Skill, 138, &Effect407{}) + +} diff --git a/logic/service/fight/effect/475.go b/logic/service/fight/effect/475.go index e7c72c800..e35469f29 100644 --- a/logic/service/fight/effect/475.go +++ b/logic/service/fight/effect/475.go @@ -20,7 +20,8 @@ func (e *Effect475) Skill_Use() bool { if damageDone.IntPart() < int64(damageThreshold) { critDuration := int(e.Args()[1].IntPart()) - e.GenSub(&Effect475_sub{}, critDuration) + + e.Ctx().Our.AddEffect(e.Ctx().Our, e.GenSub(&Effect475_sub{}, critDuration)) } diff --git a/logic/service/fight/effect/back.go1 b/logic/service/fight/effect/back.go1 index f57d4a708..0d6b43b83 100644 --- a/logic/service/fight/effect/back.go1 +++ b/logic/service/fight/effect/back.go1 @@ -6,29 +6,6 @@ import ( "blazing/logic/service/fight/node" ) -// 407 - 下回合起，每回合XX等级+n，持续m回合 -type Effect407 struct { - node.EffectNode -} - -func (e *Effect407) OnSkill() bool { - // 创建一个延迟生效的效果，在下一回合开始生效 - go func() { - effectType := int(e.Args()[0].IntPart()) // XX类型 - effectValue := int(e.Args()[1].IntPart()) // 等级+n - duration := int(e.Args()[2].IntPart()) // 持续m回合 - - statusEffect := e.Ctx().Our.InitEffect(input.EffectType.Status, effectType) - if statusEffect != nil { - statusEffect.SetArgs(e.Ctx().Our, effectValue) - statusEffect.Duration(duration) - e.Ctx().Our.AddEffect(e.Ctx().Our, statusEffect) - } - }() - - return true -} - // 523 - 若当回合未击败对手，则自身1 1 1 1 1 1能力+1 type Effect523 struct { node.EffectNode @@ -59,16 +36,6 @@ func (e *Effect523) Action_end_ex() bool { return true } -// 440 - n回合内对手使用技能消耗的PP值变为m倍 -type Effect440 struct { - node.EffectNode -} - -func (e *Effect440) SetArgs(t *input.Input, a ...int) { - e.EffectNode.SetArgs(t, a...) - e.EffectNode.Duration(a[0]) // 持续n回合 -} - // 457 - 复制对手释放的技能（组队对战时无效） type Effect457 struct { node.EffectNode @@ -105,24 +72,6 @@ func (e *Effect197) SetArgs(t *input.Input, a ...int) { e.EffectNode.Duration(a[0]) // 持续n回合 } -// 412 - 若自身体力小于1/n，则每次攻击不消耗PP值 -type Effect412 struct { - node.EffectNode -} - -func (e *Effect412) SkillHit() bool { - maxHp := e.Ctx().Our.CurrentPet.GetMaxHP() - currentHp := e.Ctx().Our.CurrentPet.GetHP() - threshold := maxHp.Div(e.Args()[0]) // 1/n - - if currentHp.Cmp(threshold) < 0 { - // 本次攻击不消耗PP - e.Ctx().Our.SkipPpConsumption = true - } - - return true -} - // 199 - 下次被击败后，下一个出场的精灵xx等级+k type Effect199 struct { node.EffectNode diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index fc1e35059..f2172ba83 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -244,7 +244,13 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction) return item.ID == currentSkill.Info.ID }) if ok { - skill.PP-- + usecount := 1 + attacker.Exec(func(effect input.Effect) bool { //技能使用后的我方效果 + effect.Ctx().SkillEntity = currentSkill + effect.HookPP(&usecount) + return true + }) + skill.Use(usecount) } } if defender.CurrentPet.Info.Hp > 0 { diff --git a/logic/service/fight/input/interface.go b/logic/service/fight/input/interface.go index 2ae42d6a9..41adfacf9 100644 --- a/logic/service/fight/input/interface.go +++ b/logic/service/fight/input/interface.go @@ -47,7 +47,7 @@ type Effect interface { //OnSwitchOut() bool // 精灵下场时触发 // OnOwnerSwitchIn() bool // 所属玩家精灵出战时触发 // OnOwnerSwitchOut() bool // 所属玩家精灵下场时触发 - + HookPP(count *int) bool TurnEnd() //回合结束计算 HookAction() bool //出手前的hook参数，返回false阻止继续出手 //PreBattleEnd() bool //战斗结束前 diff --git a/logic/service/fight/node/skill.go b/logic/service/fight/node/skill.go index 45bb04f0e..2c35ebe29 100644 --- a/logic/service/fight/node/skill.go +++ b/logic/service/fight/node/skill.go @@ -23,6 +23,9 @@ func (e *EffectNode) CalculatePre() bool { return true } +func (e *EffectNode) HookPP(count *int) bool { + return true +} func (e *EffectNode) OnSkill() bool { // if e.Effect != nil { // if e.Hit() { //没命中 diff --git a/modules/player/model/pet.go b/modules/player/model/pet.go index 11064f009..1947d3630 100644 --- a/modules/player/model/pet.go +++ b/modules/player/model/pet.go @@ -459,6 +459,10 @@ type SkillInfo struct { PP uint32 } +func (s *SkillInfo) Use(count int) { + s.PP -= uint32(count) +} + // TableName Pet's table name func (*Pet) TableName() string { return TableNamePet