Skip to content

Commit

Permalink
refactor!: remove faction camps (#4369)
Browse files Browse the repository at this point in the history
* Delete src/faction_camp.h

* Delete src/faction_camp.cpp

* Delete src/basecamp.cpp

* Delete src/basecamp.h

* Delete tests/basecamp_test.cpp

* Delete data/json/npcs/TALK_FACTION_CAMP.json

* Update TALK_COMMON_ALLY.json

* Delete data/json/itemgroups/faction_camps.json

* Update condition.cpp

* Update character.cpp

* Update iexamine.cpp

* Update condition.h

* Update iexamine.h

* Delete src/mission_companion.cpp

* Delete src/mission_companion.h

* Update faction.cpp

* Update npctalk.cpp

* Update TALK_TEST.json

* Update submap.h

* Update player.h

* Update crafting.cpp

* Update map.cpp

* Update map.h

* Update overmapbuffer.h

* Update overmapbuffer.cpp

* Update overmap.h

* Update overmap.cpp

* Delete data/json/items/basecamp.json

* Delete doc/src/content/docs/en/mod/json/reference/creatures/basecamp.md

* Update activity_item_handling.cpp

* Delete data/json/recipes/basecamps directory

* Delete data/json/mapgen/basecamps directory

* Update submap.cpp

* Update overmap_ui.cpp

* Update savegame_json.cpp

* Update savegame.cpp

* Update npcmove.cpp

* Update npc.h

* Update npc.cpp

* Update npctalk.h

* Update npctalk_funcs.cpp

* Update sdltiles.cpp

* Update clzones.cpp

* Update map_field.cpp

* Update gamemode_defense.cpp

* Update mutation.cpp

* Update iexamine.cpp

* Update npctalk.cpp

* Update catalua_bindings_creature.cpp

* Update character.h

* Update game.cpp

* Update game.h

* Delete data/json/mapgen/faction_buildings.json

* Delete data/json/mapgen_palettes/acidia_camp_palette.json

* Update TALK_ALLY_TUTORIAL.json

* Update talk_tags.json

* Delete data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json

* Update BEGGAR_1_Reena_Sandhu.json

* Update BEGGAR_3_Luo_Meizhen.json

* Update BEGGAR_4_Brandon_Garder.json

* Update NPC_Pablo_Nunez.json

* Update NPC_Pablo_Nunez.json

* cleanup

* style(autofix.ci): automated formatting

* cleanup 2

* style(autofix.ci): automated formatting

* load npcs that have old data

* assign iterator when invalidating temporary container

* increment iterator too

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
Dread-Pirate-Hogarth and autofix-ci[bot] committed Mar 27, 2024
1 parent 317c75c commit 0e06d77
Show file tree
Hide file tree
Showing 200 changed files with 38 additions and 49,708 deletions.
1 change: 0 additions & 1 deletion data/json/furniture_and_terrain/furniture-signs.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"coverage": 75,
"required_str": -1,
"flags": [ "FLAMMABLE", "NOITEM", "ORGANIC", "TRANSPARENT" ],
"examine_action": "bulletin_board",
"deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": 8 } ] },
"bash": {
"str_min": 6,
Expand Down
281 changes: 0 additions & 281 deletions data/json/itemgroups/faction_camps.json

This file was deleted.

62 changes: 0 additions & 62 deletions data/json/items/basecamp.json

This file was deleted.

14 changes: 0 additions & 14 deletions data/json/mapgen/basecamps/empty.json

This file was deleted.

Loading

0 comments on commit 0e06d77

Please sign in to comment.