Adding Navia

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
 
   "[javascript]": {

internal/characters/navia/asc.go

@@ -0,0 +1,71 @@
+package navia
+
+import (
+	"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/glog"
+	"github.com/genshinsim/gcsim/pkg/core/player/character"
+	"github.com/genshinsim/gcsim/pkg/modifier"
+)
+
+func init() {
+
+}
+
+// For 4s after using Ceremonial Crystalshot, the DMG dealt by Navia's Normal Attacks,
+// Charged Attacks, and Plunging Attacks will be converted into Geo DMG which cannot
+// be overridden by other Elemental infusions, and the DMG dealt by Navia's Normal Attacks,
+// Charged Attacks, and Plunging Attacks will be increased by 40%.
+func (c *char) a1() {
+	if c.Base.Ascension < 1 {
+		return
+	}
+	c.Core.Log.NewEvent("infusion added", glog.LogCharacterEvent, c.Index)
+
+	// add Damage Bonus
+	m := make([]float64, attributes.EndStatType)
+	c.AddAttackMod(character.AttackMod{
+		Base: modifier.NewBaseWithHitlag("navia-a1-dmg", 60*4), // 4s
+		Amount: func(atk *combat.AttackEvent, _ combat.Target) ([]float64, bool) {
+			// skip if not normal/charged/plunge
+			if atk.Info.AttackTag != attacks.AttackTagNormal &&
+				atk.Info.AttackTag != attacks.AttackTagExtra &&
+				atk.Info.AttackTag != attacks.AttackTagPlunge {
+				return nil, false
+			}
+			// apply buff
+			m[attributes.DmgP] = 0.4
+			return m, true
+		},
+	})
+}
+
+// For each Pyro/Electro/Cryo/Hydro party member, Navia gains 20% increased ATK.
+// This effect can stack up to 2 times.
+func (c *char) a4() {
+	if c.Base.Ascension < 4 {
+		return
+	}
+
+	ele := 0
+	for _, char := range c.Core.Player.Chars() {
+		if char.Base.Element != attributes.Geo && char.Base.
+			Element != attributes.Anemo && char.Base.Element != attributes.Dendro {
+			ele++
+		}
+	}
+	if ele > 2 {
+		ele = 2
+	}
+
+	m := make([]float64, attributes.EndStatType)
+	m[attributes.ATKP] = 0.2 * float64(ele)
+	c.AddStatMod(character.StatMod{
+		Base:         modifier.NewBase("navia-a4", -1),
+		AffectedStat: attributes.ATKP,
+		Amount: func() ([]float64, bool) {
+			return m, true
+		},
+	})
+}

internal/characters/navia/attack.go

@@ -0,0 +1,75 @@
+package navia
+
+import (
+	"fmt"
+	"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/geometry"
+)
+
+var (
+	attackFrames          [][]int
+	attackHitmarks        = [][]int{{23}, {22}, {31, 39, 38}, {41}}
+	attackHitlagHaltFrame = [][]float64{{0.06}, {0.06}, {0.01, 0.01, 0.01}, {.06}}
+	attackDefHalt         = [][]bool{{true}, {true}, {false, false, false}, {true}}
+	attackHitboxes        = [][]float64{{2}, {4.3, 2}, {4.5, 3}, {4.7, 2}}
+	attackOffsets         = []float64{0.5, -1.5, 1, -1.85}
+)
+
+const normalHitNum = 4
+
+func init() {
+	attackFrames = make([][]int, normalHitNum)
+
+	attackFrames[0] = frames.InitNormalCancelSlice(attackHitmarks[0][0], 28)
+	attackFrames[1] = frames.InitNormalCancelSlice(attackHitmarks[1][0], 42)
+	attackFrames[2] = frames.InitNormalCancelSlice(attackHitmarks[2][0], 48)
+	attackFrames[3] = frames.InitNormalCancelSlice(attackHitmarks[3][0], 93)
+}
+
+func (c *char) Attack(_ map[string]int) (action.Info, error) {
+	for i, mult := range auto[c.NormalCounter] {
+		ai := combat.AttackInfo{
+			ActorIndex:         c.Index,
+			Abil:               fmt.Sprintf("Normal %v", c.NormalCounter),
+			AttackTag:          attacks.AttackTagNormal,
+			ICDTag:             attacks.ICDTagNormalAttack,
+			ICDGroup:           attacks.ICDGroupDefault,
+			StrikeType:         attacks.StrikeTypeBlunt,
+			Element:            attributes.Physical,
+			Durability:         25,
+			Mult:               mult[c.TalentLvlAttack()],
+			HitlagFactor:       0.01,
+			HitlagHaltFrames:   attackHitlagHaltFrame[c.NormalCounter][i] * 60,
+			CanBeDefenseHalted: attackDefHalt[c.NormalCounter][i],
+		}
+		ap := combat.NewCircleHitOnTarget(
+			c.Core.Combat.Player(),
+			geometry.Point{Y: attackOffsets[c.NormalCounter]},
+			attackHitboxes[c.NormalCounter][0],
+		)
+		if c.NormalCounter != 0 {
+			ap = combat.NewBoxHitOnTarget(
+				c.Core.Combat.Player(),
+				geometry.Point{Y: attackOffsets[c.NormalCounter]},
+				attackHitboxes[c.NormalCounter][0],
+				attackHitboxes[c.NormalCounter][1],
+			)
+		}
+		c.QueueCharTask(func() {
+			c.Core.QueueAttack(ai, ap, 0, 0)
+		}, attackHitmarks[c.NormalCounter][i])
+	}
+
+	defer c.AdvanceNormalIndex()
+
+	return action.Info{
+		Frames:          frames.NewAttackFunc(c.Character, attackFrames),
+		AnimationLength: attackFrames[c.NormalCounter][action.InvalidAction],
+		CanQueueAfter:   attackHitmarks[c.NormalCounter][len(attackHitmarks[c.NormalCounter])-1],
+		State:           action.NormalAttackState,
+	}, nil
+}

internal/characters/navia/burst.go

@@ -0,0 +1,150 @@
+package navia
+
+import (
+	"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/geometry"
+	"github.com/genshinsim/gcsim/pkg/core/glog"
+	"github.com/genshinsim/gcsim/pkg/core/targets"
+)
+
+var (
+	burstFrames []int
+)
+
+const (
+	burstHitmark  = 104
+	burstKey      = "navia-artillery"
+	burstDuration = 720
+	targetRadius  = 10
+	burstDelay    = 154
+)
+
+func init() {
+	burstFrames = frames.InitAbilSlice(102)
+	burstFrames[action.ActionSwap] = 93
+	burstFrames[action.ActionWalk] = 127
+}
+
+// On the orders of the President of the Spina di Rosula, call for a magnificent
+// Golden Rose Salute. Unleashes a massive bombardment on opponents in front of her,
+// dealing Aoe Geo DMG and providing Fire Support for a duration afterward, periodically
+// dealing Geo DMG.
+func (c *char) Burst(_ map[string]int) (action.Info, error) {
+	ai := combat.AttackInfo{
+		ActorIndex: c.Index,
+		Abil:       "As the Sunlit Sky's Singing Salute",
+		AttackTag:  attacks.AttackTagElementalBurst,
+		ICDTag:     attacks.ICDTagNone,
+		ICDGroup:   attacks.ICDGroupDefault,
+		StrikeType: attacks.StrikeTypeBlunt,
+		Element:    attributes.Geo,
+		Durability: 50,
+		Mult:       burst[0][c.TalentLvlBurst()],
+	}
+
+	c.Core.QueueAttack(
+		ai,
+		combat.NewBoxHit(c.Core.Combat.Player(), c.Core.Combat.Player(), geometry.Point{Y: 0}, 12, 6),
+		burstHitmark,
+		burstHitmark,
+	)
+
+	c.QueueCharTask(
+		func() {
+			c.AddStatus(burstKey, burstDuration+burstDelay, false)
+			c.naviaburst = true
+		},
+		burstDelay,
+	)
+	c.QueueCharTask(
+		func() {
+			c.naviaburst = false
+		},
+		burstDuration+burstDelay,
+	)
+
+	c.ConsumeEnergy(12)
+	c.SetCD(action.ActionBurst, 15*60)
+
+	ai.Abil = "Fire Support"
+	ai.ICDTag = attacks.ICDTagElementalBurst
+	ai.Durability = 25
+	ai.Mult = burst[1][c.TalentLvlBurst()]
+
+	snap := c.Snapshot(&ai)
+	c.artillerySnapshot = combat.AttackEvent{
+		Info:        ai,
+		Snapshot:    snap,
+		SourceFrame: c.Core.F,
+	}
+	for i, j := 3, 0; i <= burstDuration; i += BurstInterval(j) {
+		c.Core.QueueAttack(
+			ai,
+			combat.NewCircleHitOnTarget(c.location(targetRadius), nil, 3),
+			burstDelay+i,
+			burstDelay+i+9,
+			c.BurstCB(),
+			c.c4(),
+		)
+	}
+
+	return action.Info{
+		Frames:          frames.NewAbilFunc(burstFrames),
+		AnimationLength: burstFrames[action.InvalidAction],
+		CanQueueAfter:   burstFrames[action.ActionSwap], // earliest cancel
+		State:           action.BurstState,
+	}, nil
+}
+
+func BurstInterval(j int) int {
+	if j%3 == 1 {
+		j++
+		return 48
+	} else {
+		j++
+		return 42
+	}
+}
+
+// When attacks from Golden Rose's Salute hit opponents, Navia will gain 1 charge
+// of Crystal Shrapnel.
+// This effect can be triggered up to once every 2.4s.
+func (c *char) BurstCB() combat.AttackCBFunc {
+
+	return func(a combat.AttackCB) {
+		if c.StatusIsActive("navia-q-shrapnel-icd") {
+			return
+		}
+		if a.Target.Type() != targets.TargettableEnemy {
+			return
+		}
+
+		if c.shrapnel < 6 {
+			c.shrapnel++
+			c.Core.Log.NewEvent("Crystal Shrapnel gained from Burst", glog.LogCharacterEvent, c.Index)
+
+		}
+
+		c.AddStatus("navia-q-shrapnel-icd", 2.4*60, false)
+	}
+
+}
+
+// Targets a random enemy if there is an enemy present, if not, it targets a random spot
+func (c *char) location(r float64) geometry.Point {
+	enemy := c.Core.Combat.RandomEnemyWithinArea(
+		combat.NewCircleHitOnTarget(c.Core.Combat.Player().Pos(), nil, 10),
+		nil,
+	)
+	var pos geometry.Point
+	if enemy != nil {
+		pos = enemy.Pos()
+	} else {
+		pos = geometry.CalcRandomPointFromCenter(c.Core.Combat.Player().Pos(), 0, r, c.Core.Rand)
+	}
+	return pos
+}

internal/characters/navia/config.yaml

@@ -0,0 +1,3 @@
+package_name: "navia"
+genshin_id: 10000091
+key: "navia"