Antlion reproduction

Added reproduction according to Venera's suggestion
SuddenEyePuncture · Jun 14, 2021 · 57cc68b · 57cc68b
2 parents 54b035c + 1df0fd0
commit 57cc68b
Show file tree

Hide file tree

Showing 26 changed files with 207 additions and 120 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,15 +73,15 @@ jobs:
             ext: zip
             content: application/zip
           - name: Linux Tiles x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 1
             artifact: linux-tiles-x64
             ext: tar.gz
             content: application/gzip
           - name: linux-curses-x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 0

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2593,6 +2593,7 @@
     "time": "60 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ] ], [ [ "nail", 20 ] ], [ [ "wood_panel", 3 ] ] ],
+    "pre_special": "check_nofloor_above",
     "pre_terrain": "t_wood_stairs_up_broken",
     "post_terrain": "t_wood_stairs_up",
     "post_special": "done_wood_stairs"
@@ -2620,6 +2621,7 @@
     "time": "360 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
     "components": [ [ [ "wood_panel", 4 ] ], [ [ "nail", 30 ] ] ],
+    "pre_special": "check_nofloor_above",
     "pre_terrain": "t_wood_stairs_up_half",
     "post_terrain": "t_wood_stairs_up",
     "post_special": "done_wood_stairs"
@@ -2668,7 +2670,6 @@
     "tools": [ [ [ "con_mix", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
-    "pre_terrain": "t_pit_shallow",
     "pre_special": "check_ramp_low",
     "post_terrain": "t_ramp_up_low",
     "post_special": "done_ramp_low"
@@ -2685,7 +2686,6 @@
     "tools": [ [ [ "con_mix", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
-    "pre_terrain": "t_pit_shallow",
     "pre_special": "check_ramp_high",
     "post_terrain": "t_ramp_up_high",
     "post_special": "done_ramp_high"

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -241,6 +241,18 @@
     "rot_spawn": "GROUP_EGG_CENTIPEDE",
     "rot_spawn_chance": 50
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_antlion",
+    "name": { "str": "antlion egg" },
+    "copy-from": "egg_insect",
+    "color": "yellow",
+    "symbol": "o",
+    "spoils_in": "5 days",
+    "description": "A large white antlion egg.  There is something hard inside.",
+    "rot_spawn": "GROUP_EGG_ANTLION",
+    "rot_spawn_chance": 50
+  },
   {
     "type": "COMESTIBLE",
     "id": "razorclaw_roe",

diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json
@@ -177,7 +177,8 @@
             { "item": "sample_t_substrate" },
             { "item": "log_immersion27" },
             { "item": "HAADF_t_substrate" },
-            { "item": "report_t_substrate" }
+            { "item": "report_t_substrate" },
+            { "item": "id_science" }
           ]
         }
       },

diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
@@ -376,14 +376,20 @@
   },
   {
     "type": "MONSTER_FACTION",
-    "name": "antlion",
+    "name": "antlion_grub",
     "base_faction": "insect",
-    "neutral": [ "antlion" ],
+    "neutral": [ "antlion_grub", "antlion_adult" ],
     "by_mood": [ "zombie", "fungus", "bee" ],
     "hate": [ "insect", "small_animal", "ant", "acid_ant" ]
   },
   {
     "type": "MONSTER_FACTION",
+    "name": "antlion_adult",
+    "base_faction": "insect",
+    "neutral": [ "antlion_grub", "antlion_adult" ]
+  },
+  {
+   "type": "MONSTER_FACTION",
     "name": "ladybug",
     "base_faction": "insect",
     "by_mood": [ "zombie", "bee", "insect" ],

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -111,5 +111,11 @@
       { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SUMMER" ] }
     ]
+  },
+   {
+    "name": "GROUP_EGG_ANTLION",
+    "type": "monstergroup",
+    "default": "mon_antlion_larva",
+    "monsters": [ { "monster": "mon_antlion_larva", "freq": 1000, "cost_multiplier": 1 } ]
   }
 ]
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
@@ -2136,8 +2136,8 @@
     "id": "mon_antlion_giant",
     "type": "MONSTER",
     "name": { "str": "giant adult antlion" },
-    "description": "A ferocious mutant flying antlion as big as a cat, darting through the air with a cluster of fangs for a mouth.",
-    "default_faction": "antlion",
+    "description": "A ferocious mutant flying antlion as big as a cat, darting through the air with a cluster of fangs for a mouth.  Despite dangerous looks it doesn't seem interested in you.",
+    "default_faction": "antlion_adult",
     "bodytype": "flying insect",
     "species": [ "INSECT_FLYING" ],
     "volume": "30 L",
@@ -2147,8 +2147,8 @@
     "material": [ "iflesh" ],
     "symbol": "y",
     "color": "yellow",
-    "aggression": 20,
-    "morale": 100,
+    "aggression": -10,
+    "morale": 20,
     "melee_skill": 6,
     "melee_dice": 1,
     "melee_dice_sides": 6,
@@ -2158,8 +2158,10 @@
     "vision_day": 25,
     "vision_night": 5,
     "harvest": "arachnid",
-    "anger_triggers": [ "PLAYER_WEAK" ],
-    "fear_triggers": [ "PLAYER_CLOSE" ],
+    "reproduction": { "baby_egg": "egg_antlion", "baby_count": 1, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
+    "anger_triggers": [ "HURT" ],
+    "fear_triggers": [ "PLAYER_CLOSE", "FIRE" ],
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "FLIES", "HEARS", "HIT_AND_RUN", "PATH_AVOID_FIRE" ]
   },

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -681,7 +681,6 @@
     "difficulty": 1,
     "time": "2 h",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 40 ] ]
   },

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -609,7 +609,6 @@
     "time": "50 m",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 36 ] ]
   },

diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
@@ -428,7 +428,6 @@
     "time": "40 m",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 120 ] ]
   },
@@ -1042,7 +1041,6 @@
     "time": "40 m",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 100 ] ]
   },
@@ -1071,7 +1069,6 @@
     "time": "4 h",
     "reversible": true,
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 190 ] ]
   },
@@ -1579,7 +1576,6 @@
     "time": "1 h",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 80 ] ]
   },
@@ -1643,7 +1639,6 @@
     "difficulty": 3,
     "time": "1 h 20 m",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 160 ] ]
   },

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -851,7 +851,6 @@
     "difficulty": 4,
     "time": "5 h",
     "autolearn": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 910 ] ]
   },
@@ -1349,7 +1348,6 @@
     "time": "6 h",
     "autolearn": true,
     "reversible": true,
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 550 ] ]
   },
@@ -1365,7 +1363,6 @@
     "autolearn": true,
     "reversible": true,
     "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ],
-    "qualities": [ { "id": "KNIT", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 620 ] ]
   },

diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json
@@ -861,22 +861,6 @@
     "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "forge", 100 ], [ "oxy_torch", 20 ] ] ],
     "components": [ [ [ "steel_lump", 8 ], [ "steel_plate", 1 ] ], [ [ "steel_chunk", 4 ], [ "scrap", 12 ], [ "spike", 4 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "BRISK_EXERCISE",
-    "result": "hard_plate",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_PARTS",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "//": "hardened metal tools require high fabrication, so +1 diff here",
-    "time": "12 m",
-    "reversible": true,
-    "book_learn": [ [ "textbook_fabrication", 5 ], [ "adv_chemistry", 6 ], [ "welding_book", 5 ] ],
-    "qualities": [ { "id": "GLARE", "level": 2 } ],
-    "tools": [ [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ], [ "forge", 100 ], [ "oxy_torch", 20 ] ] ],
-    "components": [ [ [ "steel_lump", 24 ] ] ]
-  },
   {
     "result": "fridgetank",
     "type": "recipe",

diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json
@@ -22,7 +22,8 @@
       "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "flags": [ "FOLDABLE" ]
+    "flags": [ "FOLDABLE" ],
+    "damage_reduction": { "bash": 10 }
   },
   {
     "id": "battery_motorbike",
@@ -133,7 +134,8 @@
     "requirements": {
       "install": { "skills": [ [ "mechanics", 2 ] ], "time": "600 s", "using": [ [ "welding_standard", 5 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "300 s", "using": "vehicle_weld_removal" }
-    }
+    },
+    "damage_reduction": { "bash": 10 }
   },
   {
     "id": "storage_battery_removable",

diff --git a/data/json/vehicleparts/boards.json b/data/json/vehicleparts/boards.json
@@ -31,7 +31,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "damage_reduction": { "all": 28 }
+    "damage_reduction": { "all": 7 }
   },
   {
     "id": "board",
@@ -63,7 +63,8 @@
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
-    }
+    },
+    "damage_reduction": { "all": 0, "bash": 3 }
   },
   {
     "id": "clothboard",
@@ -100,7 +101,7 @@
       "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
     "extend": { "categories": [ "cargo" ], "flags": [ "OPAQUE", "CARGO", "COVERED", "FULL_BOARD", "LOCKABLE_CARGO" ] },
-    "damage_reduction": { "all": 28 }
+    "damage_reduction": { "all": 7 }
   },
   {
     "id": "hdstowboard",
@@ -111,7 +112,7 @@
     "color": "brown",
     "broken_color": "dark_gray",
     "proportional": { "durability": 4.15, "size": 0.76 },
-    "damage_reduction": { "all": 72, "cut": 80, "stab": 80 }
+    "damage_reduction": { "all": 20 }
   },
   {
     "abstract": "hdboard_abstract",
@@ -127,7 +128,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
-    "damage_reduction": { "all": 75, "cut": 80, "stab": 80 }
+    "damage_reduction": { "all": 20 }
   },
   {
     "id": "hdboard",
@@ -160,7 +161,7 @@
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ] ] }
     },
-    "damage_reduction": { "all": 16, "cut": 8, "stab": 8 }
+    "damage_reduction": { "all": 5 }
   },
   {
     "id": "woodboard",
@@ -195,6 +196,6 @@
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
     },
     "extend": { "flags": [ "HALF_BOARD" ] },
-    "damage_reduction": { "all": 8 }
+    "damage_reduction": { "all": 5 }
   }
 ]