Cantaloupe feeder icon #712

cxong · Jul 18, 2024 · 1978f87 · 1978f87
1 parent 4bd68bd
commit 1978f87
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 10 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/bullets.json b/data/.wolf3d/N3Ddata.cdogscpn/bullets.json
@@ -39,6 +39,32 @@
         "Ticks": 30
       }
     },
+    {
+      "Name": "cantaloupe",
+      "Pic": {
+        "Type": "Animated",
+        "Sprites": "grenade",
+        "Mask": "ffba43"
+      },
+      "Size": [4, 4],
+      "ShadowSize": [6, 4],
+      "Speed": 600,
+      "Range": 200,
+      "Power": 100,
+      "Mass": 1.0,
+      "Spark": "",
+      "Hit": {
+        "Flesh": {
+          "Sound": "splat0"
+        },
+        "Wall": {
+          "Sound": "splat0"
+        }
+      },
+      "Falling": {
+        "GravityFactor": 1
+      }
+    },
     {
       "Name": "bullet_enemy",
       "Pic": {

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/cantaloupe_feeder.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/cantaloupe_feeder.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/guns.json b/data/.wolf3d/N3Ddata.cdogscpn/guns.json
@@ -55,13 +55,13 @@
     {
       "Pic": "blaster_yellow",
       "Name": "Cantaloupe Feeder",
-      "Icon": "flamer",
-      "Bullet": "grenade",
-      "Cost": 1,
+      "Icon": "cantaloupe_feeder",
+      "Bullet": "cantaloupe",
+      "Cost": 10,
       "Lock": 45,
-      "Sound": "super_feeder",
-      "SwitchSound": "chaingun_pickup",
-      "Recoil": 0.23,
+      "Sound": "cantaloupe_feeder",
+      "SwitchSound": "package_r",
+      "Elevation": 18,
       "Ammo": "Cantaloupe"
     },
     {
@@ -70,9 +70,9 @@
       "Name": "Watermelons",
       "Bullet": "grenade",
       "Cost": 20,
-      "Lock": 30,
-      "Sound": "super_feeder",
-      "SwitchSound": "grenade_pickup",
+      "Lock": 70,
+      "Sound": "watermelon_feeder",
+      "SwitchSound": "package_pickup",
       "Elevation": 24,
       "Ammo": "Watermelon"
     },

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat0.ogg b/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat0.ogg
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat0.txt b/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat0.txt
@@ -0,0 +1,5 @@
+Adapted from Messy Splat 3
+By FoolBoyMedia
+https://freesound.org/people/FoolBoyMedia/sounds/237927/
+
+https://creativecommons.org/licenses/by/4.0/
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat1.ogg b/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat1.ogg
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat1.txt b/data/.wolf3d/N3Ddata.cdogscpn/sounds/splat1.txt
@@ -0,0 +1,5 @@
+Adapted from Messy Splat 3a
+By FoolBoyMedia
+https://freesound.org/people/FoolBoyMedia/sounds/237928/
+
+https://creativecommons.org/licenses/by/4.0/
diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c
@@ -3104,7 +3104,7 @@ static bool MakeWallWalkable(Mission *m, const struct vec2i v)
 {
 	int *tile = CArrayGet(&m->u.Static.Tiles, v.x + v.y * m->Size.x);
 	const TileClass *tc = MissionStaticGetTileClass(&m->u.Static, m->Size, v);
-	if (tc->Type == TILE_CLASS_WALL)
+	if (tc->Type == TILE_CLASS_WALL && !tc->canWalk)
 	{
 		*tile += TILE_CLASS_WALL_OFFSET;
 		return true;