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

Regionalize occupied homeless camp #60120

Merged
merged 7 commits into from
Aug 17, 2022

Conversation

LovamKicsiGazsii
Copy link
Contributor

Summary

None

Purpose of change

Continues regional terrain project,

Describe the solution

Separated zombie homeless camps and NPC camps. Fixed wrong merge in homelesscamp.json and ordered it. Replaced terrains with their regional counterparts. Fixed wrong terrain appearing under NPCs. Artificial forests were removed. Made the fortresses rectangular.

Describe alternatives you've considered

None.

Testing

Debug-spawned a homeless camp mutable and the Occupied Homeless Camp. Talked to the NPCs, and completed their mission chain.

Additional context

None.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 13, 2022
@dseguin
Copy link
Member

dseguin commented Aug 15, 2022

You may want to add a migration for the removed special id in case it would break existing saves, something like

diff --git a/data/json/overmap/overmap_special/overmap_special_migration.json b/data/json/overmap/overmap_special/overmap_special_migration.json
index 8a414eaaef..5c982f1426 100644
--- a/data/json/overmap/overmap_special/overmap_special_migration.json
+++ b/data/json/overmap/overmap_special/overmap_special_migration.json
@@ -38,5 +38,10 @@
     "type": "overmap_special_migration",
     "id": "Mine Entrance",
     "//": "Removed - no new id"
+  },
+  {
+    "type": "overmap_special_migration",
+    "id": "Homeless Camp",
+    "new_id": "Occupied Homeless Camp"
   }
 ]

@LovamKicsiGazsii
Copy link
Contributor Author

You may want to add a migration for the removed special id in case it would break existing saves, something like

diff --git a/data/json/overmap/overmap_special/overmap_special_migration.json b/data/json/overmap/overmap_special/overmap_special_migration.json
index 8a414eaaef..5c982f1426 100644
--- a/data/json/overmap/overmap_special/overmap_special_migration.json
+++ b/data/json/overmap/overmap_special/overmap_special_migration.json
@@ -38,5 +38,10 @@
     "type": "overmap_special_migration",
     "id": "Mine Entrance",
     "//": "Removed - no new id"
+  },
+  {
+    "type": "overmap_special_migration",
+    "id": "Homeless Camp",
+    "new_id": "Occupied Homeless Camp"
   }
 ]

Thank you!

@dseguin dseguin merged commit b3c2d3b into CleverRaven:master Aug 17, 2022
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
* update occupied homeless camp mapgen

* update homeless npc nested

* update homeless npc mission nested

* update homeless npc missions

* split zombie camp and npc camp

* homeless npc camp spawn

* migration
@LovamKicsiGazsii LovamKicsiGazsii deleted the homeless branch August 31, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Missions Quests and missions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants