Skip to content

Commit 688e526

Browse files
authored
fix: silverwolf conditionals (#1591)
1 parent 4d42f2f commit 688e526

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/lib/conditionals/character/1500/SilverWolfLv999.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
129129
}
130130

131131
const teammateDefaults = {
132+
e1Vulnerability: true,
132133
e6ResPen: true,
133134
}
134135

@@ -206,6 +207,7 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
206207
}
207208

208209
const teammateContent: ContentDefinition<typeof teammateDefaults> = {
210+
e1Vulnerability: content.e1Vulnerability,
209211
e6ResPen: content.e6ResPen,
210212
}
211213

@@ -336,13 +338,13 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
336338
precomputeEffectsContainer: (x: ComputedStatsContainer, action: OptimizerAction, context: OptimizerContext) => {
337339
const r = action.characterConditionals as Conditionals<typeof content>
338340

339-
x.buff(StatKey.VULNERABILITY, (e >= 1 && r.e1Vulnerability && r.godmodePlayer) ? 0.20 : 0, x.source(SOURCE_E1))
340341
x.buff(StatKey.MERRYMAKING, (e >= 6 && r.e6Merrymake) ? 0.50 : 0, x.actionKind(AbilityKind.BASIC).source(SOURCE_E6))
341342
},
342343

343344
precomputeMutualEffectsContainer: (x: ComputedStatsContainer, action: OptimizerAction, context: OptimizerContext) => {
344345
const m = action.characterConditionals as Conditionals<typeof teammateContent>
345346

347+
x.buff(StatKey.VULNERABILITY, (e >= 1 && m.e1Vulnerability) ? 0.20 : 0, x.targets(TargetTag.FullTeam).source(SOURCE_E1))
346348
x.buff(StatKey.RES_PEN, (e >= 6 && m.e6ResPen) ? (context.enemyDamageResistance || 0.20) : 0, x.targets(TargetTag.FullTeam).source(SOURCE_E6))
347349
},
348350

@@ -361,7 +363,7 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
361363
chainsTo: [Stats.Elation],
362364
condition: function(x: ComputedStatsContainer, action: OptimizerAction, context: OptimizerContext) {
363365
const r = action.characterConditionals as Conditionals<typeof content>
364-
return r.spdToElation && x.getActionValueByIndex(StatKey.SPD, SELF_ENTITY_INDEX) >= 150
366+
return r.spdToElation && x.getActionValueByIndex(StatKey.SPD, SELF_ENTITY_INDEX) >= 160
365367
},
366368
effect: function(x: ComputedStatsContainer, action: OptimizerAction, context: OptimizerContext) {
367369
dynamicStatConversionContainer(
@@ -373,8 +375,8 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
373375
context,
374376
SOURCE_TRACE,
375377
(convertibleValue) => {
376-
if (convertibleValue < 150) return 0
377-
return 0.30 + Math.min(convertibleValue - 150, 100) * 0.02
378+
if (convertibleValue < 160) return 0
379+
return 0.50 + Math.min(convertibleValue - 160, 100) * 0.02
378380
},
379381
)
380382
},
@@ -387,9 +389,9 @@ const conditionals = (e: Eidolon, withContent: boolean): CharacterConditionalsCo
387389
this,
388390
action,
389391
context,
390-
`0.30 + min(convertibleValue - 150.0, 100.0) * 0.02`,
392+
`0.50 + min(convertibleValue - 160.0, 100.0) * 0.02`,
391393
`${wgslTrue(r.spdToElation)}`,
392-
`convertibleValue >= 150.0`,
394+
`convertibleValue >= 160.0`,
393395
)
394396
},
395397
},

0 commit comments

Comments
 (0)