feat: season 4 updates

This commit is contained in:
TrèsAbhi committed 2024-05-22 13:04:39 -05:00
1 parent cdd2a08ec0
commit 903b7fa677
9 files changed
+118 -66

No files matched your search

@@ -91,7 +91,7 @@ export function CoreArmorSceneComponent({
equipment,
);
material.uniforms.thickness.value = hasEnhancedArmor
? thickness * 1.04
? thickness * 1.03
: thickness;
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
@@ -106,7 +106,14 @@ export function CoreArmorSceneComponent({
);
material.uniforms.penetration.value = hasCalibratedShells
? penetration * (isExplosive(duel.antagonist!.shell.type) ? 1.1 : 1.05)
? penetration *
(duel.antagonist!.shell.type === 'ap'
? 0.08
: duel.antagonist!.shell.type === 'ap_cr'
? 0.05
: duel.antagonist!.shell.type === 'hc'
? 0.13
: 0.8)
: penetration;
}
@@ -7,7 +7,6 @@ import {
ShaderMaterial,
} from 'three';
import { ArmorUserData, ExternalModuleVariant } from '../..';
import { isExplosive } from '../../../../../../core/blitz/isExplosive';
import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
@@ -62,7 +61,7 @@ export function SpacedArmorSubExternal({
equipment,
);
material.uniforms.thickness.value = hasEnhancedArmor
? thickness * 1.04
? thickness * 1.03
: thickness;
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
@@ -76,7 +75,14 @@ export function SpacedArmorSubExternal({
equipment,
);
material.uniforms.penetration.value = hasCalibratedShells
? penetration * (isExplosive(duel.antagonist!.shell.type) ? 1.1 : 1.05)
? penetration *
(duel.antagonist!.shell.type === 'ap'
? 0.08
: duel.antagonist!.shell.type === 'ap_cr'
? 0.05
: duel.antagonist!.shell.type === 'hc'
? 0.13
: 0.8)
: penetration;
}
@@ -7,7 +7,6 @@ import {
} from 'three';
import { degToRad } from 'three/src/math/MathUtils';
import { ArmorUserData } from '../..';
import { isExplosive } from '../../../../../../core/blitz/isExplosive';
import { resolveNearPenetration } from '../../../../../../core/blitz/resolveNearPenetration';
import { hasEquipment } from '../../../../../../core/blitzkit/hasEquipment';
import { jsxTree } from '../../../../../../core/blitzkit/jsxTree';
@@ -69,7 +68,7 @@ export function SpacedArmorSubSpaced({
equipment,
);
material.uniforms.thickness.value = hasEnhancedArmor
? thickness * 1.04
? thickness * 1.03
: thickness;
}
async function handleAntagonistEquipmentChange(equipment: EquipmentMatrix) {
@@ -82,7 +81,14 @@ export function SpacedArmorSubSpaced({
equipment,
);
material.uniforms.penetration.value = hasCalibratedShells
? penetration * (isExplosive(shell.type) ? 1.1 : 1.05)
? penetration *
(duel.antagonist!.shell.type === 'ap'
? 0.08
: duel.antagonist!.shell.type === 'ap_cr'
? 0.05
: duel.antagonist!.shell.type === 'hc'
? 0.13
: 0.8)
: penetration;
}
@@ -105,16 +105,20 @@ export function SpacedArmorSceneComponent({
duel.protagonist!.tank.equipment,
duel.protagonist!.equipmentMatrix,
);
const thicknessCoefficient = hasEnhancedArmor ? 1.04 : 1;
const thicknessCoefficient = hasEnhancedArmor ? 1.03 : 1;
const shell = useDuel.getState().antagonist!.shell;
const explosive = isExplosive(shell.type);
const splashing = canSplash(shell.type);
const penetration =
resolveNearPenetration(shell.penetration) *
(hasCalibratedShells
? isExplosive(shell.type)
? 1.1
: 1.05
? duel.antagonist!.shell.type === 'ap'
? 0.08
: duel.antagonist!.shell.type === 'ap_cr'
? 0.05
: duel.antagonist!.shell.type === 'hc'
? 0.13
: 0.8
: 1);
const shot: Shot = {
layers: [],
+1 -1
View File
@@ -46,7 +46,7 @@ export function ConsumablesManager({
cooldown={
timers
? consumable.cooldown *
(hasConsumableDeliverySystem ? 0.85 : 1) *
(hasConsumableDeliverySystem ? 0.88 : 1) *
(1 - cooldownBooster! * 0.1)
: undefined
}