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

[Ready] Got some pickups working #449

Merged
merged 1 commit into from May 25, 2018

Conversation

Projects
None yet
4 participants
@husho
Copy link
Contributor

husho commented May 10, 2018

  • Health pickups give health
  • Armour pickups give armour
  • Hidden packages can be collected and give money
  • Script pickups that used in missions can be collected
  • Adrenaline pills
  • Set x2 player walk start animation speed on pills pickup (seems like walk start animation is not implemented anyway)
  • ~~~Fix Time scale for pills~~~ in different PR
  • ~~~Police bribes (requires wanted system)~~~ not going to implement without wanted system
  • Money (not used anywhere yet, except marked man)
  • Fix rampage can be only picked up on mission = 0
  • Dont render rampage pickups on mission = 1
  • Display text when pickup hidden packages
  • Opcodes
  • ~~~Colours are incorrect~~~
  • Add new pickups to debug playground
  • ~~Adrenaline pill misaligned~~~ like in original game
  • ~~~A Drop In The Ocean packages~~~ (without physics for now)
@dracc

This comment has been minimized.

Copy link
Contributor

dracc commented May 10, 2018

You're on fire! Nice work! :D

@husho husho referenced this pull request May 10, 2018

Open

Playable Missions Tracker #52

6 of 50 tasks complete
const auto gxtEntry = "CO_ONE";

auto str = ScreenText::format(
character->engine->data->texts.text(gxtEntry),

This comment has been minimized.

@danhedron

danhedron May 11, 2018

Member

There should be an engine member here already, without needing to access through the player.

@husho husho changed the title Pickups [WIP] Pickups May 14, 2018

@husho husho changed the title [WIP] Pickups [WIP] Got some pickups working May 14, 2018

@husho husho changed the title [WIP] Got some pickups working [Ready] Got some pickups working May 15, 2018

@husho husho changed the title [Ready] Got some pickups working [WIP] Got some pickups working May 16, 2018

@husho husho changed the title [WIP] Got some pickups working [Ready] Got some pickups working May 17, 2018

}

RW_PROFILE_BEGIN("Update");
while (accumulatedTime >= GAME_TIMESTEP && !world->isPaused()) {
while (accumulatedTime >= deltaTime && !world->isPaused()) {

This comment has been minimized.

@ShFil119

ShFil119 May 20, 2018

Member

Still do you think there's need with tickrate 60Hz?

This comment has been minimized.

@husho

husho May 21, 2018

Contributor

I'll open another PR for this.

RampagePickup(GameWorld* world, const glm::vec3& position,
BaseModelInfo* modelinfo, PickupType type);

bool isRampage() {

This comment has been minimized.

@ShFil119

ShFil119 May 20, 2018

Member

override
Edit: Even const override.

PickupType getPickupType() const {
return m_type;
}

virtual bool isRampage() {

This comment has been minimized.

@ShFil119
husho

@danhedron danhedron merged commit b7d657b into rwengine:master May 25, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@husho husho deleted the husho:pickups branch May 25, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment