Commit Graph

228 Commits

Author SHA1 Message Date
JappaWakka c6c7ef236d Fix for texture bugs
Rival rename texture bug, potential Trainer texture bugs and Player rename texture bugs fixed
2022-06-11 14:46:21 +02:00
JappaWakka 747de3e221
Merge branch 'master' into custommoves 2022-06-10 10:26:10 +02:00
JappaWakka 813992bf51 Fix positioning of values in move summary screen 2022-06-09 13:35:54 +02:00
JappaWakka 41615fb562 Fixed GameJolt save gender saving and loading bug 2022-06-09 11:13:50 +02:00
JappaWakka c22f7d3894 If BattleAnimations = 0, skip catch animations 2022-06-06 15:00:18 +02:00
JappaWakka bc37be1374 Fix for menu screen crash 2022-06-04 16:12:03 +02:00
JappaWakka 537226be76 Map fixes and File Validation message fix 2022-06-04 15:12:29 +02:00
JappaWakka 0ab2493be1 Minor fixes
Added missing RunMode option in the gamejolt save
Fixed error in rewardssystem script
Fixed typo in soundmanager error
Fixed typo in messagebox file validation error
2022-06-04 11:04:00 +02:00
JappaWakka caee81bc13 Possible fix for gj buttons mouse not working bug 2022-06-04 09:44:46 +02:00
darkfire006 8d822e410e y=0 fix button misselect 2022-06-03 16:10:22 -05:00
JappaWakka d9426e43d2 Possible fix for mapscreen crash 2022-06-03 22:02:44 +02:00
JappaWakka a7b834d72b Fix for texture bug in trainer card screen 2022-06-03 21:25:30 +02:00
JappaWakka e0d81272e2 Forgot to change this number 2022-06-03 20:41:08 +02:00
JappaWakka 0f0ad57a4f Fix for gamejolt profile buttons 2022-06-03 20:38:45 +02:00
JappaWakka 80432aea46 Fixed bug with localization tokens (description)
When returning to the main menu, the localization tokens were not getting reset to their default values.
2022-06-02 16:02:54 +02:00
JappaWakka a745630c73 Fix for party screen bug (read description)
Fixed bug in the Party Screen where the Pokémon icons were covered by selection boxes
2022-06-02 13:05:08 +02:00
JappaWakka 0a47307a7c Fixed missing characters in fonts, aligned text
When renaming a pokémon, the input box and the header text messages were off-center so I fixed that
Added some missing characters to the fonts, including the male and female symbols
2022-06-02 12:58:54 +02:00
JappaWakka 1d4c15475e Fixed bug in old NewGame Intro with name input 2022-05-31 21:03:13 +02:00
JappaWakka c1759499e4 Fixed the bug in the description
If you use the @environment.setdaytime(int) command and go back to the main menu, the daytime does not change reset to the system time, causing the main menu to show the wrong background color (e.g. Morning while it is evening)
2022-05-24 22:20:58 +02:00
JappaWakka 455ff447d2 Fixed "No Texture" bug when using Fly 2022-05-23 17:20:27 +02:00
JappaWakka d30f6cca27 Updated Pokédex screen 2022-05-21 21:06:21 +02:00
Jasper "JappaWakka" Speelman ae37c3a083 Pokédex needs some work, not done yet 2022-05-14 19:11:35 +02:00
Jasper "JappaWakka" Speelman 3b77f75541 Fixed summaryscreen 2022-05-14 19:11:08 +02:00
Jasper "JappaWakka" Speelman a7045ea517 Disabled scaling on some menus to prevent issues
for now
2022-05-14 16:26:42 +02:00
Jasper "JappaWakka" Speelman 2153f34aa0 Pause screen scales with window size 2022-05-14 15:03:12 +02:00
darkfire006 78f9e9e4c7 more for the optional param 2022-05-08 02:02:47 -05:00
Jasper "JappaWakka" Speelman f18dc03c4c Contentpack info out of bounds fix 2022-05-06 22:45:13 +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 797cd45085 Battle related music bugs fix 2022-04-19 18:13:18 +02:00
JappaWakka a017bb653d Added option for running hold/toggle mode 2022-04-19 12:05:00 +02:00
JappaWakka a00a97412b Fixed Save Screen font, scale & Pokémon icons 2022-04-16 20:17:09 +02:00
JappaWakka e187747ef8 Party display improvements
* Positions and rotation origins of Pokémon icons improved in Party Screen
* Pokémon in Main Menu now display their correct form (e.g. Unown showing the correct letter)
2022-04-16 18:24:26 +02:00
JappaWakka 5cda771e81 Fix for animations not updating while pausing 2022-04-16 18:20:53 +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
JappaWakka 249a93bc3f Better implementation of the ChooseBox texture 2022-04-16 14:35:35 +02:00
JappaWakka 35ff0a601d Fix for NewGame camera updating bug 2022-04-15 16:34:55 +02:00
Jasper "JappaWakka" Speelman 5a91f9f0a7 Options Screen and Pause Screen improved
* When a button is selected in the pause screen, the font now becomes white with a black shadow
* Cursor movement and scroll bar usage bugs fixed
2022-04-14 20:16:29 +02:00
Jasper "JappaWakka" Speelman d85e650f14 Updated StatisticsScreen & PokegearScreen
[StatisticsScreen]
* Properly scaled and positioned text and item icons

[PokegearScreen]
* Replaced Minifont with Mainfont
* Made switching tabs in the PSS menu more clear and controlable with the mouse
2022-04-11 20:44:33 +02:00
Jasper "JappaWakka" Speelman b3b46e97ac Made button text color white if selected 2022-04-11 20:02:16 +02:00
Jasper "JappaWakka" Speelman cd9474ac5c Fixed WorldMap PlayerSkin bug when surf or ride 2022-04-10 19:19:54 +02:00
Jasper "JappaWakka" Speelman 53d9823387 Added PlayerPosition tag to Map Screen 2022-04-10 19:12:30 +02:00
Jasper "JappaWakka" Speelman 044a3d2489 Prevent mapscreen playerskin from getting too big
If playerskin on mapscreen > 32px wide then halve the skin size to prevent it from getting too big on the map
2022-04-09 22:18:06 +02:00
Jasper "JappaWakka" Speelman b28dbf6212 Playerskin is now visible on map screen 2022-04-09 22:09:39 +02:00
JappaWakka 988d54d1a6 Possible fix for escape button inputfield crash 2022-03-31 21:14:42 +02:00
JappaWakka cc4203b150 Made the 3d intro screen auto-load custom moves
Just like the old 2d intro screen
2022-03-29 18:58:34 +02:00
JappaWakka c23c5a244e Merge branch 'BattleAnimations' 2022-02-22 13:10:43 +01:00
darkfire006 e01615e256 add APC for modeling work 2022-02-18 11:11:02 -06:00
JappaWakka 2c7fbf8364 DayTime, Level & PlayerSkin improvements
* Changed the DayTime enum name to DayTimes for consistency with other enums like Seasons
* Changing the EnvironmentType or WeatherType will now not reset back to the default when Reloading a map with the R key (Warping or loading a different map normally does reset those properties)
* @level.setdaytime(int) is now @environment.setdaytime(int), which sets the DayTime permanently across maps. Setting the daytime to any other value than 1 2 3 or 4 will reset the daytime to the default one
* Added command @player.setskin(name) which will permanently change the player's skin, unlike @player.wearskin(name) which only changes the skin temporarily.
2022-02-17 13:46:15 +01:00
JappaWakka eea9d543be Improved NewGameScreen and NewNewGameScreen
Ported skin selection and naming screens from 3d newgame intro to 2d newgame intro and made sure that there are no bad symbols in the foldernames.
2022-02-16 21:47:00 +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 e4eee9f090 ContentPack Information Menu Tweaks
The title box is now dynamic in width so the name of the contentpack can be larger.
The information box under that is now properly aligned and has a more pleasant size to match the new font.
2022-02-14 11:30:20 +01:00
JappaWakka 52b3354dd0 Removed ContentPack auto-generated "Content" field to allow for the description to be larger. 2022-02-09 21:51:12 +01:00
JappaWakka 14d4bc5ea2 Improved the cursor positioning in the ingame menu 2022-01-16 17:26:58 +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
JappaWakkaP3D f5941a79bc Fixed a bug in the option menu (see description)
BUG: If you go to the contentpack options menu in the main menu, then exit out of it and start the a save file, the ingame options menu still displays the contentpack menu
2021-12-28 13:56:53 +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 8bbbb729a7 Fix for a bug where you couldn't use certain items outside of battle 2021-11-26 21:59:52 +01:00
JappaWakkaP3D 526c226e22 Added shadow to the JoinServerScreen title text 2021-11-26 21:58:28 +01:00
Jasper "JappaWakka" Speelman ee7aaa2e0e ContentPack menu mouse selection fixes 2021-11-06 12:05:15 +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
JappaWakkaP3D 9b8022897c BattleIntro CustomBattleMusic fix 2021-10-26 23:43:23 +02:00
JappaWakkaP3D ba313f78ae Added & Changed Tokens + Added functionality for genderless players
Options Menu and Main Menu can be translated now
2021-10-22 20:22:13 +02:00
JappaWakkaP3D 9bde9a71ed Main Menu & Options Menu Fixes and Improvements
* Gave enabled Content Packs better feedback by making the text green if it's enabled
* Removed the "enabled" suffix from enabled Content Packs
* Changed the "enabled:no/yes" text in the Content Pack menu to "Enable" when the selected Pack is  disabled and "Disable" when the selected Pack is enabled
* Fixed mouse clicks registering in a different location on the Content Packs menu
When clicking any button on the row above the options submenu while the options submenu is opened, I made it close the submenu and move to that button.
* Added visual keypress feedback when pressing a commandbutton. The key will revert back to it's regular look when the mouse/keyboard/controller button is released.
* Fixed the jump when moving the cursor in the options menu from a slider to a button and vice versa.
* added an "apply" button to the main menu's option menus
* Made the "back" buttons in the main menu's option menus  not apply the changes.
* Made the language change when you scroll through the languages. Tokens in other languages need to be updated!
2021-10-22 18:13:33 +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 2941da57dd Structures inside structures works now, new Healing Machine & restart music when applying contentpacks fix 2021-10-19 20:40:37 +02:00
JappaWakka 6d30a0ebdf Added @screen.showmessagebox(text|r.g.b|r,g,b|r,g,b) command and fixed blurry scaling 2021-10-18 21:36:26 +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 43f3e8ef6a Second attempt at GameJolt description box color fix 2021-10-15 22:26:35 +02:00
JappaWakka 72fed3aa22 Main Menu & Option Menu fixes and improvements
PressStartScreen:
* Fix for GameJolt Profile not loading automatically
* Hopefully fixed GameJolt Profile's description box having the wrong color sometimes
* Hopefully fixed GameJolt Profile gender buttons having the wrong position.
* Made the description box in the GameMode selection menu expand vertically but not horizontally

NewOptionScreen:
* Removed the broken automatic position and scale adjustments at lower resolutions
2021-10-15 22:10:37 +02:00
Daniel S. Billing 659480f6d8 Renamed "Xbox 360 Controller" to "Xbox Controller" 2021-10-14 21:32:47 +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
JappaWakka 6ee71755af Fix for incorrect Main Menu scaling at lower resolutions
Also made the contents of the pausescreen at least stay inside the window at lower resolutions
2021-10-11 21:49:24 +02:00
JappaWakka 0c76e718dd Options Menu & Join Server Screen fixes
Fixed ContentPacks menu layout

Fixed the cause of the Options Menu crashing

Replaced the MiniFont in the JoinServerScreen with the InGameFont

Adjusted positioning of text in AddServerScreen
2021-10-06 00:11:56 +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 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
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 51a481da62 Added Audio Menu icon, Added support for GameMode descriptions & GameMode splash screens
Also improved the look of the GameMode menu
2021-10-01 12:44:08 +02:00
darkfire006 6f5d34f0b5 Allow for script determined roamer shinyness 2021-09-30 10:16:26 -05:00
darkfire006 f16fee3a7a Preliminary Destiny Knot implementation
very rough add
2021-09-29 18:08:24 -05:00
JappaWakka bb6181679d Added Controls Menu Icon 2021-09-30 00:18:58 +02:00
JappaWakka 1081595d24 Added ContentPacks & Language Menu Icons, Fixed arrow color, Centered text of mainmenu buttons 2021-09-29 23:47:57 +02:00
JappaWakka cbd7a4ec84 Fixed mouse selection for Language Menu 2021-09-29 17:38:56 +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 cf56508ed0 Content Pack Menu tweaks
whenever you scroll (or press up/down) on the buttons at the bottom, the select sound plays (with a delay so you can't spam it) so the player knows it does something

I also renamed Up and Down to Move Up and Move Down to avoid confusion
2021-09-29 16:29:49 +02:00
JappaWakka 0e8b60cfc4 Options Freezing fix
Fixed OptionsScreen freezing in-game & when clicking Pack Information in ContentPack Menu in the Main Menu
2021-09-29 15:57:29 +02:00
JappaWakka 7583e5d97c PressStartScreen fix
Fixed the issue where when you press a key to go to the main menu while the splash/logo screen was fading in, it would freeze halfway through the fade and you'd have a main menu with a darker background than it should be. Now when you press a key, it just skips the fade before switching the screen to the mainmenu
2021-09-29 14:43:07 +02:00
JappaWakka 106de657f0 Main Menu Crash Fix & Options Menu Cursor Fix
Fixed a crash when moving to the content pack button in the main menu options row while having no savegames.

Fixed the options pointer changing position when resizing the game window.
2021-09-29 14:32:05 +02:00
darkfire006 e5d543c945 mastershinyrate
create global control for shiny rate, update it for standard encounters and breeding and make it script callable
2021-09-29 02:25:17 -05:00
JappaWakka d3bad8913b Options Menu fixes & Mouse Speed renamed
The options are now saved when going back to the main menu

Mouse Speed is now called Camera Speed
2021-09-28 17:50:49 +02:00
JappaWakka 6ca257ce91 Faster Textbox Popup & Menu Font Position & Scale Fixes 2021-09-28 17:30:43 +02:00