Permalink
Commits on Jun 6, 2016
  1. Merge pull request #639 from onpon4/alwaysfull

    Reverted 63960aa and 60540c2.
    BTAxis committed Jun 6, 2016
  2. Reverted 63960aa and 60540c2.

    These changes collectively caused outfits to have shorter cooldown
    periods when you didn't use them as long. But this change was made
    with the intention of also adding 6a4bf10, which was rejected upstream.
    Without that, all this does is create an advantage to doing several
    short bursts of activating the outfit, or even having some sort of
    keyboard macro do it for you. I don't think there's any possible
    reason to want to implement this kind of thing on purpose.
    onpon4 committed Apr 29, 2015
Commits on Jun 1, 2016
  1. Merge pull request #637 from nikai3d/typos

    Fix pronouns and a typo
    BTAxis committed Jun 1, 2016
  2. Fix pronouns and a typo

    nikai3d committed Jun 1, 2016
Commits on May 5, 2016
  1. Merge pull request #636 from nenau/capital_aim

    Made capital ships save cannon ammo
    BTAxis committed May 5, 2016
Commits on May 4, 2016
  1. Merge pull request #635 from nikai3d/oldwoman

    Small fixes in Old Woman mission
    BTAxis committed May 4, 2016
  2. implement mission cargo in Old Woman mission

    in consistency with other neutral missions, and with a guard in case
    of mission abort when no planets where found
    nikai3d committed May 4, 2016
  3. fix starting point of Old Woman mission

    According to mission description and text, the old woman wants to
    travel from Dvaered space to Sirius space. So, she should appear
    in Dvaered bars.
    nikai3d committed May 3, 2016
Commits on May 2, 2016
  1. Merge pull request #634 from nikai3d/animaltrans

    Small fixes in animal transport mission
    BTAxis committed May 2, 2016
  2. use consistent NPC name in animal transport mission

    in consistency with Academy Hack mission 1
    nikai3d committed May 2, 2016
  3. fix NPC gender in animal transport mission

    Mission description and text refer to a male NPC:
     "(..) by the looks of him. He's got some kind of crate with him.", and
     "(..) the man greets you."
    However, the image displayed is of a Sirius female.
    nikai3d committed May 2, 2016
Commits on Apr 28, 2016
  1. corrected a small bug in ai

    nenau committed with Apr 28, 2016
Commits on Apr 27, 2016
Commits on Apr 26, 2016
  1. Merge pull request #630 from micahmumper/TraderEscort

    TraderEscort
    BTAxis committed Apr 26, 2016
  2. Trader Escort reward tweak

    micahmumper committed Apr 26, 2016
  3. Trader Escort Mission

    micahmumper committed Apr 26, 2016
  4. Changed ships produced to sirius to match description. Sofar soromid …

    …ships
    
    were build in a sirius military asset...
    Hans Malte Kern (C/CES-SWO) committed with Apr 26, 2016
Commits on Apr 24, 2016
  1. Merge pull request #627 from micahmumper/cargo-overhaul

    Cargo overhaul
    BTAxis committed Apr 24, 2016
Commits on Apr 23, 2016
  1. add newLine to end of file

    micahmumper committed Apr 23, 2016
  2. add newline to end of file

    micahmumper committed Apr 23, 2016
Commits on Apr 22, 2016
  1. corrected notes about bonus

    micahmumper committed Apr 22, 2016
  2. Cargo Mission Overhaul

    Brief Summary:
    Cargo delivery missions now only deliver commodities offered at the
    origin planet to planets that do not sell that commodity. Jump and
    distance rewards depend on the base price of the commodity being
    delivered. Rewards are also higher for traversing pirated space.
    
    A new mission was created that asks players to deliver a commodity not
    sold on that planet. Pay is dependent on base price of the commodity
    and how much is delivered.
    micahmumper committed Apr 22, 2016
Commits on Apr 18, 2016
  1. Merge remote-tracking branch 'naev/master'

    naev/naev
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.
    micahmumper committed Apr 18, 2016
  2. Fixed planet.commoditiesSold().

    committed Apr 18, 2016
Commits on Apr 17, 2016
  1. Add Piracy Risk to cargo missions.

    Bulk cargo trading is back baby!
    
    Essentially, players can make much more credits by getting a small fast
    ship and doing cargo rush missions. There is little incentive to do
    regular cargo missions because the pay is so low since “difficulty” is
    low. Well, when you’re trying to haul a ton of cargo into pirate
    infested space, it’s not so easy. Given the small rewards, it’s usually
    not worth it do bulk cargo missions.
    
    So to fix this, I’ve upped the reward for delivering cargo to pirate
    infested space. To do this, I calculate the pirates presence along the
    systems to be travelled and take an average. Depending on the average,
    the risk is calculated as “none” (no pirates) “low” (avg presence less
    than 25) “medium” (avg presence between 25 - 75) or “high” (greater
    than 75). Players then receive a bonus for doing routes with more risk.
    
    What this does, in effect, is offer much more lucrative rewards for
    doing bulk cargo missions into pirate infested space. This gives
    players an incentive to use the large trader ships because the rewards
    are now pretty comparable with the cargo rush missions when cargo
    amount and piracy is high.
    
    Ofc, this doesn’t solve the fact that it’s easier to make credits quick
    using cargo rush missions in safe spaces rather than slower bulk cargo
    missions in dangerous territory. But, this still is an improvement for
    players who want more excitement while trading.
    micahmumper committed Apr 17, 2016
Commits on Apr 16, 2016
  1. Merge pull request #625 from micahmumper/master

    Minor changes to ES: long-distance missions.
    BTAxis committed Apr 16, 2016
  2. Minor changes to long-distance shipping missions.

    Changed the Za’lek recruitment to require landing on Gerhart Station
    (Za’lek controlled) rather than Outbound Station (Empire controlled).
    
    Also, increased rewards for long-distance missions slightly and made
    sure they always require at least 3 jumps.
    micahmumper committed Apr 16, 2016
  3. * Fixed minor writing error.

    BTAxis committed Apr 16, 2016
  4. Merge pull request #624 from micahmumper/master

    Easter Egg for Sightseeing Mission
    BTAxis committed Apr 16, 2016