Implement Xianyun plunge for Candace, Chongyun, Kaeya, Lanyan, Razor, Rosaria, & Xinyan

internal/characters/candace/config.yml

@@ -2,9 +2,13 @@ package_name: candace
 genshin_id: 10000072
 key: candace
 action_param_keys:
-    skill: 
+    skill:
         - param: "hold"
         - param: "perfect"
+    low_plunge:
+        - param: "collision"
+    high_plunge:
+        - param: "collision"
 skill_data_mapping:
     attack:
         attack_1:
@@ -18,6 +22,12 @@ skill_data_mapping:
             - 4 # 4-Hit DMG|{param4:F1P}
         charge:
             - 5 # Charged Attack DMG|{param5:F1P}
+        collision:
+            - 7 # Plunge DMG|{param7:F1P}
+        lowPlunge:
+            - 8 # Low/High Plunge DMG|{param8:P}/{param9:P}
+        highPlunge:
+            - 9 # Low/High Plunge DMG|{param8:P}/{param9:P}
     skill:
         skillDmg:
             - 0 # Shield DMG Absorption|{param0:F1P} Max HP+{param1:I}

internal/characters/candace/plunge.go

@@ -0,0 +1,169 @@
+package candace
+
+import (
+	"errors"
+
+	"github.com/genshinsim/gcsim/internal/frames"
+	"github.com/genshinsim/gcsim/pkg/core/action"
+	"github.com/genshinsim/gcsim/pkg/core/attacks"
+	"github.com/genshinsim/gcsim/pkg/core/attributes"
+	"github.com/genshinsim/gcsim/pkg/core/combat"
+	"github.com/genshinsim/gcsim/pkg/core/info"
+	"github.com/genshinsim/gcsim/pkg/core/player"
+)
+
+var (
+	highPlungeFrames []int
+	lowPlungeFrames  []int
+)
+
+const (
+	lowPlungeHitmark  = 42
+	highPlungeHitmark = 45
+	collisionHitmark  = lowPlungeHitmark - 6
+)
+
+const (
+	lowPlungePoiseDMG = 100.0
+	lowPlungeRadius   = 3.0
+)
+
+const (
+	highPlungePoiseDMG = 150.0
+	highPlungeRadius   = 5.0
+)
+
+func init() {
+	// low_plunge -> x
+	lowPlungeFrames = frames.InitAbilSlice(81) // Jump
+	lowPlungeFrames[action.ActionAttack] = 59
+	lowPlungeFrames[action.ActionSkill] = 59
+	lowPlungeFrames[action.ActionBurst] = 60
+	lowPlungeFrames[action.ActionDash] = 79
+	lowPlungeFrames[action.ActionSwap] = 65
+
+	// high_plunge -> x
+	highPlungeFrames = frames.InitAbilSlice(82) // Jump
+	highPlungeFrames[action.ActionAttack] = 62
+	highPlungeFrames[action.ActionSkill] = 62
+	highPlungeFrames[action.ActionBurst] = 62
+	highPlungeFrames[action.ActionWalk] = 81
+	highPlungeFrames[action.ActionSwap] = 66
+}
+
+// Low Plunge attack damage queue generator
+// Use the "collision" optional argument if you want to do a falling hit on the way down
+// Default = 0
+func (c *char) LowPlungeAttack(p map[string]int) (action.Info, error) {
+	defer c.Core.Player.SetAirborne(player.Grounded)
+	switch c.Core.Player.Airborne() {
+	case player.AirborneXianyun:
+		return c.lowPlungeXY(p), nil
+	default:
+		return action.Info{}, errors.New("low_plunge can only be used while airborne")
+	}
+}
+
+func (c *char) lowPlungeXY(p map[string]int) action.Info {
+	collision, ok := p["collision"]
+	if !ok {
+		collision = 0 // Whether or not collision hit
+	}
+
+	if collision > 0 {
+		c.plungeCollision(collisionHitmark)
+	}
+
+	ai := info.AttackInfo{
+		ActorIndex: c.Index(),
+		Abil:       "Low Plunge",
+		AttackTag:  attacks.AttackTagPlunge,
+		ICDTag:     attacks.ICDTagNone,
+		ICDGroup:   attacks.ICDGroupDefault,
+		StrikeType: attacks.StrikeTypeBlunt,
+		PoiseDMG:   lowPlungePoiseDMG,
+		Element:    attributes.Physical,
+		Durability: 25,
+		Mult:       lowPlunge[c.TalentLvlAttack()],
+	}
+	c.Core.QueueAttack(
+		ai,
+		combat.NewCircleHitOnTarget(c.Core.Combat.Player(), info.Point{Y: 1}, lowPlungeRadius),
+		lowPlungeHitmark,
+		lowPlungeHitmark,
+	)
+
+	return action.Info{
+		Frames:          frames.NewAbilFunc(lowPlungeFrames),
+		AnimationLength: lowPlungeFrames[action.InvalidAction],
+		CanQueueAfter:   lowPlungeFrames[action.ActionAttack],
+		State:           action.PlungeAttackState,
+	}
+}
+
+// High Plunge attack damage queue generator
+// Use the "collision" optional argument if you want to do a falling hit on the way down
+// Default = 0
+func (c *char) HighPlungeAttack(p map[string]int) (action.Info, error) {
+	defer c.Core.Player.SetAirborne(player.Grounded)
+	switch c.Core.Player.Airborne() {
+	case player.AirborneXianyun:
+		return c.highPlungeXY(p), nil
+	default:
+		return action.Info{}, errors.New("high_plunge can only be used while airborne")
+	}
+}
+
+func (c *char) highPlungeXY(p map[string]int) action.Info {
+	collision, ok := p["collision"]
+	if !ok {
+		collision = 0 // Whether or not collision hit
+	}
+
+	if collision > 0 {
+		c.plungeCollision(collisionHitmark)
+	}
+
+	ai := info.AttackInfo{
+		ActorIndex: c.Index(),
+		Abil:       "High Plunge",
+		AttackTag:  attacks.AttackTagPlunge,
+		ICDTag:     attacks.ICDTagNone,
+		ICDGroup:   attacks.ICDGroupDefault,
+		StrikeType: attacks.StrikeTypeBlunt,
+		PoiseDMG:   highPlungePoiseDMG,
+		Element:    attributes.Physical,
+		Durability: 25,
+		Mult:       highPlunge[c.TalentLvlAttack()],
+	}
+	c.Core.QueueAttack(
+		ai,
+		combat.NewCircleHitOnTarget(c.Core.Combat.Player(), info.Point{Y: 1}, highPlungeRadius),
+		highPlungeHitmark,
+		highPlungeHitmark,
+	)
+
+	return action.Info{
+		Frames:          frames.NewAbilFunc(highPlungeFrames),
+		AnimationLength: highPlungeFrames[action.InvalidAction],
+		CanQueueAfter:   highPlungeFrames[action.ActionAttack],
+		State:           action.PlungeAttackState,
+	}
+}
+
+// Plunge normal falling attack damage queue generator
+// Standard - Always part of high/low plunge attacks
+func (c *char) plungeCollision(delay int) {
+	ai := info.AttackInfo{
+		ActorIndex: c.Index(),
+		Abil:       "Plunge Collision",
+		AttackTag:  attacks.AttackTagPlunge,
+		ICDTag:     attacks.ICDTagNone,
+		ICDGroup:   attacks.ICDGroupDefault,
+		StrikeType: attacks.StrikeTypeSlash,
+		Element:    attributes.Physical,
+		Durability: 0,
+		Mult:       collision[c.TalentLvlAttack()],
+	}
+	c.Core.QueueAttack(ai, combat.NewCircleHitOnTarget(c.Core.Combat.Player(), info.Point{Y: 1}, 1), delay, delay)
+}

internal/characters/chongyun/config.yml

@@ -1,6 +1,11 @@
 package_name: chongyun
 genshin_id: 10000036
 key: chongyun
+action_param_keys:
+    low_plunge:
+        - param: "collision"
+    high_plunge:
+        - param: "collision"
 skill_data_mapping:
     attack:
         attack_1:
@@ -11,6 +16,12 @@ skill_data_mapping:
             - 2 # 3-Hit DMG|{param2:F1P}
         attack_4:
             - 3 # 4-Hit DMG|{param3:P}
+        collision:
+            - 8 # Plunge DMG|{param8:F1P}
+        lowPlunge:
+            - 9 # Low/High Plunge DMG|{param9:P}/{param10:P}
+        highPlunge:
+            - 10 # Low/High Plunge DMG|{param9:P}/{param10:P}
     skill:
         skill:
             - 0 # Skill DMG|{param0:P}