Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[Challenge] Eevee only challenge #2753

Closed
wants to merge 198 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
ee5d689
feat: Add Google and Discord login functionality
f-fsantos Jun 1, 2024
dbb1fc1
refactor: Add missing properties to initLoggedInUser function
f-fsantos Jun 19, 2024
ef5847d
Update src/locales/de/menu-ui-handler.ts
f-fsantos Jun 23, 2024
782718c
make i18n debugging an optional env setting
flx-sta Jun 28, 2024
e929538
set development default also to "0"
flx-sta Jun 28, 2024
cac7e6d
Add challenge to use only Eevee
hayuna Jul 2, 2024
9e60b12
Add challenge to use only Eevee
hayuna Jul 2, 2024
0ace205
Add fr locales
hayuna Jul 2, 2024
177271c
Add ko challenges locales
hayuna Jul 2, 2024
71c57d6
Add ko achv locales
hayuna Jul 2, 2024
124865c
Add de locales
hayuna Jul 2, 2024
99f5b9b
Add cn locales
hayuna Jul 2, 2024
206da58
Changed challenge description to respect evolutions
hayuna Jul 2, 2024
cdf8769
Move On/Off outside specific challenge
hayuna Jul 2, 2024
985b20c
Update src/locales/fr/challenges.ts
hayuna Jul 2, 2024
323e0ff
Update src/locales/pt_BR/challenges.ts
hayuna Jul 2, 2024
fb2c3df
Update src/locales/ko/challenges.ts
hayuna Jul 2, 2024
477aefe
Update src/locales/pt_BR/challenges.ts
hayuna Jul 2, 2024
a417214
Update src/locales/pt_BR/achv.ts
hayuna Jul 2, 2024
fb27e93
Fix typo in var name
hayuna Jul 2, 2024
1ff4374
Update src/locales/ko/achv.ts
hayuna Jul 3, 2024
844e00e
Update src/locales/ko/challenges.ts
hayuna Jul 3, 2024
7318a52
Update src/locales/de/challenges.ts
hayuna Jul 3, 2024
92ac325
Merge branch 'pagefaultgames:main' into eevee-challenge
hayuna Jul 3, 2024
26fb3c8
Update src/locales/es/challenges.ts
hayuna Jul 3, 2024
26a3774
Update src/locales/es/achv.ts
hayuna Jul 3, 2024
6531251
Merge branch 'pagefaultgames:main' into eevee-challenge
hayuna Jul 4, 2024
9e36f51
Update src/locales/es/achv.ts
hayuna Jul 4, 2024
e8cc291
Update src/locales/es/challenges.ts
hayuna Jul 7, 2024
f513c1e
Update achv.ts (it)
NicusPulcis Jul 7, 2024
b60c893
Update challenges.ts (it)
NicusPulcis Jul 7, 2024
d045a65
Merge pull request #1 from NicusPulcis/patch-47
hayuna Jul 7, 2024
f9b804e
Merge pull request #2 from NicusPulcis/patch-48
hayuna Jul 7, 2024
d12cd9a
Merge branch 'pagefaultgames:main' into eevee-challenge
hayuna Jul 7, 2024
ff1fa15
fix inaccurate docs for TypeImmunityAbAttr (#2957)
torranx Jul 10, 2024
c44b38c
chore: Add beta branch to GitHub Actions tests workflow
f-fsantos Jul 10, 2024
4dbed9c
chore: Add beta branch to GitHub Actions linter and gh-pages workflow
f-fsantos Jul 10, 2024
f506a70
Merge branch 'beta' into discord-oauth
f-fsantos Jul 10, 2024
ea4e56b
Update src/locales/ko/menu-ui-handler.ts
f-fsantos Jul 10, 2024
cf1e457
Update src/locales/ko/menu.ts
f-fsantos Jul 10, 2024
84e03be
Localization(pt): translated bgm-name.ts (#2955)
josericardo-fo Jul 10, 2024
db38963
Merge remote-tracking branch 'upstream/beta' into feature/i18n-debugging
flx-sta Jul 10, 2024
fab5992
update VITE_I18N_DEBUG in .env files
flx-sta Jul 10, 2024
cbf9bdb
chore: Update environment variables for beta and production environments
f-fsantos Jul 10, 2024
3674325
Merge pull request #1693 from f-fsantos/discord-oauth
f-fsantos Jul 10, 2024
3c09eef
Merge remote-tracking branch 'upstream/beta' into feature/i18n-debugging
flx-sta Jul 10, 2024
616b448
chore: Add beta branch to GitHub Actions deploy workflow
f-fsantos Jul 10, 2024
85a89b9
Merge branch 'beta' of github.com:pagefaultgames/pokerogue into beta
f-fsantos Jul 10, 2024
4797878
Hardcoded Pokemon should have proper names (#2941)
Tempo-anon Jul 10, 2024
fc4b97d
Merge pull request #2692 from flx-sta/feature/i18n-debugging
Tempo-anon Jul 10, 2024
5742f08
Refactor challenges and add fresh start (#2963)
Xavion3 Jul 10, 2024
01f6ec2
[Balance] Update many TM learnsets (#2879)
Fontbane Jul 10, 2024
991051f
Refactor challenges and add fresh start (#2964)
Xavion3 Jul 11, 2024
6bc191c
[Bug] Fix off-by-one error in damage calc (#2970)
DayKev Jul 11, 2024
55f2a32
[Bug] Grounded on Terrain fixes (#2969)
chaosgrimmon Jul 11, 2024
d69bedd
Update game-stats-ui-handler.ts (italian) (#2965)
NicusPulcis Jul 11, 2024
02b1ba8
Merge branch 'beta' into eevee-challenge
hayuna Jul 11, 2024
e9b13be
[Bugfix] Fix a bug during bgm-bar initialization (#2822)
Dakurei Jul 11, 2024
c35f226
Update code for challenges
hayuna Jul 11, 2024
caf541b
[Mirror][Localization] Translate game victory sentences #2254 (#2906)
EnochG1 Jul 11, 2024
74941bd
[Mirror][Localization] Translate summary #2336 (#2907)
EnochG1 Jul 11, 2024
2f550ea
[Localization] Localization arena flyout (Active Battle Effects) (#2932)
EnochG1 Jul 11, 2024
516a100
This should prevent gym leaders appear as doubles (marnie & piers) wh…
CodeTappert Jul 11, 2024
dd361c5
The stat messages can now be plural (#2600)
CodeTappert Jul 11, 2024
e879b3c
[Enhancement][QoL] Add option to adjust shop overlay opacity (#2622)
torranx Jul 11, 2024
50d7ed3
[Bug] Fix battler tags lapsing at incorrect times (#2944)
innerthunder Jul 11, 2024
4b3984c
Update French pokemon-summary.ts (#2976)
Adri1 Jul 11, 2024
2f81bd5
[Test] Prevent tests from running if overrides are different from the…
OrangeRed Jul 11, 2024
aa90a9f
[QoL] Highlight targets of multitarget moves instead of immediate exe…
torranx Jul 11, 2024
e2290e4
[Refactor] rewrite applyAbAttrsInternal to use an iterator. (#1832)
OrangeRed Jul 11, 2024
045fd57
Update typescript and typedoc (#2988)
OrangeRed Jul 11, 2024
c5577d6
update workflow (#2989)
OrangeRed Jul 11, 2024
5aee958
[Qol/Balance] Dynamax cannon tweak (#2540)
AsdarDevelops Jul 11, 2024
d57a7c9
[Test] Fix/Extend Unit Test for Hard Press (#2992)
xsn34kzx Jul 12, 2024
1965f2b
[Test] Update tests to enable no-crits override (#2971)
DayKev Jul 12, 2024
39bdfea
[Localization]Localized move-trigger text (#2913)
mercurius-00 Jul 12, 2024
3a1d41a
[Bug] Fix description of rare candy to have proper amount of level (#…
hayuna Jul 12, 2024
21d36bf
move status effect enum into separate file (#2998)
OrangeRed Jul 12, 2024
683c337
add .env.test (#2997)
flx-sta Jul 12, 2024
2314d34
[QoL] Create default overrides class and export that with custom over…
OrangeRed Jul 12, 2024
4dc1af9
[Feature][FUN] add breedersInSpace splash message (#2631)
flx-sta Jul 12, 2024
9df3bdd
[Enhancement] Pokemon generation number tooltip (#2642)
EmberCM Jul 12, 2024
8e44ddf
[Beta] Updating the manage data->unlock all option to work with all a…
Opaque02 Jul 13, 2024
5898012
[Bug] vite port (for development) (#3003)
flx-sta Jul 13, 2024
a3177c6
feat: Update isBeta check in utils.ts to use import.meta.env.MODE
f-fsantos Jul 13, 2024
b2ced62
Merge branch 'beta' of github.com:pagefaultgames/pokerogue into beta
f-fsantos Jul 13, 2024
7709ff5
refactor: Update trainerId and secretId in game data
f-fsantos Jul 13, 2024
a1a906e
Adds bg glow behind starters with unlocked passives (#2497)
Fontbane Jul 13, 2024
985c24e
[Localization] Localize missed things in battlers-tag.ts (#3004)
EnochG1 Jul 13, 2024
0aa5e0d
[Feature] Fully implement Octolock (#2985)
mcmontag Jul 13, 2024
f7b53fa
[Bug] Fix import of overrides in a test (#3009)
mcmontag Jul 13, 2024
cbc6005
[BUG] Fixes Sketch copying the first move used by the opponent instea…
schmidtc1 Jul 13, 2024
0c0de41
[Bug] Making FormChangeItems Untransferrable (#2695)
Arxalc Jul 13, 2024
4a39946
[Bug] Fix Clear terrains upon Trainer Battle (#2027)
Arxalc Jul 13, 2024
2eb317c
Fix item reward overrides going out of bounds (#3012)
OrangeRed Jul 13, 2024
5852cae
[Localization] Localize Berry Heal message (#2996)
EnochG1 Jul 13, 2024
35bbbcb
Adds a check to the bgm-bar display to prevent it from being displaye…
Dakurei Jul 13, 2024
3e8c9d5
[Sprite] Improves Corviknight Palette usage (#3020)
chaosgrimmon Jul 14, 2024
a4f3829
[Beta][Localization] Update French battler-tags.ts and battle.ts (#3015)
Adri1 Jul 14, 2024
1be11d2
[Bug] Fix Lock-On and Mind Reader not working on the first turn (#3001)
schmidtc1 Jul 14, 2024
eedabbf
[Bug] Struggle Recoil should ignore Magic Guard (#3017)
frutescens Jul 14, 2024
8d5bfa5
[Enhancement] Decouple move power calculation from Pokemon.apply(), F…
torranx Jul 14, 2024
416079d
[QoL] Offset the status indicator to keep pokeball in view (#2966)
EmberCM Jul 14, 2024
984b188
[Bug] Fix to epic shiny Yungoos icon (#2991) (#3016)
ArielStevens Jul 14, 2024
2efde67
[Localization(ko)] Change line-break position of ghost type curse add…
EnochG1 Jul 14, 2024
76b42c4
Revert "[Localization]Localized move-trigger text (#2913)" (#3026)
CodeTappert Jul 14, 2024
a9a071b
[Localization(ko)] Fixed typo in Bertha's dialogue (#3025)
sodaMelon Jul 14, 2024
b1e7ae4
[Bug] Prevent fixed-damage and OHKO moves from being modified by dama…
Corrade Jul 14, 2024
4bf5031
[Localization] Brought german localization up to date (#3010)
CodeTappert Jul 15, 2024
21f2e69
[Bug] Remove redundant damage number popups (#3024)
DayKev Jul 15, 2024
b215de1
[Move] Implements Conversion 2 (#2943)
schmidtc1 Jul 15, 2024
4261ab3
[BUG] Fixes bug with Metronome freezing the game (#2819)
schmidtc1 Jul 15, 2024
66481c0
Add missing passive background graphic for legacy UI
Madmadness65 Jul 16, 2024
7d0437d
[Localization] Localize ability messages in ability.ts (trigger, appl…
EnochG1 Jul 16, 2024
e6639ec
Update egg.ts (italian) (#3038)
NicusPulcis Jul 16, 2024
d96b553
[Sprite] Revert Larvesta, fixing stray pixels (#3042)
chaosgrimmon Jul 17, 2024
514c6a1
[Bug] Fix level 100 moves being skipped if leveled past 100 (#3040)
mcmontag Jul 17, 2024
fcbe5e9
[Bug][Fix][Surf][Muddy Water][Sludge Wave][Animation] Added image to …
pom-eranian Jul 17, 2024
4353ccc
[Sprite] Fix Cofagrigus sprite (#3045)
Fontbane Jul 17, 2024
bde9b84
Fix FR typo (#3051)
Dakurei Jul 17, 2024
c4e146b
[Beta][Localization] Update Portuguese battler-tags.ts and battle.ts …
josericardo-fo Jul 17, 2024
27b03af
[Music/BGM] Fix bgm file & loop for battle_rival (#3053)
Dakurei Jul 17, 2024
dd693ae
stop loading pride-update banner (#3057)
flx-sta Jul 18, 2024
99f4a9d
[Item] Add Scope Lens and Leek (#2666)
xsn34kzx Jul 18, 2024
719764e
[Music/BGM] New music added for the "Slum" biome, composed by Andr06 …
Dakurei Jul 18, 2024
eb4604d
[Bug] implemented multi target damage penalty (#2329)
bucket1582 Jul 18, 2024
37526c8
[BUG] Uturn faint switch bug fix (#2980)
DustinLin Jul 18, 2024
36cf0ea
[Sprite] Remove extra Oinkologne sprites (#3067)
chaosgrimmon Jul 19, 2024
6735dd7
[Sprite] Mega Mewtwo sprite fixes (#3065)
chaosgrimmon Jul 19, 2024
be1f938
[Music/BGM] New music added for the "Sea" biome, composed by Andr06 (…
Dakurei Jul 19, 2024
94b032a
[Balance] Add 12 new TMs and remove 3 (#2733)
Fontbane Jul 20, 2024
a2edc21
[Refactor/Test] Update Dynamax Cannon Unit Tests (#3074)
xsn34kzx Jul 20, 2024
8d1a066
fix: update SameSite attribute in setCookie function to None
f-fsantos Jul 21, 2024
22cd54c
fix: update SameSite attribute in setCookie function to Strict
f-fsantos Jul 21, 2024
4c65569
feat: Add prompt=none to Discord OAuth authorization URL
f-fsantos Jul 21, 2024
93bcf8a
fix: Remove unnecessary cookie setting in LoginPhase and MenuUiHandler
f-fsantos Jul 21, 2024
cf95031
feat: Improve cookie handling in getCookie function
f-fsantos Jul 21, 2024
5abf9ec
feat: Delete duplicate cookies with the same name in getCookie function
f-fsantos Jul 21, 2024
cda7448
[Localization] Add minor Korean translations to ability-trigger file …
smee6 Jul 22, 2024
50cf1c0
Fix broken `multi_target` tests and remove RNG-based failures (#3095)
DayKev Jul 22, 2024
cc6b424
Prevent RNG from breaking the Quick Draw tests (#3096)
DayKev Jul 22, 2024
ecbf757
Make EXP boosting items stack additively and not multiplicatively (#3…
DayKev Jul 22, 2024
21f5595
[Bug] Fixes Encore bug with multi-target moves missing (#3060)
schmidtc1 Jul 22, 2024
4ad5302
Add remaining relearn moves (#2894)
Fontbane Jul 22, 2024
f298ec3
[Enhancement] Decouple move accuracy and accuracy multiplier calculat…
torranx Jul 22, 2024
1041372
[Sprite] Fix a number of sprite issues including the Zubat line, Gold…
Fontbane Jul 22, 2024
b6266c6
[Move] Finish implementation of Glaive Rush (#2720)
DayKev Jul 22, 2024
21940e6
[Bug] fix not changing moveset after add to starter #1932 (#2396)
gjeodnd12165 Jul 22, 2024
fc722be
[Bug] Enemies can properly use stuff cheeks (#3090)
schmidtc1 Jul 22, 2024
01de9b9
[Feature] Added pokemon nicknames/renaming (#2570)
sirzento Jul 22, 2024
de0aacf
[Sprite] Show Partner Eevee variants (#3097)
chaosgrimmon Jul 22, 2024
d0cbe19
Allow Necrozma forms to play their special music (#3054)
Madmadness65 Jul 22, 2024
ccb38ca
[BUG] fixing multi-hit and move messages on faint (#2981)
DustinLin Jul 22, 2024
5006d04
[Bug] Sheer Force/Serene Grace Flyout Bugfix (#2496)
okimin Jul 22, 2024
3d2c2a1
[Visual] Achievement icons (#2617)
frutescens Jul 22, 2024
aba7132
Re-add changes accidentally deleted by #2617
Madmadness65 Jul 22, 2024
04819b8
Fix some broken images in item atlas & achievement
Madmadness65 Jul 22, 2024
b42fa55
fix: Remove unnecessary cookie setting in removeCookie function
f-fsantos Jul 22, 2024
e2829f5
fix: Update removeCookie function to use Max-Age=-1 instead of Expire…
f-fsantos Jul 22, 2024
32d1b6b
[QoL] Starter UI selection update to allow removing specific pokemon …
Opaque02 Jul 22, 2024
86ebd0c
[Bug] Ability changing on evolution fix (#2995)
DayKev Jul 22, 2024
d3c9392
Localization(pt): Updated move.ts (#3078)
josericardo-fo Jul 23, 2024
e846498
[Bug] Enemy pokemon's Harvest creates berry icons on the player's sid…
schmidtc1 Jul 23, 2024
799458c
[Bug] Fix hustle not applying attack boost (#3101)
torranx Jul 23, 2024
630deb9
[Sprite] Mega Latis using opposite's eye colour (#3102)
chaosgrimmon Jul 23, 2024
1d39f8d
[Bug] Fix Thousand Arrows not hitting targets under the effects of Ma…
innerthunder Jul 23, 2024
11c5c0a
[Move] Aeroblast is a wind move (#3109)
Tempo-anon Jul 23, 2024
a0502fb
[Refactor] Replaces the single and double battles overrides with a si…
DayKev Jul 23, 2024
5cb1125
fix `Overrides` capitalization (#3111)
flx-sta Jul 23, 2024
4a04ef5
[Balance] More TM fixes (#3081)
Fontbane Jul 23, 2024
ef5e0d4
[Refactor] Code readability update (#3085)
DayKev Jul 23, 2024
0e5fd80
[Move] Implement Stockpile, Spit Up, Swallow (#2960)
mcmontag Jul 23, 2024
5edaec9
[Bug] Remove ability swap code in `PlayerPokemon.evolve()` (#3113)
DayKev Jul 23, 2024
1563b8e
[Test] Add test for rollout move (#3114)
flx-sta Jul 23, 2024
9c80e6d
[Bug][Beta] Fix Hyper Beam, etc. permanently recharging (#3115)
innerthunder Jul 24, 2024
62fd574
[QoL] New Starter Select UI with Filter (#2916)
KimJeongSun Jul 24, 2024
c37527c
[Localization] Implement Form localization (#3030)
Kiriox94 Jul 24, 2024
0ba8959
[Move] Fully implement Jungle Healing/Lunar Blessing status heal (#2785)
Fontbane Jul 24, 2024
d1e1879
[Bug] Fix tags not resetting on switch (#3119)
DayKev Jul 24, 2024
79e2b12
[Move] Water Shuriken guarantees 3 hits with battle bond (#2687)
KimJeongSun Jul 24, 2024
5111c91
[Bug] Make on-summon abilities trigger after the switch check (#3118)
DayKev Jul 24, 2024
3f9f791
[Ability] Cloud Nine now displays a message on activation
Tempo-anon Jul 24, 2024
26c98f4
[QoL] Summary Option for Caught Pokemon (#2921)
frutescens Jul 24, 2024
a526403
[Bug] Fix HP rounding issues (#2968)
EmberCM Jul 24, 2024
54feaa0
[Bug] Fixes bug with frenzy moves keeping the confusion counter despi…
schmidtc1 Jul 24, 2024
091a15c
[Tests] Updating Leftovers test (#3123)
frutescens Jul 24, 2024
f3a98ef
[Localization] Correctly Localized German names of the BGM for Evil T…
CodeTappert Jul 24, 2024
3c93aa6
[Bug] Game Stats Sub-Legendary NaN bug for new game files (#3122)
frutescens Jul 24, 2024
e1662b8
[Bug] Adjust how counter attacks target to account for uturn/voltswit…
schmidtc1 Jul 24, 2024
3caa51b
[Misc] Change fresh start achievement icon to reviver seed
Tempo-anon Jul 24, 2024
64d9c11
[Balance] Fix N-Solarizer etc appearing without secondary mon registe…
Fontbane Jul 24, 2024
45d9c65
Bug Fix (#3129)
frutescens Jul 24, 2024
928a3ae
[Bug] Fixed OHKO moves being affected by accuracy and evasion battle …
Corrade Jul 25, 2024
b326348
[Fix][Sprite] Politoed Back Sprites (#3130)
pom-eranian Jul 25, 2024
8f30bef
[Bug] Hotfix for Starter select UI with Filter (#3121)
KimJeongSun Jul 25, 2024
29a5dd0
[Bug] fix and condition of shiny and passive (#3136)
KimJeongSun Jul 25, 2024
e63cb84
Merge branch 'beta' into eevee-challenge
hayuna Jul 25, 2024
3351381
Update starter-select-ui-handler.ts
hayuna Jul 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
VITE_SERVER_URL=http://localhost:8001
VITE_DISCORD_CLIENT_ID=1248062921129459756
VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
VITE_I18N_DEBUG=0
5 changes: 4 additions & 1 deletion .env.beta
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.beta.pokerogue.net
VITE_SERVER_URL=https://api.beta.pokerogue.net
VITE_DISCORD_CLIENT_ID=1248062921129459756
VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
VITE_I18N_DEBUG=1
6 changes: 5 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
VITE_BYPASS_LOGIN=1
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=http://localhost:8001
VITE_SERVER_URL=http://localhost:8001
VITE_DISCORD_CLIENT_ID=1234567890
VITE_GOOGLE_CLIENT_ID=1234567890
VITE_I18N_DEBUG=1
VITE_PORT=8000
5 changes: 4 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
VITE_BYPASS_LOGIN=0
VITE_BYPASS_TUTORIAL=0
VITE_SERVER_URL=https://api.pokerogue.net
VITE_SERVER_URL=https://api.pokerogue.net
VITE_DISCORD_CLIENT_ID=1248062921129459756
VITE_GOOGLE_CLIENT_ID=955345393540-2k6lfftf0fdnb0krqmpthjnqavfvvf73.apps.googleusercontent.com
VITE_I18N_DEBUG=0
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_I18N_DEBUG=0
7 changes: 3 additions & 4 deletions .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Deploy Beta

on:
push: {}
pull_request: {}
push:
branches:
- beta

jobs:
deploy:
Expand All @@ -20,14 +21,12 @@ jobs:
env:
NODE_ENV: production
- name: Set up SSH
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
mkdir ~/.ssh
echo "${{ secrets.BETA_SSH_PUBLIC_KEY }}" > ~/.ssh/id_ed25519.pub
echo "${{ secrets.BETA_SSH_PRIVATE_KEY }}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/*
ssh-keyscan -H ${{ secrets.BETA_SSH_HOST }} >> ~/.ssh/known_hosts
- name: Deploy build on server
if: github.event_name == 'push' && github.ref_name == github.event.repository.default_branch
run: |
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.BETA_SSH_USER }}@${{ secrets.BETA_SSH_HOST }}:${{ secrets.BETA_DESTINATION_DIR }}
2 changes: 2 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ on:
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

jobs:
run-linters: # Define a job named "run-linters"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- main
- beta

jobs:
pages:
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
working-directory: ${{env.api-dir}}
run: |
cd pokerogue_docs
npx typedoc --out /tmp/docs --githubPages false --entryPoints ./src/
npm run docs -- --out /tmp/docs --githubPages false --entryPoints ./src/
- name: Commit & Push docs
if: github.event_name == 'push'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ on:
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

jobs:
run-tests: # Define a job named "run-tests"
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ coverage
# Local Documentation
/typedoc

/dependency-graph.svg
/dependency-graph.svg
/.vs
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<picture><img src="./public/images/logo.png" width="300" alt="PokéRogue"></picture>

PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more!
PokéRogue is a browser based Pokémon fangame heavily inspired by the roguelite genre. Battle endlessly while gathering stacking items, exploring many different biomes, fighting trainers, bosses, and more!

# Contributing
## 🛠️ 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 **#feature-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
#### Prerequisites
Expand All @@ -17,9 +17,9 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
2. Run `npm run start:dev` to locally run the project in `localhost:8000`

#### Linting
We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script.
We're using ESLint as our common linter and formatter. It will run automatically during the pre-commit hook but if you would like to manually run it, use the `npm run eslint` script.

### ❔ FAQ
### ❔ FAQ

**How do I test a new _______?**
- In the `src/overrides.ts` file there are overrides for most values you'll need to change for testing
Expand Down Expand Up @@ -56,6 +56,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
- Pokémon Scarlet/Violet
- Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
- Lmz (Custom Jungle biome music)
- Andr06 (Custom Slum and Sea biome music)

### 🎵 Sound Effects
- Pokémon Emerald
Expand Down Expand Up @@ -111,6 +112,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
- mangalos810
- Involuntary-Twitch
- selstar
- koda_want_to_sleep

### 🎨 Move Animations
- Pokémon Reborn
Loading
Loading