Commit Graph

29 Commits

Author SHA1 Message Date
JappaWakka 9970d892de Added a line break to catch message 2023-01-13 14:15:43 +01:00
JappaWakka dc454d2a68 Temporarily disabled animations for pvp battles 2023-01-13 14:09:21 +01:00
JappaWakka 69a9586f31 Corrected the transfer to pc message 2022-10-13 13:26:19 +02:00
JappaWakka d2860b15a8 Models work better in battle now 2022-09-27 12:51:51 +02:00
JappaWakka 531137c157 Fix softlock when pausing during catching
And a minor typo in the code
2022-08-18 14:55:52 +02:00
JappaWakka a73bbee55b Revert "Revert "Fix for invisible ball in certain maps""
This reverts commit 49dd67c012.
2022-06-22 20:57:35 +02:00
JappaWakka 49dd67c012 Revert "Fix for invisible ball in certain maps"
This reverts commit 75bc2b7b7c.
2022-06-22 18:12:25 +02:00
JappaWakka 75bc2b7b7c
Fix for invisible ball in certain maps 2022-06-22 11:15:53 +02:00
JappaWakka c22f7d3894 If BattleAnimations = 0, skip catch animations 2022-06-06 15:00:18 +02:00
JappaWakka cb9e810b9d Pokémon rename after catch fix + select menu fix 2022-04-29 21:14:06 +02:00
JappaWakka fe9d48b55b Slight tweak to catch animation 2022-04-25 20:39:57 +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 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
JappaWakka 71455b92a4 Fix for PokéBall in BattleCatchScreen not reaching its destination and giving the catch sound the right name 2021-10-13 21:23:07 +02:00
JappaWakka 3fde479b5a Added PokéBall break sound that's different from the open sound and added "Success_Catch" jingle that plays when catching a Pokémon 2021-10-13 20:27:47 +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
darkfire006 a1ab3786ac Mach III fixes 2020-07-18 20:04:10 -05: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
TheOmegaGhost ff81fea1b9 Updated Dream Ball and Pinch Berries 2019-11-23 03:29:31 -02:00
Vitaly Mikhailov ef0cecfe2e
Added <battle.caught> command 2019-10-31 23:57:27 +03:00
darkfire006 d5cd535685 Fix Dusk ball to have 3.5 in caves too 2019-09-23 23:01:39 -05:00
CaptainSegis 1ad833463f Fixed music not playing after catching a pokemon 2019-01-04 21:36:31 -05:00
OmegaRuan 6d932846f6 Updating a few trainers + catch star 2018-08-20 15:58:13 -03:00
OmegaRuan 082a6f91c4
Updated Ball Catch Rates 2018-08-04 22:46:23 -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