Commit Graph

45 Commits

Author SHA1 Message Date
JappaWakka d96fdbd80a
Fixed bug with battle intro music 2022-03-26 11:43:38 +01:00
JappaWakka c23c5a244e Merge branch 'BattleAnimations' 2022-02-22 13:10:43 +01:00
JappaWakka bbfc4acdd8 Fixed Some Bugs
* Skin genders in the new game intro now grab the correct localization string
* Badges rotate around the center of their texture's width and height, which fixes the bug where the badges would rotate off-center when the texture resolution was different.
* The selected button background color in the GameMode selection screen is now light and the unselected buttons are dark instead of the other way around.
2022-02-14 19:28:21 +01:00
JappaWakka 575b48de04 Make it possible for the scale factor to be a Single instead of always an Integer. 2022-02-09 21:49:54 +01:00
JappaWakka 13c838c9aa Actually saved the WallModel file 2022-02-03 22:31:11 +01:00
JappaWakka 1d4087aa2a Fixed music crashes
* Fixed crash when trying to play an intro of a battle song that wasn't an ogg
* Fixed crash when trying to resume the music after using the command @music.stop
2022-02-03 22:20:43 +01:00
JappaWakka fbba01d0c4 Added WallModel (ModelID=20) & CeilingModel (ModelID= 21) 2022-02-03 22:18:04 +01:00
JappaWakka 54ea0e57ba Added WallModel (ModelID=20) which is a flat vertical surface on an offset (like a wall) 2022-01-29 00:06:58 +01:00
JappaWakkaP3D 9b8022897c BattleIntro CustomBattleMusic fix 2021-10-26 23:43:23 +02:00
JappaWakkaP3D 0e49fbfd00 Contentpack music fix
When a song that didn't have an intro in the gamemode has one in a contentpack, the game didn't check for that. Now it does
2021-10-23 22:52:53 +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
darkfire006 a368099b07 insert start script into Kolben GM and create the script files for the reward system 2021-10-21 01:07:15 -05:00
JappaWakka c96d6443b5 Fixed TextureReplacement function of exceptions.dat in ContentPacks and made the Chat window look better
When typing a message, the cursor flickers on and off like in a text editor
The category icons in the chat window are now a consistent 24x24px
2021-10-18 21:38:20 +02:00
JappaWakka 4132bbe1c0 Fixed the music gap between BattleIntroScreen and BattleScreen
Also replaced the johto_wild music with a well-looped one
2021-10-17 22:13:18 +02:00
JappaWakka e6e44cec29 Added .mp3 & .wma support for the music engine 2021-10-13 18:08:18 +02:00
JappaWakka 799792e49c Various Fixes & Improvements
Fixed PlayerSkins displaying incorrectly in the new intro.

Fixed position of Pause Menu text.

Songs don't fade in by default now except with the @musicplayer.playfade(songname) command

You can now also close the Options row in the Main Menu with the "Up" or "Move Forward" keys

Improved the timing of the Battle intro screens

Renamed Badge_Aquired to Receive_Badge for consistency
2021-10-03 21:18:25 +02:00
JappaWakka 18c7f59fa0 Big Overworld Sprites Change + old NewGameI intro fix
Made it possible for Pokémon, NPCs and players to use textures that have 2 frames (1 - 2 - 1 - 2), 3 frames (1 - 2 - 1 - 3) or even 4 frames (1 - 2 - 3 - 4) with the numbers between the brackets being the order of the frames

- All default pokémon overworld sprites are now 2 frames wide

- Removed an error in the old NewGame intro

- Pokémon don't animate unless moving or when in battle
2021-10-01 17:06:41 +02:00
JappaWakka 9def5642e8 Lots of QoL changes
- You can now run up and down a slideblock.
- NPC movement type Straight is now less random and more smooth.
- When renaming the rival, the skin visible at the top changes to whatever skin is set as the rivalskin. This way, the rival is not stuck with one skin. This can be useful when the rival's skin changes based on the player's gender for example.
- Text messages that contain <token.tokenname>, where tokenname is a string from the localizations files, have the part between the <> replaced with that string now.
- Text messages that contain <button.buttonname>, where buttonname is one of the controls defined in "Saves\Keyboard.dat", will now have the part between the <> replaced with the key assigned to that control.
- Players can now be genderless instead of only either male or female in scripts.
- Which skins are available in the intro is now defined in the GameMode's definition file instead of being hard-coded
- Old New Game intro now uses the player skin data from the GameMode definition file
- The Pokémon in the old New Game now doesn't fall too far down anymore
- Scripts adjusted to match the new gender functionality
2021-10-01 15:19:04 +02:00
JappaWakka c4ab6604a6
Merge pull request #73 from P3D-Legacy/mainmenu-rework
Main Menu Rework
2021-09-29 16:59:40 +02:00
JappaWakka a285710f5b Added OutsideStepModel 2021-09-27 22:51:48 +02:00
Jasper "JappaWakka" Speelman 9434417c31 Kolben GameMode IntroType fix
I forgot to add the correct IntroType of the Kolben GameMode to the GameMode file.
2021-09-25 19:55:36 +02:00
Jasper "JappaWakka" Speelman b0ca5ab1d9 Options Menu update 2
- Applying ContentPacks works perfectly now and plays the Save sound when done
- ScrollBars in the options menu work correctly again
2021-09-25 00:27:12 +02:00
Daniel S. Billing 8cb50ea28a Added a fix for #59 2021-01-24 17:23:16 +01:00
JappaWakka c09656fe38 Restarting Music Fix
Fixed the music from restarting after unpausing or exiting the menu
2021-01-24 16:58:10 +03:00
JappaWakka 621a6bc364 [MusicManager Fixes]
Fix for the game taking longer to resume after pausing on a map without music
Fix for audible gaps between intros and regular songs
2021-01-21 10:36:55 +03:00
aragas b10415ccf0 tabulation 2020-11-06 15:10:24 +03:00
JappaWakkaP3D 3799887e15 Fixed a bug where the fix for the volume would cause music loops to stop working 2020-11-06 15:10:24 +03:00
JappaWakkaP3D 620f4d8325 Actually fix the music sharing its volume with the soundeffects 2020-11-06 15:10:24 +03:00
darkfire006 b58d3411b3 hatch music fix 2020-08-03 00:02:18 -05:00
darkfire006 b77ea6890a some Gen 8 data files + a small music fix 2020-07-13 22:10:50 -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
darkfire006 94ca5e3a73 pokemon cries slash didnt match for no apparent reason 2019-09-28 22:12:57 -05:00
nilllzz 71528d85a1 maybe fix the battle music 2019-01-13 00:55:17 +01:00
CaptainSegis 6925c74aa3 Lazy "fix" towards intros being cut by about 0.1 seconds 2018-10-02 00:49:58 -05:00
CaptainSegis 3053a55b9e Fixed some map's music loop. Fixed @Music.Play(no_music). 2018-10-01 20:38:26 -05:00
CaptainSegis 60171e1047 Temporary fix. Music files edits pending. 2018-05-02 18:48:39 -05:00
CaptainSegis 83570f5789 Fixed all known, noticeable bugs related to music in the engine. 2018-04-01 12:07:18 -05:00
CaptainSegis 01acc00a5b Fixed mute/unmute 2018-03-12 02:58:57 -05:00
nilllzz fb64e8dd07 store duration with reflection 2018-03-08 19:22:23 +01:00
CaptainSegis 664168e6ba Fixed some bugs related to song intros duration. 2018-03-04 15:21:47 -05:00
nilllzz b74fee0383 Fixed #7, @music.stop does not stop music 2018-02-25 11:01:45 +01:00
nilllzz fcdcbad6c9 fix music, always summer/day in main menu 2018-02-24 01:20:42 +01:00
nilllzz ce42b42806 fix blur shader 2018-02-22 23:43:27 +01:00
nilllzz f9291fd65c fix sounds and music 2018-02-22 03:40:20 +01:00
nilllzz a1786d5181 literally touch every file reorganizing the solution 2018-02-21 16:34:06 +01:00