forked from ppfun/pixelplanet
Merge branch 'sallbet-canvases'
This commit is contained in:
commit
5cda6e161b
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 3.7 KiB |
|
@ -297,11 +297,15 @@
|
|||
[ 67, 52, 85 ],
|
||||
[ 0, 0, 0 ]
|
||||
],
|
||||
"size": 2048,
|
||||
"size": 4096,
|
||||
"historicalSizes": [
|
||||
[
|
||||
"20220627",
|
||||
1024
|
||||
],
|
||||
[
|
||||
"20231007",
|
||||
2048
|
||||
]
|
||||
],
|
||||
"bcd": 15000,
|
||||
|
@ -310,47 +314,59 @@
|
|||
"sd": "2022-01-06"
|
||||
},
|
||||
"9": {
|
||||
"ident": "r",
|
||||
"ident": "e",
|
||||
"colors": [
|
||||
[ 196, 196, 196 ],
|
||||
[ 109, 0, 26 ],
|
||||
[ 190, 0, 57 ],
|
||||
[ 255, 69, 0 ],
|
||||
[ 255, 168, 0 ],
|
||||
[ 255, 214, 53 ],
|
||||
[ 255, 248, 184 ],
|
||||
[ 0, 163, 104 ],
|
||||
[ 0, 204, 120 ],
|
||||
[ 126, 237, 86 ],
|
||||
[ 0, 117, 111 ],
|
||||
[ 0, 158, 170 ],
|
||||
[ 0, 204, 192 ],
|
||||
[ 36, 80, 164 ],
|
||||
[ 54, 144, 234 ],
|
||||
[ 81, 233, 244 ],
|
||||
[ 73, 58, 193 ],
|
||||
[ 106, 92, 255 ],
|
||||
[ 148, 179, 255 ],
|
||||
[ 129, 30, 159 ],
|
||||
[ 180, 74, 192 ],
|
||||
[ 228, 171, 255 ],
|
||||
[ 222, 16, 127 ],
|
||||
[ 255, 56 , 129 ],
|
||||
[ 255, 153, 170 ],
|
||||
[ 109, 72, 47 ],
|
||||
[ 156, 105, 38 ],
|
||||
[ 255, 180, 112 ],
|
||||
[ 255, 255, 255 ],
|
||||
[ 163, 198, 238 ],
|
||||
[ 255, 255, 255 ],
|
||||
[ 221, 221, 221 ],
|
||||
[ 172, 172, 172 ],
|
||||
[ 109, 109, 109 ],
|
||||
[ 58, 58, 58 ],
|
||||
[ 0, 0, 0 ],
|
||||
[ 81, 82, 82 ],
|
||||
[ 137, 141, 144 ],
|
||||
[ 212, 215, 217 ],
|
||||
[ 255, 255, 255 ]
|
||||
[ 255, 125, 120 ],
|
||||
[ 255, 40, 40 ],
|
||||
[ 191, 6, 6 ],
|
||||
[ 127, 0, 0 ],
|
||||
[ 163, 198, 238 ],
|
||||
[ 0, 255, 240 ],
|
||||
[ 0, 185, 255 ],
|
||||
[ 0, 141, 240 ],
|
||||
[ 22, 100, 197 ],
|
||||
[ 17, 17, 84 ],
|
||||
[ 167, 237, 0 ],
|
||||
[ 69, 171, 5 ],
|
||||
[ 79, 105, 32 ],
|
||||
[ 0, 79, 13 ],
|
||||
[ 109, 247, 177 ],
|
||||
[ 0, 193, 154 ],
|
||||
[ 1, 118, 135 ],
|
||||
[ 172, 104, 39 ],
|
||||
[ 114, 69, 36 ],
|
||||
[ 84, 50, 24 ],
|
||||
[ 255, 239, 92 ],
|
||||
[ 255, 218, 8 ],
|
||||
[ 227, 170, 0 ],
|
||||
[ 255, 182, 113 ],
|
||||
[ 229, 113, 3 ],
|
||||
[ 244, 81, 38 ],
|
||||
[ 230, 116, 255 ],
|
||||
[ 191, 56, 222 ],
|
||||
[ 145, 25, 141 ],
|
||||
[ 71, 23, 70 ],
|
||||
[ 255, 116, 225 ],
|
||||
[ 255, 34, 169 ],
|
||||
[ 172, 0, 109 ],
|
||||
[ 252, 225, 184 ],
|
||||
[ 213, 162, 115 ],
|
||||
[ 152, 107, 70 ]
|
||||
],
|
||||
"cli": 1,
|
||||
"size": 4096,
|
||||
"bcd": 300000,
|
||||
"cds": 900000,
|
||||
"cli": 2,
|
||||
"size": 16384,
|
||||
"bcd": 5000,
|
||||
"cds": 600000,
|
||||
"ranked": false,
|
||||
"sd": "2023-08-01"
|
||||
"req": 500000,
|
||||
"sd": "2023-10-07"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ function getCanvases(t) {
|
|||
6: t`PixelCanvas`,
|
||||
7: t`1bit`,
|
||||
8: t`Top10`,
|
||||
9: t`r/place`,
|
||||
9: t`Thoia`,
|
||||
};
|
||||
const canvasDesc = {
|
||||
0: t`Our main canvas, a huge map of the world. Place everywhere you like`,
|
||||
|
@ -35,7 +35,7 @@ function getCanvases(t) {
|
|||
6: t`Mirror of PixelCanvas`,
|
||||
7: t`Black and White canvas`,
|
||||
8: t`A canvas for the most active players from the the previous day. Daily ranking updates at 00:00 UTC.`,
|
||||
9: t`Copy of r/place 2023 canvas. Will be present for a while.`,
|
||||
9: t`Thoia World Canvas. Advanced fictional worldbuilding and arts. Abandon the old world and all it entails.`,
|
||||
};
|
||||
/*
|
||||
* no edit below here needed when adding/removing canvas
|
||||
|
|
|
@ -474,20 +474,14 @@ export class ChatProvider {
|
|||
let displayCountry = country;
|
||||
if (user.userlvl !== 0) {
|
||||
displayCountry = 'zz';
|
||||
/*
|
||||
* meme names disabled for now
|
||||
* TODO think about activating it again after fixing accounts and
|
||||
* mute evasions
|
||||
*
|
||||
} else if (name.endsWith('berg') || name.endsWith('stein')) {
|
||||
displayCountry = 'il';
|
||||
/ */
|
||||
} else if (user.id === 2927) {
|
||||
/*
|
||||
* hard coded flag for Manchukuo_1940
|
||||
* hard coded flags
|
||||
* TODO make it possible to modify user flags
|
||||
*/
|
||||
displayCountry = 'bt';
|
||||
} else if (user.id === 41030) {
|
||||
displayCountry = 'to';
|
||||
}
|
||||
|
||||
if (USE_MAILER && !user.regUser.verified) {
|
||||
|
|
|
@ -11,7 +11,7 @@ export const DEFAULT_SCALE = 3;
|
|||
|
||||
// default canvas that is first assumed, before real canvas data
|
||||
// gets fetched via api/me
|
||||
export const DEFAULT_CANVAS_ID = '9';
|
||||
export const DEFAULT_CANVAS_ID = '0';
|
||||
export const DEFAULT_CANVASES = {
|
||||
0: {
|
||||
ident: 'd',
|
||||
|
@ -57,51 +57,6 @@ export const DEFAULT_CANVASES = {
|
|||
ranked: true,
|
||||
req: -1,
|
||||
sd: '2020-01-08',
|
||||
},
|
||||
9: {
|
||||
"ident": "r",
|
||||
"colors": [
|
||||
[ 196, 196, 196 ],
|
||||
[ 109, 0, 26 ],
|
||||
[ 190, 0, 57 ],
|
||||
[ 255, 69, 0 ],
|
||||
[ 255, 168, 0 ],
|
||||
[ 255, 214, 53 ],
|
||||
[ 255, 248, 184 ],
|
||||
[ 0, 163, 104 ],
|
||||
[ 0, 204, 120 ],
|
||||
[ 126, 237, 86 ],
|
||||
[ 0, 117, 111 ],
|
||||
[ 0, 158, 170 ],
|
||||
[ 0, 204, 192 ],
|
||||
[ 36, 80, 164 ],
|
||||
[ 54, 144, 234 ],
|
||||
[ 81, 233, 244 ],
|
||||
[ 73, 58, 193 ],
|
||||
[ 106, 92, 255 ],
|
||||
[ 148, 179, 255 ],
|
||||
[ 129, 30, 159 ],
|
||||
[ 180, 74, 192 ],
|
||||
[ 228, 171, 255 ],
|
||||
[ 222, 16, 127 ],
|
||||
[ 255, 56 , 129 ],
|
||||
[ 255, 153, 170 ],
|
||||
[ 109, 72, 47 ],
|
||||
[ 156, 105, 38 ],
|
||||
[ 255, 180, 112 ],
|
||||
[ 0, 0, 0 ],
|
||||
[ 81, 82, 82 ],
|
||||
[ 137, 141, 144 ],
|
||||
[ 212, 215, 217 ],
|
||||
[ 255, 255, 255 ]
|
||||
],
|
||||
"cli": 1,
|
||||
"size": 4096,
|
||||
"bcd": 300000,
|
||||
"cds": 300000,
|
||||
"ranked": false,
|
||||
"req": 0,
|
||||
"sd": "2023-08-01"
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user