Fixes for the armor

Fixed Tommy Gun fire sounds
Models for ammo pickups
Correct usage and support for entity names
Player now spawns correctly and with default weapons

zpak001.pk3dir/cfg/skill.cfg

@@ -2,6 +2,10 @@ set sk_armsdealer_health1 "100"
 set sk_armsdealer_health2 "100"
 set sk_armsdealer_health3 "100"
 
+set sk_armor1 "25"
+set sk_armor2 "25"
+set sk_armor3 "25"
+
 set sk_cash1 "100"
 set sk_cash2 "100"
 set sk_cash3 "100"
@@ -10,10 +14,6 @@ set sk_healthkit1 "25"
 set sk_healthkit2 "25"
 set sk_healthkit3 "25"
 
-set sk_flapjacket1 "100"
-set sk_flapjacket2 "100"
-set sk_flapjacket3 "100"
-
 set sk_plr_melee1 "10"
 set sk_plr_melee2 "10"
 set sk_plr_melee3 "10"

zpak001.pk3dir/decls/def/ammo.def

@@ -9,7 +9,7 @@
 #include "ammo/psg1.def"
 #include "ammo/steyr_m40.def"
 #include "ammo/tec9.def"
-#include "ammo/tommy.def"
+#include "ammo/tommygun.def"
 #include "ammo/uzi.def"
 
 // these have to be defined by the game.
@@ -28,7 +28,7 @@ entityDef ammo_types {
 	"ammo_smokegrenade"		"11"
 	"ammo_steyr_m40"		"12"
 	"ammo_tec9"				"13"
-	"ammo_tommy"			"14"
+	"ammo_tommygun"			"14"
 	"ammo_uzi"				"15"
 }
 
@@ -47,7 +47,7 @@ entityDef ammo_names {
 	"ammo_smokegrenade"		"Smoke Grenades"
 	"ammo_steyr_m40"		"Steyr M40 Bullets"
 	"ammo_tec9"				"TEC-9 Bullets"
-	"ammo_tommy"			"Tommy Gun Bullets"
+	"ammo_tommygun"			"Tommy Gun Bullets"
 	"ammo_uzi"				"Uzi (Silenced) Bullets"
 }
 
@@ -66,6 +66,6 @@ entityDef ammo_max {
 	"ammo_smokegrenade"		"8"
 	"ammo_steyr_m40"		"60"
 	"ammo_tec9"				"75"
-	"ammo_tommy"			"150"
+	"ammo_tommygun"			"150"
 	"ammo_uzi"				"96"
 }

zpak001.pk3dir/decls/def/ammo/ak47.def

@@ -1,6 +1,7 @@
 entityDef ammo_ak47
 {
 	"inherit"		"ammo_base"
+	"model"			"models/c_ak47.mdl"
 	"inv_ammo_ak47"	"30"
 	"price"			"35"
 }

zpak001.pk3dir/decls/def/ammo/beretta.def

@@ -1,6 +1,7 @@
 entityDef ammo_beretta
 {
 	"inherit"			"ammo_base"
+	"model"				"models/c_barettaclip.mdl"
 	"inv_ammo_beretta"	"15"
 	"price"				"15"
 }

zpak001.pk3dir/decls/def/ammo/dbshot.def

@@ -1,6 +1,7 @@
 entityDef ammo_dbshot
 {
 	"inherit"			"ammo_base"
-	"inv_ammo_dbshot"	"2"
+	"model"				"models/w_dbbox.mdl"
+	"inv_ammo_dbshot"	"10"
 	"price"				"20"
 }

zpak001.pk3dir/decls/def/ammo/glock17.def

@@ -1,6 +1,7 @@
 entityDef ammo_glock17
 {
 	"inherit"			"ammo_base"
+	"model"				"models/c_glock17.mdl"
 	"inv_ammo_glock17"	"19"
 	"price"				"20"
 }

zpak001.pk3dir/decls/def/ammo/longslide.def

@@ -1,6 +1,7 @@
 entityDef ammo_longslide
 {
 	"inherit"				"ammo_base"
+	"model"					"models/c_1911.mdl"
 	"inv_ammo_longslide"	"7"
 	"price"					"30"
 }

zpak001.pk3dir/decls/def/ammo/mac10.def

@@ -1,6 +1,7 @@
 entityDef ammo_mac10
 {
 	"inherit"			"ammo_base"
+	"model"				"models/c_mac10.mdl"
 	"inv_ammo_mac10"	"30"
 	"price"				"30"
 }

zpak001.pk3dir/decls/def/ammo/mossberg.def

@@ -1,6 +1,7 @@
 entityDef ammo_mossberg
 {
 	"inherit"			"ammo_base"
+	"model"				"models/w_shotbox.mdl"
 	"inv_ammo_mossberg"	"5"
 	"price"				"15"
 }

zpak001.pk3dir/decls/def/ammo/psg1.def

@@ -1,6 +1,7 @@
 entityDef ammo_psg1
 {
 	"inherit"		"ammo_base"
+	"model"			"models/c_psg1.mdl"
 	"inv_ammo_psg1"	"5"
 	"price"			"40"
 }

zpak001.pk3dir/decls/def/ammo/steyr_m40.def

@@ -1,6 +1,7 @@
 entityDef ammo_steyr_m40
 {
 	"inherit"				"ammo_base"
+	"model"					"models/c_barettaclip.mdl"
 	"inv_ammo_steyr_m40"	"12"
 	"price"					"20"
 }

zpak001.pk3dir/decls/def/ammo/tec9.def

@@ -1,6 +1,7 @@
 entityDef ammo_tec9
 {
 	"inherit"			"ammo_base"
+	"model"				"models/c_tec9.mdl"
 	"inv_ammo_tec9"		"25"
 	"price"				"25"
 }

zpak001.pk3dir/decls/def/ammo/tommy.def

@@ -1,6 +0,0 @@
-entityDef ammo_tommy
-{
-	"inherit"			"ammo_base"
-	"inv_ammo_tommy"	"50"
-	"price"				"45"
-}

zpak001.pk3dir/decls/def/ammo/tommygun.def

@@ -0,0 +1,7 @@
+entityDef ammo_tommygun
+{
+	"inherit"			"ammo_base"
+	"model"				"models/c_tommygun.mdl"
+	"inv_ammo_tommygun"	"50"
+	"price"				"45"
+}

zpak001.pk3dir/decls/def/ammo/uzi.def

@@ -1,6 +1,7 @@
 entityDef ammo_uzi
 {
 	"inherit"			"ammo_base"
+	"model"				"models/c_uzi.mdl"
 	"inv_ammo_uzi"		"32"
 	"price"				"35"
 }

zpak001.pk3dir/decls/def/items.def

@@ -1,3 +1,15 @@
+entityDef item_battery
+{
+	"spawnclass"	"NSItem"
+	"model"			"models/w_armor.mdl"
+	"mins"			"-16 -16 0"
+	"maxs"			"16 16 16"
+	"snd_acquire"	"item.armor"
+	"snd_respawn"	"item.respawn"
+	"inv_armor"		"skill:armor"
+	"price"			"1000"
+}
+
 entityDef item_briefcase
 {
 	"spawnclass"	"NSItem"
@@ -34,18 +46,6 @@ entityDef item_healthkit
 	"price"			"1000"
 }
 
-entityDef item_flapjacket
-{
-	"spawnclass"	"NSItem"
-	"model"			"models/w_armor.mdl"
-	"mins"			"-16 -16 0"
-	"maxs"			"16 16 16"
-	"snd_acquire"	"item.armor"
-	"snd_respawn"	"item.respawn"
-	"inv_armor"		"skill:flapjacket"
-	"price"			"1000"
-}
-
 entityDef item_suit
 {
 	"spawnclass"	"NSItem"

zpak001.pk3dir/decls/def/player.def

@@ -1,4 +1,19 @@
 entityDef player
 {
-	"spawnclass" "HLPlayer"
+	"spawnclass"		"HLPlayer"
+	"health"			"100"
+	"maxarmor"			"100"
+	"bleeds"			"1"
+	"propdata"			"actor_human"
+	"armorProtection"	"0.2"
+	"armorBonus"		"0.5"
+}
+
+entityDef player_mp
+{
+	"inherit"			"player"
+	"ammo_9mm"			"44"
+	"item"				"item_suit"
+	"weapon"			"weapon_bat,weapon_glock17"
+	"current_weapon"	"1"
 }

zpak001.pk3dir/decls/def/weapons/mossberg.def

@@ -27,7 +27,7 @@ entityDef weapon_mossberg
 	"actDraw"			"5"
 	"actIdle"			"0"
 
-	"snd_draw"			"weapon_mossberg.cock"
+	"snd_draw"			"weapon_mossberg.draw"
 	"snd_fire"			"weapon_mossberg.fire"
 	"snd_empty"			"weapon.empty"
 	"snd_reload_end"	"weapon_mossberg.cock"

zpak001.pk3dir/decls/def/weapons/tommygun.def

@@ -16,7 +16,7 @@ entityDef weapon_tommygun
 	"def_fireInfo"		"fireInfo_tommygun"
 	"inv_name"			"Thompson A1"
 	"clipSize"			"50"
-	"ammoType" 			"ammo_tommy"
+	"ammoType" 			"ammo_tommygun"
 	"ammoRequired" 		"1"
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"

zpak001.pk3dir/decls/sound/weapons_gangstawars.sndshd

@@ -68,6 +68,7 @@ weapon_dbshot.fire
 weapon_dbshot.reload
 {
 	alerts
+	delay 1.0
 	sample weapons/dbshot_r.wav
 }
 
@@ -142,6 +143,14 @@ weapon_molotov_cocktail.loop
 	sample items/flames.wav
 }
 
+weapon_mossberg.draw
+{
+	alerts
+	delay 0.5
+	sample weapons/scock1.wav
+}
+
+
 weapon_mossberg.cock
 {
 	alerts
@@ -185,6 +194,14 @@ weapon_steyr_m40.fire
 	sample weapons/steyr_m40_f1.wav
 }
 
+weapon_tommygun.fire
+{
+	alerts
+	sample weapons/tommy_f.wav
+	sample weapons/tommy_f1.wav
+	sample weapons/tommy_f2.wav
+}
+
 weapon_tec9.fire
 {
 	alerts

zpak001.pk3dir/scripts/maptweaks.txt

@@ -1,4 +1,12 @@
 mutliplayer
 {
 	replace info_gangsta_dm_start info_player_deathmatch
+	replace weapon_mac weapon_mac10
+	replace ammo_mac ammo_mac10
+	replace weapon_smkgrenade weapon_smokegrenade
+	replace weapon_rat weapon_bat
+	replace weapon_ak101 weapon_ak47
+	replace ammo_ak101 ammo_ak47
+	replace weapon_tommy weapon_tommygun
+	replace ammo_tommy ammo_tommygun
 }