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

fix: Molotov Fix/Rework, make turn_per_charge less inconsistent. #5480

Merged
merged 11 commits into from
Oct 2, 2024
Merged

fix: Molotov Fix/Rework, make turn_per_charge less inconsistent. #5480

merged 11 commits into from
Oct 2, 2024

Commits on Oct 1, 2024

  1. Molotov Fix/Rework 

    Fixes molotovs burning out too quickly due to my changes to charge handling.

Makes it so that active items will now keep track of the turns they've been active if they use turns_per_charge.

Molotovs now consume their own charges and burn out if left alone too long, they are reloaded with rags, one charge of which lasts about 5 turns.
    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    525a75d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upload' into Molotov-Fix

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7a864dc View commit details
    Browse the repository at this point in the history

  3. Update item.cpp

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    3bdc400 View commit details
    Browse the repository at this point in the history

  4. Update overwrite_scrap.json

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    1634b2c View commit details
    Browse the repository at this point in the history

  5. Lil fix

    @chaosvolt
    chaosvolt authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d1dfaab View commit details
    Browse the repository at this point in the history

  6. Fix recipe 

    Setting it to use rags as ammo makes it not spawn with default charges.
    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    63cd2fe View commit details
    Browse the repository at this point in the history

  7. Update explosive.json

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7e0b92c View commit details
    Browse the repository at this point in the history

  8. Redoes the entire logic for molotov action. 

    Base molotov has no charges, instead, it transforms into a lit molotov that has charges, that over time depletes it's charges and turns back.

Disallow extinguishing it manually, as this produces molotovs with no max charge but a charge. They don't stack in the UI with other molotovs This issue will still occur if it gets extinguished by water.
    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d09b9c3 View commit details
    Browse the repository at this point in the history

  9. Update explosive.json

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    9a00cb9 View commit details
    Browse the repository at this point in the history

  10. Remove rag ammotype

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    11e9956 View commit details
    Browse the repository at this point in the history

  11. Update generic.json

    @KheirFerrum
    KheirFerrum committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    cd57337 View commit details
    Browse the repository at this point in the history