Merge branch 'new-frontiers-14:master' into 20240409-DungeonLootSpawners

new-frontiers-14 · Apr 27, 2024 · a8ac81d · a8ac81d
2 parents 226e31b + 3f800f8
commit a8ac81d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4303,3 +4303,11 @@ Entries:
       message: Knuckleverse can hire latejoins correctly.
   id: 4947
   time: '2024-04-27T15:21:40.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Borgs can have laws that will force them to become goblin slayers due to
+        ion storms. Same for harpies.
+  id: 4948
+  time: '2024-04-27T17:48:50.0000000+00:00'
diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -852,6 +852,8 @@
   - SLIME PEOPLE
   - SKELETONS
   - ONIS # Frontier
+  - GOBLINS # Frontier
+  - HARPY # Frontier
   - VULPS
   - FELINIDS
 

diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml
@@ -12,3 +12,5 @@
     Oni: 2
     Dwarf: 2
     Diona: 2
+    Goblin: 2
+    Harpy: 1
diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml
@@ -46,6 +46,7 @@
   - Revolutionary
   - Xeno
   - BloodCultNF
+  - Goblin
 
 - type: npcFaction
   id: BloodCultNF
@@ -59,3 +60,4 @@
   - Revolutionary
   - Xeno
   - WizFedFaction
+  - Goblin