i threw it on the GROUND (#51850)

CleverRaven · Sep 25, 2021 · af27432 · af27432
1 parent ee70ec5
commit af27432
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 36 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -7,8 +7,8 @@
     "//": "Small common items carried in a person's pockets, purse, etc. Wallets at roughly 50%.",
     "items": [
       { "group": "wallets", "prob": 1600 },
-      { "item": "cell_phone", "prob": 50, "charges": [ 0, 300 ] },
-      { "item": "smart_phone", "prob": 180, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 26, "charges": [ 0, 300 ] },
+      { "item": "smart_phone", "prob": 204, "charges-min": 0 },
       { "item": "cig", "prob": 250, "charges-min": 1, "charges-max": 20 },
       { "item": "lighter", "prob": 50, "charges-min": 0 },
       [ "joint", 10 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -856,8 +856,8 @@
       [ "atomic_light", 1 ],
       { "item": "eink_tablet_pc", "prob": 1, "charges": [ 0, 100 ] },
       [ "mobile_memory_card", 5 ],
-      { "item": "cell_phone", "prob": 10, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 30, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 35, "charges-min": 0 },
       [ "rag", 1 ],
       [ "claw_bar", 3 ],
       [ "crowbar", 18 ],
@@ -1539,8 +1539,8 @@
       { "item": "mag_melee", "prob": 10 },
       { "item": "mag_traps", "prob": 10 },
       { "item": "mp3", "prob": 9, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 20, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 80, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 10, "charges-min": 0 },
       { "item": "eink_tablet_pc", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
@@ -1740,8 +1740,8 @@
       [ "atomic_light", 3 ],
       [ "atomic_lamp", 3 ],
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 40, "charges": [ 0, 150 ] },
+      { "item": "cell_phone", "prob": 7, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 54, "charges": [ 0, 150 ] },
       { "item": "eink_tablet_pc", "prob": 15, "charges": [ 0, 100 ] },
       [ "mobile_memory_card", 40 ],
       [ "mobile_memory_card_science", 10 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -262,8 +262,8 @@
       [ "fc_hairpin", 5 ],
       [ "barrette", 5 ],
       [ "pearl_collar", 1 ],
-      { "item": "cell_phone", "prob": 15, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 20, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 31, "charges-min": 0 },
       [ "tophat", 10 ],
       [ "bullwhip", 3 ],
       [ "bowhat", 10 ],
@@ -1624,8 +1624,8 @@
     "magazine": 100,
     "items": [
       { "item": "portable_game", "prob": 65, "charges": 100 },
-      { "item": "cell_phone", "prob": 30, "charges": 150 },
-      { "item": "smart_phone", "prob": 65, "charges": 120 },
+      { "item": "cell_phone", "prob": 11, "charges": 150 },
+      { "item": "smart_phone", "prob": 85, "charges": 120 },
       { "item": "mp3", "prob": 65, "charges": 100 },
       { "group": "toy_radio_car", "prob": 35 },
       { "item": "vibrator", "prob": 1, "charges": 100 }

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -182,7 +182,8 @@
       [ "crackpipe", 10 ],
       { "item": "weed", "prob": 10, "charges": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "smart_phone", "prob": 20, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 17, "charges-min": 0 },
       { "item": "camera", "prob": 20, "charges": [ 0, 150 ] },
       [ "chem_hexamine", 5 ]
     ]
@@ -224,7 +225,8 @@
       { "item": "cig", "prob": 20, "charges": [ 1, 20 ] },
       { "item": "weed", "prob": 10, "charges": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "smart_phone", "prob": 50, "charges-min": 0 }
+      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 44, "charges-min": 0 }
     ]
   },
   {
@@ -260,7 +262,8 @@
       { "item": "cig", "prob": 20, "charges": [ 1, 20 ] },
       { "item": "weed", "prob": 10, "charges": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "smart_phone", "prob": 50, "charges-min": 0 }
+      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 44, "charges-min": 0 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -257,8 +257,8 @@
       { "item": "water", "prob": 10, "container-item": "glass" },
       { "group": "glass_of_wine", "prob": 10 },
       { "item": "gummy_vitamins", "prob": 10, "charges": [ 1, 10 ] },
-      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 10, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 2, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 12, "charges-min": 0 },
       [ "eyedrops", 10 ],
       [ "holy_symbol", 5 ],
       [ "pills_sleep", 5 ],
@@ -404,8 +404,8 @@
       { "item": "deck_of_cards", "prob": 2 },
       { "item": "usb_drive", "prob": 5 },
       { "group": "alcohol", "prob": 163 },
-      { "item": "cell_phone", "prob": 15, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 25, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 36, "charges-min": 0 },
       { "item": "wristwatch", "prob": 15 },
       { "item": "pocketwatch", "prob": 5 },
       { "item": "umbrella", "prob": 50 },
@@ -898,8 +898,8 @@
       { "item": "laptop", "prob": 10, "charges": [ 0, 500 ] },
       { "item": "atomic_light", "prob": 2 },
       { "item": "atomic_lamp", "prob": 2 },
-      { "item": "cell_phone", "prob": 15, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 30, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 40, "charges-min": 0 },
       { "item": "eink_tablet_pc", "prob": 2, "charges": [ 0, 100 ] },
       { "item": "smart_lamp", "prob": 2, "charges": [ 0, 100 ] },
       { "item": "mobile_memory_card", "prob": 8 },

diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
@@ -32,8 +32,8 @@
       [ "small_lcd_screen", 20 ],
       { "item": "polycarbonate_sheet", "prob": 39 },
       [ "battery_ups", 15 ],
-      { "item": "cell_phone", "prob": 15, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 20, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 31, "charges-min": 0 },
       { "item": "eink_tablet_pc", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
@@ -116,9 +116,9 @@
     "subtype": "distribution",
     "id": "phones",
     "items": [
-      { "item": "cell_phone", "prob": 9, "charges-min": 0, "charges-max": 15 },
+      { "item": "cell_phone", "prob": 2, "charges-min": 0, "charges-max": 15 },
       { "item": "cell_phone", "prob": 1, "charges-min": 150, "charges-max": 150 },
-      { "item": "smart_phone", "prob": 9, "charges-min": 0, "charges-max": 15 },
+      { "item": "smart_phone", "prob": 17, "charges-min": 0, "charges-max": 15 },
       { "item": "smart_phone", "prob": 1, "charges-min": 130, "charges-max": 130 }
     ]
   },

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -490,8 +490,8 @@
       [ "mbag", 2 ],
       [ "mop", 5 ],
       [ "rubber_band", 5 ],
-      { "item": "cell_phone", "prob": 10, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 10, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 18, "charges-min": 0 },
       { "item": "duct_tape", "prob": 5, "charges": [ 50, 200 ] },
       { "group": "ammo_pocket_batteries", "prob": 5 },
       { "item": "flashlight", "prob": 10, "charges": [ 0, 300 ] },

diff --git a/data/json/mapgen/abandoned01.json b/data/json/mapgen/abandoned01.json
@@ -69,8 +69,8 @@
       [ "bandages", 15 ],
       [ "bandana", 10 ],
       [ "cig", 5 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 15, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 18, "charges-min": 0 },
       [ "gloves_fingerless", 5 ],
       [ "holster", 5 ],
       [ "hatchet", 5 ],

diff --git a/data/json/mapgen/field_football.json b/data/json/mapgen/field_football.json
@@ -24,8 +24,8 @@
       [ "duffelbag", 30 ],
       [ "backpack", 40 ],
       [ "energy_drink", 30 ],
-      { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 30, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 44, "charges-min": 0 },
       [ "mp3", 50 ],
       { "item": "inhaler", "prob": 10, "charges": [ 0, 100 ] }
     ]

diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -420,8 +420,8 @@
       [ "carpentry_book", 1 ],
       [ "carrot", 3 ],
       { "item": "catfood", "prob": 3, "container-item": "can_food" },
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 15, "charges-min": 0 },
+      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
+      { "item": "smart_phone", "prob": 17, "charges-min": 0 },
       [ "ceramic_armor", 1 ],
       [ "cereal", 5 ],
       [ "cereal2", 5 ],

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -4016,7 +4016,7 @@
     "items": {
       "both": {
         "items": [ "hoodie", "jeans", "mbag", "socks", "sneakers", "bandana", "gloves_medical", "switchblade" ],
-        "entries": [ { "item": "crack", "charges": 25, "container-item": "bag_zipper" } ]
+        "entries": [ { "group": "charged_cell_phone" }, { "item": "crack", "charges": 25, "container-item": "bag_zipper" } ]
       },
       "male": [ "briefs" ],
       "female": [ "sports_bra", "boy_shorts" ]
@@ -4050,6 +4050,7 @@
           "knuckle_brass"
         ],
         "entries": [
+          { "group": "charged_cell_phone" },
           { "item": "deagle_44", "ammo-item": "44fmj", "container-item": "holster", "charges": 8 },
           { "item": "deaglemag", "ammo-item": "44fmj", "charges": 8, "count": 2 }
         ]

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -1922,15 +1922,22 @@
     "activity_level": "LIGHT_EXERCISE",
     "time": "2 m",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap", 1 ] ], [ [ "small_lcd_screen", 1 ] ], [ [ "RAM", 1 ] ], [ [ "processor", 1 ] ] ]
+    "components": [ [ [ "scrap", 1 ] ], [ [ "small_lcd_screen", 1 ] ], [ [ "processor", 1 ] ] ]
   },
   {
     "result": "smart_phone",
     "type": "uncraft",
     "activity_level": "LIGHT_EXERCISE",
     "time": "3 m 30 s",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap", 1 ] ], [ [ "small_lcd_screen", 1 ] ], [ [ "RAM", 1 ] ], [ [ "processor", 1 ] ], [ [ "lens_small", 1 ] ] ]
+    "components": [
+      [ [ "scrap", 1 ] ],
+      [ [ "light_plus_battery_cell", 1 ] ],
+      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "mobile_memory_card", 1 ] ],
+      [ [ "processor", 1 ] ],
+      [ [ "lens_small", 1 ] ]
+    ]
   },
   {
     "result": "mp3",