Merge pull request #133 from collectanos/master

Futurism

data/json/EraOfDecay/items/tools/other.json

@@ -70,5 +70,51 @@
     "name": { "str": "sharpened entrenching tool" },
     "description": "A stout, collapsible spade.  It's commonly used by military forces and favored by hikers for digging.  This one had its edges crudely shapened, turning it into a much more dangerous weapon in melee combat.",
     "melee_damage": { "bash": 6, "cut": 16 }
+  },
+  {
+    "id": "rc_scout_car",
+    "copy-from": "rc_scout_car",
+    "type": "TOOL",
+    "name": { "str": "RC scout car" },
+    "description": "A small wheeled drone, nimble and almost undetectable it mounts a robotic eye for espionage work.  Once turned on, a remote controller will let you use it as a mobile camera.",
+    "symbol": "e",
+    "ammo": [ "battery" ],
+    "charges_per_use": 1,
+    "proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 },
+    "use_action": {
+      "target": "rc_scout_car_on",
+      "menu_text": "Activate RC scout car",
+      "msg": "You activate the RC scout car.",
+      "active": true,
+      "type": "transform"
+    },
+    "flags": [ "RADIO_CONTAINER" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "holster": true,
+        "rigid": true,
+        "max_contains_volume": "2 L",
+        "max_contains_weight": "2 kg",
+        "item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ]
+      }
+    ]
+  },
+  {
+    "id": "rc_scout_car_on",
+    "copy-from": "rc_scout_car",
+    "type": "TOOL",
+    "name": { "str": "RC scout car (on)", "str_pl": "RC scout cars (on)" },
+    "description": "This RC scout car is on, and continuously transmitting a video-feed of its immediate surroundings.  Use a remote control to drive it around.",
+    "turns_per_charge": 5,
+    "revert_to": "rc_scout_car",
+    "use_action": {
+      "target": "rc_scout_car",
+      "menu_text": "Deactivate RC scout car",
+      "msg": "You deactivate the RC scout car.",
+      "type": "transform"
+    },
+    "emits": [ "emit_clairvoyant" ],
+    "flags": [ "LIGHT_15", "RADIO_CONTAINER", "RADIOCAR" ]
   }
 ]

data/json/items/armor/legs_clothes.json

@@ -1718,8 +1718,109 @@
     "armor": [
       { "coverage": 100, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] },
       { "coverage": 75, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] }
+    ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "skirt_red",
+        "name": { "str": "red skirt" },
+        "description": "This one is colored red.",
+        "color": "red",
+        "append": true,
+        "weight": 40
+      },
+      {
+        "id": "skirt_blue",
+        "name": { "str": "blue skirt" },
+        "color": "blue",
+        "description": "This one is colored blue.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_yellow",
+        "name": { "str": "yellow skirt" },
+        "color": "yellow",
+        "description": "This one is colored yellow.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_green",
+        "name": { "str": "green skirt" },
+        "color": "green",
+        "description": "This one is colored green.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_purple",
+        "name": { "str": "purple skirt" },
+        "color": "magenta",
+        "description": "This one is colored purple.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_pink",
+        "name": { "str": "pink skirt" },
+        "color": "magenta",
+        "description": "This one is colored pink.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_cyan",
+        "name": { "str": "cyan skirt" },
+        "color": "cyan",
+        "description": "This one is colored cyan.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_black",
+        "name": { "str": "black skirt" },
+        "color": "dark_gray",
+        "description": "This one is colored black.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_white",
+        "name": { "str": "white skirt" },
+        "color": "light_gray",
+        "description": "This one is colored white.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "skirt_brown",
+        "name": { "str": "brown skirt" },
+        "color": "brown",
+        "description": "This one is colored brown.",
+        "append": true,
+        "weight": 24
+      }
     ]
   },
+  {
+    "id": "skirt_long",
+    "type": "ARMOR",
+    "name": { "str": "long skirt" },
+    "description": "A long skirt with no pockets.  Slightly more cumbersome but warmer than a normal skirt.",
+    "weight": "500 g",
+    "volume": "550 ml",
+    "price": 6500,
+    "price_postapoc": 75,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "kilt",
+    "color": "black",
+    "warmth": 10,
+    "material_thickness": 0.2,
+    "flags": [ "VARSIZE" ],
+    "armor": [ { "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ]
+  },
   {
     "id": "skirt_grass",
     "type": "ARMOR",

data/json/items/armor/torso_clothes.json

@@ -742,7 +742,90 @@
     "warmth": 20,
     "material_thickness": 1,
     "valid_mods": [ "steel_padded" ],
-    "flags": [ "VARSIZE", "POCKETS", "HOOD" ]
+    "flags": [ "VARSIZE", "POCKETS", "HOOD" ],
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "hoodie_red",
+        "name": { "str": "red hoodie" },
+        "description": "This one is colored red.",
+        "color": "red",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_blue",
+        "name": { "str": "blue hoodie" },
+        "color": "blue",
+        "description": "This one is colored blue.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_yellow",
+        "name": { "str": "yellow hoodie" },
+        "color": "yellow",
+        "description": "This one is colored yellow.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_green",
+        "name": { "str": "green hoodie" },
+        "color": "green",
+        "description": "This one is colored green.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_purple",
+        "name": { "str": "purple hoodie" },
+        "color": "magenta",
+        "description": "This one is colored purple.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_pink",
+        "name": { "str": "pink hoodie" },
+        "color": "magenta",
+        "description": "This one is colored pink.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_cyan",
+        "name": { "str": "cyan hoodie" },
+        "color": "cyan",
+        "description": "This one is colored cyan.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_black",
+        "name": { "str": "black hoodie" },
+        "color": "dark_gray",
+        "description": "This one is colored black.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_white",
+        "name": { "str": "white hoodie" },
+        "color": "light_gray",
+        "description": "This one is colored white.",
+        "append": true,
+        "weight": 24
+      },
+      {
+        "id": "hoodie_brown",
+        "name": { "str": "brown hoodie" },
+        "color": "brown",
+        "description": "This one is colored brown.",
+        "append": true,
+        "weight": 24
+      }
+    ]
   },
   {
     "id": "jersey",

data/json/items/melee/high_tech_weapons_melee.json

@@ -0,0 +1,62 @@
+[
+  {
+    "id": "plasma_saber",
+    "type": "TOOL",
+    "category": "weapons",
+    "name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" },
+    "description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.",
+    "weight": "1000 g",
+    "volume": "500 ml",
+    "longest_side": "20 cm",
+    "price": 5000,
+    "price_postapoc": 3000,
+    "to_hit": -1,
+    "melee_damage": { "bash": 9 },
+    "material": [ "steel" ],
+    "symbol": "/",
+    "color": "light_gray",
+    "ammo": [ "battery" ],
+    "charges_per_use": 1,
+    "use_action": [
+      {
+        "target": "plasma_saber_on",
+        "msg": "The plasma saber activates.",
+        "active": true,
+        "need_charges": 1,
+        "need_charges_msg": "The plasma saber power cell is empty.",
+        "type": "transform"
+      }
+    ],
+    "flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "flag_restriction": [ "BATTERY_HEAVY" ],
+        "default_magazine": "heavy_plus_battery_cell"
+      }
+    ]
+  },
+  {
+    "id": "plasma_saber_on",
+    "copy-from": "plasma_saber",
+    "type": "TOOL",
+    "name": { "str": "plasma saber (on)", "str_pl": "plasma sabers (on)" },
+    "description": "An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.",
+    "material": [ "steel" ],
+    "longest_side": "180 cm",
+    "melee_damage": { "cutting": 60 },
+    "qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "SAW_M", 2 ] ],
+    "revert_to": "plasma_saber",
+    "power_draw": 5000,
+    "use_action": [
+      { "type": "firestarter", "moves": 200, "moves_slow": 2000 },
+      {
+        "target": "plasma_saber",
+        "msg": "The plasma saber deactivates.",
+        "menu_text": "Turn off",
+        "type": "transform"
+      }
+    ],
+    "flags": [ "LIGHT_50", "DURABLE_MELEE", "TRADER_AVOID", "FIRESTARTER", "NONCONDUCTIVE" ]
+  }
+]