Merge branch 'main' of ssh://gitea.directonline.io:29417/sylvan-quest/client

This commit is contained in:
Dennis Postma 2024-12-24 00:54:27 +01:00
commit c54d2a2da8

View File

@ -76,21 +76,22 @@ const initializeEffects = (scene: Phaser.Scene) => {
// Effect updates // Effect updates
const updateScene = () => { const updateScene = () => {
const timeBasedLight = calculateLightStrength(gameStore.world.date) const timeBasedLight = calculateLightStrength(gameStore.world.date)
const defaultEffects = {
light: timeBasedLight,
rain: weatherState.value.isRainEnabled ? weatherState.value.rainPercentage : 0,
fog: weatherState.value.isFogEnabled ? weatherState.value.fogDensity * 100 : 0
}
const zoneEffects = zoneStore.zone?.zoneEffects?.reduce((acc, curr) => ({ const zoneEffects = zoneStore.zone?.zoneEffects?.reduce((acc, curr) => ({
...acc, ...acc,
[curr.effect]: curr.strength [curr.effect]: curr.strength
}), {}) as { [key: string]: number } }), {}) as { [key: string]: number }
if (zoneEffects && Object.keys(zoneEffects).length) {
applyEffects(zoneEffects)
} else {
applyEffects({ applyEffects({
light: timeBasedLight, ...defaultEffects,
rain: weatherState.value.isRainEnabled ? weatherState.value.rainPercentage : 0, ...(zoneEffects || {})
fog: weatherState.value.isFogEnabled ? weatherState.value.fogDensity * 100 : 0
}) })
} }
}
const applyEffects = (effectValues: any) => { const applyEffects = (effectValues: any) => {
if (effects.light.value) { if (effects.light.value) {