Commit Graph

2828 Commits

Author SHA1 Message Date
Flashfyre
ff936ee395 Fix hanging when bypass login is on 2024-01-10 14:02:43 -05:00
Flashfyre
0f5c735609 Improve handling of boss bar thresholds 2024-01-10 10:38:00 -05:00
Flashfyre
7d0393be35 Add shiny versions of gen 8-9 Pokemon icons by @Someonealive-QN 2024-01-10 08:30:36 -05:00
Flashfyre
397bf1ce78 Add case for immediate move-based form changes 2024-01-10 00:13:47 -05:00
Flashfyre
4bbf1acbd8 Fix crash on catching a Pokemon 2024-01-09 23:53:31 -05:00
Flashfyre
53097dfa6d Fix Keldeo's form condition using wrong move 2024-01-09 23:48:23 -05:00
Flashfyre
6084d3aaa6 Add form change system 2024-01-09 23:34:43 -05:00
Flashfyre
7f1add83c4 Add Soul Dew item and make various minor changes 2024-01-09 00:06:11 -05:00
Flashfyre
63834858cd Tweak logic for boss segment count 2024-01-08 01:18:55 -05:00
Flashfyre
12295d7680 Fix crash with normal type gym leaders 2024-01-08 00:35:41 -05:00
Flashfyre
111f9c9af8 Make Electric types immune to paralysis 2024-01-08 00:10:08 -05:00
Flashfyre
bde168accb Update gym leader template logic 2024-01-08 00:07:42 -05:00
Flashfyre
a2fbb91a77 Fix applying time tint to Pokemon when evolving 2024-01-07 23:58:36 -05:00
Flashfyre
f0060e47a7 Add construction site arena background 2024-01-07 23:54:49 -05:00
Flashfyre
f029f450fe Fix master ball not working properly 2024-01-07 23:50:11 -05:00
Flashfyre
eedad7d678 Add boss health bars 2024-01-07 23:17:24 -05:00
Flashfyre
52e3c6b730 Fix logic error in nature stat effect text 2024-01-06 12:54:42 -05:00
Flashfyre
06020bee14 Fix text overlap in egg hatch screen stats 2024-01-06 12:24:01 -05:00
Flashfyre
8cc1982859 Add natures 2024-01-05 22:31:13 -05:00
Flashfyre
6dc868272f Add summary memo text 2024-01-05 11:29:34 -05:00
Flashfyre
39b31e7d6f Add back old random seed gaussian function to fix level balancing 2024-01-05 00:44:28 -05:00
Flashfyre
678753aaaf Tweak Pokeball release animation for fast game speed 2024-01-05 00:00:51 -05:00
Flashfyre
9037562c5c Add Pokeball release animations and Fairy Feather item 2024-01-04 23:57:21 -05:00
Madmadness65
f342ea8e67 Fix minor champion oversight
Iris is no longer listed twice for wave 190, and Geeta has been added for the future
2024-01-04 19:28:24 -06:00
Flashfyre
32dda0a603 Respect pokeball type on caught Pokemon 2024-01-04 19:56:26 -05:00
Flashfyre
4776851bb8 Add new boss trainers and tweak boss trainer logic 2024-01-04 19:37:07 -05:00
Flashfyre
e05bf78481 Overhaul random logic and implement battle seed 2024-01-02 21:31:59 -05:00
Flashfyre
6558de01c4 Fix issue with mobile and submit action 2024-01-02 17:31:44 -05:00
Flashfyre
c0aac06fab Fix mobile bug on starter select screen 2024-01-02 17:11:51 -05:00
Flashfyre
f7bfb925a1 Fix issue with regional evolutions 2024-01-01 20:10:48 -05:00
Madmadness65
308b264246 Update exp yields for Hisui and Paldea Pokémon
This still lacks exp yield info for Indigo Disk Pokémon, as it is still unknown at this time.
2024-01-01 14:56:57 -06:00
Flashfyre
ae42dac370 Tweak species evolution logic 2024-01-01 15:27:47 -05:00
Flashfyre
cc5f15e00e Press enter to start run on starter screen 2024-01-01 13:41:46 -05:00
Flashfyre
2d1fabdc03 Ignore erroring modifiers when loading session 2024-01-01 12:32:03 -05:00
Flashfyre
eae0d907c5 Minor tweak for starter select screen 2024-01-01 11:17:20 -05:00
Flashfyre
264c1c28ef Allow for up to 6 starters below the limit 2024-01-01 10:14:49 -05:00
Flashfyre
9bfe57cc94 Reload page after overriding system data with local 2024-01-01 01:05:20 -05:00
Flashfyre
6ca98ee6b5 Change Soothe Bell weight to depend on benefit 2024-01-01 00:29:41 -05:00
Madmadness65
42eaa6235e Lower the friendship evolution requirements 2023-12-31 23:18:39 -06:00
Flashfyre
6941e6bdce Fix issue with some modifiers not loading after loading session 2024-01-01 00:00:44 -05:00
Flashfyre
bbf42f28fb Fix vouchers in endless mode 2023-12-31 23:19:06 -05:00
Flashfyre
83e9f6d784 Fix freezing after a battle ends due to not clearing session 2023-12-31 22:49:50 -05:00
Flashfyre
183b53286e Fix error when importing data while eggs list is empty 2023-12-31 18:53:16 -05:00
Flashfyre
1ad25bdf61 Link save data to account 2023-12-31 18:30:37 -05:00
Flashfyre
34d91edab1 Reduce size of system data by shortening keys 2023-12-31 13:39:04 -05:00
Flashfyre
7a47c62535 Fix various data related issues and add hatchedCount to DexEntry 2023-12-31 13:20:28 -05:00
Flashfyre
db3ff7988f Fix errors in spliced endless mode 2023-12-31 11:15:57 -05:00
Flashfyre
de87a35b97 Fix switch out status moves in wild causing softlock 2023-12-31 10:39:33 -05:00
Flashfyre
5d7f69e35f Fix arenas not switching back from end biome 2023-12-31 10:33:34 -05:00
Flashfyre
0700e9313d Make regional forms rarer to hatch from eggs 2023-12-31 01:28:40 -05:00
Madmadness65
aa15061293 Adjust encounters for time of day for gens 3-8 2023-12-31 00:27:58 -06:00
Flashfyre
ffc1a8d02e Minor evolution updates 2023-12-31 01:03:27 -05:00
Flashfyre
2e909b430f Improve logic for determining enemy trainer party members 2023-12-30 23:31:26 -05:00
Flashfyre
20569b0317 Fix various bugs related to switch out attack moves 2023-12-30 22:01:46 -05:00
Flashfyre
8063472bac Add accounts, login, and registration 2023-12-30 20:19:33 -05:00
Flashfyre
19fec88daa Fix Legendary egg gacha pulling in boosted rates for unobtainable species 2023-12-30 15:58:41 -05:00
Flashfyre
60260faaa4 Ignore time of day tint on Pokemon sprites in UI 2023-12-30 15:44:20 -05:00
Madmadness65
b831dd7835 Adjust time of day encounters for gen 1 & 2 Pokémon 2023-12-30 01:22:13 -06:00
Flashfyre
22a5f6599d Fix issues with regex patterns for processing Pokemon pools 2023-12-30 01:11:34 -05:00
Madmadness65
75dd38eff8 Update biome.ts 2023-12-29 23:34:49 -06:00
Flashfyre
2ed01f9b63 Add support for time of day specific Pokemon pools 2023-12-30 00:00:27 -05:00
Flashfyre
4e841db730 Fix stack overflow on game over 2023-12-29 21:36:26 -05:00
Flashfyre
5ef6f2da88 Add day/night cycle 2023-12-29 21:04:40 -05:00
Madmadness65
343bc95028 Add Waiters to the trainer pool
Clobbopus is also now properly available for Black Belt trainers
2023-12-28 16:51:29 -06:00
Flashfyre
e107349a98 Add data save and load 2023-12-26 14:49:23 -05:00
Flashfyre
97124c2710 Add shiny sparkle animation to egg hatch scene
Add shiny sparkle animation to egg hatch scene; implement missing logic for same seed trainer party member generation
2023-12-26 12:29:18 -05:00
Flashfyre
e265c1961f Fix bug with generating moves before form 2023-12-26 12:01:56 -05:00
Flashfyre
40439817ac Attempt fixing issue with gender-specific types 2023-12-26 01:29:05 -05:00
Madmadness65
7688a4aaa6 Add XP yields for Paradox Pokémon 2023-12-25 23:08:38 -06:00
Flashfyre
295505ca7f Fix Smeargle moveset 2023-12-25 20:43:56 -05:00
Madmadness65
f968d4c5ae Indigo Disk Paradox Pokémon
Mostly implements Gouging Fire, Raging Bolt, Iron Boulder, and Iron Crown. They still require shiny sprites and cries, and have placeholders for now. Galarian Mr. Mime also removed as a starter (evolve Mime Jr. instead).
2023-12-25 16:26:59 -06:00
Flashfyre
5935907a09 Don't allow disabling the touch controls on a detected mobile device 2023-12-25 16:39:40 -05:00
Flashfyre
1e4e0d013e Add experimental vibration touch feedback on mobile 2023-12-25 15:50:33 -05:00
Flashfyre
77e70a6540 Update default window type 2023-12-25 15:08:51 -05:00
Flashfyre
ca720e8a20 Add missing case for updating touch controls UI mode 2023-12-25 15:06:56 -05:00
Flashfyre
41d1a84c76 Add touch controls for mobile support 2023-12-25 15:03:50 -05:00
Flashfyre
de29ea9c05 Add missing west Shellos icon 2023-12-24 15:32:21 -05:00
Flashfyre
40eed4464d Implement various abilities 2023-12-23 01:21:01 -05:00
Flashfyre
40a4d4cf13 Fix issues with Sticky Hold ability 2023-12-22 23:58:53 -05:00
Flashfyre
2bb1676d82 Implement Slow Start ability 2023-12-22 22:46:05 -05:00
Flashfyre
0b5adbb43c Refactor ability hook functions to remove code duplication 2023-12-22 22:04:30 -05:00
Flashfyre
6391e05508 Convert apply attribute functions to promises 2023-12-22 21:42:47 -05:00
Flashfyre
dd89db29fd Grant a plus voucher instead of a normal one for every 250th wave in endless mode 2023-12-22 20:13:48 -05:00
N1ghtz567
53fb56391b Implement 2 abilities 2023-12-22 18:08:37 -04:00
Flashfyre
7deab1c545 Implement some abilities 2023-12-22 01:21:05 -05:00
Flashfyre
4a575a45a9 Fix some bugs
Fix softlock with charging moves; fix double summon bug with Dragon Tail and similar moves in a trainer battle
2023-12-21 23:57:11 -05:00
Flashfyre
957b5d0fa7 Add friendship system in place of win count
Add friendship system in place of win count; add soothe bell item
2023-12-21 23:00:45 -05:00
Flashfyre
8ed7b77868 Add most gen 9 move animations 2023-12-21 20:58:00 -05:00
Flashfyre
b9c05a253e Remove temporary compensation voucher logic 2023-12-21 11:46:50 -05:00
Flashfyre
2568ac3524 Add paradox Pokemon for the end biome 2023-12-21 01:24:24 -05:00
Flashfyre
e07e267ddc Refactor windows and add alternate window skins 2023-12-20 22:22:15 -05:00
Flashfyre
cb71e543a8 Rename UiHandler file to fit conventions 2023-12-20 19:19:23 -05:00
Flashfyre
51b833f779 Grant a single voucher for defeating a boss trainer for subsequent times 2023-12-20 17:30:06 -05:00
Flashfyre
524cd99eda Rebalanace vouchers and add golden voucher 2023-12-20 17:22:50 -05:00
Madmadness65
830d3fde57 Adjust encounters and XP yields
Add wild encounters for Gen 9 cross-evos, and fix XP yields of PLA and Gen 9 cross-evos.
2023-12-20 16:12:32 -06:00
Flashfyre
5883c2fafd Calculate IVs twice for hatched Pokemon to improve overall IVs 2023-12-20 13:05:11 -05:00
Madmadness65
c3c4446930 Minor changes
Rival can have Hoothoot too, and slightly bumped up Whismur's starter value (It's too strong for how cheap it is to start with).
2023-12-20 01:51:38 -06:00
Madmadness65
51a42da89e Update Rival party choices
The Rival can now choose from the Galar starters and regional bird.
2023-12-20 00:07:15 -06:00
Flashfyre
534d5a907c Fix eggs ignoring forms 2023-12-20 00:35:41 -05:00
Flashfyre
aa94e044ab Add egg gacha system and various minor changes
Add egg gacha system; remove certain mythical Pokemon from the wild pool as egg exclusive; add egg vouchers with UI; rework Shiny Charm odds; fix trainer Pokemon shiny odds not properly ignoring Shiny Charm modifier
2023-12-19 23:51:48 -05:00
Madmadness65
50d4858caa Implement new Indigo Disk TMs
These include: Double Edge, Curse, Pain Split, Endeavor, Feather Dance, Metal Sound, Petal Blizzard, Hard Press, Alluring Voice, Temper Flare, Supercell Slam, Psychic Noise, and Upper Hand.
2023-12-19 16:54:28 -06:00
N1ghtz567
721ec6e8a9 Implement Perish Song 2023-12-18 21:53:28 -04:00
Madmadness65
a774fa69d5 Indigo Disk cross-evos now usable
Hydrapple and Archaludon are now able to be used. Dipplin also, as it was missing all it's graphics previously. Dragon Cheer is also in the TM pool now to accommodate this change.
2023-12-16 19:19:24 -06:00
Flashfyre
90f4b54fcc Minor visual fixes for item icons 2023-12-16 10:15:25 -05:00
Flashfyre
d8c62b700f Update Eternatus' moveset 2023-12-16 00:46:01 -05:00
Flashfyre
4062cd9380 Fix wrong signature for Deoxys fix 2023-12-15 23:54:22 -05:00
Flashfyre
8781bb29da Move starter screen IV chart to its own component 2023-12-15 23:42:31 -05:00
Flashfyre
5ad16731db Fix crash with Deoxys normal forme sprite 2023-12-15 23:21:42 -05:00
Flashfyre
71fdafe8fb Add egg logic and hatching screen (WiP) and end biome arena BG 2023-12-15 23:07:32 -05:00
Madmadness65
f4ad9546c0 Add relevant move flags
Will be important later once the abilities that interact with these flags are implemented.
2023-12-15 01:46:57 -06:00
Flashfyre
58fba9d966 Add some new biome backgrounds by @Someonealive-QN 2023-12-14 13:50:25 -05:00
Madmadness65
590483f3af Covet can steal too 2023-12-14 12:21:49 -06:00
Flashfyre
dad6401f67 Add evolution pausing and fix visual bug with evolution scene 2023-12-14 12:55:11 -05:00
Madmadness65
fc2665b3f0 Implement type-boosting abilities
This affects Steelworker, Transistor, Dragon's Maw, and Rocky Payload.
2023-12-14 11:52:30 -06:00
Flashfyre
1a4d51d060 Add evolution cancelling 2023-12-14 11:54:56 -05:00
Flashfyre
01a5fe18dd Remove arena tags before a trainer battle or new biome 2023-12-14 09:35:15 -05:00
Flashfyre
c27db5603a Fix Stone Axe failing with max layers 2023-12-14 09:16:41 -05:00
Flashfyre
f47c3e22ce Fix evolution level up moves 2023-12-14 08:55:08 -05:00
Flashfyre
4bad2b46d2 Treat Ultra Beasts as pseudo legendaries 2023-12-14 08:38:09 -05:00
Madmadness65
625359fb39 Add Indigo Disk data
New Pokémon, moves, learnsets, TMs, and evolution data added in various states of completeness. Until graphics are made for the new Pokémon, they cannot be used yet.
2023-12-14 03:03:00 -06:00
Flashfyre
243bfa1624 Add missing Mega Diancie evolution 2023-12-14 01:01:10 -05:00
Flashfyre
47181ea868 Add generation 8 Pokemon and new biomes 2023-12-14 00:41:35 -05:00
Flashfyre
c07df0db99 Add Dudunspare three-segment evolution chance 2023-12-13 19:24:10 -05:00
Madmadness65
f7176109e7 Fix order of evolutions
Hopefully rectified that some were unintentionally impossible to get
2023-12-13 17:39:11 -06:00
Madmadness65
5543d5fe04 Implement Gen 8+9 starter values & evolutions
Most Gen 8 & 9 Pokémon are still not usable yet. However, any cross-generation evolutions can be obtained.
2023-12-13 17:17:16 -06:00
Flashfyre
33b2bd8450 Add sprites and icons for gen 8 and evolutions of past generations 2023-12-13 18:00:48 -05:00
Madmadness65
16a17484f2 Minor Stantler change
It can now learn Psyshield Bash in preparation for it's evolution.
2023-12-13 01:25:17 -06:00
Flashfyre
982e9c7e1e Add generation 7 Pokemon and new biomes 2023-12-12 15:32:50 -05:00
Flashfyre
3da558f2f8 Fix route to Temple biome 2023-12-12 01:01:31 -05:00
Flashfyre
ed800ead28 Add Temple biome 2023-12-12 00:14:30 -05:00
Flashfyre
fa48f6acd5 Add missing level moves and Fairy Cave biome 2023-12-11 23:24:33 -05:00
Flashfyre
34ba66346e Minor fixes 2023-12-11 21:46:49 -05:00
Hyo
052d8ca765 added dialogue for hoenn gym leaders 2023-12-11 17:52:51 -08:00
Madmadness65
30b3b56570 Implement a few more moves
Fully implements Meteor Beam, partially implements Spiky Shield, Dragon Darts, Octolock, and Scale Shot.
2023-12-11 19:09:38 -06:00
Flashfyre
aa15f83ede Add missing TM learnability entries 2023-12-11 13:02:02 -05:00
Madmadness65
9d3b936ade Use the actual ability descriptions
With the implementation of text scrolling in the ability text box, the shortening is no longer necessary.
2023-12-11 11:23:00 -06:00
Flashfyre
7047448382 Add scrolling ability text 2023-12-11 11:09:58 -05:00
Madmadness65
a4f3408c7d Add descriptions to generation 9 abilities
They have also been sufficiently squished to fit within the gen 3 style UI.
2023-12-11 01:41:33 -06:00
Madmadness65
b69e4ccc6b Correct Population Bomb
Used the wrong multi-hit, whoops
2023-12-11 00:19:58 -05:00
Madmadness65
50215d05ec Implement moves with basic functionality 2023-12-11 00:19:58 -05:00
Flashfyre
552bda9840 Implement some abilities 2023-12-10 22:29:13 -05:00
Flashfyre
67f816cff4 Minor refactoring for move conditions 2023-12-10 17:57:12 -05:00
Flashfyre
67ac5d3139 Truncate names in battle info and party UI when too long 2023-12-09 23:41:36 -05:00
Flashfyre
fa94db0939 Implement new movesets and TMs 2023-12-09 20:09:09 -05:00
Flashfyre
79a2f4637c Add logic for evolution-only moves 2023-12-09 10:03:36 -05:00
Flashfyre
e2a6a93209 Rebalance base stat boosters and make max stack count rely on IVs 2023-12-09 00:33:29 -05:00
Flashfyre
d4b620b155 Lower stack limits for base stat boosters and reviver seed 2023-12-08 21:59:03 -05:00
Flashfyre
839d4cec0b Push missed change 2023-12-08 20:26:52 -05:00
Flashfyre
93dd48a742 Fix crash with Florges line 2023-12-08 20:12:09 -05:00
Flashfyre
7c1e82d08c Fix fully evolved species with mega evolutions treated as middle for fusions 2023-12-08 20:02:25 -05:00
Flashfyre
35747c3dd6 Fix Pokemon icon positioning 2023-12-08 19:43:14 -05:00
Flashfyre
d70ddcfe65 Fix crash with Scatterbug and Spewpa 2023-12-08 19:30:30 -05:00
Flashfyre
2c3cf64e70 Fix Tyrunt evolution condition 2023-12-08 18:23:06 -05:00
Flashfyre
d6712f3a39 Fix Binacle evolving to wrong species 2023-12-08 18:19:38 -05:00
Flashfyre
c3244cfdc3 Fix Furfrou sprite names 2023-12-08 18:01:30 -05:00
Flashfyre
e7ec5b4f88 Implement generation 6 Pokemon and some moves 2023-12-08 16:29:03 -05:00
Flashfyre
b29ee1be5e Allow for null user in end of move effect phase 2023-12-08 09:51:45 -05:00
Flashfyre
5441ecbd73 Add logic to space out trainer battles in classic mode 2023-12-08 09:48:03 -05:00
Flashfyre
9a42b05dd6 Update some trainer pools 2023-12-08 08:15:36 -05:00
Flashfyre
890bf47e26 Add logic to better control enemy trainer party member evolutions 2023-12-07 23:10:45 -05:00
Flashfyre
19bea46574 Fix typo 2023-12-07 18:41:55 -05:00
Flashfyre
f671eda029 Fix crash related to mega evolutions 2023-12-07 18:20:41 -05:00
Flashfyre
70827420cd Implement mega evolutions 2023-12-07 17:43:56 -05:00
Flashfyre
fae2c50916 Add endless mode biome weighting 2023-12-07 13:41:47 -05:00
Flashfyre
b7687a9a30 Add gen 6-7 sprites and update icon set 2023-12-07 00:52:20 -05:00
Flashfyre
0e366986b5 Fix bug with catching Pokemon 2023-12-05 23:31:45 -05:00
Flashfyre
0b8ae6f05e Fix bug with evolving fused Pokemon via item 2023-12-05 23:18:34 -05:00
Flashfyre
73de28ea16 Update cry set 2023-12-05 21:00:04 -05:00
Flashfyre
fab2d9b788 Soft implement gen 6-9 species, abilities, and learnsets 2023-12-05 17:12:39 -05:00
Flashfyre
ec2ff480ec Fix crash when EXP charm stack is full 2023-12-04 20:35:33 -05:00
Flashfyre
88bee27694 Implement Future Sight and Doom Desire 2023-12-04 00:09:38 -05:00
Flashfyre
40e5449982 Nerf healing charm from 100% to 25%
Nerf healing charm from 100% to 25%; change shiny item buff to only count when Pokemon has not fainted
2023-12-03 00:28:54 -05:00
Flashfyre
2f6f7c9dc6 Minor fix for spliced names 2023-12-03 00:08:13 -05:00
Flashfyre
839264506b Add shiny indicator to battle info 2023-12-02 23:31:45 -05:00
1goop
d94fdc71ff Implemented more trainer types. - fixed 2023-12-02 20:59:47 -05:00
1goop
620a2b649c More trainer pools implemented. 2023-12-02 20:56:53 -05:00
Flashfyre
374779fdc0 Fix not updating name after regenerating starter for spliced endless 2023-12-02 20:37:51 -05:00
Flashfyre
b1b6a6f1c7 Fix Baton Pass crash 2023-12-02 16:31:10 -05:00
Flashfyre
d66529e96f Remove Golden EXP Charm from master tier pool 2023-12-02 11:55:15 -05:00
Flashfyre
fbcd372068 Refactor logic for summons and returns 2023-12-02 10:30:23 -05:00
1goop
5ec3991cb3 Implemented some trainer pools. 2023-12-02 01:12:32 -05:00
Flashfyre
167fb5110b Fix fusion types not factoring into damage 2023-12-01 18:23:51 -05:00
Flashfyre
ab344cd82a Add starter values with limit and add generated fusion names 2023-12-01 17:23:26 -05:00
Flashfyre
b2d7895c7b Add spliced type sharing and fix move description scrolling 2023-12-01 10:07:21 -05:00
Flashfyre
f3ed8e925e EXP Charm balancing for endless mode 2023-12-01 08:57:10 -05:00
Flashfyre
d5731eaa69 Remove duplicate move 2023-11-30 19:38:54 -05:00
Flashfyre
333847f25e Nerf coin case item 2023-11-30 16:53:34 -05:00
Flashfyre
e8b82d2d55 Soft implement gen 6-9 moves 2023-11-30 16:37:16 -05:00
Flashfyre
97956dee50 Update Eternatus icons to smaller version 2023-11-28 23:05:35 -05:00
Flashfyre
ad9d8a8507 Add Annihilape with Rage Fist move 2023-11-28 21:35:52 -05:00
Flashfyre
233e33bbed Rename High EXP Charm to Super EXP Charm 2023-11-28 18:45:14 -05:00
Flashfyre
12dbdf2522 Add High EXP Charm for balance update 2023-11-28 18:21:29 -05:00
Flashfyre
58b6ecd2bf Offset EXP charms in endless modes 2023-11-28 17:50:15 -05:00
Flashfyre
1d31105de5 Rebalance EXP charms 2023-11-28 16:59:40 -05:00
Flashfyre
da4896362c Fix Shell Smash excluding speed effect 2023-11-28 15:19:30 -05:00
Flashfyre
d2a1eea802 Complete list of reverse compatible TMs 2023-11-28 14:42:28 -05:00
Flashfyre
8345eaef5a Fix TM compatibility for certain moves being reversed 2023-11-28 14:37:45 -05:00
Flashfyre
4355ebd375 Fix switch out move logic 2023-11-28 08:43:21 -05:00
Hyun Ahn
07f82dfcac
Implement solarpower (#10)
* Implement solarpower

* Fix after review

* Fix after review

* Update src/data/ability.ts

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
2023-11-28 08:20:10 -05:00
Flashfyre
1040b2f1d7 Fix incorrect operator used for ability weather damage formula 2023-11-28 08:15:50 -05:00
Hyun Ahn
3e8b047cbd
implement_sand_rush_ability (#9)
* implement_sand_rush_ability

* after review fix

* Update src/data/ability.ts

---------

Co-authored-by: Samuel H <flashfireex@gmail.com>
2023-11-27 22:34:19 -05:00
Hyun Ahn
7f30cc1d37 implement_hustle_ability 2023-11-27 20:58:01 -05:00
Flashfyre
2fcd7e20fa Fix recharging moves causing a crash 2023-11-27 13:47:32 -05:00
Flashfyre
c34eb05083 Fix counter and mirror coat implementation 2023-11-27 11:42:03 -05:00
Flashfyre
21c8a67b10 Change perfect IVs achievement condition 2023-11-27 08:46:59 -05:00
Flashfyre
75904470d3 Fix some bugs related to double battles 2023-11-26 22:22:05 -05:00
Flashfyre
1ac9f239b7 Fix multiple line enemy modifiers covering wave count 2023-11-26 10:00:58 -05:00
Flashfyre
1e2bd0dbb9 Minor change to sprite shader 2023-11-26 09:53:16 -05:00
Flashfyre
cbcf874ffc Change Memory Mushroom move list to exclude duplicate moves 2023-11-25 16:17:58 -05:00
Flashfyre
e1768bfc80 Fix issue with double battle position logic 2023-11-25 16:02:47 -05:00
Flashfyre
6dbe475784 Fix crash bug with double battles 2023-11-25 15:53:38 -05:00
Flashfyre
39f6eb4de6 Decrease rarity of DNA splicers in spliced endless mode 2023-11-25 14:43:26 -05:00
Hyun Ahn
11fb22ae88
rain to none (#7) 2023-11-25 18:21:27 +09:00
Hyun Ahn
0c5e451606 hyun/imple_slush_rush 2023-11-24 22:25:51 -05:00
Hyun Ahn
62a070239b
Hyun/weather_override (#4)
* weather_override

* move weather override
2023-11-24 22:25:09 -05:00
Flashfyre
1a9c492a79 Fix infinite EXP bug 2023-11-24 16:27:26 -05:00
Flashfyre
e5fe0c6e3a Add transform support to fusion palette swaps 2023-11-24 15:12:26 -05:00
Flashfyre
5fc5f5b499 Factor back sprites into fusion palette generation 2023-11-24 12:11:50 -05:00
Flashfyre
3b72878e47 Fix fusion palette swaps not showing on evolution screen 2023-11-24 09:19:18 -05:00
Flashfyre
8ad08edd53 Fix level up moves not working for spliced Pokemon 2023-11-24 08:31:52 -05:00
Flashfyre
0f3ecbae12 Fix incorrect achievement value for Hard Hitter achievement 2023-11-24 07:06:19 -05:00
Flashfyre
4d02432606 Add palette swaps for fusions 2023-11-23 23:52:13 -05:00
Flashfyre
06943ac5dc Change spliced endless mode unfused penalty to base stats 2023-11-22 18:43:31 -05:00
Flashfyre
ab70f78a8f Halve stats when unspliced in spliced endless mode 2023-11-22 15:36:39 -05:00
Flashfyre
d6617957be Fix status effects from moves always overriding 2023-11-21 14:11:13 -05:00
Flashfyre
85866169ac Implement encore move 2023-11-16 00:58:57 -05:00
Flashfyre
23c2b4fc63 Fix trainer bug with not summoning and defer summons to before next turn 2023-11-15 18:45:10 -05:00
Flashfyre
2655828fb9 Fix issues with caught Pokemon IVs not propogating and spliced endless mode not unlocking 2023-11-14 23:52:58 -05:00
Flashfyre
16b580451c Add IV display on starter screen 2023-11-13 22:29:03 -05:00
Flashfyre
83b85acd8a Fix logic for checking starter attributes 2023-11-13 08:20:31 -05:00
Flashfyre
b4f2700a59 Rework dex system and add starter IVs 2023-11-12 23:47:04 -05:00
Flashfyre
4f6f17e63e Fix Lv1000 achievement set to Lv100 2023-11-12 22:45:34 -05:00
Flashfyre
9f17273d87 Add IV Scanner item 2023-11-12 12:49:06 -05:00
Flashfyre
9a6dc06a12 Add some additional achievements and rebalanced points 2023-11-12 09:27:50 -05:00
Flashfyre
c2b5135627 Fix display issue with unlocked hidden achievements 2023-11-12 00:55:13 -05:00
Flashfyre
729b70c6a6 Minor changes to menu controls 2023-11-12 00:34:36 -05:00
Flashfyre
cbbb8e972b Add achievement system and UI
Add achievement system and UI; fix counting invalid inputs in UI handlers for input delay
2023-11-12 00:31:40 -05:00
Flashfyre
ff93e6233f Add back bgm pending remove checks 2023-11-11 21:04:20 -05:00
Flashfyre
2987c8ec93 Undo rename of grip claw modifier class due to corrupting old data 2023-11-10 21:30:11 -05:00
Flashfyre
a113db5e3f Add various money-related modifiers
Add various money-related modifiers; change grip claw to work with all attacks
2023-11-10 21:11:36 -05:00
Flashfyre
55a61158cf Update Phaser version 2023-11-10 16:41:02 -05:00
Flashfyre
83fae68abf Add rerolling modifiers for money and fix field UI layering issues 2023-11-10 15:51:34 -05:00
Flashfyre
5a88344173 Fix trainer random Pokemon always first evolution 2023-11-09 08:27:17 -05:00
Flashfyre
f0055048ed Fix showing level moves in blue instead of spliced moves 2023-11-08 23:37:12 -05:00
Flashfyre
1236cb948d Add shared movesets for spliced Pokemon 2023-11-08 22:30:22 -05:00
Flashfyre
d0a60a7f86 Adjust fusion evolutions for starters 2023-11-08 18:36:30 -05:00
Flashfyre
2257d8d2f2 Add memory mushroom item for remembering moves 2023-11-08 17:30:07 -05:00
Flashfyre
c62cb27cdb Reimplement one-hit KO effect 2023-11-07 22:23:42 -05:00
Flashfyre
5fa7921e41 Fix additional cases of missing form data causing crash 2023-11-07 21:05:27 -05:00
Flashfyre
39a458cb3a Don't allow instant revivals for a one hit KO move 2023-11-07 20:02:42 -05:00
Flashfyre
fdc1bc5b61 Fix issues with item transfer and add scrolling 2023-11-07 18:43:48 -05:00
Flashfyre
66bd547d6c Fix crash with concurrent duplicate cries 2023-11-07 17:41:31 -05:00
Flashfyre
79c5b3d4f3 Inherit shininess from splices 2023-11-05 23:48:04 -05:00
Flashfyre
28f8fdfdc1 Implement unaware ability 2023-11-05 23:27:40 -05:00
Flashfyre
cc27913728 Fix opponent post-summon ability triggers happening twice in trainer battles 2023-11-05 22:44:49 -05:00
Flashfyre
52039849ac Fix faint cry using wrong form index 2023-11-05 22:32:08 -05:00
MonkehestMan
bb4f35095d Contrary + Simple implemented 2023-11-06 16:11:38 +13:00
Flashfyre
467049dfa0 Add increasing chance of a boss on any wave in endless after wave 250 2023-11-05 20:34:32 -05:00
Flashfyre
446d00b4cd Rework token modifiers in endless mode (WiP) 2023-11-05 10:56:09 -05:00
Flashfyre
bd8fa9811f Add fix for missing form data in dex 2023-11-04 23:09:46 -04:00
Flashfyre
49a2231245 Fix bug with summoning fainted Pokemon in double battles 2023-11-04 22:08:05 -04:00
Flashfyre
4f91c47168 Add option to not show level up stats 2023-11-04 21:53:38 -04:00
Flashfyre
7e5615c1bb Change Giovanni to a dark type gym leader 2023-11-04 20:12:16 -04:00
Flashfyre
b85bb0916d Add spliced endless mode and splice indicator 2023-11-04 19:46:48 -04:00
Flashfyre
e07339e3eb Add DNA splicers and Pokemon fusing 2023-11-04 00:32:12 -04:00
Flashfyre
0d108fb581 Update sprite set and add missing forms 2023-11-02 13:52:05 -04:00
Flashfyre
4702ef7737 Add tooltips for modifiers 2023-11-02 00:55:20 -04:00
Flashfyre
9865a48332 Fix duplicate modifier length 2023-11-01 11:06:16 -04:00
Flashfyre
ccb0245889 Fix freeze on catching Pokemon 2023-11-01 10:38:54 -04:00
Flashfyre
74f6e9a8f2 Update modifier bar display to avoid clutter and improve performance 2023-10-31 21:43:22 -04:00
Flashfyre
c3734112b3 Fix issues with enemy buff modifiers and freeze on failing a hit 2023-10-31 17:38:44 -04:00
Flashfyre
94af842146 Fix revive tokens not stacking 2023-10-31 14:47:12 -04:00
Flashfyre
4b59097a85 Fix revive tokens not working 2023-10-31 14:44:10 -04:00
Flashfyre
ca4f9297a8 Implement switch moves 2023-10-31 14:09:33 -04:00
Flashfyre
7d75bffab4 Fix issue with generating enemy forms 2023-10-30 14:57:23 -04:00
Flashfyre
afc1f81e30 Don't allow double battle for final boss fight 2023-10-30 12:47:06 -04:00
Flashfyre
1ae54de59e Fix multi-hit move implementation 2023-10-30 12:33:20 -04:00
Flashfyre
179d1bcb13 Implement Pressure ability 2023-10-30 00:16:23 -04:00
Flashfyre
3e092876ad Add shiny indicators to starter screen 2023-10-29 23:36:29 -04:00
Flashfyre
c0a5d86ab1 Fix issue with hidden abilities 2023-10-29 23:11:30 -04:00
Flashfyre
2c17efca9b Implement hidden abilities and ability charm 2023-10-29 22:18:02 -04:00
Flashfyre
d503834758 Chance enemy buff modifier stack count back to 5 2023-10-29 18:01:18 -04:00
Flashfyre
98cade0835 Update enemy buff modifiers 2023-10-29 17:58:54 -04:00
Flashfyre
840d032aa7 Don't apply Golden Pokeball towards enemy buffs 2023-10-29 16:15:18 -04:00
Flashfyre
5567b39f20 Add enemy buffs to balance endless mode 2023-10-29 16:05:17 -04:00
Flashfyre
cb62d79280 Fixing cancelling attack when switching your 2nd Pokemon in a double battle 2023-10-29 01:35:12 -04:00
Flashfyre
813b4894f3 Implement Transform move and Imposter ability 2023-10-29 01:28:56 -04:00
Flashfyre
e3368b79e5 Fix shiny odds not working properly 2023-10-28 22:08:06 -04:00
Flashfyre
e0a63a9ed6 Fix crash with playing battle animation for target not on field 2023-10-28 21:03:36 -04:00
Flashfyre
06740130b9 Fix confusion turns 2023-10-28 20:37:02 -04:00
Flashfyre
8651099d04 Change Shiny Charm max stack count back to 5 2023-10-28 20:33:51 -04:00
Flashfyre
8f0fcf736b Change Shiny Charm formula 2023-10-28 19:20:37 -04:00
Flashfyre
ce84ae2f69 Lower max Shiny Charm stack count to 4 2023-10-28 18:55:07 -04:00
Flashfyre
989e4b37f4 Fix negative EXP level cap bug 2023-10-28 18:38:22 -04:00
Flashfyre
f831f3ab75 Remove extreme weather conditions from natural weather 2023-10-28 17:59:49 -04:00
xDasone
95f645dd23 Merge branch 'main' of https://github.com/Flashfyre/pokemon-rogue-battle 2023-10-28 14:37:17 -07:00
xDasone
8bad05ea97 Fixed Huge Power, and Pure Power not giving the correct boost 2023-10-28 14:37:00 -07:00
Flashfyre
d1c58224bc Add base logic for enemy buff modifiers 2023-10-28 13:24:57 -04:00
Flashfyre
ae6d4d0ea0 Don't boost enemy trainer shiny odds with shiny charm 2023-10-28 10:51:34 -04:00
Flashfyre
1a488d421c Fix Psywave causing decimal damage 2023-10-28 00:36:41 -04:00
Flashfyre
d6ee340c59 Minor changes and fixes 2023-10-28 00:18:44 -04:00
Flashfyre
29b0f046a6 Lower Berry Pouch cap to 3 2023-10-27 23:18:18 -04:00
Flashfyre
62f464c81c Change one-hit KO moves to just do 250 power on final boss 2023-10-27 22:25:48 -04:00
Flashfyre
57f869cf61 Change rest to override status 2023-10-27 22:18:54 -04:00
Flashfyre
cf6f30ccca Fix trainer pools not evolving Pokemon 2023-10-27 22:04:09 -04:00
Flashfyre
e0a7e88c17 Fix high priority on Giga Drain instead of Endure 2023-10-27 20:30:57 -04:00
Flashfyre
9684eb2be0 Fix being able to run in the end biome 2023-10-27 19:56:15 -04:00
Flashfyre
2a7ebaf89e Fix crash in double battles with target selection 2023-10-27 19:34:55 -04:00
Flashfyre
cc435284ec Update implementation of Pokeball and run commands 2023-10-27 17:43:53 -04:00
Flashfyre
970d014bfd Fix issue with generating enemy modifiers 2023-10-27 16:20:51 -04:00
Flashfyre
de126dc35c Add Struggle logic 2023-10-27 08:45:47 -04:00
xDasone
36b030d019 Implemented Frustration, and Return Damage Calcs 2023-10-26 22:03:24 -07:00
xDasone
1d8cf50f1b Implemented Anger Point Ability 2023-10-26 21:12:53 -07:00
Flashfyre
1b47741ca5 Fix revive not working on Pokemon with 1 max HP 2023-10-26 22:01:25 -04:00
Flashfyre
e4c79084f2 Don't show level cap coloring for enemy Pokemon 2023-10-26 21:51:24 -04:00
Flashfyre
6c9b27a232 Update enemy level formula for endless mode 2023-10-26 21:42:53 -04:00
Flashfyre
d54a4be7b4 Implement Adaptability ability 2023-10-26 20:02:30 -04:00
Flashfyre
c958c4f074 Fix not healing after 10 battles 2023-10-26 19:45:35 -04:00
Flashfyre
634d93b989 Fix playing evolution BGM twice 2023-10-26 19:31:08 -04:00
Flashfyre
d4d6931512 Fix healing after every wave in endless mode 2023-10-26 19:07:41 -04:00
Flashfyre
d3f55ad4ae Add game settings 2023-10-26 16:33:59 -04:00
Flashfyre
23a21af173 Update Vite and add sound for item rewards 2023-10-25 23:15:54 -04:00
Flashfyre
c0e1c3bde7 Add missing gym leader for City biome 2023-10-25 17:38:21 -04:00
Flashfyre
0ac853eba2 Add Pokerus and give only Golden EXP Charms until wave 40 2023-10-25 14:15:44 -04:00
Flashfyre
e0acb1e737 Fix Disable implementation 2023-10-25 09:41:37 -04:00
Flashfyre
1fd5f6c01f Fix issues with held item transfer 2023-10-25 09:12:39 -04:00
Flashfyre
8ae78fcd05 Add growth rate to starter select screen 2023-10-24 23:04:23 -04:00
Flashfyre
a53dc0f025 Average out growth rates 2023-10-24 19:39:34 -04:00
Flashfyre
610218fe16 Clone modifiers when getting Shedinja 2023-10-24 18:44:38 -04:00
Flashfyre
50cbad3af3 Add icons for Mega Rayquaza and Eternamax Eternatus 2023-10-24 15:17:41 -04:00
Flashfyre
0ab7f1b018 Fix logic issues with item stealing 2023-10-24 11:07:09 -04:00
Flashfyre
10733fd98d Fix various issues with enemy modifiers 2023-10-24 10:05:07 -04:00
Flashfyre
d135591b75 Fix crash when playing weather animation before a trainer battle 2023-10-24 08:34:52 -04:00
Flashfyre
1fd342aa11 Add back party heal to endless mode 2023-10-24 00:31:09 -04:00
Flashfyre
653f3639c3 Update boss to Eternamax Eternatus 2023-10-23 23:20:05 -04:00
Flashfyre
3bee719026 Fix being able to steal non transferrable items 2023-10-23 22:23:18 -04:00
Flashfyre
3ebf42705e Fix EXP. Share using wrong icon 2023-10-23 19:27:12 -04:00
Flashfyre
bb487373ab Rework EXP. Share and rename to EXP. All 2023-10-23 17:47:05 -04:00
Flashfyre
2001dd780b Update enemy modifier rates and update trainer modifier display 2023-10-23 13:48:56 -04:00
Flashfyre
00f7bc595b Fix biome selection causing bgm-related crash 2023-10-23 09:00:23 -04:00
Flashfyre
d3323aadce Fix checking wrong party for non fainted enemy party members 2023-10-23 08:44:04 -04:00
Flashfyre
a22caa5106 Increase chances of evolution items 2023-10-23 00:04:42 -04:00
Flashfyre
e09f881cd4 Change gym leader and trainer frequency 2023-10-22 23:31:41 -04:00
Flashfyre
ae795e0e6e Fix enemy trainers staying on screen 2023-10-22 22:45:48 -04:00
Flashfyre
08364d9060 Fix reviver seed causing infinite loop and clear status on revive 2023-10-22 10:41:49 -04:00
Flashfyre
e0065fca7c Fix issues with Pokemon sprites persisting after some moves 2023-10-22 10:13:03 -04:00
Flashfyre
7c5d7074ec Fix Skyla using water types 2023-10-21 22:30:32 -04:00
B1bbs
f2e001ead1 Implement pain split 2023-10-21 20:40:46 -05:00
Flashfyre
96a154f5e0 Add Pokemon heal function 2023-10-21 20:52:19 -04:00
Flashfyre
7dbf3f62da Add money (currently unused) and fix issue with reward modifiers not persisting 2023-10-21 20:23:43 -04:00
Flashfyre
8222d67408 Prevent trainer battles on the first wave of a new biome 2023-10-21 09:00:42 -04:00
Flashfyre
96a15ccb0d Adjust game volume 2023-10-21 08:58:39 -04:00
Flashfyre
c2cb433409 Fix crash from accessing modifier types before initialization 2023-10-20 23:00:08 -04:00
Flashfyre
ec6a3644a2 Fix issue with trainer modifier rewards not persisting 2023-10-20 22:48:40 -04:00
B1bbs
327ad44923 Ignore unimplemented tms 2023-10-20 20:49:04 -05:00
B1bbs
5e08a5cf83 Implement endeavor 2023-10-20 20:30:28 -05:00
Flashfyre
6de5e7ebc6 Fix crash when generating trainer party member 2023-10-20 19:07:47 -04:00
Flashfyre
678a76394a Update breeder and ace trainer party templates 2023-10-20 17:22:07 -04:00
Flashfyre
84b487e719 Update random evolution logic 2023-10-20 16:55:46 -04:00
Flashfyre
c778ef5e36 Add Mega Rayquaza (static sprite) 2023-10-20 14:19:22 -04:00
Flashfyre
e604d75436 Set pool for youngster/lass trainer type 2023-10-20 11:48:19 -04:00
Flashfyre
988438cc81 Add gym leaders, elite four, and champions
Add gym leaders, elite four, and champions; add modifier rewards for initial rival battle
2023-10-20 11:38:41 -04:00
Flashfyre
f5a2723d3d Increase Golden EXP Charm boost from 50% to 75% 2023-10-19 23:15:42 -04:00
Flashfyre
59767c7607 Attempt fixing crash when getting EXP value 2023-10-19 22:54:19 -04:00
Flashfyre
6ab6360ec9 Add 1.5x EXP bonus for trainer battles 2023-10-19 22:41:00 -04:00
Flashfyre
245d07b307 Fix seed not resetting every run 2023-10-19 22:19:14 -04:00
Flashfyre
e54632007d Change initial scripted trainer battle waves 2023-10-19 22:01:12 -04:00
Flashfyre
eab6d082fd Add command cancelling and 2nd battler move memory 2023-10-18 23:16:38 -04:00
Flashfyre
83c70889fc Implement trainer battles and various changes
Implement trainer battles; add dialogue functionality; add random session seed for predictable random results; remove capitalization from text; add full party heal after every 10 waves
2023-10-18 18:01:15 -04:00
Flashfyre
75bd40863e Add construction site and jungle biomes 2023-10-09 23:43:19 -04:00
Flashfyre
6d73d71608 Add more logic for trainers (WiP) and various changes
Add WiP logic for trainer Pokemon pools and biome trainer pools; add more music tracks; fix issue with implementation of Mimic move
2023-10-09 20:20:02 -04:00
Flashfyre
5d5c8318fd Balance changes for potion and golden EXP charm 2023-10-09 16:57:25 -04:00
Flashfyre
48797cb20f Add WiP trainer logic 2023-10-07 16:08:33 -04:00
Flashfyre
798f6cc53f Add quicker party member EXP display and fix some minor bugs 2023-10-04 17:24:28 -04:00
Flashfyre
46c31f9595 Add scaling level cap and party switch option after load
Add scaling level cap and party switch option after load; update Phaser to newest beta version
2023-10-03 12:50:31 -04:00
Flashfyre
e633ff1577 Remove logic that makes all status moves 100 accuracy 2023-07-28 10:23:37 -04:00
Flashfyre
6804476a3c Fix some move target issues 2023-07-11 11:32:56 -04:00
Flashfyre
5c1251a616 Re-arrange some elements in party UI 2023-07-10 11:21:05 -04:00
Flashfyre
5a706649db Fix sacrificial move effect order 2023-07-10 10:54:22 -04:00
Flashfyre
d1e9d817aa Updates to certain modifiers for balance 2023-07-06 19:47:52 -04:00
Flashfyre
7cca86e082 Fix name casing for starter unlocks 2023-07-05 22:56:12 -04:00
Flashfyre
38f4da7445 Minor changes to double battles for stability 2023-07-05 22:33:27 -04:00
Flashfyre
3afd43375a Attempt fixing some issues with move effects 2023-07-05 22:23:50 -04:00
Flashfyre
68282d28da Fix implementation of level damage moves 2023-07-05 16:25:09 -04:00
Flashfyre
a005c7c850 Fix crash when returning shiny 2023-07-05 16:13:00 -04:00
Flashfyre
4b61e50d72 Add starters for evolved Pokemon 2023-07-05 14:19:49 -04:00
Flashfyre
4e253862fc Lower shiny charm rate boost 2023-07-05 13:53:28 -04:00
Flashfyre
f2c35e36ef Add failsafe for held item on nonexistent Pokemon 2023-07-05 13:03:51 -04:00
Flashfyre
2ec0c32487 Fix variable move accuracy not working with guaranteed hits 2023-07-05 12:10:23 -04:00
Flashfyre
7cd45b30eb Fix crash when encountering a shiny 2023-07-05 11:54:36 -04:00
Flashfyre
d556f5aca1 Add extra information to party screen 2023-07-05 00:29:22 -04:00
Flashfyre
106d3298a2 Add TM learnability indicator when learning TM 2023-07-04 23:11:31 -04:00
Flashfyre
46b32976ff Fix logic to prevent the first battle being a double 2023-07-04 20:07:05 -04:00
Flashfyre
10b49b5dcb Fix crashing on faint in double battles 2023-07-04 18:27:07 -04:00
Flashfyre
2cb718de94 Fix crash on returning to single battle 2023-07-04 18:06:12 -04:00
Flashfyre
e46bb9fd50 Rework post summon logic 2023-07-04 17:50:51 -04:00
Flashfyre
1e8798b708 Make type immunity abilities block status moves 2023-07-04 16:47:23 -04:00
Flashfyre
e1b64e0623 Fix Salac berry raising the wrong stat 2023-07-04 16:35:40 -04:00
Flashfyre
9212d3642a Move weather effects to the end of the turn 2023-07-04 16:16:50 -04:00
Flashfyre
64da443fa6 Fix issues with logic related to AI targeting and types 2023-07-04 15:25:11 -04:00
Flashfyre
05fe3b899c Fix logic for fake out move 2023-07-04 13:04:58 -04:00
Flashfyre
a7aa639bb2 Change accuracy ignore moves to only apply to the original target 2023-07-04 12:59:58 -04:00
Flashfyre
969d54dd2e Fix crash for edge case with double battles 2023-07-04 12:51:28 -04:00
Flashfyre
9e0a8a3030 Fix hanging after catching Pokemon without releasing 2023-07-03 10:59:56 -04:00
Flashfyre
23de25d585 Implement nineslice for some UI windows 2023-06-16 12:13:52 -04:00
Flashfyre
cb2c77542d Add ruins background 2023-06-06 11:09:34 -04:00
Flashfyre
f7ca13d96e Fix crashing issues 2023-06-06 10:14:53 -04:00
Flashfyre
ffa4c60011 Add reviver seed item (untested) 2023-06-06 08:16:07 -04:00
Flashfyre
59c63234a5 Add abyss background 2023-06-05 23:25:17 -04:00
Flashfyre
6b1f96e0c1 Fix issues with shader code 2023-06-05 23:01:00 -04:00
Flashfyre
da8629164e Fix some bugs 2023-06-05 11:39:49 -04:00
Flashfyre
0cc87b4ba0 Add sprite shadows and update engine 2023-06-04 21:47:43 -04:00
Flashfyre
1b5e757731 Fix name and icon for max lure item 2023-06-02 23:40:41 -04:00
Flashfyre
bf2eca2851 Add shader for sprite tone 2023-06-02 18:33:51 -04:00
Flashfyre
3fc830f401 Fix some bugs related to double battles 2023-06-02 11:41:08 -04:00
Flashfyre
105b5cd510 Fix some bugs and add factory bg 2023-06-01 13:54:52 -04:00
Flashfyre
7e0974a6c2 Add lure items 2023-06-01 11:22:34 -04:00
Flashfyre
9faa489f19 Add endless mode
Add endless mode; prevent stat booster items from being transferred or stolen
2023-05-31 19:54:57 -04:00
Flashfyre
ac9814e665 Fix issues with targeting 2023-05-31 15:04:03 -04:00
Flashfyre
47fd9985c8 Fix some bugs with double battle switching 2023-05-31 12:38:55 -04:00
Flashfyre
95f35fd2f7 Fix post turn abilities running exponentially 2023-05-31 11:20:06 -04:00
Flashfyre
890d8bc531 Fix plains arena background not working 2023-05-31 10:33:20 -04:00
Flashfyre
b9ac3be0bc Add new backgrounds 2023-05-31 10:21:38 -04:00
Flashfyre
cde5fe45b0 Attempt fixing new biome double battle visual bug 2023-05-30 12:15:59 -04:00
Flashfyre
1cf21a994b Add wasteland background 2023-05-30 10:21:09 -04:00
Flashfyre
2dd3c273ab Add new mountain background 2023-05-30 09:46:42 -04:00
Flashfyre
85c2ca718a Add Wonder Guard HP exception 2023-05-29 13:25:36 -04:00
Flashfyre
516c8c6d13 Fix EXP based on your own side 2023-05-29 12:24:38 -04:00
Flashfyre
683c1f660e Fix crash with multi-hit moves when target faints 2023-05-29 11:39:47 -04:00
Flashfyre
ab5f66f11c Minor changes 2023-05-23 10:44:33 -04:00
Flashfyre
5c7b2ccecc Fix some minor bugs 2023-05-19 16:13:11 -04:00
Flashfyre
2c4a90bf1c Fix crash with common animations 2023-05-19 13:02:58 -04:00
Flashfyre
b0112c5acb Fix issue with battle continuing after enemy faint 2023-05-19 12:35:06 -04:00
Samuel H
b9f7ba173d
Implement Double Battles (#1)
* Add WiP logic for double battles

* Minor changes for double battles

* More fixes for double battles

* Show battle info for both in double battles

* Improvements to double battles

* Add double battle version of party UI

* Fix some issues with double battles

* Updates to double battles

* More work on double battles for stability

* Fix issues with ability bar and evolution screen

* Add chance for double battles
2023-05-18 11:11:06 -04:00
Flashfyre
e2d6890072 Add Ice Cave background 2023-05-15 08:45:26 -04:00
Flashfyre
0757fd88a4 Add new backgrounds 2023-05-11 12:16:10 -04:00
Flashfyre
ceeb2efd0a Add badlands BG and update sea BG 2023-05-11 10:31:39 -04:00
Flashfyre
9f28a067cd Use weight 0 for modifiers when stack is maxed 2023-05-09 15:01:27 -04:00
Flashfyre
930b960374 Increase EXP max level to 10000
Increase EXP max level to 10000; add new battle BGs and random props for enemy side
2023-05-09 12:43:28 -04:00
Flashfyre
b82d3a55e4 Implement some moves 2023-05-08 18:48:35 -04:00
Flashfyre
66cd02fc30 Add beach and city backgrounds 2023-05-08 10:03:57 -04:00
Flashfyre
40e69789c8 Add run logic and forest background 2023-05-07 17:05:19 -04:00
Flashfyre
fda8e6055a Fix typo in move setting logic 2023-05-06 17:31:45 -04:00
Flashfyre
c88828548c Implement some abilities 2023-05-06 12:13:35 -04:00
Flashfyre
15cfd3bad4 Add color change ability, some moves, and fix mimic 2023-05-06 00:42:01 -04:00
Flashfyre
45f73cc6ed Add missing import 2023-05-05 22:05:26 -04:00
Flashfyre
095d98a8cb Implement some moves 2023-05-05 18:20:55 -04:00
Flashfyre
d53959e0a9 Add Grip Claw item and fix evolution logic bug 2023-05-05 16:55:46 -04:00
Flashfyre
f33ee493bd Fix random wild evolution logic 2023-05-04 20:47:41 -04:00
Flashfyre
4423f79b66 Attempt fixing crash 2023-05-04 16:38:56 -04:00
Flashfyre
2cafe0bd76 Add TM tiers 2023-05-04 15:55:18 -04:00
Flashfyre
c25b2332f2 Implement some abilities 2023-05-04 14:06:31 -04:00
Flashfyre
d1d65708ce Implement some abilities and attract move 2023-05-04 12:57:55 -04:00
Flashfyre
884c5cc40f Add weather change abilities 2023-05-04 10:25:11 -04:00
Flashfyre
85caa97b72 Fix escape characters in charge move text 2023-05-03 18:58:07 -04:00
Flashfyre
230b582b66 Count all hits for multi hit moves 2023-05-03 00:00:21 -04:00
Flashfyre
5413fd5c9c Fix stack overflow 2023-05-02 22:27:04 -04:00
Flashfyre
c49bac094f Attempt fixing stack overflow 2023-05-02 20:53:06 -04:00
Flashfyre
76ceed52a3 Fix levitate ability effect 2023-05-02 16:58:18 -04:00
Flashfyre
dafe502b3c Implement some abilities 2023-05-02 15:56:41 -04:00
Flashfyre
60f191e60d Add battler stat multiplier ability attribute 2023-05-02 00:11:31 -04:00
Flashfyre
f6c7a2906d Add crit block abilities and fix some common anims 2023-05-01 22:07:00 -04:00
Flashfyre
bfc26970f0 Add move targets for proper animation target 2023-05-01 14:41:44 -04:00
Flashfyre
f9c895c0cd Fix charge animation targeting issue 2023-05-01 10:53:52 -04:00
Flashfyre
064cf9588e Add factory biome 2023-05-01 01:00:46 -04:00
Flashfyre
fe298c39e2 Add tall grass BG and fix a hanging bug with charge moves 2023-04-30 23:58:16 -04:00
Flashfyre
b1be0da013 Implement thief move 2023-04-30 19:05:47 -04:00
Flashfyre
6e6d54cbbb Add some new battle backgrounds 2023-04-30 18:08:22 -04:00
Flashfyre
f98a271ca0 Battle background updates 2023-04-30 11:38:46 -04:00
Flashfyre
c6d9816318 Fix some bugs 2023-04-30 00:51:33 -04:00
Flashfyre
fc4f98b203 Add finished custom swamp arena BG and resize others 2023-04-29 23:29:02 -04:00
Flashfyre
3fc213bc73 Prevent using Pokeballs in the last biome 2023-04-29 16:26:09 -04:00
Flashfyre
842ea5af40 Initially lock Mini Black Hole item 2023-04-29 01:40:24 -04:00
Flashfyre
16fbe971f6 Fix summary next level EXP showing incorrectly 2023-04-28 19:56:11 -04:00
Flashfyre
2b95d4ce51 Add Baton modifier 2023-04-28 19:26:41 -04:00
Flashfyre
140e759486 Repurpose Oval Charm for multiple participant EXP bonus 2023-04-28 16:35:03 -04:00
Flashfyre
a2ecb4089d Add session save data 2023-04-28 15:03:42 -04:00
Flashfyre
fcd711673d Fix some bugs 2023-04-28 00:25:33 -04:00
Flashfyre
14ba169ea5 Add ignore accuracy move attribute 2023-04-27 20:12:25 -04:00
Flashfyre
2062d44026 Add Wonder Guard ability and remove test code 2023-04-27 14:56:30 -04:00
Flashfyre
005cc9b7d5 Add more abilities and move contact flag 2023-04-27 14:30:03 -04:00
Flashfyre
18679241e9 Add ability bar UI 2023-04-27 01:14:15 -04:00
Flashfyre
c614295b5e Begin implementing abilities 2023-04-26 23:33:13 -04:00
Flashfyre
f790a5ff2a Add map item for selecting biome 2023-04-26 19:19:39 -04:00
Flashfyre
998972e12b Add end biome and set final wave at 200 2023-04-26 17:40:08 -04:00
Flashfyre
55ba3cd5e7 Add Xerneas, Yveltal, and Eternatus 2023-04-26 16:07:29 -04:00
Flashfyre
592ccc7c6a Add starter select ability selection 2023-04-26 12:50:21 -04:00
Flashfyre
bb86ab6250 Fix ability description text wrapping improperly 2023-04-26 00:16:00 -04:00
Flashfyre
714e6408f5 Make music tracks loop seamlessly 2023-04-25 23:56:38 -04:00
Flashfyre
9056104bd1 Rework battle animation system 2023-04-25 19:24:59 -04:00
Flashfyre
a148ecab80 Add King's Rock and more berry types 2023-04-25 01:32:48 -04:00
Flashfyre
3753ea73be Fix some bugs 2023-04-24 22:32:12 -04:00
Flashfyre
842e2707a1 Minor battle animation changes 2023-04-24 19:46:02 -04:00
Flashfyre
4a595db3ef Fix some issues with battle animations 2023-04-24 17:26:08 -04:00
Flashfyre
92c8583129 Refactor move attribute logic and add arena trap moves 2023-04-24 14:30:21 -04:00
Flashfyre
77b3f136dd Fix hanging when move has no effect 2023-04-24 00:38:28 -04:00
Flashfyre
c1e048e9af Add Focus Band item 2023-04-23 21:31:06 -04:00
Flashfyre
e7c0c1abd4 Add some minor details to summary screen 2023-04-23 19:41:32 -04:00
Flashfyre
ebdfb7b4cb Add items and ability to summary 2023-04-23 18:40:21 -04:00
Flashfyre
db5db61272 Add stats screen to summary 2023-04-23 16:36:03 -04:00
Flashfyre
4e6164943c Add PP to move summary 2023-04-23 15:13:21 -04:00
Flashfyre
707e3556d0 Add rarer candy and candy jar items 2023-04-23 12:35:16 -04:00
Flashfyre
4f8a1621d8 Remove boss at level over 100 logic 2023-04-23 10:42:00 -04:00
Flashfyre
7c291ce0cf Re-implement mini black hole item 2023-04-23 10:24:22 -04:00
Flashfyre
70cd42b934 Add stack limit to Golden Pokeball modifier 2023-04-23 01:37:58 -04:00
Flashfyre
032e26728b Fix some bugs 2023-04-23 01:03:09 -04:00
Flashfyre
2ac0a3645f Add switch out preventing to traps 2023-04-22 22:14:53 -04:00
Flashfyre
f13302e28f Implement trap moves 2023-04-22 15:01:48 -04:00
Flashfyre
ef1fd4b2fd Fix Ingrain not working properly 2023-04-22 13:16:45 -04:00
Flashfyre
29771cfa8e Fix modifier select screen transition issue 2023-04-22 11:46:52 -04:00
Flashfyre
362a94c658 Implement various moves 2023-04-22 10:56:17 -04:00
Flashfyre
f5f9eb576f Re-implement random evolution handling and mark unfinished moves 2023-04-22 01:09:35 -04:00
Flashfyre
db31f961ad Add fade back to starter select on game over 2023-04-21 22:59:09 -04:00
Flashfyre
b50976d784 Fix issue with biome links 2023-04-21 21:32:14 -04:00
Flashfyre
d721705d30 Fix town biome using wrong battle background 2023-04-21 20:58:56 -04:00
Flashfyre
0746aa5017 Add grass biome and replace old grass with new plains 2023-04-21 20:29:22 -04:00
Flashfyre
77999671b2 Add more move implementations 2023-04-21 19:30:04 -04:00
Flashfyre
355bfc76bf Add mini black hole item 2023-04-21 15:45:48 -04:00
Flashfyre
4b89794ab3 Add modifier transfer functionality 2023-04-21 14:05:16 -04:00
Flashfyre
57f19a3f40 Add Low Kick and Grass Knot logic 2023-04-21 01:17:43 -04:00
Flashfyre
3b238737a1 Fix some bugs 2023-04-21 00:10:45 -04:00
Flashfyre
4d69d3b219 Fix evolved enemy Pokemon icons not being initialized 2023-04-21 00:04:48 -04:00
Flashfyre
4eb44003b2 Fix TMs in modifier pool replaced with temp stat booster 2023-04-20 23:47:15 -04:00
Flashfyre
edce08b35c Adjust enemy modifier rate 2023-04-20 22:26:38 -04:00
Flashfyre
61adb285b6 Fix order of luxury tier modifiers 2023-04-20 21:42:56 -04:00
Flashfyre
1876bded74 Disable quickstart mode 2023-04-20 21:34:37 -04:00
Flashfyre
50b264ad77 Add recharging move logic 2023-04-20 21:32:48 -04:00
Flashfyre
bfa95a372e Add leftovers item 2023-04-20 20:15:16 -04:00
Flashfyre
60ac4e096c Add enemy modifiers functionality 2023-04-20 19:44:56 -04:00
Flashfyre
3546f3b5a7 Refactor source files and add berries 2023-04-20 15:46:05 -04:00
Flashfyre
6135243641 Add Pokeball modifier when modifier stack is full 2023-04-20 11:29:26 -04:00
Flashfyre
92e3a6f537 Fix golden pokeball not stacking 2023-04-20 01:07:39 -04:00
Flashfyre
ebff806dbd Add lower level limit to legendaries 2023-04-20 01:04:36 -04:00
Flashfyre
14c792506f Add EXP. Balance 2023-04-19 22:51:46 -04:00
Flashfyre
fb52c4a6ed Add EXP charm and change Lucky Egg to held item 2023-04-19 19:55:22 -04:00
Flashfyre
52a28ed95a Add logic for disable move 2023-04-19 18:19:55 -04:00
Flashfyre
da0d607f26 Add some move effects 2023-04-19 16:52:14 -04:00
Flashfyre
5a3f626776 Fix some bugs and re-implement unintentionally reverted weather logic 2023-04-19 14:07:38 -04:00
Flashfyre
64076a842d Alter average level formula 2023-04-19 11:14:47 -04:00
Flashfyre
2fbb533ca2 Minor biome config fix 2023-04-19 02:13:10 -04:00
Flashfyre
8f990fbc21 Fix auto play issue with level up stats prompt 2023-04-19 00:37:41 -04:00
Flashfyre
5ab3b2dab6 Fix crash related to weather and issue with level up stats 2023-04-19 00:35:06 -04:00
Flashfyre
5a1de4d9a5 Fix weather and add wave display 2023-04-18 23:54:07 -04:00
Flashfyre
89356fbfda Add full heal modifier 2023-04-18 22:23:06 -04:00
Flashfyre
d2d2f956ef Overhaul modifiers and add temp stat boosts 2023-04-18 22:09:37 -04:00
Flashfyre
59155b7c18 Fix no faint bug with certain kinds of damage 2023-04-18 16:47:29 -04:00
Flashfyre
40058539a7 Fix crashes 2023-04-18 15:07:10 -04:00
Flashfyre
8d8f3d6c92 Add recoil damage and sacrificial moves 2023-04-18 13:36:11 -04:00
Flashfyre
54f94dbe38 Re-comment move animation test in run command 2023-04-18 12:32:37 -04:00
Flashfyre
1574d16275 Add leech seed and protect effects 2023-04-18 12:30:47 -04:00
Flashfyre
9a2fa0934f Fix starter select cycling issue 2023-04-18 09:34:02 -04:00
Flashfyre
fcdd7c421e Add persistent data for catches 2023-04-18 01:32:26 -04:00
Flashfyre
00ad27247c Add WiP features related to forms and save data 2023-04-17 22:44:41 -04:00
Flashfyre
bcafa47673 Fix not loading shiny assets properly 2023-04-17 08:23:30 -04:00
Flashfyre
32d6bea725 Add weather and weather-related move effects 2023-04-17 00:46:50 -04:00
Flashfyre
ef93aec804 Add scaffolding for weather mechanic 2023-04-16 20:41:52 -04:00
Flashfyre
a66d2a8d17 Add sleep moves 2023-04-16 18:40:32 -04:00
Flashfyre
d030327336 Increase modifier upgrade odds based on shiny count 2023-04-16 09:42:35 -04:00
Flashfyre
683a8f4d04 Add HP recovery move effects 2023-04-16 00:29:55 -04:00
Flashfyre
0997bdf55b Fix issue with item-based evolutions 2023-04-15 22:51:33 -04:00
Flashfyre
8773f25e66 Simplify EXP formula for gameplay reasons 2023-04-15 22:12:59 -04:00
Flashfyre
14b3d494bb Fix move priority using wrong value 2023-04-15 21:51:08 -04:00
Flashfyre
f308887632 Add abilities list 2023-04-15 20:36:19 -04:00
Flashfyre
0e9710d45c Add move priority, flinching, and fixed damage 2023-04-15 17:40:18 -04:00
Flashfyre
656b6951b6 Add confusion and frenzy move effects 2023-04-15 01:32:16 -04:00
Flashfyre
b11e391e7a Add evolution items and new modifiers 2023-04-14 18:21:33 -04:00
Flashfyre
927f17b71f Add Shell Bell modifier 2023-04-14 01:08:44 -04:00
Flashfyre
618128dd00 Fix bug with releasing first party member 2023-04-13 23:50:48 -04:00
Flashfyre
1b8c8b5a3f Battle animation improvements 2023-04-13 23:04:51 -04:00
Flashfyre
791bf3cc49 Add charging moves and tag system 2023-04-13 12:16:36 -04:00
Flashfyre
e3f7603f22 Fix bug with logic for ether and elixir modifier 2023-04-12 21:52:23 -04:00
Flashfyre
53d62056d2 Some minor bug fixes 2023-04-12 21:44:12 -04:00
Flashfyre
6397a10998 Add starter select 2023-04-12 19:09:15 -04:00
Flashfyre
950b3a14b4 Fix crash with modifiers 2023-04-12 12:56:37 -04:00
Flashfyre
2ee39119d6 Add chance of modifier tier upgrade 2023-04-12 12:48:02 -04:00
Flashfyre
638750f75b Move modifier types to separate file 2023-04-12 11:57:15 -04:00
Flashfyre
7529ac938e Slightly modify ether and elixir condition 2023-04-12 11:37:54 -04:00
Flashfyre
05736530c6 Add game speed functionality 2023-04-12 11:30:47 -04:00
Flashfyre
4c892c2c40 Add biome flow 2023-04-12 00:37:56 -04:00
Flashfyre
1bf0456511 Slightly change potion condition 2023-04-11 19:56:26 -04:00
Flashfyre
b0ecb9d5f5 Add status effects 2023-04-11 19:08:03 -04:00
Flashfyre
3f9fbc1267 Add common and charge animation data 2023-04-11 13:00:04 -04:00
Flashfyre
690e284f4d Add ethers and elixirs 2023-04-11 11:04:39 -04:00
Flashfyre
50ce6c0791 Improve release logic 2023-04-11 09:41:11 -04:00
Flashfyre
53ab693bad Add release option on full party 2023-04-11 01:31:18 -04:00
Flashfyre
525cf41b5e Fix UI layering issue with evolution screen 2023-04-11 00:56:05 -04:00
Flashfyre
8e6e1fd233 Refactor controls and add random starter function 2023-04-11 00:24:55 -04:00
Flashfyre
f7490c871a Move enhancements and stat modifiers 2023-04-10 23:15:06 -04:00
Flashfyre
4b7ecf434e Remove usage of fs plugin 2023-04-10 17:20:37 -04:00
Flashfyre
4ff3c55613 Fix some crashes 2023-04-10 16:52:27 -04:00
Flashfyre
7b216ce4c1 Implement multi-hit moves 2023-04-10 16:17:25 -04:00
Flashfyre
3723e25682 Fix import issues with battle phase 2023-04-10 14:12:01 -04:00
Flashfyre
5b097b347b Finish evolution logic and sequence 2023-04-10 13:54:06 -04:00
Flashfyre
824106c2a3 Add WiP evolution phase 2023-04-10 07:59:00 -04:00
Flashfyre
15105231ba Refactor modifiers 2023-04-09 19:15:21 -04:00
Flashfyre
4ec91695f7 Changes to autoplay mode 2023-04-09 00:22:14 -04:00
Flashfyre
8bacb9bc84 Add more to summary UI 2023-04-08 20:35:45 -04:00
Flashfyre
a5186d378d Add TM modifiers 2023-04-08 00:21:44 -04:00
Flashfyre
cf423c2d8c Add TMs data 2023-04-07 21:48:14 -04:00
Flashfyre
b743a44f4b Add move description text scrolling and summary sprite 2023-04-07 13:23:55 -04:00
Flashfyre
860c1a5c11 Improve summary UI 2023-04-07 00:17:55 -04:00
Flashfyre
b9f21551f4 Add WiP move replacement and UI transition 2023-04-06 22:24:13 -04:00
Flashfyre
fa236a4f28 Additions to summary UI 2023-04-06 11:30:22 -04:00
Flashfyre
b77fd1755c Changes to summary UI 2023-04-06 10:05:12 -04:00
Flashfyre
0287904371 Minor change to party UI 2023-04-06 00:15:33 -04:00
Flashfyre
56c776834f Make party UI more flexible 2023-04-05 22:22:03 -04:00
Flashfyre
2d819a0ea4 Add party menu options and WiP summary UI 2023-04-05 08:35:15 -04:00
Flashfyre
2a22b31129 Fix animation not resuming after faint 2023-04-04 21:10:11 -04:00
Flashfyre
a1b857fbc6 Add rare candy modifier 2023-04-04 18:28:21 -04:00
Flashfyre
2c71550b35 Add more biomes and balance pools
Q
2023-04-04 14:04:04 -04:00
Flashfyre
c9c4e82f7f Add WiP move attributes system 2023-04-03 23:38:31 -04:00
Flashfyre
1cf81869d0 Add Pokemon Reborn move animations 2023-04-03 20:47:41 -04:00
Flashfyre
5f845839af WiP changes to move animation parser 2023-04-02 09:08:49 -04:00
Flashfyre
a21595c790 Add Pokeball select 2023-04-01 22:59:07 -04:00
Flashfyre
987697e6c7 Add gender indicator 2023-04-01 20:06:44 -04:00
Flashfyre
4635808873 Minor changes to biome pools 2023-04-01 17:19:16 -04:00
Flashfyre
f8283a810a Add move accuracy checks 2023-03-31 22:31:20 -04:00
Flashfyre
124f69f1ec Various changes 2023-03-31 20:19:57 -04:00
Flashfyre
0effdfa7fb Various updates and changes 2023-03-31 16:04:39 -04:00
Flashfyre
dbc4661507 Finish Pokemon biome entries 2023-03-31 00:41:16 -04:00
Flashfyre
d90c91af06 Various changes 2023-03-30 23:02:35 -04:00
Flashfyre
1969d36669 Add Sacred Ash and Golden Pokeball modifiers 2023-03-30 10:50:46 -04:00
Flashfyre
807bf9da8c Add golden egg every 10 waves for exp balancing 2023-03-30 00:13:56 -04:00
Flashfyre
7e3cde77be Add luxury ball and golden egg sprite 2023-03-29 22:56:43 -04:00
Flashfyre
7ab91dda80 Update arenas and soundtrack 2023-03-29 18:55:41 -04:00
Flashfyre
27c0b64a3f Changes to plains arena pool 2023-03-29 12:23:52 -04:00
Flashfyre
a739a1666f Add auto mode and various changes 2023-03-29 00:31:25 -04:00
Flashfyre
2f17903d30 Initial commit 2023-03-28 14:54:52 -04:00