Accurate efficacy

data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json

@@ -10,7 +10,7 @@
     "light_emitted": 120,
     "looks_like": "t_carpet_green",
     "connect_groups": "INDOORFLOOR",
-    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG", "EASY_DECONSTRUCT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "RUG" ],
     "bash": {
       "str_min": 4,
       "str_max": 12,

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -1376,6 +1376,7 @@
       "sound_fail": "whump!",
       "items": [ { "item": "rock_large", "count": [ 0, 20 ] }, { "item": "sharp_rock", "count": [ 0, 16 ] } ]
     },
+    "deconstruct": { "ter_set": "t_dirt", "items": [ { "item": "rock_large", "count": 22 } ] },
     "flags": [ "TRANSPARENT", "THIN_OBSTACLE", "SHORT", "ROUGH", "UNSTABLE", "PERMEABLE", "EASY_DECONSTRUCT" ]
   },
   {
@@ -1494,6 +1495,7 @@
       "HIDE_PLACE",
       "EASY_DECONSTRUCT"
     ],
+    "deconstruct": { "ter_set": "t_pit_shallow", "items": [ { "item": "stick", "count": 12 }, { "item": "pine_bough", "count": 24 } ] },
     "bash": {
       "str_min": 4,
       "str_max": 60,
@@ -1526,6 +1528,10 @@
       "HIDE_PLACE",
       "EASY_DECONSTRUCT"
     ],
+    "deconstruct": {
+      "ter_set": "t_pit_shallow",
+      "items": [ { "item": "stick", "count": 12 }, { "item": "pine_bough", "count": 24 }, { "item": "withered", "count": 80 } ]
+    },
     "bash": {
       "str_min": 4,
       "str_max": 60,

data/json/mapgen/microlab/microlab_generic_edge.json

@@ -8,6 +8,15 @@
       "set": [ { "line": "terrain", "id": "t_concrete_wall", "x": 0, "y": 0, "x2": 23, "y2": 0 } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "concrete_wall_hole_ew",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "set": [ { "line": "terrain", "id": "t_strconc_floor", "x": 11, "y": 0, "x2": 12, "y2": 0 } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -23,6 +32,15 @@
       "set": [ { "line": "terrain", "id": "t_concrete_wall", "x": 0, "y": 0, "x2": 0, "y2": 23 } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "concrete_wall_hole_ns",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "set": [ { "line": "terrain", "id": "t_strconc_floor", "x": 0, "y": 11, "x2": 0, "y2": 12 } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -46,6 +64,10 @@
         { "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
         { "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
         { "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } },
+        { "chunks": [ "concrete_wall_hole_ew" ], "x": 0, "y": 0, "neighbors": { "north": "mlb_generic_subhallway" } },
+        { "chunks": [ "concrete_wall_hole_ns" ], "x": 23, "y": 0, "neighbors": { "east": "mlb_generic_subhallway" } },
+        { "chunks": [ "concrete_wall_hole_ew" ], "x": 0, "y": 23, "neighbors": { "south": "mlb_generic_subhallway" } },
+        { "chunks": [ "concrete_wall_hole_ns" ], "x": 0, "y": 0, "neighbors": { "west": "mlb_generic_subhallway" } },
         { "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
         { "else_chunks": [ "concrete_corner" ], "x": 23, "y": 0, "neighbors": { "north_east": "microlab" } },
         { "else_chunks": [ "concrete_corner" ], "x": 23, "y": 23, "neighbors": { "south_east": "microlab" } },

data/json/mutations/mutations.json

@@ -10294,6 +10294,49 @@
     "flags": [ "SOCIAL2" ],
     "category": [ "CATTLE", "LUPINE", "MOUSE", "RAT", "CHIROPTERAN", "ELFA" ]
   },
+  {
+    "type": "mutation",
+    "id": "AMOG",
+    "name": { "str": "Alpha Member of the Group" },
+    "points": 1,
+    "vitamin_cost": 160,
+    "types": [ "SOCIAL" ],
+    "cancels": [ "ASOCIAL1", "ASOCIAL2", "SOCIAL1", "SOCIAL2" ],
+    "description": "You are the natural leader of any group.  It's just part of who you are, groups naturally form around you and you need these groups to energize you.  Sometimes however, you give in to your worst impulses and this trait will flip.",
+    "starting_trait": true,
+    "mixed_effect": true,
+    "purifiable": false,
+    "flags": [ "SOCIAL2" ],
+    "category": [ "ALPHA" ],
+    "social_modifiers": { "intimidate": 5, "persuade": 15, "lie": 10 },
+    "triggers": [
+      [
+        {
+          "condition": { "or": [ { "math": [ "u_val('morale')", "<", "-75" ] }, { "math": [ "u_val('morale')", "<", "75" ] } ] }
+        }
+      ],
+      [
+        { "condition": { "or": [ { "math": [ "u_val('stim')", "<", "-50" ] }, { "math": [ "u_val('stim')", "<", "50" ] } ] } }
+      ]
+    ],
+    "transform": { "target": "DARK_TRIAD", "msg_transform": "You give in to your worst instincts.", "active": false, "moves": 10 }
+  },
+  {
+    "type": "mutation",
+    "id": "DARK_TRIAD",
+    "name": { "str": "Dark Triad" },
+    "types": [ "SOCIAL" ],
+    "cancels": [ "ASOCIAL1", "ASOCIAL2", "SOCIAL1", "SOCIAL2" ],
+    "description": "You are a god among mortals and they are all so very dissapointing.  Why should you even bother to hide your dissapointment in their failures?",
+    "valid": false,
+    "mixed_effect": true,
+    "points": -1,
+    "flags": [ "ASOCIAL2" ],
+    "category": [ "ALPHA" ],
+    "triggers": [ [ { "condition": { "math": [ "time_since(u_transform_time)", ">", "time('36 h')" ] } } ] ],
+    "transform": { "target": "AMOG", "msg_transform": "Maybe you can make better decisions this time.", "active": false, "moves": 10 },
+    "social_modifiers": { "intimidate": -10, "persuade": -25, "lie": -15 }
+  },
   {
     "type": "mutation",
     "id": "ASOCIAL1",

data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json

@@ -204,11 +204,18 @@
     "id": "MISSION_RANCH_FOREMAN_2",
     "type": "mission_definition",
     "name": { "str": "Find 25 Blankets" },
-    "goal": "MGOAL_FIND_ITEM",
+    "goal": "MGOAL_CONDITION",
+    "goal_condition": {
+      "u_has_items_sum": [
+        { "item": "blanket", "amount": 25 },
+        { "item": "fur_blanket", "amount": 25 },
+        { "item": "down_blanket", "amount": 25 },
+        { "item": "blanket_weighted", "amount": 25 },
+        { "item": "electric_blanket", "amount": 25 }
+      ]
+    },
     "difficulty": 5,
     "value": 50000,
-    "item": "blanket",
-    "count": 25,
     "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_RANCH_FOREMAN_3",
     "dialogue": {
@@ -261,6 +268,17 @@
           ],
           "place_npcs": [ { "class": "ranch_construction_2", "x": 19, "y": 8 } ]
         }
+      ],
+      "effect": [
+        {
+          "u_consume_item_sum": [
+            { "item": "blanket", "amount": 25 },
+            { "item": "fur_blanket", "amount": 25 },
+            { "item": "down_blanket", "amount": 25 },
+            { "item": "blanket_weighted", "amount": 25 },
+            { "item": "electric_blanket", "amount": 25 }
+          ]
+        }
       ]
     }
   },

data/json/recipes/appliances/oven.json

@@ -22,136 +22,5 @@
       [ [ "element", 4 ], [ "crude_heating_element", 6 ] ],
       [ [ "cable", 1 ] ]
     ]
-  },
-  {
-    "result": "oven",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "45 m",
-    "skill_used": "fabrication",
-    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "skill_penalty": 0 } ],
-    "components": [
-      [ [ "oven_stovetop", 1 ] ],
-      [ [ "oven_cabinet", 1 ] ],
-      [ [ "oven_controls", 1 ] ],
-      [ [ "oven_door", 1 ] ],
-      [ [ "oven_broiler_pan", 1 ] ],
-      [ [ "heavy_wire_rack", 2 ] ],
-      [ [ "element", 4 ] ],
-      [ [ "cable", 4 ] ]
-    ]
-  },
-  {
-    "result": "oven_stovetop",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "30 m",
-    "skill_used": "fabrication",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "skill_penalty": 0 } ],
-    "qualities": [
-      { "id": "SCREW", "level": 1 },
-      { "id": "WRENCH", "level": 1 },
-      { "id": "HAMMER", "level": 1 },
-      { "id": "SAW_M", "level": 1 }
-    ],
-    "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "wire", 1 ] ], [ [ "e_scrap", 4 ] ] ]
-  },
-  {
-    "result": "oven_cabinet",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "1 h",
-    "skill_used": "fabrication",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "skill_penalty": 0 } ],
-    "qualities": [
-      { "id": "SCREW", "level": 1 },
-      { "id": "WRENCH", "level": 1 },
-      { "id": "HAMMER", "level": 1 },
-      { "id": "SAW_M", "level": 1 }
-    ],
-    "//": "Pilot lights shouldn't be part of an electric oven but we don't have gas ones yet. Can be removed when that changes.",
-    "components": [
-      [ [ "sheet_metal", 2 ] ],
-      [ [ "sheet_metal_small", 2 ] ],
-      [ [ "rock_wool_bat", 3 ] ],
-      [ [ "element", 2 ] ],
-      [ [ "scrap", 4 ] ],
-      [ [ "e_scrap", 2 ] ],
-      [ [ "cable", 2 ] ],
-      [ [ "pilot_light", 1 ] ],
-      [ [ "motor_micro", 1 ] ],
-      [ [ "fanblade_metal", 1 ] ],
-      [ [ "thermometer", 1 ] ],
-      [ [ "pipe_fittings", 4 ] ]
-    ]
-  },
-  {
-    "result": "oven_door",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "1 h",
-    "skill_used": "fabrication",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "skill_penalty": 0 } ],
-    "qualities": [
-      { "id": "SCREW", "level": 1 },
-      { "id": "WRENCH", "level": 1 },
-      { "id": "HAMMER_FINE", "level": 1 },
-      { "id": "SAW_M", "level": 1 }
-    ],
-    "components": [
-      [ [ "reinforced_glass_pane", 1 ] ],
-      [ [ "sheet_metal_small", 2 ] ],
-      [ [ "rock_wool_bat", 1 ] ],
-      [ [ "element", 2 ] ],
-      [ [ "scrap", 4 ] ],
-      [ [ "e_scrap", 2 ] ],
-      [ [ "cable", 2 ] ],
-      [ [ "hinge", 2 ] ]
-    ]
-  },
-  {
-    "result": "oven_broiler_pan",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "30 m",
-    "skill_used": "fabrication",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "skill_penalty": 0 } ],
-    "qualities": [
-      { "id": "SCREW", "level": 1 },
-      { "id": "WRENCH", "level": 1 },
-      { "id": "HAMMER", "level": 1 },
-      { "id": "SAW_M", "level": 1 }
-    ],
-    "components": [ [ [ "sheet_metal", 1 ] ], [ [ "sheet_metal_small", 2 ] ], [ [ "scrap", 2 ] ], [ [ "bearing", 12 ] ] ]
-  },
-  {
-    "result": "oven_controls",
-    "type": "uncraft",
-    "activity_level": "MODERATE_EXERCISE",
-    "time": "1 h",
-    "skill_used": "fabrication",
-    "proficiencies": [
-      { "proficiency": "prof_elec_soldering", "skill_penalty": 0 },
-      { "proficiency": "prof_elec_circuits", "skill_penalty": 0 }
-    ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "tools": [
-      [
-        [ "soldering_iron", -1 ],
-        [ "soldering_iron_portable", -1 ],
-        [ "integrated_electrokit", -1 ],
-        [ "integrated_welder", -1 ]
-      ]
-    ],
-    "components": [
-      [ [ "plastic_chunk", 4 ] ],
-      [ [ "sheet_metal_small", 1 ] ],
-      [ [ "scrap", 2 ] ],
-      [ [ "e_scrap", 6 ] ],
-      [ [ "cable", 2 ] ],
-      [ [ "solder_wire", 8 ] ],
-      [ [ "small_lcd_screen", 1 ] ]
-    ]
   }
 ]

data/json/recipes/other/parts.json

@@ -120,42 +120,6 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "circuit", 1 ] ], [ [ "e_scrap", 3 ] ], [ [ "cable", 1 ] ] ]
   },
-  {
-    "//": "TODO MAKE A RECIPE FOR THIS AND A BOOK",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "exodii_wire_kit",
-    "skill_used": "electronics",
-    "difficulty": 1,
-    "time": "4 m",
-    "using": [ [ "soldering_standard", 4 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "exodii_micro_computer", 1 ] ],
-      [ [ "exodii_micro_module", 1 ] ],
-      [ [ "e_scrap", 10 ] ],
-      [ [ "clockworks", 1 ] ],
-      [ [ "solder_wire", 2 ] ]
-    ]
-  },
-  {
-    "//": "TODO MAKE A RECIPE FOR THIS AND A BOOK",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "exodii_ac_kit",
-    "skill_used": "electronics",
-    "difficulty": 1,
-    "time": "4 m",
-    "using": [ [ "soldering_standard", 4 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "exodii_micro_module", 1 ] ],
-      [ [ "e_scrap", 10 ] ],
-      [ [ "clockworks", 2 ] ],
-      [ [ "solder_wire", 2 ] ],
-      [ [ "pipe", 1 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",