Merge pull request #31 from cliffe/main

MERGE

assets/rooms/room_office.json

@@ -338,6 +338,17 @@
                  "width": 48,
                  "x": 340,
                  "y": 144
+                },
+                {
+                 "height": 48,
+                 "id": 17,
+                 "name": "lockpick",
+                 "rotation": 0,
+                 "type": "",
+                 "visible": true,
+                 "width": 48,
+                 "x": 330,
+                 "y": 144
                 }
 
                 
@@ -349,7 +360,7 @@
          "y":0
         }],
  "nextlayerid":12,
- "nextobjectid":16,
+ "nextobjectid":18,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.0",

assets/rooms/room_reception.json

@@ -244,6 +244,17 @@
                  "width":48,
                  "x":380,
                  "y":166
+                },
+                {
+                 "height":48,
+                 "id":13,
+                 "name":"bluetooth_spoofer",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":48,
+                 "x":320,
+                 "y":166
                 }
          ],
          "opacity":1,
@@ -253,7 +264,7 @@
          "y":0
         }],
  "nextlayerid":12,
- "nextobjectid":11,
+ "nextobjectid":14,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.0",

assets/scenarios/ceo_exfil.json

@@ -45,7 +45,14 @@
                     "name": "Bluetooth Scanner",
                     "takeable": true,
                     "observations": "A device for detecting nearby Bluetooth signals",
-                    "canScanBluetooth": true,
+                    "canScanBluetooth": true
+                },
+                {
+                    "type": "bluetooth_spoofer",
+                    "name": "Bluetooth Spoofer",
+                    "takeable": true,
+                    "observations": "A specialized device that can mimic Bluetooth signals from other devices",
+                    "canSpoofBluetooth": true,
                     "mac": "00:11:22:33:44:55"
                 }
             ]
@@ -141,6 +148,12 @@
                     "readable": true,
                     "text": "Large data transfers detected to unknown external IPs - All originating from CEO's office",
                     "observations": "Suspicious network activity logs"
+                },
+                {
+                    "type": "lockpick",
+                    "name": "Lock Pick Kit",
+                    "takeable": true,
+                    "observations": "A professional lock picking kit with various picks and tension wrenches"
                 }
             ]
         },
@@ -153,6 +166,7 @@
             "locked": true,
             "lockType": "key",
             "requires": "ceo_office_key",
+            "difficulty": "easy",
             "objects": [
                 {
                     "type": "pc",
@@ -167,6 +181,7 @@
                     "locked": true,
                     "lockType": "key",
                     "requires": "briefcase_key",
+                    "difficulty": "medium",
                     "observations": "An expensive leather briefcase with a sturdy lock",
                     "contents": [
                         {
@@ -212,6 +227,7 @@
                     "locked": true,
                     "lockType": "key",
                     "requires": "safe_key",
+                    "difficulty": "hard",
                     "observations": "A well-hidden wall safe behind a painting",
                     "contents": [
                         {