Commit Graph

154 Commits

Author SHA1 Message Date
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
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 944cf6ae71 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:25:00 +02:00
JappaWakka ea12c8f5f4 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:24:56 +02:00
JappaWakka 02ed129c85 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:24:48 +02:00
JappaWakka d20abdf6df Hit Animation + Restructure of attack sound effects + Absorb animation
Attack sound effects are now in the folder of the type of their attack

Pokémon flicker briefly when hit
2021-10-22 12:23:32 +02:00
JappaWakka 79edf72d1c Fix Burned animation error 2021-10-22 12:22:06 +02:00
JappaWakkaP3D 758154551b Battle Animations 22-08-2021
Made the Battle Animation implementation functional
Added animations for:
Stats Increasing
Stats Decreasing
Status Effects
- Poisoned
- Burned
Attacks
- Ember
- Growl
- Pound
- Tackle
- Poison Sting
2021-10-22 12:22:06 +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
JappaWakka b95d4d1c69 Hit Animation + Restructure of attack sound effects + Absorb animation
Attack sound effects are now in the folder of the type of their attack

Pokémon flicker briefly when hit
2021-10-22 12:21:12 +02:00
JappaWakka 09e5661729 Fix Burned animation error 2021-10-22 12:21:12 +02:00
JappaWakkaP3D c79f92b3e8 Battle Animations 22-08-2021
Made the Battle Animation implementation functional
Added animations for:
Stats Increasing
Stats Decreasing
Status Effects
- Poisoned
- Burned
Attacks
- Ember
- Growl
- Pound
- Tackle
- Poison Sting
2021-10-22 12:21:11 +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 a85849a52c Added @screen.showimage(texture,[sound],[x],[y],[w],[h]) command
To show an image like with @screen.showpokemon but one that's not necessarily the texture of a Pokémon, like the fossils at Pewter City, which I've also added textures for. Arguments in the title of this commit between brackets are optional.
2021-10-17 17:44:01 +02:00
JappaWakka dd34d9731c CanMuteMusic = CanMuteAudio & other tweaks
- CanMuteMusic property in source code renamed to CanMuteAudio

- Old New Game intro and Localization errors (made by me) fixed
2021-10-01 15:24:54 +02:00
JappaWakkaP3D 7227be54c2 Fixed error 2021-08-22 17:27:01 +02:00
JappaWakkaP3D 3a35860f7a Removed visible animations for now 2021-08-22 17:24:06 +02:00
JappaWakkaP3D c6625de6f9 Fixed some battle animation errors and added content that I forgot, also corrected ViceGrip spelling 2021-08-22 16:47:26 +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
JappaWakkaP3D d8f7319bc7 Permanent item loss caused by attacks fix
If an item is swapped/removed/whatever in a battle
  If it's a PvP battle or a Trainer battle
    Every Pokémon that has its item removed gets its original item back
  If it's a Wild battle
    If a Pokémon that had its original item removed is holding
    a different item (because of the attack Trick for example)
      The Pokémon keeps the new item and the original item is added to
      the inventory.
2021-01-30 22:34:02 +01: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 90e3ea7fee Contrary message display fix 2020-04-19 04:20:18 -03:00
TheOmegaGhost 000d45be6d Flash Fire now activates properly 2020-04-19 02:20:42 -03:00
TheOmegaGhost 9949c565e1 Minor Move and Item name update
Leek updated
Vise Grip updated
Steel Beam half implemented
2020-04-10 00:07:57 -03:00
TheOmegaGhost 1f20cade3c Made Berserk Gene more interesting 2019-11-23 05:06:08 -02:00
TheOmegaGhost ff81fea1b9 Updated Dream Ball and Pinch Berries 2019-11-23 03:29:31 -02:00
TheOmegaGhost 94a0ee7ce6 Updated Synchronize and Moody 2019-11-23 03:15:53 -02:00
TheOmegaGhost 82fa8630f7 Missing part of last commit 2019-11-23 02:20:02 -02:00
TheOmegaGhost f447d7a18c Gen 8 updates
Updated Rapid Spin, Howl and King's Shield
Updated abilities interacting with Intimidate
Updated ability and move listings
Updated Koffing and Weezing abilities
Updated Aegislash's forms base stats
2019-11-23 02:11:15 -02:00
Vitaly Mikhailov ef0cecfe2e
Added <battle.caught> command 2019-10-31 23:57:27 +03:00
Ruan Pablo 5b5a648843 Choice Items Added 2019-10-09 03:10:44 -03:00
Ruan Pablo 8bb0c00a10 Belly Drum fails if attack maxed, fixed stat messages 2019-10-02 17:31:27 -03:00
darkfire006 f56696df23 Stat in crease text change 2019-10-01 19:01:10 -05:00
TheOmegaGhost ac6882104c Added Elemental Gems + new gene location 2019-10-01 02:32:04 -03:00
TheOmegaGhost 8e1c0733aa Added Snowball and Cell Battery battle effects 2019-09-30 19:34:52 -03:00
Ruan Pablo aedec48f93 Terrain final implementation + typos and move fixes
fixed fake-out/first impression working on 2 turns
fixed protecting move breaking messages
fixed trapping/binding moves and abilities
fixed flinch message popping up unnecessarily
updated natural gift BP calculation
updated some moves' contest category and other stats
added roseli, kee, maranga berry effects
added alolan pokemon abilities
added smacking down effect
added terrain as well as its effects
replaced polkadot bow (no use) with berserk gene
other minor fixes such as typos, captalizations
wrapping up other commits
2019-09-27 15:46:23 -03:00
Ruan Pablo 35b77ec646 minor typo fix 2019-01-23 02:23:34 -02:00
CaptainSegis ca5be51d4c Some minor fixes 2019-01-20 11:11:07 -05:00
CaptainSegis df5a6806ba Small tweaks 2018-12-24 07:44:46 -05:00
CaptainSegis dd8f4d4192 Merge 2018-12-24 07:31:53 -05:00
Ruan Pablo 6fc51e95b1 Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy 2018-12-22 18:27:26 -02:00
Ruan Pablo a061239256 Move fixes 2018-12-22 18:25:36 -02:00
CaptainSegis 87edaa0ee6 Fixes regarding battle system 2018-12-22 15:02:02 -05:00
CaptainSegis 2784bbe54a Tiny BattleMenu visual fix 2018-12-21 20:26:51 -05:00
Ruan Pablo 813a5a373e Added some Gen 7 moves 2018-11-08 17:34:07 -02:00
Ruan Pablo c4105ad5aa Added some missing moves up to Gen 6 2018-10-26 06:03:33 -02:00
CaptainSegis 17e2dc5fed Done with status condition icons 2018-10-21 22:20:08 -05:00
Ruan Pablo 35bb43d0a4 some moves + min gfx 2018-10-22 00:10:27 -02:00
CaptainSegis 9e91ee9393 Fixed message related to whirlpool 2018-09-03 02:10:48 -05:00
CaptainSegis f8d579b6ff Balance changes from Gen 7 to Sheer Cold and Prankster 2018-08-20 15:25:47 -05:00
CaptainSegis 1ecf95745f Soul Dew 2018-08-16 20:01:08 -05:00
CaptainSegis a1aff31089 Minor visual fixes 2018-08-16 18:53:49 -05:00
CaptainSegis ab2071a72e Able to build now 2018-08-16 16:57:27 -05:00
OmegaRuan 0a721d1045
Updated to Gen 7 Battle Functionality 2018-08-04 22:40:06 -03:00
CaptainSegis 6b33815b2b Tiny fix about mega evolution 2018-03-25 21:05:39 -05:00
CaptainSegis b9c39c07ae Fixed Mega Evolution not reverting when the pokemon faints 2018-03-25 19:44:21 -05:00