forked from OpenWF/SpaceNinjaServer
		
	fix: correct Activation/Expiry date for Ghoul Emergence (#2777)
Closes #2775 Reviewed-on: OpenWF/SpaceNinjaServer#2777 Reviewed-by: Sainan <63328889+sainan@users.noreply.github.com> Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									d027e7f26e
								
							
						
					
					
						commit
						791ae389d8
					
				@ -2803,7 +2803,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        const activeStartDay = day - ghoulsCycleDay + 17;
 | 
					        const activeStartDay = day - ghoulsCycleDay + 17;
 | 
				
			||||||
        const activeEndDay = activeStartDay + 5;
 | 
					        const activeEndDay = activeStartDay + 5;
 | 
				
			||||||
        const dayWithFraction = (timeMs - EPOCH) / 86400000;
 | 
					        const dayWithFraction = (timeMs - EPOCH) / unixTimesInMs.day;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        const progress = (dayWithFraction - activeStartDay) / (activeEndDay - activeStartDay);
 | 
					        const progress = (dayWithFraction - activeStartDay) / (activeEndDay - activeStartDay);
 | 
				
			||||||
        const healthPct = 1 - Math.min(Math.max(progress, 0), 1);
 | 
					        const healthPct = 1 - Math.min(Math.max(progress, 0), 1);
 | 
				
			||||||
@ -2814,22 +2814,14 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
 | 
				
			|||||||
                $date: {
 | 
					                $date: {
 | 
				
			||||||
                    $numberLong: config.worldState?.ghoulEmergenceOverride
 | 
					                    $numberLong: config.worldState?.ghoulEmergenceOverride
 | 
				
			||||||
                        ? "1753204900185"
 | 
					                        ? "1753204900185"
 | 
				
			||||||
                        : Date.UTC(
 | 
					                        : (EPOCH + activeStartDay * unixTimesInMs.day).toString()
 | 
				
			||||||
                              date.getUTCFullYear(),
 | 
					 | 
				
			||||||
                              date.getUTCMonth(),
 | 
					 | 
				
			||||||
                              date.getUTCDate() + activeStartDay
 | 
					 | 
				
			||||||
                          ).toString()
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            Expiry: {
 | 
					            Expiry: {
 | 
				
			||||||
                $date: {
 | 
					                $date: {
 | 
				
			||||||
                    $numberLong: config.worldState?.ghoulEmergenceOverride
 | 
					                    $numberLong: config.worldState?.ghoulEmergenceOverride
 | 
				
			||||||
                        ? "2000000000000"
 | 
					                        ? "2000000000000"
 | 
				
			||||||
                        : Date.UTC(
 | 
					                        : (EPOCH + activeEndDay * unixTimesInMs.day).toString()
 | 
				
			||||||
                              date.getUTCFullYear(),
 | 
					 | 
				
			||||||
                              date.getUTCMonth(),
 | 
					 | 
				
			||||||
                              date.getUTCDate() + activeEndDay
 | 
					 | 
				
			||||||
                          ).toString()
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            HealthPct: config.worldState?.ghoulEmergenceOverride ? 1 : healthPct,
 | 
					            HealthPct: config.worldState?.ghoulEmergenceOverride ? 1 : healthPct,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user