[Magiclysm] Goblin encampment / orc village revamp + additions (Cleve…

…rRaven#71758) * Initial commit * Add warg * Add bugbear, give them XL armor loot * Goblin armor should be XS * goblinkin melee attacks based on the actual weapon * Add orc and goblin mages * Add extra house to outpost, add dirt path and fire ring to goblin encampment * Initial mapgen nesting * Finalize nest placement * Add more nests, reorganize goblin-related files * Add more nests * Even more nests * Reduce orc and goblin speed to reflect armor encumbrance * Adjustments * Adjust goblin thornweaver's poison gas attack
Ramza13 · Feb 15, 2024 · ace4fdb · ace4fdb
1 parent bc85b8a
commit ace4fdb
Show file tree

Hide file tree

Showing 9 changed files with 1,455 additions and 392 deletions.
diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json
@@ -282,5 +282,49 @@
     "max_duration": 36000,
     "duration_increment": 1000,
     "flags": [ "SILENT", "NO_EXPLOSION_SFX" ]
+  },
+  {
+    "id": "monster_ranged_gas_attack",
+    "type": "SPELL",
+    "name": "Gas Attack Ranged",
+    "description": "Spreads toxic gas around at range.",
+    "valid_targets": [ "hostile" ],
+    "flags": [ "NO_PROJECTILE" ],
+    "damage_type": "biological",
+    "min_damage": 1,
+    "max_damage": 1,
+    "max_level": 10,
+    "min_range": 3,
+    "max_range": 13,
+    "range_increment": 1,
+    "effect": "emit",
+    "effect_str": "emit_toxic_stream",
+    "shape": "blast",
+    "field_id": "fd_toxic_gas",
+    "field_chance": 1,
+    "min_field_intensity": 1,
+    "max_field_intensity": 1,
+    "min_aoe": 1,
+    "max_aoe": 5,
+    "aoe_increment": 0.5
+  },
+  {
+    "type": "SPELL",
+    "id": "mon_bloodlust_spell",
+    "name": { "str": "Bloodlust" },
+    "description": "Speeds up an ally.",
+    "valid_targets": [ "ally" ],
+    "effect": "attack",
+    "shape": "blast",
+    "effect_str": "frenzy",
+    "max_level": 1,
+    "min_range": 10,
+    "max_range": 10,
+    "min_damage": 0,
+    "max_damage": 0,
+    "min_duration": 6000,
+    "max_duration": 12000,
+    "base_casting_time": 200,
+    "flags": [ "NO_EXPLOSION_SFX", "RANDOM_DURATION" ]
   }
 ]
diff --git a/data/mods/Magiclysm/monstergroups.json b/data/mods/Magiclysm/monstergroups.json
@@ -10,10 +10,11 @@
     "name": "GROUP_FOREST",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_null", "weight": 880 },
+      { "monster": "mon_null", "weight": 860 },
       { "monster": "mon_owlbear", "weight": 10, "cost_multiplier": 10 },
       { "monster": "mon_wisp", "weight": 3, "cost_multiplier": 10, "conditions": [ "NIGHT" ] },
       { "monster": "mon_troll", "weight": 3, "cost_multiplier": 10, "conditions": [ "DAY" ] },
+      { "monster": "mon_wolf_goblin", "weight": 10, "cost_multiplier": 4 },
       { "monster": "mon_claygolem", "weight": 8, "cost_multiplier": 3 },
       { "monster": "mon_stonegolem", "weight": 4, "cost_multiplier": 5 },
       { "monster": "mon_yulecat", "weight": 2, "cost_multiplier": 7 },
@@ -29,6 +30,21 @@
       },
       { "monster": "mon_were_zolf", "weight": 4, "cost_multiplier": 5, "pack_size": [ 1, 2 ], "starts": 800 },
       { "monster": "mon_winter_wolf", "weight": 4, "cost_multiplier": 5, "pack_size": [ 1, 3 ], "starts": 750 },
+      {
+        "monster": "mon_goblin_warrior",
+        "weight": 10,
+        "cost_multiplier": 5,
+        "pack_size": [ 2, 6 ],
+        "conditions": [ "NIGHT" ]
+      },
+      {
+        "monster": "mon_goblin_bugbear",
+        "weight": 5,
+        "cost_multiplier": 5,
+        "pack_size": [ 2, 4 ],
+        "starts": "15 days",
+        "conditions": [ "NIGHT" ]
+      },
       { "monster": "mon_irongolem", "weight": 2, "cost_multiplier": 8 },
       { "monster": "mon_demon_spiderling", "weight": 15, "cost_multiplier": 5, "pack_size": [ 3, 7 ] },
       { "monster": "mon_owlbear_zombie", "weight": 7, "cost_multiplier": 10, "starts": "15 days" },
@@ -255,6 +271,38 @@
       { "monster": "mon_gray_frog", "weight": 100, "pack_size": [ 1, 4 ] }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_ALL_GOBLINS",
+    "monsters": [
+      { "monster": "mon_goblin_warrior", "weight": 335 },
+      { "monster": "mon_feral_goblin", "weight": 50 },
+      { "monster": "mon_wolf_goblin", "weight": 75 },
+      { "monster": "mon_wolf_goblin", "weight": 15, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_goblin_warrior", "weight": 100, "ends": "7 days" },
+      { "monster": "mon_goblin_warrior", "weight": 125, "ends": "28 days" },
+      { "monster": "mon_goblin_warrior", "weight": 150, "ends": "90 days" },
+      { "monster": "mon_goblin_mage_poison", "weight": 25 },
+      { "monster": "mon_goblin_warrior", "weight": 35, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_goblin_slinger", "weight": 65, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_troll_goblin_tamed", "weight": 15 },
+      { "group": "GROUP_GOBLIN_MUTANTS", "weight": 100, "starts": "7 days" },
+      { "group": "GROUP_GOBLIN_MUTANTS", "weight": 125, "starts": "28 days" },
+      { "group": "GROUP_GOBLIN_MUTANTS", "weight": 150, "starts": "90 days" }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_GOBLIN_MUTANTS",
+    "monsters": [
+      { "monster": "mon_orc_warrior", "weight": 400 },
+      { "monster": "mon_orc_archer", "weight": 150 },
+      { "monster": "mon_orc_blood_warrior", "weight": 100 },
+      { "monster": "mon_orc_mage_blood", "weight": 25 },
+      { "monster": "mon_goblin_bugbear", "weight": 250 },
+      { "monster": "mon_goblin_bugbear_stalker", "weight": 75 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_GOBLIN_STANDARD",

diff --git a/data/mods/Magiclysm/monsters/feral_fantasy_species.json b/data/mods/Magiclysm/monsters/feral_fantasy_species.json
@@ -25,7 +25,7 @@
     "name": { "str": "feral elf", "str_pl": "feral elves" },
     "description": "Fair folk no longer, this elf's pupils are dilated and what can be seen of the iris and sclera are bloodshot.  They clutch a pipe in one delicate hand as they gracefully walk unbothered amidst the zombies.",
     "symbol": "E",
-    "proportional": { "hp": 0.75, "speed": 1.03, "weight": 0.85 },
+    "proportional": { "hp": 0.82, "speed": 1.03, "weight": 0.85 },
     "dodge": 3,
     "vision_night": 8,
     "harvest": "demihuman",
@@ -89,7 +89,7 @@
     "name": { "str": "feral elf", "str_pl": "feral elves" },
     "description": "Fair folk no longer, this elf's pupils are dilated and what can be seen of the iris and sclera are bloodshot.  They clutch a crowbar in one delicate hand as they gracefully walk unbothered amidst the zombies.",
     "symbol": "E",
-    "proportional": { "hp": 0.75, "speed": 1.03, "weight": 0.85 },
+    "proportional": { "hp": 0.82, "speed": 1.03, "weight": 0.85 },
     "dodge": 3,
     "vision_night": 8,
     "harvest": "demihuman",
@@ -134,7 +134,7 @@
     "name": { "str": "feral axe-elf", "str_pl": "feral axe-elves" },
     "description": "Dragging a large axe along the ground, this elf's expression is one of twisted glee.  Their movements are more fluid than those of the feral humans, but no less unsettling.",
     "symbol": "E",
-    "proportional": { "hp": 0.75, "speed": 1.03, "weight": 0.85 },
+    "proportional": { "hp": 0.82, "speed": 1.03, "weight": 0.85 },
     "dodge": 3,
     "vision_night": 8,
     "harvest": "demihuman",