Skip to content

holiday effects v2 #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2022
Merged

holiday effects v2 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
736e198
holiday effects v2
TurtIeSocks Oct 12, 2022
af57093
Synced docker env vars with latest config
TurtIeSocks Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactmap",
"version": "1.5.1",
"version": "1.6.0",
"description": "React based frontend map.",
"main": "ReactMap.js",
"author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",
Expand Down
18 changes: 2 additions & 16 deletions server/src/configs/custom-environment-variables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,8 @@
"rolesLink": "MAP_LINKS_ROLES_LINK"
},
"holidayEffects": {
"christmasSnow": {
"__name": "MAP_HOLIDAY_EFFECTS_CHRISTMAS_SNOW",
"__format": "boolean"
},
"newYearsFireworks": {
"__name": "MAP_HOLIDAY_EFFECTS_NEW_YEARS_FIREWORKS",
"__format": "boolean"
},
"valentinesDay": {
"__name": "MAP_HOLIDAY_EFFECTS_VALENTINES_DAY",
"__format": "boolean"
},
"internationalWomensDay": {
"__name": "MAP_HOLIDAY_EFFECTS_INTERNATIONAL_WOMENS_DAY",
"__format": "boolean"
}
"__name": "MAP_HOLIDAY_EFFECTS",
"__format": "json"
},
"misc": {
"enableMapJsFilter": {
Expand Down
65 changes: 59 additions & 6 deletions server/src/configs/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,65 @@
"rolesLinkName": "Role Upgrading Info",
"rolesLink": ""
},
"holidayEffects": {
"christmasSnow": true,
"newYearsFireworks": true,
"valentinesDay": true,
"internationalWomensDay": true
},
"holidayEffects": [
{
"name": "Valentine's Day",
"enabled": true,
"images": [
"https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/A_perfect_SVG_heart.svg/20px-A_perfect_SVG_heart.svg.png"
],
"imageScale": 1.5,
"startMonth": 1,
"startDay": 14,
"endMonth": 1,
"endDay": 14
},
{
"name": "International Women's Day",
"enabled": true,
"images": [
"https://upload.wikimedia.org/wikipedia/commons/thumb/a/ae/Emoji_u1f338.svg/20px-Emoji_u1f338.svg.png"
],
"imageScale": 1,
"startDay": 8,
"startMonth": 3,
"endDay": 8,
"endMonth": 3
},
{
"name": "Halloween",
"enabled": true,
"images": [
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dc/Fluent_Emoji_flat_1f383.svg/640px-Fluent_Emoji_flat_1f383.svg.png",
"https://upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Ghost.svg/640px-Ghost.svg.png"
],
"imageScale": 2,
"startDay": 29,
"startMonth": 10,
"endDay": 31,
"endMonth": 10
},
{
"name": "Christmas",
"enabled": true,
"images": [],
"css": "snow",
"startDay": 25,
"startMonth": 12,
"endDay": 26,
"endMonth": 12
},
{
"name": "New Years",
"enabled": true,
"images": [],
"css": "fireworks",
"startDay": 31,
"startMonth": 12,
"endDay": 1,
"endMonth": 1
}
],
"misc": {
"enableMapJsFilter": true,
"fetchLatestInvasions": true,
Expand Down
12 changes: 10 additions & 2 deletions server/src/services/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,22 @@ const mergeMapConfig = (obj) => {
}
})

if (
obj?.holidayEffects &&
!Array.isArray(obj?.holidayEffects) &&
typeof obj?.holidayEffects === 'object'
) {
console.warn(
'[CONFIG] holidayEffects has been changed to an array, please update your config. Check out `server/src/configs/default.json` for an example.',
)
obj.holidayEffects = []
}
return {
localeSelection: obj.localeSelection,
...obj,
...obj.general,
...obj.customRoutes,
...obj.links,
...obj.holidayEffects,
...obj.misc,
messageOfTheDay: {
...obj.messageOfTheDay,
Expand All @@ -179,7 +188,6 @@ const mergeMapConfig = (obj) => {
general: undefined,
customRoutes: undefined,
links: undefined,
holidayEffects: undefined,
misc: undefined,
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/components/Config.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ export default function Config() {
getServerSettings={getServerSettings}
/>
<HolidayEffects
mapSettings={
serverSettings?.config?.map ? serverSettings.config.map : {}
}
holidayEffects={serverSettings?.config?.map?.holidayEffects || []}
/>
</ThemeProvider>
)
Expand Down
95 changes: 40 additions & 55 deletions src/components/HolidayEffects.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,46 @@
import React from 'react'
import HolidayAnimations from '@services/HolidayAnimations'

export default function HolidayEffects({ mapSettings }) {
export default function HolidayEffects({ holidayEffects }) {
const date = new Date()

if (
mapSettings.valentinesDay &&
date.getMonth() === 1 &&
date.getDate() === 14
) {
const heart = new HolidayAnimations(
'https://upload.wikimedia.org/wikipedia/commons/thumb/8/86/A_perfect_SVG_heart.svg/20px-A_perfect_SVG_heart.svg.png',
)
heart.initialize()

return null
}
if (
mapSettings.internationalWomensDay &&
date.getMonth() === 2 &&
date.getDate() === 8
) {
const flower = new HolidayAnimations(
'https://upload.wikimedia.org/wikipedia/commons/thumb/a/ae/Emoji_u1f338.svg/20px-Emoji_u1f338.svg.png',
)
flower.initialize()

return holidayEffects.map((holiday) => {
if (
holiday.enabled &&
date.getMonth() >= holiday.startMonth - 1 &&
date.getMonth() <= holiday.endMonth - 1 &&
date.getDate() >= holiday.startDay &&
date.getDate() <= holiday.endDay
) {
switch (holiday.css) {
case 'snow':
return (
<div className="winter-is-coming">
<div className="snow snow--near" />
<div className="snow snow--near snow--alt" />
<div className="snow snow--mid" />
<div className="snow snow--mid snow--alt" />
<div className="snow snow--far" />
<div className="snow snow--far snow--alt" />
</div>
)
case 'fireworks':
return (
<div className="pyro">
<div className="before" />
<div className="after" />
</div>
)
default: {
if (holiday.images?.length) {
const animation = new HolidayAnimations(
holiday.images,
holiday.imageScale,
)
animation.initialize()
}
}
}
}
return null
}
if (
mapSettings.christmasSnow &&
date.getMonth() === 11 &&
date.getDate() >= 24 &&
date.getDate() <= 30
) {
return (
<div className="winter-is-coming">
<div className="snow snow--near" />
<div className="snow snow--near snow--alt" />
<div className="snow snow--mid" />
<div className="snow snow--mid snow--alt" />
<div className="snow snow--far" />
<div className="snow snow--far snow--alt" />
</div>
)
}
if (
mapSettings.newYearsFireworks &&
((date.getMonth() === 11 && date.getDate() === 31) ||
(date.getMonth() === 0 && date.getDate() === 1))
) {
return (
<div className="pyro">
<div className="before" />
<div className="after" />
</div>
)
}
return null
})
}
15 changes: 9 additions & 6 deletions src/services/HolidayAnimations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default class HolidayAnimations {
constructor(image) {
this.imageHeight = 15
this.imageWidth = 15
constructor(images, scale = 1) {
this.imageHeight = 15 * scale
this.imageWidth = 15 * scale
this.baseImages = images
this.images = []
this.image = image
this.minScale = 0.3
this.canvas = document.getElementById('holiday-canvas')
this.ctx = this.canvas ? this.canvas.getContext('2d') : null
Expand Down Expand Up @@ -33,7 +33,7 @@ export default class HolidayAnimations {
this.images.forEach((item) => {
item.image = new Image()
item.image.style.height = item.height
item.image.src = this.image
item.image.src = item.src
this.ctx.globalAlpha = item.opacity
this.ctx.drawImage(item.image, item.x, item.y, item.width, item.height)
})
Expand All @@ -54,7 +54,10 @@ export default class HolidayAnimations {
ys: Math.random() + 1,
height: scale * this.imageHeight,
width: scale * this.imageWidth,
opacity: scale,
opacity: Math.max(Math.random(), 0.25),
src: this.baseImages[
Math.floor(Math.random() * this.baseImages.length)
],
})
}
setInterval(this.draw.bind(this), 30)
Expand Down