Skip to content

Commit 50229b9

Browse files
authored
Fix xilonen geo sampler being active if all samplers were converted (#2332)
https://discord.com/channels/845087716541595668/1336939788925931561
1 parent 9ec1440 commit 50229b9

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

internal/characters/xilonen/cons.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ func (c *char) c2() {
5959
return
6060
}
6161

62+
if c.samplersConverted >= 3 {
63+
return
64+
}
65+
6266
c.activeGeoSampler(-1)()
6367
for _, ch := range c.Core.Player.Chars() {
6468
if ch.Base.Element != attributes.Geo {

internal/characters/xilonen/skill.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (c *char) enterNightsoul() {
6969
c.skillLastStamF = c.Core.Player.LastStamUse
7070
c.Core.Player.LastStamUse = math.MaxInt
7171
// Don't queue the task if C2 or higher
72-
if c.Base.Cons < 2 {
72+
if c.Base.Cons < 2 && c.samplersConverted < 3 {
7373
c.activeGeoSampler(c.nightsoulSrc)()
7474
}
7575
}
@@ -113,6 +113,11 @@ func (c *char) applySamplerShred(ele attributes.Element, enemies []combat.Enemy)
113113

114114
func (c *char) activeGeoSampler(src int) func() {
115115
return func() {
116+
// Xilonen only has 3 samplers; if all 3 are converted then no geo samplers can remain.
117+
if c.samplersConverted >= 3 {
118+
return
119+
}
120+
116121
if c.Base.Cons < 2 {
117122
if c.nightsoulSrc != src {
118123
return

0 commit comments

Comments
 (0)