Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

.github/CONTRIBUTING.md

@@ -111,12 +111,13 @@ Helpful pages:
 
 3. Set commit message template.
 
+        $ cd Cataclysm-DDA
+        # Changes the active directory in the prompt to the newly cloned "Cataclysm-DDA" directory
         $ git config --local commit.template .gitmessage
+        # Set commit message template to the custom one in the repo
 
 4. Add this repository as a remote.
 
-        $ cd Cataclysm-DDA
-        # Changes the active directory in the prompt to the newly cloned "Cataclysm-DDA" directory
         $ git remote add -f upstream https://github.com/CleverRaven/Cataclysm-DDA.git
         # Assigns the original repository to a remote called "upstream"
 

data/json/bionics.json

@@ -16,6 +16,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": 10,
     "react_cost": 10,
+    "trigger_cost": "25kJ",
     "time": 1
   },
   {
@@ -27,6 +28,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": "1 J",
     "react_cost": "1 J",
+    "trigger_cost": "25 kJ",
     "time": 1
   },
   {
@@ -620,7 +622,8 @@
     "name": { "str": "Electrical Discharge" },
     "description": "A malfunctioning bionic which occasionally discharges electricity through your body, causing pain and brief paralysis but no damage.",
     "occupied_bodyparts": [ [ "torso", 6 ] ],
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "10 kJ"
   },
   {
     "id": "bio_drain",
@@ -787,7 +790,8 @@
     "act_cost": "3 J",
     "react_cost": "3 J",
     "time": 1,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 60 } ] } ]
   },
   {
     "id": "bio_tattoo_led",
@@ -797,14 +801,16 @@
     "act_cost": "1 J",
     "react_cost": "1 J",
     "time": 1,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "LUMINATION", "add": 5 } ] } ]
   },
   {
     "id": "bio_glowy",
     "type": "bionic",
     "name": { "str": "Glowy Thing" },
     "description": "You don't think that capacitor is *meant* to glow, but it does, and usually at bad times.  A malfunctioning bionic randomly turns on and off, causing you to glow and making you visible in the dark without improving how much you can see in the slightest.",
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "1 kJ"
   },
   {
     "id": "bio_geiger",
@@ -820,7 +826,8 @@
     "name": { "str": "Respirator" },
     "description": "A complex respiration augmentation system.  Improves respiration ability in air and allows breathing water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "head", 2 ], [ "mouth", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "trigger_cost": "25 kJ"
   },
   {
     "id": "bio_ground_sonar",
@@ -850,7 +857,8 @@
       [ "foot_l", 2 ],
       [ "foot_r", 2 ]
     ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "3 kJ"
   },
   {
     "id": "bio_heatsink",
@@ -942,7 +950,17 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
     "act_cost": "5 J",
     "react_cost": "5 J",
-    "time": 1
+    "time": 1,
+    "enchantments": [
+      {
+        "condition": "ACTIVE",
+        "values": [
+          { "value": "EFFECTIVE_HEALTH_MOD", "add": 100 },
+          { "value": "MOD_HEALTH", "add": -50 },
+          { "value": "MOD_HEALTH_CAP", "add": -200 }
+        ]
+      }
+    ]
   },
   {
     "id": "bio_lighter",
@@ -986,6 +1004,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": "2 J",
     "react_cost": "2 J",
+    "trigger_cost": "25 J",
     "time": 1
   },
   {
@@ -1005,7 +1024,8 @@
     "name": { "str": "Weather Reader" },
     "description": "A multitude of scientific instruments and sensors collect environmental data.  The data is compiled and presented as a simple readout of the current weather.  It also passively tells you the local air temperature.",
     "occupied_bodyparts": [ [ "torso", 1 ], [ "head", 1 ] ],
-    "act_cost": "10 J"
+    "act_cost": "10 J",
+    "flags": [ "THERMOMETER" ]
   },
   {
     "id": "bio_nanobots",
@@ -1074,6 +1094,7 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": "10 kJ",
     "react_cost": "10 kJ",
+    "trigger_cost": "1 kJ",
     "time": 1
   },
   {
@@ -1082,7 +1103,8 @@
     "name": { "str": "Sensory Dulling" },
     "description": "Your nervous system is wired to allow you to inhibit the signals of pain, allowing you to dull your senses at will.  However, the use of this system may cause delayed reaction time and drowsiness.",
     "occupied_bodyparts": [ [ "head", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "2 kJ"
   },
   {
     "id": "bio_pokedeye",
@@ -1118,6 +1140,7 @@
     "type": "bionic",
     "name": { "str": "Power Storage" },
     "capacity": "100 kJ",
+    "dupes_allowed": true,
     "description": "A Compact Bionics Module that increases your power capacity by 100 kJ.  Having at least one of these is a prerequisite to using powered bionics.  You will also need a power supply, found in various CBMs.",
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
@@ -1126,6 +1149,7 @@
     "type": "bionic",
     "name": { "str": "Power Storage Mk. II" },
     "capacity": "250 kJ",
+    "dupes_allowed": true,
     "description": "A Compact Bionics Module that increases your power capacity by 250 kJ.",
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
@@ -1146,6 +1170,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": "3 J",
     "react_cost": "3 J",
+    "trigger_cost": "250 kJ",
     "time": 1
   },
   {
@@ -1240,7 +1265,8 @@
     "name": { "str": "Bionic Short Circuit" },
     "description": "A poorly-wired bionic which fails to serve its intended purpose, this malfunctioning device periodically short-circuits, causing systemic muscle tremors.",
     "occupied_bodyparts": [ [ "torso", 1 ], [ "arm_l", 2 ], [ "arm_r", 2 ], [ "leg_l", 3 ], [ "leg_r", 3 ] ],
-    "flags": [ "BIONIC_FAULTY" ]
+    "flags": [ "BIONIC_FAULTY" ],
+    "trigger_cost": "25 kJ"
   },
   {
     "id": "bio_synaptic_regen",
@@ -1260,7 +1286,8 @@
     "name": { "str": "Electroshock Unit" },
     "description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
     "occupied_bodyparts": [ [ "torso", 8 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "trigger_cost": "2 kJ"
   },
   {
     "id": "bio_shockwave",
@@ -1302,6 +1329,7 @@
       [ "foot_l", 2 ],
       [ "foot_r", 2 ]
     ],
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "SPEED", "multiply": 0.1 } ] } ],
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
   {
@@ -1355,7 +1383,8 @@
     "name": { "str": "Targeting System" },
     "description": "Your eyes are surgically equipped with range finders, and their movement is synced with that of your arms, to a degree.  Shots you fire will be much more accurate, particularly at long range.",
     "occupied_bodyparts": [ [ "eyes", 1 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "flags": [ "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_NPC_USABLE" ],
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "WEAPON_DISPERSION", "multiply": -0.25 } ] } ]
   },
   {
     "id": "bio_teleport",
@@ -1427,10 +1456,15 @@
     "id": "bio_jointservo",
     "type": "bionic",
     "name": { "str": "Joint Servo" },
-    "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement.  They are optimized for running, but walking also requires less effort when this bionic is online.  However, when it's offline it will hamper your movement, as you struggle against its moving parts.",
+    "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement.  Movement takes less effort when this bionic is online.  However, when it's offline it will hamper your movement, as you struggle against its moving parts.",
     "occupied_bodyparts": [ [ "leg_l", 12 ], [ "leg_r", 12 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "mutation_conflicts": [ "LEG_TENTACLES", "LEG_TENT_BRACE" ]
+    "mutation_conflicts": [ "LEG_TENTACLES", "LEG_TENT_BRACE" ],
+    "enchantments": [
+      { "condition": "ACTIVE", "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ] },
+      { "condition": "INACTIVE", "values": [ { "value": "MOVE_COST", "multiply": 0.1 } ] }
+    ],
+    "trigger_cost": "35 J"
   },
   {
     "id": "bio_trip",
@@ -1449,6 +1483,7 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": "6 J",
     "react_cost": "6 J",
+    "trigger_cost": "75 kJ",
     "time": 1
   },
   {

data/json/construction.json

@@ -1127,7 +1127,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [ [ [ "rebar", 16 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_reb_cage"
@@ -1168,7 +1168,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [ [ [ "rebar", 16 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_reb_cage"
@@ -1223,7 +1223,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "120 m",
-    "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [ [ [ "rebar", 8 ] ], [ [ "2x4", 12 ] ], [ [ "pipe", 4 ] ] ],
     "pre_terrain": "t_pit_shallow",
     "post_terrain": "t_ov_smreb_cage"
@@ -1250,7 +1250,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "180 m",
-    "qualities": [ [ { "id": "WELD", "level": 2 } ], [ { "id": "GLARE", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [ [ [ "rebar", 12 ] ], [ [ "2x4", 12 ] ], [ [ "pipe", 4 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_ov_reb_cage"
@@ -2110,12 +2110,8 @@
     "category": "FURN",
     "required_skills": [ [ "fabrication", 2 ], [ "cooking", 1 ] ],
     "time": "180 m",
-    "qualities": [
-      [ { "id": "HAMMER", "level": 2 } ],
-      [ { "id": "SAW_M", "level": 1 } ],
-      [ { "id": "WELD", "level": 2 } ],
-      [ { "id": "GLARE", "level": 2 } ]
-    ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [ [ [ "metal_tank", 4 ] ], [ [ "water_faucet", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_standing_tank"
@@ -3754,10 +3750,10 @@
     "qualities": [
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "SAW_M", "level": 1 } ],
-      [ { "id": "WELD", "level": 2 } ],
       [ { "id": "DRILL", "level": 3 } ],
       [ { "id": "WRENCH", "level": 2 } ]
     ],
+    "using": [ [ "welding_standard", 2 ] ],
     "components": [
       [ [ "fire_brick", 40 ] ],
       [ [ "cu_pipe", 4 ] ],

data/json/effect_on_condition.json

@@ -87,5 +87,69 @@
       { "sound_effect": "elec_crackle_low", "id": "bionics", "volume": 100 },
       { "u_add_power": "-25kJ" }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SLEEP",
+    "effect": [ { "message": "You feel very sleepy…" }, { "u_mod_fatigue": 40 } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_MINOR_SLEEP",
+    "effect": [ { "message": "You feel sleepy…" }, { "u_mod_fatigue": 20 } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "night_messages",
+    "recurrence_min": "4 hours",
+    "recurrence_max": "8 hours",
+    "condition": {
+      "and": [
+        { "one_in_chance": 3 },
+        { "not": "is_day" },
+        "u_can_see",
+        { "is_weather": "clear" },
+        { "not": { "days_since_cataclysm": 14 } },
+        "u_is_outside"
+      ]
+    },
+    "deactivate_condition": { "days_since_cataclysm": 14 },
+    "effect": [ { "message": "NIGHT_MESSAGES_1", "snippet": true } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "night_messages2",
+    "recurrence_min": "4 hours",
+    "recurrence_max": "8 hours",
+    "condition": {
+      "and": [
+        { "one_in_chance": 3 },
+        { "not": "is_day" },
+        "u_can_see",
+        { "is_weather": "clear" },
+        { "days_since_cataclysm": 14 },
+        { "not": { "days_since_cataclysm": 50 } },
+        "u_is_outside"
+      ]
+    },
+    "deactivate_condition": { "days_since_cataclysm": 50 },
+    "effect": [ { "message": "NIGHT_MESSAGES_2", "snippet": true } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "night_messages3",
+    "recurrence_min": "4 hours",
+    "recurrence_max": "8 hours",
+    "condition": {
+      "and": [
+        { "one_in_chance": 3 },
+        { "not": "is_day" },
+        "u_can_see",
+        { "is_weather": "clear" },
+        { "days_since_cataclysm": 50 },
+        "u_is_outside"
+      ]
+    },
+    "effect": [ { "message": "NIGHT_MESSAGES_3", "snippet": true } ]
   }
 ]