Cantaloupe splat #712

cxong · Sep 12, 2024 · 5e4ceff · 5e4ceff
1 parent c9d428c
commit 5e4ceff
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 5 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/bullets.json b/data/.wolf3d/N3Ddata.cdogscpn/bullets.json
@@ -43,16 +43,42 @@
       "Name": "cantaloupe",
       "Pic": {
         "Type": "Animated",
-        "Sprites": "grenade",
-        "Mask": "ffba43"
+        "Sprites": "particles/cantaloupe",
+        "TicksPerFrame": 2
       },
       "Size": [4, 4],
       "ShadowSize": [6, 4],
-      "Speed": 600,
+      "SpeedLow": 500,
+      "SpeedHigh": 700,
       "Range": 200,
-      "Power": 100,
+      "Power": 20,
       "Mass": 1.0,
       "Spark": "",
+      "Hit": {
+        "Flesh": {},
+        "Wall": {}
+      },
+      "HitGuns": [
+        "cantaloupe_splat"
+      ],
+      "Falling": {
+        "GravityFactor": 1
+      }
+    },
+    {
+      "Name": "cantaloupe_splat",
+      "Pic": {
+        "Type": "AnimatedRandom",
+        "Sprites": "particles/spall3",
+        "TicksPerFrame": 6,
+        "Mask": "F08C60"
+      },
+      "SpeedLow": 256,
+      "SpeedHigh": 512,
+      "SpeedScale": true,
+      "Range": 100,
+      "Power": 15,
+      "WallBounces": true,
       "Hit": {
         "Flesh": {
           "Sound": "splat0"
@@ -61,10 +87,63 @@
           "Sound": "splat0"
         }
       },
+      "Falling": {
+        "GravityFactor": 4,
+        "DestroyOnDrop": true
+      }
+    },
+    {
+      "Name": "watermelon",
+      "Pic": {
+        "Type": "Animated",
+        "Sprites": "grenade",
+        "Mask": "527A30"
+      },
+      "Size": [8, 8],
+      "ShadowSize": [8, 6],
+      "Speed": 400,
+      "Range": 300,
+      "Power": 40,
+      "Mass": 4.0,
+      "Spark": "",
+      "Hit": {
+        "Flesh": {},
+        "Wall": {}
+      },
+      "HitGuns": [
+        "watermelon_splat"
+      ],
       "Falling": {
         "GravityFactor": 1
       }
     },
+    {
+      "Name": "watermelon_splat",
+      "Pic": {
+        "Type": "AnimatedRandom",
+        "Sprites": "particles/spall2",
+        "TicksPerFrame": 6,
+        "Mask": "C63A4F"
+      },
+      "SpeedLow": 256,
+      "SpeedHigh": 512,
+      "SpeedScale": true,
+      "Range": 100,
+      "Power": 20,
+      "WallBounces": true,
+      "Hit": {
+        "Flesh": {
+          "Sound": "splat1"
+        },
+        "Wall": {
+          "Sound": "splat1"
+        }
+      },
+      "Falling": {
+        "GravityFactor": 4,
+        "DestroyOnDrop": true
+      }
+    },
     {
       "Name": "bullet_enemy",
       "Pic": {

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/particles/cantaloupe_8x8.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/particles/cantaloupe_8x8.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/guns.json b/data/.wolf3d/N3Ddata.cdogscpn/guns.json
@@ -69,6 +69,8 @@
       "MuzzleFlashParticle": "",
       "Sound": "cantaloupe_feeder",
       "SwitchSound": "package_r",
+      "SpreadCount": 2,
+      "SpreadWidth": 0,
       "Elevation": 18,
       "Ammo": "Cantaloupe",
       "OverheatTicks": -1
@@ -77,7 +79,7 @@
       "Pic": "",
       "IsGrenade": true,
       "Name": "Watermelons",
-      "Bullet": "grenade",
+      "Bullet": "watermelon",
       "Cost": 20,
       "Lock": 70,
       "Sound": "watermelon_feeder",
@@ -173,6 +175,24 @@
     }
   ],
   "PseudoGuns" : [
+    {
+      "Name": "cantaloupe_splat",
+      "Bullet": "cantaloupe_splat",
+      "Recoil": 2,
+      "SpreadCount": 6,
+      "ElevationLow": 22,
+      "ElevationHigh": 30,
+      "Sound": "splat0"
+    },
+    {
+      "Name": "watermelon_splat",
+      "Bullet": "watermelon_splat",
+      "Recoil": 2,
+      "SpreadCount": 10,
+      "ElevationLow": 22,
+      "ElevationHigh": 30,
+      "Sound": "splat1"
+    },
     {
       "Pic": "chaingun",
       "Name": "boss_chaingun2",