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.

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

refactor!: remove faction camps #4369

Merged
merged 70 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
73e962c
Delete src/faction_camp.h
Dread-Pirate-Hogarth Mar 19, 2024
4deb287
Delete src/faction_camp.cpp
Dread-Pirate-Hogarth Mar 19, 2024
419e214
Delete src/basecamp.cpp
Dread-Pirate-Hogarth Mar 19, 2024
f4399a5
Delete src/basecamp.h
Dread-Pirate-Hogarth Mar 19, 2024
68b78c5
Delete tests/basecamp_test.cpp
Dread-Pirate-Hogarth Mar 19, 2024
b814399
Delete data/json/npcs/TALK_FACTION_CAMP.json
Dread-Pirate-Hogarth Mar 19, 2024
7f007f3
Update TALK_COMMON_ALLY.json
Dread-Pirate-Hogarth Mar 19, 2024
072dc0a
Delete data/json/itemgroups/faction_camps.json
Dread-Pirate-Hogarth Mar 19, 2024
0280ef4
Update condition.cpp
Dread-Pirate-Hogarth Mar 19, 2024
e22edf1
Update character.cpp
Dread-Pirate-Hogarth Mar 19, 2024
7a7c88f
Update iexamine.cpp
Dread-Pirate-Hogarth Mar 19, 2024
6aa83e9
Update condition.h
Dread-Pirate-Hogarth Mar 19, 2024
f4fff3f
Update iexamine.h
Dread-Pirate-Hogarth Mar 19, 2024
3eae96c
Delete src/mission_companion.cpp
Dread-Pirate-Hogarth Mar 19, 2024
e45858c
Delete src/mission_companion.h
Dread-Pirate-Hogarth Mar 19, 2024
cf901d2
Update faction.cpp
Dread-Pirate-Hogarth Mar 19, 2024
cb559fa
Update npctalk.cpp
Dread-Pirate-Hogarth Mar 19, 2024
f8359e5
Update TALK_TEST.json
Dread-Pirate-Hogarth Mar 19, 2024
68b7c3c
Update submap.h
Dread-Pirate-Hogarth Mar 19, 2024
ada6354
Update player.h
Dread-Pirate-Hogarth Mar 19, 2024
90eb8b5
Update crafting.cpp
Dread-Pirate-Hogarth Mar 19, 2024
672de30
Update map.cpp
Dread-Pirate-Hogarth Mar 19, 2024
4117dd8
Update map.h
Dread-Pirate-Hogarth Mar 19, 2024
1712625
Update overmapbuffer.h
Dread-Pirate-Hogarth Mar 19, 2024
3a8d51f
Update overmapbuffer.cpp
Dread-Pirate-Hogarth Mar 19, 2024
b0a61ef
Update overmap.h
Dread-Pirate-Hogarth Mar 19, 2024
f49fd16
Update overmap.cpp
Dread-Pirate-Hogarth Mar 19, 2024
b0a7d2c
Delete data/json/items/basecamp.json
Dread-Pirate-Hogarth Mar 19, 2024
13b3e9e
Delete doc/src/content/docs/en/mod/json/reference/creatures/basecamp.md
Dread-Pirate-Hogarth Mar 19, 2024
7069483
Update activity_item_handling.cpp
Dread-Pirate-Hogarth Mar 19, 2024
2b7a9c7
Delete data/json/recipes/basecamps directory
Dread-Pirate-Hogarth Mar 19, 2024
6f0f574
Delete data/json/mapgen/basecamps directory
Dread-Pirate-Hogarth Mar 19, 2024
e92013d
Update submap.cpp
Dread-Pirate-Hogarth Mar 19, 2024
27d377d
Update overmap_ui.cpp
Dread-Pirate-Hogarth Mar 19, 2024
2e77db4
Update savegame_json.cpp
Dread-Pirate-Hogarth Mar 19, 2024
408b12c
Update savegame.cpp
Dread-Pirate-Hogarth Mar 19, 2024
d04c564
Update npcmove.cpp
Dread-Pirate-Hogarth Mar 19, 2024
7ad8a7b
Update npc.h
Dread-Pirate-Hogarth Mar 19, 2024
ec46ef7
Update npc.cpp
Dread-Pirate-Hogarth Mar 19, 2024
b420700
Update npctalk.h
Dread-Pirate-Hogarth Mar 19, 2024
8930a29
Update npctalk_funcs.cpp
Dread-Pirate-Hogarth Mar 19, 2024
26621eb
Update sdltiles.cpp
Dread-Pirate-Hogarth Mar 19, 2024
c211e03
Update clzones.cpp
Dread-Pirate-Hogarth Mar 19, 2024
38673d8
Update map_field.cpp
Dread-Pirate-Hogarth Mar 19, 2024
be9f123
Update gamemode_defense.cpp
Dread-Pirate-Hogarth Mar 19, 2024
e8b6ed3
Update mutation.cpp
Dread-Pirate-Hogarth Mar 19, 2024
a898358
Update iexamine.cpp
Dread-Pirate-Hogarth Mar 19, 2024
89c3d5a
Update npctalk.cpp
Dread-Pirate-Hogarth Mar 19, 2024
395b9be
Update catalua_bindings_creature.cpp
Dread-Pirate-Hogarth Mar 19, 2024
495bd6d
Update character.h
Dread-Pirate-Hogarth Mar 19, 2024
d0a5603
Update game.cpp
Dread-Pirate-Hogarth Mar 19, 2024
291df8b
Update game.h
Dread-Pirate-Hogarth Mar 19, 2024
96965ce
Delete data/json/mapgen/faction_buildings.json
Dread-Pirate-Hogarth Mar 19, 2024
39f650b
Delete data/json/mapgen_palettes/acidia_camp_palette.json
Dread-Pirate-Hogarth Mar 19, 2024
d9ad7dc
Update TALK_ALLY_TUTORIAL.json
Dread-Pirate-Hogarth Mar 19, 2024
8f15888
Update talk_tags.json
Dread-Pirate-Hogarth Mar 19, 2024
5d5eb1a
Delete data/json/overmap/overmap_terrain/overmap_terrain_faction_base…
Dread-Pirate-Hogarth Mar 19, 2024
b689090
Update BEGGAR_1_Reena_Sandhu.json
Dread-Pirate-Hogarth Mar 19, 2024
4c94733
Update BEGGAR_3_Luo_Meizhen.json
Dread-Pirate-Hogarth Mar 19, 2024
a310b31
Update BEGGAR_4_Brandon_Garder.json
Dread-Pirate-Hogarth Mar 19, 2024
f4ebb71
Update NPC_Pablo_Nunez.json
Dread-Pirate-Hogarth Mar 19, 2024
76b167a
Update NPC_Pablo_Nunez.json
Dread-Pirate-Hogarth Mar 19, 2024
785cc21
cleanup
Dread-Pirate-Hogarth Mar 21, 2024
a271bb0
style(autofix.ci): automated formatting
autofix-ci[bot] Mar 21, 2024
10ea394
cleanup 2
Dread-Pirate-Hogarth Mar 21, 2024
733d6c8
cleanup 2
Dread-Pirate-Hogarth Mar 21, 2024
f454eb8
style(autofix.ci): automated formatting
autofix-ci[bot] Mar 22, 2024
67a24f1
load npcs that have old data
Dread-Pirate-Hogarth Mar 22, 2024
9f8b407
assign iterator when invalidating temporary container
Dread-Pirate-Hogarth Mar 27, 2024
4a6bd54
increment iterator too
Dread-Pirate-Hogarth Mar 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading