826 Commits

Author SHA1 Message Date
Colin 4c474208de Implemented Surf Animation (#381)
* Menu Indices are reset upon the start of a game. (#355)

* Added `saveIndex` property to certain menus.

* Menu Indices are reset upon the start of the game.

* Added menu indexing for battle menu. (#357)

* Updated Items menu so that item interaction is possible (#362)

Reshaped Items menu, added use/toss Item menu, fixed Pause menu to
reshape if the Player has a Pokedex. Fixes #361.

* Rebased and Addressed Comments to previous PR
2016-11-28 16:51:30 -05:00
Josh Goldberg 9412e3bf44 Merge branch 'master' into 'moves' (#376)
* Menu Indices are reset upon the start of a game. (#355)

* Added `saveIndex` property to certain menus.

* Menu Indices are reset upon the start of the game.

* Added menu indexing for battle menu. (#357)

* Updated Items menu so that item interaction is possible (#362)

Reshaped Items menu, added use/toss Item menu, fixed Pause menu to
reshape if the Player has a Pokedex. Fixes #361.

* Merge branch 'moves' into 'master' (#375)

* Added Bubble battle animation. (#341)

* Fixed bug that causes game to freeze when player uses tackle.

* Added Bubble battle animation

Fixes #315

* Implemented Quick Attack Battle Animation (#354)

* Closes #280
Bug fix: Z press during starter selection

* Implemented Quick Attack
Implemented the battle animation for quick attack. Repetitive code

* Implemented Sand Attack
Sand attack needs the "sand" sprite still.
Also made requested changes to the Quick Attack function (Infinity still needs to be changed).

* Simplified numbers
Made changes like 20*2 -> 40 and 30/2 -> 15

* Added AreaGates to help spawn across areas (#350)

* Added an AreaGate detector

It changes the current area/map/location, but doesn't mess with
offsetes.

* Fixed AreaSpawner direction-based size glitches

* Made ItemsHoldr source-of-truth for map/area/loc

The previous system had it set in saveGame, which meant whatever was
changed in AreaGate activations would be overriden. Now,
`FSP.maps.setLocation` stores it in ItemsHoldr (excluding the Blank
map).

* Added logic to move MapScreenr on area change

The logic is slightly flawed at the moment. Will file a separate issue
to fix it.

* Added `saveIndex` property to certain menus. (#353)

* Implemented Quick Attack
Implemented the battle animation for quick attack. Repetitive code

* Implemented Sand Attack
Sand attack needs the "sand" sprite still.
Also made requested changes to the Quick Attack function (Infinity still needs to be changed).

* Simplified numbers
Made changes like 20*2 -> 40 and 30/2 -> 15

* Completed Quick Attack
Resolved infinity and delay by 20 issues. Quick attack now uses the ExplosionLarge sprite.

* Fixed Quick Attack Implementation
Removed unecessary comments/log statement, made code more readable

* Fixed PR

* Implemented Sand Attack Battle Animation (#359)

* Fixed merge issues

* Fixed comment structure

* Implemented Gust Battle Animation (#368)

* Fixed merge issues

* Fixed comment structure

* Implemented Gust
Sprites used are explosion sprites, need to be switched to gust sprites which alternate orientation

* Made Gust code elegant
2016-11-17 11:51:09 -08:00
Colin 1467e5e1d2 Implemented Ice Beam Attack Animation (#367)
* Menu Indices are reset upon the start of a game. (#355)

* Added `saveIndex` property to certain menus.

* Menu Indices are reset upon the start of the game.

* Added menu indexing for battle menu. (#357)

* Updated Items menu so that item interaction is possible (#362)

Reshaped Items menu, added use/toss Item menu, fixed Pause menu to
reshape if the Player has a Pokedex. Fixes #361.

* Added the Animation and Sprites for Ice Beam and the Framework for Surf

* Revert "Added the Animation and Sprites for Ice Beam and the Framework for Surf"

This reverts commit 2993f90477.

* Added Animation for Ice Beam

* Revert "Changed badge names from name of gym leader to name of actual badge (#326)"

This reverts commit c02c181913.

* Addressed Comments on PR

Corrected newlines, if statements and removed the EventIntervals that
were unnecessary

* Removed the Pyramid of Doom and extra `* 1`'s
2016-11-17 11:48:43 -08:00
Jose Guv a3a02d09c8 Implemented Gust Battle Animation (#368)
* Fixed merge issues

* Fixed comment structure

* Implemented Gust
Sprites used are explosion sprites, need to be switched to gust sprites which alternate orientation

* Made Gust code elegant
2016-11-15 22:48:36 -08:00
Jose Guv 2362678172 Implemented Sand Attack Battle Animation (#359)
* Fixed merge issues

* Fixed comment structure
2016-11-12 13:41:43 -08:00
Jose Guv 312775869d Implemented Quick Attack Battle Animation (#354)
* Closes #280
Bug fix: Z press during starter selection

* Implemented Quick Attack
Implemented the battle animation for quick attack. Repetitive code

* Implemented Sand Attack
Sand attack needs the "sand" sprite still.
Also made requested changes to the Quick Attack function (Infinity still needs to be changed).

* Simplified numbers
Made changes like 20*2 -> 40 and 30/2 -> 15

* Added AreaGates to help spawn across areas (#350)

* Added an AreaGate detector

It changes the current area/map/location, but doesn't mess with
offsetes.

* Fixed AreaSpawner direction-based size glitches

* Made ItemsHoldr source-of-truth for map/area/loc

The previous system had it set in saveGame, which meant whatever was
changed in AreaGate activations would be overriden. Now,
`FSP.maps.setLocation` stores it in ItemsHoldr (excluding the Blank
map).

* Added logic to move MapScreenr on area change

The logic is slightly flawed at the moment. Will file a separate issue
to fix it.

* Added `saveIndex` property to certain menus. (#353)

* Implemented Quick Attack
Implemented the battle animation for quick attack. Repetitive code

* Implemented Sand Attack
Sand attack needs the "sand" sprite still.
Also made requested changes to the Quick Attack function (Infinity still needs to be changed).

* Simplified numbers
Made changes like 20*2 -> 40 and 30/2 -> 15

* Completed Quick Attack
Resolved infinity and delay by 20 issues. Quick attack now uses the ExplosionLarge sprite.

* Fixed Quick Attack Implementation
Removed unecessary comments/log statement, made code more readable

* Fixed PR
2016-11-09 12:42:01 -08:00
tsitsop 3bf840d7e3 Added Bubble battle animation. (#341)
* Fixed bug that causes game to freeze when player uses tackle.

* Added Bubble battle animation

Fixes #315
2016-11-02 09:57:40 -07:00
tsitsop 0bdbb061eb Added saveIndex property to certain menus. (#353) 2016-10-23 19:02:54 -07:00
Josh Goldberg 7597c073d5 Added AreaGates to help spawn across areas (#350)
* Added an AreaGate detector

It changes the current area/map/location, but doesn't mess with
offsetes.

* Fixed AreaSpawner direction-based size glitches

* Made ItemsHoldr source-of-truth for map/area/loc

The previous system had it set in saveGame, which meant whatever was
changed in AreaGate activations would be overriden. Now,
`FSP.maps.setLocation` stores it in ItemsHoldr (excluding the Blank
map).

* Added logic to move MapScreenr on area change

The logic is slightly flawed at the moment. Will file a separate issue
to fix it.
2016-10-23 16:58:15 -07:00
Josh Goldberg 326ca31d8e Merge remote-tracking branch 'origin/mods' 2016-10-15 14:01:54 -07:00
Josh Goldberg 22e5937626 Merge branch 'bugs'
# Conflicts:
#	src/Cutscenes.ts
2016-10-15 14:01:40 -07:00
Josh Goldberg 904c6040b2 Merge branch 'moves' 2016-10-15 14:00:01 -07:00
tsitsop 454375af51 Fixed bug that caused game to freeze when player uses tackle (#340)
* Delete Getting Started.md

It's covered by the Documentation repo.

* Fixed bug that causes game to freeze when player uses tackle.
2016-10-12 20:04:00 -07:00
Jose Guv 57dc4a59aa Bug Fix: Z press while rival walks towards starter (#337)
* Delete Getting Started.md

It's covered by the Documentation repo.

* Bumped MenuGraphr to 0.5.4

* Closes #280
Bug fix: Z press during starter selection
2016-10-12 09:52:07 -07:00
Josh Goldberg 07ae395755 Merge branch 'master' into 'mods' (#339)
* Delete Getting Started.md

It's covered by the Documentation repo.

* Bumped MenuGraphr to 0.5.4
2016-10-12 09:13:15 -07:00
Josh Goldberg a252fb7d29 Merge branch 'master' into 'bugs' (#338)
* Delete Getting Started.md

It's covered by the Documentation repo.

* Bumped MenuGraphr to 0.5.4
2016-10-12 09:12:57 -07:00
Colin 83fa9c2c1b Fixed GeneralText right padding (#335)
* Changed badge names from name of gym leader to name of actual badge

* Delete Getting Started.md

It's covered by the Documentation repo.

* Bumped MenuGraphr to 0.5.4

* Set textPaddingRight to three within GeneralText to get propper padding
2016-10-11 13:04:49 -07:00
Josh Goldberg 7bff56c351 Merge branch 'master' into 'bugs' (#336)
* Delete Getting Started.md

It's covered by the Documentation repo.

* Bumped MenuGraphr to 0.5.4
2016-10-11 13:03:36 -07:00
Josh Goldberg 4afd31bc3b Bumped MenuGraphr to 0.5.4 2016-10-09 21:54:33 -07:00
tsitsop 0ca8bba7c4 Delete Getting Started.md (#330)
It's covered by the Documentation repo.
2016-10-06 15:28:08 -07:00
tsitsop f9eb29c1b8 Implemented Ember animation when the move is used by the player (#328)
* Changed variable names in cutsceneBattleAttackGrowl

* Fixes #314. Implemented Ember animation when used by player
2016-10-04 19:48:51 -07:00
Josh Goldberg 4a05b1ca1c Delete Getting Started.md
It's covered by the Documentation repo.
2016-10-03 20:23:54 -07:00
Colin c02c181913 Changed badge names from name of gym leader to name of actual badge (#326)
👍
2016-10-02 09:42:00 -07:00
Blake Lingenau 39cebb66a7 Extend "Scaling Levels" mod to factor potential wild Pokemon levels (#320)
Fixes #263
2016-09-26 19:23:19 -07:00
tsitsop 4970983a43 Changed variable names in cutsceneBattleAttackGrowl (#319) 2016-09-24 16:07:54 -07:00