Commit Graph

50 Commits

Author SHA1 Message Date
JappaWakka 2640ec070f Make it possible to scale + rotated pkmn models
PokeModelScale|Value - Scale all Pokémon models in battle by value (sng), default  = 1
PokeModelRotation|xRot,zRot - Rotate all Pokémon models by the specified radians. Y rotation is dynamically controlled by the game so I didn't want to mess with that.
2024-11-30 11:45:59 +01:00
JappaWakka f5feba5e99 Fix abilities etc. activating before opp switched 2024-08-12 15:15:53 +02:00
JappaWakka 8479bd0fc3 Added some more text replacements 2024-05-10 18:07:31 +02:00
JappaWakka 9bb85df200 Fix Confuse Ray Battle Animation 2024-03-23 17:47:59 +01:00
JappaWakka 1e16a5dcc4 Pokémon forms play the right cry in battle now 2023-11-04 15:16:25 +01:00
JappaWakka b66be1637c Added camera battleanims & earthquake anim &...
...fixed the timing system to be consistent
2023-09-07 13:05:20 +02:00
JappaWakka eccda481b9 Implemented flash move animation 2023-09-06 12:13:24 +02:00
JappaWakka 888371c914 Some battle fixes & move implementations
* Baton Pass, Volt Switch, Parting Shot and U-Turn technically work, however the camera is aimed at the wrong pokémon
* Fixed softlock when the PVP client selects a move before the host has finished the battle intro dialogue
2023-08-21 18:43:40 +02:00
JappaWakka e497776ecd Localized field moves and switching 2023-07-30 18:16:27 +02:00
JappaWakka d911935dfb Fixed BattleAnimation bug, updated moves 2023-07-28 15:51:16 +02:00
JappaWakka 581a2c696c Correct tokens for trainer switch prompt 2023-06-29 20:30:10 +02:00
JappaWakka f1aeb43b75 Fix Pokémon not falling in battle 2023-06-27 14:23:12 +02:00
JappaWakka df992888a2 Animation fixes 2023-06-26 18:18:19 +02:00
JappaWakka af937955b9 New BattleAnimation type + Confuse Ray animation..
And some fixes
2023-06-26 16:36:52 +02:00
JappaWakka d96152d133 Fix EntityMove Battle Animation Type 2023-06-23 11:03:39 +02:00
JappaWakka a386be5eb6 Added psychic anim & made background anims work
and also added Ice Punch assets to project
2023-06-21 19:24:43 +02:00
JappaWakka d13b5eb8d3 GameMode Item Preparations
Implemented GameMode Mega Stones
2023-05-29 15:33:57 +02: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 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 bdb0278280 Make unable to switch message localizable 2022-12-04 21:17:42 +01:00
JappaWakka 7d1931abd1 Fix exp sharing after switching before opponent 2022-11-11 12:59:38 +01:00
JappaWakka d2860b15a8 Models work better in battle now 2022-09-27 12:51:51 +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
JappaWakka 3461b1f549 Battle poke switch - mouse support & cancel button 2022-06-26 21:23:28 +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
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
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 e892977d70 Added Bind animation & Fixed scaling animation anchor functionality 2022-01-07 14:25:57 +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
JappaWakkaP3D 3900fe7191 Fixed Spawned Entities not being removed after the animation is done + Made the switch Pokémon animation look better 2021-10-29 18:54:00 +02:00
JappaWakkaP3D 72599bfd16 Fixed spawned animation entities not being positioned/moved correctly + Added Heal animation + Made other animations be affected by battleanimations option 2021-10-29 15:58:28 +02:00
JappaWakkaP3D 7fba875d02 Fixed a lot of animation system bugs
Fixed:
* Spawned entities not appearing
* Animations getting removed too soon
* Incorrect relative positioning
* Ember textures being searched for in the wrong place
2021-10-24 01:56:29 +02:00
JappaWakka 673178616f Added Battle Animation type Background to temporarily draw a texture to the screen behind the Pokémon but in front of the world 2021-10-22 12:21:13 +02:00
JappaWakka 2c3f46cd2e Updated everything to the new Battle Animations system and the newest commands
Updated Attacks:
Ember, Absorb, Growl, Pound

Updated status effects & shared animations:
Poisoned, Switching Pokémon (own and opponent's)
2021-10-22 12:21:13 +02:00
JappaWakka 168a855ed0 I was not halfway done
I've updated Poison Sting, through which I realized I hadn't taken some usage cases into consideration, so the system should be more robust and useful now
I've also updated the animation for Switching In your own Pokémon
and I've added an animation for when the Pokémon breaks out of the ball when you're trying to catch it
2021-10-22 12:21:12 +02:00
JappaWakka 7ff7f96a47 Battle Animation System Rework about halfway done
Updated to work with the new animation system:
- Catch animation
- Burn animation
- Attack: Tackle
2021-10-22 12:21:12 +02:00
JappaWakkaP3D 9723820427 SFX & Battle Animations
Ported Battle Animation Code
Ported Battle Animations for Tackle, Pound, Growl, Ember and Poison Sting
Normalized all SFX by Perceived Loudness (-11.0 LUFS)
Renamed and moved a bunch of the SFX so they make more sense
Added a jingle when you register a Phone Number
Added a soundeffect for when an elevator reaches its destination
2021-08-22 16:10:06 +02:00
JappaWakka fae7349356
Fix audio engine & contentpacks (#35)
* Replaced existing Gen 2 SFX with better sounding ones (no ugly reverb)
Replaced MediaPlayer with NAudio(and NAudio.Vorbis) for playing music in order to fix random stopping issues.
The game now directly loads .ogg files instead of the .wma/.xnb combination from before.
ContentPacks are now able to replace Music and SFX again (I haven't added a menu yet for choosing ContentPacks).
To make older GameModes work with current versions, you can add the GameMode property EnterType and set it to "1", this will make the game use the older 2D NewGameScreen.

* Delete GameController.vb

* Add gamecontroller.vb back

* Fix sfx missing

* Battleintro doodle now doesn't loop anymore (for no trainer)
Changed the shutter sound (aka Large Door sound) to something more large door-y
Made the enter sound slightly louder
The enter sound now plays when going through any warp to or from an indoor map (including falling through holes)
The flying sound effect is played earlier in the animation after selecting a location
Changed played sound effect when using the Escape Rope to "teleport" instead of "destroy"
The bump noise now also plays when bumping into something in first person
Fixed small gap between the end of the intro song and the start of the main song
Replaced some songs with better songs

* Fixed some more intro issues

* Forgot to change a thing

* Fixed an error where the main music would play, ignoring the muted musicmanager.

* fix indenting in musicmanager

* The music player will now only start playback on a new song if the music player is not muted, fixed the end time calculation of the intro of a song after muting, Music can't be unmuted now as long as a sound effect plays that stops the music.

* Fixed league restplace position, fixed sound effects sharing the volume slider of the music, sound effects are now also muted when pressing M, changed music on/off popup to audio on/off, removed bump delay in first person, added more control on whether played songs should be looping or not.

* Fixed some more scripts that turn on thirdperson mode but don't check if it was on before or set it back to what it was before afterwards, also fixed a small error in creditsscreen.vb.

* Fixed indenting error in musicmanager.vb, fixed an error of mine where the loopsong parameter would be seen as the playintro parameter.

* Added more music commands, added quite some menu select noises, will add more later

* More select sound effects!

* Fix music not resuming after soundeffect

* Trainer using item now plays the single_heal soundeffect

* Pokémon cries now sound louder

* Possibly fixing crash when playing Pokémon cry at volume higher than 0.71

* Added better quality Pokémon cries, made random overworld cries slightly less loud, added cries for 719 and 720.

* Sound effects now sound louder

* Revert "Added better quality Pokémon cries, made random overworld cries slightly less loud, added cries for 719 and 720."

This reverts commit 8c9296ed1a.

* Fixed the cause of why the title screen music plays even when the game is muted

* Tabs to spaces

* Revert

Co-authored-by: darkfire006 <blazer257@live.com>
Co-authored-by: JappaWakkaP3D <66885565+JappaWakkaP3D@users.noreply.github.com>
Co-authored-by: JappaWakkaP3D <jasper.speelman@outlook.com>
Co-authored-by: Vitaly Mikhailov <personal@aragas.org>
2020-07-09 20:59:42 +03:00
nilllzz fcdcbad6c9 fix music, always summer/day in main menu 2018-02-24 01:20:42 +01:00
nilllzz a1786d5181 literally touch every file reorganizing the solution 2018-02-21 16:34:06 +01:00