diff --git a/game/content/nfopen/models/p_357.mdl b/game/content/nfopen/models/p_357.mdl deleted file mode 100644 index 31b6cba07..000000000 --- a/game/content/nfopen/models/p_357.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd7dc70a352ece3a8022b68f216a1e0f16d42708f02fbbabfa61b45c80675815 -size 11696 diff --git a/game/content/nfopen/models/p_9mmar.mdl b/game/content/nfopen/models/p_9mmar.mdl deleted file mode 100644 index 5d2a367e9..000000000 --- a/game/content/nfopen/models/p_9mmar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c40b0ad38d999d68430862a080d19bcea083db92e3d83503f6adc98cfb89a3de -size 14692 diff --git a/game/content/nfopen/models/p_9mmhandgun.mdl b/game/content/nfopen/models/p_9mmhandgun.mdl deleted file mode 100644 index e8e5f5b0b..000000000 --- a/game/content/nfopen/models/p_9mmhandgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac2af6aa3f53dcda6f84394c3b619f91174e53734a92cc2ed1bec312667cfb0a -size 17860 diff --git a/game/content/nfopen/models/p_crossbow.mdl b/game/content/nfopen/models/p_crossbow.mdl deleted file mode 100644 index 9642ede19..000000000 --- a/game/content/nfopen/models/p_crossbow.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8caa2844e03f0935512ccc793e48717fa1fb41b7a702f97387c0195ed94e94c -size 42672 diff --git a/game/content/nfopen/models/p_crowbar.mdl b/game/content/nfopen/models/p_crowbar.mdl deleted file mode 100644 index 5f9b75831..000000000 --- a/game/content/nfopen/models/p_crowbar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e43f5eb1768fa13cf8730e526c03f5d22322c759c4cb4f5d8a2dd9275176b297 -size 4852 diff --git a/game/content/nfopen/models/p_egon.mdl b/game/content/nfopen/models/p_egon.mdl deleted file mode 100644 index 8b2365357..000000000 --- a/game/content/nfopen/models/p_egon.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98e40bd2d74af13f070721f7d2718cc494e6ec683231bf61976b5cf2d18bbd59 -size 46476 diff --git a/game/content/nfopen/models/p_gauss.mdl b/game/content/nfopen/models/p_gauss.mdl deleted file mode 100644 index 6f26357d6..000000000 --- a/game/content/nfopen/models/p_gauss.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cf31afae020f7d24efa45e339c41078834cd3a80a586e8e82afdb5e8c944695 -size 35116 diff --git a/game/content/nfopen/models/p_glock.mdl b/game/content/nfopen/models/p_glock.mdl deleted file mode 100644 index efddac5b6..000000000 --- a/game/content/nfopen/models/p_glock.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e67b98b66650ecea225611ff59e9ed7b7f5978c9529d5e3ca4289c6c1f5db0a -size 17860 diff --git a/game/content/nfopen/models/p_grenade.mdl b/game/content/nfopen/models/p_grenade.mdl deleted file mode 100644 index ecab9724d..000000000 --- a/game/content/nfopen/models/p_grenade.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78b5161121d8738bf9131a1d7aa8c8fe37a06360e9708c02d79208081e421198 -size 19432 diff --git a/game/content/nfopen/models/p_hgun.mdl b/game/content/nfopen/models/p_hgun.mdl deleted file mode 100644 index e4b5ac3e1..000000000 --- a/game/content/nfopen/models/p_hgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aa2e66d308df63a0b3eb12c824f40f9ab1c8ba693fc270fe85e31d39a641897 -size 42296 diff --git a/game/content/nfopen/models/p_rpg.mdl b/game/content/nfopen/models/p_rpg.mdl deleted file mode 100644 index 1f9342407..000000000 --- a/game/content/nfopen/models/p_rpg.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39bcf4f02c2cbf1a06583828d0a894239188a907ae61424d439683e4c997a4fc -size 41004 diff --git a/game/content/nfopen/models/p_satchel.mdl b/game/content/nfopen/models/p_satchel.mdl deleted file mode 100644 index a729c6293..000000000 --- a/game/content/nfopen/models/p_satchel.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:721aacc6a135e155a9dcf1680cf616e357f41e9209ccc6101cb79ecc2f38be34 -size 17344 diff --git a/game/content/nfopen/models/p_satchel_radio.mdl b/game/content/nfopen/models/p_satchel_radio.mdl deleted file mode 100644 index 25ee8dd6a..000000000 --- a/game/content/nfopen/models/p_satchel_radio.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90188105354fb125968d7fd411b7fdd8f235bbf6e150f60548f555b617077400 -size 5444 diff --git a/game/content/nfopen/models/p_shotgun.mdl b/game/content/nfopen/models/p_shotgun.mdl deleted file mode 100644 index a9b6dc0ab..000000000 --- a/game/content/nfopen/models/p_shotgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0462d6b8a8e96edbd8150a1fc89a7929a8f4e51c95076757abcadbfc81243fc1 -size 13468 diff --git a/game/content/nfopen/models/p_squeak.mdl b/game/content/nfopen/models/p_squeak.mdl deleted file mode 100644 index 18c83b5e2..000000000 --- a/game/content/nfopen/models/p_squeak.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31952bdaf61f819959fea54ed7bdc47307495e8a502af4f8d62217dfc3181185 -size 25924 diff --git a/game/content/nfopen/models/p_tripmine.mdl b/game/content/nfopen/models/p_tripmine.mdl deleted file mode 100644 index e664344ac..000000000 --- a/game/content/nfopen/models/p_tripmine.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8916e9402334ab5b7ca03184fc839ac80227da86d2256e8144e8afe1b5f27f2b -size 36316 diff --git a/game/content/nfopen/models/player.mdl b/game/content/nfopen/models/player.mdl deleted file mode 100644 index a38289a7f..000000000 --- a/game/content/nfopen/models/player.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb59b69ff909b5e1e8d22616d4ffdaa24deb40f698fc8711cfc63487a35582cd -size 281324 diff --git a/game/content/nfopen/models/playert.mdl b/game/content/nfopen/models/playert.mdl deleted file mode 100644 index 3a68d7af3..000000000 --- a/game/content/nfopen/models/playert.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb1a0da4bd9dafbfb0a3c2c206bfc0d0070796e3ed27458c12539123842f21bf -size 73776 diff --git a/game/content/nfopen/models/v_357.mdl b/game/content/nfopen/models/v_357.mdl deleted file mode 100644 index 8b52a4712..000000000 --- a/game/content/nfopen/models/v_357.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12791f64091aa572ae35aad40ee74b5bb3ee30f59426e6ffa045d9ad1d731175 -size 145604 diff --git a/game/content/nfopen/models/v_9mmar.mdl b/game/content/nfopen/models/v_9mmar.mdl deleted file mode 100644 index 4c87e84b8..000000000 --- a/game/content/nfopen/models/v_9mmar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3acee98ba922578e017db3e2087e3b6f2583e5d14a277f853bfe5a53de7468a5 -size 103644 diff --git a/game/content/nfopen/models/v_9mmhandgun.mdl b/game/content/nfopen/models/v_9mmhandgun.mdl deleted file mode 100644 index 43cc3e2ed..000000000 --- a/game/content/nfopen/models/v_9mmhandgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:469237a671f142f051a167d14ed2fc8e5df873b87b59a53ed19d596cc4acf497 -size 134016 diff --git a/game/content/nfopen/models/v_chub.mdl b/game/content/nfopen/models/v_chub.mdl deleted file mode 100644 index 0feac1e7d..000000000 --- a/game/content/nfopen/models/v_chub.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60cd34521ae3c257abc17f27f0483b0b5682fba9b2c64b5c8ecbf4f43d7716fa -size 96688 diff --git a/game/content/nfopen/models/v_crossbow.mdl b/game/content/nfopen/models/v_crossbow.mdl deleted file mode 100644 index 1a4a3ef71..000000000 --- a/game/content/nfopen/models/v_crossbow.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a4e0ac15de14446c132f521154ce6c8428eaa9563c2d5396915ea59e765cd51 -size 181072 diff --git a/game/content/nfopen/models/v_crowbar.mdl b/game/content/nfopen/models/v_crowbar.mdl deleted file mode 100644 index 4d81f4fe6..000000000 --- a/game/content/nfopen/models/v_crowbar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f7664dcbefaad2cb849dcbe5fb6eb38f885dc76ffab5ceccc7185e8bf29348d -size 47356 diff --git a/game/content/nfopen/models/v_egon.mdl b/game/content/nfopen/models/v_egon.mdl deleted file mode 100644 index 96da42977..000000000 --- a/game/content/nfopen/models/v_egon.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fde7e8c434784a7918514c5f6460dfdb5ae5b3f5805d22d50940be919fa47b0 -size 130120 diff --git a/game/content/nfopen/models/v_gauss.mdl b/game/content/nfopen/models/v_gauss.mdl deleted file mode 100644 index cf7905670..000000000 --- a/game/content/nfopen/models/v_gauss.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97d20e2bbdd155210d31c3891321ac59b35e68202275a4119700fb40a47896c4 -size 148948 diff --git a/game/content/nfopen/models/v_grenade.mdl b/game/content/nfopen/models/v_grenade.mdl deleted file mode 100644 index bdcd764d7..000000000 --- a/game/content/nfopen/models/v_grenade.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:571f8f9ceb6bd33b62ec96f2a879da60fbcf1aded60e3fe13ea8c93f3f00a03f -size 88884 diff --git a/game/content/nfopen/models/v_hgun.mdl b/game/content/nfopen/models/v_hgun.mdl deleted file mode 100644 index fc396dd6a..000000000 --- a/game/content/nfopen/models/v_hgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:562cdcc2f6ae1c8c270f0d8c6d5828a8edd08bed051fc65f056124fca7f98900 -size 72908 diff --git a/game/content/nfopen/models/v_rpg.mdl b/game/content/nfopen/models/v_rpg.mdl deleted file mode 100644 index 904056b42..000000000 --- a/game/content/nfopen/models/v_rpg.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e66872ad1f1354ad7043c2ce452d3d82ba4c16e3a7fad8edb831b18aad736344 -size 147400 diff --git a/game/content/nfopen/models/v_satchel.mdl b/game/content/nfopen/models/v_satchel.mdl deleted file mode 100644 index c0fbe9b61..000000000 --- a/game/content/nfopen/models/v_satchel.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d71cb29da2cfa52f98c789233227a0e443ba04775b33ab28e7e5e3bbc506c248 -size 82180 diff --git a/game/content/nfopen/models/v_satchel_radio.mdl b/game/content/nfopen/models/v_satchel_radio.mdl deleted file mode 100644 index 4c4ea8a7d..000000000 --- a/game/content/nfopen/models/v_satchel_radio.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:787e4a381b3c51ef538f8553cf672504e038e5ae669140caa9467ca2d4678d31 -size 61472 diff --git a/game/content/nfopen/models/v_shotgun.mdl b/game/content/nfopen/models/v_shotgun.mdl deleted file mode 100644 index f5ace9358..000000000 --- a/game/content/nfopen/models/v_shotgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2247ad40f9209743f3c1611d0b1fbd2650505f2c7710f5093e1f1d77bbd50d08 -size 92316 diff --git a/game/content/nfopen/models/v_squeak.mdl b/game/content/nfopen/models/v_squeak.mdl deleted file mode 100644 index 5c7cda629..000000000 --- a/game/content/nfopen/models/v_squeak.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e588b9fe15d30ac98d0b00f1801aa3f314fa2cffd687a390e5a79d3273460fcd -size 113876 diff --git a/game/content/nfopen/models/v_tripmine.mdl b/game/content/nfopen/models/v_tripmine.mdl deleted file mode 100644 index 7822f8096..000000000 --- a/game/content/nfopen/models/v_tripmine.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f25f58237165c7665c5ccab93c2492f690b2f7f6ea723fd7456576c3b7796142 -size 100400 diff --git a/game/content/nfopen/models/w_357.mdl b/game/content/nfopen/models/w_357.mdl deleted file mode 100644 index 3acda5888..000000000 --- a/game/content/nfopen/models/w_357.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9188f3d6b22ee0a72b951c523f3f6684e566f61d8f376b5b3a746eae60248f4f -size 4852 diff --git a/game/content/nfopen/models/w_357ammo.mdl b/game/content/nfopen/models/w_357ammo.mdl deleted file mode 100644 index 7b6e2d496..000000000 --- a/game/content/nfopen/models/w_357ammo.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19b1d05f294d45fff6632298047a25a9f32c5850cd20aa7f0ccec42829dd8f2f -size 4744 diff --git a/game/content/nfopen/models/w_357ammobox.mdl b/game/content/nfopen/models/w_357ammobox.mdl deleted file mode 100644 index 837fba87c..000000000 --- a/game/content/nfopen/models/w_357ammobox.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e6d8fa5e868d9bdf740d6aa39d58c495661ecedabc519522e60d2abcc58de63 -size 3580 diff --git a/game/content/nfopen/models/w_357ammoboxt.mdl b/game/content/nfopen/models/w_357ammoboxt.mdl deleted file mode 100644 index 431a1c5df..000000000 --- a/game/content/nfopen/models/w_357ammoboxt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8a950e28d16fa920fd0071374f7ba5322a0d6a4ddb2f7f358ed5e8c652426c3 -size 15420 diff --git a/game/content/nfopen/models/w_357ammot.mdl b/game/content/nfopen/models/w_357ammot.mdl deleted file mode 100644 index 6eb2ecb12..000000000 --- a/game/content/nfopen/models/w_357ammot.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ec7810cbc0a9fa7b0afe01b88e46370aa44f8e79f026e92aa17c10a2e614aba -size 26632 diff --git a/game/content/nfopen/models/w_357t.mdl b/game/content/nfopen/models/w_357t.mdl deleted file mode 100644 index 575d084de..000000000 --- a/game/content/nfopen/models/w_357t.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f99b25a5717b332ec3e5660b145e1135381a2fa7c1179b8e72543063502b814 -size 5704 diff --git a/game/content/nfopen/models/w_9mmar.mdl b/game/content/nfopen/models/w_9mmar.mdl deleted file mode 100644 index acdb1cc79..000000000 --- a/game/content/nfopen/models/w_9mmar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c471c4aa523c2a04fe117ff5b69f9a8b38da3fd30d483c6e9f4309f73cbb9ae -size 5436 diff --git a/game/content/nfopen/models/w_9mmarclip.mdl b/game/content/nfopen/models/w_9mmarclip.mdl deleted file mode 100644 index df7aa4e5d..000000000 --- a/game/content/nfopen/models/w_9mmarclip.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85fb3214e606d12781f88847c116e59e9a3fe291ad33d744126cee97cbddf7d2 -size 2188 diff --git a/game/content/nfopen/models/w_9mmarclipt.mdl b/game/content/nfopen/models/w_9mmarclipt.mdl deleted file mode 100644 index bc1766ff2..000000000 --- a/game/content/nfopen/models/w_9mmarclipt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9781029e78629e80ebdde1b61a34813fcdf551a337d158bd583d5513aef44016 -size 14296 diff --git a/game/content/nfopen/models/w_9mmart.mdl b/game/content/nfopen/models/w_9mmart.mdl deleted file mode 100644 index ec85dc7d5..000000000 --- a/game/content/nfopen/models/w_9mmart.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32dedb954c2207bde6b4bb3a43d0a2c21b5adc012f598e06cd862bc3980cac95 -size 8104 diff --git a/game/content/nfopen/models/w_9mmclip.mdl b/game/content/nfopen/models/w_9mmclip.mdl deleted file mode 100644 index 3bfcb6c70..000000000 --- a/game/content/nfopen/models/w_9mmclip.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2afde7ef1e3d987d203f517715dedc482768cc666c964a617990326734ee00e1 -size 1772 diff --git a/game/content/nfopen/models/w_9mmclipt.mdl b/game/content/nfopen/models/w_9mmclipt.mdl deleted file mode 100644 index 45b70238e..000000000 --- a/game/content/nfopen/models/w_9mmclipt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18ce87d7f1e23f69f479a99a2e5c49ee5ea95e2712ade3b4c6496fbc172bae3d -size 5096 diff --git a/game/content/nfopen/models/w_9mmhandgun.mdl b/game/content/nfopen/models/w_9mmhandgun.mdl deleted file mode 100644 index ab0892743..000000000 --- a/game/content/nfopen/models/w_9mmhandgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbf20bf875085256269621e55e1bc6200aca569bef45fcfa1dbe486c0dc75550 -size 3504 diff --git a/game/content/nfopen/models/w_9mmhandgunt.mdl b/game/content/nfopen/models/w_9mmhandgunt.mdl deleted file mode 100644 index 119528adb..000000000 --- a/game/content/nfopen/models/w_9mmhandgunt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cf578656a188f42ce305a1a770fd6d715c694b37b10fc3610714965199a3ac5 -size 13204 diff --git a/game/content/nfopen/models/w_adrenaline.mdl b/game/content/nfopen/models/w_adrenaline.mdl deleted file mode 100644 index a9ed35a03..000000000 --- a/game/content/nfopen/models/w_adrenaline.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0284e1314c3ab268b6cb29a95e96e51edbb31cad391afbe99eef437e444383b8 -size 1956 diff --git a/game/content/nfopen/models/w_adrenalinet.mdl b/game/content/nfopen/models/w_adrenalinet.mdl deleted file mode 100644 index ae3170fba..000000000 --- a/game/content/nfopen/models/w_adrenalinet.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b668bb22b329a0ce8b89ff5b0eaa2eb5c8784792840e47672f9dd80bc3cf89a0 -size 6104 diff --git a/game/content/nfopen/models/w_antidote.mdl b/game/content/nfopen/models/w_antidote.mdl deleted file mode 100644 index 4c0626912..000000000 --- a/game/content/nfopen/models/w_antidote.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16a2ff29bd0252db289d6a1fcff47153225af08b88d64288fedd4122813de955 -size 1956 diff --git a/game/content/nfopen/models/w_antidotet.mdl b/game/content/nfopen/models/w_antidotet.mdl deleted file mode 100644 index 1f6283cac..000000000 --- a/game/content/nfopen/models/w_antidotet.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36d73a23a26441926d45f34756357caae6712fffa1fee2278214aa167684a6e3 -size 6104 diff --git a/game/content/nfopen/models/w_argrenade.mdl b/game/content/nfopen/models/w_argrenade.mdl deleted file mode 100644 index 29a0081e9..000000000 --- a/game/content/nfopen/models/w_argrenade.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0cf084a1c772adefb6fb6365bba374a653aa965a2a07754820d19f110005857 -size 2868 diff --git a/game/content/nfopen/models/w_argrenadet.mdl b/game/content/nfopen/models/w_argrenadet.mdl deleted file mode 100644 index e5f603d26..000000000 --- a/game/content/nfopen/models/w_argrenadet.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1cb4928f74fde78a73df484d59a7cad90ff49edff276215623af216389fd7f4 -size 5304 diff --git a/game/content/nfopen/models/w_chainammo.mdl b/game/content/nfopen/models/w_chainammo.mdl deleted file mode 100644 index 6bd7bbb3a..000000000 --- a/game/content/nfopen/models/w_chainammo.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7632ed4715d99c0ad745506577bf7a8069d5e5e01619b9363f4ce157aa35093d -size 2704 diff --git a/game/content/nfopen/models/w_chainammot.mdl b/game/content/nfopen/models/w_chainammot.mdl deleted file mode 100644 index 117723904..000000000 --- a/game/content/nfopen/models/w_chainammot.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8599d6cef0ffa6072b9e3f86d67d3b902895321d7df4f62224b520af260e29cf -size 15392 diff --git a/game/content/nfopen/models/w_crossbow.mdl b/game/content/nfopen/models/w_crossbow.mdl deleted file mode 100644 index 39ea98d76..000000000 --- a/game/content/nfopen/models/w_crossbow.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b511c143948ba9923af9c1529868ab32c69fbf471ee67e30a4c3dae8bf26c898 -size 9412 diff --git a/game/content/nfopen/models/w_crossbow_clip.mdl b/game/content/nfopen/models/w_crossbow_clip.mdl deleted file mode 100644 index 325039d19..000000000 --- a/game/content/nfopen/models/w_crossbow_clip.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc4512c1465576df6c3aa9c9dafad0b0d1344222f86568615d0965a5121471a5 -size 11468 diff --git a/game/content/nfopen/models/w_crossbowt.mdl b/game/content/nfopen/models/w_crossbowt.mdl deleted file mode 100644 index f815d479d..000000000 --- a/game/content/nfopen/models/w_crossbowt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5213d6ab6a228ecd329f0e7a273c7ac106df5711528a6e5bc3b817527b25aa6d -size 31816 diff --git a/game/content/nfopen/models/w_crowbar.mdl b/game/content/nfopen/models/w_crowbar.mdl deleted file mode 100644 index ab3b7f87f..000000000 --- a/game/content/nfopen/models/w_crowbar.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bdce6cfdcfc488bf63bb3bd23954ca7f906b6884f4f560fb78e4cd1aacfac79 -size 2472 diff --git a/game/content/nfopen/models/w_crowbart.mdl b/game/content/nfopen/models/w_crowbart.mdl deleted file mode 100644 index d1ee790c7..000000000 --- a/game/content/nfopen/models/w_crowbart.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4962dfede508882e359fc0d6da00b5337ca45bfd9cf37a1d1a6039376c5f389a -size 1228 diff --git a/game/content/nfopen/models/w_egon.mdl b/game/content/nfopen/models/w_egon.mdl deleted file mode 100644 index 1b57845a2..000000000 --- a/game/content/nfopen/models/w_egon.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:821b2e77eb84bf8c1a672ba683e05309e140ed57d1ef173338f072ca0e7acd11 -size 6148 diff --git a/game/content/nfopen/models/w_egont.mdl b/game/content/nfopen/models/w_egont.mdl deleted file mode 100644 index 851fc2573..000000000 --- a/game/content/nfopen/models/w_egont.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d22e5e1e614cd9dd293c1866e7119a8d506e97be3258e33aec3365858685c9bc -size 39320 diff --git a/game/content/nfopen/models/w_flare.mdl b/game/content/nfopen/models/w_flare.mdl deleted file mode 100644 index cdfb281b6..000000000 --- a/game/content/nfopen/models/w_flare.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b168b2ef01b4d86b56748a0100388505806c8bd130c5c289593da859d6ecaee2 -size 2124 diff --git a/game/content/nfopen/models/w_flaret.mdl b/game/content/nfopen/models/w_flaret.mdl deleted file mode 100644 index 64540eb83..000000000 --- a/game/content/nfopen/models/w_flaret.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cf09292a92d54114afb37626cc028a16aa17289827b47989ec2c164093061ac -size 4096 diff --git a/game/content/nfopen/models/w_gauss.mdl b/game/content/nfopen/models/w_gauss.mdl deleted file mode 100644 index 7a6ec69bb..000000000 --- a/game/content/nfopen/models/w_gauss.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce30ed52733e1968b15854a0cce5e3c87eac96cadb2e87407c5f3d8009d19b3b -size 9328 diff --git a/game/content/nfopen/models/w_gaussammo.mdl b/game/content/nfopen/models/w_gaussammo.mdl deleted file mode 100644 index 9ae4ba989..000000000 --- a/game/content/nfopen/models/w_gaussammo.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d86c2d3df12df27cf739c5c4a345cfe43fa1874214f81a69f1e387f1f42a252 -size 3008 diff --git a/game/content/nfopen/models/w_gaussammot.mdl b/game/content/nfopen/models/w_gaussammot.mdl deleted file mode 100644 index 5c6b0b130..000000000 --- a/game/content/nfopen/models/w_gaussammot.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf9ad48cf489ffbeddf81c7d91f6e0d25e607733b9c48fa8fbacf3ac280fc571 -size 11244 diff --git a/game/content/nfopen/models/w_gausst.mdl b/game/content/nfopen/models/w_gausst.mdl deleted file mode 100644 index b9119ce00..000000000 --- a/game/content/nfopen/models/w_gausst.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e2d7483c58306e60609cc8938492d7870ad902584045b48aedb6c288bd6d354 -size 24840 diff --git a/game/content/nfopen/models/w_grenade.mdl b/game/content/nfopen/models/w_grenade.mdl deleted file mode 100644 index f55d185aa..000000000 --- a/game/content/nfopen/models/w_grenade.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b3605357ff6f9b50a0cdc2de23d7c03da158e8956bf99827bc61bf9c60dde30 -size 7704 diff --git a/game/content/nfopen/models/w_grenadet.mdl b/game/content/nfopen/models/w_grenadet.mdl deleted file mode 100644 index a795fcdba..000000000 --- a/game/content/nfopen/models/w_grenadet.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1adb5be076da0c7ee01ef72dc151223b5feade6c18caedae58c25fa0faf36f88 -size 14232 diff --git a/game/content/nfopen/models/w_hgun.mdl b/game/content/nfopen/models/w_hgun.mdl deleted file mode 100644 index 3774c8ffb..000000000 --- a/game/content/nfopen/models/w_hgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97a05f15c0898c281b6e8f21da05acb5c6bebb9d677b84a2b997f610330c3dce -size 9024 diff --git a/game/content/nfopen/models/w_hgunt.mdl b/game/content/nfopen/models/w_hgunt.mdl deleted file mode 100644 index 1063ad83e..000000000 --- a/game/content/nfopen/models/w_hgunt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb6bf30d2d28a5b5c87b76c4a1c1aae19b0acf288dc9172b9f42a0a0c6afc90e -size 32912 diff --git a/game/content/nfopen/models/w_isotopebox.mdl b/game/content/nfopen/models/w_isotopebox.mdl deleted file mode 100644 index e7c0637ee..000000000 --- a/game/content/nfopen/models/w_isotopebox.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1f0787dd703fe1655d1d11d5152094dbcc0665d567a81bcbdaaf633279b20c5 -size 2740 diff --git a/game/content/nfopen/models/w_isotopeboxt.mdl b/game/content/nfopen/models/w_isotopeboxt.mdl deleted file mode 100644 index 8c1f6d39d..000000000 --- a/game/content/nfopen/models/w_isotopeboxt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63159219221613dee7064241c3d42ce397f842f1ead9fec3224a78cb1aefe81e -size 20268 diff --git a/game/content/nfopen/models/w_longjump.mdl b/game/content/nfopen/models/w_longjump.mdl deleted file mode 100644 index cb3c46ad6..000000000 --- a/game/content/nfopen/models/w_longjump.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bd003ff2c6f2099f75fecbb783b95b25792fd334aed8d521478a09e1b3a68b2 -size 6500 diff --git a/game/content/nfopen/models/w_longjumpt.mdl b/game/content/nfopen/models/w_longjumpt.mdl deleted file mode 100644 index cbfcb70fc..000000000 --- a/game/content/nfopen/models/w_longjumpt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5ca1ff6ef87ecf889a8714147954fb74eb5278507dfd618173fd1acff867558 -size 33720 diff --git a/game/content/nfopen/models/w_oxygen.mdl b/game/content/nfopen/models/w_oxygen.mdl deleted file mode 100644 index a40e7c2da..000000000 --- a/game/content/nfopen/models/w_oxygen.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87cef119023b2c5a654a091c4c799f027aacc85d67c7385801df9108e87f048c -size 7604 diff --git a/game/content/nfopen/models/w_oxygent.mdl b/game/content/nfopen/models/w_oxygent.mdl deleted file mode 100644 index 1da0be216..000000000 --- a/game/content/nfopen/models/w_oxygent.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f38868a074224141baf3de0c8e753de329adc08c0c5a1d0ba9b5a44e1279f98 -size 33424 diff --git a/game/content/nfopen/models/w_rad.mdl b/game/content/nfopen/models/w_rad.mdl deleted file mode 100644 index abd94c1be..000000000 --- a/game/content/nfopen/models/w_rad.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7614c54a75ceb6970e5f9c2d73014aa5177cbfc689b71de8b4c17880656ab7b -size 1956 diff --git a/game/content/nfopen/models/w_radt.mdl b/game/content/nfopen/models/w_radt.mdl deleted file mode 100644 index fe1c88190..000000000 --- a/game/content/nfopen/models/w_radt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0166c12a8bbf9bc77591c3bddd590afdd4b72f5a3b87f7a91daec291b39c8e9 -size 6104 diff --git a/game/content/nfopen/models/w_rpg.mdl b/game/content/nfopen/models/w_rpg.mdl deleted file mode 100644 index c451b41a0..000000000 --- a/game/content/nfopen/models/w_rpg.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8642fff90c59240273e4c5dcd88541d9541ad92c88a8e82f467d83bb4a88755 -size 4560 diff --git a/game/content/nfopen/models/w_rpgammo.mdl b/game/content/nfopen/models/w_rpgammo.mdl deleted file mode 100644 index e06db3c01..000000000 --- a/game/content/nfopen/models/w_rpgammo.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:637a29b041eca16076916ada6b20830230229262032d838f75059d8efbf4c07b -size 3044 diff --git a/game/content/nfopen/models/w_rpgammot.mdl b/game/content/nfopen/models/w_rpgammot.mdl deleted file mode 100644 index 93d7c6bb8..000000000 --- a/game/content/nfopen/models/w_rpgammot.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a44965030c1b30ddde125ecca300d86064ae75f880158e9a20db0e90215818b5 -size 20428 diff --git a/game/content/nfopen/models/w_rpgt.mdl b/game/content/nfopen/models/w_rpgt.mdl deleted file mode 100644 index d3e8eb28f..000000000 --- a/game/content/nfopen/models/w_rpgt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e0f31150e826a0eef6fbfc6ea215827b8afa160897710a61d8bdb5eec5ad368 -size 33352 diff --git a/game/content/nfopen/models/w_satchel.mdl b/game/content/nfopen/models/w_satchel.mdl deleted file mode 100644 index 28d79675b..000000000 --- a/game/content/nfopen/models/w_satchel.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc99e035a04c82843a702d8556812f91df1654c01c627792db18cf290704b9d0 -size 5240 diff --git a/game/content/nfopen/models/w_satchelt.mdl b/game/content/nfopen/models/w_satchelt.mdl deleted file mode 100644 index cef55e122..000000000 --- a/game/content/nfopen/models/w_satchelt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d15017c930e30683dcc672aa39abe944c5a01e7a44cd3518319600aeb687dbc1 -size 11116 diff --git a/game/content/nfopen/models/w_security.mdl b/game/content/nfopen/models/w_security.mdl deleted file mode 100644 index 8e278b5c3..000000000 --- a/game/content/nfopen/models/w_security.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d7d3b1df9a7307c107fdb1bb0627172dfafe82a2a06d9db26571d68e295f710 -size 1976 diff --git a/game/content/nfopen/models/w_securityt.mdl b/game/content/nfopen/models/w_securityt.mdl deleted file mode 100644 index e3f0c4613..000000000 --- a/game/content/nfopen/models/w_securityt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfa57207b2af8e9450ca8eccb9d88d763380ee698939142c1dccf42e2adc2e8d -size 20936 diff --git a/game/content/nfopen/models/w_shotbox.mdl b/game/content/nfopen/models/w_shotbox.mdl deleted file mode 100644 index 948d52db2..000000000 --- a/game/content/nfopen/models/w_shotbox.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06ffc29848ee4532dda6a33ae348087a6e55ac5ae4379ecfb6115ffbd707edd6 -size 2524 diff --git a/game/content/nfopen/models/w_shotboxt.mdl b/game/content/nfopen/models/w_shotboxt.mdl deleted file mode 100644 index 83c04e139..000000000 --- a/game/content/nfopen/models/w_shotboxt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b0fd668234ffc79e9a5681008bf841f050c2fb816145fdcfa2f8eed4306d996 -size 21304 diff --git a/game/content/nfopen/models/w_shotgun.mdl b/game/content/nfopen/models/w_shotgun.mdl deleted file mode 100644 index 59bd5df04..000000000 --- a/game/content/nfopen/models/w_shotgun.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d43f0cf666c0cc7812cae7b06d6824ec9f93c0aa68fa9edbd762cfd12320898 -size 6872 diff --git a/game/content/nfopen/models/w_shotgunt.mdl b/game/content/nfopen/models/w_shotgunt.mdl deleted file mode 100644 index 63a9cc11e..000000000 --- a/game/content/nfopen/models/w_shotgunt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec260d35128773880aa22bbe0ae54c3177568eb2dc0e1b81766f8bc4a8e76b61 -size 6588 diff --git a/game/content/nfopen/models/w_shotshell.mdl b/game/content/nfopen/models/w_shotshell.mdl deleted file mode 100644 index c68a885a9..000000000 --- a/game/content/nfopen/models/w_shotshell.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58907a8e80fc31b6a8b42f081652c70f488de8f61df1a9097c79ad989c1dcd45 -size 3240 diff --git a/game/content/nfopen/models/w_shotshellt.mdl b/game/content/nfopen/models/w_shotshellt.mdl deleted file mode 100644 index 0d0174aa0..000000000 --- a/game/content/nfopen/models/w_shotshellt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc18ec926e23a4aedde586853c21df51961620f79c1d0b8995f3671b921731eb -size 4888 diff --git a/game/content/nfopen/models/w_silencer.mdl b/game/content/nfopen/models/w_silencer.mdl deleted file mode 100644 index 7838cd9fb..000000000 --- a/game/content/nfopen/models/w_silencer.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5d5285d463cbdb5054990e915c30ba3e9963885139fcd0f829743e39c446f89 -size 4576 diff --git a/game/content/nfopen/models/w_silencert.mdl b/game/content/nfopen/models/w_silencert.mdl deleted file mode 100644 index 3a65c0c63..000000000 --- a/game/content/nfopen/models/w_silencert.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50ace9cea7392fc8fd56f66e9ed5e1c1c6c6ba04a37a34589454a26f8d4497f0 -size 18152 diff --git a/game/content/nfopen/models/w_sqknest.mdl b/game/content/nfopen/models/w_sqknest.mdl deleted file mode 100644 index 78c25b3cb..000000000 --- a/game/content/nfopen/models/w_sqknest.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac386abf60bc3468e26deb03d1b85a365108d0d7afc7be7d251bfa537cba2a93 -size 7708 diff --git a/game/content/nfopen/models/w_sqknestt.mdl b/game/content/nfopen/models/w_sqknestt.mdl deleted file mode 100644 index 4db6185f8..000000000 --- a/game/content/nfopen/models/w_sqknestt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c11ef9034b34cd3c7e9e6685a0ce0e2a351783f28d2033c098be7860a2982477 -size 24048 diff --git a/game/content/nfopen/models/w_squeak.mdl b/game/content/nfopen/models/w_squeak.mdl deleted file mode 100644 index 5df4172a6..000000000 --- a/game/content/nfopen/models/w_squeak.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a9f347e22baf92ffea0ea4af9990b0f11678dd70ff5118b94585bd8b1071444 -size 12360 diff --git a/game/content/nfopen/models/w_squeakt.mdl b/game/content/nfopen/models/w_squeakt.mdl deleted file mode 100644 index 355bf7d94..000000000 --- a/game/content/nfopen/models/w_squeakt.mdl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba1c6dddf8d40f723b2dab47502a7194fa377f107e6f05b384b95f4f11f6e045 -size 18768 diff --git a/game/content/nfopen/skill.cfg b/game/content/nfopen/skill.cfg index a368685bb..06a216797 100644 --- a/game/content/nfopen/skill.cfg +++ b/game/content/nfopen/skill.cfg @@ -1,331 +1,18 @@ -// MONSTERS - -// Alien Grunt -sk_agrunt_health1 "60" -sk_agrunt_health2 "90" -sk_agrunt_health3 "120" - -sk_agrunt_dmg_punch1 "10" -sk_agrunt_dmg_punch2 "20" -sk_agrunt_dmg_punch3 "20" - - -// Apache -sk_apache_health1 "150" -sk_apache_health2 "250" -sk_apache_health3 "400" - - -// Barney -sk_barney_health1 "35" -sk_barney_health2 "35" -sk_barney_health3 "35" - - -// Bullsquid -sk_bullsquid_health1 "40" -sk_bullsquid_health2 "40" -sk_bullsquid_health3 "120" - -sk_bullsquid_dmg_bite1 "15" -sk_bullsquid_dmg_bite2 "25" -sk_bullsquid_dmg_bite3 "25" - -sk_bullsquid_dmg_whip1 "25" -sk_bullsquid_dmg_whip2 "35" -sk_bullsquid_dmg_whip3 "35" - -sk_bullsquid_dmg_spit1 "10" -sk_bullsquid_dmg_spit2 "10" -sk_bullsquid_dmg_spit3 "15" - -// Big momma -sk_bigmomma_health_factor1 "1.0" -sk_bigmomma_health_factor2 "1.5" -sk_bigmomma_health_factor3 "2" - -sk_bigmomma_dmg_slash1 "50" -sk_bigmomma_dmg_slash2 "60" -sk_bigmomma_dmg_slash3 "70" - -sk_bigmomma_dmg_blast1 "100" -sk_bigmomma_dmg_blast2 "120" -sk_bigmomma_dmg_blast3 "160" - -sk_bigmomma_radius_blast1 "250" -sk_bigmomma_radius_blast2 "250" -sk_bigmomma_radius_blast3 "275" - -// Gargantua -sk_gargantua_health1 "800" -sk_gargantua_health2 "800" -sk_gargantua_health3 "1000" - -sk_gargantua_dmg_slash1 "10" -sk_gargantua_dmg_slash2 "30" -sk_gargantua_dmg_slash3 "30" - -sk_gargantua_dmg_fire1 "3" -sk_gargantua_dmg_fire2 "5" -sk_gargantua_dmg_fire3 "5" - -sk_gargantua_dmg_stomp1 "50" -sk_gargantua_dmg_stomp2 "100" -sk_gargantua_dmg_stomp3 "100" - - -// Hassassin -sk_hassassin_health1 "30" -sk_hassassin_health2 "50" -sk_hassassin_health3 "50" - - -// Headcrab -sk_headcrab_health1 "10" -sk_headcrab_health2 "10" -sk_headcrab_health3 "20" - -sk_headcrab_dmg_bite1 "5" -sk_headcrab_dmg_bite2 "10" -sk_headcrab_dmg_bite3 "10" - - -// Hgrunt -sk_hgrunt_health1 "50" -sk_hgrunt_health2 "50" -sk_hgrunt_health3 "80" - -sk_hgrunt_kick1 "5" -sk_hgrunt_kick2 "10" -sk_hgrunt_kick3 "10" - -sk_hgrunt_pellets1 "3" -sk_hgrunt_pellets2 "5" -sk_hgrunt_pellets3 "6" - -sk_hgrunt_gspeed1 "400" -sk_hgrunt_gspeed2 "600" -sk_hgrunt_gspeed3 "800" - -// Houndeye -sk_houndeye_health1 "20" -sk_houndeye_health2 "20" -sk_houndeye_health3 "30" - -sk_houndeye_dmg_blast1 "10" -sk_houndeye_dmg_blast2 "15" -sk_houndeye_dmg_blast3 "15" - - -// ISlave -sk_islave_health1 "30" -sk_islave_health2 "30" -sk_islave_health3 "60" - -sk_islave_dmg_claw1 "8" -sk_islave_dmg_claw2 "10" -sk_islave_dmg_claw3 "10" - -sk_islave_dmg_clawrake1 "25" -sk_islave_dmg_clawrake2 "25" -sk_islave_dmg_clawrake3 "25" - -sk_islave_dmg_zap1 "10" -sk_islave_dmg_zap2 "10" -sk_islave_dmg_zap3 "15" - - -// Icthyosaur -sk_ichthyosaur_health1 "200" -sk_ichthyosaur_health2 "200" -sk_ichthyosaur_health3 "400" - -sk_ichthyosaur_shake1 "20" -sk_ichthyosaur_shake2 "35" -sk_ichthyosaur_shake3 "50" - - -// Leech -sk_leech_health1 "2" -sk_leech_health2 "2" -sk_leech_health3 "2" - -sk_leech_dmg_bite1 "2" -sk_leech_dmg_bite2 "2" -sk_leech_dmg_bite3 "2" - - -// Controller -sk_controller_health1 "60" -sk_controller_health2 "60" -sk_controller_health3 "100" - -sk_controller_dmgzap1 "15" -sk_controller_dmgzap2 "25" -sk_controller_dmgzap3 "35" - -sk_controller_speedball1 "650" -sk_controller_speedball2 "800" -sk_controller_speedball3 "1000" - -sk_controller_dmgball1 "3" -sk_controller_dmgball2 "4" -sk_controller_dmgball3 "5" - -// Nihilanth -sk_nihilanth_health1 "800" -sk_nihilanth_health2 "800" -sk_nihilanth_health3 "1000" - -sk_nihilanth_zap1 "30" -sk_nihilanth_zap2 "30" -sk_nihilanth_zap3 "50" - -// Scientist -sk_scientist_health1 "20" -sk_scientist_health2 "20" -sk_scientist_health3 "20" - - -// Snark -sk_snark_health1 "2" -sk_snark_health2 "2" -sk_snark_health3 "2" - -sk_snark_dmg_bite1 "10" -sk_snark_dmg_bite2 "10" -sk_snark_dmg_bite3 "10" - -sk_snark_dmg_pop1 "5" -sk_snark_dmg_pop2 "5" -sk_snark_dmg_pop3 "5" - - -// Zombie -sk_zombie_health1 "50" -sk_zombie_health2 "50" -sk_zombie_health3 "100" - -sk_zombie_dmg_one_slash1 "10" -sk_zombie_dmg_one_slash2 "20" -sk_zombie_dmg_one_slash3 "20" - -sk_zombie_dmg_both_slash1 "25" -sk_zombie_dmg_both_slash2 "40" -sk_zombie_dmg_both_slash3 "40" - - //Turret sk_turret_health1 "50" sk_turret_health2 "50" sk_turret_health3 "60" - // MiniTurret sk_miniturret_health1 "40" sk_miniturret_health2 "40" sk_miniturret_health3 "50" - // Sentry Turret sk_sentry_health1 "40" sk_sentry_health2 "40" sk_sentry_health3 "50" - -// PLAYER WEAPONS - -// Crowbar whack -sk_plr_crowbar1 "10" -sk_plr_crowbar2 "10" -sk_plr_crowbar3 "10" - -// 9mmhandgun Round -sk_plr_9mm_bullet1 "8" -sk_plr_9mm_bullet2 "8" -sk_plr_9mm_bullet3 "8" - -// 357 Round -sk_plr_357_bullet1 "40" -sk_plr_357_bullet2 "40" -sk_plr_357_bullet3 "40" - -// 9mmAR Round -sk_plr_9mmAR_bullet1 "5" -sk_plr_9mmAR_bullet2 "5" -sk_plr_9mmAR_bullet3 "5" - -// M203 grenade -sk_plr_9mmAR_grenade1 "100" -sk_plr_9mmAR_grenade2 "100" -sk_plr_9mmAR_grenade3 "100" - -// Shotgun buckshot -sk_plr_buckshot1 "5" -sk_plr_buckshot2 "5" -sk_plr_buckshot3 "5" - -// Crossbow -sk_plr_xbow_bolt_client1 "10" -sk_plr_xbow_bolt_client2 "10" -sk_plr_xbow_bolt_client3 "10" - -sk_plr_xbow_bolt_monster1 "50" -sk_plr_xbow_bolt_monster2 "50" -sk_plr_xbow_bolt_monster3 "50" - -// RPG -sk_plr_rpg1 "100" -sk_plr_rpg2 "100" -sk_plr_rpg3 "100" - -// Gauss Gun -sk_plr_gauss1 "20" -sk_plr_gauss2 "20" -sk_plr_gauss3 "20" - -// Egon Gun -sk_plr_egon_narrow1 "6" -sk_plr_egon_narrow2 "6" -sk_plr_egon_narrow3 "6" - -sk_plr_egon_wide1 "14" -sk_plr_egon_wide2 "14" -sk_plr_egon_wide3 "14" - -// Hand Grendade -sk_plr_hand_grenade1 "100" -sk_plr_hand_grenade2 "100" -sk_plr_hand_grenade3 "100" - -// Satchel Charge -sk_plr_satchel1 "150" -sk_plr_satchel2 "150" -sk_plr_satchel3 "150" - -// Tripmine -sk_plr_tripmine1 "150" -sk_plr_tripmine2 "150" -sk_plr_tripmine3 "150" - -// MONSTER WEAPONS -sk_12mm_bullet1 "8" -sk_12mm_bullet2 "10" -sk_12mm_bullet3 "10" - -sk_9mmAR_bullet1 "3" -sk_9mmAR_bullet2 "4" -sk_9mmAR_bullet3 "5" - -sk_9mm_bullet1 "5" -sk_9mm_bullet2 "5" -sk_9mm_bullet3 "8" - -// HORNET -sk_hornet_dmg1 "4" -sk_hornet_dmg2 "5" -sk_hornet_dmg3 "8" - // HEALTH/SUIT CHARGE DISTRIBUTION sk_suitcharger1 "75" sk_suitcharger2 "50" diff --git a/game/content/nfopen/sound/items/9mmclip1.wav b/game/content/nfopen/sound/items/9mmclip1.wav deleted file mode 100644 index 6a08e1da8..000000000 --- a/game/content/nfopen/sound/items/9mmclip1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d422fdc5622bda2792a855eae73f3d184ae8c901132766d9a55ea09b7ae16772 -size 6734 diff --git a/game/content/nfopen/sound/items/9mmclip2.wav b/game/content/nfopen/sound/items/9mmclip2.wav deleted file mode 100644 index 21baa4ef7..000000000 --- a/game/content/nfopen/sound/items/9mmclip2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c050b89b4c637246969342ef90faba6ff3054ad7b08da17cae2879ac4f6af8b4 -size 10084 diff --git a/game/content/nfopen/sound/items/clipinsert1.wav b/game/content/nfopen/sound/items/clipinsert1.wav deleted file mode 100644 index fc10430f2..000000000 --- a/game/content/nfopen/sound/items/clipinsert1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46edb5285edf1370ef7f52cd88e06d81391037d664a7b76ed991cd0e5929bd09 -size 12670 diff --git a/game/content/nfopen/sound/items/cliprelease1.wav b/game/content/nfopen/sound/items/cliprelease1.wav deleted file mode 100644 index 15124ba6c..000000000 --- a/game/content/nfopen/sound/items/cliprelease1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ca78a16e1aded33bd837abc4369bb91bcc4d31e967285183a5586f7d40539fb -size 6066 diff --git a/game/content/nfopen/sound/items/guncock1.wav b/game/content/nfopen/sound/items/guncock1.wav deleted file mode 100644 index 9bbaa9973..000000000 --- a/game/content/nfopen/sound/items/guncock1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed96f81f5b097bf2f28e988fea77a1c2f878c2c1c59682d549f06b418eb70d6b -size 12534 diff --git a/game/content/nfopen/sound/weapons/357_cock1.wav b/game/content/nfopen/sound/weapons/357_cock1.wav deleted file mode 100644 index f1847014c..000000000 --- a/game/content/nfopen/sound/weapons/357_cock1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17b229056edeef1035d82bf2e6a80ee04f6f8e6bfb3d2e5066f5b182bde81c08 -size 2678 diff --git a/game/content/nfopen/sound/weapons/357_reload1.wav b/game/content/nfopen/sound/weapons/357_reload1.wav deleted file mode 100644 index 14dedc6aa..000000000 --- a/game/content/nfopen/sound/weapons/357_reload1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdfe28272ba4b6c18f2367eab4cb59d22c44a73b270a13903036025323336c99 -size 12840 diff --git a/game/content/nfopen/sound/weapons/357_shot1.wav b/game/content/nfopen/sound/weapons/357_shot1.wav deleted file mode 100644 index 99b30c54e..000000000 --- a/game/content/nfopen/sound/weapons/357_shot1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d645622d61feb88b200c6d07852f764aff7b1ff62f340d5e7370ae6ab70531f -size 23580 diff --git a/game/content/nfopen/sound/weapons/357_shot2.wav b/game/content/nfopen/sound/weapons/357_shot2.wav deleted file mode 100644 index 9ab5d2c5c..000000000 --- a/game/content/nfopen/sound/weapons/357_shot2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52d909d609364379832e9328bbe40e7f7234c8a87da571dd55ae872e0806f096 -size 23510 diff --git a/game/content/nfopen/sound/weapons/cbar_hit1.wav b/game/content/nfopen/sound/weapons/cbar_hit1.wav deleted file mode 100644 index 76a760f13..000000000 --- a/game/content/nfopen/sound/weapons/cbar_hit1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24a190d8edf5b943c3273d8908255284e783653a11f611a6da011f86554c2eed -size 7784 diff --git a/game/content/nfopen/sound/weapons/cbar_hit2.wav b/game/content/nfopen/sound/weapons/cbar_hit2.wav deleted file mode 100644 index 614161bab..000000000 --- a/game/content/nfopen/sound/weapons/cbar_hit2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fded05c96ab0255c5ee3bb4f0d778fd6f344dfdffa7f926c46bef7d1f14de380 -size 5530 diff --git a/game/content/nfopen/sound/weapons/cbar_hitbod1.wav b/game/content/nfopen/sound/weapons/cbar_hitbod1.wav deleted file mode 100644 index eb8b65e11..000000000 --- a/game/content/nfopen/sound/weapons/cbar_hitbod1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0d86c5b96ef6e2571fe66cde068955a29a95683969833c00b8dc801d58190d3 -size 7048 diff --git a/game/content/nfopen/sound/weapons/cbar_hitbod2.wav b/game/content/nfopen/sound/weapons/cbar_hitbod2.wav deleted file mode 100644 index 9fbc1e58f..000000000 --- a/game/content/nfopen/sound/weapons/cbar_hitbod2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc8857eb420e3d36464cf39b747e9c82c32e3f61149ff3b3e17b61d6b1f74e9f -size 5518 diff --git a/game/content/nfopen/sound/weapons/cbar_hitbod3.wav b/game/content/nfopen/sound/weapons/cbar_hitbod3.wav deleted file mode 100644 index 02452743e..000000000 --- a/game/content/nfopen/sound/weapons/cbar_hitbod3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61278bfe5e7045b4710fa71224d8abf580c76d9cc4a6edf1cc52775d8054eb17 -size 7744 diff --git a/game/content/nfopen/sound/weapons/cbar_miss1.wav b/game/content/nfopen/sound/weapons/cbar_miss1.wav deleted file mode 100644 index cecba3cdb..000000000 --- a/game/content/nfopen/sound/weapons/cbar_miss1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:187d46ff07ed254247d5cfedce87274ff71fea86f795cfc99837e00e0acf2c1d -size 7710 diff --git a/game/content/nfopen/sound/weapons/dbarrel1.wav b/game/content/nfopen/sound/weapons/dbarrel1.wav deleted file mode 100644 index 42b1ea191..000000000 --- a/game/content/nfopen/sound/weapons/dbarrel1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c32cf987890b051180e6b3734177ad0f6530c1ef4265f4ac1166cee6efed800 -size 30426 diff --git a/game/content/nfopen/sound/weapons/egon_off1.wav b/game/content/nfopen/sound/weapons/egon_off1.wav deleted file mode 100644 index daedb11f0..000000000 --- a/game/content/nfopen/sound/weapons/egon_off1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fbc7059cf74a4944b98ba209bead7f27d755a650aa9fd093dc7516264131b18a -size 72540 diff --git a/game/content/nfopen/sound/weapons/egon_run3.wav b/game/content/nfopen/sound/weapons/egon_run3.wav deleted file mode 100644 index 507a74b35..000000000 --- a/game/content/nfopen/sound/weapons/egon_run3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa5059b65b5e9c18911166e50cbc77017010b7bb79e185ae4ae540a4608a142e -size 47570 diff --git a/game/content/nfopen/sound/weapons/egon_windup2.wav b/game/content/nfopen/sound/weapons/egon_windup2.wav deleted file mode 100644 index d6fcdc4fd..000000000 --- a/game/content/nfopen/sound/weapons/egon_windup2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dd83a82368eb22b92bcde56562d62f84e5c75bed30472b9e4e01eef8d0e139b -size 86894 diff --git a/game/content/nfopen/sound/weapons/electro4.wav b/game/content/nfopen/sound/weapons/electro4.wav deleted file mode 100644 index da9f9aa56..000000000 --- a/game/content/nfopen/sound/weapons/electro4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf4b8eddd7cf54d1f61f30f193617c5d799087675e2f518264b709e7acc7766f -size 19010 diff --git a/game/content/nfopen/sound/weapons/electro5.wav b/game/content/nfopen/sound/weapons/electro5.wav deleted file mode 100644 index 669558b86..000000000 --- a/game/content/nfopen/sound/weapons/electro5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ac2155f828fc704e8e946c76958b88f9ef4155fb13864323b726e98043f4e52 -size 15362 diff --git a/game/content/nfopen/sound/weapons/electro6.wav b/game/content/nfopen/sound/weapons/electro6.wav deleted file mode 100644 index a86251f89..000000000 --- a/game/content/nfopen/sound/weapons/electro6.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:777d0f2d164603f613fd9922747e7bf7ba5b2f7d75be2e1b7074bbd97e6d96ed -size 15036 diff --git a/game/content/nfopen/sound/weapons/g_bounce1.wav b/game/content/nfopen/sound/weapons/g_bounce1.wav deleted file mode 100644 index 07e75b151..000000000 --- a/game/content/nfopen/sound/weapons/g_bounce1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a518d643a79c888c2a27bfcca4ce043093d3132a034588ff0de805c36302369d -size 3198 diff --git a/game/content/nfopen/sound/weapons/g_bounce2.wav b/game/content/nfopen/sound/weapons/g_bounce2.wav deleted file mode 100644 index 9608a78aa..000000000 --- a/game/content/nfopen/sound/weapons/g_bounce2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1c973b79ff49be1059f8d9cb6cd766c4bf1d4a68f300d5da25903d4415bc2fa -size 5222 diff --git a/game/content/nfopen/sound/weapons/g_bounce4.wav b/game/content/nfopen/sound/weapons/g_bounce4.wav deleted file mode 100644 index aa424411b..000000000 --- a/game/content/nfopen/sound/weapons/g_bounce4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91092fdcd938922b44e3fc4bf6c828111d4b0b79ab9725eb70290a641eacc64b -size 7618 diff --git a/game/content/nfopen/sound/weapons/g_bounce5.wav b/game/content/nfopen/sound/weapons/g_bounce5.wav deleted file mode 100644 index 16a5955a8..000000000 --- a/game/content/nfopen/sound/weapons/g_bounce5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1074584e78caae6afefd93d0370ea4ebbb96eb11aa496302dbc4a28fe2b82a37 -size 6614 diff --git a/game/content/nfopen/sound/weapons/gauss2.wav b/game/content/nfopen/sound/weapons/gauss2.wav deleted file mode 100644 index 4dca715db..000000000 --- a/game/content/nfopen/sound/weapons/gauss2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7081c03073a8abe550739c3970e051a68473462021ad235a556d35bd507500bb -size 32224 diff --git a/game/content/nfopen/sound/weapons/glauncher.wav b/game/content/nfopen/sound/weapons/glauncher.wav deleted file mode 100644 index 3b653f051..000000000 --- a/game/content/nfopen/sound/weapons/glauncher.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7305444aaa42c02bdd4585dfc4e58eaedee76ae8a5d45ed2c83d4a45e965ca6 -size 28220 diff --git a/game/content/nfopen/sound/weapons/glauncher2.wav b/game/content/nfopen/sound/weapons/glauncher2.wav deleted file mode 100644 index 2d0821027..000000000 --- a/game/content/nfopen/sound/weapons/glauncher2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29e9e125ceaeeb8f82afc9f7a9d897ed7a2c9ced441fd8285f386095912a3e10 -size 29230 diff --git a/game/content/nfopen/sound/weapons/gren_cock1.wav b/game/content/nfopen/sound/weapons/gren_cock1.wav deleted file mode 100644 index 964881862..000000000 --- a/game/content/nfopen/sound/weapons/gren_cock1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f544c6b6780c007fb4b3c0640553d648a38e9c74df1d0e489aa89a65499f597 -size 8426 diff --git a/game/content/nfopen/sound/weapons/hks1.wav b/game/content/nfopen/sound/weapons/hks1.wav deleted file mode 100644 index fe8f83b2e..000000000 --- a/game/content/nfopen/sound/weapons/hks1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4df259d2c22faba729346172b937ad31ac4ab46f88fb0ecb3fc5ff40863dd63 -size 27900 diff --git a/game/content/nfopen/sound/weapons/hks2.wav b/game/content/nfopen/sound/weapons/hks2.wav deleted file mode 100644 index 9e4ccdb7f..000000000 --- a/game/content/nfopen/sound/weapons/hks2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13fd0120e40ac5648e3da9724bbe129c61bb10dff476c1cf7c457042994700f7 -size 25528 diff --git a/game/content/nfopen/sound/weapons/hks3.wav b/game/content/nfopen/sound/weapons/hks3.wav deleted file mode 100644 index 038908bf2..000000000 --- a/game/content/nfopen/sound/weapons/hks3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc1858ebbb266bdde31ccc03985e06f453b8687825c138b4792d1e87840a5437 -size 27550 diff --git a/game/content/nfopen/sound/weapons/mine_activate.wav b/game/content/nfopen/sound/weapons/mine_activate.wav deleted file mode 100644 index ae72ff18b..000000000 --- a/game/content/nfopen/sound/weapons/mine_activate.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f21d1aa7be7138310bebdcb1288a712e627be20a94577390c53f283b3c37718f -size 6042 diff --git a/game/content/nfopen/sound/weapons/mine_charge.wav b/game/content/nfopen/sound/weapons/mine_charge.wav deleted file mode 100644 index f54ac353e..000000000 --- a/game/content/nfopen/sound/weapons/mine_charge.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a0149de6872f2e1a1d5f1409605956b29ed3459ea003bcf3afaff4b8d60523c -size 44294 diff --git a/game/content/nfopen/sound/weapons/mine_deploy.wav b/game/content/nfopen/sound/weapons/mine_deploy.wav deleted file mode 100644 index 189a230d8..000000000 --- a/game/content/nfopen/sound/weapons/mine_deploy.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7acc23233660db738fa289823da7396d12dd90e4aecd5c14d70ecb22fda1f74c -size 5928 diff --git a/game/content/nfopen/sound/weapons/mortar.wav b/game/content/nfopen/sound/weapons/mortar.wav deleted file mode 100644 index 975a422a5..000000000 --- a/game/content/nfopen/sound/weapons/mortar.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ba460c12d82d98f3c46b253595ffdd6f1708f9f64ccae78a7c11cc7663b6388 -size 25748 diff --git a/game/content/nfopen/sound/weapons/mortarhit.wav b/game/content/nfopen/sound/weapons/mortarhit.wav deleted file mode 100644 index c4727fd3d..000000000 --- a/game/content/nfopen/sound/weapons/mortarhit.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2e16f87f9f767b9216b2446721ac8685f594478c317c4d2adae383afc1b77da -size 40366 diff --git a/game/content/nfopen/sound/weapons/pl_gun1.wav b/game/content/nfopen/sound/weapons/pl_gun1.wav deleted file mode 100644 index e785ba887..000000000 --- a/game/content/nfopen/sound/weapons/pl_gun1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b83e4e479b015d56bcff46e85062d1e6356228becfe705b730d511ab69bbee40 -size 6382 diff --git a/game/content/nfopen/sound/weapons/pl_gun2.wav b/game/content/nfopen/sound/weapons/pl_gun2.wav deleted file mode 100644 index 7b7d9f2e5..000000000 --- a/game/content/nfopen/sound/weapons/pl_gun2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fc3f99376e6250cb6f49bddd0bb64abe8284aca12915fab956e1c8b1e05b224 -size 6360 diff --git a/game/content/nfopen/sound/weapons/pl_gun3.wav b/game/content/nfopen/sound/weapons/pl_gun3.wav deleted file mode 100644 index 572e4dcd2..000000000 --- a/game/content/nfopen/sound/weapons/pl_gun3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d858e4ea5051dea58c9254d5d8e423678c63fc87b2bdf6c0ed0a34e14444c02 -size 13336 diff --git a/game/content/nfopen/sound/weapons/reload1.wav b/game/content/nfopen/sound/weapons/reload1.wav deleted file mode 100644 index 0735f6e07..000000000 --- a/game/content/nfopen/sound/weapons/reload1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef3d655a98fff205594e93f384fd91bcc502e0b8ed3b046e6fdf246322543e4d -size 4874 diff --git a/game/content/nfopen/sound/weapons/reload2.wav b/game/content/nfopen/sound/weapons/reload2.wav deleted file mode 100644 index 1178d4405..000000000 --- a/game/content/nfopen/sound/weapons/reload2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0c6d769577c9f3ee17cbd59c008cfc0cad7ba7e8a01aa5876023fb39362d562 -size 6098 diff --git a/game/content/nfopen/sound/weapons/reload3.wav b/game/content/nfopen/sound/weapons/reload3.wav deleted file mode 100644 index 293be14ee..000000000 --- a/game/content/nfopen/sound/weapons/reload3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4ec314af2dee6fb0266c940a02253931b683ad0ad096da29d0212b0e0bcb34d -size 13504 diff --git a/game/content/nfopen/sound/weapons/rocket1.wav b/game/content/nfopen/sound/weapons/rocket1.wav deleted file mode 100644 index 8cbc6a18c..000000000 --- a/game/content/nfopen/sound/weapons/rocket1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63b63629fe377d6cc1dfd7e57c844c1ff0884db2f322f117e8c9c8b323b60c8 -size 55210 diff --git a/game/content/nfopen/sound/weapons/rocketfire1.wav b/game/content/nfopen/sound/weapons/rocketfire1.wav deleted file mode 100644 index 01ecfbcb9..000000000 --- a/game/content/nfopen/sound/weapons/rocketfire1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1603950bfd1ef5a7a3169b0fd8deb9b67eae4b0fc042b765e0ca7ba7eb83c235 -size 9538 diff --git a/game/content/nfopen/sound/weapons/sbarrel1.wav b/game/content/nfopen/sound/weapons/sbarrel1.wav deleted file mode 100644 index 92e0ac1d9..000000000 --- a/game/content/nfopen/sound/weapons/sbarrel1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1c3ad4de641925f8b51916a39b7fb1553163c707826fd1d9cb5942a618b90fb -size 23030 diff --git a/game/content/nfopen/sound/weapons/scock1.wav b/game/content/nfopen/sound/weapons/scock1.wav deleted file mode 100644 index e7ca37935..000000000 --- a/game/content/nfopen/sound/weapons/scock1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c85661c9d9437c039010aee2c7359ad18c29f9bebb4022688b1b332c5580c6a9 -size 11846 diff --git a/game/content/nfopen/sound/weapons/xbow_fire1.wav b/game/content/nfopen/sound/weapons/xbow_fire1.wav deleted file mode 100644 index f04a19e0f..000000000 --- a/game/content/nfopen/sound/weapons/xbow_fire1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab34c8226df84a816a5625dddd78eac9620e06d459aa47cb459cb4b1e0f22aaa -size 12264 diff --git a/game/content/nfopen/sound/weapons/xbow_fly1.wav b/game/content/nfopen/sound/weapons/xbow_fly1.wav deleted file mode 100644 index 1e20aeddb..000000000 --- a/game/content/nfopen/sound/weapons/xbow_fly1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bf8f3d8edc87c6042a2c9d4f442175de618a460498123c48411d5f326d8e4de -size 11186 diff --git a/game/content/nfopen/sound/weapons/xbow_hit1.wav b/game/content/nfopen/sound/weapons/xbow_hit1.wav deleted file mode 100644 index ccb4f8f75..000000000 --- a/game/content/nfopen/sound/weapons/xbow_hit1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:664a50da21c4a4e680f2457d3a8862f25dfb6ff1ea26c280224b5b2ca8452531 -size 9002 diff --git a/game/content/nfopen/sound/weapons/xbow_hit2.wav b/game/content/nfopen/sound/weapons/xbow_hit2.wav deleted file mode 100644 index 4fc64d6af..000000000 --- a/game/content/nfopen/sound/weapons/xbow_hit2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1a4961cc0656fdef0387370a72c682d2d53758aabe91289ad73c3f401fb34a -size 10772 diff --git a/game/content/nfopen/sound/weapons/xbow_hitbod1.wav b/game/content/nfopen/sound/weapons/xbow_hitbod1.wav deleted file mode 100644 index 9a35274c1..000000000 --- a/game/content/nfopen/sound/weapons/xbow_hitbod1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a21a63177077390e059e78405ca45d8ef590fe7ea430904bbffeb426deac1ad -size 6852 diff --git a/game/content/nfopen/sound/weapons/xbow_hitbod2.wav b/game/content/nfopen/sound/weapons/xbow_hitbod2.wav deleted file mode 100644 index 577bbdee0..000000000 --- a/game/content/nfopen/sound/weapons/xbow_hitbod2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64d366b7670419871c782bf481dacd61423c963c346499ef43e85ca3f0b54d3d -size 4014 diff --git a/game/content/nfopen/sound/weapons/xbow_reload1.wav b/game/content/nfopen/sound/weapons/xbow_reload1.wav deleted file mode 100644 index 992ef9e61..000000000 --- a/game/content/nfopen/sound/weapons/xbow_reload1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a3bd67488d4b4732de3562d4d8b7ab1ef35b2288dd8d7dc1137f4615a0efdb3 -size 12770 diff --git a/game/content/nfopen/sprites/hud.txt b/game/content/nfopen/sprites/hud.txt index 86d7a801c..93f0e3d89 100644 --- a/game/content/nfopen/sprites/hud.txt +++ b/game/content/nfopen/sprites/hud.txt @@ -3,9 +3,9 @@ selection 320 320hud1 160 160 80 20 bucket1 320 320hud2 108 16 12 12 bucket2 320 320hud2 108 28 12 12 -bucket3 320 320hud2 108 40 12 12 +bucket3 320 320hud2 108 40 12 12 bucket4 320 320hud2 108 52 12 12 -bucket5 320 320hud2 108 64 12 12 +bucket5 320 320hud2 108 64 12 12 bucket0 320 320hud2 108 76 12 12 dmg_bio 320 320hud4 0 0 32 32 @@ -49,27 +49,12 @@ train_forward3 320 320hud3 192 0 48 48 title_half 320 320hud3 0 48 128 16 title_life 320 320hud3 128 48 116 16 -d_crowbar 320 320hud1 0 208 48 16 -d_9mmhandgun 320 320hud1 0 224 32 16 -d_357 320 320hud1 0 240 32 16 -d_9mmAR 320 320hud1 48 208 48 16 -d_shotgun 320 320hud1 48 224 48 16 -d_bolt 320 320hud1 48 240 48 16 -d_crossbow 320 320hud1 48 240 48 16 -d_rpg_rocket 320 320hud1 96 208 48 16 -d_gauss 320 320hud1 96 224 32 16 -d_egon 320 320hud1 96 240 32 16 -d_hornet 320 320hud1 144 208 48 16 d_grenade 320 320hud1 144 224 32 16 -d_satchel 320 320hud1 144 240 32 16 -d_tripmine 320 320hud1 192 208 32 16 -d_snark 320 320hud1 192 224 32 16 d_skull 320 320hud1 192 240 32 16 d_tracktrain 320 320hud1 224 208 32 16 item_battery 320 320hud2 48 52 20 20 item_healthkit 320 320hud2 68 52 20 20 -item_longjump 320 320hud2 88 52 20 20 grenade 320 320hud2 36 34 18 18 @@ -79,11 +64,11 @@ grenade 320 320hud2 36 34 18 18 selection 640 640hud3 0 180 170 45 bucket1 640 640hud7 168 72 20 20 -bucket2 640 640hud7 188 72 20 20 -bucket3 640 640hud7 208 72 20 20 -bucket4 640 640hud7 168 92 20 20 -bucket5 640 640hud7 188 92 20 20 -bucket0 640 640hud7 208 92 20 20 +bucket2 640 640hud7 188 72 20 20 +bucket3 640 640hud7 208 72 20 20 +bucket4 640 640hud7 168 92 20 20 +bucket5 640 640hud7 188 92 20 20 +bucket0 640 640hud7 208 92 20 20 dmg_bio 640 640hud8 128 0 64 64 dmg_poison 640 640hud8 128 0 64 64 @@ -128,26 +113,11 @@ autoaim_c 640 crosshairs 96 0 24 24 title_half 640 640hud4 0 226 256 30 title_life 640 640hud5 0 226 220 30 -d_crowbar 640 640hud1 192 0 48 16 -d_9mmhandgun 640 640hud1 192 16 32 16 -d_357 640 640hud1 192 32 32 16 -d_9mmAR 640 640hud1 192 48 48 16 -d_shotgun 640 640hud1 192 64 48 16 -d_bolt 640 640hud1 192 80 48 16 -d_crossbow 640 640hud1 192 80 48 16 -d_rpg_rocket 640 640hud1 192 96 48 16 -d_gauss 640 640hud1 192 112 32 16 -d_egon 640 640hud1 192 128 32 16 -d_hornet 640 640hud1 192 144 48 16 d_grenade 640 640hud1 192 160 32 16 -d_satchel 640 640hud1 192 176 32 16 -d_tripmine 640 640hud1 192 192 32 16 -d_snark 640 640hud1 192 208 32 16 d_skull 640 640hud1 192 224 32 16 d_tracktrain 640 640hud1 192 240 32 16 item_battery 640 640hud2 176 0 44 44 item_healthkit 640 640hud2 176 48 44 44 -item_longjump 640 640hud2 176 96 44 44 grenade 640 640hud7 48 96 24 24 diff --git a/game/content/nfopen/sprites/weapon_357.txt b/game/content/nfopen/sprites/weapon_357.txt deleted file mode 100644 index 2e5ca6696..000000000 --- a/game/content/nfopen/sprites/weapon_357.txt +++ /dev/null @@ -1,13 +0,0 @@ -12 -weapon 320 320hud1 0 80 80 20 -weapon_s 320 320hud1 0 100 80 20 -ammo 320 320hud2 18 16 18 18 -crosshair 320 crosshairs 48 0 24 24 -autoaim 320 crosshairs 24 72 24 24 -zoom 320 crosshairs 96 0 24 24 -weapon 640 640hud1 0 90 170 45 -weapon_s 640 640hud4 0 90 170 45 -ammo 640 640hud7 24 72 24 24 -crosshair 640 crosshairs 48 0 24 24 -autoaim 640 crosshairs 24 72 24 24 -zoom 640 crosshairs 96 0 24 24 diff --git a/game/content/nfopen/sprites/weapon_9mmar.txt b/game/content/nfopen/sprites/weapon_9mmar.txt deleted file mode 100644 index 542a80202..000000000 --- a/game/content/nfopen/sprites/weapon_9mmar.txt +++ /dev/null @@ -1,15 +0,0 @@ -// mp5 - -12 // number of sprites -weapon 320 320hud1 0 120 80 20 -weapon_s 320 320hud1 0 140 80 20 -ammo 320 320hud2 0 16 18 18 -ammo2 320 320hud2 36 16 18 18 -crosshair 320 crosshairs 0 48 24 24 -autoaim 320 crosshairs 48 72 24 24 -weapon 640 640hud1 0 135 170 45 -weapon_s 640 640hud4 0 135 170 45 -ammo 640 640hud7 0 72 24 24 -ammo2 640 640hud7 48 72 24 24 -crosshair 640 crosshairs 0 48 24 24 -autoaim 640 crosshairs 48 72 24 24 diff --git a/game/content/nfopen/sprites/weapon_crossbow.txt b/game/content/nfopen/sprites/weapon_crossbow.txt deleted file mode 100644 index 2ad1d15ba..000000000 --- a/game/content/nfopen/sprites/weapon_crossbow.txt +++ /dev/null @@ -1,15 +0,0 @@ -14 -weapon 320 320hud1 80 0 80 20 -weapon_s 320 320hud1 80 20 80 20 -ammo 320 320hud2 72 16 18 18 -crosshair 320 crosshairs 72 0 24 24 -autoaim 320 crosshairs 0 96 24 24 -zoom 320 crosshairs 24 96 104 16 -zoom_autoaim 320 crosshairs 24 112 104 16 -weapon 640 640hud2 0 0 170 45 -weapon_s 640 640hud5 0 0 170 45 -ammo 640 640hud7 96 72 24 24 -crosshair 640 crosshairs 72 0 24 24 -autoaim 640 crosshairs 0 96 24 24 -zoom 640 crosshairs 24 96 104 16 -zoom_autoaim 640 crosshairs 24 112 104 16 diff --git a/game/content/nfopen/sprites/weapon_crowbar.txt b/game/content/nfopen/sprites/weapon_crowbar.txt deleted file mode 100644 index 8ba9f4be9..000000000 --- a/game/content/nfopen/sprites/weapon_crowbar.txt +++ /dev/null @@ -1,5 +0,0 @@ -4 -weapon 320 320hud1 0 0 80 20 -weapon_s 320 320hud1 0 20 80 20 -weapon 640 640hud1 0 0 170 45 -weapon_s 640 640hud4 0 0 170 45 diff --git a/game/content/nfopen/sprites/weapon_egon.txt b/game/content/nfopen/sprites/weapon_egon.txt deleted file mode 100644 index 632ffa047..000000000 --- a/game/content/nfopen/sprites/weapon_egon.txt +++ /dev/null @@ -1,9 +0,0 @@ -8 -weapon 320 320hud1 80 120 80 20 -weapon_s 320 320hud1 80 140 80 20 -ammo 320 320hud2 0 34 18 18 -crosshair 320 crosshairs 72 48 24 24 -weapon 640 640hud2 0 135 170 45 -weapon_s 640 640hud5 0 135 170 45 -ammo 640 640hud7 0 96 24 24 -crosshair 640 crosshairs 72 48 24 24 \ No newline at end of file diff --git a/game/content/nfopen/sprites/weapon_gauss.txt b/game/content/nfopen/sprites/weapon_gauss.txt deleted file mode 100644 index c99207d60..000000000 --- a/game/content/nfopen/sprites/weapon_gauss.txt +++ /dev/null @@ -1,9 +0,0 @@ -8 -weapon 320 320hud1 80 80 80 20 -weapon_s 320 320hud1 80 100 80 20 -ammo 320 320hud2 0 34 18 18 -crosshair 320 crosshairs 48 48 24 24 -weapon 640 640hud2 0 90 170 45 -weapon_s 640 640hud5 0 90 170 45 -ammo 640 640hud7 0 96 24 24 -crosshair 640 crosshairs 48 48 24 24 \ No newline at end of file diff --git a/game/content/nfopen/sprites/weapon_handgrenade.txt b/game/content/nfopen/sprites/weapon_handgrenade.txt deleted file mode 100644 index 99912096f..000000000 --- a/game/content/nfopen/sprites/weapon_handgrenade.txt +++ /dev/null @@ -1,7 +0,0 @@ -6 -weapon 320 320hud1 160 0 80 20 -weapon_s 320 320hud1 160 20 80 20 -ammo 320 320hud2 36 34 18 18 -weapon 640 640hud3 0 0 170 45 -weapon_s 640 640hud6 0 0 170 45 -ammo 640 640hud7 48 96 24 24 diff --git a/game/content/nfopen/sprites/weapon_hornetgun.txt b/game/content/nfopen/sprites/weapon_hornetgun.txt deleted file mode 100644 index 457d4d3f9..000000000 --- a/game/content/nfopen/sprites/weapon_hornetgun.txt +++ /dev/null @@ -1,9 +0,0 @@ -8 -weapon 320 320hud1 80 160 80 20 -weapon_s 320 320hud1 80 180 80 20 -ammo 320 320hud2 16 36 18 18 -crosshair 320 crosshairs 72 24 24 24 -weapon 640 640hud2 0 180 170 45 -weapon_s 640 640hud5 0 180 170 45 -ammo 640 640hud7 24 96 24 24 -crosshair 640 crosshairs 72 24 24 24 diff --git a/game/content/nfopen/sprites/weapon_question.txt b/game/content/nfopen/sprites/weapon_question.txt deleted file mode 100644 index b011f494d..000000000 --- a/game/content/nfopen/sprites/weapon_question.txt +++ /dev/null @@ -1,7 +0,0 @@ -6 -weapon 320 320hud2 0 36 80 20 -weapon_s 320 320hud2 0 104 80 20 -ammo 320 320hud2 90 52 18 18 -weapon 640 640hud6 0 200 170 45 -weapon_s 640 640hud6 0 200 170 45 -ammo 640 640hud7 144 96 24 24 diff --git a/game/content/nfopen/sprites/weapon_rpg.txt b/game/content/nfopen/sprites/weapon_rpg.txt deleted file mode 100644 index 13700f8fc..000000000 --- a/game/content/nfopen/sprites/weapon_rpg.txt +++ /dev/null @@ -1,9 +0,0 @@ -8 -weapon 320 320hud1 80 40 80 20 -weapon_s 320 320hud1 80 60 80 20 -ammo 320 320hud2 90 16 18 18 -crosshair 320 crosshairs 24 48 24 24 -weapon 640 640hud2 0 45 170 45 -weapon_s 640 640hud5 0 45 170 45 -ammo 640 640hud7 120 72 24 24 -crosshair 640 crosshairs 24 48 24 24 diff --git a/game/content/nfopen/sprites/weapon_satchel.txt b/game/content/nfopen/sprites/weapon_satchel.txt deleted file mode 100644 index ba5da055a..000000000 --- a/game/content/nfopen/sprites/weapon_satchel.txt +++ /dev/null @@ -1,7 +0,0 @@ -6 -weapon 320 320hud1 160 40 80 20 -weapon_s 320 320hud1 160 60 80 20 -ammo 320 320hud2 54 34 18 18 -weapon 640 640hud3 0 45 170 45 -weapon_s 640 640hud6 0 45 170 45 -ammo 640 640hud7 72 96 24 24 diff --git a/game/content/nfopen/sprites/weapon_shotgun.txt b/game/content/nfopen/sprites/weapon_shotgun.txt deleted file mode 100644 index 933dd2a5a..000000000 --- a/game/content/nfopen/sprites/weapon_shotgun.txt +++ /dev/null @@ -1,11 +0,0 @@ -10 -weapon 320 320hud1 0 160 80 20 -weapon_s 320 320hud1 0 180 80 20 -ammo 320 320hud2 54 16 18 18 -crosshair 320 crosshairs 48 24 24 24 -autoaim 320 crosshairs 72 72 24 24 -weapon 640 640hud1 0 180 170 45 -weapon_s 640 640hud4 0 180 170 45 -ammo 640 640hud7 72 72 24 24 -crosshair 640 crosshairs 48 24 24 24 -autoaim 640 crosshairs 72 72 24 24 \ No newline at end of file diff --git a/game/content/nfopen/sprites/weapon_9mmhandgun.txt b/game/content/nfopen/sprites/weapon_silent.txt similarity index 96% rename from game/content/nfopen/sprites/weapon_9mmhandgun.txt rename to game/content/nfopen/sprites/weapon_silent.txt index 3c282ef17..f753c3e80 100644 --- a/game/content/nfopen/sprites/weapon_9mmhandgun.txt +++ b/game/content/nfopen/sprites/weapon_silent.txt @@ -1,11 +1,11 @@ -10 -weapon 320 320hud1 0 40 80 20 -weapon_s 320 320hud1 0 60 80 20 -ammo 320 320hud2 0 16 18 18 -crosshair 320 crosshairs 24 0 24 24 -autoaim 320 crosshairs 0 72 24 24 -weapon 640 640hud1 0 45 170 45 -weapon_s 640 640hud4 0 45 170 45 -ammo 640 640hud7 0 72 24 24 -crosshair 640 crosshairs 24 0 24 24 -autoaim 640 crosshairs 0 72 24 24 +10 +weapon 320 320hud1 0 40 80 20 +weapon_s 320 320hud1 0 60 80 20 +ammo 320 320hud2 0 16 18 18 +crosshair 320 crosshairs 24 0 24 24 +autoaim 320 crosshairs 0 72 24 24 +weapon 640 640hud1 0 45 170 45 +weapon_s 640 640hud4 0 45 170 45 +ammo 640 640hud7 0 72 24 24 +crosshair 640 crosshairs 24 0 24 24 +autoaim 640 crosshairs 0 72 24 24 diff --git a/game/content/nfopen/sprites/weapon_snark.txt b/game/content/nfopen/sprites/weapon_snark.txt deleted file mode 100644 index d618b3487..000000000 --- a/game/content/nfopen/sprites/weapon_snark.txt +++ /dev/null @@ -1,7 +0,0 @@ -6 -weapon 320 320hud1 160 120 80 20 -weapon_s 320 320hud1 160 140 80 20 -ammo 320 320hud2 90 34 18 18 -weapon 640 640hud3 0 135 170 45 -weapon_s 640 640hud6 0 135 170 45 -ammo 640 640hud7 96 96 24 24 diff --git a/game/content/nfopen/sprites/weapon_tripmine.txt b/game/content/nfopen/sprites/weapon_tripmine.txt deleted file mode 100644 index 85695a4c7..000000000 --- a/game/content/nfopen/sprites/weapon_tripmine.txt +++ /dev/null @@ -1,7 +0,0 @@ -6 -weapon 320 320hud1 160 80 80 20 -weapon_s 320 320hud1 160 100 80 20 -ammo 320 320hud2 72 34 18 18 -weapon 640 640hud3 0 90 170 45 -weapon_s 640 640hud6 0 90 170 45 -ammo 640 640hud7 120 96 24 24 diff --git a/game/content/tools/NightfireOpen.fgd b/game/content/tools/NightfireOpen.fgd index 017dd1534..2d0f36c25 100644 --- a/game/content/tools/NightfireOpen.fgd +++ b/game/content/tools/NightfireOpen.fgd @@ -278,25 +278,6 @@ 0: "Nothing" 1: "Battery" 2: "Healthkit" - 3: "9mm Handgun" - 4: "9mm Clip" - 5: "Machine Gun" - 6: "Machine Gun Clip" - 7: "Machine Gun Grenades" - 8: "Shotgun" - 9: "Shotgun Shells" - 10: "Crossbow" - 11: "Crossbow Bolts" - 12: "357" - 13: "357 clip" - 14: "RPG" - 15: "RPG Clip" - 16: "Gauss clip" - 17: "Hand grenade" - 18: "Tripmine" - 19: "Satchel Charge" - 20: "Snark" - 21: "Hornet Gun" ] explodemagnitude(integer) : "Explode Magnitude (0=none)" : 0 ] @@ -2156,8 +2137,6 @@ [ type(choices) :"types" : 42 = [ - 42: "Antidote" - 43: "Security Card" 44: "Battery" 45: "Suit" ] diff --git a/game/game_libs/cl_dlls/CMakeLists.txt b/game/game_libs/cl_dlls/CMakeLists.txt index bd0c560fd..d5ea3e091 100644 --- a/game/game_libs/cl_dlls/CMakeLists.txt +++ b/game/game_libs/cl_dlls/CMakeLists.txt @@ -86,10 +86,6 @@ set(SOURCES_GAME_SHARED ../game_shared/weapons/ammodefs.cpp ../game_shared/weapons/basegrenadelauncher.h ../game_shared/weapons/basegrenadelauncher.cpp - ../game_shared/weapons/crossbow.cpp - ../game_shared/weapons/crowbar.cpp - ../game_shared/weapons/egon.cpp - ../game_shared/weapons/gauss.cpp ../game_shared/weapons/generichitscanweapon.h ../game_shared/weapons/generichitscanweapon.cpp ../game_shared/weapons/genericmeleeweapon.h @@ -98,16 +94,6 @@ set(SOURCES_GAME_SHARED ../game_shared/weapons/genericprojectileweapon.cpp ../game_shared/weapons/genericweapon.h ../game_shared/weapons/genericweapon.cpp - ../game_shared/weapons/glock.cpp - ../game_shared/weapons/handgrenade.cpp - ../game_shared/weapons/hornetgun.cpp - ../game_shared/weapons/mp5.cpp - ../game_shared/weapons/python.cpp - ../game_shared/weapons/rpg.cpp - ../game_shared/weapons/satchel.cpp - ../game_shared/weapons/shotgun.cpp - ../game_shared/weapons/squeakgrenade.cpp - ../game_shared/weapons/tripmine.cpp ../game_shared/weapons/weapon_fists_atts.h ../game_shared/weapons/weapon_fists.h ../game_shared/weapons/weapon_fists.cpp diff --git a/game/game_libs/cl_dlls/ev_hldm.cpp b/game/game_libs/cl_dlls/ev_hldm.cpp index 9b10b8276..0c262a275 100644 --- a/game/game_libs/cl_dlls/ev_hldm.cpp +++ b/game/game_libs/cl_dlls/ev_hldm.cpp @@ -66,6 +66,11 @@ void VectorAngles(const float* forward, float* angles); extern cvar_t* cl_weapon_prediction; +// These are used elsewhere, apparently. +BEAM* pBeam; +BEAM* pBeam2; +TEMPENTITY* pFlare; // Vit_amiN: egon's beam flare + void EV_HLDM_Init() { CWeaponRegistry::StaticInstance().ForEach( @@ -445,6 +450,8 @@ void EV_HLDM_FireBullets( } } +#ifdef HL_CONTENT + //====================== // GLOCK START //====================== @@ -1720,10 +1727,6 @@ enum EGON_FIREMODE #define EGON_SOUND_RUN "weapons/egon_run3.wav" #define EGON_SOUND_STARTUP "weapons/egon_windup2.wav" -BEAM* pBeam; -BEAM* pBeam2; -TEMPENTITY* pFlare; // Vit_amiN: egon's beam flare - void EV_EgonFlareCallback(struct tempent_s* ent, float, float currenttime) { float delta = currenttime - ent->tentOffset[2]; // time past since the last scale @@ -2081,6 +2084,8 @@ void EV_SnarkFire(event_args_t* args) // SQUEAK END //====================== +#endif // HL_CONTENT + void EV_TrainPitchAdjust(event_args_t* args) { int idx; diff --git a/game/game_libs/cl_dlls/ev_hldm.h b/game/game_libs/cl_dlls/ev_hldm.h index fdab43ef4..726525d07 100644 --- a/game/game_libs/cl_dlls/ev_hldm.h +++ b/game/game_libs/cl_dlls/ev_hldm.h @@ -14,6 +14,7 @@ struct event_args_s; extern "C" { +#ifdef HL_CONTENT // HLDM void EV_FireGlock1(event_args_t* args); void EV_FireGlock2(event_args_t* args); @@ -33,6 +34,7 @@ void EV_EgonStop(event_args_t* args); void EV_HornetGunFire(event_args_t* args); void EV_TripmineFire(event_args_t* args); void EV_SnarkFire(event_args_t* args); +#endif // HL_CONTENT void EV_TrainPitchAdjust(event_args_t* args); diff --git a/game/game_libs/cl_dlls/hl/hl_events.cpp b/game/game_libs/cl_dlls/hl/hl_events.cpp index 251fcc2c2..34a8897c3 100644 --- a/game/game_libs/cl_dlls/hl/hl_events.cpp +++ b/game/game_libs/cl_dlls/hl/hl_events.cpp @@ -37,6 +37,7 @@ void Game_HookEvents(void) { EV_HLDM_Init(); +#ifdef HL_CONTENT gEngfuncs.pfnHookEvent("events/glock1.sc", EV_FireGlock1, NULL); gEngfuncs.pfnHookEvent("events/glock2.sc", EV_FireGlock2, NULL); gEngfuncs.pfnHookEvent("events/shotgun1.sc", EV_FireShotGunSingle, NULL); @@ -56,6 +57,7 @@ void Game_HookEvents(void) gEngfuncs.pfnHookEvent("events/firehornet.sc", EV_HornetGunFire, NULL); gEngfuncs.pfnHookEvent("events/tripfire.sc", EV_TripmineFire, NULL); gEngfuncs.pfnHookEvent("events/snarkfire.sc", EV_SnarkFire, NULL); +#endif // HL_CONTENT // Hook up all registered weapons to generic event handlers for firing. CWeaponRegistry::StaticInstance().ForEach( diff --git a/game/game_libs/cl_dlls/hl/hl_weapons.cpp b/game/game_libs/cl_dlls/hl/hl_weapons.cpp index 48bfd2e86..897b9aa0c 100644 --- a/game/game_libs/cl_dlls/hl/hl_weapons.cpp +++ b/game/game_libs/cl_dlls/hl/hl_weapons.cpp @@ -59,6 +59,7 @@ int g_irunninggausspred = 0; vec3_t previousorigin; +#ifdef HL_CONTENT // HLDM Weapon placeholder entities. CGlock g_Glock; CCrowbar g_Crowbar; @@ -74,6 +75,7 @@ CHandGrenade g_HandGren; CSatchel g_Satchel; CTripmine g_Tripmine; CSqueak g_Snark; +#endif // HL_CONTENT /* ====================== @@ -237,12 +239,7 @@ CBasePlayerWeapon::DefaultDeploy ===================== */ -BOOL CBasePlayerWeapon::DefaultDeploy( - const char* szViewModel, - const char*, - int iAnim, - const char*, - int body) +BOOL CBasePlayerWeapon::DefaultDeploy(const char* szViewModel, const char*, int iAnim, const char*, int body) { if ( !CanDeploy() ) return FALSE; @@ -540,12 +537,7 @@ UTIL_TraceLine Don't actually trace, but act like the trace didn't hit anything. ===================== */ -void UTIL_TraceLine( - const Vector&, - const Vector&, - IGNORE_MONSTERS, - edict_t*, - TraceResult* ptr) +void UTIL_TraceLine(const Vector&, const Vector&, IGNORE_MONSTERS, edict_t*, TraceResult* ptr) { *ptr = TraceResult {}; ptr->flFraction = 1.0; @@ -689,6 +681,7 @@ void HUD_InitClientWeapons(void) HUD_PrepEntity(predictionWeapon, &player); }); +#ifdef HL_CONTENT // Allocate slot(s) for each weapon that we are going to be predicting HUD_PrepEntity(&g_Glock, &player); HUD_PrepEntity(&g_Crowbar, &player); @@ -704,6 +697,7 @@ void HUD_InitClientWeapons(void) HUD_PrepEntity(&g_Satchel, &player); HUD_PrepEntity(&g_Tripmine, &player); HUD_PrepEntity(&g_Snark, &player); +#endif // HL_CONTENT } /* @@ -790,6 +784,7 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd pWeapon = g_pWpns[static_cast(atts->Core.Id)]; } +#ifdef HL_CONTENT if ( !pWeapon ) { // NFTODO: Once all weapons use attributes, this can go. @@ -839,6 +834,7 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd break; } } +#endif // HL_CONTENT // Store pointer to our destination entity_state_t so we can get our origin, etc. from it // for setting up events on the client @@ -935,11 +931,13 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd player.m_pActiveItem = g_pWpns[from->client.m_iId]; } +#ifdef HL_CONTENT if ( player.m_pActiveItem->m_iId == WEAPON_RPG ) { ((CRpg*)player.m_pActiveItem)->m_fSpotActive = (int)from->client.vuser2[1]; ((CRpg*)player.m_pActiveItem)->m_cActiveRockets = (int)from->client.vuser2[2]; } +#endif // HL_CONTENT // Don't go firing anything if we have died. // Or if we don't have a weapon model deployed @@ -1021,6 +1019,7 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd to->client.fuser3 = player.m_flAmmoStartCharge; to->client.maxspeed = player.pev->maxspeed; +#ifdef HL_CONTENT if ( player.m_pActiveItem->m_iId == WEAPON_RPG ) { from->client.vuser2[1] = static_cast(((CRpg*)player.m_pActiveItem)->m_fSpotActive); @@ -1045,6 +1044,7 @@ void HUD_WeaponsPostThink(local_state_s* from, local_state_s* to, usercmd_t* cmd // Force a fixed anim down to viewmodel HUD_SendWeaponAnim(to->client.weaponanim, body, 1); } +#endif // HL_CONTENT for ( i = 0; i < MAX_LOCAL_WEAPONS; i++ ) { diff --git a/game/game_libs/common/skill.h b/game/game_libs/common/skill.h index a4ca517c1..f50e475cf 100644 --- a/game/game_libs/common/skill.h +++ b/game/game_libs/common/skill.h @@ -23,99 +23,10 @@ struct skilldata_t { int iSkillLevel; // game skill level - // Monster Health & Damage - float agruntHealth; - float agruntDmgPunch; - - float apacheHealth; - - float barneyHealth; - - float bigmommaHealthFactor; // Multiply each node's health by this - float bigmommaDmgSlash; // melee attack damage - float bigmommaDmgBlast; // mortar attack damage - float bigmommaRadiusBlast; // mortar attack radius - - float bullsquidHealth; - float bullsquidDmgBite; - float bullsquidDmgWhip; - float bullsquidDmgSpit; - - float gargantuaHealth; - float gargantuaDmgSlash; - float gargantuaDmgFire; - float gargantuaDmgStomp; - - float hassassinHealth; - - float headcrabHealth; - float headcrabDmgBite; - - float hgruntHealth; - float hgruntDmgKick; - float hgruntShotgunPellets; - float hgruntGrenadeSpeed; - - float houndeyeHealth; - float houndeyeDmgBlast; - - float slaveHealth; - float slaveDmgClaw; - float slaveDmgClawrake; - float slaveDmgZap; - - float ichthyosaurHealth; - float ichthyosaurDmgShake; - - float leechHealth; - float leechDmgBite; - - float controllerHealth; - float controllerDmgZap; - float controllerSpeedBall; - float controllerDmgBall; - - float nihilanthHealth; - float nihilanthZap; - - float scientistHealth; - - float snarkHealth; - float snarkDmgBite; - float snarkDmgPop; - - float zombieHealth; - float zombieDmgOneSlash; - float zombieDmgBothSlash; - float turretHealth; float miniturretHealth; float sentryHealth; - // Player Weapons - float plrDmgCrowbar; - float plrDmg9MM; - float plrDmg357; - float plrDmgMP5; - float plrDmgM203Grenade; - float plrDmgBuckshot; - float plrDmgCrossbowClient; - float plrDmgCrossbowMonster; - float plrDmgRPG; - float plrDmgGauss; - float plrDmgEgonNarrow; - float plrDmgEgonWide; - float plrDmgHornet; - float plrDmgHandGrenade; - float plrDmgSatchel; - float plrDmgTripmine; - - // weapons shared by monsters - float monDmg9MM; - float monDmgMP5; - float monDmg12MM; - float monDmgHornet; - // health/suit charge float suitchargerCapacity; float batteryCapacity; diff --git a/game/game_libs/dlls/CMakeLists.txt b/game/game_libs/dlls/CMakeLists.txt index 1009cbed4..eaafff4cf 100644 --- a/game/game_libs/dlls/CMakeLists.txt +++ b/game/game_libs/dlls/CMakeLists.txt @@ -86,10 +86,6 @@ set(SOURCES_GAME_SHARED ../game_shared/weapons/ammodefs.cpp ../game_shared/weapons/basegrenadelauncher.h ../game_shared/weapons/basegrenadelauncher.cpp - ../game_shared/weapons/crossbow.cpp - ../game_shared/weapons/crowbar.cpp - ../game_shared/weapons/egon.cpp - ../game_shared/weapons/gauss.cpp ../game_shared/weapons/generichitscanweapon.h ../game_shared/weapons/generichitscanweapon.cpp ../game_shared/weapons/genericmeleeweapon.h @@ -98,16 +94,6 @@ set(SOURCES_GAME_SHARED ../game_shared/weapons/genericprojectileweapon.cpp ../game_shared/weapons/genericweapon.h ../game_shared/weapons/genericweapon.cpp - ../game_shared/weapons/glock.cpp - ../game_shared/weapons/handgrenade.cpp - ../game_shared/weapons/hornetgun.cpp - ../game_shared/weapons/mp5.cpp - ../game_shared/weapons/python.cpp - ../game_shared/weapons/rpg.cpp - ../game_shared/weapons/satchel.cpp - ../game_shared/weapons/shotgun.cpp - ../game_shared/weapons/squeakgrenade.cpp - ../game_shared/weapons/tripmine.cpp ../game_shared/weapons/weapon_fists_atts.h ../game_shared/weapons/weapon_fists.h ../game_shared/weapons/weapon_fists.cpp @@ -287,24 +273,16 @@ set(SOURCES_SERVER weapondebugevents/weapondebugeventsource.h weapondebugevents/weapondebugeventsource.cpp activitymap.h - aflock.cpp - agrunt.cpp airtank.cpp animating.cpp animation.h animation.cpp - apache.cpp - barnacle.cpp - barney.cpp - bigmomma.cpp bloater.cpp bmodels.cpp - bullsquid.cpp buttons.cpp cbase.cpp client.h combat.cpp - controller.cpp decals.h defaultai.h defaultai.cpp @@ -319,40 +297,27 @@ set(SOURCES_SERVER func_break.cpp func_tank.cpp game.cpp - gargantua.cpp genericmonster.cpp ggrenade.cpp globals.cpp - gman.cpp h_ai.cpp h_battery.cpp h_cine.cpp h_cycler.cpp h_export.cpp - hassassin.cpp - headcrab.cpp healthkit.cpp - hgrunt.cpp - hornet.cpp - houndeye.cpp - ichthyosaur.cpp - islave.cpp items.h items.cpp - leech.cpp lights.cpp maprules.h maprules.cpp monstermaker.cpp monsters.cpp monsterstate.cpp - mortar.cpp multiplay_gamerules.cpp - nihilanth.cpp nodes_compat.h nodes.cpp observer.cpp - osprey.cpp pathcorner.cpp plane.h plane.cpp @@ -364,7 +329,6 @@ set(SOURCES_SERVER rat.cpp roach.cpp schedule.cpp - scientist.cpp scripted.h scripted.cpp singleplay_gamerules.cpp @@ -382,14 +346,11 @@ set(SOURCES_SERVER teamplay_gamerules.h teamplay_gamerules.cpp tempmonster.cpp - tentacle.cpp trains.h triggers.cpp turret.cpp weapons.cpp world.cpp - xen.cpp - zombie.cpp ) if(TARGET_IS_64BIT) diff --git a/game/game_libs/dlls/client/client.cpp b/game/game_libs/dlls/client/client.cpp index 9ee19e1f6..56c2e8e08 100644 --- a/game/game_libs/dlls/client/client.cpp +++ b/game/game_libs/dlls/client/client.cpp @@ -52,7 +52,6 @@ extern DLL_GLOBAL BOOL g_fGameOver; extern DLL_GLOBAL int g_iSkillLevel; extern DLL_GLOBAL ULONG g_ulFrameCount; -extern int giPrecacheGrunt; extern int gmsgSayText; extern int gmsgBhopcap; @@ -1006,18 +1005,6 @@ void ClientPrecache(void) // setup precaches always needed PRECACHE_SOUND("player/sprayer.wav"); // spray paint sound for PreAlpha - PRECACHE_SOUND("debris/wood1.wav"); // hit wood texture - PRECACHE_SOUND("debris/wood2.wav"); - PRECACHE_SOUND("debris/wood3.wav"); - - PRECACHE_SOUND("plats/train_use1.wav"); // use a train - - PRECACHE_SOUND("buttons/spark5.wav"); // hit computer texture - PRECACHE_SOUND("buttons/spark6.wav"); - PRECACHE_SOUND("debris/glass1.wav"); - PRECACHE_SOUND("debris/glass2.wav"); - PRECACHE_SOUND("debris/glass3.wav"); - PRECACHE_SOUND(SOUND_FLASHLIGHT_ON); PRECACHE_SOUND(SOUND_FLASHLIGHT_OFF); @@ -1040,11 +1027,6 @@ void ClientPrecache(void) PRECACHE_SOUND("player/geiger3.wav"); PRECACHE_SOUND("player/geiger2.wav"); PRECACHE_SOUND("player/geiger1.wav"); - - if ( giPrecacheGrunt ) - { - UTIL_PrecacheOther("monster_human_grunt"); - } } /* @@ -1914,11 +1896,13 @@ void UpdateClientData(const struct edict_s* ent, int sendweapons, struct clientd cd->vuser4[1] = static_cast(pl->m_rgAmmo[gun->m_iPrimaryAmmoType]); cd->vuser4[2] = static_cast(pl->m_rgAmmo[gun->m_iSecondaryAmmoType]); +#ifdef HL_CONTENT if ( pl->m_pActiveItem->m_iId == WEAPON_RPG ) { cd->vuser2[1] = static_cast(((CRpg*)pl->m_pActiveItem)->m_fSpotActive); cd->vuser2[2] = static_cast(((CRpg*)pl->m_pActiveItem)->m_cActiveRockets); } +#endif // HL_CONTENT } } } diff --git a/game/game_libs/dlls/combat.cpp b/game/game_libs/dlls/combat.cpp index ef26ce4bd..a1c51da66 100644 --- a/game/game_libs/dlls/combat.cpp +++ b/game/game_libs/dlls/combat.cpp @@ -1432,11 +1432,14 @@ void CBaseEntity::FireBullets( entvars_t* pevAttacker) { static int tracerCount; - int tracer; TraceResult tr; Vector vecRight = gpGlobals->v_right; Vector vecUp = gpGlobals->v_up; +#ifdef HL_CONTENT + int tracer; +#endif // HL_CONTENT + if ( pevAttacker == NULL ) pevAttacker = pev; // the default attacker is ourselves @@ -1461,7 +1464,10 @@ void CBaseEntity::FireBullets( vecEnd = vecSrc + vecDir * flDistance; UTIL_TraceLine(vecSrc, vecEnd, dont_ignore_monsters, ENT(pev) /*pentIgnore*/, &tr); +#ifdef HL_CONTENT tracer = 0; +#endif // HL_CONTENT + if ( iTracerFreq != 0 && (tracerCount++ % iTracerFreq) == 0 ) { Vector vecTracerSrc; @@ -1477,8 +1483,12 @@ void CBaseEntity::FireBullets( vecTracerSrc = vecSrc; } +#ifdef HL_CONTENT if ( iTracerFreq != 1 ) // guns that always trace also always decal + { tracer = 1; + } + switch ( iBulletType ) { case BULLET_MONSTER_MP5: @@ -1496,6 +1506,7 @@ void CBaseEntity::FireBullets( MESSAGE_END(); break; } +#endif // HL_CONTENT } // do damage, paint decals if ( tr.flFraction != 1.0 ) @@ -1514,6 +1525,7 @@ void CBaseEntity::FireBullets( TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType); DecalGunshot(&tr, iBulletType); } +#ifdef HL_CONTENT else switch ( iBulletType ) { @@ -1549,6 +1561,7 @@ void CBaseEntity::FireBullets( break; } +#endif // HL_CONTENT } // make bullet trails UTIL_BubbleTrail(vecSrc, tr.vecEndPos, (int)((flDistance * tr.flFraction) / 64.0)); @@ -1621,6 +1634,7 @@ Vector CBaseEntity::FireBulletsPlayer( TEXTURETYPE_PlaySound(&tr, vecSrc, vecEnd, iBulletType); DecalGunshot(&tr, iBulletType); } +#ifdef HL_CONTENT else switch ( iBulletType ) { @@ -1649,6 +1663,7 @@ Vector CBaseEntity::FireBulletsPlayer( break; } +#endif // HL_CONTENT } // make bullet trails UTIL_BubbleTrail(vecSrc, tr.vecEndPos, (int)((flDistance * tr.flFraction) / 64.0)); @@ -1716,7 +1731,12 @@ void CBaseEntity::TraceBleed(float flDamage, Vector vecDir, const TraceResult* p vecTraceDir.y += RANDOM_FLOAT(-flNoise, flNoise); vecTraceDir.z += RANDOM_FLOAT(-flNoise, flNoise); - UTIL_TraceLine(ptr->vecEndPos, Vector(ptr->vecEndPos) + vecTraceDir * -172, ignore_monsters, ENT(pev), &Bloodtr); + UTIL_TraceLine( + ptr->vecEndPos, + Vector(ptr->vecEndPos) + vecTraceDir * -172, + ignore_monsters, + ENT(pev), + &Bloodtr); if ( Bloodtr.flFraction != 1.0 ) { diff --git a/game/game_libs/dlls/doors.cpp b/game/game_libs/dlls/doors.cpp index 9819b8ab4..950a2883b 100644 --- a/game/game_libs/dlls/doors.cpp +++ b/game/game_libs/dlls/doors.cpp @@ -763,12 +763,14 @@ void CBaseDoor::Blocked(CBaseEntity* pOther) if ( pev->dmg ) pOther->TakeDamage(pev, pev, pev->dmg, DMG_CRUSH); +#ifdef HL_CONTENT if ( satchelfix.value ) { // Detonate satchels if ( !strcmp("monster_satchel", STRING(pOther->pev->classname)) ) ((CSatchel*)pOther)->Use(this, this, USE_ON, 0); } +#endif // HL_CONTENT // if a door has a negative wait, it would never come back if blocked, // so let it just squash the object to death real fast diff --git a/game/game_libs/dlls/func_break.cpp b/game/game_libs/dlls/func_break.cpp index 2b318103b..4d4849bc9 100644 --- a/game/game_libs/dlls/func_break.cpp +++ b/game/game_libs/dlls/func_break.cpp @@ -41,25 +41,6 @@ const char* CBreakable::pSpawnObjects[] = { NULL, // 0 "item_battery", // 1 "item_healthkit", // 2 - "weapon_9mmhandgun", // 3 - "ammo_9mmclip", // 4 - "weapon_9mmAR", // 5 - "ammo_9mmAR", // 6 - "ammo_ARgrenades", // 7 - "weapon_shotgun", // 8 - "ammo_buckshot", // 9 - "weapon_crossbow", // 10 - "ammo_crossbow", // 11 - "weapon_357", // 12 - "ammo_357", // 13 - "weapon_rpg", // 14 - "ammo_rpgclip", // 15 - "ammo_gaussclip", // 16 - "weapon_handgrenade", // 17 - "weapon_tripmine", // 18 - "weapon_satchel", // 19 - "weapon_snark", // 20 - "weapon_hornetgun", // 21 }; void CBreakable::KeyValue(KeyValueData* pkvd) diff --git a/game/game_libs/dlls/game.cpp b/game/game_libs/dlls/game.cpp index 896406e33..357476237 100644 --- a/game/game_libs/dlls/game.cpp +++ b/game/game_libs/dlls/game.cpp @@ -78,207 +78,6 @@ cvar_t* g_psv_aim = NULL; cvar_t* g_footsteps = NULL; // CVARS FOR SKILL LEVEL SETTINGS -// Agrunt -cvar_t sk_agrunt_health1 = CREATE_CVAR("sk_agrunt_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_agrunt_health2 = CREATE_CVAR("sk_agrunt_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_agrunt_health3 = CREATE_CVAR("sk_agrunt_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_agrunt_dmg_punch1 = CREATE_CVAR("sk_agrunt_dmg_punch1", "0", 0, 0.0f, nullptr); -cvar_t sk_agrunt_dmg_punch2 = CREATE_CVAR("sk_agrunt_dmg_punch2", "0", 0, 0.0f, nullptr); -cvar_t sk_agrunt_dmg_punch3 = CREATE_CVAR("sk_agrunt_dmg_punch3", "0", 0, 0.0f, nullptr); - -// Apache -cvar_t sk_apache_health1 = CREATE_CVAR("sk_apache_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_apache_health2 = CREATE_CVAR("sk_apache_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_apache_health3 = CREATE_CVAR("sk_apache_health3", "0", 0, 0.0f, nullptr); - -// Barney -cvar_t sk_barney_health1 = CREATE_CVAR("sk_barney_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_barney_health2 = CREATE_CVAR("sk_barney_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_barney_health3 = CREATE_CVAR("sk_barney_health3", "0", 0, 0.0f, nullptr); - -// Bullsquid -cvar_t sk_bullsquid_health1 = CREATE_CVAR("sk_bullsquid_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_health2 = CREATE_CVAR("sk_bullsquid_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_health3 = CREATE_CVAR("sk_bullsquid_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_bullsquid_dmg_bite1 = CREATE_CVAR("sk_bullsquid_dmg_bite1", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_bite2 = CREATE_CVAR("sk_bullsquid_dmg_bite2", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_bite3 = CREATE_CVAR("sk_bullsquid_dmg_bite3", "0", 0, 0.0f, nullptr); - -cvar_t sk_bullsquid_dmg_whip1 = CREATE_CVAR("sk_bullsquid_dmg_whip1", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_whip2 = CREATE_CVAR("sk_bullsquid_dmg_whip2", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_whip3 = CREATE_CVAR("sk_bullsquid_dmg_whip3", "0", 0, 0.0f, nullptr); - -cvar_t sk_bullsquid_dmg_spit1 = CREATE_CVAR("sk_bullsquid_dmg_spit1", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_spit2 = CREATE_CVAR("sk_bullsquid_dmg_spit2", "0", 0, 0.0f, nullptr); -cvar_t sk_bullsquid_dmg_spit3 = CREATE_CVAR("sk_bullsquid_dmg_spit3", "0", 0, 0.0f, nullptr); - -// Big Momma -cvar_t sk_bigmomma_health_factor1 = CREATE_CVAR("sk_bigmomma_health_factor1", "1.0", 0, 1.0f, nullptr); -cvar_t sk_bigmomma_health_factor2 = CREATE_CVAR("sk_bigmomma_health_factor2", "1.0", 0, 1.0f, nullptr); -cvar_t sk_bigmomma_health_factor3 = CREATE_CVAR("sk_bigmomma_health_factor3", "1.0", 0, 1.0f, nullptr); - -cvar_t sk_bigmomma_dmg_slash1 = CREATE_CVAR("sk_bigmomma_dmg_slash1", "50", 0, 50.0f, nullptr); -cvar_t sk_bigmomma_dmg_slash2 = CREATE_CVAR("sk_bigmomma_dmg_slash2", "50", 0, 50.0f, nullptr); -cvar_t sk_bigmomma_dmg_slash3 = CREATE_CVAR("sk_bigmomma_dmg_slash3", "50", 0, 50.0f, nullptr); - -cvar_t sk_bigmomma_dmg_blast1 = CREATE_CVAR("sk_bigmomma_dmg_blast1", "100", 0, 100.0f, nullptr); -cvar_t sk_bigmomma_dmg_blast2 = CREATE_CVAR("sk_bigmomma_dmg_blast2", "100", 0, 100.0f, nullptr); -cvar_t sk_bigmomma_dmg_blast3 = CREATE_CVAR("sk_bigmomma_dmg_blast3", "100", 0, 100.0f, nullptr); - -cvar_t sk_bigmomma_radius_blast1 = CREATE_CVAR("sk_bigmomma_radius_blast1", "250", 0, 250.0f, nullptr); -cvar_t sk_bigmomma_radius_blast2 = CREATE_CVAR("sk_bigmomma_radius_blast2", "250", 0, 250.0f, nullptr); -cvar_t sk_bigmomma_radius_blast3 = CREATE_CVAR("sk_bigmomma_radius_blast3", "250", 0, 250.0f, nullptr); - -// Gargantua -cvar_t sk_gargantua_health1 = CREATE_CVAR("sk_gargantua_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_health2 = CREATE_CVAR("sk_gargantua_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_health3 = CREATE_CVAR("sk_gargantua_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_gargantua_dmg_slash1 = CREATE_CVAR("sk_gargantua_dmg_slash1", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_slash2 = CREATE_CVAR("sk_gargantua_dmg_slash2", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_slash3 = CREATE_CVAR("sk_gargantua_dmg_slash3", "0", 0, 0.0f, nullptr); - -cvar_t sk_gargantua_dmg_fire1 = CREATE_CVAR("sk_gargantua_dmg_fire1", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_fire2 = CREATE_CVAR("sk_gargantua_dmg_fire2", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_fire3 = CREATE_CVAR("sk_gargantua_dmg_fire3", "0", 0, 0.0f, nullptr); - -cvar_t sk_gargantua_dmg_stomp1 = CREATE_CVAR("sk_gargantua_dmg_stomp1", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_stomp2 = CREATE_CVAR("sk_gargantua_dmg_stomp2", "0", 0, 0.0f, nullptr); -cvar_t sk_gargantua_dmg_stomp3 = CREATE_CVAR("sk_gargantua_dmg_stomp3", "0", 0, 0.0f, nullptr); - -// Hassassin -cvar_t sk_hassassin_health1 = CREATE_CVAR("sk_hassassin_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_hassassin_health2 = CREATE_CVAR("sk_hassassin_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_hassassin_health3 = CREATE_CVAR("sk_hassassin_health3", "0", 0, 0.0f, nullptr); - -// Headcrab -cvar_t sk_headcrab_health1 = CREATE_CVAR("sk_headcrab_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_headcrab_health2 = CREATE_CVAR("sk_headcrab_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_headcrab_health3 = CREATE_CVAR("sk_headcrab_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_headcrab_dmg_bite1 = CREATE_CVAR("sk_headcrab_dmg_bite1", "0", 0, 0.0f, nullptr); -cvar_t sk_headcrab_dmg_bite2 = CREATE_CVAR("sk_headcrab_dmg_bite2", "0", 0, 0.0f, nullptr); -cvar_t sk_headcrab_dmg_bite3 = CREATE_CVAR("sk_headcrab_dmg_bite3", "0", 0, 0.0f, nullptr); - -// Hgrunt -cvar_t sk_hgrunt_health1 = CREATE_CVAR("sk_hgrunt_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_health2 = CREATE_CVAR("sk_hgrunt_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_health3 = CREATE_CVAR("sk_hgrunt_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_hgrunt_kick1 = CREATE_CVAR("sk_hgrunt_kick1", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_kick2 = CREATE_CVAR("sk_hgrunt_kick2", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_kick3 = CREATE_CVAR("sk_hgrunt_kick3", "0", 0, 0.0f, nullptr); - -cvar_t sk_hgrunt_pellets1 = CREATE_CVAR("sk_hgrunt_pellets1", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_pellets2 = CREATE_CVAR("sk_hgrunt_pellets2", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_pellets3 = CREATE_CVAR("sk_hgrunt_pellets3", "0", 0, 0.0f, nullptr); - -cvar_t sk_hgrunt_gspeed1 = CREATE_CVAR("sk_hgrunt_gspeed1", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_gspeed2 = CREATE_CVAR("sk_hgrunt_gspeed2", "0", 0, 0.0f, nullptr); -cvar_t sk_hgrunt_gspeed3 = CREATE_CVAR("sk_hgrunt_gspeed3", "0", 0, 0.0f, nullptr); - -// Houndeye -cvar_t sk_houndeye_health1 = CREATE_CVAR("sk_houndeye_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_houndeye_health2 = CREATE_CVAR("sk_houndeye_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_houndeye_health3 = CREATE_CVAR("sk_houndeye_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_houndeye_dmg_blast1 = CREATE_CVAR("sk_houndeye_dmg_blast1", "0", 0, 0.0f, nullptr); -cvar_t sk_houndeye_dmg_blast2 = CREATE_CVAR("sk_houndeye_dmg_blast2", "0", 0, 0.0f, nullptr); -cvar_t sk_houndeye_dmg_blast3 = CREATE_CVAR("sk_houndeye_dmg_blast3", "0", 0, 0.0f, nullptr); - -// ISlave -cvar_t sk_islave_health1 = CREATE_CVAR("sk_islave_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_health2 = CREATE_CVAR("sk_islave_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_health3 = CREATE_CVAR("sk_islave_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_islave_dmg_claw1 = CREATE_CVAR("sk_islave_dmg_claw1", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_claw2 = CREATE_CVAR("sk_islave_dmg_claw2", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_claw3 = CREATE_CVAR("sk_islave_dmg_claw3", "0", 0, 0.0f, nullptr); - -cvar_t sk_islave_dmg_clawrake1 = CREATE_CVAR("sk_islave_dmg_clawrake1", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_clawrake2 = CREATE_CVAR("sk_islave_dmg_clawrake2", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_clawrake3 = CREATE_CVAR("sk_islave_dmg_clawrake3", "0", 0, 0.0f, nullptr); - -cvar_t sk_islave_dmg_zap1 = CREATE_CVAR("sk_islave_dmg_zap1", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_zap2 = CREATE_CVAR("sk_islave_dmg_zap2", "0", 0, 0.0f, nullptr); -cvar_t sk_islave_dmg_zap3 = CREATE_CVAR("sk_islave_dmg_zap3", "0", 0, 0.0f, nullptr); - -// Icthyosaur -cvar_t sk_ichthyosaur_health1 = CREATE_CVAR("sk_ichthyosaur_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_ichthyosaur_health2 = CREATE_CVAR("sk_ichthyosaur_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_ichthyosaur_health3 = CREATE_CVAR("sk_ichthyosaur_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_ichthyosaur_shake1 = CREATE_CVAR("sk_ichthyosaur_shake1", "0", 0, 0.0f, nullptr); -cvar_t sk_ichthyosaur_shake2 = CREATE_CVAR("sk_ichthyosaur_shake2", "0", 0, 0.0f, nullptr); -cvar_t sk_ichthyosaur_shake3 = CREATE_CVAR("sk_ichthyosaur_shake3", "0", 0, 0.0f, nullptr); - -// Leech -cvar_t sk_leech_health1 = CREATE_CVAR("sk_leech_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_leech_health2 = CREATE_CVAR("sk_leech_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_leech_health3 = CREATE_CVAR("sk_leech_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_leech_dmg_bite1 = CREATE_CVAR("sk_leech_dmg_bite1", "0", 0, 0.0f, nullptr); -cvar_t sk_leech_dmg_bite2 = CREATE_CVAR("sk_leech_dmg_bite2", "0", 0, 0.0f, nullptr); -cvar_t sk_leech_dmg_bite3 = CREATE_CVAR("sk_leech_dmg_bite3", "0", 0, 0.0f, nullptr); - -// Controller -cvar_t sk_controller_health1 = CREATE_CVAR("sk_controller_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_health2 = CREATE_CVAR("sk_controller_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_health3 = CREATE_CVAR("sk_controller_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_controller_dmgzap1 = CREATE_CVAR("sk_controller_dmgzap1", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_dmgzap2 = CREATE_CVAR("sk_controller_dmgzap2", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_dmgzap3 = CREATE_CVAR("sk_controller_dmgzap3", "0", 0, 0.0f, nullptr); - -cvar_t sk_controller_speedball1 = CREATE_CVAR("sk_controller_speedball1", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_speedball2 = CREATE_CVAR("sk_controller_speedball2", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_speedball3 = CREATE_CVAR("sk_controller_speedball3", "0", 0, 0.0f, nullptr); - -cvar_t sk_controller_dmgball1 = CREATE_CVAR("sk_controller_dmgball1", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_dmgball2 = CREATE_CVAR("sk_controller_dmgball2", "0", 0, 0.0f, nullptr); -cvar_t sk_controller_dmgball3 = CREATE_CVAR("sk_controller_dmgball3", "0", 0, 0.0f, nullptr); - -// Nihilanth -cvar_t sk_nihilanth_health1 = CREATE_CVAR("sk_nihilanth_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_nihilanth_health2 = CREATE_CVAR("sk_nihilanth_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_nihilanth_health3 = CREATE_CVAR("sk_nihilanth_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_nihilanth_zap1 = CREATE_CVAR("sk_nihilanth_zap1", "0", 0, 0.0f, nullptr); -cvar_t sk_nihilanth_zap2 = CREATE_CVAR("sk_nihilanth_zap2", "0", 0, 0.0f, nullptr); -cvar_t sk_nihilanth_zap3 = CREATE_CVAR("sk_nihilanth_zap3", "0", 0, 0.0f, nullptr); - -// Scientist -cvar_t sk_scientist_health1 = CREATE_CVAR("sk_scientist_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_scientist_health2 = CREATE_CVAR("sk_scientist_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_scientist_health3 = CREATE_CVAR("sk_scientist_health3", "0", 0, 0.0f, nullptr); - -// Snark -cvar_t sk_snark_health1 = CREATE_CVAR("sk_snark_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_health2 = CREATE_CVAR("sk_snark_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_health3 = CREATE_CVAR("sk_snark_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_snark_dmg_bite1 = CREATE_CVAR("sk_snark_dmg_bite1", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_dmg_bite2 = CREATE_CVAR("sk_snark_dmg_bite2", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_dmg_bite3 = CREATE_CVAR("sk_snark_dmg_bite3", "0", 0, 0.0f, nullptr); - -cvar_t sk_snark_dmg_pop1 = CREATE_CVAR("sk_snark_dmg_pop1", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_dmg_pop2 = CREATE_CVAR("sk_snark_dmg_pop2", "0", 0, 0.0f, nullptr); -cvar_t sk_snark_dmg_pop3 = CREATE_CVAR("sk_snark_dmg_pop3", "0", 0, 0.0f, nullptr); - -// Zombie -cvar_t sk_zombie_health1 = CREATE_CVAR("sk_zombie_health1", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_health2 = CREATE_CVAR("sk_zombie_health2", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_health3 = CREATE_CVAR("sk_zombie_health3", "0", 0, 0.0f, nullptr); - -cvar_t sk_zombie_dmg_one_slash1 = CREATE_CVAR("sk_zombie_dmg_one_slash1", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_dmg_one_slash2 = CREATE_CVAR("sk_zombie_dmg_one_slash2", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_dmg_one_slash3 = CREATE_CVAR("sk_zombie_dmg_one_slash3", "0", 0, 0.0f, nullptr); - -cvar_t sk_zombie_dmg_both_slash1 = CREATE_CVAR("sk_zombie_dmg_both_slash1", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_dmg_both_slash2 = CREATE_CVAR("sk_zombie_dmg_both_slash2", "0", 0, 0.0f, nullptr); -cvar_t sk_zombie_dmg_both_slash3 = CREATE_CVAR("sk_zombie_dmg_both_slash3", "0", 0, 0.0f, nullptr); // Turret cvar_t sk_turret_health1 = CREATE_CVAR("sk_turret_health1", "0", 0, 0.0f, nullptr); @@ -295,99 +94,6 @@ cvar_t sk_sentry_health1 = CREATE_CVAR("sk_sentry_health1", "0", 0, 0.0f, nullpt cvar_t sk_sentry_health2 = CREATE_CVAR("sk_sentry_health2", "0", 0, 0.0f, nullptr); cvar_t sk_sentry_health3 = CREATE_CVAR("sk_sentry_health3", "0", 0, 0.0f, nullptr); -// PLAYER WEAPONS - -// Crowbar whack -cvar_t sk_plr_crowbar1 = CREATE_CVAR("sk_plr_crowbar1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_crowbar2 = CREATE_CVAR("sk_plr_crowbar2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_crowbar3 = CREATE_CVAR("sk_plr_crowbar3", "0", 0, 0.0f, nullptr); - -// Glock Round -cvar_t sk_plr_9mm_bullet1 = CREATE_CVAR("sk_plr_9mm_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mm_bullet2 = CREATE_CVAR("sk_plr_9mm_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mm_bullet3 = CREATE_CVAR("sk_plr_9mm_bullet3", "0", 0, 0.0f, nullptr); - -// 357 Round -cvar_t sk_plr_357_bullet1 = CREATE_CVAR("sk_plr_357_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_357_bullet2 = CREATE_CVAR("sk_plr_357_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_357_bullet3 = CREATE_CVAR("sk_plr_357_bullet3", "0", 0, 0.0f, nullptr); - -// MP5 Round -cvar_t sk_plr_9mmAR_bullet1 = CREATE_CVAR("sk_plr_9mmAR_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mmAR_bullet2 = CREATE_CVAR("sk_plr_9mmAR_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mmAR_bullet3 = CREATE_CVAR("sk_plr_9mmAR_bullet3", "0", 0, 0.0f, nullptr); - -// M203 grenade -cvar_t sk_plr_9mmAR_grenade1 = CREATE_CVAR("sk_plr_9mmAR_grenade1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mmAR_grenade2 = CREATE_CVAR("sk_plr_9mmAR_grenade2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_9mmAR_grenade3 = CREATE_CVAR("sk_plr_9mmAR_grenade3", "0", 0, 0.0f, nullptr); - -// Shotgun buckshot -cvar_t sk_plr_buckshot1 = CREATE_CVAR("sk_plr_buckshot1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_buckshot2 = CREATE_CVAR("sk_plr_buckshot2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_buckshot3 = CREATE_CVAR("sk_plr_buckshot3", "0", 0, 0.0f, nullptr); - -// Crossbow -cvar_t sk_plr_xbow_bolt_client1 = CREATE_CVAR("sk_plr_xbow_bolt_client1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_xbow_bolt_client2 = CREATE_CVAR("sk_plr_xbow_bolt_client2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_xbow_bolt_client3 = CREATE_CVAR("sk_plr_xbow_bolt_client3", "0", 0, 0.0f, nullptr); - -cvar_t sk_plr_xbow_bolt_monster1 = CREATE_CVAR("sk_plr_xbow_bolt_monster1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_xbow_bolt_monster2 = CREATE_CVAR("sk_plr_xbow_bolt_monster2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_xbow_bolt_monster3 = CREATE_CVAR("sk_plr_xbow_bolt_monster3", "0", 0, 0.0f, nullptr); - -// RPG -cvar_t sk_plr_rpg1 = CREATE_CVAR("sk_plr_rpg1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_rpg2 = CREATE_CVAR("sk_plr_rpg2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_rpg3 = CREATE_CVAR("sk_plr_rpg3", "0", 0, 0.0f, nullptr); - -// Zero Point Generator -cvar_t sk_plr_gauss1 = CREATE_CVAR("sk_plr_gauss1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_gauss2 = CREATE_CVAR("sk_plr_gauss2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_gauss3 = CREATE_CVAR("sk_plr_gauss3", "0", 0, 0.0f, nullptr); - -// Tau Cannon -cvar_t sk_plr_egon_narrow1 = CREATE_CVAR("sk_plr_egon_narrow1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_egon_narrow2 = CREATE_CVAR("sk_plr_egon_narrow2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_egon_narrow3 = CREATE_CVAR("sk_plr_egon_narrow3", "0", 0, 0.0f, nullptr); - -cvar_t sk_plr_egon_wide1 = CREATE_CVAR("sk_plr_egon_wide1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_egon_wide2 = CREATE_CVAR("sk_plr_egon_wide2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_egon_wide3 = CREATE_CVAR("sk_plr_egon_wide3", "0", 0, 0.0f, nullptr); - -// Hand Grendade -cvar_t sk_plr_hand_grenade1 = CREATE_CVAR("sk_plr_hand_grenade1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_hand_grenade2 = CREATE_CVAR("sk_plr_hand_grenade2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_hand_grenade3 = CREATE_CVAR("sk_plr_hand_grenade3", "0", 0, 0.0f, nullptr); - -// Satchel Charge -cvar_t sk_plr_satchel1 = CREATE_CVAR("sk_plr_satchel1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_satchel2 = CREATE_CVAR("sk_plr_satchel2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_satchel3 = CREATE_CVAR("sk_plr_satchel3", "0", 0, 0.0f, nullptr); - -// Tripmine -cvar_t sk_plr_tripmine1 = CREATE_CVAR("sk_plr_tripmine1", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_tripmine2 = CREATE_CVAR("sk_plr_tripmine2", "0", 0, 0.0f, nullptr); -cvar_t sk_plr_tripmine3 = CREATE_CVAR("sk_plr_tripmine3", "0", 0, 0.0f, nullptr); - -// WORLD WEAPONS -cvar_t sk_12mm_bullet1 = CREATE_CVAR("sk_12mm_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_12mm_bullet2 = CREATE_CVAR("sk_12mm_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_12mm_bullet3 = CREATE_CVAR("sk_12mm_bullet3", "0", 0, 0.0f, nullptr); - -cvar_t sk_9mmAR_bullet1 = CREATE_CVAR("sk_9mmAR_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_9mmAR_bullet2 = CREATE_CVAR("sk_9mmAR_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_9mmAR_bullet3 = CREATE_CVAR("sk_9mmAR_bullet3", "0", 0, 0.0f, nullptr); - -cvar_t sk_9mm_bullet1 = CREATE_CVAR("sk_9mm_bullet1", "0", 0, 0.0f, nullptr); -cvar_t sk_9mm_bullet2 = CREATE_CVAR("sk_9mm_bullet2", "0", 0, 0.0f, nullptr); -cvar_t sk_9mm_bullet3 = CREATE_CVAR("sk_9mm_bullet3", "0", 0, 0.0f, nullptr); - -// HORNET -cvar_t sk_hornet_dmg1 = CREATE_CVAR("sk_hornet_dmg1", "0", 0, 0.0f, nullptr); -cvar_t sk_hornet_dmg2 = CREATE_CVAR("sk_hornet_dmg2", "0", 0, 0.0f, nullptr); -cvar_t sk_hornet_dmg3 = CREATE_CVAR("sk_hornet_dmg3", "0", 0, 0.0f, nullptr); - // HEALTH/CHARGE cvar_t sk_suitcharger1 = CREATE_CVAR("sk_suitcharger1", "0", 0, 0.0f, nullptr); cvar_t sk_suitcharger2 = CREATE_CVAR("sk_suitcharger2", "0", 0, 0.0f, nullptr); @@ -495,206 +201,6 @@ void GameDLLInit(void) CVAR_REGISTER(&mp_chattime); // REGISTER CVARS FOR SKILL LEVEL STUFF - // Agrunt - CVAR_REGISTER(&sk_agrunt_health1); // {"sk_agrunt_health1","0"); - CVAR_REGISTER(&sk_agrunt_health2); // {"sk_agrunt_health2","0"); - CVAR_REGISTER(&sk_agrunt_health3); // {"sk_agrunt_health3","0"); - - CVAR_REGISTER(&sk_agrunt_dmg_punch1); // {"sk_agrunt_dmg_punch1","0"); - CVAR_REGISTER(&sk_agrunt_dmg_punch2); // {"sk_agrunt_dmg_punch2","0"); - CVAR_REGISTER(&sk_agrunt_dmg_punch3); // {"sk_agrunt_dmg_punch3","0"); - - // Apache - CVAR_REGISTER(&sk_apache_health1); // {"sk_apache_health1","0"); - CVAR_REGISTER(&sk_apache_health2); // {"sk_apache_health2","0"); - CVAR_REGISTER(&sk_apache_health3); // {"sk_apache_health3","0"); - - // Barney - CVAR_REGISTER(&sk_barney_health1); // {"sk_barney_health1","0"); - CVAR_REGISTER(&sk_barney_health2); // {"sk_barney_health2","0"); - CVAR_REGISTER(&sk_barney_health3); // {"sk_barney_health3","0"); - - // Bullsquid - CVAR_REGISTER(&sk_bullsquid_health1); // {"sk_bullsquid_health1","0"); - CVAR_REGISTER(&sk_bullsquid_health2); // {"sk_bullsquid_health2","0"); - CVAR_REGISTER(&sk_bullsquid_health3); // {"sk_bullsquid_health3","0"); - - CVAR_REGISTER(&sk_bullsquid_dmg_bite1); // {"sk_bullsquid_dmg_bite1","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_bite2); // {"sk_bullsquid_dmg_bite2","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_bite3); // {"sk_bullsquid_dmg_bite3","0"); - - CVAR_REGISTER(&sk_bullsquid_dmg_whip1); // {"sk_bullsquid_dmg_whip1","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_whip2); // {"sk_bullsquid_dmg_whip2","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_whip3); // {"sk_bullsquid_dmg_whip3","0"); - - CVAR_REGISTER(&sk_bullsquid_dmg_spit1); // {"sk_bullsquid_dmg_spit1","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_spit2); // {"sk_bullsquid_dmg_spit2","0"); - CVAR_REGISTER(&sk_bullsquid_dmg_spit3); // {"sk_bullsquid_dmg_spit3","0"); - - CVAR_REGISTER(&sk_bigmomma_health_factor1); // {"sk_bigmomma_health_factor1","1.0"); - CVAR_REGISTER(&sk_bigmomma_health_factor2); // {"sk_bigmomma_health_factor2","1.0"); - CVAR_REGISTER(&sk_bigmomma_health_factor3); // {"sk_bigmomma_health_factor3","1.0"); - - CVAR_REGISTER(&sk_bigmomma_dmg_slash1); // {"sk_bigmomma_dmg_slash1","50"); - CVAR_REGISTER(&sk_bigmomma_dmg_slash2); // {"sk_bigmomma_dmg_slash2","50"); - CVAR_REGISTER(&sk_bigmomma_dmg_slash3); // {"sk_bigmomma_dmg_slash3","50"); - - CVAR_REGISTER(&sk_bigmomma_dmg_blast1); // {"sk_bigmomma_dmg_blast1","100"); - CVAR_REGISTER(&sk_bigmomma_dmg_blast2); // {"sk_bigmomma_dmg_blast2","100"); - CVAR_REGISTER(&sk_bigmomma_dmg_blast3); // {"sk_bigmomma_dmg_blast3","100"); - - CVAR_REGISTER(&sk_bigmomma_radius_blast1); // {"sk_bigmomma_radius_blast1","250"); - CVAR_REGISTER(&sk_bigmomma_radius_blast2); // {"sk_bigmomma_radius_blast2","250"); - CVAR_REGISTER(&sk_bigmomma_radius_blast3); // {"sk_bigmomma_radius_blast3","250"); - - // Gargantua - CVAR_REGISTER(&sk_gargantua_health1); // {"sk_gargantua_health1","0"); - CVAR_REGISTER(&sk_gargantua_health2); // {"sk_gargantua_health2","0"); - CVAR_REGISTER(&sk_gargantua_health3); // {"sk_gargantua_health3","0"); - - CVAR_REGISTER(&sk_gargantua_dmg_slash1); // {"sk_gargantua_dmg_slash1","0"); - CVAR_REGISTER(&sk_gargantua_dmg_slash2); // {"sk_gargantua_dmg_slash2","0"); - CVAR_REGISTER(&sk_gargantua_dmg_slash3); // {"sk_gargantua_dmg_slash3","0"); - - CVAR_REGISTER(&sk_gargantua_dmg_fire1); // {"sk_gargantua_dmg_fire1","0"); - CVAR_REGISTER(&sk_gargantua_dmg_fire2); // {"sk_gargantua_dmg_fire2","0"); - CVAR_REGISTER(&sk_gargantua_dmg_fire3); // {"sk_gargantua_dmg_fire3","0"); - - CVAR_REGISTER(&sk_gargantua_dmg_stomp1); // {"sk_gargantua_dmg_stomp1","0"); - CVAR_REGISTER(&sk_gargantua_dmg_stomp2); // {"sk_gargantua_dmg_stomp2","0"); - CVAR_REGISTER(&sk_gargantua_dmg_stomp3); // {"sk_gargantua_dmg_stomp3","0"); - - // Hassassin - CVAR_REGISTER(&sk_hassassin_health1); // {"sk_hassassin_health1","0"); - CVAR_REGISTER(&sk_hassassin_health2); // {"sk_hassassin_health2","0"); - CVAR_REGISTER(&sk_hassassin_health3); // {"sk_hassassin_health3","0"); - - // Headcrab - CVAR_REGISTER(&sk_headcrab_health1); // {"sk_headcrab_health1","0"); - CVAR_REGISTER(&sk_headcrab_health2); // {"sk_headcrab_health2","0"); - CVAR_REGISTER(&sk_headcrab_health3); // {"sk_headcrab_health3","0"); - - CVAR_REGISTER(&sk_headcrab_dmg_bite1); // {"sk_headcrab_dmg_bite1","0"); - CVAR_REGISTER(&sk_headcrab_dmg_bite2); // {"sk_headcrab_dmg_bite2","0"); - CVAR_REGISTER(&sk_headcrab_dmg_bite3); // {"sk_headcrab_dmg_bite3","0"); - - // Hgrunt - CVAR_REGISTER(&sk_hgrunt_health1); // {"sk_hgrunt_health1","0"); - CVAR_REGISTER(&sk_hgrunt_health2); // {"sk_hgrunt_health2","0"); - CVAR_REGISTER(&sk_hgrunt_health3); // {"sk_hgrunt_health3","0"); - - CVAR_REGISTER(&sk_hgrunt_kick1); // {"sk_hgrunt_kick1","0"); - CVAR_REGISTER(&sk_hgrunt_kick2); // {"sk_hgrunt_kick2","0"); - CVAR_REGISTER(&sk_hgrunt_kick3); // {"sk_hgrunt_kick3","0"); - - CVAR_REGISTER(&sk_hgrunt_pellets1); - CVAR_REGISTER(&sk_hgrunt_pellets2); - CVAR_REGISTER(&sk_hgrunt_pellets3); - - CVAR_REGISTER(&sk_hgrunt_gspeed1); - CVAR_REGISTER(&sk_hgrunt_gspeed2); - CVAR_REGISTER(&sk_hgrunt_gspeed3); - - // Houndeye - CVAR_REGISTER(&sk_houndeye_health1); // {"sk_houndeye_health1","0"); - CVAR_REGISTER(&sk_houndeye_health2); // {"sk_houndeye_health2","0"); - CVAR_REGISTER(&sk_houndeye_health3); // {"sk_houndeye_health3","0"); - - CVAR_REGISTER(&sk_houndeye_dmg_blast1); // {"sk_houndeye_dmg_blast1","0"); - CVAR_REGISTER(&sk_houndeye_dmg_blast2); // {"sk_houndeye_dmg_blast2","0"); - CVAR_REGISTER(&sk_houndeye_dmg_blast3); // {"sk_houndeye_dmg_blast3","0"); - - // ISlave - CVAR_REGISTER(&sk_islave_health1); // {"sk_islave_health1","0"); - CVAR_REGISTER(&sk_islave_health2); // {"sk_islave_health2","0"); - CVAR_REGISTER(&sk_islave_health3); // {"sk_islave_health3","0"); - - CVAR_REGISTER(&sk_islave_dmg_claw1); // {"sk_islave_dmg_claw1","0"); - CVAR_REGISTER(&sk_islave_dmg_claw2); // {"sk_islave_dmg_claw2","0"); - CVAR_REGISTER(&sk_islave_dmg_claw3); // {"sk_islave_dmg_claw3","0"); - - CVAR_REGISTER(&sk_islave_dmg_clawrake1); // {"sk_islave_dmg_clawrake1","0"); - CVAR_REGISTER(&sk_islave_dmg_clawrake2); // {"sk_islave_dmg_clawrake2","0"); - CVAR_REGISTER(&sk_islave_dmg_clawrake3); // {"sk_islave_dmg_clawrake3","0"); - - CVAR_REGISTER(&sk_islave_dmg_zap1); // {"sk_islave_dmg_zap1","0"); - CVAR_REGISTER(&sk_islave_dmg_zap2); // {"sk_islave_dmg_zap2","0"); - CVAR_REGISTER(&sk_islave_dmg_zap3); // {"sk_islave_dmg_zap3","0"); - - // Icthyosaur - CVAR_REGISTER(&sk_ichthyosaur_health1); // {"sk_ichthyosaur_health1","0"); - CVAR_REGISTER(&sk_ichthyosaur_health2); // {"sk_ichthyosaur_health2","0"); - CVAR_REGISTER(&sk_ichthyosaur_health3); // {"sk_ichthyosaur_health3","0"); - - CVAR_REGISTER(&sk_ichthyosaur_shake1); // {"sk_ichthyosaur_health3","0"); - CVAR_REGISTER(&sk_ichthyosaur_shake2); // {"sk_ichthyosaur_health3","0"); - CVAR_REGISTER(&sk_ichthyosaur_shake3); // {"sk_ichthyosaur_health3","0"); - - // Leech - CVAR_REGISTER(&sk_leech_health1); // {"sk_leech_health1","0"); - CVAR_REGISTER(&sk_leech_health2); // {"sk_leech_health2","0"); - CVAR_REGISTER(&sk_leech_health3); // {"sk_leech_health3","0"); - - CVAR_REGISTER(&sk_leech_dmg_bite1); // {"sk_leech_dmg_bite1","0"); - CVAR_REGISTER(&sk_leech_dmg_bite2); // {"sk_leech_dmg_bite2","0"); - CVAR_REGISTER(&sk_leech_dmg_bite3); // {"sk_leech_dmg_bite3","0"); - - // Controller - CVAR_REGISTER(&sk_controller_health1); - CVAR_REGISTER(&sk_controller_health2); - CVAR_REGISTER(&sk_controller_health3); - - CVAR_REGISTER(&sk_controller_dmgzap1); - CVAR_REGISTER(&sk_controller_dmgzap2); - CVAR_REGISTER(&sk_controller_dmgzap3); - - CVAR_REGISTER(&sk_controller_speedball1); - CVAR_REGISTER(&sk_controller_speedball2); - CVAR_REGISTER(&sk_controller_speedball3); - - CVAR_REGISTER(&sk_controller_dmgball1); - CVAR_REGISTER(&sk_controller_dmgball2); - CVAR_REGISTER(&sk_controller_dmgball3); - - // Nihilanth - CVAR_REGISTER(&sk_nihilanth_health1); // {"sk_nihilanth_health1","0"); - CVAR_REGISTER(&sk_nihilanth_health2); // {"sk_nihilanth_health2","0"); - CVAR_REGISTER(&sk_nihilanth_health3); // {"sk_nihilanth_health3","0"); - - CVAR_REGISTER(&sk_nihilanth_zap1); - CVAR_REGISTER(&sk_nihilanth_zap2); - CVAR_REGISTER(&sk_nihilanth_zap3); - - // Scientist - CVAR_REGISTER(&sk_scientist_health1); // {"sk_scientist_health1","0"); - CVAR_REGISTER(&sk_scientist_health2); // {"sk_scientist_health2","0"); - CVAR_REGISTER(&sk_scientist_health3); // {"sk_scientist_health3","0"); - - // Snark - CVAR_REGISTER(&sk_snark_health1); // {"sk_snark_health1","0"); - CVAR_REGISTER(&sk_snark_health2); // {"sk_snark_health2","0"); - CVAR_REGISTER(&sk_snark_health3); // {"sk_snark_health3","0"); - - CVAR_REGISTER(&sk_snark_dmg_bite1); // {"sk_snark_dmg_bite1","0"); - CVAR_REGISTER(&sk_snark_dmg_bite2); // {"sk_snark_dmg_bite2","0"); - CVAR_REGISTER(&sk_snark_dmg_bite3); // {"sk_snark_dmg_bite3","0"); - - CVAR_REGISTER(&sk_snark_dmg_pop1); // {"sk_snark_dmg_pop1","0"); - CVAR_REGISTER(&sk_snark_dmg_pop2); // {"sk_snark_dmg_pop2","0"); - CVAR_REGISTER(&sk_snark_dmg_pop3); // {"sk_snark_dmg_pop3","0"); - - // Zombie - CVAR_REGISTER(&sk_zombie_health1); // {"sk_zombie_health1","0"); - CVAR_REGISTER(&sk_zombie_health2); // {"sk_zombie_health3","0"); - CVAR_REGISTER(&sk_zombie_health3); // {"sk_zombie_health3","0"); - - CVAR_REGISTER(&sk_zombie_dmg_one_slash1); // {"sk_zombie_dmg_one_slash1","0"); - CVAR_REGISTER(&sk_zombie_dmg_one_slash2); // {"sk_zombie_dmg_one_slash2","0"); - CVAR_REGISTER(&sk_zombie_dmg_one_slash3); // {"sk_zombie_dmg_one_slash3","0"); - - CVAR_REGISTER(&sk_zombie_dmg_both_slash1); // {"sk_zombie_dmg_both_slash1","0"); - CVAR_REGISTER(&sk_zombie_dmg_both_slash2); // {"sk_zombie_dmg_both_slash2","0"); - CVAR_REGISTER(&sk_zombie_dmg_both_slash3); // {"sk_zombie_dmg_both_slash3","0"); // Turret CVAR_REGISTER(&sk_turret_health1); // {"sk_turret_health1","0"); @@ -711,99 +217,6 @@ void GameDLLInit(void) CVAR_REGISTER(&sk_sentry_health2); // {"sk_sentry_health2","0"); CVAR_REGISTER(&sk_sentry_health3); // {"sk_sentry_health3","0"); - // PLAYER WEAPONS - - // Crowbar whack - CVAR_REGISTER(&sk_plr_crowbar1); // {"sk_plr_crowbar1","0"); - CVAR_REGISTER(&sk_plr_crowbar2); // {"sk_plr_crowbar2","0"); - CVAR_REGISTER(&sk_plr_crowbar3); // {"sk_plr_crowbar3","0"); - - // Glock Round - CVAR_REGISTER(&sk_plr_9mm_bullet1); // {"sk_plr_9mm_bullet1","0"); - CVAR_REGISTER(&sk_plr_9mm_bullet2); // {"sk_plr_9mm_bullet2","0"); - CVAR_REGISTER(&sk_plr_9mm_bullet3); // {"sk_plr_9mm_bullet3","0"); - - // 357 Round - CVAR_REGISTER(&sk_plr_357_bullet1); // {"sk_plr_357_bullet1","0"); - CVAR_REGISTER(&sk_plr_357_bullet2); // {"sk_plr_357_bullet2","0"); - CVAR_REGISTER(&sk_plr_357_bullet3); // {"sk_plr_357_bullet3","0"); - - // MP5 Round - CVAR_REGISTER(&sk_plr_9mmAR_bullet1); // {"sk_plr_9mmAR_bullet1","0"); - CVAR_REGISTER(&sk_plr_9mmAR_bullet2); // {"sk_plr_9mmAR_bullet2","0"); - CVAR_REGISTER(&sk_plr_9mmAR_bullet3); // {"sk_plr_9mmAR_bullet3","0"); - - // M203 grenade - CVAR_REGISTER(&sk_plr_9mmAR_grenade1); // {"sk_plr_9mmAR_grenade1","0"); - CVAR_REGISTER(&sk_plr_9mmAR_grenade2); // {"sk_plr_9mmAR_grenade2","0"); - CVAR_REGISTER(&sk_plr_9mmAR_grenade3); // {"sk_plr_9mmAR_grenade3","0"); - - // Shotgun buckshot - CVAR_REGISTER(&sk_plr_buckshot1); // {"sk_plr_buckshot1","0"); - CVAR_REGISTER(&sk_plr_buckshot2); // {"sk_plr_buckshot2","0"); - CVAR_REGISTER(&sk_plr_buckshot3); // {"sk_plr_buckshot3","0"); - - // Crossbow - CVAR_REGISTER(&sk_plr_xbow_bolt_monster1); // {"sk_plr_xbow_bolt1","0"); - CVAR_REGISTER(&sk_plr_xbow_bolt_monster2); // {"sk_plr_xbow_bolt2","0"); - CVAR_REGISTER(&sk_plr_xbow_bolt_monster3); // {"sk_plr_xbow_bolt3","0"); - - CVAR_REGISTER(&sk_plr_xbow_bolt_client1); // {"sk_plr_xbow_bolt1","0"); - CVAR_REGISTER(&sk_plr_xbow_bolt_client2); // {"sk_plr_xbow_bolt2","0"); - CVAR_REGISTER(&sk_plr_xbow_bolt_client3); // {"sk_plr_xbow_bolt3","0"); - - // RPG - CVAR_REGISTER(&sk_plr_rpg1); // {"sk_plr_rpg1","0"); - CVAR_REGISTER(&sk_plr_rpg2); // {"sk_plr_rpg2","0"); - CVAR_REGISTER(&sk_plr_rpg3); // {"sk_plr_rpg3","0"); - - // Gauss Gun - CVAR_REGISTER(&sk_plr_gauss1); // {"sk_plr_gauss1","0"); - CVAR_REGISTER(&sk_plr_gauss2); // {"sk_plr_gauss2","0"); - CVAR_REGISTER(&sk_plr_gauss3); // {"sk_plr_gauss3","0"); - - // Egon Gun - CVAR_REGISTER(&sk_plr_egon_narrow1); // {"sk_plr_egon_narrow1","0"); - CVAR_REGISTER(&sk_plr_egon_narrow2); // {"sk_plr_egon_narrow2","0"); - CVAR_REGISTER(&sk_plr_egon_narrow3); // {"sk_plr_egon_narrow3","0"); - - CVAR_REGISTER(&sk_plr_egon_wide1); // {"sk_plr_egon_wide1","0"); - CVAR_REGISTER(&sk_plr_egon_wide2); // {"sk_plr_egon_wide2","0"); - CVAR_REGISTER(&sk_plr_egon_wide3); // {"sk_plr_egon_wide3","0"); - - // Hand Grendade - CVAR_REGISTER(&sk_plr_hand_grenade1); // {"sk_plr_hand_grenade1","0"); - CVAR_REGISTER(&sk_plr_hand_grenade2); // {"sk_plr_hand_grenade2","0"); - CVAR_REGISTER(&sk_plr_hand_grenade3); // {"sk_plr_hand_grenade3","0"); - - // Satchel Charge - CVAR_REGISTER(&sk_plr_satchel1); // {"sk_plr_satchel1","0"); - CVAR_REGISTER(&sk_plr_satchel2); // {"sk_plr_satchel2","0"); - CVAR_REGISTER(&sk_plr_satchel3); // {"sk_plr_satchel3","0"); - - // Tripmine - CVAR_REGISTER(&sk_plr_tripmine1); // {"sk_plr_tripmine1","0"); - CVAR_REGISTER(&sk_plr_tripmine2); // {"sk_plr_tripmine2","0"); - CVAR_REGISTER(&sk_plr_tripmine3); // {"sk_plr_tripmine3","0"); - - // WORLD WEAPONS - CVAR_REGISTER(&sk_12mm_bullet1); // {"sk_12mm_bullet1","0"); - CVAR_REGISTER(&sk_12mm_bullet2); // {"sk_12mm_bullet2","0"); - CVAR_REGISTER(&sk_12mm_bullet3); // {"sk_12mm_bullet3","0"); - - CVAR_REGISTER(&sk_9mmAR_bullet1); // {"sk_9mm_bullet1","0"); - CVAR_REGISTER(&sk_9mmAR_bullet2); // {"sk_9mm_bullet1","0"); - CVAR_REGISTER(&sk_9mmAR_bullet3); // {"sk_9mm_bullet1","0"); - - CVAR_REGISTER(&sk_9mm_bullet1); // {"sk_9mm_bullet1","0"); - CVAR_REGISTER(&sk_9mm_bullet2); // {"sk_9mm_bullet2","0"); - CVAR_REGISTER(&sk_9mm_bullet3); // {"sk_9mm_bullet3","0"); - - // HORNET - CVAR_REGISTER(&sk_hornet_dmg1); // {"sk_hornet_dmg1","0"); - CVAR_REGISTER(&sk_hornet_dmg2); // {"sk_hornet_dmg2","0"); - CVAR_REGISTER(&sk_hornet_dmg3); // {"sk_hornet_dmg3","0"); - // HEALTH/SUIT CHARGE DISTRIBUTION CVAR_REGISTER(&sk_suitcharger1); CVAR_REGISTER(&sk_suitcharger2); diff --git a/game/game_libs/dlls/gameplay/gamerules.cpp b/game/game_libs/dlls/gameplay/gamerules.cpp index ca2b0104e..e030a78bb 100644 --- a/game/game_libs/dlls/gameplay/gamerules.cpp +++ b/game/game_libs/dlls/gameplay/gamerules.cpp @@ -165,89 +165,6 @@ void CGameRules::RefreshSkillData(void) ALERT(at_console, "GAME SKILL LEVEL:%d\n", iSkill); - // Agrunt - gSkillData.agruntHealth = GetSkillCvar("sk_agrunt_health"); - gSkillData.agruntDmgPunch = GetSkillCvar("sk_agrunt_dmg_punch"); - - // Apache - gSkillData.apacheHealth = GetSkillCvar("sk_apache_health"); - - // Barney - gSkillData.barneyHealth = GetSkillCvar("sk_barney_health"); - - // Big Momma - gSkillData.bigmommaHealthFactor = GetSkillCvar("sk_bigmomma_health_factor"); - gSkillData.bigmommaDmgSlash = GetSkillCvar("sk_bigmomma_dmg_slash"); - gSkillData.bigmommaDmgBlast = GetSkillCvar("sk_bigmomma_dmg_blast"); - gSkillData.bigmommaRadiusBlast = GetSkillCvar("sk_bigmomma_radius_blast"); - - // Bullsquid - gSkillData.bullsquidHealth = GetSkillCvar("sk_bullsquid_health"); - gSkillData.bullsquidDmgBite = GetSkillCvar("sk_bullsquid_dmg_bite"); - gSkillData.bullsquidDmgWhip = GetSkillCvar("sk_bullsquid_dmg_whip"); - gSkillData.bullsquidDmgSpit = GetSkillCvar("sk_bullsquid_dmg_spit"); - - // Gargantua - gSkillData.gargantuaHealth = GetSkillCvar("sk_gargantua_health"); - gSkillData.gargantuaDmgSlash = GetSkillCvar("sk_gargantua_dmg_slash"); - gSkillData.gargantuaDmgFire = GetSkillCvar("sk_gargantua_dmg_fire"); - gSkillData.gargantuaDmgStomp = GetSkillCvar("sk_gargantua_dmg_stomp"); - - // Hassassin - gSkillData.hassassinHealth = GetSkillCvar("sk_hassassin_health"); - - // Headcrab - gSkillData.headcrabHealth = GetSkillCvar("sk_headcrab_health"); - gSkillData.headcrabDmgBite = GetSkillCvar("sk_headcrab_dmg_bite"); - - // Hgrunt - gSkillData.hgruntHealth = GetSkillCvar("sk_hgrunt_health"); - gSkillData.hgruntDmgKick = GetSkillCvar("sk_hgrunt_kick"); - gSkillData.hgruntShotgunPellets = GetSkillCvar("sk_hgrunt_pellets"); - gSkillData.hgruntGrenadeSpeed = GetSkillCvar("sk_hgrunt_gspeed"); - - // Houndeye - gSkillData.houndeyeHealth = GetSkillCvar("sk_houndeye_health"); - gSkillData.houndeyeDmgBlast = GetSkillCvar("sk_houndeye_dmg_blast"); - - // ISlave - gSkillData.slaveHealth = GetSkillCvar("sk_islave_health"); - gSkillData.slaveDmgClaw = GetSkillCvar("sk_islave_dmg_claw"); - gSkillData.slaveDmgClawrake = GetSkillCvar("sk_islave_dmg_clawrake"); - gSkillData.slaveDmgZap = GetSkillCvar("sk_islave_dmg_zap"); - - // Icthyosaur - gSkillData.ichthyosaurHealth = GetSkillCvar("sk_ichthyosaur_health"); - gSkillData.ichthyosaurDmgShake = GetSkillCvar("sk_ichthyosaur_shake"); - - // Leech - gSkillData.leechHealth = GetSkillCvar("sk_leech_health"); - - gSkillData.leechDmgBite = GetSkillCvar("sk_leech_dmg_bite"); - - // Controller - gSkillData.controllerHealth = GetSkillCvar("sk_controller_health"); - gSkillData.controllerDmgZap = GetSkillCvar("sk_controller_dmgzap"); - gSkillData.controllerSpeedBall = GetSkillCvar("sk_controller_speedball"); - gSkillData.controllerDmgBall = GetSkillCvar("sk_controller_dmgball"); - - // Nihilanth - gSkillData.nihilanthHealth = GetSkillCvar("sk_nihilanth_health"); - gSkillData.nihilanthZap = GetSkillCvar("sk_nihilanth_zap"); - - // Scientist - gSkillData.scientistHealth = GetSkillCvar("sk_scientist_health"); - - // Snark - gSkillData.snarkHealth = GetSkillCvar("sk_snark_health"); - gSkillData.snarkDmgBite = GetSkillCvar("sk_snark_dmg_bite"); - gSkillData.snarkDmgPop = GetSkillCvar("sk_snark_dmg_pop"); - - // Zombie - gSkillData.zombieHealth = GetSkillCvar("sk_zombie_health"); - gSkillData.zombieDmgOneSlash = GetSkillCvar("sk_zombie_dmg_one_slash"); - gSkillData.zombieDmgBothSlash = GetSkillCvar("sk_zombie_dmg_both_slash"); - // Turret gSkillData.turretHealth = GetSkillCvar("sk_turret_health"); @@ -257,65 +174,6 @@ void CGameRules::RefreshSkillData(void) // Sentry Turret gSkillData.sentryHealth = GetSkillCvar("sk_sentry_health"); - // PLAYER WEAPONS - - // Crowbar whack - gSkillData.plrDmgCrowbar = GetSkillCvar("sk_plr_crowbar"); - - // Glock Round - gSkillData.plrDmg9MM = GetSkillCvar("sk_plr_9mm_bullet"); - - // 357 Round - gSkillData.plrDmg357 = GetSkillCvar("sk_plr_357_bullet"); - - // MP5 Round - gSkillData.plrDmgMP5 = GetSkillCvar("sk_plr_9mmAR_bullet"); - - // M203 grenade - gSkillData.plrDmgM203Grenade = GetSkillCvar("sk_plr_9mmAR_grenade"); - - // Shotgun buckshot - gSkillData.plrDmgBuckshot = GetSkillCvar("sk_plr_buckshot"); - - // Crossbow - gSkillData.plrDmgCrossbowClient = GetSkillCvar("sk_plr_xbow_bolt_client"); - gSkillData.plrDmgCrossbowMonster = GetSkillCvar("sk_plr_xbow_bolt_monster"); - - // RPG - gSkillData.plrDmgRPG = GetSkillCvar("sk_plr_rpg"); - - // Gauss gun - gSkillData.plrDmgGauss = GetSkillCvar("sk_plr_gauss"); - - // Egon Gun - gSkillData.plrDmgEgonNarrow = GetSkillCvar("sk_plr_egon_narrow"); - gSkillData.plrDmgEgonWide = GetSkillCvar("sk_plr_egon_wide"); - - // Hand Grendade - gSkillData.plrDmgHandGrenade = GetSkillCvar("sk_plr_hand_grenade"); - - // Satchel Charge - gSkillData.plrDmgSatchel = GetSkillCvar("sk_plr_satchel"); - - // Tripmine - gSkillData.plrDmgTripmine = GetSkillCvar("sk_plr_tripmine"); - - // MONSTER WEAPONS - gSkillData.monDmg12MM = GetSkillCvar("sk_12mm_bullet"); - gSkillData.monDmgMP5 = GetSkillCvar("sk_9mmAR_bullet"); - gSkillData.monDmg9MM = GetSkillCvar("sk_9mm_bullet"); - - // MONSTER HORNET - gSkillData.monDmgHornet = GetSkillCvar("sk_hornet_dmg"); - - // PLAYER HORNET - // Up to this point, player hornet damage and monster hornet damage were both using - // monDmgHornet to determine how much damage to do. In tuning the hivehand, we now need - // to separate player damage and monster hivehand damage. Since it's so late in the project, we've - // added plrDmgHornet to the SKILLDATA struct, but not to the engine CVar list, so it's inaccesible - // via SKILLS.CFG. Any player hivehand tuning must take place in the code. (sjb) - gSkillData.plrDmgHornet = 7; - // HEALTH/CHARGE gSkillData.suitchargerCapacity = GetSkillCvar("sk_suitcharger"); gSkillData.batteryCapacity = GetSkillCvar("sk_battery"); diff --git a/game/game_libs/dlls/ggrenade.cpp b/game/game_libs/dlls/ggrenade.cpp index 5660d66b8..40761aef2 100644 --- a/game/game_libs/dlls/ggrenade.cpp +++ b/game/game_libs/dlls/ggrenade.cpp @@ -407,7 +407,7 @@ CGrenade* CGrenade::ShootContact(entvars_t* pevOwner, Vector vecStart, Vector ve // Explode on contact pGrenade->SetTouch(&CGrenade::ExplodeTouch); - pGrenade->pev->dmg = gSkillData.plrDmgM203Grenade; + pGrenade->pev->dmg = 100; return pGrenade; } diff --git a/game/game_libs/dlls/aflock.cpp b/game/game_libs/dlls/hl/aflock.cpp similarity index 100% rename from game/game_libs/dlls/aflock.cpp rename to game/game_libs/dlls/hl/aflock.cpp diff --git a/game/game_libs/dlls/agrunt.cpp b/game/game_libs/dlls/hl/agrunt.cpp similarity index 100% rename from game/game_libs/dlls/agrunt.cpp rename to game/game_libs/dlls/hl/agrunt.cpp diff --git a/game/game_libs/dlls/apache.cpp b/game/game_libs/dlls/hl/apache.cpp similarity index 100% rename from game/game_libs/dlls/apache.cpp rename to game/game_libs/dlls/hl/apache.cpp diff --git a/game/game_libs/dlls/barnacle.cpp b/game/game_libs/dlls/hl/barnacle.cpp similarity index 100% rename from game/game_libs/dlls/barnacle.cpp rename to game/game_libs/dlls/hl/barnacle.cpp diff --git a/game/game_libs/dlls/barney.cpp b/game/game_libs/dlls/hl/barney.cpp similarity index 100% rename from game/game_libs/dlls/barney.cpp rename to game/game_libs/dlls/hl/barney.cpp diff --git a/game/game_libs/dlls/bigmomma.cpp b/game/game_libs/dlls/hl/bigmomma.cpp similarity index 100% rename from game/game_libs/dlls/bigmomma.cpp rename to game/game_libs/dlls/hl/bigmomma.cpp diff --git a/game/game_libs/dlls/bullsquid.cpp b/game/game_libs/dlls/hl/bullsquid.cpp similarity index 100% rename from game/game_libs/dlls/bullsquid.cpp rename to game/game_libs/dlls/hl/bullsquid.cpp diff --git a/game/game_libs/dlls/controller.cpp b/game/game_libs/dlls/hl/controller.cpp similarity index 100% rename from game/game_libs/dlls/controller.cpp rename to game/game_libs/dlls/hl/controller.cpp diff --git a/game/game_libs/dlls/gargantua.cpp b/game/game_libs/dlls/hl/gargantua.cpp similarity index 100% rename from game/game_libs/dlls/gargantua.cpp rename to game/game_libs/dlls/hl/gargantua.cpp diff --git a/game/game_libs/dlls/gman.cpp b/game/game_libs/dlls/hl/gman.cpp similarity index 100% rename from game/game_libs/dlls/gman.cpp rename to game/game_libs/dlls/hl/gman.cpp diff --git a/game/game_libs/dlls/hassassin.cpp b/game/game_libs/dlls/hl/hassassin.cpp similarity index 100% rename from game/game_libs/dlls/hassassin.cpp rename to game/game_libs/dlls/hl/hassassin.cpp diff --git a/game/game_libs/dlls/headcrab.cpp b/game/game_libs/dlls/hl/headcrab.cpp similarity index 100% rename from game/game_libs/dlls/headcrab.cpp rename to game/game_libs/dlls/hl/headcrab.cpp diff --git a/game/game_libs/dlls/hgrunt.cpp b/game/game_libs/dlls/hl/hgrunt.cpp similarity index 100% rename from game/game_libs/dlls/hgrunt.cpp rename to game/game_libs/dlls/hl/hgrunt.cpp diff --git a/game/game_libs/dlls/hornet.cpp b/game/game_libs/dlls/hl/hornet.cpp similarity index 100% rename from game/game_libs/dlls/hornet.cpp rename to game/game_libs/dlls/hl/hornet.cpp diff --git a/game/game_libs/dlls/houndeye.cpp b/game/game_libs/dlls/hl/houndeye.cpp similarity index 100% rename from game/game_libs/dlls/houndeye.cpp rename to game/game_libs/dlls/hl/houndeye.cpp diff --git a/game/game_libs/dlls/ichthyosaur.cpp b/game/game_libs/dlls/hl/ichthyosaur.cpp similarity index 100% rename from game/game_libs/dlls/ichthyosaur.cpp rename to game/game_libs/dlls/hl/ichthyosaur.cpp diff --git a/game/game_libs/dlls/islave.cpp b/game/game_libs/dlls/hl/islave.cpp similarity index 100% rename from game/game_libs/dlls/islave.cpp rename to game/game_libs/dlls/hl/islave.cpp diff --git a/game/game_libs/dlls/leech.cpp b/game/game_libs/dlls/hl/leech.cpp similarity index 100% rename from game/game_libs/dlls/leech.cpp rename to game/game_libs/dlls/hl/leech.cpp diff --git a/game/game_libs/dlls/mortar.cpp b/game/game_libs/dlls/hl/mortar.cpp similarity index 100% rename from game/game_libs/dlls/mortar.cpp rename to game/game_libs/dlls/hl/mortar.cpp diff --git a/game/game_libs/dlls/nihilanth.cpp b/game/game_libs/dlls/hl/nihilanth.cpp similarity index 100% rename from game/game_libs/dlls/nihilanth.cpp rename to game/game_libs/dlls/hl/nihilanth.cpp diff --git a/game/game_libs/dlls/osprey.cpp b/game/game_libs/dlls/hl/osprey.cpp similarity index 100% rename from game/game_libs/dlls/osprey.cpp rename to game/game_libs/dlls/hl/osprey.cpp diff --git a/game/game_libs/dlls/scientist.cpp b/game/game_libs/dlls/hl/scientist.cpp similarity index 100% rename from game/game_libs/dlls/scientist.cpp rename to game/game_libs/dlls/hl/scientist.cpp diff --git a/game/game_libs/dlls/tentacle.cpp b/game/game_libs/dlls/hl/tentacle.cpp similarity index 100% rename from game/game_libs/dlls/tentacle.cpp rename to game/game_libs/dlls/hl/tentacle.cpp diff --git a/game/game_libs/dlls/xen.cpp b/game/game_libs/dlls/hl/xen.cpp similarity index 100% rename from game/game_libs/dlls/xen.cpp rename to game/game_libs/dlls/hl/xen.cpp diff --git a/game/game_libs/dlls/zombie.cpp b/game/game_libs/dlls/hl/zombie.cpp similarity index 100% rename from game/game_libs/dlls/zombie.cpp rename to game/game_libs/dlls/hl/zombie.cpp diff --git a/game/game_libs/dlls/items.cpp b/game/game_libs/dlls/items.cpp index f88d2a228..f42899811 100644 --- a/game/game_libs/dlls/items.cpp +++ b/game/game_libs/dlls/items.cpp @@ -63,12 +63,6 @@ void CWorldItem::Spawn(void) case 44: // ITEM_BATTERY: pEntity = CBaseEntity::Create("item_battery", pev->origin, pev->angles); break; - case 42: // ITEM_ANTIDOTE: - pEntity = CBaseEntity::Create("item_antidote", pev->origin, pev->angles); - break; - case 43: // ITEM_SECURITY: - pEntity = CBaseEntity::Create("item_security", pev->origin, pev->angles); - break; case 45: // ITEM_SUIT: pEntity = CBaseEntity::Create("item_suit", pev->origin, pev->angles); break; @@ -264,85 +258,3 @@ LINK_ENTITY_TO_CLASS(item_battery, CItemBattery) #ifdef NFOPEN_GAMEPLAY_PLACEHOLDERS LINK_ENTITY_TO_CLASS(item_armor_plate, CItemBattery) #endif - -class CItemAntidote : public CItem -{ - void Spawn(void) - { - Precache(); - SET_MODEL(ENT(pev), "models/w_antidote.mdl"); - CItem::Spawn(); - } - void Precache(void) - { - PRECACHE_MODEL("models/w_antidote.mdl"); - } - BOOL MyTouch(CBasePlayer* pPlayer) - { - pPlayer->SetSuitUpdate("!HEV_DET4", FALSE, SUIT_NEXT_IN_1MIN); - - pPlayer->m_rgItems[ITEM_ANTIDOTE] += 1; - return TRUE; - } -}; - -LINK_ENTITY_TO_CLASS(item_antidote, CItemAntidote) - -class CItemSecurity : public CItem -{ - void Spawn(void) - { - Precache(); - SET_MODEL(ENT(pev), "models/w_security.mdl"); - CItem::Spawn(); - } - void Precache(void) - { - PRECACHE_MODEL("models/w_security.mdl"); - } - BOOL MyTouch(CBasePlayer* pPlayer) - { - pPlayer->m_rgItems[ITEM_SECURITY] += 1; - return TRUE; - } -}; - -LINK_ENTITY_TO_CLASS(item_security, CItemSecurity) - -class CItemLongJump : public CItem -{ - void Spawn(void) - { - Precache(); - SET_MODEL(ENT(pev), "models/w_longjump.mdl"); - CItem::Spawn(); - } - void Precache(void) - { - PRECACHE_MODEL("models/w_longjump.mdl"); - } - BOOL MyTouch(CBasePlayer* pPlayer) - { - if ( pPlayer->m_fLongJump ) - { - return FALSE; - } - - if ( (pPlayer->pev->weapons & (1 << WEAPON_SUIT)) ) - { - pPlayer->m_fLongJump = TRUE; // player now has longjump module - - g_engfuncs.pfnSetPhysicsKeyValue(pPlayer->edict(), "slj", "1"); - - MESSAGE_BEGIN(MSG_ONE, gmsgItemPickup, NULL, pPlayer->pev); - WRITE_STRING(STRING(pev->classname)); - MESSAGE_END(); - - EMIT_SOUND_SUIT(pPlayer->edict(), "!HEV_A1"); // Play the longjump sound UNDONE: Kelly? correct sound? - return TRUE; - } - return FALSE; - } -}; - -LINK_ENTITY_TO_CLASS(item_longjump, CItemLongJump) diff --git a/game/game_libs/dlls/maprules.cpp b/game/game_libs/dlls/maprules.cpp index 4b0d68016..59f491cdc 100644 --- a/game/game_libs/dlls/maprules.cpp +++ b/game/game_libs/dlls/maprules.cpp @@ -840,6 +840,16 @@ void CGamePlayerEquip::KeyValue(KeyValueData* pkvd) UTIL_StripToken(pkvd->szKeyName, tmp); + if ( strcmp(tmp, "default_weapon") == 0 ) + { + // TODO: We should set the default weapon + // that the player will equip on spawn. + // For now, just avoid doing anything + // until we implement this feature. + pkvd->fHandled = TRUE; + break; + } + m_weaponNames[i] = ALLOC_STRING(tmp); m_weaponCount[i] = atoi(pkvd->szValue); m_weaponCount[i] = Q_max(1, m_weaponCount[i]); @@ -871,12 +881,17 @@ void CGamePlayerEquip::EquipPlayer(CBaseEntity* pEntity) } if ( !pPlayer ) + { return; + } for ( int i = 0; i < MAX_EQUIP; i++ ) { if ( !m_weaponNames[i] ) + { break; + } + for ( int j = 0; j < m_weaponCount[i]; j++ ) { pPlayer->GiveNamedItem(STRING(m_weaponNames[i])); diff --git a/game/game_libs/dlls/multiplay_gamerules.cpp b/game/game_libs/dlls/multiplay_gamerules.cpp index d48275d6f..071cc4284 100644 --- a/game/game_libs/dlls/multiplay_gamerules.cpp +++ b/game/game_libs/dlls/multiplay_gamerules.cpp @@ -176,46 +176,6 @@ void CHalfLifeMultiplay::RefreshSkillData(void) // suitcharger gSkillData.suitchargerCapacity = 30; - - // Crowbar whack - gSkillData.plrDmgCrowbar = 25; - - // Glock Round - gSkillData.plrDmg9MM = 12; - - // 357 Round - gSkillData.plrDmg357 = 40; - - // MP5 Round - gSkillData.plrDmgMP5 = 12; - - // M203 grenade - gSkillData.plrDmgM203Grenade = 100; - - // Shotgun buckshot - gSkillData.plrDmgBuckshot = 20; // fewer pellets in deathmatch - - // Crossbow - gSkillData.plrDmgCrossbowClient = 20; - - // RPG - gSkillData.plrDmgRPG = 120; - - // Egon - gSkillData.plrDmgEgonWide = 20; - gSkillData.plrDmgEgonNarrow = 10; - - // Hand Grendade - gSkillData.plrDmgHandGrenade = 100; - - // Satchel Charge - gSkillData.plrDmgSatchel = 120; - - // Tripmine - gSkillData.plrDmgTripmine = 150; - - // hornet - gSkillData.plrDmgHornet = 10; } // longest the intermission can last, in seconds diff --git a/game/game_libs/dlls/player.cpp b/game/game_libs/dlls/player.cpp index da9d74e46..3b625d60c 100644 --- a/game/game_libs/dlls/player.cpp +++ b/game/game_libs/dlls/player.cpp @@ -51,6 +51,7 @@ #include "EnginePublicAPI/com_strings.h" #include "PlatformLib/String.h" #include "MathLib/angles.h" +#include "weapons/weaponregistry.h" // #define DUCKFIX @@ -162,7 +163,6 @@ TYPEDESCRIPTION CBasePlayer::m_playerSaveData[] = { }; bool userMessagesRegistered = false; -int giPrecacheGrunt = 0; int gmsgShake = 0; int gmsgFade = 0; int gmsgSelAmmo = 0; @@ -850,8 +850,12 @@ void CBasePlayer::RemoveAllItems(BOOL removeSuit) for ( i = 0; i < MAX_AMMO_SLOTS; i++ ) m_rgAmmo[i] = 0; +#ifdef HL_CONTENT if ( satchelfix.value ) + { DeactivateSatchels(this); + } +#endif // HL_CONTENT UpdateClientData(); @@ -2128,18 +2132,6 @@ void CBasePlayer::CheckTimeBasedDamage() if ( m_rgbTimeBasedDamage[i] ) { - // use up an antitoxin on poison or nervegas after a few seconds of damage - if ( ((i == itbd_NerveGas) && (m_rgbTimeBasedDamage[i] < NERVEGAS_DURATION)) || - ((i == itbd_Poison) && (m_rgbTimeBasedDamage[i] < POISON_DURATION)) ) - { - if ( m_rgItems[ITEM_ANTIDOTE] ) - { - m_rgbTimeBasedDamage[i] = 0; - m_rgItems[ITEM_ANTIDOTE]--; - SetSuitUpdate("!HEV_HEAL4", FALSE, SUIT_REPEAT_OK); - } - } - // decrement damage duration, detect when done. if ( !m_rgbTimeBasedDamage[i] || --m_rgbTimeBasedDamage[i] == 0 ) { @@ -3451,46 +3443,14 @@ void CBasePlayer::CheatImpulseCommands(int iImpulse) switch ( iImpulse ) { - case 76: - if ( !giPrecacheGrunt ) - { - giPrecacheGrunt = 1; - ALERT(at_console, "You must now restart to use Grunt-o-matic.\n"); - } - else - { - UTIL_MakeVectors(Vector(0, pev->v_angle[YAW], 0)); - Create("monster_human_grunt", Vector(pev->origin) + Vector(gpGlobals->v_forward) * 128, pev->angles); - } - break; case 101: gEvilImpulse101 = TRUE; GiveNamedItem("item_suit"); GiveNamedItem("item_battery"); - GiveNamedItem("weapon_crowbar"); - GiveNamedItem("weapon_9mmhandgun"); - GiveNamedItem("ammo_9mmclip"); - GiveNamedItem("weapon_shotgun"); - GiveNamedItem("ammo_buckshot"); - GiveNamedItem("weapon_9mmAR"); - GiveNamedItem("ammo_9mmAR"); - GiveNamedItem("ammo_ARgrenades"); - GiveNamedItem("weapon_handgrenade"); - GiveNamedItem("weapon_tripmine"); -#ifndef OEM_BUILD - GiveNamedItem("weapon_357"); - GiveNamedItem("ammo_357"); - GiveNamedItem("weapon_crossbow"); - GiveNamedItem("ammo_crossbow"); - GiveNamedItem("weapon_egon"); - GiveNamedItem("weapon_gauss"); - GiveNamedItem("ammo_gaussclip"); - GiveNamedItem("weapon_rpg"); - GiveNamedItem("ammo_rpgclip"); - GiveNamedItem("weapon_satchel"); - GiveNamedItem("weapon_snark"); - GiveNamedItem("weapon_hornetgun"); -#endif + CWeaponRegistry::StaticInstance().ForEach([this](const WeaponAtts::WACollection& atts) + { + GiveNamedItem(atts.Core.Classname); + }); gEvilImpulse101 = FALSE; break; case 102: diff --git a/game/game_libs/dlls/weapons.cpp b/game/game_libs/dlls/weapons.cpp index 76afaf4f1..4727c592e 100644 --- a/game/game_libs/dlls/weapons.cpp +++ b/game/game_libs/dlls/weapons.cpp @@ -322,69 +322,12 @@ void W_Precache(void) UTIL_PrecacheOther("item_suit"); UTIL_PrecacheOther("item_healthkit"); UTIL_PrecacheOther("item_battery"); - UTIL_PrecacheOther("item_antidote"); - UTIL_PrecacheOther("item_security"); - UTIL_PrecacheOther("item_longjump"); - - // shotgun - UTIL_PrecacheOtherWeapon("weapon_shotgun"); - UTIL_PrecacheOther("ammo_buckshot"); - - // crowbar - UTIL_PrecacheOtherWeapon("weapon_crowbar"); - - // glock - UTIL_PrecacheOtherWeapon("weapon_9mmhandgun"); - UTIL_PrecacheOther("ammo_9mmclip"); - - // mp5 - UTIL_PrecacheOtherWeapon("weapon_9mmAR"); - UTIL_PrecacheOther("ammo_9mmAR"); - UTIL_PrecacheOther("ammo_ARgrenades"); - - // 9mm ammo box - UTIL_PrecacheOther("ammo_9mmbox"); - -#if !defined(OEM_BUILD) && !defined(HLDEMO_BUILD) - // python - UTIL_PrecacheOtherWeapon("weapon_357"); - UTIL_PrecacheOther("ammo_357"); - - // gauss - UTIL_PrecacheOtherWeapon("weapon_gauss"); - UTIL_PrecacheOther("ammo_gaussclip"); - - // rpg - UTIL_PrecacheOtherWeapon("weapon_rpg"); - UTIL_PrecacheOther("ammo_rpgclip"); - - // crossbow - UTIL_PrecacheOtherWeapon("weapon_crossbow"); - UTIL_PrecacheOther("ammo_crossbow"); - - // egon - UTIL_PrecacheOtherWeapon("weapon_egon"); -#endif - // tripmine - UTIL_PrecacheOtherWeapon("weapon_tripmine"); -#if !defined(OEM_BUILD) && !defined(HLDEMO_BUILD) - // satchel charge - UTIL_PrecacheOtherWeapon("weapon_satchel"); -#endif - // hand grenade - UTIL_PrecacheOtherWeapon("weapon_handgrenade"); -#if !defined(OEM_BUILD) && !defined(HLDEMO_BUILD) - // squeak grenade - UTIL_PrecacheOtherWeapon("weapon_snark"); - - // hornetgun - UTIL_PrecacheOtherWeapon("weapon_hornetgun"); if ( g_pGameRules->IsDeathmatch() ) { UTIL_PrecacheOther("weaponbox"); // container for dropped deathmatch weapons } -#endif + g_sModelIndexFireball = static_cast(PRECACHE_MODEL("sprites/zerogxplode.spr")); // fireball g_sModelIndexWExplosion = static_cast(PRECACHE_MODEL("sprites/WXplo1.spr")); // underwater fireball g_sModelIndexSmoke = static_cast(PRECACHE_MODEL("sprites/steam1.spr")); // smoke @@ -444,8 +387,8 @@ IMPLEMENT_SAVERESTORE(CBasePlayerWeapon, CBasePlayerItem) void CBasePlayerItem::SetObjectCollisionBox(void) { - VectorAdd(pev->origin, Vector(-24, -24, 0), pev->absmin); - VectorAdd(pev->origin, Vector(24, 24, 16), pev->absmax); + VectorAdd(pev->origin, Vector(-24, -24, 0), pev->absmin); + VectorAdd(pev->origin, Vector(24, 24, 16), pev->absmax); } //========================================================= @@ -1248,7 +1191,7 @@ float CBasePlayerWeapon::GetNextAttackDelay(float delay) // store it as m_flPrevPrimaryAttack. m_flPrevPrimaryAttack = flNextAttack - UTIL_WeaponTimeBase(); // char szMsg[256]; - //PlatformLib_SNPrintF( szMsg, sizeof(szMsg), "next attack time: %0.4f\n", gpGlobals->time + flNextAttack ); + // PlatformLib_SNPrintF( szMsg, sizeof(szMsg), "next attack time: %0.4f\n", gpGlobals->time + flNextAttack ); // OutputDebugString( szMsg ); return flNextAttack; } @@ -1638,6 +1581,7 @@ void CBasePlayerWeapon::PrintState(void) ALERT(at_console, "m_iclip: %i\n", m_iClip); } +#ifdef HL_CONTENT TYPEDESCRIPTION CRpg::m_SaveData[] = { DEFINE_FIELD(CRpg, m_fSpotActive, FIELD_INTEGER), DEFINE_FIELD(CRpg, m_cActiveRockets, FIELD_INTEGER), @@ -1696,3 +1640,4 @@ TYPEDESCRIPTION CSatchel::m_SaveData[] = { }; IMPLEMENT_SAVERESTORE(CSatchel, CBasePlayerWeapon) +#endif // HL_CONTENT diff --git a/game/game_libs/game_shared/resources/MaterialBreakSoundResources.cpp b/game/game_libs/game_shared/resources/MaterialBreakSoundResources.cpp index 070efc132..dbf216891 100644 --- a/game/game_libs/game_shared/resources/MaterialBreakSoundResources.cpp +++ b/game/game_libs/game_shared/resources/MaterialBreakSoundResources.cpp @@ -1,10 +1,18 @@ #include "MaterialBreakSoundResources.h" -static constexpr const char* const BreakGlass[] = {"break/break_glass1.wav"}; +static constexpr const char* const BreakGlass[] = { + "break/break_glass1.wav", +}; -static constexpr const char* const BreakConcrete[] = {"break/break_concrete1.wav", "break/break_concrete2.wav"}; +static constexpr const char* const BreakConcrete[] = { + "break/break_concrete1.wav", + "break/break_concrete2.wav", +}; -static constexpr const char* const BreakFlesh[] = {"break/break_flesh1.wav", "break/break_flesh2.wav"}; +static constexpr const char* const BreakFlesh[] = { + "break/break_flesh1.wav", + "break/break_flesh2.wav", +}; static constexpr const char* const BreakMetal[] = { "break/break_metal1.wav", diff --git a/game/game_libs/game_shared/resources/PlayerSoundResources.cpp b/game/game_libs/game_shared/resources/PlayerSoundResources.cpp index f168c1b72..2f31000d5 100644 --- a/game/game_libs/game_shared/resources/PlayerSoundResources.cpp +++ b/game/game_libs/game_shared/resources/PlayerSoundResources.cpp @@ -23,7 +23,7 @@ static constexpr const char* const MalePain[] = { "player/male_pain7.wav", "player/male_pain8.wav", "player/male_pain9.wav", - "player/male_pain10.wav" + "player/male_pain10.wav", "player/male_pain11.wav", "player/male_pain12.wav", "player/male_pain13.wav", diff --git a/game/game_libs/game_shared/weapons/crossbow.cpp b/game/game_libs/game_shared/weapons/hl/crossbow.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/crossbow.cpp rename to game/game_libs/game_shared/weapons/hl/crossbow.cpp diff --git a/game/game_libs/game_shared/weapons/crowbar.cpp b/game/game_libs/game_shared/weapons/hl/crowbar.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/crowbar.cpp rename to game/game_libs/game_shared/weapons/hl/crowbar.cpp diff --git a/game/game_libs/game_shared/weapons/egon.cpp b/game/game_libs/game_shared/weapons/hl/egon.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/egon.cpp rename to game/game_libs/game_shared/weapons/hl/egon.cpp diff --git a/game/game_libs/game_shared/weapons/gauss.cpp b/game/game_libs/game_shared/weapons/hl/gauss.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/gauss.cpp rename to game/game_libs/game_shared/weapons/hl/gauss.cpp diff --git a/game/game_libs/game_shared/weapons/glock.cpp b/game/game_libs/game_shared/weapons/hl/glock.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/glock.cpp rename to game/game_libs/game_shared/weapons/hl/glock.cpp diff --git a/game/game_libs/game_shared/weapons/handgrenade.cpp b/game/game_libs/game_shared/weapons/hl/handgrenade.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/handgrenade.cpp rename to game/game_libs/game_shared/weapons/hl/handgrenade.cpp diff --git a/game/game_libs/game_shared/weapons/hornetgun.cpp b/game/game_libs/game_shared/weapons/hl/hornetgun.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/hornetgun.cpp rename to game/game_libs/game_shared/weapons/hl/hornetgun.cpp diff --git a/game/game_libs/game_shared/weapons/mp5.cpp b/game/game_libs/game_shared/weapons/hl/mp5.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/mp5.cpp rename to game/game_libs/game_shared/weapons/hl/mp5.cpp diff --git a/game/game_libs/game_shared/weapons/python.cpp b/game/game_libs/game_shared/weapons/hl/python.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/python.cpp rename to game/game_libs/game_shared/weapons/hl/python.cpp diff --git a/game/game_libs/game_shared/weapons/rpg.cpp b/game/game_libs/game_shared/weapons/hl/rpg.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/rpg.cpp rename to game/game_libs/game_shared/weapons/hl/rpg.cpp diff --git a/game/game_libs/game_shared/weapons/satchel.cpp b/game/game_libs/game_shared/weapons/hl/satchel.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/satchel.cpp rename to game/game_libs/game_shared/weapons/hl/satchel.cpp diff --git a/game/game_libs/game_shared/weapons/shotgun.cpp b/game/game_libs/game_shared/weapons/hl/shotgun.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/shotgun.cpp rename to game/game_libs/game_shared/weapons/hl/shotgun.cpp diff --git a/game/game_libs/game_shared/weapons/squeakgrenade.cpp b/game/game_libs/game_shared/weapons/hl/squeakgrenade.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/squeakgrenade.cpp rename to game/game_libs/game_shared/weapons/hl/squeakgrenade.cpp diff --git a/game/game_libs/game_shared/weapons/tripmine.cpp b/game/game_libs/game_shared/weapons/hl/tripmine.cpp similarity index 100% rename from game/game_libs/game_shared/weapons/tripmine.cpp rename to game/game_libs/game_shared/weapons/hl/tripmine.cpp diff --git a/game/game_libs/game_shared/weapons/weapon_frag_grenade.cpp b/game/game_libs/game_shared/weapons/weapon_frag_grenade.cpp index 586d431ae..7f9bb4c7f 100644 --- a/game/game_libs/game_shared/weapons/weapon_frag_grenade.cpp +++ b/game/game_libs/game_shared/weapons/weapon_frag_grenade.cpp @@ -185,9 +185,7 @@ class CAmmoFragGrenade : public CGenericAmmo } }; -#ifdef NFOPEN_GAMEPLAY_UNFINISHED_WEAPONS LINK_ENTITY_TO_CLASS(ammo_frag_grenade, CAmmoFragGrenade) // For Nightfire compatibility: LINK_ENTITY_TO_CLASS(ammo_fraggrenade, CAmmoFragGrenade) -#endif // NFOPEN_GAMEPLAY_UNFINISHED_WEAPONS diff --git a/game/game_libs/game_shared/weapons/weaponids.h b/game/game_libs/game_shared/weapons/weaponids.h index c3417b5d2..d31a1a97f 100644 --- a/game/game_libs/game_shared/weapons/weaponids.h +++ b/game/game_libs/game_shared/weapons/weaponids.h @@ -3,7 +3,7 @@ enum class WeaponId_e { WeaponNone = 0, - WeaponP99 = 17, // TODO: Change once other weapons are gone + WeaponP99, WeaponFrinesi, WeaponGrenadeLauncher, WeaponRaptor, diff --git a/game/game_libs/game_shared/weapons/weapons.h b/game/game_libs/game_shared/weapons/weapons.h index 8d428f581..8c975aeda 100644 --- a/game/game_libs/game_shared/weapons/weapons.h +++ b/game/game_libs/game_shared/weapons/weapons.h @@ -12,9 +12,8 @@ * without written permission from Valve LLC. * ****/ + #pragma once -#ifndef WEAPONS_H -#define WEAPONS_H #include "effects.h" #include "cdll_dll.h" @@ -23,176 +22,63 @@ class CBasePlayer; typedef struct weapon_data_s weapon_data_t; extern int gmsgWeapPickup; -void DeactivateSatchels(CBasePlayer* pOwner); - -// Contact Grenade / Timed grenade / Satchel Charge -class CGrenade : public CBaseMonster -{ -public: - CGrenade(); - void Spawn(void); - - typedef enum - { - SATCHEL_DETONATE = 0, - SATCHEL_RELEASE - } SATCHELCODE; - - static CGrenade* ShootTimed(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity, float time); - static CGrenade* ShootContact(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity); - static CGrenade* ShootSatchelCharge(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity); - static void UseSatchelCharges(entvars_t* pevOwner, SATCHELCODE code); - - void Explode(Vector vecSrc, Vector vecAim); - void Explode(TraceResult* pTrace, int bitsDamageType); - void EXPORT Smoke(void); - - void EXPORT BounceTouch(CBaseEntity* pOther); - void EXPORT SlideTouch(CBaseEntity* pOther); - void EXPORT ExplodeTouch(CBaseEntity* pOther); - void EXPORT DangerSoundThink(void); - void EXPORT PreDetonate(void); - void EXPORT Detonate(void); - void EXPORT DetonateUse(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value); - void EXPORT TumbleThink(void); - - virtual void BounceSound(void); - virtual int BloodColor(void) - { - return DONT_BLEED; - } - virtual void Killed(entvars_t* pevAttacker, int iGib); - - inline unsigned char ExplodeSpriteScale() const - { - return m_iExplodeSpriteScale; - } - inline void SetExplodeSpriteScale(unsigned char val) - { - m_iExplodeSpriteScale = val; - } - inline float ExplosionRadius() const - { - return pev->fuser1; - } - inline void SetExplosionRadius(float radius) - { - pev->fuser1 = radius; - } - inline float OwnerDamageMultiplier() const - { - return pev->fuser2; - } - inline void SetOwnerDamageMultiplier(float multiplier) - { - pev->fuser2 = multiplier; - } - inline float PlayerContactDamageMultiplier() const - { - return pev->fuser3; - } - inline void SetPlayerContactDamageMultiplier(float multiplier) - { - pev->fuser3 = multiplier; - } +extern DLL_GLOBAL short g_sModelIndexLaser; // holds the index for the laser beam +extern DLL_GLOBAL const char* g_pModelNameLaser; - BOOL m_fRegisteredSound; // whether or not this grenade has issued its DANGER sound to the world sound list yet. +extern DLL_GLOBAL short g_sModelIndexLaserDot; // holds the index for the laser beam dot +extern DLL_GLOBAL short g_sModelIndexFireball; // holds the index for the fireball +extern DLL_GLOBAL short g_sModelIndexSmoke; // holds the index for the smoke cloud +extern DLL_GLOBAL short g_sModelIndexWExplosion; // holds the index for the underwater explosion +extern DLL_GLOBAL short g_sModelIndexBubbles; // holds the index for the bubbles model +extern DLL_GLOBAL short g_sModelIndexBloodDrop; // holds the sprite index for blood drops +extern DLL_GLOBAL short g_sModelIndexBloodSpray; // holds the sprite index for blood spray (bigger) -private: - unsigned char m_iExplodeSpriteScale; -}; +// the maximum amount of ammo each weapon's clip can hold +#define WEAPON_NOCLIP -1 +#define WEAPON_ALLWEAPONS (~(1 << WEAPON_SUIT)) // constant items #define ITEM_HEALTHKIT 1 -#define ITEM_ANTIDOTE 2 -#define ITEM_SECURITY 3 #define ITEM_BATTERY 4 #define WEAPON_NONE 0 -#define WEAPON_CROWBAR 1 -#define WEAPON_GLOCK 2 -#define WEAPON_PYTHON 3 -#define WEAPON_MP5 4 -#define WEAPON_CHAINGUN 5 -#define WEAPON_CROSSBOW 6 -#define WEAPON_SHOTGUN 7 -#define WEAPON_RPG 8 -#define WEAPON_GAUSS 9 -#define WEAPON_EGON 10 -#define WEAPON_HORNETGUN 11 -#define WEAPON_HANDGRENADE 12 -#define WEAPON_TRIPMINE 13 -#define WEAPON_SATCHEL 14 -#define WEAPON_SNARK 15 - -#define WEAPON_ALLWEAPONS (~(1 << WEAPON_SUIT)) #define MAX_NORMAL_BATTERY 100 -// weapon weight factors (for auto-switching) (-1 = noswitch) -#define CROWBAR_WEIGHT 0 -#define GLOCK_WEIGHT 10 -#define PYTHON_WEIGHT 15 -#define MP5_WEIGHT 15 -#define SHOTGUN_WEIGHT 15 -#define CROSSBOW_WEIGHT 10 -#define RPG_WEIGHT 20 -#define GAUSS_WEIGHT 20 -#define EGON_WEIGHT 20 -#define HORNETGUN_WEIGHT 10 -#define HANDGRENADE_WEIGHT 5 -#define SNARK_WEIGHT 5 -#define SATCHEL_WEIGHT -10 -#define TRIPMINE_WEIGHT -10 +#define LOUD_GUN_VOLUME 1000 +#define NORMAL_GUN_VOLUME 600 +#define QUIET_GUN_VOLUME 200 -// the maximum amount of ammo each weapon's clip can hold -#define WEAPON_NOCLIP -1 +#define BRIGHT_GUN_FLASH 512 +#define NORMAL_GUN_FLASH 256 +#define DIM_GUN_FLASH 128 -// #define CROWBAR_MAX_CLIP WEAPON_NOCLIP -#define GLOCK_MAX_CLIP 17 -#define PYTHON_MAX_CLIP 6 -#define MP5_MAX_CLIP 50 -#define MP5_DEFAULT_AMMO 25 -#define SHOTGUN_MAX_CLIP 8 -#define CROSSBOW_MAX_CLIP 5 -#define RPG_MAX_CLIP 1 -#define GAUSS_MAX_CLIP WEAPON_NOCLIP -#define EGON_MAX_CLIP WEAPON_NOCLIP -#define HORNETGUN_MAX_CLIP WEAPON_NOCLIP -#define HANDGRENADE_MAX_CLIP WEAPON_NOCLIP -#define SATCHEL_MAX_CLIP WEAPON_NOCLIP -#define TRIPMINE_MAX_CLIP WEAPON_NOCLIP -#define SNARK_MAX_CLIP WEAPON_NOCLIP +#define BIG_EXPLOSION_VOLUME 2048 +#define NORMAL_EXPLOSION_VOLUME 1024 +#define SMALL_EXPLOSION_VOLUME 512 -// the default amount of ammo that comes with each gun when it spawns -#define GLOCK_DEFAULT_GIVE 17 -#define PYTHON_DEFAULT_GIVE 6 -#define MP5_DEFAULT_GIVE 25 -#define MP5_DEFAULT_AMMO 25 -#define MP5_M203_DEFAULT_GIVE 0 -#define SHOTGUN_DEFAULT_GIVE 12 -#define CROSSBOW_DEFAULT_GIVE 5 -#define RPG_DEFAULT_GIVE 1 -#define GAUSS_DEFAULT_GIVE 20 -#define EGON_DEFAULT_GIVE 20 -#define HANDGRENADE_DEFAULT_GIVE 5 -#define SATCHEL_DEFAULT_GIVE 1 -#define TRIPMINE_DEFAULT_GIVE 1 -#define SNARK_DEFAULT_GIVE 5 -#define HIVEHAND_DEFAULT_GIVE 8 +#define WEAPON_ACTIVITY_VOLUME 64 -// The amount of ammo given to a player by an ammo item. -#define AMMO_URANIUMBOX_GIVE 20 -#define AMMO_GLOCKCLIP_GIVE GLOCK_MAX_CLIP -#define AMMO_357BOX_GIVE PYTHON_MAX_CLIP -#define AMMO_MP5CLIP_GIVE MP5_MAX_CLIP -#define AMMO_CHAINBOX_GIVE 200 -#define AMMO_M203BOX_GIVE 2 -#define AMMO_BUCKSHOTBOX_GIVE 12 -#define AMMO_CROSSBOWCLIP_GIVE CROSSBOW_MAX_CLIP -#define AMMO_RPGCLIP_GIVE RPG_MAX_CLIP -#define AMMO_URANIUMBOX_GIVE 20 -#define AMMO_SNARKBOX_GIVE 5 +#define VECTOR_CONE_1DEGREES Vector(0.00873f, 0.00873f, 0.00873f) +#define VECTOR_CONE_2DEGREES Vector(0.01745f, 0.01745f, 0.01745f) +#define VECTOR_CONE_3DEGREES Vector(0.02618f, 0.02618f, 0.02618f) +#define VECTOR_CONE_4DEGREES Vector(0.03490f, 0.03490f, 0.03490f) +#define VECTOR_CONE_5DEGREES Vector(0.04362f, 0.04362f, 0.04362f) +#define VECTOR_CONE_6DEGREES Vector(0.05234f, 0.05234f, 0.05234f) +#define VECTOR_CONE_7DEGREES Vector(0.06105f, 0.06105f, 0.06105f) +#define VECTOR_CONE_8DEGREES Vector(0.06976f, 0.06976f, 0.06976f) +#define VECTOR_CONE_9DEGREES Vector(0.07846f, 0.07846f, 0.07846f) +#define VECTOR_CONE_10DEGREES Vector(0.08716f, 0.08716f, 0.08716f) +#define VECTOR_CONE_15DEGREES Vector(0.13053f, 0.13053f, 0.13053f) +#define VECTOR_CONE_20DEGREES Vector(0.17365f, 0.17365f, 0.17365f) + +#define ITEM_FLAG_SELECTONEMPTY 1 +#define ITEM_FLAG_NOAUTORELOAD 2 +#define ITEM_FLAG_NOAUTOSWITCHEMPTY 4 +#define ITEM_FLAG_LIMITINWORLD 8 +#define ITEM_FLAG_EXHAUSTIBLE 16 // A player can totally exhaust their ammo supply and lose this weapon + +#define WEAPON_IS_ONTARGET 0x40 // bullet types // NOTE: At some point (once we make the original HL weapons obsolete) @@ -214,14 +100,6 @@ typedef enum BULLET_MONSTER_12MM } Bullet; -#define ITEM_FLAG_SELECTONEMPTY 1 -#define ITEM_FLAG_NOAUTORELOAD 2 -#define ITEM_FLAG_NOAUTOSWITCHEMPTY 4 -#define ITEM_FLAG_LIMITINWORLD 8 -#define ITEM_FLAG_EXHAUSTIBLE 16 // A player can totally exhaust their ammo supply and lose this weapon - -#define WEAPON_IS_ONTARGET 0x40 - typedef struct { int iSlot; @@ -516,60 +394,82 @@ class CBasePlayerAmmo : public CBaseEntity void EXPORT Materialize(void); }; -extern DLL_GLOBAL short g_sModelIndexLaser; // holds the index for the laser beam -extern DLL_GLOBAL const char* g_pModelNameLaser; - -extern DLL_GLOBAL short g_sModelIndexLaserDot; // holds the index for the laser beam dot -extern DLL_GLOBAL short g_sModelIndexFireball; // holds the index for the fireball -extern DLL_GLOBAL short g_sModelIndexSmoke; // holds the index for the smoke cloud -extern DLL_GLOBAL short g_sModelIndexWExplosion; // holds the index for the underwater explosion -extern DLL_GLOBAL short g_sModelIndexBubbles; // holds the index for the bubbles model -extern DLL_GLOBAL short g_sModelIndexBloodDrop; // holds the sprite index for blood drops -extern DLL_GLOBAL short g_sModelIndexBloodSpray; // holds the sprite index for blood spray (bigger) - -extern void ClearMultiDamage(void); -extern void ApplyMultiDamage(entvars_t* pevInflictor, entvars_t* pevAttacker); -extern void AddMultiDamage(entvars_t* pevInflictor, CBaseEntity* pEntity, float flDamage, int bitsDamageType); +// Contact Grenade / Timed grenade / Satchel Charge +class CGrenade : public CBaseMonster +{ +public: + CGrenade(); + void Spawn(void); -extern void DecalGunshot(TraceResult* pTrace, int iBulletType); -extern void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage); -extern int DamageDecal(CBaseEntity* pEntity, int bitsDamageType); + typedef enum + { + SATCHEL_DETONATE = 0, + SATCHEL_RELEASE + } SATCHELCODE; -typedef struct -{ - CBaseEntity* pEntity; - float amount; - int type; -} MULTIDAMAGE; + static CGrenade* ShootTimed(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity, float time); + static CGrenade* ShootContact(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity); + static CGrenade* ShootSatchelCharge(entvars_t* pevOwner, Vector vecStart, Vector vecVelocity); + static void UseSatchelCharges(entvars_t* pevOwner, SATCHELCODE code); -extern MULTIDAMAGE gMultiDamage; + void Explode(Vector vecSrc, Vector vecAim); + void Explode(TraceResult* pTrace, int bitsDamageType); + void EXPORT Smoke(void); -#define LOUD_GUN_VOLUME 1000 -#define NORMAL_GUN_VOLUME 600 -#define QUIET_GUN_VOLUME 200 + void EXPORT BounceTouch(CBaseEntity* pOther); + void EXPORT SlideTouch(CBaseEntity* pOther); + void EXPORT ExplodeTouch(CBaseEntity* pOther); + void EXPORT DangerSoundThink(void); + void EXPORT PreDetonate(void); + void EXPORT Detonate(void); + void EXPORT DetonateUse(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value); + void EXPORT TumbleThink(void); -#define BRIGHT_GUN_FLASH 512 -#define NORMAL_GUN_FLASH 256 -#define DIM_GUN_FLASH 128 + virtual void BounceSound(void); + virtual int BloodColor(void) + { + return DONT_BLEED; + } + virtual void Killed(entvars_t* pevAttacker, int iGib); -#define BIG_EXPLOSION_VOLUME 2048 -#define NORMAL_EXPLOSION_VOLUME 1024 -#define SMALL_EXPLOSION_VOLUME 512 + inline unsigned char ExplodeSpriteScale() const + { + return m_iExplodeSpriteScale; + } + inline void SetExplodeSpriteScale(unsigned char val) + { + m_iExplodeSpriteScale = val; + } + inline float ExplosionRadius() const + { + return pev->fuser1; + } + inline void SetExplosionRadius(float radius) + { + pev->fuser1 = radius; + } + inline float OwnerDamageMultiplier() const + { + return pev->fuser2; + } + inline void SetOwnerDamageMultiplier(float multiplier) + { + pev->fuser2 = multiplier; + } + inline float PlayerContactDamageMultiplier() const + { + return pev->fuser3; + } + inline void SetPlayerContactDamageMultiplier(float multiplier) + { + pev->fuser3 = multiplier; + } -#define WEAPON_ACTIVITY_VOLUME 64 + BOOL m_fRegisteredSound; // whether or not this grenade has issued its DANGER sound to the world sound list yet. -#define VECTOR_CONE_1DEGREES Vector(0.00873f, 0.00873f, 0.00873f) -#define VECTOR_CONE_2DEGREES Vector(0.01745f, 0.01745f, 0.01745f) -#define VECTOR_CONE_3DEGREES Vector(0.02618f, 0.02618f, 0.02618f) -#define VECTOR_CONE_4DEGREES Vector(0.03490f, 0.03490f, 0.03490f) -#define VECTOR_CONE_5DEGREES Vector(0.04362f, 0.04362f, 0.04362f) -#define VECTOR_CONE_6DEGREES Vector(0.05234f, 0.05234f, 0.05234f) -#define VECTOR_CONE_7DEGREES Vector(0.06105f, 0.06105f, 0.06105f) -#define VECTOR_CONE_8DEGREES Vector(0.06976f, 0.06976f, 0.06976f) -#define VECTOR_CONE_9DEGREES Vector(0.07846f, 0.07846f, 0.07846f) -#define VECTOR_CONE_10DEGREES Vector(0.08716f, 0.08716f, 0.08716f) -#define VECTOR_CONE_15DEGREES Vector(0.13053f, 0.13053f, 0.13053f) -#define VECTOR_CONE_20DEGREES Vector(0.17365f, 0.17365f, 0.17365f) +private: + unsigned char m_iExplodeSpriteScale; +}; //========================================================= // CWeaponBox - a single entity that can store weapons @@ -608,6 +508,105 @@ bool bIsMultiplayer(void); void LoadVModel(const char* szViewModel, CBasePlayer* m_pPlayer); #endif +extern void ClearMultiDamage(void); +extern void ApplyMultiDamage(entvars_t* pevInflictor, entvars_t* pevAttacker); +extern void AddMultiDamage(entvars_t* pevInflictor, CBaseEntity* pEntity, float flDamage, int bitsDamageType); + +extern void DecalGunshot(TraceResult* pTrace, int iBulletType); +extern void SpawnBlood(Vector vecSpot, int bloodColor, float flDamage); +extern int DamageDecal(CBaseEntity* pEntity, int bitsDamageType); + +typedef struct +{ + CBaseEntity* pEntity; + float amount; + int type; +} MULTIDAMAGE; + +extern MULTIDAMAGE gMultiDamage; + +#ifdef HL_CONTENT + +#define WEAPON_CROWBAR 1 +#define WEAPON_GLOCK 2 +#define WEAPON_PYTHON 3 +#define WEAPON_MP5 4 +#define WEAPON_CHAINGUN 5 +#define WEAPON_CROSSBOW 6 +#define WEAPON_SHOTGUN 7 +#define WEAPON_RPG 8 +#define WEAPON_GAUSS 9 +#define WEAPON_EGON 10 +#define WEAPON_HORNETGUN 11 +#define WEAPON_HANDGRENADE 12 +#define WEAPON_TRIPMINE 13 +#define WEAPON_SATCHEL 14 +#define WEAPON_SNARK 15 + +// weapon weight factors (for auto-switching) (-1 = noswitch) +#define CROWBAR_WEIGHT 0 +#define GLOCK_WEIGHT 10 +#define PYTHON_WEIGHT 15 +#define MP5_WEIGHT 15 +#define SHOTGUN_WEIGHT 15 +#define CROSSBOW_WEIGHT 10 +#define RPG_WEIGHT 20 +#define GAUSS_WEIGHT 20 +#define EGON_WEIGHT 20 +#define HORNETGUN_WEIGHT 10 +#define HANDGRENADE_WEIGHT 5 +#define SNARK_WEIGHT 5 +#define SATCHEL_WEIGHT -10 +#define TRIPMINE_WEIGHT -10 + +// #define CROWBAR_MAX_CLIP WEAPON_NOCLIP +#define GLOCK_MAX_CLIP 17 +#define PYTHON_MAX_CLIP 6 +#define MP5_MAX_CLIP 50 +#define MP5_DEFAULT_AMMO 25 +#define SHOTGUN_MAX_CLIP 8 +#define CROSSBOW_MAX_CLIP 5 +#define RPG_MAX_CLIP 1 +#define GAUSS_MAX_CLIP WEAPON_NOCLIP +#define EGON_MAX_CLIP WEAPON_NOCLIP +#define HORNETGUN_MAX_CLIP WEAPON_NOCLIP +#define HANDGRENADE_MAX_CLIP WEAPON_NOCLIP +#define SATCHEL_MAX_CLIP WEAPON_NOCLIP +#define TRIPMINE_MAX_CLIP WEAPON_NOCLIP +#define SNARK_MAX_CLIP WEAPON_NOCLIP + +// the default amount of ammo that comes with each gun when it spawns +#define GLOCK_DEFAULT_GIVE 17 +#define PYTHON_DEFAULT_GIVE 6 +#define MP5_DEFAULT_GIVE 25 +#define MP5_DEFAULT_AMMO 25 +#define MP5_M203_DEFAULT_GIVE 0 +#define SHOTGUN_DEFAULT_GIVE 12 +#define CROSSBOW_DEFAULT_GIVE 5 +#define RPG_DEFAULT_GIVE 1 +#define GAUSS_DEFAULT_GIVE 20 +#define EGON_DEFAULT_GIVE 20 +#define HANDGRENADE_DEFAULT_GIVE 5 +#define SATCHEL_DEFAULT_GIVE 1 +#define TRIPMINE_DEFAULT_GIVE 1 +#define SNARK_DEFAULT_GIVE 5 +#define HIVEHAND_DEFAULT_GIVE 8 + +// The amount of ammo given to a player by an ammo item. +#define AMMO_URANIUMBOX_GIVE 20 +#define AMMO_GLOCKCLIP_GIVE GLOCK_MAX_CLIP +#define AMMO_357BOX_GIVE PYTHON_MAX_CLIP +#define AMMO_MP5CLIP_GIVE MP5_MAX_CLIP +#define AMMO_CHAINBOX_GIVE 200 +#define AMMO_M203BOX_GIVE 2 +#define AMMO_BUCKSHOTBOX_GIVE 12 +#define AMMO_CROSSBOWCLIP_GIVE CROSSBOW_MAX_CLIP +#define AMMO_RPGCLIP_GIVE RPG_MAX_CLIP +#define AMMO_URANIUMBOX_GIVE 20 +#define AMMO_SNARKBOX_GIVE 5 + +void DeactivateSatchels(CBasePlayer* pOwner); + enum glock_e { GLOCK_IDLE1 = 0, @@ -1175,4 +1174,5 @@ class CSqueak : public CBasePlayerWeapon private: unsigned short m_usSnarkFire; }; -#endif // WEAPONS_H + +#endif // HL_CONTENT diff --git a/game/game_libs/game_shared/weapons/weaponslots.cpp b/game/game_libs/game_shared/weapons/weaponslots.cpp index 8ddc122aa..83fae73f8 100644 --- a/game/game_libs/game_shared/weapons/weaponslots.cpp +++ b/game/game_libs/game_shared/weapons/weaponslots.cpp @@ -6,7 +6,6 @@ const int WEAPON_HUD_SLOTS[MAX_WEAPON_SLOTS][MAX_WEAPON_POSITIONS] = { // Slot 1 { - WEAPON_CROWBAR, static_cast(WeaponId_e::WeaponFists), // Debug weapons @@ -15,17 +14,12 @@ const int WEAPON_HUD_SLOTS[MAX_WEAPON_SLOTS][MAX_WEAPON_POSITIONS] = { // Slot 2 { - WEAPON_GLOCK, - WEAPON_PYTHON, static_cast(WeaponId_e::WeaponP99), static_cast(WeaponId_e::WeaponRaptor), }, // Slot 3 { - WEAPON_MP5, - WEAPON_SHOTGUN, - WEAPON_CROSSBOW, static_cast(WeaponId_e::WeaponFrinesi), static_cast(WeaponId_e::WeaponMP9), static_cast(WeaponId_e::WeaponL96A1), @@ -33,19 +27,11 @@ const int WEAPON_HUD_SLOTS[MAX_WEAPON_SLOTS][MAX_WEAPON_POSITIONS] = { // Slot 4 { - WEAPON_RPG, - WEAPON_GAUSS, - WEAPON_EGON, - WEAPON_HORNETGUN, static_cast(WeaponId_e::WeaponGrenadeLauncher), }, // Slot 5 { - WEAPON_HANDGRENADE, - WEAPON_SATCHEL, - WEAPON_TRIPMINE, - WEAPON_SNARK, - static_cast(WeaponId_e::WeaponFragGrenade) + static_cast(WeaponId_e::WeaponFragGrenade), }, }; diff --git a/xash3d_engine/engine/src/server/sv_init.c b/xash3d_engine/engine/src/server/sv_init.c index 173bb0194..e0c2db6e2 100644 --- a/xash3d_engine/engine/src/server/sv_init.c +++ b/xash3d_engine/engine/src/server/sv_init.c @@ -456,9 +456,13 @@ void SV_CreateBaseline(void) SV_WriteVoiceCodec(&sv.signon); if ( FBitSet(host.features, ENGINE_QUAKE_COMPATIBLE) ) + { playermodel = SV_ModelIndex(DEFAULT_PLAYER_PATH_QUAKE); + } else - playermodel = SV_ModelIndex(DEFAULT_PLAYER_PATH_HALFLIFE); + { + playermodel = SV_ModelIndex(PLAYER_MODEL_PATH); + } memset(&nullstate, 0, sizeof(nullstate));