Skip to content

Commit

Permalink
Merge pull request #162 from doshidak/matcha-cha-cha
Browse files Browse the repository at this point in the history
Gen 9 DLC 1 + Sync Refactor + Calcdex Optimizations
  • Loading branch information
doshidak committed Oct 19, 2023
2 parents 1a57a69 + ecf6245 commit 447e823
Show file tree
Hide file tree
Showing 121 changed files with 11,398 additions and 3,144 deletions.
16 changes: 15 additions & 1 deletion .env
Expand Up @@ -4,12 +4,17 @@

DEV_HOSTNAME='localhost'
DEV_PORT=6969
DEV_SPRING_CLEANING=false

##
## uuid
##

UUID_NAMESPACE='b92890ec-ae85-4692-a4b4-e56268f8caa3'
# to auto-generate a UUID namespace on each Webpack build, set it to one of the following:
# - (nothing)
# - '' (empty string)
# - '00000000-0000-0000-0000-000000000000' (NIL UUID)
UUID_NAMESPACE='00000000-0000-0000-0000-000000000000'

##
## storage
Expand Down Expand Up @@ -40,6 +45,15 @@ HELLODEX_PATRONAGE_URL='https://patreon.com/showdex'
CALCDEX_DEFAULT_GEN=9
CALCDEX_PLAYER_MIN_POKEMON=6
CALCDEX_POKEMON_MAX_LEGAL_EVS=508
CALCDEX_POKEMON_MAX_LEGAL_RANDOMS_EVS=510
CALCDEX_POKEMON_PRESET_DEFAULT_IV=31
CALCDEX_POKEMON_PRESET_DEFAULT_LEGACY_IV=30
CALCDEX_POKEMON_PRESET_DEFAULT_RANDOMS_IV=31
CALCDEX_POKEMON_PRESET_DEFAULT_RANDOMS_LEGACY_IV=30
CALCDEX_POKEMON_PRESET_DEFAULT_EV=0
CALCDEX_POKEMON_PRESET_DEFAULT_LEGACY_EV=252
CALCDEX_POKEMON_PRESET_DEFAULT_RANDOMS_EV=85
CALCDEX_POKEMON_PRESET_DEFAULT_RANDOMS_LEGACY_EV=252

##
## pkmn
Expand Down
10 changes: 5 additions & 5 deletions .github/CONTRIBUTING.md
Expand Up @@ -20,12 +20,12 @@ I'm not a stickler for how these should be formatted; just make sure you provide

If possible, including the following would be **immensely** helpful!

* **Device** (e.g., Custom PC, MacBook Pro 2023, eMachines eTower 400i, Samsung Smart Fridge, etc.)
* **OS** & **Version** (e.g., Windows 11, macOS Ventura, Ubuntu 22, Android 14, etc.)
* **Device** (e.g., Custom PC, MacBook Pro 14" 2023, eMachines eTower 400i, Samsung Smart Fridge, etc.)
* **OS** & **Version** (e.g., Windows 11, macOS Sonoma, Ubuntu 22.04.3 LTS, Android 12, etc.)
* **Browser** (e.g., Chrome, Firefox, Opera, Netscape Navigator, etc.)
* **Showdex Version** (e.g., v1.1.6)
* **Format**, if applicable (e.g., Gen 9 National Dex AG)
* **Replay**, if applicable & possible
* **Showdex Version** (e.g., v1.1.7)
* **Format**, if applicable (e.g., Gen 9 VGC 2023 Regulation E Bo3)
* **Replay**, if applicable

If you would like to be [credited for your contribution](../README.md#contributors), please also include your username on [**Smogon Forums**](https://smogon.com/forums) or [**Pokémon Showdown**](https://pokemonshowdown.com). Otherwise, your **GitHub** username will be used, unless you don't want to be credited.

Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Expand Up @@ -4,7 +4,7 @@
"emmet.showExpandedAbbreviation": "never",

"eslint.debug": false,
"eslint.packageManager": "yarn",
// "eslint.packageManager": "yarn",

"explorer.incrementalNaming": "smart",

Expand Down
111 changes: 68 additions & 43 deletions README.md

Large diffs are not rendered by default.

4,842 changes: 4,842 additions & 0 deletions patches/@smogon+calc+0.8.0.patch

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/assets/icons/team-lift.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/app/PokeFormeTooltip/PokeFormeTooltip.tsx
Expand Up @@ -18,7 +18,7 @@ export interface PokeFormeTooltipProps {
columnWidth?: number;
disabled?: boolean;
children?: TooltipProps['children'];
onPokemonChange?: (pokemon: DeepPartial<CalcdexPokemon>) => void;
onPokemonChange?: (pokemon: Partial<CalcdexPokemon>) => void;
onRequestClose?: () => void;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/app/PokeStatusTooltip/PokeStatusTooltip.tsx
Expand Up @@ -23,7 +23,7 @@ export interface PokeStatusTooltipProps {
visible?: boolean;
disabled?: boolean;
children?: TooltipProps['children'];
onPokemonChange?: (pokemon: DeepPartial<CalcdexPokemon>) => void;
onPokemonChange?: (pokemon: Partial<CalcdexPokemon>) => void;
onRequestClose?: () => void;
}

Expand Down
147 changes: 147 additions & 0 deletions src/components/form/MoveCategoryField/MoveCategoryField.module.scss
@@ -0,0 +1,147 @@
@use 'sass:map';
@use 'config/colors';
@use 'config/fonts';
@use 'functions/color';
@use 'mixins/flex';
@use 'mixins/font';
@use 'mixins/spacing';

$tooltip-container: (
padding: 8px,
);

$stat-presets: (
spacing: 8px, // section spacing

option: (
size: 44px,
spacing: 4px,
font-size: 9px,
),
);

$stat-sections: (
title: (
spacing: 4px,
font-weight: 600,
font-size: 8px,
color: (
light: color.alpha(colors.$white, 0.64),
dark: color.alpha(colors.$black, 0.64),
),
),

option: (
size: 28px,
spacing: 2px,
font-size: 8px,
),
);

$container-button: (
padding-x: 8px,
padding-y: 1px,
font-vertical-offset: 1px,
font-weight: 500,
font-size: 8px,
);

$vs-label: (
spacing-x: 4px,
spacing-y: 3px,
font-weight: 600,
font-size: 6px,
letter-spacing: 0.25px,
opacity: 0.56,
);

button.container {
@include spacing.padding(
$top: map.get($container-button, padding-y) + map.get($container-button, font-vertical-offset),
$right: map.get($container-button, padding-x),
$bottom: map.get($container-button, padding-y),
$left: map.get($container-button, padding-x),
);
font-weight: map.get($container-button, font-weight);
font-size: map.get($container-button, font-size);

&.readOnly {
user-select: none;
pointer-events: none;
}
}

.tooltipContainer {
@include spacing.padding-all(map.get($tooltip-container, padding));
user-select: none;
z-index: 99;
}

.statPresets {
@include flex.row-center;
@include spacing.margin($bottom: map.get($stat-presets, spacing));
}

button.statPresetOption {
width: map.get($stat-presets, option, size);
font-size: map.get($stat-presets, option, font-size);

&:not(:last-child) {
@include spacing.margin($right: map.get($stat-presets, option, spacing));
}
}

.statSections {
@include flex.column-center;
}

.statSectionTitle {
@include font.apply(fonts.$primary, ( font-weight: map.get($stat-sections, title, font-weight) ));
font-size: map.get($stat-sections, title, font-size);
text-transform: uppercase;

&.top {
@include spacing.margin($bottom: map.get($stat-sections, title, spacing));
}

&.bottom {
@include spacing.margin($top: map.get($stat-sections, title, spacing));
}

.light & {
color: map.get($stat-sections, title, color, light);
}

.dark & {
color: map.get($stat-sections, title, color, dark);
}
}

.statSectionOptions {
@include flex.row-center;
}

button.statSectionOption {
width: map.get($stat-sections, option, size);
font-size: map.get($stat-sections, option, font-size);

&:not(:last-child) {
@include spacing.margin($right: map.get($stat-sections, option, spacing));
}
}

.vsLabel {
@include font.apply(fonts.$mono, ( font-weight: map.get($vs-label, font-weight) ));
font-size: map.get($vs-label, font-size);
letter-spacing: map.get($vs-label, letter-spacing);
text-transform: uppercase;
opacity: map.get($vs-label, opacity);

&.horizontal {
@include spacing.margin-xy($x: map.get($vs-label, spacing-x));
}

&.vertical {
@include spacing.margin-xy($y: map.get($vs-label, spacing-y));
}
}

0 comments on commit 447e823

Please sign in to comment.