Merge branch 'pagefaultgames:main' into transfer

This commit is contained in:
dielle000 2024-05-21 16:53:39 +02:00 committed by GitHub
commit 8d3c362bb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1275 changed files with 39873 additions and 22443 deletions

3
.gitignore vendored
View File

@ -24,6 +24,9 @@ dist-ssr
*.sln *.sln
*.sw? *.sw?
# Docummentation
docs/*
public/images/trainer/convert/* public/images/trainer/convert/*
public/images/battle_anims/input/*.png public/images/battle_anims/input/*.png
public/images/pokemon/input/*.png public/images/pokemon/input/*.png

View File

@ -4,7 +4,7 @@ PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite
# Contributing # Contributing
## 🛠️ Development ## 🛠️ Development
If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#vote** channel in the discord. If you have the motivation and experience with Typescript/Javascript (or are willing to learn) please feel free to fork the repository and make pull requests with contributions. If you don't know what to work on but want to help, reference the below **To-Do** section or the **#feature-vote** channel in the discord.
### 💻 Environment Setup ### 💻 Environment Setup
#### Prerequisites #### Prerequisites
@ -44,8 +44,8 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- Arata Iiyoshi - Arata Iiyoshi
- Atsuhiro Ishizuna - Atsuhiro Ishizuna
- Pokémon Black/White 2 - Pokémon Black/White 2
- Firel (Additional biome themes) - Firel (Custom Metropolis and Laboratory biome music)
- edifette (Title screen music) - Lmz (Custom Jungle biome music)
### 🎵 Sound Effects ### 🎵 Sound Effects
- Pokémon Emerald - Pokémon Emerald
@ -74,7 +74,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
### 🎨 Trainer Portraits ### 🎨 Trainer Portraits
- pkmn_realidea (Paid Commissions) - pkmn_realidea (Paid Commissions)
### 🎨 Pokemon Sprites ### 🎨 Pokemon Sprites and Animation
- GAMEFREAK (Pokémon Black/White 2) - GAMEFREAK (Pokémon Black/White 2)
- Smogon Sprite Project (Various Artists) - Smogon Sprite Project (Various Artists)
- Skyflyer - Skyflyer
@ -100,6 +100,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s
- bizcoeindoloro - bizcoeindoloro
- mangalos810 - mangalos810
- Involuntary-Twitch - Involuntary-Twitch
- selstar
### 🎨 Move Animations ### 🎨 Move Animations
- Pokémon Reborn - Pokémon Reborn

View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" />
<title>PokéRogue</title> <title>PokéRogue</title>
<meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." /> <meta name="description" content="A Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, and reaching Pokémon stats you never thought possible." />
<meta name="theme-color" content="#da3838" /> <meta name="theme-color" content="#da3838" />
@ -11,7 +12,7 @@
<meta property="og:image" content="https://pokerogue.net/logo512.png" /> <meta property="og:image" content="https://pokerogue.net/logo512.png" />
<link rel="apple-touch-icon" href="./logo512.png" /> <link rel="apple-touch-icon" href="./logo512.png" />
<link rel="shortcut icon" type="image/png" href="./logo512.png" /> <link rel="shortcut icon" type="image/png" href="./logo512.png" />
<meta charset="UTF-8" /> <link rel="canonical" href="https://pokerogue.net" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<style type="text/css"> <style type="text/css">
@font-face { @font-face {

Binary file not shown.

Binary file not shown.

BIN
public/images/cg/end_f.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

BIN
public/images/cg/end_m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -4,8 +4,8 @@
"image": "932.png", "image": "932.png",
"format": "RGBA8888", "format": "RGBA8888",
"size": { "size": {
"w": 294, "w": 147,
"h": 294 "h": 147
}, },
"scale": 1, "scale": 1,
"frames": [ "frames": [
@ -30,6 +30,69 @@
"h": 49 "h": 49
} }
}, },
{
"filename": "0014.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
},
"frame": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
},
"frame": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
}
},
{
"filename": "0032.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
},
"frame": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
}
},
{ {
"filename": "0008.png", "filename": "0008.png",
"rotated": false, "rotated": false,
@ -45,52 +108,10 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 0, "x": 48,
"y": 49,
"w": 48,
"h": 49
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0, "y": 0,
"w": 48, "w": 48,
"h": 49 "h": 49
},
"frame": {
"x": 0,
"y": 98,
"w": 48,
"h": 49
}
},
{
"filename": "0032.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 48,
"h": 49
},
"frame": {
"x": 0,
"y": 98,
"w": 48,
"h": 49
} }
}, },
{ {
@ -108,31 +129,10 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 0, "x": 48,
"y": 147,
"w": 48,
"h": 49
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": false,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0, "y": 0,
"w": 48, "w": 48,
"h": 49 "h": 49
},
"frame": {
"x": 0,
"y": 196,
"w": 48,
"h": 49
} }
}, },
{ {
@ -150,8 +150,8 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 0, "x": 48,
"y": 245, "y": 0,
"w": 48, "w": 48,
"h": 49 "h": 49
} }
@ -213,7 +213,49 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 143, "x": 96,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 96,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 96,
"y": 0, "y": 0,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -234,7 +276,7 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 143, "x": 96,
"y": 0, "y": 0,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -255,7 +297,49 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 143, "x": 96,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0028.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 96,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0029.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 96,
"y": 0, "y": 0,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -276,159 +360,12 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 190,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0030.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 190,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 237,
"y": 0,
"w": 47,
"h": 49
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0, "x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 48,
"y": 49, "y": 49,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
}, },
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 48,
"y": 98,
"w": 47,
"h": 49
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 48,
"y": 147,
"w": 47,
"h": 49
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 48,
"y": 196,
"w": 47,
"h": 49
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 48,
"y": 245,
"w": 47,
"h": 49
}
},
{ {
"filename": "0012.png", "filename": "0012.png",
"rotated": false, "rotated": false,
@ -444,7 +381,70 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 95, "x": 0,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 0,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0030.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 0,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 47,
"y": 49, "y": 49,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -465,7 +465,91 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 142, "x": 47,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 47,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0031.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 47,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 94,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 94,
"y": 49, "y": 49,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -486,70 +570,7 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 189, "x": 94,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 189,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0033.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 189,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0034.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 189,
"y": 49, "y": 49,
"w": 47, "w": 47,
"h": 49 "h": 49
@ -570,14 +591,14 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 236, "x": 94,
"y": 49, "y": 49,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
}, },
{ {
"filename": "0018.png", "filename": "0024.png",
"rotated": false, "rotated": false,
"trimmed": true, "trimmed": true,
"sourceSize": { "sourceSize": {
@ -585,56 +606,14 @@
"h": 49 "h": 49
}, },
"spriteSourceSize": { "spriteSourceSize": {
"x": 1, "x": 0,
"y": 0, "y": 0,
"w": 47, "w": 47,
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 95, "x": 94,
"y": 98, "y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 95,
"y": 147,
"w": 47,
"h": 49
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 95,
"y": 196,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
@ -654,8 +633,92 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 95, "x": 94,
"y": 245, "y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0033.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 94,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0034.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 0,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 94,
"y": 49,
"w": 47,
"h": 49
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 0,
"y": 98,
"w": 47,
"h": 49
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 0,
"y": 98,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
@ -675,75 +738,12 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 142, "x": 0,
"y": 98, "y": 98,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
}, },
{
"filename": "0028.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 189,
"y": 98,
"w": 47,
"h": 49
}
},
{
"filename": "0029.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 236,
"y": 98,
"w": 47,
"h": 49
}
},
{
"filename": "0031.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 48,
"h": 49
},
"spriteSourceSize": {
"x": 1,
"y": 0,
"w": 47,
"h": 49
},
"frame": {
"x": 142,
"y": 147,
"w": 47,
"h": 49
}
},
{ {
"filename": "0036.png", "filename": "0036.png",
"rotated": false, "rotated": false,
@ -759,8 +759,8 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 142, "x": 0,
"y": 196, "y": 98,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
@ -780,8 +780,8 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 142, "x": 47,
"y": 245, "y": 98,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
@ -801,8 +801,8 @@
"h": 49 "h": 49
}, },
"frame": { "frame": {
"x": 189, "x": 94,
"y": 147, "y": 98,
"w": 47, "w": 47,
"h": 49 "h": 49
} }
@ -813,6 +813,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:92f56cb0554b8fbfda1578295eb5275b:e2b2250f4b68aac4f8e27eb1485dd131:ac6592b1ff7d7b5afb4c4b933cec3f50$" "smartupdate": "$TexturePacker:SmartUpdate:56f22a59e3b5dc3b3a0b87fa1b0040f4:2e1654fddb365c17252def724f3b66f1:ac6592b1ff7d7b5afb4c4b933cec3f50$"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -1,15 +1,15 @@
{ {
"0": { "0": {
"7b4a9c": "323f81", "7b4a9c": "d684ce",
"63197b": "142557", "63197b": "9c528c",
"a55ace": "6265b4", "a55ace": "ffb5f7",
"101010": "101010", "101010": "101010",
"b57bce": "99a3ee", "b57bce": "ffd6ef",
"08426b": "277eb2", "08426b": "638400",
"ce0021": "ce0021", "ce0021": "940821",
"ffd600": "ffc3f4", "ffd600": "ffd600",
"d69400": "ff61e2", "d69400": "d69400",
"216b94": "4aa6ce", "216b94": "8ca508",
"ffffff": "ffffff", "ffffff": "ffffff",
"a5a5a5": "a5a5a5", "a5a5a5": "a5a5a5",
"6b6b6b": "6b6b6b" "6b6b6b": "6b6b6b"

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -14,26 +14,26 @@
"943a7b": "175990" "943a7b": "175990"
}, },
"1": { "1": {
"3a3a7b": "1d0f4e", "3a3a7b": "084a00",
"5aadef": "3d4381", "5aadef": "6b9c29",
"6384ce": "2f2a5f", "6384ce": "317300",
"631052": "892d03", "631052": "c52931",
"ce6bb5": "f1a139", "ce6bb5": "ffada5",
"adceff": "666fb4", "adceff": "84d64a",
"000000": "000000", "000000": "000000",
"ad52ad": "d5711b", "ad52ad": "e6737b",
"636363": "636363", "636363": "636363",
"ffffff": "ffffff", "ffffff": "ffffff",
"d6d6d6": "d6d6d6", "d6d6d6": "d6d6d6",
"943a7b": "af4e0c" "943a7b": "d6525a"
}, },
"2": { "2": {
"3a3a7b": "584055", "3a3a7b": "3d2349",
"5aadef": "c1aec0", "5aadef": "cbabca",
"6384ce": "866881", "6384ce": "916c8b",
"631052": "54070c", "631052": "54070c",
"ce6bb5": "bc3b1d", "ce6bb5": "bc3b1d",
"adceff": "dfcddd", "adceff": "e8d2e6",
"000000": "000000", "000000": "000000",
"ad52ad": "94241c", "ad52ad": "94241c",
"636363": "636363", "636363": "636363",

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -909,6 +909,11 @@
2, 2,
2 2
], ],
"472": [
0,
0,
0
],
"475-mega": [ "475-mega": [
0, 0,
2, 2,
@ -2050,6 +2055,16 @@
2, 2,
1 1
], ],
"41": [
0,
1,
1
],
"42": [
0,
1,
1
],
"308": [ "308": [
0, 0,
1, 1,
@ -2869,7 +2884,7 @@
], ],
"383": [ "383": [
0, 0,
2, 1,
1 1
], ],
"384-mega": [ "384-mega": [
@ -4143,6 +4158,16 @@
1, 1,
1 1
], ],
"41": [
0,
1,
1
],
"42": [
0,
1,
1
],
"308": [ "308": [
0, 0,
1, 1,
@ -4538,7 +4563,7 @@
], ],
"747": [ "747": [
0, 0,
1, 2,
1 1
], ],
"748": [ "748": [
@ -4591,6 +4616,11 @@
1, 1,
1 1
], ],
"770": [
0,
0,
0
],
"771": [ "771": [
0, 0,
2, 2,

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1012 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -1,4 +1,21 @@
{ {
"1": {
"000000": "000000",
"7b2129": "032a10",
"9c2929": "10371a",
"ff736b": "419e49",
"ff2129": "2b5b32",
"bd3131": "0f461c",
"3a3a3a": "383540",
"736363": "625769",
"ffffff": "fff6de",
"bdbdd6": "e5d4b6",
"9c6b31": "d51b3e",
"ffce31": "ff435d",
"94848c": "72798b",
"ffbdbd": "49c74f",
"ad9ca5": "ad9ca5"
},
"2": { "2": {
"000000": "000000", "000000": "000000",
"7b2129": "123953", "7b2129": "123953",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

View File

@ -1,19 +1,19 @@
{ {
"0": { "0": {
"298c8c": "1c3820", "298c8c": "427373",
"5aada5": "3e5d43", "5aada5": "6b9c94",
"84cece": "758076", "84cece": "94bdbd",
"004a52": "102c16", "004a52": "192121",
"106b63": "0d1e10", "106b63": "21524a",
"191921": "191921", "191921": "191921",
"106b7b": "102c16", "106b7b": "293a42",
"29848c": "224427", "29848c": "424a5a",
"6b4200": "54190e", "6b4200": "523a10",
"c59c52": "a65c3f", "c59c52": "b59463",
"9c7329": "763826", "9c7329": "846b3a",
"dece94": "e46424", "dece94": "b5de21",
"ffefa5": "ff9942", "ffefa5": "d6ff42",
"bdad73": "cb3000" "bdad73": "94bd00"
}, },
"1": { "1": {
"298c8c": "793907", "298c8c": "793907",

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Some files were not shown because too many files have changed in this diff Show More