Merge branch 'spring-refactor' into test-release

data/json/external_tileset/External_Tileset_DP_Normal.json

@@ -0,0 +1,35 @@
+[
+  {
+    "type": "mod_tileset",
+    "compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
+    "tiles-new": [
+      {
+        "file": "external_tileset/External_Tileset_DP_Normal.png",
+        "tiles": [
+          { "id": "f_steam_turbine", "fg": 0 },
+          { "id": "animation_bullet_normal_0deg", "fg": 1, "rotates": true },
+          { "id": "animation_bullet_normal_45deg", "fg": 2, "rotates": true },
+          { "id": "shield_wooden", "fg": 3 },
+          { "id": [ "overlay_worn_shield_wooden", "overlay_wielded_shield_wooden" ], "fg": 4 },
+          { "id": "shield_wooden_large", "fg": 5 },
+          { "id": [ "overlay_worn_shield_wooden_large", "overlay_wielded_shield_wooden_large" ], "fg": 6 },
+          { "id": "shield_riot", "fg": 7 },
+          { "id": [ "overlay_worn_shield_riot", "overlay_wielded_shield_riot" ], "fg": 8 },
+          { "id": "shield_ballistic", "fg": 9 },
+          { "id": [ "overlay_worn_shield_ballistic", "overlay_worn_shield_ballistic" ], "fg": 10 },
+          { "id": "sling_bullet", "fg": 11 },
+          { "id": "shield_leather", "fg": 12 },
+          { "id": [ "overlay_worn_shield_leather", "overlay_wielded_shield_leather" ], "fg": 13 },
+          { "id": "shield_banded", "fg": 14 },
+          { "id": [ "overlay_worn_shield_banded", "overlay_wielded_shield_banded" ], "fg": 15 },
+          { "id": "shield_leather_large", "fg": 16 },
+          { "id": [ "overlay_worn_shield_leather_large", "overlay_wielded_shield_leather_large" ], "fg": 17 },
+          { "id": "shield_banded_large", "fg": 18 },
+          { "id": [ "overlay_worn_shield_banded_large", "overlay_wielded_shield_banded_large" ], "fg": 19 }
+        ],
+        "sprite_width": 32,
+        "sprite_height": 32
+      }
+    ]
+  }
+]

data/json/external_tileset/External_Tileset_DP_Tall.json

@@ -0,0 +1,21 @@
+[
+  {
+    "type": "mod_tileset",
+    "compatibility": [ "UNDEAD_PEOPLE_BASE", "UNDEAD_PEOPLE" ],
+    "tiles-new": [
+      {
+        "file": "external_tileset/External_Tileset_DP_Tall.png",
+        "tiles": [
+          { "id": "t_utility_light_off", "fg": 0 },
+          { "id": "f_alien_nerve", "fg": 1 },
+          { "id": "mon_bear_armored", "fg": 2 },
+          { "id": "corpse_mon_bear_armored", "fg": 3 }
+        ],
+        "sprite_width": 64,
+        "sprite_height": 80,
+        "sprite_offset_x": -16,
+        "sprite_offset_y": -48
+      }
+    ]
+  }
+]

data/json/itemgroups/Clothing_Gear/clothing.json

@@ -1872,7 +1872,8 @@
       [ "beret_wool", 40 ],
       [ "elbow_pads", 50 ],
       [ "knee_pads", 50 ],
-      [ "solarpack", 5 ]
+      [ "solarpack", 5 ],
+      [ "shield_ballistic", 3 ]
     ]
   },
   {
@@ -1903,6 +1904,7 @@
       [ "elbow_pads", 40 ],
       [ "knee_pads", 40 ],
       [ "mask_bal", 5 ],
+      [ "shield_ballistic", 2 ],
       [ "e_tool", 10 ],
       [ "waterproof_gunmod", 8 ],
       [ "grapnel", 3 ],
@@ -2398,7 +2400,11 @@
       [ "survivor_shavingkit", 3 ],
       [ "survivor_hairtrimmer", 1 ],
       [ "survivor_scope", 1 ],
-      [ "survnote", 30 ]
+      [ "survnote", 30 ],
+      [ "shield_wooden", 1 ],
+      [ "shield_wooden_large", 1 ],
+      [ "shield_riot", 3 ],
+      [ "shield_ballistic", 2 ]
     ]
   },
   {
@@ -2429,7 +2435,13 @@
       [ "legguard_metal", 10 ],
       [ "helmet_corinthian", 45 ],
       [ "armor_cuirass", 25 ],
-      [ "legguard_bronze", 20 ]
+      [ "legguard_bronze", 20 ],
+      [ "shield_wooden", 10 ],
+      [ "shield_wooden_large", 5 ],
+      [ "shield_leather", 3 ],
+      [ "shield_leather_large", 2 ],
+      [ "shield_banded", 3 ],
+      [ "shield_banded_large", 2 ]
     ]
   },
   {

data/json/itemgroups/Clothing_Gear/gear.json

@@ -31,7 +31,9 @@
       [ "suppressor_compact", 20 ],
       [ "swat_armor", 20 ],
       [ "tac_fullhelmet", 5 ],
-      [ "tac_helmet", 10 ]
+      [ "tac_helmet", 10 ],
+      [ "shield_riot", 20 ],
+      [ "shield_ballistic", 5 ]
     ]
   },
   {

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1385,6 +1385,7 @@
       [ "gloves_tactical", 10 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 20 ],
+      [ "shield_riot", 20 ],
       [ "emergency_book", 1 ]
     ]
   },

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -585,7 +585,8 @@
       [ "silver_medal", 2 ],
       [ "gold_medal", 1 ],
       [ "bionic_scanner", 5 ],
-      { "group": "tinware", "prob": 10 }
+      { "group": "tinware", "prob": 10 },
+      [ "shield_riot", 5 ]
     ]
   },
   {

data/json/itemgroups/Locations_MapExtras/mansion.json

@@ -452,7 +452,12 @@
     "id": "soa_plate",
     "type": "item_group",
     "subtype": "collection",
-    "items": [ { "group": "soa_weapons_plate" }, [ "armor_lightplate", 100 ], [ "helmet_barbute", 100 ] ]
+    "items": [
+      { "group": "soa_weapons_plate" },
+      { "group": "soa_shields_plate", "prob": 25 },
+      [ "armor_lightplate", 100 ],
+      [ "helmet_barbute", 100 ]
+    ]
   },
   {
     "id": "soa_weapons_plate",
@@ -464,11 +469,16 @@
       { "group": "soa_real_weapon_plate", "prob": 3 }
     ]
   },
+  {
+    "id": "soa_shields_plate",
+    "type": "item_group",
+    "items": [ [ "shield_leather", 50 ] ]
+  },
   {
     "id": "soa_mail",
     "type": "item_group",
     "subtype": "collection",
-    "items": [ { "group": "soa_weapons_mail" }, [ "chainmail_suit", 100 ] ]
+    "items": [ { "group": "soa_weapons_mail" }, { "group": "soa_shields_mail", "prob": 50 }, [ "chainmail_suit", 100 ] ]
   },
   {
     "id": "soa_weapons_mail",
@@ -480,6 +490,17 @@
       { "group": "soa_real_weapon_mail", "prob": 3 }
     ]
   },
+  {
+    "id": "soa_shields_mail",
+    "type": "item_group",
+    "items": [
+      [ "shield_wooden", 10 ],
+      [ "shield_wooden_large", 5 ],
+      [ "shield_banded", 30 ],
+      [ "shield_leather", 40 ],
+      [ "shield_leather_large", 30 ]
+    ]
+  },
   {
     "id": "soa_samurai",
     "type": "item_group",

data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json

@@ -177,34 +177,24 @@
     "ammo": 20,
     "subtype": "distribution",
     "entries": [
-      { "item": "jumpsuit", "prob": 90 },
-      { "item": "mask_filter", "prob": 10 },
+      { "group": "floor_trash", "prob": 25 },
+      { "group": "necropolis_visitors", "prob": 5 },
+      { "group": "magazines", "prob": 10 },
+      { "group": "office_paper", "prob": 10 },
+      { "group": "hazmat_mask", "prob": 10, "damage": [ 1, 4 ] },
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      { "item": "radio", "prob": 10, "charges-min": 10, "charges-max": 95 },
-      { "item": "boots_combat", "prob": 20 },
-      { "item": "bandages", "prob": 10, "charges-min": 1, "charges-max": 3 },
-      { "item": "cig", "prob": 30, "charges-min": 1, "charges-max": 20 },
-      { "item": "knife_combat", "prob": 10 },
-      { "item": "vest", "prob": 15 },
-      { "item": "glasses_safety", "prob": 15 },
-      { "item": "9mm", "prob": 15 },
-      { "item": "m9", "prob": 10 },
-      { "item": "water_clean", "prob": 10 },
-      { "item": "eyedrops", "prob": 10, "charges-min": 1, "charges-max": 10 },
-      { "item": "screwdriver", "prob": 10 },
+      { "item": "radio", "prob": 10, "charges": [ 10, 95 ] },
+      { "group": "drugs_heal_simple", "prob": 20 },
+      { "group": "default_zombie_items_pockets", "prob": 30 },
+      { "item": "knife_combat", "prob": 10, "damage": [ 1, 4 ] },
+      { "group": "clothing_work_glasses", "prob": 45, "damage": [ 1, 4 ] },
+      { "group": "ammo_pistol_milspec", "prob": 15 },
+      { "group": "guns_pistol_milspec", "prob": 10, "damage": [ 1, 4 ] },
+      { "group": "vending_drink_items", "prob": 10 },
+      { "group": "tools_common", "prob": 10 },
       { "item": "id_science", "prob": 5 },
-      { "item": "cleansuit", "prob": 10 },
-      { "item": "coat_lab", "prob": 20 },
-      { "item": "glasses_eye", "prob": 30 },
-      { "item": "rad_monitor", "prob": 10, "charges-min": 2, "charges-max": 20 },
-      { "item": "geiger_off", "prob": 10, "charges-min": 10, "charges-max": 95 },
-      { "item": "tool_belt", "prob": 15 },
-      { "item": "panties", "prob": 20 },
-      { "item": "boy_shorts", "prob": 20 },
-      { "item": "bra", "prob": 20 },
-      { "item": "undershirt", "prob": 40 },
-      { "item": "boxer_shorts", "prob": 30 },
-      { "item": "briefs", "prob": 30 }
+      { "group": "rad_gear", "prob": 20 },
+      { "item": "tool_belt", "prob": 15, "damage": [ 1, 4 ] }
     ]
   },
   {
@@ -334,7 +324,8 @@
       { "item": "pur_tablets", "prob": 10 },
       { "item": "pastaextruder", "prob": 10 },
       { "item": "can_sealer", "prob": 10 },
-      { "item": "remotevehcontrol", "prob": 8 }
+      { "item": "remotevehcontrol", "prob": 8 },
+      { "item": "shield_ballistic", "prob": 10 }
     ]
   },
   {

data/json/itemgroups/art_antiques_crafts.json

@@ -133,6 +133,10 @@
       { "item": "tinderbox", "prob": 4 },
       { "item": "flint_steel", "prob": 7 },
       { "item": "canteen_wood", "prob": 5 },
+      { "item": "shield_wooden", "prob": 3 },
+      { "item": "shield_wooden_large", "prob": 3 },
+      { "item": "shield_banded", "prob": 3 },
+      { "item": "shield_banded_large", "prob": 3 },
       { "item": "apron_leather", "prob": 1 },
       { "item": "pot_copper", "prob": 3 },
       { "group": "tinware", "prob": 10 }

data/json/itemgroups/science_and_tech.json

@@ -496,5 +496,46 @@
       [ "test_tube", 10 ],
       [ "bionic_scanner", 5 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "microlab_storage_electric",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "alloy_plate", "prob": 20 },
+      { "item": "recharge_station", "prob": 20 },
+      { "item": "solar_panel", "prob": 10 },
+      { "item": "solar_panel_v2", "prob": 20 },
+      { "item": "motor_large", "prob": 5 },
+      { "item": "motor_enhanced", "prob": 15 },
+      { "item": "motor_super", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "microlab_storage_cvd_carbon",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "charcoal", "prob": 75, "charges": [ 25, 50 ] },
+      { "item": "coal_lump", "prob": 25, "charges": [ 25, 50 ] }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "microlab_storage_cvd_hydrogen",
+    "subtype": "distribution",
+    "entries": [ { "item": "hydrogen_tank", "prob": 25 }, { "item": "plasma", "prob": 75, "charges": [ 10, 20 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "microlab_storage_plutonium_special",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "minireactor", "prob": 50 },
+      { "item": "bio_reactor", "prob": 10 },
+      { "item": "bio_advreactor", "prob": 10 },
+      { "item": "bio_reactor_upgrade", "prob": 5 },
+      { "item": "huge_atomic_battery_cell", "prob": 25 }
+    ]
   }
 ]