burst_when_thrown_filled item property and condom to use it (#29801)

* Added condom to containers and added a property named 'burst_when_thrown_filled' that takes a number which represents a percentage.
randombk · May 10, 2019 · d5f27f7 · d5f27f7
1 parent 783fd96
commit d5f27f7
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 17 deletions.
diff --git a/SIGNOFF b/SIGNOFF
@@ -61,3 +61,4 @@ Patrik Stridvall <patrik@stridvall.se>
 Ryan Schneider (RadHazard) <rslego@gmail.com>
 Paul Bransford (draeath) <draeath@gmail.com>
 Mark Langsdorf (mlangsdorf) <mark.langsdorf@gmail.com> / <mlangsdo@redhat.com>
+Davis Bray (Kaltag1925) <pdavisbray@gmail.com>
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
@@ -1011,5 +1011,24 @@
     "contains": 17,
     "seals": true,
     "watertight": true
+  },
+  {
+    "id": "condom",
+    "type": "CONTAINER",
+    "category": "other",
+    "name": "condom",
+    "description": "A gentleman's balloon. A single use life preventer. A thumbless latex mitten. This could be used as a makeshift water container, but otherwise it's anyone's guess what it's for.",
+    "weight": 5,
+    "volume": 0,
+    "price": 0,
+    "to_hit": -5,
+    "rigid": false,
+    "material": "plastic",
+    "symbol": ")",
+    "color": "white",
+    "contains": 15,
+    "watertight": true,
+    "seals": true,
+    "properties": [ [ "burst_when_filled", "75" ] ]
   }
 ]
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -2912,22 +2912,6 @@
     "volume": 2,
     "bashing": 5
   },
-  {
-    "id": "condom",
-    "type": "GENERIC",
-    "category": "other",
-    "name": "condom",
-    "looks_like": "lens",
-    "description": "A gentleman's balloon.  A single use life preventer.  A thumbless latex mitten.   This could be used as a makeshift water container, but otherwise it's anyone's guess what it's for.",
-    "weight": 5,
-    "volume": "5ml",
-    "price": 200,
-    "material": "plastic",
-    "symbol": "*",
-    "color": "white",
-    "bashing": 5,
-    "to_hit": -3
-  },
   {
     "type": "GENERIC",
     "id": "lock",

diff --git a/data/json/mapgen/cs_sex_shop.json b/data/json/mapgen/cs_sex_shop.json
@@ -26,7 +26,8 @@
       [ "leather_collar", 20 ],
       [ "bondage_mask", 20 ],
       [ "bullwhip", 20 ],
-      [ "candle", 20 ]
+      [ "candle", 20 ],
+      [ "condom", 20 ]
     ]
   },
   {

diff --git a/msvc-full-features/Cataclysm-vcpkg-static.vcxproj b/msvc-full-features/Cataclysm-vcpkg-static.vcxproj
@@ -243,3 +243,4 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
+
diff --git a/src/ballistics.cpp b/src/ballistics.cpp
@@ -61,6 +61,20 @@ static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
         return;
     }
 
+    if( effects.count( "BURST" ) ) {
+        // Drop the contents, not the thrown item
+        if( g->u.sees( pt ) ) {
+            add_msg( _( "The %s bursts!" ), drop_item.tname() );
+        }
+
+        for( const item &i : drop_item.contents ) {
+            g->m.add_item_or_charges( pt, i );
+        }
+
+        //TODO: Sound
+        return;
+    }
+
     // Copy the item
     item dropped_item = drop_item;
 

diff --git a/src/ranged.cpp b/src/ranged.cpp
@@ -518,6 +518,12 @@ dealt_projectile_attack player::throw_item( const tripoint &target, const item &
     const bool shatter = !thrown.active && thrown.made_of( material_id( "glass" ) ) &&
                          rng( 0, units::to_milliliter( 2000_ml - volume ) ) < get_str() * 100;
 
+    // Item will burst upon landing, destroying the item, and spilling its contents
+    const bool burst = thrown.has_property( "burst_when_filled" ) && thrown.is_container() &&
+                       thrown.get_property_long( "burst_when_filled" ) <= ( ( double )
+                               thrown.get_contained().volume().value() ) / thrown.get_container_capacity().value() * 100;
+
+
     // Add some flags to the projectile
     if( weight > 500_gram ) {
         proj_effects.insert( "HEAVY_HIT" );
@@ -545,6 +551,11 @@ dealt_projectile_attack player::throw_item( const tripoint &target, const item &
         proj_effects.insert( "SHATTER_SELF" );
     }
 
+    //TODO: Add wet effect if other things care about that
+    if( burst ) {
+        proj_effects.insert( "BURST" );
+    }
+
     // Some minor (skill/2) armor piercing for skillful throws
     // Not as much as in melee, though
     for( damage_unit &du : impact.damage_units ) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -243,3 +243,4 @@
		<ImportGroup Label="ExtensionTargets">
		</ImportGroup>
		</Project>