Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Game_Character classes 2 of 2 #1522

Merged
merged 16 commits into from Dec 17, 2018

Conversation

Projects
None yet
4 participants
@fmatthew5876
Copy link
Contributor

fmatthew5876 commented Dec 3, 2018

No description provided.

@fmatthew5876 fmatthew5876 changed the title Refactor Game_Character classes 2 of 2 Refactor Game_Character classes 2 of 2 - DO NOT MERGE Dec 3, 2018

@fdelapena fdelapena added the Refactor label Dec 3, 2018

@fdelapena fdelapena added this to the 0.6.0 (likely) milestone Dec 3, 2018

@fdelapena fdelapena added the Savegames label Dec 3, 2018

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent_2 branch from ea20e63 to 4891126 Dec 9, 2018

@fmatthew5876 fmatthew5876 changed the title Refactor Game_Character classes 2 of 2 - DO NOT MERGE Refactor Game_Character classes 2 of 2 Dec 9, 2018

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent_2 branch from 4891126 to 3648998 Dec 9, 2018

@carstene1ns

This comment has been minimized.

Copy link
Member

carstene1ns commented Dec 10, 2018

I do not remember where the parallax refactor was, however, needs to be adapted here.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent_2 branch 2 times, most recently from 75b2243 to fa5a12e Dec 10, 2018

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent_2 branch from fa5a12e to 44df494 Dec 11, 2018

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Dec 14, 2018

This one is starting to become a blocker. I find myself needing these commits to test save games.

@Ghabry

Ghabry approved these changes Dec 17, 2018

Copy link
Member

Ghabry left a comment

Just two minor things:

Change direction and sprite direction when jumping

Could you add #1522 to the commit msg

Write SaveMapEventBase::processed

you have 4 times //<- RPG_RT compat. Remove the <- for consistency

fmatthew5876 added some commits Nov 19, 2018

Don't change layer when boarding airship
* Uses IsFlying() to determine Z ordering
* Fixes an RPG_RT compat bug:

1. Board airship in Player, save game (airship saved to
   upper layer).
2. Load the game in RPG_RT
3. Land the airship
4. Airship will remain stuck on upper layer and appear above player
Fix Game_Vehicle::SetMoveSpeed
If player is in the vehicle, move speed changes affect the player only.
Otherwise, they affect the vehicle.

Tested and matches RPG_RT behavior
Airship doesn't use anim_paused
* Matches RPG_RT behavior better
Fixes for vehicle continuous animation
* Vehicles always animated, regardless of animation_type
  and anim_paused.
* Move commands when disable animation on a vehicle will
  update the anim_paused flag but the vehicle will continue
  to animate regardless.
* Matches RPG_RT behavior
Don't animate vehicles which aren't on the map.
* Matches RPG_RT behavior. Vehicles freeze animation
  state when off map.
Change direction and sprite direction when jumping
Fixes: #1113

* For diagonal moves, Vertical is preferred.
* Changes direction even if jump can't be performed.
* Verified using LSD files that behavior matches RPG_RT
Don't reset remaining_steps when loading saved game
* Should use remaining_steps value from save
* Fixes a bug where an inprogress Jump would
  not continue properly when loaded from save.
* Probably fixes other move related bugs when
  loading saved games.
Don't refresh vehicles when loading saved game
* Don't reset remaining_steps
* Don't reset move speed
Fix airship movement bug
When a move command moves the airship, it does
not animate

fmatthew5876 added some commits Nov 19, 2018

Set/Unset route_through flag on move commands
* No effect in Player, but compatible for RPG_RT saves.
Handle RPG_RT SaveMapEvent::map_id
* RPG_RT always sets this value to 0 in LSD.
* Player now writes 0 to this chunk in LSD for RPG_RT
  compatibility.
* Game_Event calls SetMapId() to ensure the map_id is
  correct at runtime.
Write SaveMapEventBase::processed
* Write this flag to be compatible with RPG_RT saves.
* Player - always 1
* Events - always 1
* Vehicle - 0 until we have visited the same map as a vehicle
  map events, and vehicles we have seen on the map.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent_2 branch from 44df494 to 6a70d01 Dec 17, 2018

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Dec 17, 2018

Addressed the review comments and rebased to master

@Ghabry Ghabry merged commit 5693e24 into EasyRPG:master Dec 17, 2018

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.