Merge pull request #78824 from Standing-Storm/goblins-love-wargs

[Magiclysm] Goblins and wargs are best friends
CleverRaven · Dec 29, 2024 · 52e013b · 52e013b
2 parents e0b3658 + e0d9014
commit 52e013b
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 4 deletions.
diff --git a/data/mods/Magiclysm/Spells/fantasy_species.json b/data/mods/Magiclysm/Spells/fantasy_species.json
@@ -0,0 +1,45 @@
+[
+  {
+    "type": "SPELL",
+    "id": "goblin_tame_warg_spell",
+    "name": "Warg-Friend",
+    "description": "Goblins and wargs have had an innate bond from time immemorial, and even wild wargs will easily heel when a goblin calls…as long as the goblin has some raw meat to feed them with.",
+    "message": "You take control of the animal's mind!",
+    "teachable": false,
+    "valid_targets": [ "self" ],
+    "flags": [ "NON_MAGICAL", "NO_FAIL", "SILENT", "NO_HANDS", "NO_LEGS" ],
+    "max_level": 1,
+    "spell_class": "GOBLIN_BUILD",
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_GOBLIN_WARG_TAMING",
+    "components": "spell_components_goblin_warg_taming",
+    "shape": "blast",
+    "base_casting_time": 10
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_GOBLIN_WARG_TAMING",
+    "effect": [
+      { "u_spawn_item": "warg_food", "suppress_message": true },
+      { "run_eocs": "EOC_GOBLIN_WARG_TAMING_01" },
+      { "u_remove_item_with": "warg_food" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_GOBLIN_WARG_TAMING_01",
+    "effect": [
+      {
+        "u_run_inv_eocs": "random",
+        "search_data": [ { "id": "warg_food" } ],
+        "true_eocs": [ { "id": "EOC_GOBLIN_WARG_TAMING_01_ACTIVATE", "effect": { "u_activate": "PETFOOD" } } ]
+      }
+    ]
+  },
+  {
+    "id": "spell_components_goblin_warg_taming",
+    "type": "requirement",
+    "//": "meat for Warg-Friend",
+    "components": [ [ [ "meat", 1 ], [ "meat_scrap", 9 ], [ "poultry", 1 ], [ "poultry_scrap", 9 ] ] ]
+  }
+]
diff --git a/data/mods/Magiclysm/items/fake.json b/data/mods/Magiclysm/items/fake.json
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "warg_food",
+    "copy-from": "cattlefodder_medium",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str": "warg food", "//~": "NO_I18N" },
+    "description": { "str": "A food that doesn't exist but is necessary for technical reasons.", "//~": "NO_I18N" },
+    "flags": [ "INEDIBLE" ],
+    "use_action": [ "PETFOOD" ],
+    "petfood": [ "WARG_FOOD" ]
+  }
+]
diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json
@@ -180,17 +180,17 @@
     "default_faction": "goblin",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
+    "species": [ "WARG" ],
     "volume": "200000 ml",
     "weight": "200000 g",
     "hp": 175,
     "speed": 140,
     "material": [ "flesh" ],
     "symbol": "W",
     "color": "light_gray",
-    "looks_like": "mon_wolf",
+    "looks_like": "mon_direwolf",
     "scents_tracked": [ "sc_human", "sc_fetid" ],
-    "aggression": 20,
+    "aggression": 30,
     "morale": 70,
     "melee_skill": 7,
     "melee_dice": 2,
@@ -214,9 +214,26 @@
       [ "SHRIEK", 12 ],
       [ "EAT_FOOD", 60 ]
     ],
+    "petfood": {
+      "food": [ "WARG_FOOD" ],
+      "feed": "The %s approaches you, acknowledging your ancient bond, and eats the meat you offer.",
+      "pet": "The %s happily wags its tail while you pat its head."
+    },
     "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "zombify_into": "mon_zombie_dog_fungus",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS" ],
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "ANIMAL",
+      "PET_MOUNTABLE",
+      "COMBAT_MOUNT",
+      "CANPLAY",
+      "PATH_AVOID_DANGER",
+      "WARM",
+      "KEENNOSE",
+      "EATS"
+    ],
     "armor": { "bash": 8, "cut": 10, "electric": 1 }
   },
   {

diff --git a/data/mods/Magiclysm/mutations/fantasy_species.json b/data/mods/Magiclysm/mutations/fantasy_species.json
@@ -505,6 +505,8 @@
     "category": [ "SPECIES_GOBLIN" ],
     "threshreq": [ "THRESH_SPECIES_GOBLIN" ],
     "flags": [ "TINY" ],
+    "anger_relations": [ [ "WARG", -90 ] ],
+    "spells_learned": [ [ "goblin_tame_warg_spell", 1 ] ],
     "enchantments": [
       {
         "values": [

diff --git a/data/mods/Magiclysm/species.json b/data/mods/Magiclysm/species.json
@@ -35,6 +35,13 @@
     "description": "a short and entrepreneurial humanoid",
     "anger_triggers": [ "HURT", "FRIEND_ATTACKED" ]
   },
+  {
+    "type": "SPECIES",
+    "id": "WARG",
+    "description": "a gigantic lupine beast",
+    "fear_triggers": [ "HURT", "FIRE", "FRIEND_DIED" ],
+    "bleeds": "fd_blood"
+  },
   {
     "type": "SPECIES",
     "id": "ORC",