Small launcher #712

data/.wolf3d/N3Ddata.cdogscpn/bullets.json

@@ -15,7 +15,7 @@
       }
     },
     {
-      "Name": "bullet",
+      "Name": "feed",
       "Pic": {
         "Type": "Normal",
         "Pic": ""
@@ -24,8 +24,7 @@
         "Particle": "trail",
         "Width": 1.0
       },
-      "OutOfRangeSpark": "spark",
-      "WallMark": "bullet_hole",
+      "OutOfRangeSpark": "spark_yellow",
       "Hit": {
         "Flesh": {
           "Sound": "hits/food"

data/.wolf3d/N3Ddata.cdogscpn/guns.json

@@ -4,7 +4,7 @@
     {
       "Pic": "",
       "Icon": "hand_feed",
-      "Name": "Hand",
+      "Name": "Hand Feed",
       "Bullet": "hand_feed",
       "Cost": 0,
       "Lock": 30,
@@ -16,12 +16,12 @@
     {
       "Pic": "pistol",
       "Name": "Small Launcher",
-      "Icon": "pistol",
-      "Bullet": "bullet",
+      "Icon": "small_launcher",
+      "Bullet": "feed",
       "Cost": 1,
       "Lock": 30,
-      "Sound": "small_feeder",
-      "SwitchSound": "pistol_switch",
+      "Sound": "small_launcher",
+      "SwitchSound": "bow_draw0",
       "Recoil": 0.1,
       "Ammo": "Feed"
     },
@@ -30,32 +30,32 @@
       "Grips": 2,
       "Name": "Large Launcher",
       "Icon": "smg",
-      "Bullet": "bullet",
+      "Bullet": "feed",
       "Prerequisite": "Small Launcher",
       "Cost": 1,
       "Lock": 12,
-      "Sound": "large_feeder",
-      "SwitchSound": "machine_gun_switch",
+      "Sound": "large_launcher",
+      "SwitchSound": "bow_draw1",
       "Recoil": 0.17,
       "Ammo": "Feed"
     },
     {
       "Pic": "chaingun",
       "Name": "Super Feeder",
       "Icon": "machine_gun",
-      "Bullet": "bullet",
+      "Bullet": "feed",
       "Cost": 1,
       "Lock": 6,
       "Sound": "super_feeder",
-      "SwitchSound": "chaingun_pickup",
+      "SwitchSound": "bow_draw2",
       "Recoil": 0.23,
       "Ammo": "Feed"
     },
     {
       "Pic": "blaster_yellow",
       "Name": "Cantaloupe Feeder",
       "Icon": "flamer",
-      "Bullet": "bullet",
+      "Bullet": "feed",
       "Cost": 1,
       "Lock": 45,
       "Sound": "super_feeder",

data/.wolf3d/N3Ddata.cdogscpn/missions.json

@@ -13,7 +13,7 @@
 		"MapObjectDensities": [],
 		"PickupCounts": [],
 		"EnemyDensity": 0,
-		"Weapons": ["Hand"],
+		"Weapons": ["Hand Feed"],
 		"WeaponPersist": false,
 		"SkipDebrief": false,
 		"TileClasses": {

data/.wolf3d/N3Ddata.cdogscpn/sounds/bow_draw.txt

@@ -0,0 +1,5 @@
+Adapted from SFX_Bow_&_Arrow_Attacks
+By PoundSoundUK
+https://freesound.org/people/PoundSoundUK/sounds/717823/
+
+https://creativecommons.org/licenses/by/4.0/

src/cdogs/map_wolf.c

@@ -169,12 +169,12 @@ static const char *soundsN3D[] = {
 	"chars/die/animal",
 	// 10-19
 	"chars/alert/elephant", "1up", "super_feeder", "chars/alert/giraffe",
-	"chars/alert/goat", "small_feeder", "doof?", "chars/alert/kangaroo",
+	"chars/alert/goat", "small_launcher", "ricochet", "chars/alert/kangaroo",
 	"whistle", "hand_feed",
 	// 20-29
 	"chars/alert/monkey", "footsteps/bear", "door", "chars/alert/ostrich",
 	"chars/alert/ox", "hurt", "hahaha", "secret_door", "chars/alert/sheep",
-	"large_feeder",
+	"large_launcher",
 	// 30-32
 	"spit", "watermelon", "watermelon_feeder"}; // TODO BS6:
 // https://github.com/bibendovsky/bstone/blob/3dea1ef72a101519afd17aa95c881da40a18040d/src/bstone_audio_content_mgr.cpp#L320-L398
@@ -458,8 +458,9 @@ static const char *adlibSoundsN3D[] = {
 	// we concat the two?
 	NULL,
 	// 40-42
-	"menu_enter", NULL,
-	"bonus", // quiz correct, perfect score
+	"menu_enter", "menu_start", // not really used as this in N3D, arbitrarily
+								// use this for C-Dogs
+	"bonus",					// quiz correct, perfect score
 };
 static const char *GetAdlibSound(const CWMapType type, const int i)
 {
@@ -991,7 +992,7 @@ static void LoadMission(
 		switch (map->type)
 		{
 		case CWMAPTYPE_N3D:
-			wc = StrWeaponClass("Hand");
+			wc = StrWeaponClass("Hand Feed");
 			break;
 		default:
 			wc = StrWeaponClass("Knife");