Merge pull request #105 from AtomicFox556/CleverRaven-master

Traits and professions update

data/json/EraOfDecay/flags.json

@@ -23,5 +23,10 @@
     "id": "POWERARMOR_NOACTIVE",
     "type": "json_flag",
     "info": "This gear is an add-on for power armor, and is not affected by power armor being powered or not."
+  },
+  {
+    "id": "HOLY_SYMBOL",
+    "type": "json_flag",
+    "info": "This gear improves morale of spiritual people if worn."
   }
 ]

data/json/EraOfDecay/furniture/crafting.json

@@ -51,5 +51,30 @@
       "sound_fail": "whump!",
       "items": [ { "item": "fire_brick", "count": [ 6, 12 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_milling_machine",
+    "name": "milling machine",
+    "looks_like": "f_machinery_light",
+    "description": "An industrial-grade machine tool which uses rotary cutters to remove material by advancing a cutter into a workpiece.",
+    "symbol": "4",
+    "color": "cyan_red",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": 16,
+    "flags": [ "BLOCKSDOOR" ],
+    "bash": {
+      "str_min": 40,
+      "str_max": 150,
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "cable", "charges": [ 0, 4 ] },
+        { "item": "scrap", "count": [ 12, 20 ] },
+        { "item": "steel_chunk", "count": [ 2, 4 ] },
+        { "item": "steel_lump", "count": [ 1, 2 ] }
+      ]
+    },
+    "deconstruct": { "items": [ { "item": "milling_machine", "count": 1 } ] }
   }
 ]

data/json/EraOfDecay/items/fake.json

@@ -0,0 +1,8 @@
+[
+  {
+    "id": "milling_machine_tool",
+    "type": "TOOL",
+    "copy-from": "fake_appliance_tool",
+    "name": { "str": "milling machine" }
+  }
+]

data/json/EraOfDecay/items/generic/junk.json

@@ -0,0 +1,17 @@
+[
+  {
+    "id": "katana_plastic",
+    "copy-from": "katana",
+    "type": "GENERIC",
+    "name": { "str_sp": "toy katana" },
+    "description": "A toy katana made from plastic.  Worthless as a weapon.",
+    "proportional": { "melee_damage": { "bash": 0.6, "cut": 0 } },
+    "delete": { "flags": [ "DURABLE_MELEE" ], "techniques": [ "WBLOCK_2" ] },
+    "extend": { "flags": [ "FRAGILE_MELEE" ] },
+    "material": [ "plastic" ],
+    "weight": "142 g",
+    "price": 100,
+    "price_postapoc": 0,
+    "qualities": [  ]
+  }
+]

data/json/EraOfDecay/items/tools/workshop.json

@@ -0,0 +1,33 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "heavy_lathe",
+    "category": "tools",
+    "looks_like": "f_heavy_lathe",
+    "symbol": "7",
+    "description": "An industrial-grade lathe, for turning chunks of metal and other hard things into round chunks of metal and other hard things.",
+    "color": "black_red",
+    "name": { "str": "disconnected power lathe" },
+    "material": [ "steel" ],
+    "//": "Based off Warco WM 280V Lathe.",
+    "longest_side": "135 cm",
+    "volume": "425 L",
+    "weight": "210 kg",
+    "price": "4100 USD"
+  },
+  {
+    "type": "GENERIC",
+    "id": "milling_machine",
+    "looks_like": "f_milling_machine",
+    "symbol": "7",
+    "description": "An industrial-grade machine tool which uses rotary cutters to remove material by advancing a cutter into a workpiece.",
+    "color": "black_red",
+    "name": { "str": "disconnected milling machine" },
+    "material": [ "steel" ],
+    "//": "Based off Warco WM 18B Belt Drive Mill.  Volume reduced to account for the fact that this machine isn't a perfect cuboid with those dimensions.",
+    "longest_side": "126 cm",
+    "volume": "450 L",
+    "weight": "230 kg",
+    "price": "3000 USD"
+  }
+]

data/json/EraOfDecay/items/vehicle/rotor.json

@@ -0,0 +1,18 @@
+[
+  {
+    "id": "homebuilt_gyrocopter_rotor",
+    "type": "GENERIC",
+    "category": "veh_parts",
+    "name": { "str": "makeshift gyrocopter rotors", "str_pl": "sets of makeshift gyrocopter rotors" },
+    "description": "A set of two-bladed wooden rotor and propeller, as well as a set of machined parts needed to control them, intended for lightweight vehicles put together by hobbyists.",
+    "price": "10 USD",
+    "price_postapoc": "2 USD",
+    "weight": "120 kg",
+    "volume": "120 L",
+    "longest_side": "609 cm",
+    "looks_like": "wind_turbine",
+    "material": [ "steel", "wood" ],
+    "symbol": "*",
+    "color": "brown"
+  }
+]

data/json/EraOfDecay/morale_types.json

@@ -13,5 +13,10 @@
     "id": "morale_perm_darkness",
     "type": "morale_type",
     "text": "In Dark"
+  },
+  {
+    "id": "morale_spiritual",
+    "type": "morale_type",
+    "text": "Spiritual"
   }
 ]

data/json/EraOfDecay/mutations/mutations.json

@@ -18,5 +18,26 @@
     "category": [ "HUMAN" ],
     "cancels": [ "RESISTWARM", "STRONGER_RESISTWARM" ],
     "description": "Your heat tolerance is more or less normal for a human."
+  },
+  {
+    "type": "mutation",
+    "id": "PYROMANIA_GOOD",
+    "name": { "str": "Likes Fire" },
+    "points": 1,
+    "description": "You enjoy lighting fires and standing near them, and gain a morale bonus for doing so.",
+    "starting_trait": true,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "id": "KILLER_GOOD",
+    "name": { "str": "Killer" },
+    "points": 2,
+    "description": "You derive enjoyment from killing things.  Putting end to life seem to spark some dark satisfaction and thrill, and you gain a morale bonus for doing so.",
+    "social_modifiers": { "intimidate": 10 },
+    "cancels": [ "PACIFIST" ],
+    "flags": [ "CANNIBAL" ],
+    "starting_trait": true,
+    "valid": false
   }
 ]