Commit Graph

214 Commits

Author SHA1 Message Date
JappaWakka 2689467a7c Moves can't be learned twice after level ups 2023-04-28 09:18:41 +02:00
JappaWakka 1bdd6e1c55 Check if opponent is frozen before defrosting 2023-04-08 20:12:42 +02:00
JappaWakka aa105b38a2 Fix scald not defrosting opponent...
Also added defrosting the opponent as a gamemode attack function
2023-04-01 08:58:01 +02:00
JappaWakka f90152c506 Implemented Torment move 2023-03-27 17:59:57 +02:00
JappaWakka ae5a26f8e3 Fix defrosting moves not working
By putting the move defrost check before the freeze animation/move cancelation check
2023-03-27 17:26:07 +02:00
JappaWakka b2f6c98f8e Fix Infinite PP for opponents 2023-03-23 12:06:17 +01:00
JappaWakka 5819ca30fe Fix for crash related to TrainerAI and using items 2023-03-18 19:56:52 +01:00
JappaWakka a806284149 Fix cancel pp changing items skipping battle turn 2023-03-15 15:40:46 +01:00
JappaWakka 390d8086dd Fix protean change with struggle 2023-03-15 15:39:59 +01:00
JappaWakka 2987cbb177 Pokémon no longer choose taunted status moves
but instead pick another move. if there are no usable moves left, the pokémon uses struggle
2023-03-09 20:00:20 +01:00
JappaWakka 66046800d3 Pokémon will no longer choose disabled moves...
but instead pick another move. if there are no usable moves left, the pokémon uses struggle
2023-03-09 19:36:47 +01:00
JappaWakka e5ee6cb145 Temporarily comment out opponent switching 2023-03-03 12:28:30 +01:00
JappaWakka 0ae62ceaef Have both double trainer npcs show up in battle 2023-02-27 20:25:16 +01:00
JappaWakka 734ece683c Fix battle transition from displaying twice 2023-02-27 20:01:57 +01:00
JappaWakka ffefa421c4 Fix faint Pokémon message showing twice 2023-02-27 20:01:28 +01:00
JappaWakka 611e9688b9 Fix faint Pokémon message not showing...
when the Pokémon faints due to effects not caused by attacks/moves
2023-02-27 19:41:57 +01:00
JappaWakka 022597262c Fixed replace fainted pokémon twice bug 2023-02-26 16:05:47 +01:00
JappaWakka f50a62d3fc Consistency in SwitchPokemonQueryObject 2023-02-23 21:13:46 +01:00
JappaWakka 36a5ebf936 Fix opponent switching shenanigans 2023-02-23 12:58:43 +01:00
JappaWakka b75de6fe5e Fixed BattleMapOffset not being set to 0 2023-02-23 12:27:48 +01:00
JappaWakka ca410ee53b Fix Protean ability 2023-02-23 12:09:22 +01:00
JappaWakka fabab5e32e Finally fixed protean not resetting types 2023-02-02 14:58:33 +01:00
JappaWakka 628f379a28 Fix opponent switching errors bug 2023-02-02 11:19:51 +01:00
JappaWakka 4464766202 Removed unnecessary checks for battlemapoffset 2023-01-27 18:31:48 +01:00
JappaWakka 8f372b16f2 Fix item swap duplication (for real hopefully) 2023-01-27 13:17:25 +01:00
JappaWakka 55106f8450 Can't switch if not in original position 2023-01-23 12:27:36 +01:00
JappaWakka 4f2513dac9 Fix no switching softlock 2023-01-23 11:31:21 +01:00
JappaWakka b8ffdb73c3 Teleport doesn't fail anymore if opp is faster 2023-01-18 20:13:04 +01:00
JappaWakka 7e7dae0d20 Fixed trick/item duplication and protean 2023-01-18 20:06:21 +01:00
JappaWakka d839b64689 Can't choose a move if it's disabled anymore 2023-01-17 18:21:30 +01:00
JappaWakka 4b0cfde2fc Replaced font in BattleMenu 2023-01-15 19:26:05 +01:00
JappaWakka cdccbfcc67 Fix for Trick and Recycle 2023-01-15 11:40:43 +01:00
JappaWakka 678cd35fde Forgot a period in the exp. share name 2023-01-15 09:58:30 +01:00
JappaWakka cc2d46153d Disable Shift BattleStyle in PvP 2023-01-15 09:34:42 +01:00
JappaWakka ffdc28dd85 Fix for Protean Ability not resetting 2023-01-15 09:28:29 +01:00
JappaWakka 77271a4b67 Forgot some battle animation things 2023-01-14 20:58:17 +01:00
JappaWakka dfbaaf2b33 BattleScreen + BattleCatchScreen softlock fixes 2023-01-13 14:46:44 +01:00
JappaWakka dc454d2a68 Temporarily disabled animations for pvp battles 2023-01-13 14:09:21 +01:00
JappaWakka 7ae9ebaa50 Multimove Bug Fixed 2023-01-13 14:07:35 +01:00
JappaWakka add7f4ac6f Fixed item name not being found with localizations 2023-01-02 15:27:59 +01:00
JappaWakka 68a9d197e5 Improved the Custom Move commands 2022-12-26 20:54:00 +01:00
JappaWakka f7c97ec7c9 Implemented Disable move & fixed Cursed Body turns
When Cursed Body successfully executes, it now always disables moves for 4 turns too
2022-12-22 14:48:06 +01:00
darkfire006 b538376a1e Updated mechanics from SwSh
3 terrains are a +30%  instead of +50%
Defog removes terrains
Kings Shield is only a single atk red
2022-12-20 16:58:57 -06:00
JappaWakka 6e106a28fa Set second type to typeless with Protean ability 2022-12-18 20:18:35 +01:00
JappaWakka bdb0278280 Make unable to switch message localizable 2022-12-04 21:17:42 +01:00
JappaWakka 3bea96a5ea Fix Confused animation 2022-11-15 10:28:09 +01:00
JappaWakka 7d1931abd1 Fix exp sharing after switching before opponent 2022-11-11 12:59:38 +01:00
JappaWakka c6b3a97885 Fix trainers crashing when starting a battle 2022-10-18 16:54:38 +02:00
JappaWakka d2860b15a8 Models work better in battle now 2022-09-27 12:51:51 +02:00
JappaWakka fd93f96cbc Rewrote a huge part of musicplayer, works now! 2022-09-13 21:01:55 +02:00
JappaWakka e37268ffb5 Fix for knockoff item dupe bug 2022-09-04 19:23:12 +02:00
darkfire006 9d85a79f65 leech seed drains even if other pokemon is full 2022-08-23 01:01:59 -05:00
JappaWakka 27fa63bc7c Fixed battle model crash 2022-08-16 20:23:00 +02:00
JappaWakka 6f5f992d6e Fix for softlock animations and tail whip crash 2022-07-24 15:16:16 +02:00
Jasper "JappaWakka" Speelman 7d55ca2c64 Fix for Invisible Pokémon in Battle
As well as some other fixes like the hit animation also working on models and making the timing more reliable
2022-07-23 16:41:00 +02:00
JappaWakka bf544a5e25 Fixed stats animation, added Tail Whip animation 2022-07-19 12:03:13 +02:00
JappaWakka e6a2f6eab8 Updates to animation system + rotating pokemon
Also made useful tweaks to how battleflipped works
2022-07-18 21:41:30 +02:00
JappaWakka f103caa5f2 Fixed Models not being affected by lighting 2022-07-16 14:48:29 +02:00
JappaWakka 352b80db9c Any entity can have a model, model scale improved
0.1 meter in blender is now equivalent to 1/16th of a P3D unit or 1 pixel on a 16 pixels wide/tall texture. Mt Silver will need to be updated to match this scale, making the ModelEntity obsolete.

Also added Snorlax battle model
2022-07-13 00:12:16 +02:00
Jasper "JappaWakka" Speelman 1d7897be82 Fixed poison animation 2022-07-08 12:21:32 +02:00
JappaWakka 3461b1f549 Battle poke switch - mouse support & cancel button 2022-06-26 21:23:28 +02:00
JappaWakka 747de3e221
Merge branch 'master' into custommoves 2022-06-10 10:26:10 +02:00
Jasper "JappaWakka" Speelman 790afcdbbc Made sure regular moves still work as expected 2022-06-10 10:13:23 +02:00
JappaWakka a40a44181b Make gamemode moves actually work 2022-06-09 21:29:30 +02:00
JappaWakka 9e67b5fc62 Fix for incorrectly placed burn animation 2022-06-06 14:59:13 +02:00
Jasper "JappaWakka" Speelman 4d36a5851b Only allow switching when round is over
Also fixed minor error with items in battle
2022-05-14 16:07:32 +02:00
JappaWakka 8160838230
Merge pull request #64 from JappaWakkaP3D/permanent_item_loss_fix
Permanent item loss caused by attacks fix
2022-05-13 23:49:52 +02:00
JappaWakka e47581df69 Battle Pokémon models are now placed in subfolder 2022-04-25 18:44:36 +02:00
JappaWakka 24a6b77a1c Most of the animations work again 2022-04-25 18:44:05 +02:00
JappaWakka cf0bb03e10 Fix for BattleCatchScreen crash 2022-04-22 21:56:25 +02:00
JappaWakka 797cd45085 Battle related music bugs fix 2022-04-19 18:13:18 +02:00
JappaWakka cb4ae0c3a3 Tar Shot secondary effect added
Added the second effect of Tar Shot (which is doubling the effectiveness of fire type moves on the opponent of the attacker)
2022-04-17 16:56:57 +02:00
Jasper "JappaWakka" Speelman d934a947aa Battle Updates
* Shift Battlestyle Implemented
* Bugs related to switching Pokémon with Battle Animations off fixed
2022-04-14 20:14:35 +02:00
Jasper "JappaWakka" Speelman 56527e85c0 Fix for battlemusic playing after end battle 2022-04-09 22:08:52 +02:00
darkfire006 45f2082347 Wild Pokemon for diamond dive and new routes including 5 new mons 2022-04-08 22:07:25 -05:00
Jasper "JappaWakka" Speelman dde6cb5c34 Removed unneccessary item use sounds 2022-02-05 10:28:48 +01:00
JappaWakka 313fb999cb Bugfixes
Fixed:
- Regular toxic animation (initial move) only has 1 bubble instead of 3
- Issue with Zoom in screen when status effect occurs (from opposing pokemon) instead focuses on player pokemon
2022-01-29 00:10:47 +01:00
JappaWakka 7555a5e903 Battle fixes and improvements
* Fixed camera angle not changing to the Pokémon when status effects are doing something
* Fixed softlock when opponent trainer switches Pokémon
* (Hopefully) fixed initial positioning errors with spawned BattleAnimation entities related to BattleFlip functionality
* Removed the now unneccessary BattleFlip checks in the move animation of Growl
* Improved Ember move animation (fireball speed & flame delay)
* Improved Poison Sting move animation by making the stinger smaller, increasing the speed of the stinger and making it use a flipped version of the texture when the opponent uses the move
* Improved Poisoned status effect animation by making it 1 bubble for regular poison and 3 bubbles for toxic
* Repositioned the flame of the Burned status effect animation
* Trainers now display a message when sending out their Pokémon (I removed that before)
* Fixed Party Screen not appearing immediately after the player's Pokémon fainted and also made the player unable to exit the Party Screen when that happens.
* Fixed the incorrectly scaled font sizes and text alignment in the selection menu that appears when selecting a Pokémon in the Party screen
* Replaced minifont in the Pokémon level up stats box with InGameFont and fixed the offsets
* Fixed the error I made in the ceiling map code of Violet City's gym
* Removed the file MoveAnimationQueryObject.vb because AnimationQueryObject.vb also includes Move Animations
* Fixed the textbox in battles where an empty rectangle would appear before the animation finished.
* When a trainer spots the player and an exclamation mark bubble pops up above their head, a sound is played (Emote_Exclamation)
* In trainer battles, the player's Pokémon now also plays their cry.
2022-01-16 17:22:36 +01:00
JappaWakka 667671e16f Battle Bugfixes
Fixed buggy throwing animation of the opponent trainer
Fixed a bug related to the trainer sprite in the vs trainer intro that made the trainer texture buggy if it wasn't 32x32
2022-01-10 20:45:28 +01:00
JappaWakka c116f30c6b Added Battle Animation for attack Clamp 2022-01-08 17:36:57 +01:00
JappaWakka 6391851597 Improved Wrap & Bind animations, fixed some errors in the Bind animation 2022-01-07 19:27:05 +01:00
JappaWakka 65887946d5 Attract, Bind, Wrap, Infatuated Animations
Added animation for attacks Attract & Bind, updated animation of attacks Wrap, added animation for status Infatuated
2022-01-07 16:30:03 +01:00
JappaWakka e892977d70 Added Bind animation & Fixed scaling animation anchor functionality 2022-01-07 14:25:57 +01:00
JappaWakka 6681a75601 Whirlpool animation now uses 1.5 * MathHelper.PI instead of 4.71F 2022-01-06 12:31:46 +01:00
JappaWakka 35aa80b072 Improved Whirlpool Animation + Fixed BattleAnimations drawn behind Pokémon 2021-12-30 21:53:57 +01:00
JappaWakkaP3D 312e3ed934 Added Wrap & Whirlpool Animations 2021-12-28 17:35:28 +01:00
JappaWakkaP3D f1ccba7e45 Improved Mega Evolution animation and slightly tweaked the speed of some of the battle intros
Battle intros need testing still
2021-12-28 13:55:30 +01:00
JappaWakkaP3D 6dcb11c775 Mega Evolution Animation - Attempt 1 2021-12-20 20:14:26 +01:00
JappaWakkaP3D bf887b0e3a Fixed Bug: When the lead Pokémon faints and you switch to a different Pokémon, when the battle ends, your current Pokémon disappears 2021-12-14 22:11:11 +01:00
JappaWakkaP3D 93f1228eb2 Possible animation fixes
* Confusion ducks are smaller and they should rotate slower now.
* Fixed the Stat Raise animation from using the wrong destination coordinates.
* Attempted to center the frozen animation more.
* Added the frozen animation to the other place where it was needed.
2021-12-03 18:37:19 +01:00
JappaWakkaP3D c85ccd89ae Added Frozen animation and Infatuated sound effect 2021-12-03 16:01:54 +01:00
JappaWakkaP3D 1ea2da7bb7 Added Asleep animation, fixed some code errors I made. Also added sound effects when animations are disabled. 2021-11-28 11:03:55 +01:00
JappaWakkaP3D 3bdc124a99 Bugfixes & Tweaks
* Growl displays correctly now
* The sound played with stat change animations is now timed correctly
* Stat change particles now fall straight down as intended
* Fixed incorrect texture for Confusion
* Stat Down texture is now blue and Stat Up texture is now orange/yellow
2021-11-26 21:56:38 +01:00
Jasper "JappaWakka" Speelman bac3d2b292 Gave status effect textures a separate folder not related to a specific type. 2021-11-21 15:01:38 +01:00
Jasper "JappaWakka" Speelman e9d4cacd3c Fix for faint animation 2021-11-21 15:00:39 +01:00
Jasper "JappaWakka" Speelman 51b9eb649a Fix for missing texture in Poisoned & Burned animations as well as poison sting. 2021-11-21 12:59:21 +01:00
Jasper "JappaWakka" Speelman 71cdb5e0c0 Added Paralysis Animation 2021-11-06 18:22:17 +01:00
Jasper "JappaWakka" Speelman dc9ec6bd23 Fixed mistakes in Stat Animations + Updated Pound animation + Improved Tackle animation 2021-11-06 12:03:55 +01:00
Jasper "JappaWakka" Speelman c1ec08fe7f Various Battle Improvements and Fixes
* Improved timing BlockIn & BlockOut BattleIntro animations
* Removed player ball throw animations at the start of the battle for battles that are not pvp
* Fixed absorb animation
* Improved the faint animation and removed the unnecessary camera angle changes when a pokémon faints
2021-11-06 11:26:34 +01:00
Jasper "JappaWakka" Speelman 4b3b900e40 Start of battle pokeball throw animation
and some little fixes
2021-11-05 23:09:33 +01:00