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.

Sign up for GitHub

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

Jump to bottom

Equipment fixes 2 #3052

Merged
merged 11 commits into from Jul 16, 2014
Merged

Equipment fixes 2 #3052

merged 11 commits into from Jul 16, 2014

Commits on Jul 14, 2014

  1. remove Ship::UpdateStats, because it only calls UpdateEquipStats anyway 

    It might need to be re-introduced in the future to call some combination
of UpdateEquipStats, UpdateLuaStats and UpdateFuelStats, but for now it's
better to call UpdateEquipStats directly to avoid confusion.
    @johnbartholomew
    johnbartholomew committed Jul 14, 2014
    Copy the full SHA
    b3f682a View commit details
    Browse the repository at this point in the history

  2. init stats in Ship::Load, and don't override loaded mass_cap 

    fixes pioneerspacesim#3049
    @johnbartholomew
    johnbartholomew committed Jul 14, 2014
    Copy the full SHA
    a3f8cf2 View commit details
    Browse the repository at this point in the history

  3. mark Player::SetShipType as virtual/override (explicit is good)

    @johnbartholomew
    johnbartholomew committed Jul 14, 2014
    Copy the full SHA
    0bc6080 View commit details
    Browse the repository at this point in the history

  4. add EquipSet:Clear and use it in Ship::SetShipType 

    fixes pioneerspacesim#3027
    @johnbartholomew
    johnbartholomew committed Jul 14, 2014
    Copy the full SHA
    096c724 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2014

  1. update Ship Market to refer to new equipment hyperdrive

    @johnbartholomew
    johnbartholomew committed Jul 15, 2014
    Copy the full SHA
    7cb454a View commit details
    Browse the repository at this point in the history

  2. update crew orders/hull repair for new equipment

    @johnbartholomew
    johnbartholomew committed Jul 15, 2014
    Copy the full SHA
    2a39860 View commit details
    Browse the repository at this point in the history

  3. update documentation comments on Ship equipment methods in libs/Ship.lua

    @johnbartholomew
    johnbartholomew committed Jul 15, 2014
    Copy the full SHA
    b1fb6a0 View commit details
    Browse the repository at this point in the history

  4. use GetName() method to retrieve hyperdrive equipment name for radar … 

    …mapper

fixes pioneerspacesim#3054
    @johnbartholomew
    johnbartholomew committed Jul 15, 2014
    Copy the full SHA
    bc38d8d View commit details
    Browse the repository at this point in the history

  5. add a ship total mass limit check in EquipType.Install 

    This prevents actions like scooping cargo from using more than the
available space and hence giving you negative free capacity.
    @johnbartholomew
    johnbartholomew committed Jul 15, 2014
    Copy the full SHA
    7eeb6a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2014

  1. fix some erroneous use of global variables in EquipSet

    @johnbartholomew
    johnbartholomew committed Jul 16, 2014
    Copy the full SHA
    120f9b5 View commit details
    Browse the repository at this point in the history

  2. fix bug in EquipSet:Set when rolling back failed install in empty slot

    @johnbartholomew
    johnbartholomew committed Jul 16, 2014
    Copy the full SHA
    2d6b521 View commit details
    Browse the repository at this point in the history