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

NPC faction camps #73372

Merged
merged 23 commits into from
May 30, 2024
Merged

NPC faction camps #73372

merged 23 commits into from
May 30, 2024
+468 −112

Commits on Apr 29, 2024

  1. Revert CleverRaven#72296

    @RenechCDDA
    RenechCDDA committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    53d39a9 View commit details
    Browse the repository at this point in the history

  2. Mapgen-spawned NPC camps

    @RenechCDDA
    RenechCDDA committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    13cb9dd View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. No bulletin boards or faction display 

    Fix abandoning camps (remove them from player known list)
    @RenechCDDA
    RenechCDDA committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0b1ef78 View commit details
    Browse the repository at this point in the history

  2. Normalize camp access based on faction relationship

    @RenechCDDA
    RenechCDDA committed May 9, 2024
    Configuration menu
    Copy the full SHA
    82d89ed View commit details
    Browse the repository at this point in the history

  3. Allow all NPCs to eat out of camp that they can access

    @RenechCDDA
    RenechCDDA committed May 9, 2024
    Configuration menu
    Copy the full SHA
    30f09f6 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Add camps to vanilla factions

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9d6f2bf View commit details
    Browse the repository at this point in the history

  2. Camps for in-repo mods

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5653001 View commit details
    Browse the repository at this point in the history

  3. Give all our factions reasonable food stores

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    52884da View commit details
    Browse the repository at this point in the history

  4. Handle infinite food for most NPC factions

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    08679de View commit details
    Browse the repository at this point in the history

  5. NPC camps use a special camp type which always provides water

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    c989f1a View commit details
    Browse the repository at this point in the history

  6. Some factions share water access

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    7d17140 View commit details
    Browse the repository at this point in the history

  7. Can't send NPCs to NPC camps you've never seen before

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    081357e View commit details
    Browse the repository at this point in the history

  8. Prevent NPCs from infinitely looping when starved and eating from camp

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d9fdcea View commit details
    Browse the repository at this point in the history

  9. Camp migrations for previously placed specials

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    be3274a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into NPC_camps

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e0e05cf View commit details
    Browse the repository at this point in the history

  11. Update src/map.h 

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    @RenechCDDA @github-actions
    RenechCDDA and github-actions[bot] committed May 10, 2024
    Configuration menu
    Copy the full SHA
    12e455e View commit details
    Browse the repository at this point in the history

  12. Nix fake IDs

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    40dddf0 View commit details
    Browse the repository at this point in the history

  13. Oops - reset loaded migrations when asked

    @RenechCDDA
    RenechCDDA committed May 10, 2024
    Configuration menu
    Copy the full SHA
    403d255 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Fixes - wasteland scavengers get camps. 

    UICA gets INTMAX food
Clang gets silenced
    @RenechCDDA
    RenechCDDA committed May 11, 2024
    Configuration menu
    Copy the full SHA
    93146b5 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2024

  1. typo fix thanks 

    Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com>
    @RenechCDDA @Fris0uman
    RenechCDDA and Fris0uman committed May 19, 2024
    Configuration menu
    Copy the full SHA
    4707ff6 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'master' into NPC_camps

    @Maleclypse @RenechCDDA
    Maleclypse authored and RenechCDDA committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2d03b77 View commit details
    Browse the repository at this point in the history

  2. Update u_has_camp

    @RenechCDDA
    RenechCDDA committed May 29, 2024
    Configuration menu
    Copy the full SHA
    303010b View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Camp name translations, hopefully? 

    Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com>
    @RenechCDDA @Procyonae
    RenechCDDA and Procyonae committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8939787 View commit details
    Browse the repository at this point in the history