Commit Graph

392 Commits (1d7d8b1ac7d0b6e13de0f3036fc64dbbce77168f)

Author SHA1 Message Date
Flashfyre 2cc38ac2cb Fix softlock with switch out moves used on player 2024-03-28 00:05:48 -04:00
Flashfyre 63a6655759 Fix Transform and Imposter causing crash 2024-03-27 23:44:11 -04:00
Madmadness65 eb14031bdd Replace some egg moves
These egg moves were some of the moves marked as problematic on the sheet. They have been changed out for either suggestions or more fitting moves.
2024-03-27 22:15:35 -05:00
Flashfyre 1a0c470173 Add hardware acceleration notice in initial tutorial 2024-03-27 22:40:10 -04:00
Flashfyre 75c9c9cc2c Make form change items non-stealable and fix Recover AI 2024-03-27 13:13:37 -04:00
Flashfyre a06323c8ab Fix Circle Throw causing battle skip 2024-03-26 23:40:01 -04:00
Madmadness65 8829727c8a Fix Upper Hand not having +3 priority 2024-03-26 17:05:12 -05:00
Madmadness65 53b850aa0e Implement Chloroblast
Apparently this one does too, and I just missed it.
2024-03-26 17:01:55 -05:00
Madmadness65 44d4a28315 Implement Steel Beam
Functions identically to Mind Blown, minus targeting everything.
2024-03-26 16:54:47 -05:00
Madmadness65 316b93877a Fix Acupressure; Implement Life Dew
Acupressure was always boosting the user's stats, even when targeting an ally, so that has been fixed.
Life Dew has also been implemented and functions as intended.
2024-03-26 15:21:22 -05:00
Flashfyre c5f52692f6 Rest fails at full HP 2024-03-26 13:11:59 -04:00
Madmadness65 be88f4783e Fix Thunder not having the accuracy bypass in rain
It was unintentionally given to Thunder Wave instead of Thunder.
2024-03-24 22:25:02 -05:00
Flashfyre b3e6f26afe Properly implement Last Resort 2024-03-21 23:05:47 -04:00
Flashfyre 918a0d77f1 Fix for single battle trainer summoning issue 2024-03-21 12:18:10 -04:00
Flashfyre a76f795cd5 Trainer updates including names and double battle pairs
Add dynamic trainer pairs; add trainer names with Bulbapedia scraping logic; add Hex Maniac trainer; make namebox stretch to fit name
2024-03-21 00:57:28 -04:00
Madmadness65 91b74fbef3 Implement Volt Switch
Was just forgotten when doing the other U-turn clones.
2024-03-18 21:10:23 -05:00
Flashfyre 98e88a160b Implement Bolt Beak, Fishious Rend, and Magnitude 2024-03-18 22:05:21 -04:00
Flashfyre 47a51c9958 Add first hit move effect and apply only to Make It Rain 2024-03-18 17:15:20 -04:00
Flashfyre ab5ac1823b Remove unused TM value from move definitions 2024-03-17 22:55:52 -04:00
Flashfyre 9c467fd697 Fix Water Shuriken 2024-03-17 22:47:30 -04:00
Madmadness65 babc32211f Mark more attacking moves as (P)artial
The only functionality this changes is that Metronome can call these specific attacks too now.
2024-03-17 20:00:20 -05:00
Flashfyre 33ba66b236 Add daily rankings board 2024-03-17 13:38:27 -04:00
Flashfyre a52b8c6b4b Tweak for daily run final boss 2024-03-17 00:12:57 -04:00
Flashfyre 0c835f4157 Implement various abilities including Mold Breaker 2024-03-14 00:40:57 -04:00
Madmadness65 1905ecc828 Implement Burning Bulwark 2024-03-13 16:37:36 -05:00
Xiaphear 37f769de72 Added Baneful Bunker 2024-03-13 22:09:23 +01:00
Xiaphear b12ade22e9 Attempted magnitude, not implemented. 2024-03-13 17:38:37 +01:00
Flashfyre 60c3c0a008 Implement Topsy-Turvy 2024-03-11 18:44:40 -04:00
Flashfyre f7d89b5268 Implement Psyshock 2024-03-11 18:18:55 -04:00
Flashfyre e99af6f148 Implement Healing Wish 2024-03-11 18:13:07 -04:00
Xiaphear 9e02d71c75 Added Conversion 2024-03-11 22:57:07 +01:00
Xiaphear 7b28d9bf6e Merge branch 'main' of https://github.com/Flashfyre/pokerogue 2024-03-11 21:45:36 +01:00
Xiaphear 56250aca9c Added Body Press 2024-03-11 21:45:32 +01:00
Flashfyre 4919dfcaa6 Implement Spite 2024-03-11 15:42:01 -04:00
Xiaphear 03989d07b2 Added Wring Out. Attempted Healing Wish ( WIP ) 2024-03-11 18:18:49 +01:00
Madmadness65 9550016ebc Minor egg move update
Popplio got a well-deserved egg move nerf. Also added more token graphics and commented-out G-Max moves for later.
2024-03-10 21:55:18 -05:00
Flashfyre bd9d2de0af Fix not setting immune type for move type immunity 2024-03-10 10:16:49 -04:00
Flashfyre 6dac4c2b0f Implement terrain clearing moves 2024-03-09 22:05:49 -05:00
Flashfyre 47cf14da9b Implement terrains and rework status logic 2024-03-09 21:57:33 -05:00
Xiaphear b9395ebd7f Implemented Sturdy. 2024-03-09 23:49:00 +01:00
Xiaphear 3b96d1916d Implement Electro Ball & Gyro Ball 2024-03-09 22:58:05 +01:00
Flashfyre b147cf8f37 Fix Fake Out implementation not working properly 2024-03-08 13:14:08 -05:00
Flashfyre da492cfac7 Metronome doesn't select unimplemented moves 2024-03-07 20:13:31 -05:00
Flashfyre 3fea44de6f Fix bug with trainer double battles and implement Magnetic Flux move 2024-03-06 22:41:55 -05:00
Flashfyre 62b6157426 Rebalance item stealing moves 2024-03-04 21:51:28 -05:00
Flashfyre 95bfb2a056 Implement Skill Swap and fix Wonder Guard with status moves 2024-03-04 21:32:11 -05:00
Flashfyre 893c20fc16 Remove status effect move type immunity 2024-03-04 20:28:55 -05:00
Madmadness65 616c2ea05c Implement U-turn; Shellos & Gastrodon forms
Shellos and Gastrodon can randomly be found as their West Sea forms now.
2024-03-04 01:47:37 -06:00
Madmadness65 859ce259aa Swap nature colors on starter screen
Also unmarking the Let's Go and Torque attacks as unused, now that they're used as egg moves.
2024-03-03 23:44:37 -06:00
Flashfyre 0011f6033b Fix redundant item update for each transferred item when fusing 2024-03-02 10:23:54 -05:00
Flashfyre 32f4d69041 Wild spliced Pokemon generate shared movesets 2024-03-01 16:21:28 -05:00
Flashfyre 6f54fa7741 Fix damage display issues with battle info 2024-03-01 10:28:29 -05:00
Flashfyre 1f6a6f4621 Damage-related fixes and changes
Apply damage numbers to all damage and heal; fix some damage-related bugs
2024-03-01 09:35:36 -05:00
Flashfyre 716d8853a3 Add damage numbers feature 2024-03-01 00:27:46 -05:00
Flashfyre f48464d48d Minor refactoring 2024-02-29 20:08:58 -05:00
Flashfyre cdeb677080 Fix Belly Drum condition 2024-02-29 15:47:29 -05:00
Flashfyre ed5921eb10 Rework boss HP logic to allow unlimited bypasses for large damage 2024-02-29 12:23:49 -05:00
Flashfyre 59fb3fa5db Add thawing to burning moves 2024-02-28 15:15:27 -05:00
Flashfyre fdff3a549c Factor type immunity abilities into enemy AI 2024-02-28 11:40:30 -05:00
Flashfyre 822c83e469 Fix charge move effect activating twice 2024-02-27 20:15:47 -05:00
Flashfyre 38a518a9e1 Mark unimplemented attack moves as partial 2024-02-27 16:33:02 -05:00
Flashfyre 01938dcf83 Fix issue with skipped move charge effects not activating 2024-02-27 14:21:17 -05:00
Flashfyre 143c38d0bd Minor fixes 2024-02-27 13:58:25 -05:00
Madmadness65 10ff9c4775 Minor fix for Axe Kick
It's supposed to confuse, not flinch.
2024-02-24 00:04:25 -06:00
Madmadness65 2351fde687 Update moves to use their latest Gen 9 properties
This includes the nerfing of all the recovery move's PP to 5, and slight adjustment of power to a few attacks. Also corrected Indeedee's type to be properly Psychic/Normal.
2024-02-22 17:20:16 -06:00
Flashfyre 4e93f1e52c Display enemy trainer briefly when switching 2024-02-22 00:00:51 -05:00
Flashfyre 355fbac9c3 Add fix for crash when setting name if form index is too high 2024-02-21 12:18:57 -05:00
Madmadness65 c3983fccb4 Implement most of the LGPE moves
They are still not distributed to any Pokémon, but will function if called by Metronome, for example.
Glitzy Glow, Baddy Bad, Freezy Frost, and Sparkly Swirl rely on mechanics not yet implemented.
None of these attacks have animations currently.
2024-02-20 22:43:43 -06:00
Flashfyre 6460e736a7 Fix Slack Off healing 100% HP 2024-02-20 18:05:17 -05:00
Flashfyre 5879724ead Fix Beak Blast not working in same turn 2024-02-20 13:15:53 -05:00
Flashfyre 00d985c9cf Update Feint move logic 2024-02-20 12:27:38 -05:00
Flashfyre fa45d54be7 Add type immunity exception for status effect moves 2024-02-20 11:00:40 -05:00
Flashfyre dadc08d16e Add Terestallization mechanics
Add Terestallization mechanics; implement Stellar type; fix bug with held item weights
2024-02-17 00:40:03 -05:00
Flashfyre ed1d473c49 Fix softlock with Flip Turn and similar moves 2024-02-14 19:43:59 -05:00
Madmadness65 0fe4d02b87 Implement a few moves
Fully implements Anchor Shot, Clangorous Soul, Coaching, Thunder Cage, Dragon Energy, Infernal Parade, and Mortal Spin.
Partially implements Baneful Bunker, Tar Shot, Aura Wheel, and Syrup Bomb.
Trapping moves also updated to deal 1/8th damage and lasts for 4-5 turns.
2024-02-08 17:01:11 -06:00
Flashfyre c5eb86b0b1 Fix crash with stat change after Pokemon is recalled 2024-01-21 16:30:06 -05:00
Flashfyre 63cb2ae22f Implement some moves and update arena tags to include side 2024-01-15 23:29:22 -05:00
Flashfyre 8c4f336cd6 Trainers switch out their Pokemon when at a disadvantage 2024-01-15 00:20:35 -05:00
Flashfyre f49a3e5127 Add field zoom functionality and make final boss larger 2024-01-14 20:47:08 -05:00
Flashfyre 052564f902 Update final boss fight and restructure some files 2024-01-13 12:24:24 -05:00
Flashfyre 7c5acc527c Implement Mind Blown 2024-01-12 18:22:00 -05:00
Flashfyre b7256ab250 Fix Dragon Ascent effect target 2024-01-12 16:24:44 -05:00
Flashfyre eedad7d678 Add boss health bars 2024-01-07 23:17:24 -05:00
Flashfyre e05bf78481 Overhaul random logic and implement battle seed 2024-01-02 21:31:59 -05:00
Flashfyre de87a35b97 Fix switch out status moves in wild causing softlock 2023-12-31 10:39:33 -05:00
Flashfyre 20569b0317 Fix various bugs related to switch out attack moves 2023-12-30 22:01:46 -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
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
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 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
Madmadness65 590483f3af Covet can steal too 2023-12-14 12:21:49 -06:00
Flashfyre c27db5603a Fix Stone Axe failing with max layers 2023-12-14 09:16:41 -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
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
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 fa94db0939 Implement new movesets and TMs 2023-12-09 20:09:09 -05:00
Flashfyre e7ec5b4f88 Implement generation 6 Pokemon and some moves 2023-12-08 16:29:03 -05:00
Flashfyre 70827420cd Implement mega evolutions 2023-12-07 17:43:56 -05:00
Flashfyre fab2d9b788 Soft implement gen 6-9 species, abilities, and learnsets 2023-12-05 17:12:39 -05:00
Flashfyre 88bee27694 Implement Future Sight and Doom Desire 2023-12-04 00:09:38 -05:00
Flashfyre b1b6a6f1c7 Fix Baton Pass crash 2023-12-02 16:31:10 -05:00
Flashfyre d5731eaa69 Remove duplicate move 2023-11-30 19:38:54 -05:00
Flashfyre e8b82d2d55 Soft implement gen 6-9 moves 2023-11-30 16:37:16 -05:00
Flashfyre ad9d8a8507 Add Annihilape with Rage Fist move 2023-11-28 21:35:52 -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 4355ebd375 Fix switch out move logic 2023-11-28 08:43:21 -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 75904470d3 Fix some bugs related to double battles 2023-11-26 22:22:05 -05:00
Flashfyre e5fe0c6e3a Add transform support to fusion palette swaps 2023-11-24 15:12:26 -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 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 1236cb948d Add shared movesets for spliced Pokemon 2023-11-08 22:30:22 -05:00
Flashfyre c62cb27cdb Reimplement one-hit KO effect 2023-11-07 22:23:42 -05:00
Flashfyre 28f8fdfdc1 Implement unaware ability 2023-11-05 23:27:40 -05:00
Flashfyre e07339e3eb Add DNA splicers and Pokemon fusing 2023-11-04 00:32:12 -04:00
Flashfyre ca4f9297a8 Implement switch moves 2023-10-31 14:09:33 -04:00
Flashfyre 1ae54de59e Fix multi-hit move implementation 2023-10-30 12:33:20 -04:00
Flashfyre 5567b39f20 Add enemy buffs to balance endless mode 2023-10-29 16:05:17 -04:00
Flashfyre 813b4894f3 Implement Transform move and Imposter ability 2023-10-29 01:28:56 -04:00
Flashfyre 06740130b9 Fix confusion turns 2023-10-28 20:37:02 -04:00
Flashfyre 1a488d421c Fix Psywave causing decimal damage 2023-10-28 00:36:41 -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
xDasone 36b030d019 Implemented Frustration, and Return Damage Calcs 2023-10-26 22:03:24 -07:00
Flashfyre c958c4f074 Fix not healing after 10 battles 2023-10-26 19:45:35 -04:00
Flashfyre e0acb1e737 Fix Disable implementation 2023-10-25 09:41:37 -04:00
Flashfyre 3bee719026 Fix being able to steal non transferrable items 2023-10-23 22:23:18 -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
B1bbs f2e001ead1 Implement pain split 2023-10-21 20:40:46 -05:00
B1bbs 5e08a5cf83 Implement endeavor 2023-10-20 20:30:28 -05: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 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 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 5a706649db Fix sacrificial move effect order 2023-07-10 10:54:22 -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 4b61e50d72 Add starters for evolved Pokemon 2023-07-05 14:19:49 -04:00
Flashfyre e46bb9fd50 Rework post summon logic 2023-07-04 17:50:51 -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 0cc87b4ba0 Add sprite shadows and update engine 2023-06-04 21:47:43 -04:00
Flashfyre ac9814e665 Fix issues with targeting 2023-05-31 15:04:03 -04:00
Flashfyre ab5f66f11c Minor changes 2023-05-23 10:44:33 -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 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 15cfd3bad4 Add color change ability, some moves, and fix mimic 2023-05-06 00:42:01 -04:00
Flashfyre 095d98a8cb Implement some moves 2023-05-05 18:20:55 -04:00
Flashfyre d1d65708ce Implement some abilities and attract move 2023-05-04 12:57:55 -04:00
Flashfyre 85caa97b72 Fix escape characters in charge move text 2023-05-03 18:58:07 -04:00
Flashfyre bfc26970f0 Add move targets for proper animation target 2023-05-01 14:41:44 -04:00
Flashfyre b1be0da013 Implement thief move 2023-04-30 19:05:47 -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 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 c614295b5e Begin implementing abilities 2023-04-26 23:33:13 -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 a148ecab80 Add King's Rock and more berry types 2023-04-25 01:32:48 -04:00
Flashfyre 92c8583129 Refactor move attribute logic and add arena trap moves 2023-04-24 14:30:21 -04:00
Flashfyre c1e048e9af Add Focus Band item 2023-04-23 21:31:06 -04:00
Flashfyre 70cd42b934 Add stack limit to Golden Pokeball modifier 2023-04-23 01:37:58 -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 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 77999671b2 Add more move implementations 2023-04-21 19:30:04 -04:00
Flashfyre 57f19a3f40 Add Low Kick and Grass Knot logic 2023-04-21 01:17:43 -04:00
Flashfyre 50b264ad77 Add recharging move logic 2023-04-20 21:32:48 -04:00
Flashfyre 3546f3b5a7 Refactor source files and add berries 2023-04-20 15:46:05 -04:00