Commit Graph

116 Commits

Author SHA1 Message Date
JappaWakka ce165c1e57 Fix for battlemaps with scriptblocks on them
like battle\underwatercave\underwater.dat
2023-03-19 19:11:12 +01:00
JappaWakka 9a7543fb33 Fix for StrengthRock softlock 2023-03-09 17:14:56 +01:00
JappaWakka 300aa87738 Fixed slideblock and waterfall 2023-02-12 18:57:20 +01:00
JappaWakka f77c45d102 Prevent walking into slideblocks from the back 2023-02-12 12:05:45 +01:00
darkfire006 3ea6b65cac remove annoying case insenetivity 2023-01-08 01:49:10 -06:00
JappaWakka 9d9045218c This should prevent TurningSign crash 2022-12-19 06:11:48 +01:00
JappaWakka 790e8ec382 Water animation in Waterfall can be vertical 2022-12-18 14:53:33 +01:00
JappaWakka f3633cc0d8 Whirlpool animation textures can now be modified
Also removed a tag that wasn't used
2022-12-18 14:42:09 +01:00
JappaWakka 9d5411986f Update TurningSign entity rotation speed system 2022-12-15 19:13:10 +01:00
JappaWakka 8ea37604eb @Screen.ShowImage can now scale depending on size 2022-11-15 14:56:54 +01:00
JappaWakka f5eff34304 Allow darker shading with different environments 2022-11-02 10:36:50 +01:00
JappaWakka 470ccdff4f Another try at fixing waterfall bug 2022-10-02 12:50:34 +02:00
JappaWakka 269b7c3721 Fixed scriptblocks sometimes not executing 2022-10-01 12:44:42 +02:00
JappaWakka d2860b15a8 Models work better in battle now 2022-09-27 12:51:51 +02:00
JappaWakka da2242b24b Water animations rotation can now also be vertical
Instead of putting all water textures next to each other, you can also put sequences of 3 textures below each other if you add a 1 to the end of the definition of the water texture in additional value.
2022-09-20 21:34:04 +02:00
JappaWakka 4785492836 AnimationBlocks now support SeasonTextures 2022-09-18 21:01:34 +02:00
JappaWakka 3d41783c71 Failsafe for Pokémon player texture 2022-08-28 14:29:09 +02:00
darkfire006 5614e05e4e replace random use age of different NPC skin names 2022-08-25 01:10:16 -05:00
darkfire006 0e32b45b6c allow white space before trainer scripts for insight detection 2022-08-23 00:08:55 -05:00
darkfire006 bae3a28431 Revert "Remove caps from registers"
This reverts commit 7310e3cd13.
2022-08-09 10:34:56 -05:00
darkfire006 7310e3cd13 Remove caps from registers
re Strength triggers and time registers
2022-08-06 21:49:50 -05:00
darkfire006 56908b35f9 just the script block fix without the other "fixes" 2022-08-06 21:48:57 -05:00
darkfire006 21bfdc2b74 Revert "Fix for softlock scriptblocks with strengthrocks"
This reverts commit 5003186b39.
2022-08-06 18:22:13 -05:00
JappaWakka 5003186b39 Fix for softlock scriptblocks with strengthrocks 2022-08-06 23:36:45 +02:00
JappaWakka 6f5f992d6e Fix for softlock animations and tail whip crash 2022-07-24 15:16:16 +02:00
JappaWakka eb69a8ee5b Maybe this'll prevent animatedblock crash 2022-07-24 10:45:18 +02:00
Jasper "JappaWakka" Speelman 2dd64aa7be Animatedblock faces camera if modelid = 3 2022-07-23 19:52:28 +02:00
JappaWakka 31a1c3b6d5 Hopefully this'll prevent animatedblock crash 2022-07-21 10:11:24 +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
darkfire006 64a7b1fab2 have headbutt trees and smash rocks use the spawner correctly to get forms 2022-07-10 18:19:10 -05:00
JappaWakka 9dd17a9c65 Fix slideblocks resetting player speed (descr.)
Fixed the following bug:

If the player runs up or down a slideblock, and then walk up or down another slideblock right after the movement script is finished, then the player will walk at regular speed.
2022-07-05 17:49:23 +02:00
JappaWakka 04d9cce576 Removed unnecessary stuff from waterfall script 2022-06-26 21:02:33 +02:00
JappaWakka e60877d880 Now I definitely fixed waterfall bug 2022-06-14 19:48:18 +02:00
JappaWakka dab417e190 DiamondDive WaterFall fix and other fixes
Added @player.stopmovement before waterfall scripts to make sure the player doesn't move further than they should
Fixed spelling error in code: NotifcationTypes -> NotificationTypes
Added commands to ScriptLibrary that were missing
2022-06-14 18:12:29 +02:00
JappaWakka eac10fbdb2 Fix for waterfall movement bug 2022-06-06 12:10:22 +02:00
Jasper "JappaWakka" Speelman 6810a35dfd Shaders now independent of daytime 2022-05-14 14:45:01 +02:00
Jasper "JappaWakka" Speelman a0b2626523 Fix for animatedblock crash 2022-05-06 22:10:16 +02:00
JappaWakka ea0ab80ba6 Water animation improvements
* Added the ability for contentpacks to change the animation speed of water
* Water backdrops are synced to the current map's water animation speed
2022-04-16 18:19:27 +02:00
Jasper "JappaWakka" Speelman bda6f66423 Potential debugwalk fix for rockclimbing 2022-04-08 12:16:07 +02:00
Jasper "JappaWakka" Speelman e62c49b7bb Potential bugfix for 2x debug move on water 2022-04-07 12:01:32 +02:00
Jasper "JappaWakka" Speelman d65b7dc10b Replaced inconsistent overworldpokemon commands
The following commands has been replaced by @overworldpokemon.hide:
* @pokemon.hide
* @player.hidepokemonfollow
The following command has been replaced by @overworldpokemon.show:
* @player.showpokemonfollow
and the following unused command is now replaced by @overworldpokemon.toggle:
* @player.togglepokemonfollow
2022-04-04 19:37:40 +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 5b7a6fc9ab Fixed Overworld Pokémon texture animations
Pokémon textures with 3 and 4 frames work better now
When the player is running, the Pokémon animates faster
When a (network) player is standing still, the Pokémon animates slower (unless the Pokémon texture has 4 frames, then it stops at the first frame)
Cleaned up the code a little
2022-01-08 18:00:05 +01: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 d1fd63dafa Updated GameDevCommon submodule to use .NET 4.6 & Mo
And fixed some color errors
2021-10-21 20:49:07 +02:00
JappaWakka 904f2007a8 Fix for NetworkPokemon textures messing up 2021-10-15 19:13:25 +02:00
JappaWakka cae2b61ef7 Music Fixes and other Audio-related QoL things
Fixed music playing errors

[Added Songs]
Mom (as there wasn't any music for when the mom gives you the pokégear)

PVP_Intro (PVP music didn't have an intro before and I also replaced PVP with a better sounding version)

[Added Sounds]
Emote_Exclamation (can be used when using the ! emote for NPCs)

Receive_HM (the game checks if the name of the item that was received contains "HM", if so, this sound is played instead of the regular item receive sound)
2021-10-04 01:14:55 +02:00
darkfire006 bf6c263cc1 Revert "Music & SFX Renaming"
This reverts commit 0bf513e3b7.
2021-10-03 14:49:51 -05:00
JappaWakka 0bf513e3b7 Music & SFX Renaming
Renamed all of the songs with properly capitalized names to improve recognizability and readability.

I also changed some song names and added some sounds & I edited the maps and songs accordingly

[Changed Songs]
alph = RuinsOfAlph
barktown = NewBark
frontier = BattleFrontier
indigo = IndigoPlateau
mtmoonsq = MtMoonSquare
rHideout = Rocket_Hideout
safari = SafariZone
safarigate = SafariZone_Gate
kVictoryroad = VictoryRoad
--
[Added Songs]
Mom (as there wasn't any music for when the mom gives you the pokégear)

PVP_Intro (PVP music didn't have an intro before and I also replaced PVP with a better sounding version)

[Added Sounds]
Emote_Exclamation (can be used when using the ! emote for NPCs)

Receive_HM (the game checks if the name of the item that was received contains "HM", if so, this sound is played instead of the regular item receive sound)
2021-10-03 21:35:02 +02:00
JappaWakka bd8f91e338 Pokémon idle animate when they have only 2 frames 2021-10-03 11:09:08 +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
Jasper "JappaWakka" Speelman 073ed91356 NPCs can get on and off chairs
The Y Position of an NPC when moving is now a Single (instead of an integer), allowing for NPCs to climb on and off chairs without their Y Position being rounded down.
2021-09-25 13:32:09 +02:00
Jasper "JappaWakka" Speelman 425a336401 Typo fix in code
AnimationDelayLenght
is now
AnimationDelayLength
2021-09-25 13:28:15 +02:00
Jasper "JappaWakka" Speelman 86076944b2 Pause Screen Fixes + Indentation fix
- Fixed crash that occured when pausing the game during the old intro
- Fix weird indentation in warpblock.vb
2021-09-25 00:28:06 +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 9244a18653 [Overworld Pokémon Fix]
Fixed OverworldPokemon from continuing to walk infinitely when pausing the game, opening a chat window or while the current screen is any other screen than OverworldScreen
2021-01-21 10:35:51 +03:00
Daniel S. Billing d18c44ef23 Minor oprator changes 2021-01-08 22:35:33 +01:00
aragas b10415ccf0 tabulation 2020-11-06 15:10:24 +03:00
JappaWakkaP3D e8d980b34a Fixed scriptblocks not showing the text in AdditionalValue when the Action value is set to 2 2020-11-06 15:10:24 +03: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
CaptainSegis e1faeb362f Hopefully fixed all time related issues 2019-08-03 18:37:07 -05:00
CaptainSegis 7b8e781dce - Added missing houses in Six and Seven Island.
- Implemented @NPC.dance and @Player.dance commands.
- Implemented the CameraDistanceDelta tag, which allows entity CD to be adjusted manually.
2018-08-28 19:34:58 -05: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