Merge branch 'beta' into minor-1.9.6

This commit is contained in:
NightKev 2025-06-18 18:27:37 -07:00
commit 560ebbaee2
2624 changed files with 140496 additions and 141643 deletions

View File

@ -1,9 +1,20 @@
/** @type {import('dependency-cruiser').IConfiguration} */
module.exports = {
forbidden: [
{
name: "only-type-imports",
severity: "error",
comment: "Files in 'enums/' and '@types/' must only use type imports.",
from: {
path: ["(^|/)src/@types", "(^|/)src/enums"],
},
to: {
dependencyTypesNot: ["type-only"],
},
},
{
name: "no-circular-at-runtime",
severity: "warn",
severity: "error",
comment:
"This dependency is part of a circular relationship. You might want to revise " +
"your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ",
@ -23,7 +34,7 @@ module.exports = {
"add an exception for it in your dependency-cruiser configuration. By default " +
"this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
"files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
severity: "warn",
severity: "error",
from: {
orphan: true,
pathNot: [
@ -31,6 +42,7 @@ module.exports = {
"[.]d[.]ts$", // TypeScript declaration files
"(^|/)tsconfig[.]json$", // TypeScript config
"(^|/)(?:babel|webpack)[.]config[.](?:js|cjs|mjs|ts|cts|mts|json)$", // other configs
"(^|/)test/.+[.]setup[.]ts", // Vitest setup files
],
},
to: {},
@ -40,7 +52,7 @@ module.exports = {
comment:
"A module depends on a node core module that has been deprecated. Find an alternative - these are " +
"bound to exist - node doesn't deprecate lightly.",
severity: "warn",
severity: "error",
from: {},
to: {
dependencyTypes: ["core"],
@ -73,7 +85,7 @@ module.exports = {
comment:
"This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later " +
"version of that module, or find an alternative. Deprecated modules are a security risk.",
severity: "warn",
severity: "error",
from: {},
to: {
dependencyTypes: ["deprecated"],
@ -109,7 +121,7 @@ module.exports = {
"Likely this module depends on an external ('npm') package that occurs more than once " +
"in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
"maintenance problems later on.",
severity: "warn",
severity: "error",
from: {},
to: {
moreThanOneDependencyType: true,
@ -120,7 +132,7 @@ module.exports = {
},
},
/* rules you might want to tweak for your specific situation: */
// rules you might want to tweak for your specific situation:
{
name: "not-to-spec",
@ -175,7 +187,7 @@ module.exports = {
"in your package.json. This makes sense if your package is e.g. a plugin, but in " +
"other cases - maybe not so much. If the use of a peer dependency is intentional " +
"add an exception to your dependency-cruiser configuration.",
severity: "warn",
severity: "error",
from: {},
to: {
dependencyTypes: ["npm-peer"],
@ -183,6 +195,7 @@ module.exports = {
},
],
options: {
exclude: ["src/plugins/vite/*", "src/vite.env.d.ts"],
/* Which modules not to follow further when encountered */
doNotFollow: {
/* path: an array of regular expressions in strings to match against */
@ -205,7 +218,7 @@ module.exports = {
module systems it knows of. It's the default because it's the safe option
It might come at a performance penalty, though.
moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
As in practice only commonjs ('cjs') and ecmascript modules ('es6')
are widely used, you can limit the moduleSystems to those.
*/
@ -213,7 +226,7 @@ module.exports = {
// moduleSystems: ['cjs', 'es6'],
/* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
to open it on your online repo or `vscode://file/${process.cwd()}/` to
to open it on your online repo or `vscode://file/${process.cwd()}/` to
open it in visual studio code),
*/
// prefix: `vscode://file/${process.cwd()}/`,
@ -222,7 +235,7 @@ module.exports = {
true: also detect dependencies that only exist before typescript-to-javascript compilation
"specify": for each dependency identify whether it only exists before compilation or also after
*/
// tsPreCompilationDeps: false,
tsPreCompilationDeps: true,
/* list of extensions to scan that aren't javascript or compile-to-javascript.
Empty by default. Only put extensions in here that you want to take into
@ -258,7 +271,7 @@ module.exports = {
to './webpack.conf.js'.
The (optional) `env` and `arguments` attributes contain the parameters
to be passed if your webpack config is a function and takes them (see
to be passed if your webpack config is a function and takes them (see
webpack documentation for details)
*/
// webpackConfig: {
@ -309,8 +322,8 @@ module.exports = {
A list of alias fields in package.jsons
See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and
the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
documentation
documentation
Defaults to an empty array (= don't use alias fields).
*/
// aliasFields: ["browser"],

View File

@ -1,6 +1,7 @@
VITE_BYPASS_LOGIN=1
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
# IDs for discord/google auth go unused due to VITE_BYPASS_LOGIN
VITE_DISCORD_CLIENT_ID=1234567890
VITE_GOOGLE_CLIENT_ID=1234567890
VITE_I18N_DEBUG=0

2
.github/CODEOWNERS vendored
View File

@ -8,7 +8,7 @@
# Art Team
/public/**/*.png @pagefaultgames/art-team
/public/**/*.json @pagefaultgames/art-team
/public/**/*.json @pagefaultgames/art-team
/public/images @pagefaultgames/art-team
/public/battle-anims @pagefaultgames/art-team

View File

@ -2,25 +2,28 @@
<!-- Feel free to look at other PRs for examples -->
<!--
Make sure the title includes categorization (choose the one that best fits):
- [Bug]: If the PR is primarily a bug fix
- [Move]: If a move has new or changed functionality
- [Ability]: If an ability has new or changed functionality
- [Item]: For new or modified items
- [Mystery]: For new or modified Mystery Encounters
- [Test]: If the PR is primarily adding or modifying tests
- [UI/UX]: If the PR is changing UI/UX elements
- [Audio]: If the PR is adding or changing music/sfx
- [Sprite]: If the PR is adding or changing sprites
- [Balance]: If the PR is related to game balance
- [Challenge]: If the PR is adding or modifying challenges
- [Bug]: If the PR is primarily a bug fix
- [Move]: If a move has new or changed functionality
- [Ability]: If an ability has new or changed functionality
- [Item]: For new or modified items
- [Mystery]: For new or modified Mystery Encounters
- [Test]: If the PR is primarily adding or modifying tests
- [UI/UX]: If the PR is changing UI/UX elements
- [Audio]: If the PR is adding or changing music/sfx
- [Sprite]: If the PR is adding or changing sprites
- [Balance]: If the PR is related to game balance
- [Challenge]: If the PR is adding or modifying challenges
- [Refactor]: If the PR is primarily rewriting existing code
- [Docs]: If the PR is just adding or modifying documentation (such as tsdocs/code comments)
- [GitHub]: For changes to GitHub workflows/templates/etc
- [Misc]: If no other category fits the PR
- [Dev]: If the PR is primarily changing something pertaining to development (lefthook hooks, linter rules, etc.)
- [i18n]: If the PR is primarily adding/changing locale keys or key usage (may come with an associated locales PR)
- [Docs]: If the PR is adding or modifying documentation (such as tsdocs/code comments)
- [GitHub]: For changes to GitHub workflows/templates/etc
- [Misc]: If no other category fits the PR
-->
<!--
Make sure that this PR is not overlapping with someone else's work
Please try to keep the PR self-contained (and small)
Please try to keep the PR self-contained (and small!)
-->
## What are the changes the user will see?
@ -66,11 +69,11 @@ Do the reviewers need to do something special in order to test your changes?
- [ ] Have I provided a clear explanation of the changes?
- [ ] Have I tested the changes manually?
- [ ] Are all unit tests still passing? (`npm run test:silent`)
- [ ] Have I created new automated tests (`npm run create-test`) or updated existing tests related to the PR's changes?
- [ ] Have I created new automated tests (`npm run test:create`) or updated existing tests related to the PR's changes?
- [ ] Have I provided screenshots/videos of the changes (if applicable)?
- [ ] Have I made sure that any UI change works for both UI themes (default and legacy)?
Are there any localization additions or changes? If so:
- [ ] Has a locales PR been created on the [locales](https://github.com/pagefaultgames/pokerogue-locales) repo?
- [ ] If so, please leave a link to it here:
- [ ] Has the translation team been contacted for proofreading/translation?
- [ ] Has the translation team been contacted for proofreading/translation?

15
.github/test-filters.yml vendored Normal file
View File

@ -0,0 +1,15 @@
all:
# Negations syntax from https://github.com/dorny/paths-filter/issues/184#issuecomment-2786521554
- "src/**/!(*.{md,py,sh,gitkeep,gitignore})"
- "test/**/!(*.{md,py,sh,gitkeep,gitignore})"
- "public/**/!(*.{md,py,sh,gitkeep,gitignore})"
# Workflows that can impact tests
- ".github/workflows/test*.yml"
- ".github/test-filters.yml"
# top-level files
- "package*.json"
- ".nvrmc" # Updates to node version can break tests
- "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
- "tsconfig*.json" # tsconfig.json tweaking can impact compilation
- "global.d.ts"
- ".env*"

View File

@ -35,7 +35,7 @@ jobs:
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
- name: Deploy build on server
if: github.event_name == 'push' && github.ref_name == 'main'
run: |
run: |
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
- name: Purge Cloudflare Cache

42
.github/workflows/linting.yml vendored Normal file
View File

@ -0,0 +1,42 @@
name: Linting
on:
push:
branches:
- main
- beta
pull_request:
branches:
- main
- beta
merge_group:
types: [checks_requested]
jobs:
run-linters:
name: Run linters
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'npm'
- name: Install Node.js dependencies
run: npm ci
- name: Run ESLint
run: npm run eslint-ci
- name: Lint with Biome
run: npm run biome-ci
- name: Check dependencies with depcruise
run: npm run depcruise

View File

@ -1,41 +0,0 @@
name: Biome Code Quality
on:
# Trigger the workflow on push or pull request,
# but only for the main branch
push:
branches:
- main # Trigger on push events to the main branch
- beta # Trigger on push events to the beta branch
pull_request:
branches:
- main # Trigger on pull request events targeting the main branch
- beta # Trigger on pull request events targeting the beta branch
merge_group:
types: [checks_requested]
jobs:
run-linters: # Define a job named "run-linters"
name: Run linters # Human-readable name for the job
runs-on: ubuntu-latest # Specify the latest Ubuntu runner for the job
steps:
- name: Check out Git repository # Step to check out the repository
uses: actions/checkout@v4 # Use the checkout action version 4
with:
submodules: 'recursive'
- name: Set up Node.js # Step to set up Node.js environment
uses: actions/setup-node@v4 # Use the setup-node action version 4
with:
node-version-file: '.nvmrc'
cache: 'npm'
- name: Install Node.js dependencies # Step to install Node.js dependencies
run: npm ci # Use 'npm ci' to install dependencies
- name: eslint # Step to run linters
run: npm run eslint-ci
- name: Lint with Biome # Step to run linters
run: npm run biome-ci

View File

@ -12,21 +12,27 @@ on:
totalShards:
required: true
type: number
skip:
required: true
type: boolean
default: false
jobs:
test:
name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }}
# We can't use dynmically named jobs until https://github.com/orgs/community/discussions/13261 is implemented
name: Shard
runs-on: ubuntu-latest
if: ${{ !inputs.skip }}
steps:
- name: Check out Git repository
uses: actions/checkout@v4.2.2
with:
submodules: 'recursive'
submodules: "recursive"
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: 'npm'
node-version-file: ".nvmrc"
cache: "npm"
- name: Install Node.js dependencies
run: npm ci
- name: Run tests

View File

@ -7,63 +7,37 @@ on:
branches:
- main # Trigger on push events to the main branch
- beta # Trigger on push events to the beta branch
- release # Trigger on push events to the release branch
# go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft until they fix this or ditch yml for workflows
paths:
# src and test files
- "src/**"
- "test/**"
- "public/**"
# Workflows that can impact tests
- ".github/workflows/test*.yml"
# top-level files
- "package*.json"
- ".nvrmc" # Updates to node version can break tests
- "vite.*.ts" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
- "tsconfig*.json" # tsconfig.json tweaking can impact compilation
- "global.d.ts"
- ".env.*"
# Blanket negations for files that cannot impact tests
- "!**/*.py" # No .py files
- "!**/*.sh" # No .sh files
- "!**/*.md" # No .md files
- "!**/.git*" # .gitkeep and family
pull_request:
branches:
- main # Trigger on pull request events targeting the main branch
- beta # Trigger on pull request events targeting the beta branch
- release # Trigger on pull request events targeting the release branch
paths: # go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft because until then we have to duplicate this
# src and test files
- "src/**"
- "test/**"
- "public/**"
# Workflows that can impact tests
- ".github/workflows/test*.yml"
# top-level files
- "package*.json"
- ".nvrmc" # Updates to node version can break tests
- "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
- "tsconfig*.json" # tsconfig.json tweaking can impact compilation
- "global.d.ts"
- ".env.*"
# Blanket negations for files that cannot impact tests
- "!**/*.py" # No .py files
- "!**/*.sh" # No .sh files
- "!**/*.md" # No .md files
- "!**/.git*" # .gitkeep and family
merge_group:
types: [checks_requested]
jobs:
check-path-change-filter:
runs-on: ubuntu-latest
permissions:
pull-requests: read
outputs:
all: ${{ steps.filter.outputs.all }}
steps:
- name: checkout
uses: actions/checkout@v4
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
id: filter
with:
filters: .github/test-filters.yml
run-tests:
name: Run Tests
needs: check-path-change-filter
strategy:
matrix:
shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
shard: [1, 2, 3, 4, 5]
uses: ./.github/workflows/test-shard-template.yml
with:
project: main
shard: ${{ matrix.shard }}
totalShards: 10
totalShards: 5
skip: ${{ needs.check-path-change-filter.outputs.all != 'true'}}

View File

@ -28,11 +28,8 @@
".vscode/*",
"*.css", // TODO?
"*.html", // TODO?
"src/overrides.ts",
// TODO: these files are too big and complex, ignore them until their respective refactors
"src/data/moves/move.ts",
"src/data/abilities/ability.ts",
"src/field/pokemon.ts",
// this file is just too big:
"src/data/balance/tms.ts"
@ -43,22 +40,19 @@
// TODO: Remove if we ever get down to 0 circular imports
"organizeImports": { "enabled": false },
"linter": {
"ignore": [
"src/phases/move-effect-phase.ts" // TODO: unignore after move-effect-phase refactor
],
"enabled": true,
"rules": {
"recommended": true,
"correctness": {
"noUndeclaredVariables": "off",
"noUnusedVariables": "error",
"noSwitchDeclarations": "warn", // TODO: refactor and make this an error
"noVoidTypeReturn": "warn", // TODO: Refactor and make this an error
"noSwitchDeclarations": "error",
"noVoidTypeReturn": "error",
"noUnusedImports": "error"
},
"style": {
"noVar": "error",
"useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome
"useEnumInitializers": "off", // large enums like Moves/Species would make this cumbersome
"useBlockStatements": "error",
"useConst": "error",
"useImportType": "error",
@ -73,9 +67,9 @@
},
"suspicious": {
"noDoubleEquals": "error",
// While this would be a nice rule to enable, the current structure of the codebase makes this infeasible
// While this would be a nice rule to enable, the current structure of the codebase makes this infeasible
// due to being used for move/ability `args` params and save data-related code.
// This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off.
// This can likely be enabled for all non-utils files once these are eventually reworked, but until then we leave it off.
"noExplicitAny": "off",
"noAssignInExpressions": "off",
"noPrototypeBuiltins": "off",
@ -90,8 +84,21 @@
"useLiteralKeys": "off",
"noForEach": "off", // Foreach vs for of is not that simple.
"noUselessSwitchCase": "off", // Explicit > Implicit
"noUselessConstructor": "warn", // TODO: Refactor and make this an error
"noUselessConstructor": "error",
"noBannedTypes": "warn" // TODO: Refactor and make this an error
},
"nursery": {
"noRestrictedTypes": {
"level": "error",
"options": {
"types": {
"integer": {
"message": "This is an alias for 'number' that can provide false impressions of what values can actually be contained in this variable. Use 'number' instead.",
"use": "number"
}
}
}
}
}
}
},
@ -112,6 +119,28 @@
}
}
}
},
// Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes)
{
"include": ["src/overrides.ts", "src/enums/*"],
"linter": {
"rules": {
"correctness": {
"noUnusedImports": "off"
}
}
}
},
{
"include": ["src/overrides.ts"],
"linter": {
"rules": {
"style": {
"useImportType": "off"
}
}
}
}
]
}

View File

@ -1,172 +0,0 @@
/**
* This script creates a test boilerplate file in the appropriate
* directory based on the type selected.
* @example npm run create-test
*/
import fs from "fs";
import inquirer from "inquirer";
import path from "path";
import { fileURLToPath } from "url";
// Get the directory name of the current module file
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const typeChoices = ["Move", "Ability", "Item", "Mystery Encounter"];
/**
* Prompts the user to select a type via list.
* @returns {Promise<{selectedOption: string}>} the selected type
*/
async function promptTestType() {
const typeAnswer = await inquirer.prompt([
{
type: "list",
name: "selectedOption",
message: "What type of test would you like to create:",
choices: [...typeChoices, "EXIT"],
},
]);
if (typeAnswer.selectedOption === "EXIT") {
console.log("Exiting...");
return process.exit();
}
if (!typeChoices.includes(typeAnswer.selectedOption)) {
console.error(`Please provide a valid type (${typeChoices.join(", ")})!`);
return await promptTestType();
}
return typeAnswer;
}
/**
* Prompts the user to provide a file name.
* @param {string} selectedType
* @returns {Promise<{userInput: string}>} the selected file name
*/
async function promptFileName(selectedType) {
const fileNameAnswer = await inquirer.prompt([
{
type: "input",
name: "userInput",
message: `Please provide the name of the ${selectedType}:`,
},
]);
if (!fileNameAnswer.userInput || fileNameAnswer.userInput.trim().length === 0) {
console.error("Please provide a valid file name!");
return await promptFileName(selectedType);
}
return fileNameAnswer;
}
/**
* Runs the interactive create-test "CLI"
* @returns {Promise<void>}
*/
async function runInteractive() {
const typeAnswer = await promptTestType();
const fileNameAnswer = await promptFileName(typeAnswer.selectedOption);
const type = typeAnswer.selectedOption.toLowerCase();
// Convert fileName from kebab-case or camelCase to snake_case
const fileName = fileNameAnswer.userInput
.replace(/-+/g, "_") // Convert kebab-case (dashes) to underscores
.replace(/([a-z])([A-Z])/g, "$1_$2") // Convert camelCase to snake_case
.replace(/\s+/g, "_") // Replace spaces with underscores
.toLowerCase(); // Ensure all lowercase
// Format the description for the test case
const formattedName = fileName.replace(/_/g, " ").replace(/\b\w/g, char => char.toUpperCase());
// Determine the directory based on the type
let dir;
let description;
switch (type) {
case "move":
dir = path.join(__dirname, "test", "moves");
description = `Moves - ${formattedName}`;
break;
case "ability":
dir = path.join(__dirname, "test", "abilities");
description = `Abilities - ${formattedName}`;
break;
case "item":
dir = path.join(__dirname, "test", "items");
description = `Items - ${formattedName}`;
break;
case "mystery encounter":
dir = path.join(__dirname, "test", "mystery-encounter", "encounters");
description = `Mystery Encounter - ${formattedName}`;
break;
default:
console.error(`Invalid type. Please use one of the following: ${typeChoices.join(", ")}.`);
process.exit(1);
}
// Define the content template
const content = `import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/testUtils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
describe("${description}", () => {
let phaserGame: Phaser.Game;
let game: GameManager;
beforeAll(() => {
phaserGame = new Phaser.Game({
type: Phaser.HEADLESS,
});
});
afterEach(() => {
game.phaseInterceptor.restoreOg();
});
beforeEach(() => {
game = new GameManager(phaserGame);
game.override
.moveset([ Moves.SPLASH ])
.ability(Abilities.BALL_FETCH)
.battleType("single")
.disableCrits()
.enemySpecies(Species.MAGIKARP)
.enemyAbility(Abilities.BALL_FETCH)
.enemyMoveset(Moves.SPLASH);
});
it("should do X", async () => {
await game.classicMode.startBattle([ Species.FEEBAS ]);
game.move.select(Moves.SPLASH);
await game.phaseInterceptor.to("BerryPhase");
expect(true).toBe(true);
});
});
`;
// Ensure the directory exists
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, { recursive: true });
}
// Create the file with the given name
const filePath = path.join(dir, `${fileName}.test.ts`);
if (fs.existsSync(filePath)) {
console.error(`File "${fileName}.test.ts" already exists.`);
process.exit(1);
}
// Write the template content to the file
fs.writeFileSync(filePath, content, "utf8");
console.log(`File created at: ${filePath}`);
}
runInteractive();

2
global.d.ts vendored
View File

@ -7,7 +7,7 @@ declare global {
* Only used in testing.
* Can technically be undefined/null but for ease of use we are going to assume it is always defined.
* Used to load i18n files exclusively.
*
*
* To set up your own server in a test see `game_data.test.ts`
*/
var server: SetupServerApi;

View File

@ -145,6 +145,5 @@
</div>
<script type="module" src="./src/main.ts"></script>
<script src="./src/touch-controls.ts" type="module"></script>
<script src="./src/debug.js" type="module"></script>
</body>
</html>

View File

@ -9,6 +9,11 @@ pre-commit:
- rebase
post-merge:
commands:
update-submodules:
run: git submodule update --init --recursive
post-checkout:
commands:
update-submodules:
run: git submodule update --init --recursive

View File

@ -13,15 +13,15 @@
"test:cov": "vitest run --coverage --no-isolate",
"test:watch": "vitest watch --coverage --no-isolate",
"test:silent": "vitest run --silent --no-isolate",
"test:create": "node scripts/create-test/create-test.js",
"typecheck": "tsc --noEmit",
"eslint": "eslint --fix .",
"eslint-ci": "eslint .",
"biome": "biome check --write --changed --no-errors-on-unmatched",
"biome-ci": "biome ci --diagnostic-level=error --reporter=github --changed --no-errors-on-unmatched",
"biome-ci": "biome ci --diagnostic-level=error --reporter=github --no-errors-on-unmatched",
"docs": "typedoc",
"depcruise": "depcruise src",
"depcruise": "depcruise src test",
"depcruise:graph": "depcruise src --output-type dot | node dependency-graph.js > dependency-graph.svg",
"create-test": "node ./create-test-boilerplate.js",
"postinstall": "npx lefthook install && npx lefthook run post-merge",
"update-version:patch": "npm version patch --force --no-git-tag-version",
"update-version:minor": "npm version minor --force --no-git-tag-version",

View File

@ -542,6 +542,79 @@
"volume": 100,
"pitch": 55,
"eventType": "AnimTimedSoundEvent"
},
{
"frameIndex": 0,
"resourceName": "PRAS- Sandstorm",
"bgX": -50,
"bgY": 0,
"opacity": 0,
"duration": 5,
"eventType": "AnimTimedAddBgEvent"
},
{
"frameIndex": 0,
"resourceName": "",
"bgX": -50,
"bgY": 0,
"opacity": 96,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
],
"3": [
{
"frameIndex": 3,
"resourceName": "",
"bgX": -25,
"bgY": 0,
"opacity": 128,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
],
"6": [
{
"frameIndex": 6,
"resourceName": "",
"bgX": 0,
"bgY": 0,
"opacity": 192,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
],
"9": [
{
"frameIndex": 9,
"resourceName": "",
"bgX": 25,
"bgY": 0,
"opacity": 128,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
],
"12": [
{
"frameIndex": 12,
"resourceName": "",
"bgX": 50,
"bgY": 0,
"opacity": 96,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
],
"15": [
{
"frameIndex": 15,
"resourceName": "",
"bgX": 50,
"bgY": 0,
"opacity": 0,
"duration": 3,
"eventType": "AnimTimedUpdateBgEvent"
}
]
},

View File

@ -179,8 +179,6 @@
"483-origin",
"484-origin",
"484-origin",
"487-origin",
"487-origin",
"531-mega",
"531-mega",
"569-gigantamax",
@ -1307,8 +1305,6 @@
"483b-origin",
"484b-origin",
"484b-origin",
"487b-origin",
"487b-origin",
"531b-mega",
"531b-mega",
"569b-gigantamax",
@ -2435,8 +2431,6 @@
"483sb-origin",
"484sb-origin",
"484sb-origin",
"487sb-origin",
"487sb-origin",
"531sb-mega",
"531sb-mega",
"569sb-gigantamax",
@ -3568,8 +3562,6 @@
"483s-origin",
"484s-origin",
"484s-origin",
"487s-origin",
"487s-origin",
"531s-mega",
"531s-mega",
"569s-gigantamax",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -1,566 +0,0 @@
{
"textures": [
{
"image": "487-origin.png",
"format": "RGBA8888",
"size": {
"w": 318,
"h": 318
},
"scale": 1,
"frames": [
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 8,
"w": 91,
"h": 77
},
"frame": {
"x": 0,
"y": 0,
"w": 91,
"h": 77
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 8,
"w": 91,
"h": 77
},
"frame": {
"x": 0,
"y": 0,
"w": 91,
"h": 77
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 9,
"w": 91,
"h": 74
},
"frame": {
"x": 91,
"y": 0,
"w": 91,
"h": 74
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 10,
"w": 91,
"h": 74
},
"frame": {
"x": 91,
"y": 0,
"w": 91,
"h": 74
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 10,
"w": 91,
"h": 74
},
"frame": {
"x": 91,
"y": 0,
"w": 91,
"h": 74
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 6,
"w": 89,
"h": 75
},
"frame": {
"x": 182,
"y": 0,
"w": 89,
"h": 75
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 7,
"w": 89,
"h": 75
},
"frame": {
"x": 182,
"y": 0,
"w": 89,
"h": 75
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 7,
"w": 89,
"h": 75
},
"frame": {
"x": 182,
"y": 0,
"w": 89,
"h": 75
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 7,
"w": 86,
"h": 79
},
"frame": {
"x": 91,
"y": 74,
"w": 86,
"h": 79
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 8,
"w": 86,
"h": 79
},
"frame": {
"x": 91,
"y": 74,
"w": 86,
"h": 79
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 1,
"w": 85,
"h": 83
},
"frame": {
"x": 0,
"y": 77,
"w": 85,
"h": 83
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 85,
"h": 83
},
"frame": {
"x": 0,
"y": 77,
"w": 85,
"h": 83
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 85,
"h": 82
},
"frame": {
"x": 177,
"y": 75,
"w": 85,
"h": 82
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 4,
"y": 2,
"w": 83,
"h": 83
},
"frame": {
"x": 85,
"y": 153,
"w": 83,
"h": 83
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 4,
"y": 1,
"w": 83,
"h": 83
},
"frame": {
"x": 85,
"y": 153,
"w": 83,
"h": 83
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 6,
"y": 5,
"w": 80,
"h": 82
},
"frame": {
"x": 0,
"y": 236,
"w": 80,
"h": 82
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 6,
"y": 4,
"w": 80,
"h": 82
},
"frame": {
"x": 0,
"y": 236,
"w": 80,
"h": 82
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 6,
"y": 3,
"w": 80,
"h": 82
},
"frame": {
"x": 0,
"y": 236,
"w": 80,
"h": 82
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 2,
"y": 4,
"w": 83,
"h": 76
},
"frame": {
"x": 0,
"y": 160,
"w": 83,
"h": 76
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 2,
"y": 5,
"w": 83,
"h": 76
},
"frame": {
"x": 0,
"y": 160,
"w": 83,
"h": 76
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 6,
"w": 81,
"h": 81
},
"frame": {
"x": 80,
"y": 236,
"w": 81,
"h": 81
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 7,
"w": 81,
"h": 80
},
"frame": {
"x": 161,
"y": 236,
"w": 81,
"h": 80
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 7,
"w": 81,
"h": 80
},
"frame": {
"x": 161,
"y": 236,
"w": 81,
"h": 80
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 3,
"w": 81,
"h": 79
},
"frame": {
"x": 168,
"y": 157,
"w": 81,
"h": 79
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 2,
"w": 81,
"h": 79
},
"frame": {
"x": 168,
"y": 157,
"w": 81,
"h": 79
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 2,
"w": 81,
"h": 79
},
"frame": {
"x": 168,
"y": 157,
"w": 81,
"h": 79
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:f669baef18fc6ae83124ad81c9b726f9:b705ee5bfe7dc7d92c348ffa4a4d6ce2:5d19509f6557fe13b0b6311434ba7e2d$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -1,566 +0,0 @@
{
"textures": [
{
"image": "487-origin.png",
"format": "RGBA8888",
"size": {
"w": 326,
"h": 326
},
"scale": 1,
"frames": [
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 2,
"w": 95,
"h": 84
},
"frame": {
"x": 0,
"y": 0,
"w": 95,
"h": 84
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 1,
"w": 95,
"h": 84
},
"frame": {
"x": 0,
"y": 0,
"w": 95,
"h": 84
}
},
{
"filename": "0023.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 7,
"w": 97,
"h": 79
},
"frame": {
"x": 0,
"y": 84,
"w": 97,
"h": 79
}
},
{
"filename": "0024.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 7,
"w": 97,
"h": 79
},
"frame": {
"x": 0,
"y": 84,
"w": 97,
"h": 79
}
},
{
"filename": "0020.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 6,
"w": 97,
"h": 78
},
"frame": {
"x": 95,
"y": 0,
"w": 97,
"h": 78
}
},
{
"filename": "0021.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 7,
"w": 97,
"h": 78
},
"frame": {
"x": 95,
"y": 0,
"w": 97,
"h": 78
}
},
{
"filename": "0022.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 7,
"w": 97,
"h": 78
},
"frame": {
"x": 95,
"y": 0,
"w": 97,
"h": 78
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 4,
"w": 94,
"h": 84
},
"frame": {
"x": 97,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 3,
"w": 94,
"h": 84
},
"frame": {
"x": 97,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 2,
"w": 94,
"h": 84
},
"frame": {
"x": 97,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0025.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 6,
"w": 95,
"h": 81
},
"frame": {
"x": 97,
"y": 162,
"w": 95,
"h": 81
}
},
{
"filename": "0026.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 7,
"w": 95,
"h": 81
},
"frame": {
"x": 97,
"y": 162,
"w": 95,
"h": 81
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 1,
"w": 94,
"h": 84
},
"frame": {
"x": 191,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 0,
"w": 94,
"h": 84
},
"frame": {
"x": 191,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0017.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 5,
"w": 94,
"h": 77
},
"frame": {
"x": 192,
"y": 0,
"w": 94,
"h": 77
}
},
{
"filename": "0018.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 6,
"w": 94,
"h": 77
},
"frame": {
"x": 192,
"y": 0,
"w": 94,
"h": 77
}
},
{
"filename": "0019.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 6,
"w": 94,
"h": 77
},
"frame": {
"x": 192,
"y": 0,
"w": 94,
"h": 77
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 0,
"w": 94,
"h": 83
},
"frame": {
"x": 0,
"y": 163,
"w": 94,
"h": 83
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 0,
"y": 5,
"w": 92,
"h": 83
},
"frame": {
"x": 192,
"y": 162,
"w": 92,
"h": 83
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 0,
"y": 6,
"w": 92,
"h": 82
},
"frame": {
"x": 94,
"y": 243,
"w": 92,
"h": 82
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 0,
"y": 6,
"w": 92,
"h": 82
},
"frame": {
"x": 94,
"y": 243,
"w": 92,
"h": 82
}
},
{
"filename": "0015.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 7,
"y": 3,
"w": 90,
"h": 78
},
"frame": {
"x": 0,
"y": 246,
"w": 90,
"h": 78
}
},
{
"filename": "0016.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 7,
"y": 4,
"w": 90,
"h": 78
},
"frame": {
"x": 0,
"y": 246,
"w": 90,
"h": 78
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 2,
"w": 91,
"h": 81
},
"frame": {
"x": 186,
"y": 245,
"w": 91,
"h": 81
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 1,
"w": 91,
"h": 81
},
"frame": {
"x": 186,
"y": 245,
"w": 91,
"h": 81
}
},
{
"filename": "0014.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 1,
"w": 91,
"h": 81
},
"frame": {
"x": 186,
"y": 245,
"w": 91,
"h": 81
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:d1a63c2aac4c99e778e6efb9fa120e53:11f49886c328fc8474daefc2533a7f5d:5d19509f6557fe13b0b6311434ba7e2d$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,293 +0,0 @@
{
"textures": [
{
"image": "487-origin.png",
"format": "RGBA8888",
"size": {
"w": 326,
"h": 326
},
"scale": 1,
"frames": [
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 2,
"w": 95,
"h": 84
},
"frame": {
"x": 0,
"y": 0,
"w": 95,
"h": 84
}
},
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 2,
"y": 7,
"w": 97,
"h": 79
},
"frame": {
"x": 0,
"y": 84,
"w": 97,
"h": 79
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 7,
"w": 97,
"h": 78
},
"frame": {
"x": 95,
"y": 0,
"w": 97,
"h": 78
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 3,
"w": 94,
"h": 84
},
"frame": {
"x": 97,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 1,
"y": 6,
"w": 95,
"h": 81
},
"frame": {
"x": 97,
"y": 162,
"w": 95,
"h": 81
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 1,
"w": 94,
"h": 84
},
"frame": {
"x": 191,
"y": 78,
"w": 94,
"h": 84
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 5,
"w": 94,
"h": 77
},
"frame": {
"x": 192,
"y": 0,
"w": 94,
"h": 77
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 6,
"w": 94,
"h": 77
},
"frame": {
"x": 192,
"y": 0,
"w": 94,
"h": 77
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 4,
"y": 0,
"w": 94,
"h": 83
},
"frame": {
"x": 0,
"y": 163,
"w": 94,
"h": 83
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 0,
"y": 5,
"w": 92,
"h": 83
},
"frame": {
"x": 192,
"y": 162,
"w": 92,
"h": 83
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 0,
"y": 6,
"w": 92,
"h": 82
},
"frame": {
"x": 94,
"y": 243,
"w": 92,
"h": 82
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 7,
"y": 3,
"w": 90,
"h": 78
},
"frame": {
"x": 0,
"y": 246,
"w": 90,
"h": 78
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 101,
"h": 88
},
"spriteSourceSize": {
"x": 5,
"y": 1,
"w": 91,
"h": 81
},
"frame": {
"x": 186,
"y": 245,
"w": 91,
"h": 81
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:47e13c1a7a77825c7cf7e9fb039c2587:68949a6c55126e61a0a82829cd6ac5a8:5d19509f6557fe13b0b6311434ba7e2d$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,293 +0,0 @@
{
"textures": [
{
"image": "487-origin.png",
"format": "RGBA8888",
"size": {
"w": 318,
"h": 318
},
"scale": 1,
"frames": [
{
"filename": "0012.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 8,
"w": 91,
"h": 77
},
"frame": {
"x": 0,
"y": 0,
"w": 91,
"h": 77
}
},
{
"filename": "0011.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 10,
"w": 91,
"h": 74
},
"frame": {
"x": 91,
"y": 0,
"w": 91,
"h": 74
}
},
{
"filename": "0009.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 6,
"w": 89,
"h": 75
},
"frame": {
"x": 182,
"y": 0,
"w": 89,
"h": 75
}
},
{
"filename": "0010.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 0,
"y": 7,
"w": 89,
"h": 75
},
"frame": {
"x": 182,
"y": 0,
"w": 89,
"h": 75
}
},
{
"filename": "0013.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 7,
"w": 86,
"h": 79
},
"frame": {
"x": 91,
"y": 74,
"w": 86,
"h": 79
}
},
{
"filename": "0005.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 1,
"w": 85,
"h": 83
},
"frame": {
"x": 0,
"y": 77,
"w": 85,
"h": 83
}
},
{
"filename": "0006.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 3,
"y": 0,
"w": 85,
"h": 82
},
"frame": {
"x": 177,
"y": 75,
"w": 85,
"h": 82
}
},
{
"filename": "0004.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 4,
"y": 2,
"w": 83,
"h": 83
},
"frame": {
"x": 85,
"y": 153,
"w": 83,
"h": 83
}
},
{
"filename": "0003.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 6,
"y": 4,
"w": 80,
"h": 82
},
"frame": {
"x": 0,
"y": 236,
"w": 80,
"h": 82
}
},
{
"filename": "0008.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 2,
"y": 4,
"w": 83,
"h": 76
},
"frame": {
"x": 0,
"y": 160,
"w": 83,
"h": 76
}
},
{
"filename": "0002.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 6,
"w": 81,
"h": 81
},
"frame": {
"x": 80,
"y": 236,
"w": 81,
"h": 81
}
},
{
"filename": "0001.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 7,
"w": 81,
"h": 80
},
"frame": {
"x": 161,
"y": 236,
"w": 81,
"h": 80
}
},
{
"filename": "0007.png",
"rotated": false,
"trimmed": true,
"sourceSize": {
"w": 91,
"h": 87
},
"spriteSourceSize": {
"x": 5,
"y": 2,
"w": 81,
"h": 79
},
"frame": {
"x": 168,
"y": 157,
"w": 81,
"h": 79
}
}
]
}
],
"meta": {
"app": "https://www.codeandweb.com/texturepacker",
"version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:00abebb007c47ada81d4e754581d7146:4691e19364eb9392dbee1ee37d737c8b:5d19509f6557fe13b0b6311434ba7e2d$"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 868 B

After

Width:  |  Height:  |  Size: 1.5 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -2,7 +2,6 @@
"1": {
"526329": "4a1117",
"a5d642": "ff745e",
"101010": "101010",
"194a4a": "57003d",
"73ad31": "b34952",
"3a9494": "9c195c",
@ -10,16 +9,13 @@
"317373": "6e034e",
"63d6b5": "de3570",
"bdff73": "ffc5a3",
"cecece": "cecece",
"ef213a": "712f8f",
"ad0031": "3f1375",
"ffffff": "ffffff",
"ff6b63": "a266b0"
},
"2": {
"526329": "022e59",
"a5d642": "80c3d9",
"101010": "101010",
"194a4a": "782c00",
"73ad31": "446b94",
"3a9494": "d46d00",
@ -27,10 +23,8 @@
"317373": "5c410d",
"63d6b5": "faac05",
"bdff73": "befaf1",
"cecece": "cecece",
"ef213a": "1d540c",
"ad0031": "3c8227",
"ffffff": "ffffff",
"ff6b63": "86bf75"
}
}

View File

@ -1,6 +1,5 @@
{
"1": {
"101010": "101010",
"841010": "983d00",
"d63142": "c76d14",
"ff5221": "f0b64a",
@ -12,7 +11,6 @@
"b5adbd": "d6b0a5"
},
"2": {
"101010": "101010",
"841010": "27145d",
"d63142": "482683",
"ff5221": "7240a2",

View File

@ -3,7 +3,6 @@
"917228": "a33612",
"ffdba6": "ffb667",
"ffd52d": "ee883f",
"0f0f0f": "0f0f0f",
"f7a62d": "a64700",
"d9880f": "9b3e00",
"484415": "6d1906",
@ -20,7 +19,6 @@
"917228": "622f43",
"ffdba6": "f3e3e4",
"ffd52d": "e1ced1",
"0f0f0f": "0f0f0f",
"f7a62d": "96747e",
"d9880f": "7a4e5d",
"484415": "4b1a32",
@ -37,7 +35,6 @@
"917228": "3d717b",
"ffdba6": "ffffff",
"ffd52d": "e5fffc",
"0f0f0f": "0f0f0f",
"f7a62d": "89d1d6",
"d9880f": "5a9aa3",
"484415": "214048",

View File

@ -3,7 +3,6 @@
"505551": "754e3b",
"b8bebd": "ebe6c0",
"313430": "4f2711",
"010101": "010101",
"7e615a": "1f1e1c",
"48492e": "0a0907",
"a28b76": "383734",
@ -13,16 +12,12 @@
"524a36": "754607",
"b99c60": "e2a845",
"7b7253": "b87416",
"f97c20": "a5af8b",
"fdfdfd": "fdfdfd",
"212421": "212421",
"212021": "212021"
"f97c20": "a5af8b"
},
"2": {
"505551": "322733",
"b8bebd": "dbcce8",
"313430": "1b101c",
"010101": "010101",
"7e615a": "e6aec8",
"48492e": "9c4b6f",
"a28b76": "fce6f0",
@ -32,9 +27,6 @@
"524a36": "420f0f",
"b99c60": "bd405d",
"7b7253": "5e1b1b",
"f97c20": "f536f5",
"fdfdfd": "fdfdfd",
"212421": "212421",
"212021": "212021"
"f97c20": "f536f5"
}
}

View File

@ -2,9 +2,7 @@
"1": {
"283331": "96562e",
"a6b4a7": "e7cb7e",
"4a4a4a": "4a4a4a",
"486863": "be8550",
"0f0f0f": "0f0f0f",
"73958b": "daa666",
"5e4622": "352831",
"5c3127": "861d0f",
@ -20,9 +18,7 @@
"2": {
"283331": "472d7c",
"a6b4a7": "cfa0f3",
"4a4a4a": "4a4a4a",
"486863": "6c4aac",
"0f0f0f": "0f0f0f",
"73958b": "8d6acc",
"5e4622": "434377",
"5c3127": "313246",

View File

@ -2,7 +2,6 @@
"1": {
"a23724": "b06f00",
"f4342f": "f2b200",
"0f0f0f": "0f0f0f",
"f35e38": "ffc81b",
"f9824f": "ffe13a",
"b15236": "dca300",
@ -13,13 +12,11 @@
"1c4021": "3e3e84",
"5b985a": "5c71c1",
"83b884": "7a9ae0",
"3c3f3a": "27276a",
"f8f8f0": "f8f8f0"
"3c3f3a": "27276a"
},
"2": {
"a23724": "76074d",
"f4342f": "a525d3",
"0f0f0f": "0f0f0f",
"f35e38": "3449f6",
"f9824f": "49c9f6",
"b15236": "6233a3",
@ -30,7 +27,6 @@
"1c4021": "655a59",
"5b985a": "b09f97",
"83b884": "d7cbb5",
"3c3f3a": "4b4444",
"f8f8f0": "f8f8f0"
"3c3f3a": "4b4444"
}
}

View File

@ -2,10 +2,8 @@
"2": {
"2d384a": "2a224e",
"595f6a": "181440",
"f4f8f7": "f4f8f7",
"4b8383": "3e2d63",
"6db0b4": "585995",
"0f0f0f": "0f0f0f",
"264d24": "483d5c",
"5ab46a": "c2c8dc",
"41835a": "79728e",

View File

@ -1,21 +1,15 @@
{
"0": {
"4ba5cf": "8955b5",
"fefefe": "fefefe",
"d7c2c1": "d7c3f7",
"c883d1": "7fd8cf",
"1a1c42": "393a3e",
"5c4370": "3e446d",
"fcdf14": "427eff",
"878594": "878594",
"c1bddf": "c1bddf",
"e6e3f2": "e6e3f2",
"643fa3": "c8c8c8",
"0e0e12": "0e0e12",
"4d3672": "858585",
"392855": "616161",
"2e3176": "868686",
"ffffff": "ffffff"
"2e3176": "868686"
},
"1": {
"4ba5cf": "31808e",
@ -27,13 +21,10 @@
"fcdf14": "2cc151",
"878594": "89a5ff",
"c1bddf": "b7d8ff",
"e6e3f2": "e6e3f2",
"643fa3": "626877",
"0e0e12": "0e0e12",
"4d3672": "444b66",
"392855": "393e51",
"2e3176": "3aff75",
"ffffff": "ffffff"
"2e3176": "3aff75"
},
"2": {
"4ba5cf": "8e3c84",
@ -41,16 +32,13 @@
"d7c2c1": "ff93d4",
"c883d1": "ffc26d",
"1a1c42": "29253f",
"5c4370": "5c4370",
"fcdf14": "cc5767",
"878594": "ad9e9d",
"c1bddf": "e0e0e0",
"e6e3f2": "eae8f4",
"643fa3": "3b4986",
"0e0e12": "0e0e12",
"4d3672": "2a3768",
"392855": "192142",
"2e3176": "cf3e57",
"ffffff": "ffffff"
"2e3176": "cf3e57"
}
}

View File

@ -1,11 +1,8 @@
{
"1": {
"5a5252": "5a5252",
"cecede": "d6b0a5",
"efefef": "f7e4da",
"101010": "101010",
"ffffff": "fffdfb",
"a59c9c": "a59c9c",
"d68494": "d59679",
"c52942": "c76d14",
"f7a58c": "ffd86f",
@ -14,12 +11,9 @@
"841010": "983d00"
},
"2": {
"5a5252": "5a5252",
"cecede": "94b1c9",
"efefef": "cde3ef",
"101010": "101010",
"ffffff": "f3fdff",
"a59c9c": "a59c9c",
"d68494": "887db5",
"c52942": "482683",
"f7a58c": "c27bec",

View File

@ -6,13 +6,11 @@
"c51333": "4a6329",
"ff5f7c": "638c10",
"ffb2c0": "9cce52",
"0b0b0b": "0b0b0b",
"aedf87": "ef8ca5",
"343631": "313436",
"61635b": "5b6263",
"8a8d85": "858d8c",
"c0c1be": "bec1c0",
"1d1d1c": "1d1d1c"
"c0c1be": "bec1c0"
},
"2": {
"1e5238": "834b04",
@ -21,12 +19,10 @@
"c51333": "9131a3",
"ff5f7c": "e565fd",
"ffb2c0": "eeeeee",
"0b0b0b": "0b0b0b",
"aedf87": "e3d520",
"343631": "54544c",
"61635b": "a1a19b",
"8a8d85": "cacac6",
"c0c1be": "eeeeee",
"1d1d1c": "1d1d1c"
"c0c1be": "eeeeee"
}
}

View File

@ -1,7 +1,6 @@
{
"1": {
"691701": "871e14",
"000000": "000000",
"aa3810": "ed7746",
"7d5c02": "b53d07",
"272b87": "1d542f",
@ -19,7 +18,6 @@
},
"2": {
"691701": "062449",
"000000": "000000",
"aa3810": "2077a6",
"7d5c02": "126fa3",
"272b87": "fede7d",

View File

@ -3,11 +3,9 @@
"382929": "5e1111",
"604640": "9c120b",
"7a5a4b": "ce2e25",
"050505": "050505",
"adadad": "9a9696",
"cfcfcf": "c1baba",
"b87b21": "0a8d7f",
"eeeeee": "eeeeee",
"8a8e8a": "817c7c",
"dfa939": "22c7b6",
"5a5a56": "56534c",
@ -19,11 +17,9 @@
"382929": "744c08",
"604640": "bba010",
"7a5a4b": "e3d520",
"050505": "050505",
"adadad": "a1a19b",
"cfcfcf": "cacac6",
"b87b21": "9131a3",
"eeeeee": "eeeeee",
"8a8e8a": "74746b",
"dfa939": "e565fd",
"5a5a56": "54544c",

View File

@ -2,8 +2,6 @@
"1": {
"00a6ad": "92c72a",
"62f7f7": "bcfb3f",
"f9ffff": "f9ffff",
"050505": "050505",
"f0c720": "c5f6e6",
"89570c": "52766a",
"b4961f": "88b8a8",
@ -11,17 +9,13 @@
"163d43": "133453",
"45cbc8": "5ca6ea",
"389cad": "3673aa",
"242322": "242322",
"858ca7": "7b7b7b",
"c9cfda": "bdbdbd",
"454a54": "4f4d4d",
"7092be": "7092be"
"454a54": "4f4d4d"
},
"2": {
"00a6ad": "852098",
"62f7f7": "d046e8",
"f9ffff": "f9ffff",
"050505": "050505",
"f0c720": "b6d4d2",
"89570c": "627675",
"b4961f": "9bb4b3",
@ -29,10 +23,8 @@
"163d43": "5c3c06",
"45cbc8": "d9cd25",
"389cad": "c1991d",
"242322": "242322",
"858ca7": "a9a7a2",
"c9cfda": "d5d5d1",
"454a54": "72716d",
"7092be": "7092be"
"454a54": "72716d"
}
}

View File

@ -1,22 +1,16 @@
{
"1": {
"5a5a7b": "241e2f",
"101010": "101010",
"bdbdce": "6a547a",
"e6e6ef": "9781ab",
"8484ad": "402f51",
"3a3a52": "261e2d",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
"3a3a52": "261e2d"
},
"2": {
"5a5a7b": "ab4355",
"101010": "101010",
"bdbdce": "e18db3",
"e6e6ef": "f7b4d1",
"8484ad": "d76688",
"3a3a52": "6d2935",
"ffffff": "ffffff",
"ad3a29": "ad3a29"
"3a3a52": "6d2935"
}
}

View File

@ -1,32 +1,22 @@
{
"1": {
"8c8c94": "523c5c",
"101010": "101010",
"c5c5bd": "6a547a",
"52525a": "3c2945",
"e6e6de": "9781ab",
"735a31": "6b6373",
"ffefc5": "cecede",
"b5a573": "948cad",
"ffffff": "ffffff",
"a53110": "a53110",
"e6523a": "e6523a",
"e6d6ad": "cecede",
"732110": "732110"
"e6d6ad": "cecede"
},
"2": {
"8c8c94": "ab3f5c",
"101010": "101010",
"c5c5bd": "cb568a",
"52525a": "642224",
"e6e6de": "ef86b5",
"735a31": "6d586d",
"ffefc5": "dacad3",
"b5a573": "be9bb6",
"ffffff": "ffffff",
"a53110": "a53110",
"e6523a": "e6523a",
"e6d6ad": "dacad3",
"732110": "732110"
"e6d6ad": "dacad3"
}
}

View File

@ -4,9 +4,6 @@
"427b94": "654294",
"5aa5ce": "755ace",
"94d6f7": "a479ff",
"101010": "101010",
"b5b5b5": "b5b5b5",
"ffffff": "ffffff",
"732929": "2b7329",
"ad2942": "2dad29",
"de4a6b": "7bde4a",
@ -17,9 +14,6 @@
"427b94": "ad875a",
"5aa5ce": "ebc582",
"94d6f7": "ffedb6",
"101010": "101010",
"b5b5b5": "b5b5b5",
"ffffff": "ffffff",
"732929": "332119",
"ad2942": "4d2c1d",
"de4a6b": "7a4932",

View File

@ -4,10 +4,7 @@
"bddeff": "7ed683",
"a5c5ef": "5bab65",
"6b94b5": "3d7b4f",
"101010": "101010",
"ffffff": "ffffff",
"ff7373": "34b9af",
"d6d6d6": "d6d6d6",
"dec54a": "91bf49",
"9c844a": "548133",
"ffffad": "fff370"
@ -17,10 +14,7 @@
"bddeff": "fffaa1",
"a5c5ef": "ffe675",
"6b94b5": "edb766",
"101010": "101010",
"ffffff": "ffffff",
"ff7373": "9973c7",
"d6d6d6": "d6d6d6",
"dec54a": "4e878a",
"9c844a": "314e5e",
"ffffad": "7bc9bb"

View File

@ -4,12 +4,10 @@
"21425a": "122647",
"a5cee6": "45b38f",
"84adce": "2e8b7b",
"101010": "101010",
"4a6b84": "143c4f",
"7b6321": "3f8a49",
"dec552": "87c563",
"ffffad": "b5e37f",
"ffffff": "ffffff",
"9c9c9c": "243b61"
},
"2": {
@ -17,12 +15,10 @@
"21425a": "702525",
"a5cee6": "ffd166",
"84adce": "ffab66",
"101010": "101010",
"4a6b84": "c74c4c",
"7b6321": "4e878a",
"dec552": "7bc9bb",
"ffffad": "b3f2d8",
"ffffff": "ffffff",
"9c9c9c": "ff9a47"
}
}

View File

@ -2,9 +2,7 @@
"0": {
"52525a": "734733",
"ffffff": "fff7ee",
"101010": "101010",
"8c8c94": "966f58",
"ceb57b": "ceb57b",
"efefef": "e7d7c9",
"d6d6de": "cbb7aa",
"ffc57b": "ffda73",
@ -19,7 +17,6 @@
"1": {
"52525a": "492d5c",
"ffffff": "e7d1ea",
"101010": "101010",
"8c8c94": "6c5277",
"ceb57b": "7e3eb1",
"efefef": "b9a0bf",
@ -36,7 +33,6 @@
"2": {
"52525a": "2b4a54",
"ffffff": "d5e6e4",
"101010": "101010",
"8c8c94": "526d71",
"ceb57b": "45895b",
"efefef": "aecac8",

View File

@ -6,7 +6,6 @@
"5a5a63": "734733",
"52525a": "522b23",
"cec5c5": "e1caba",
"101010": "101010",
"943119": "8c5003",
"e67342": "f5c767",
"f79463": "ffe499",
@ -23,7 +22,6 @@
"5a5a63": "6c5277",
"52525a": "39195d",
"cec5c5": "ac90b2",
"101010": "101010",
"943119": "582488",
"e67342": "9e5fcb",
"f79463": "ba82d9",
@ -40,7 +38,6 @@
"5a5a63": "526d71",
"52525a": "2b4a54",
"cec5c5": "9ab8b8",
"101010": "101010",
"943119": "0e3c1e",
"e67342": "5fad67",
"f79463": "92c494",

View File

@ -2,7 +2,6 @@
"1": {
"633131": "07293b",
"9c6b3a": "1b7272",
"000000": "000000",
"deb563": "4bd09b",
"7b523a": "0f4c58",
"d69c52": "2d9683",
@ -19,7 +18,6 @@
"2": {
"633131": "1d5198",
"9c6b3a": "3eb7e5",
"000000": "000000",
"deb563": "9cffff",
"7b523a": "2c81bc",
"d69c52": "74e7f7",

View File

@ -2,7 +2,6 @@
"1": {
"5a529c": "8b4a52",
"8c73bd": "de6262",
"000000": "000000",
"313a73": "631c26",
"d6adef": "ffc5b4",
"b58cd6": "ee9494",
@ -19,7 +18,6 @@
"2": {
"5a529c": "9eb4ff",
"8c73bd": "c5d5ff",
"000000": "000000",
"313a73": "597cdb",
"d6adef": "ffffff",
"b58cd6": "d6e8ff",

View File

@ -2,43 +2,23 @@
"0": {
"425a21": "632929",
"bde673": "f76b6b",
"101010": "101010",
"9c8c31": "9494a5",
"fff7d6": "ffffff",
"8cce73": "d63a3a",
"e6d6ad": "b5b5ce",
"5a9c4a": "a52929",
"ffffff": "ffffff",
"dedede": "dedede",
"bdbdbd": "bdbdbd",
"737373": "737373"
"5a9c4a": "a52929"
},
"1": {
"425a21": "484e75",
"bde673": "7c9ac5",
"101010": "101010",
"9c8c31": "9c8c31",
"fff7d6": "fff7d6",
"8cce73": "92b0db",
"e6d6ad": "e6d6ad",
"5a9c4a": "7b94d6",
"ffffff": "ffffff",
"dedede": "dedede",
"bdbdbd": "bdbdbd",
"737373": "737373"
"5a9c4a": "7b94d6"
},
"2": {
"425a21": "8f3907",
"bde673": "f8f581",
"101010": "101010",
"9c8c31": "9c8c31",
"fff7d6": "fff7d6",
"8cce73": "f0c947",
"e6d6ad": "e6d6ad",
"5a9c4a": "e6a027",
"ffffff": "ffffff",
"dedede": "f0c947",
"bdbdbd": "bdbdbd",
"737373": "737373"
"dedede": "f0c947"
}
}

View File

@ -3,13 +3,11 @@
"c5a510": "b34d2b",
"5a4a08": "752c0b",
"ffe63a": "ff8b3a",
"101010": "101010",
"fff7b5": "ffd4b5",
"e6c521": "e66a21",
"292921": "211d29",
"3a4252": "3f3a52",
"6b6b63": "57526e",
"ffffff": "ffffff",
"c5c5d6": "c5ccd6",
"b53a6b": "b53a59",
"e66394": "e66380"
@ -18,13 +16,11 @@
"c5a510": "2dbd73",
"5a4a08": "235c3c",
"ffe63a": "59f7d0",
"101010": "101010",
"fff7b5": "c8ffea",
"e6c521": "43e6b7",
"292921": "282a24",
"3a4252": "424554",
"6b6b63": "6a6982",
"ffffff": "ffffff",
"c5c5d6": "cfd2dc",
"b53a6b": "b85195",
"e66394": "ed89c2"

View File

@ -1,16 +1,12 @@
{
"2": {
"7b5231": "699296",
"000000": "000000",
"ffef4a": "eaffff",
"c57b10": "9ec9cf",
"e6bd31": "c6edf2",
"6b2121": "303d58",
"ce1042": "4065b0",
"ff4a31": "5398cf",
"636363": "636363",
"ffffff": "ffffff",
"c5c5c5": "c5c5c5",
"ff8c63": "b2a0b1",
"ffcebd": "cabac8",
"fff7ce": "ffffff"

View File

@ -3,32 +3,24 @@
"837362": "7e5649",
"c0b5ab": "b1846f",
"fdf7e6": "eccb90",
"101010": "101010",
"4a4139": "441a0f",
"e1d7cc": "d29f88",
"f0831d": "f0831d",
"836a52": "3b554d",
"5a4131": "172a22",
"c5ac8b": "72988e",
"a48b6a": "54796f",
"e6d5b4": "92bab1",
"ffde62": "ffde62",
"f8f8f8": "f8f8f8"
"e6d5b4": "92bab1"
},
"2": {
"837362": "868686",
"c0b5ab": "b7b7b7",
"fdf7e6": "ffffff",
"101010": "101010",
"4a4139": "484848",
"e1d7cc": "d5d5d5",
"f0831d": "f0831d",
"836a52": "8c2c40",
"5a4131": "5c0026",
"c5ac8b": "d56a70",
"a48b6a": "b44954",
"e6d5b4": "fa958c",
"ffde62": "ffde62",
"f8f8f8": "f8f8f8"
"e6d5b4": "fa958c"
}
}

View File

@ -4,27 +4,23 @@
"b5a594": "b1846f",
"efe6ce": "eccb90",
"4a423a": "441a0f",
"000000": "000000",
"d6c5b5": "d29f88",
"846b52": "3b554d",
"5a4231": "172a22",
"c5ad8c": "72988e",
"e6d6b5": "92bab1",
"a58c6b": "54796f",
"ffffff": "ffffff"
"a58c6b": "54796f"
},
"2": {
"847363": "868686",
"b5a594": "b7b7b7",
"efe6ce": "ffffff",
"4a423a": "484848",
"000000": "000000",
"d6c5b5": "d5d5d5",
"846b52": "8c2c40",
"5a4231": "5c0026",
"c5ad8c": "d56a70",
"e6d6b5": "fa958c",
"a58c6b": "b44954",
"ffffff": "ffffff"
"a58c6b": "b44954"
}
}

View File

@ -7,7 +7,6 @@
"f76319": "ac9bbc",
"840042": "312b45",
"c5ad73": "d0784b",
"000000": "000000",
"525263": "896e5d",
"bd4242": "6f6380",
"ffffff": "fffcf3",
@ -24,13 +23,11 @@
"f76319": "f25090",
"840042": "6c0261",
"c5ad73": "bcaf98",
"000000": "000000",
"525263": "74619a",
"bd4242": "cd2b78",
"ffffff": "f9efff",
"8c8ca5": "af97ce",
"ceced6": "d1bae7",
"ff9c63": "ff9dbb",
"ffe6c5": "ffe6c5"
"ff9c63": "ff9dbb"
}
}

View File

@ -3,16 +3,13 @@
"132d5b": "611d07",
"2192e4": "eea747",
"1b68a7": "c67429",
"101010": "101010",
"cdb47b": "bd9b8e",
"144f7e": "923d13",
"5a4120": "5a4120",
"3c3f47": "c32625",
"67686b": "dd493b",
"980e31": "8691d5",
"e43343": "c9d4ff",
"f6e6ac": "fff3ec",
"f8f8f8": "f8f8f8",
"383b42": "682a23",
"d5def6": "f37754"
},
@ -20,7 +17,6 @@
"132d5b": "200d46",
"2192e4": "7b43a1",
"1b68a7": "582c81",
"101010": "101010",
"cdb47b": "d7aec0",
"144f7e": "411f70",
"5a4120": "855a71",
@ -29,7 +25,6 @@
"980e31": "a62869",
"e43343": "e15693",
"f6e6ac": "ffedf4",
"f8f8f8": "f8f8f8",
"383b42": "202b47",
"d5def6": "ffdb85"
}

View File

@ -6,12 +6,10 @@
"d6def7": "d2bdb4",
"196394": "a85104",
"194273": "873503",
"191919": "191919",
"7bd6ef": "fed076",
"42b5ef": "f2aa45",
"f7e6ad": "fff3ec",
"ceb57b": "bd9b8e",
"5a4221": "5a4221",
"bd3163": "6274e1",
"6b1921": "3b42b5",
"ef6342": "95abff"
@ -23,7 +21,6 @@
"d6def7": "f3c3de",
"196394": "431a77",
"194273": "1f0a47",
"191919": "191919",
"7bd6ef": "9e5cc8",
"42b5ef": "7f43b3",
"f7e6ad": "e8b4d4",

View File

@ -1,12 +1,10 @@
{
"1": {
"101010": "101010",
"41a4e6": "85cfef",
"184152": "133363",
"73c5f6": "ffc0e7",
"397ba4": "3595c4",
"51fffb": "ff8de5",
"fffad6": "fffad6",
"8ba494": "a7b2ab",
"dec583": "dac99e",
"52526a": "3c1838",
@ -17,18 +15,14 @@
"f6deac": "f1e9d9"
},
"2": {
"101010": "101010",
"41a4e6": "49b18c",
"184152": "184152",
"73c5f6": "8bd3b6",
"397ba4": "3a8770",
"51fffb": "0085b2",
"fffad6": "fffad6",
"8ba494": "8ca594",
"dec583": "baafaa",
"52526a": "282548",
"a49494": "666b8b",
"fefefe": "fefefe",
"d5cdc5": "969dbc",
"807573": "454565",
"f6deac": "e8e3e0"

View File

@ -1,7 +1,6 @@
{
"1": {
"194252": "133363",
"000000": "000000",
"42a5e6": "85cfef",
"3a7ba5": "4b9bc3",
"73c5f7": "c4f6ff",
@ -17,15 +16,11 @@
},
"2": {
"194252": "06383e",
"000000": "000000",
"42a5e6": "49b18c",
"3a7ba5": "3a8770",
"73c5f7": "8bd3b6",
"f7efe6": "f7efe6",
"6b5219": "18418d",
"dec584": "baafaa",
"8ca594": "8ca594",
"5a4a42": "5a4a42",
"52526b": "383851",
"d6cec5": "969dbc",
"a59494": "666b8b",

View File

@ -1,7 +1,6 @@
{
"1": {
"5a1994": "2a6d20",
"000000": "000000",
"9c5ab5": "5aa03d",
"ffceff": "ffffc2",
"c57be6": "9dce55",
@ -10,7 +9,6 @@
},
"2": {
"5a1994": "0e0c1c",
"000000": "000000",
"9c5ab5": "131432",
"ffceff": "83bdff",
"c57be6": "2b3154",

View File

@ -3,22 +3,18 @@
"a5634a": "5982b7",
"734a4a": "334b7d",
"d69c4a": "90c1f1",
"000000": "000000",
"523121": "13235c",
"e6c594": "9db5d8",
"bd9c7b": "5f6f94",
"ffffff": "ffffff",
"ffe6ad": "d7ebff"
},
"2": {
"a5634a": "915ea3",
"734a4a": "5e3372",
"d69c4a": "bf88cb",
"000000": "000000",
"523121": "461144",
"e6c594": "d7b8ba",
"bd9c7b": "a07c83",
"ffffff": "ffffff",
"ffe6ad": "f3e6e3"
}
}

View File

@ -3,22 +3,18 @@
"a5634a": "5982b7",
"734a4a": "334b7d",
"d69c4a": "90c1f1",
"000000": "000000",
"523121": "13235c",
"e6c594": "9db5d8",
"bd9c7b": "5f6f94",
"ffffff": "ffffff",
"ffe6ad": "d7ebff"
},
"2": {
"a5634a": "915ea3",
"734a4a": "5e3372",
"d69c4a": "bf88cb",
"000000": "000000",
"523121": "461144",
"e6c594": "d7b8ba",
"bd9c7b": "a07c83",
"ffffff": "ffffff",
"ffe6ad": "f3e6e3"
}
}

View File

@ -4,7 +4,6 @@
"107394": "7054e7",
"bdad5a": "a26b30",
"6b6321": "663a18",
"101010": "101010",
"8c8c8c": "754949",
"ffffff": "ffe6db",
"ffe6a5": "f4cb60",
@ -12,16 +11,13 @@
"84deff": "c497e5",
"5ac5e6": "a271e1",
"429cbd": "764abf",
"521073": "18359b",
"7b0829": "7b0829",
"d65273": "d65273"
"521073": "18359b"
},
"2": {
"104a63": "5e1120",
"107394": "b75846",
"bdad5a": "7d2f67",
"6b6321": "4a1642",
"101010": "101010",
"8c8c8c": "655081",
"ffffff": "fee1fa",
"ffe6a5": "a65687",
@ -29,8 +25,6 @@
"84deff": "e1c66e",
"5ac5e6": "d29d48",
"429cbd": "a66829",
"521073": "13517b",
"7b0829": "7b0829",
"d65273": "d65273"
"521073": "13517b"
}
}

View File

@ -1,6 +1,5 @@
{
"0": {
"000000": "000000",
"5a4a10": "7b3e14",
"cead4a": "e4a254",
"ad8c3a": "975720",
@ -13,7 +12,6 @@
"c5c5c5": "aacbc7"
},
"1": {
"000000": "000000",
"5a4a10": "202448",
"cead4a": "5e5a84",
"ad8c3a": "35346d",
@ -26,7 +24,6 @@
"c5c5c5": "8e99b5"
},
"2": {
"000000": "000000",
"5a4a10": "2c3182",
"cead4a": "47b4e9",
"ad8c3a": "4351d7",

View File

@ -3,39 +3,33 @@
"732119": "64391a",
"c5a56b": "ac9276",
"d64252": "b1772e",
"000000": "000000",
"735a42": "5e4828",
"ffefa5": "f5f4e2",
"f7734a": "e6af4a",
"debd8c": "e5d9c3",
"21216b": "0e4481",
"ffffff": "ffffff",
"a54252": "8c5219"
},
"1": {
"732119": "1b5255",
"c5a56b": "b1a58c",
"d64252": "3aad8b",
"000000": "000000",
"735a42": "766a5b",
"ffefa5": "f5f3df",
"f7734a": "5dde9d",
"debd8c": "d9c9ac",
"21216b": "541433",
"ffffff": "ffffff",
"a54252": "2c736b"
},
"2": {
"732119": "4c0013",
"c5a56b": "564c51",
"d64252": "8c2426",
"000000": "000000",
"735a42": "2d252a",
"ffefa5": "a89da0",
"f7734a": "b54144",
"debd8c": "82787c",
"21216b": "4d1b00",
"ffffff": "ffffff",
"a54252": "771823"
}
}

View File

@ -7,7 +7,6 @@
"efad9c": "f8a8cd",
"085a73": "4d030f",
"5abde6": "e9635a",
"000000": "000000",
"ff6363": "e9778e",
"0884a5": "841023",
"08add6": "ba333b",
@ -22,7 +21,6 @@
"efad9c": "82391d",
"085a73": "a1562c",
"5abde6": "ffd9ab",
"000000": "000000",
"ff6363": "491c0c",
"0884a5": "cf8556",
"08add6": "efb787",

View File

@ -5,7 +5,6 @@
"635231": "821e16",
"e6de84": "e67443",
"c5ad73": "d04e2a",
"000000": "000000",
"3a4284": "2c0c19",
"426bad": "48172f",
"ffffff": "f3fdff",
@ -21,7 +20,6 @@
"635231": "0c0f28",
"e6de84": "404c5f",
"c5ad73": "2a344b",
"000000": "000000",
"3a4284": "0c5540",
"426bad": "1a7e5c",
"ffffff": "ffa788",

View File

@ -4,14 +4,12 @@
"e6de84": "db764a",
"635242": "5f1e19",
"c5ad73": "c04e2f",
"000000": "000000",
"ffefc5": "fdad7d",
"426bad": "39121f",
"63bdf7": "885374",
"3a9cce": "602a48",
"3a4284": "2c0c19",
"424242": "3c1313",
"fff79c": "ffca9c",
"ffffff": "ffffff"
"fff79c": "ffca9c"
}
}

View File

@ -2,8 +2,6 @@
"1": {
"7b5229": "600006",
"4a2900": "52060e",
"ffffff": "ffffff",
"000000": "000000",
"c58429": "9f1105",
"a56b29": "870100",
"ff8cad": "ff5bda",
@ -15,8 +13,6 @@
"2": {
"7b5229": "2821ab",
"4a2900": "271381",
"ffffff": "ffffff",
"000000": "000000",
"c58429": "4b64e6",
"a56b29": "3440cb",
"ff8cad": "ffed85",

View File

@ -6,12 +6,10 @@
"957fa0": "945f65",
"a79ed4": "b58788",
"57406d": "582e34",
"010101": "010101",
"79559f": "c54522",
"9767d2": "df6d3c",
"c5bfe3": "e4b7b2",
"317329": "2150d9",
"fafafa": "fafafa",
"832041": "a31048",
"ae87e2": "ee9152",
"d95b6b": "ee526f"
@ -23,12 +21,10 @@
"957fa0": "a8bdcc",
"a79ed4": "cae0ec",
"57406d": "596876",
"010101": "010101",
"79559f": "1e5e54",
"9767d2": "348f78",
"c5bfe3": "d7ecf4",
"317329": "c00c39",
"fafafa": "fafafa",
"832041": "941c2d",
"ae87e2": "5ebf9c",
"d95b6b": "e76e67"

View File

@ -1,14 +1,11 @@
{
"1": {
"9484a5": "6c3c43",
"000000": "000000",
"adadd6": "945f65",
"cecee6": "b58788",
"524273": "411921",
"31196b": "671707",
"317329": "2150d9",
"cecece": "cecece",
"ffffff": "ffffff",
"735294": "c54522",
"ce3a4a": "d92f62",
"842142": "a31048",
@ -18,14 +15,11 @@
},
"2": {
"9484a5": "7c8e9f",
"000000": "000000",
"adadd6": "a8bdcc",
"cecee6": "cae0ec",
"524273": "374659",
"31196b": "0b3433",
"317329": "c00c39",
"cecece": "cecece",
"ffffff": "ffffff",
"735294": "1e5e54",
"ce3a4a": "d03e3f",
"842142": "941c2d",

View File

@ -3,17 +3,13 @@
"005273": "642c89",
"94c5ff": "f1dfff",
"4a84d6": "7b42ab",
"000000": "000000",
"6badf7": "d7adff",
"003152": "461660",
"007bbd": "a142c8",
"5a3a19": "221531",
"b59473": "736581",
"8c6b52": "372841",
"ffffff": "ffffff",
"bd293a": "2d6cb0",
"cee6ff": "fef5ff",
"525252": "525252",
"cecece": "cecece"
"cee6ff": "fef5ff"
}
}

View File

@ -5,11 +5,8 @@
"101010": "000000",
"d6ad08": "cc4e17",
"9c7b10": "991500",
"ffffff": "ffffff",
"dedede": "dedede",
"f79419": "6c4645",
"c56b19": "442526",
"6b6b6b": "6b6b6b",
"7b6b19": "2f1517",
"9c8c31": "290f13"
},
@ -19,11 +16,8 @@
"101010": "000000",
"d6ad08": "e3b68e",
"9c7b10": "ac7c5b",
"ffffff": "ffffff",
"dedede": "dedede",
"f79419": "ff9a33",
"c56b19": "dd6b10",
"6b6b6b": "6b6b6b",
"7b6b19": "885024",
"9c8c31": "6e4216"
},
@ -33,11 +27,8 @@
"101010": "000000",
"d6ad08": "a32a71",
"9c7b10": "94007e",
"ffffff": "ffffff",
"dedede": "dedede",
"f79419": "ffdeff",
"c56b19": "c992cb",
"6b6b6b": "6b6b6b",
"7b6b19": "970083",
"9c8c31": "ce24a8"
}

View File

@ -6,15 +6,11 @@
"ffa54a": "e01291",
"734210": "220f23",
"de9410": "431d43",
"000000": "000000",
"ffc54a": "512d4e",
"ffef63": "755c73",
"523a29": "460241",
"8c634a": "8c0c75",
"cecece": "cecece",
"ffffff": "ffffff",
"b58c63": "dd2559",
"636363": "636363"
"b58c63": "dd2559"
},
"1": {
"d60808": "00877f",
@ -23,15 +19,11 @@
"ffa54a": "90e932",
"734210": "706127",
"de9410": "c2b562",
"000000": "000000",
"ffc54a": "f1eca3",
"ffef63": "feffe1",
"523a29": "840000",
"8c634a": "ad1910",
"cecece": "cecece",
"ffffff": "ffffff",
"b58c63": "de423a",
"636363": "636363"
"b58c63": "de423a"
},
"2": {
"d60808": "053889",
@ -40,14 +32,10 @@
"ffa54a": "26b1e1",
"734210": "0c4f6b",
"de9410": "58abdb",
"000000": "000000",
"ffc54a": "9dd5ff",
"ffef63": "dae9ff",
"523a29": "3e0b03",
"8c634a": "78230b",
"cecece": "cecece",
"ffffff": "ffffff",
"b58c63": "b05329",
"636363": "636363"
"b58c63": "b05329"
}
}

View File

@ -3,7 +3,6 @@
"9c948c": "79a2a3",
"ffffff": "def1ef",
"5a5a5a": "54787d",
"000000": "000000",
"ded6de": "a2c7c7",
"5a63bd": "b24729",
"293184": "a82d17",
@ -15,7 +14,6 @@
"9c948c": "c2a7a3",
"ffffff": "fff5f0",
"5a5a5a": "8c7270",
"000000": "000000",
"ded6de": "dfc8c2",
"5a63bd": "1b5f6f",
"293184": "134557",

View File

@ -1,6 +1,5 @@
{
"1": {
"000000": "000000",
"a59ca5": "79a2a3",
"ffffff": "def1ef",
"5a525a": "54787d",
@ -16,7 +15,6 @@
"425aff": "359bbd"
},
"2": {
"000000": "000000",
"a59ca5": "c29490",
"ffffff": "ffedde",
"5a525a": "895e5c",

View File

@ -3,34 +3,26 @@
"5a3a21": "102908",
"ffefbd": "def1ef",
"ef9c3a": "e9917b",
"000000": "000000",
"de733a": "d15b67",
"efbd8c": "a2c7c7",
"9c5a4a": "5a394e",
"f7bd5a": "f8b58f",
"cecece": "cecece",
"ffffff": "ffffff",
"196b63": "359bbd",
"21a57b": "61cce2",
"104231": "1b6794",
"ad8c42": "79a2a3",
"636363": "636363"
"ad8c42": "79a2a3"
},
"2": {
"5a3a21": "102908",
"ffefbd": "f8dfce",
"ef9c3a": "55a39f",
"000000": "000000",
"de733a": "2d636d",
"efbd8c": "c0a59d",
"9c5a4a": "895e5c",
"f7bd5a": "8ed9c4",
"cecece": "cecece",
"ffffff": "ffffff",
"196b63": "a44a91",
"21a57b": "f86ebf",
"104231": "9c4a94",
"ad8c42": "ad7e7a",
"636363": "636363"
"ad8c42": "ad7e7a"
}
}

View File

@ -5,11 +5,9 @@
"b4acc5": "db8aaf",
"ded5e6": "ffb5d6",
"eee6ee": "ffd6ef",
"101010": "101010",
"6a319c": "196b5b",
"9441bd": "4bac9a",
"2b68b3": "4bac9a",
"fdfdfd": "fdfdfd",
"b44aee": "c4fff4",
"57acdf": "89cabe",
"392052": "105144"
@ -20,11 +18,9 @@
"b4acc5": "edaf5b",
"ded5e6": "ffdd98",
"eee6ee": "ffeeb6",
"101010": "101010",
"6a319c": "6b2619",
"9441bd": "ac4f4b",
"2b68b3": "da2e29",
"fdfdfd": "fdfdfd",
"b44aee": "ffffff",
"57acdf": "ea5f5b",
"392052": "531b10"

View File

@ -7,9 +7,7 @@
"393952": "5a2952",
"6a319c": "196b5b",
"9441bd": "4bac9a",
"fdfdfd": "fdfdfd",
"c83535": "4bac9a",
"101010": "101010",
"ea5f5b": "89cabe",
"392052": "12493f",
"b44aee": "c4fff4"
@ -22,10 +20,7 @@
"393952": "884c17",
"6a319c": "6b2619",
"9441bd": "ac4f4b",
"fdfdfd": "fdfdfd",
"c83535": "da2e29",
"101010": "101010",
"ea5f5b": "ea5f5b",
"392052": "491b12",
"b44aee": "ffffff"
}

View File

@ -6,10 +6,8 @@
"3a3a52": "5a2952",
"6b319c": "196b5b",
"9442bd": "4bac9a",
"000000": "000000",
"efe6ef": "ffd6ef",
"3a2152": "12493f",
"ffffff": "ffffff",
"b54aef": "c4fff4"
},
"2": {
@ -19,10 +17,8 @@
"3a3a52": "884c17",
"6b319c": "6b2619",
"9442bd": "ac4f4b",
"000000": "000000",
"efe6ef": "ffeeb6",
"3a2152": "491b12",
"ffffff": "ffffff",
"b54aef": "ffffff"
}
}

View File

@ -3,11 +3,8 @@
"b56394": "895ac3",
"5a2952": "5c2da1",
"ffb5d6": "d3b8e8",
"000000": "000000",
"ef84b5": "ab87cf",
"ffd6ef": "eed7fa",
"cecece": "cecece",
"ffffff": "ffffff",
"193a6b": "ca241d",
"2963e6": "e85040",
"84adf7": "ff9180"
@ -16,11 +13,8 @@
"b56394": "d68f40",
"5a2952": "884c17",
"ffb5d6": "ffdd98",
"000000": "000000",
"ef84b5": "edaf5b",
"ffd6ef": "ffeeb6",
"cecece": "cecece",
"ffffff": "ffffff",
"193a6b": "067576",
"2963e6": "11948c",
"84adf7": "74f5e3"

View File

@ -3,15 +3,12 @@
"4a3121": "252054",
"634231": "46387d",
"3a0800": "15143c",
"101010": "101010",
"b52142": "921a4b",
"de424a": "a44362",
"8c5a42": "744e9b",
"cea584": "eec1ff",
"bd845a": "cc95eb",
"a5734a": "a374c7",
"ffffff": "ffffff",
"3a1910": "161443",
"cecec5": "cecec5"
"3a1910": "161443"
}
}

View File

@ -3,28 +3,23 @@
"522921": "151c34",
"e6c54a": "988fc7",
"7b423a": "2d2766",
"212129": "212129",
"9c634a": "46387d",
"c59c42": "7266a2",
"ffef94": "b7abde",
"ad8429": "716aa8",
"ffffc5": "d3c8ec",
"ffffff": "ffffff",
"737373": "3a8591",
"9c0000": "9c1f00",
"ff9463": "ff9463"
"9c0000": "9c1f00"
},
"2": {
"522921": "222f3c",
"e6c54a": "b4d1dc",
"7b423a": "56697a",
"212129": "212129",
"9c634a": "7a8e9b",
"c59c42": "8aaabb",
"ffef94": "daeff5",
"ad8429": "67748a",
"ffffc5": "f9feff",
"ffffff": "ffffff",
"737373": "cc3b46",
"9c0000": "00379c",
"ff9463": "1e78c6"

View File

@ -1,6 +1,5 @@
{
"1": {
"101010": "101010",
"424242": "462f68",
"734a19": "4d438b",
"523100": "25245c",
@ -12,12 +11,9 @@
"bd5a29": "663e5f",
"efad94": "87627e",
"ffe6c5": "cdd9ee",
"debd9c": "a3b0d2",
"ffffff": "ffffff",
"7b7b7b": "7b7b7b"
"debd9c": "a3b0d2"
},
"2": {
"101010": "101010",
"424242": "232d44",
"734a19": "435170",
"523100": "1f2a4e",
@ -29,8 +25,6 @@
"bd5a29": "36282b",
"efad94": "4f4143",
"ffe6c5": "e3e9eb",
"debd9c": "ccd4d9",
"ffffff": "ffffff",
"7b7b7b": "7b7b7b"
"debd9c": "ccd4d9"
}
}

View File

@ -3,30 +3,21 @@
"7b4a9c": "2f2a5f",
"63197b": "14093b",
"a55ace": "3d4381",
"101010": "101010",
"b57bce": "666fb4",
"08426b": "b06130",
"ce0021": "1200b5",
"ffd600": "20e0ff",
"d69400": "099ac3",
"216b94": "ffb049",
"ffffff": "ffffff",
"a5a5a5": "a5a5a5",
"6b6b6b": "6b6b6b"
"216b94": "ffb049"
},
"2": {
"7b4a9c": "80607b",
"63197b": "3c1e39",
"a55ace": "b49db2",
"101010": "101010",
"b57bce": "c8b6c2",
"08426b": "901606",
"ce0021": "ce0021",
"ffd600": "ffa028",
"d69400": "ff7b00",
"216b94": "b52c0c",
"ffffff": "ffffff",
"a5a5a5": "a5a5a5",
"6b6b6b": "6b6b6b"
"216b94": "b52c0c"
}
}

View File

@ -4,12 +4,10 @@
"632119": "3d2e66",
"ffc5ad": "c19fe3",
"ffa594": "9579c9",
"101010": "101010",
"523100": "44004a",
"de7b6b": "7c52ba",
"6b4a31": "494299",
"c58c29": "5ca3bf",
"a56b00": "647cb3",
"ffffff": "ffffff"
"a56b00": "647cb3"
}
}

View File

@ -1,13 +1,11 @@
{
"0": {
"94735a": "844466",
"000000": "000000",
"f7efc5": "f7c9c5",
"ce9c73": "a7738f",
"734a4a": "5b2847",
"f7d6a5": "e4b2bb",
"b5b5c5": "c5b5b5",
"ffffff": "ffffff",
"ad2121": "811a5f",
"d6dede": "ded6d6",
"c54242": "409e80",
@ -18,7 +16,6 @@
},
"1": {
"94735a": "734350",
"000000": "000000",
"f7efc5": "f7c5ce",
"ce9c73": "a26867",
"734a4a": "452030",
@ -35,7 +32,6 @@
},
"2": {
"94735a": "404d5b",
"000000": "000000",
"f7efc5": "ddeaef",
"ce9c73": "8093a5",
"734a4a": "1f293b",

View File

@ -1,7 +1,6 @@
{
"0": {
"737b84": "6b3552",
"000000": "000000",
"ffffff": "eee0db",
"adc5bd": "ceacac",
"d6efef": "dbc9c5",
@ -12,7 +11,6 @@
},
"1": {
"737b84": "734350",
"000000": "000000",
"ffffff": "f3cbcb",
"adc5bd": "ae7675",
"d6efef": "c79397",
@ -23,7 +21,6 @@
},
"2": {
"737b84": "384d72",
"000000": "000000",
"ffffff": "c1dfe9",
"adc5bd": "81aaca",
"d6efef": "91b6cf",

View File

@ -3,30 +3,24 @@
"842900": "001d3f",
"ff424a": "4b798a",
"d63131": "174d69",
"292929": "292929",
"296b29": "b36848",
"73bd42": "ffbe79",
"94d642": "ffe88e",
"4a9442": "d1915e",
"ffffff": "ffffff",
"846321": "356f6d",
"d6ad29": "4ca690",
"ffde29": "8ddcaf",
"cecece": "cecece"
"ffde29": "8ddcaf"
},
"2": {
"842900": "3b060c",
"ff424a": "9a3841",
"d63131": "662340",
"292929": "292929",
"296b29": "224181",
"73bd42": "62a1e8",
"94d642": "82d4fc",
"4a9442": "4973c7",
"ffffff": "ffffff",
"846321": "382c78",
"d6ad29": "554196",
"ffde29": "8767bf",
"cecece": "cecece"
"ffde29": "8767bf"
}
}

View File

@ -6,8 +6,6 @@
"e6cea5": "deccb2",
"e6ad00": "eaa60f",
"ffde00": "ffe85a",
"ffffff": "ffffff",
"101010": "101010",
"525252": "392229",
"a5a5a5": "4f3a3d",
"004a94": "461e1b",
@ -23,8 +21,6 @@
"e6cea5": "352b53",
"e6ad00": "c33486",
"ffde00": "ee74c1",
"ffffff": "ffffff",
"101010": "101010",
"525252": "221b1f",
"a5a5a5": "2d282a",
"004a94": "42579d",

View File

@ -2,7 +2,6 @@
"1": {
"737373": "58341f",
"f8f8f8": "ffe8b2",
"101010": "101010",
"bf370a": "e28f09",
"bfbfbf": "e5c079",
"ff490d": "ffe85a",
@ -15,7 +14,6 @@
"2": {
"737373": "5d412a",
"f8f8f8": "fff1d0",
"101010": "101010",
"bf370a": "d26b00",
"bfbfbf": "ebbb78",
"ff490d": "ffab34",

View File

@ -1,6 +1,5 @@
{
"1": {
"101010": "101010",
"636b6b": "4a1e19",
"ffc510": "9f5834",
"845a31": "492602",
@ -15,7 +14,6 @@
"e6e6e6": "e6c285"
},
"2": {
"101010": "101010",
"636b6b": "3e2752",
"ffc510": "6189db",
"845a31": "1c2a6d",

View File

@ -4,13 +4,11 @@
"f76b00": "79f6d5",
"840000": "338497",
"e6d66b": "5c51b9",
"101010": "101010",
"b5a53a": "3a2c7d",
"847319": "231c5a",
"73ad31": "a2d281",
"9cd64a": "d8ecb1",
"526329": "659251",
"ffffff": "ffffff",
"3a9400": "6370b3",
"105210": "373c8b",
"52ce31": "90a4d7"
@ -20,13 +18,11 @@
"f76b00": "eaed6e",
"840000": "a7801f",
"e6d66b": "eb4f50",
"101010": "101010",
"b5a53a": "ca3442",
"847319": "a21b36",
"73ad31": "804428",
"9cd64a": "b68356",
"526329": "592819",
"ffffff": "ffffff",
"3a9400": "b8462a",
"105210": "901a17",
"52ce31": "e87940"

View File

@ -8,7 +8,6 @@
"941010": "7b3cd6",
"bd2931": "778dd1",
"de4252": "9fcae2",
"ffffff": "ffffff",
"101010": "32392e",
"b5d6ff": "ffd9f3",
"636363": "7c6a7d",

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