From fe0b9681d08a4b2ceed495092e4f1ded2bb3f724 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 10 Mar 2022 19:01:08 -0800 Subject: [PATCH] Fill in some more info to help botlib's AI (weapon types, gamemode team setting) --- src/server/gamerules.h | 1 + src/server/gamerules_multiplayer.qc | 6 ++++++ src/shared/w_ak47.qc | 1 + src/shared/w_aug.qc | 1 + src/shared/w_awp.qc | 1 + src/shared/w_deagle.qc | 1 + src/shared/w_elites.qc | 1 + src/shared/w_fiveseven.qc | 1 + src/shared/w_g3sg1.qc | 1 + src/shared/w_glock18.qc | 1 + src/shared/w_knife.qc | 1 + src/shared/w_m3.qc | 1 + src/shared/w_m4a1.qc | 1 + src/shared/w_mac10.qc | 1 + src/shared/w_mp5.qc | 1 + src/shared/w_p228.qc | 1 + src/shared/w_p90.qc | 1 + src/shared/w_para.qc | 1 + src/shared/w_scout.qc | 1 + src/shared/w_sg550.qc | 1 + src/shared/w_sg552.qc | 1 + src/shared/w_tmp.qc | 1 + src/shared/w_ump45.qc | 1 + src/shared/w_usp45.qc | 1 + src/shared/w_xm1014.qc | 1 + src/shared/weapons_cstrike.qc | 12 ++++++++++++ 26 files changed, 42 insertions(+) diff --git a/src/server/gamerules.h b/src/server/gamerules.h index deebb81..911ea36 100644 --- a/src/server/gamerules.h +++ b/src/server/gamerules.h @@ -70,6 +70,7 @@ class CSMultiplayerRules:CSGameRules virtual void(void) CountPlayers; virtual void(void) SwitchTeams; virtual void(void) TimeOut; + virtual float(void) IsTeamPlay; virtual void(base_player) PlayerClearWeaponry; virtual void(base_player, int) PlayerMakePlayable; diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index c596c02..131eedb 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -969,6 +969,12 @@ CSMultiplayerRules::ConsoleCommand(base_player pp, string cmd) return (1); } +float +CSMultiplayerRules::IsTeamPlay(void) +{ + return TRUE; +} + void CSMultiplayerRules::CSMultiplayerRules(void) { diff --git a/src/shared/w_ak47.qc b/src/shared/w_ak47.qc index 5bf4ad5..75af6e9 100644 --- a/src/shared/w_ak47.qc +++ b/src/shared/w_ak47.qc @@ -321,6 +321,7 @@ weapon_t w_ak47 = .deathmsg = w_ak47_deathmsg, .aimanim = w_ak47_aimanim, .hudpic = w_ak47_hudpic, + .type = csweapon_ranged_type, .isempty = w_ak47_isempty }; diff --git a/src/shared/w_aug.qc b/src/shared/w_aug.qc index fc0b9d4..f5503ad 100644 --- a/src/shared/w_aug.qc +++ b/src/shared/w_aug.qc @@ -311,6 +311,7 @@ weapon_t w_aug = .deathmsg = w_aug_deathmsg, .aimanim = w_aug_aimanim, .hudpic = w_aug_hudpic, + .type = csweapon_ranged_type, .isempty = w_aug_isempty }; diff --git a/src/shared/w_awp.qc b/src/shared/w_awp.qc index f31d69f..21c4cfa 100644 --- a/src/shared/w_awp.qc +++ b/src/shared/w_awp.qc @@ -366,6 +366,7 @@ weapon_t w_awp = .deathmsg = w_awp_deathmsg, .aimanim = w_awp_aimanim, .hudpic = w_awp_hudpic, + .type = csweapon_ranged_type, .isempty = w_awp_isempty }; diff --git a/src/shared/w_deagle.qc b/src/shared/w_deagle.qc index 2634e9c..d4295af 100644 --- a/src/shared/w_deagle.qc +++ b/src/shared/w_deagle.qc @@ -320,6 +320,7 @@ weapon_t w_deagle = .deathmsg = w_deagle_deathmsg, .aimanim = w_deagle_aimanim, .hudpic = w_deagle_hudpic, + .type = csweapon_ranged_type, .isempty = w_deagle_isempty }; diff --git a/src/shared/w_elites.qc b/src/shared/w_elites.qc index 2c74cfb..dd221c3 100644 --- a/src/shared/w_elites.qc +++ b/src/shared/w_elites.qc @@ -390,6 +390,7 @@ weapon_t w_elites = .deathmsg = w_elites_deathmsg, .aimanim = w_elites_aimanim, .hudpic = w_elites_hudpic, + .type = csweapon_ranged_type, .isempty = w_elites_isempty }; diff --git a/src/shared/w_fiveseven.qc b/src/shared/w_fiveseven.qc index 7c89a89..feb0a66 100644 --- a/src/shared/w_fiveseven.qc +++ b/src/shared/w_fiveseven.qc @@ -289,6 +289,7 @@ weapon_t w_fiveseven = .deathmsg = w_fiveseven_deathmsg, .aimanim = w_fiveseven_aimanim, .hudpic = w_fiveseven_hudpic, + .type = csweapon_ranged_type, .isempty = w_fiveseven_isempty }; diff --git a/src/shared/w_g3sg1.qc b/src/shared/w_g3sg1.qc index cb239c0..ed30a91 100644 --- a/src/shared/w_g3sg1.qc +++ b/src/shared/w_g3sg1.qc @@ -304,6 +304,7 @@ weapon_t w_g3sg1 = .deathmsg = w_g3sg1_deathmsg, .aimanim = w_g3sg1_aimanim, .hudpic = w_g3sg1_hudpic, + .type = csweapon_ranged_type, .isempty = w_g3sg1_isempty }; diff --git a/src/shared/w_glock18.qc b/src/shared/w_glock18.qc index e80609e..546ac1f 100644 --- a/src/shared/w_glock18.qc +++ b/src/shared/w_glock18.qc @@ -356,6 +356,7 @@ weapon_t w_glock18 = .deathmsg = w_glock18_deathmsg, .aimanim = w_glock18_aimanim, .hudpic = w_glock18_hudpic, + .type = csweapon_ranged_type, .isempty = w_glock18_isempty }; diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index 1672849..03f947d 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -241,6 +241,7 @@ weapon_t w_knife = .deathmsg = w_knife_deathmsg, .aimanim = w_knife_aimanim, .hudpic = w_knife_hudpic, + .type = csweapon_melee_type, .isempty = w_knife_isempty }; diff --git a/src/shared/w_m3.qc b/src/shared/w_m3.qc index c709f68..202a1ca 100644 --- a/src/shared/w_m3.qc +++ b/src/shared/w_m3.qc @@ -368,6 +368,7 @@ weapon_t w_m3 = .deathmsg = w_m3_deathmsg, .aimanim = w_m3_aimanim, .hudpic = w_m3_hudpic, + .type = csweapon_ranged_type, .isempty = w_m3_isempty }; diff --git a/src/shared/w_m4a1.qc b/src/shared/w_m4a1.qc index f170faf..ce09678 100644 --- a/src/shared/w_m4a1.qc +++ b/src/shared/w_m4a1.qc @@ -361,6 +361,7 @@ weapon_t w_m4a1 = .deathmsg = w_m4a1_deathmsg, .aimanim = w_m4a1_aimanim, .hudpic = w_m4a1_hudpic, + .type = csweapon_ranged_type, .isempty = w_m4a1_isempty }; diff --git a/src/shared/w_mac10.qc b/src/shared/w_mac10.qc index 4c9bae8..66ed329 100644 --- a/src/shared/w_mac10.qc +++ b/src/shared/w_mac10.qc @@ -284,6 +284,7 @@ weapon_t w_mac10 = .deathmsg = w_mac10_deathmsg, .aimanim = w_mac10_aimanim, .hudpic = w_mac10_hudpic, + .type = csweapon_ranged_type, .isempty = w_mac10_isempty }; diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc index 7b30d1f..6cab4df 100644 --- a/src/shared/w_mp5.qc +++ b/src/shared/w_mp5.qc @@ -282,6 +282,7 @@ weapon_t w_mp5 = .deathmsg = w_mp5_deathmsg, .aimanim = w_mp5_aimanim, .hudpic = w_mp5_hudpic, + .type = csweapon_ranged_type, .isempty = w_mp5_isempty }; diff --git a/src/shared/w_p228.qc b/src/shared/w_p228.qc index cba1946..3c8d9a6 100644 --- a/src/shared/w_p228.qc +++ b/src/shared/w_p228.qc @@ -290,6 +290,7 @@ weapon_t w_p228 = .deathmsg = w_p228_deathmsg, .aimanim = w_p228_aimanim, .hudpic = w_p228_hudpic, + .type = csweapon_ranged_type, .isempty = w_p228_isempty }; diff --git a/src/shared/w_p90.qc b/src/shared/w_p90.qc index d4b44db..3a93395 100644 --- a/src/shared/w_p90.qc +++ b/src/shared/w_p90.qc @@ -282,6 +282,7 @@ weapon_t w_p90 = .deathmsg = w_p90_deathmsg, .aimanim = w_p90_aimanim, .hudpic = w_p90_hudpic, + .type = csweapon_ranged_type, .isempty = w_p90_isempty }; diff --git a/src/shared/w_para.qc b/src/shared/w_para.qc index fe4f400..6120372 100644 --- a/src/shared/w_para.qc +++ b/src/shared/w_para.qc @@ -278,6 +278,7 @@ weapon_t w_para = .deathmsg = w_para_deathmsg, .aimanim = w_para_aimanim, .hudpic = w_para_hudpic, + .type = csweapon_ranged_type, .isempty = w_para_isempty }; diff --git a/src/shared/w_scout.qc b/src/shared/w_scout.qc index 6a1daec..96499fc 100644 --- a/src/shared/w_scout.qc +++ b/src/shared/w_scout.qc @@ -329,6 +329,7 @@ weapon_t w_scout = .deathmsg = w_scout_deathmsg, .aimanim = w_scout_aimanim, .hudpic = w_scout_hudpic, + .type = csweapon_ranged_type, .isempty = w_scout_isempty }; diff --git a/src/shared/w_sg550.qc b/src/shared/w_sg550.qc index 81f964f..4767def 100644 --- a/src/shared/w_sg550.qc +++ b/src/shared/w_sg550.qc @@ -305,6 +305,7 @@ weapon_t w_sg550 = .deathmsg = w_sg550_deathmsg, .aimanim = w_sg550_aimanim, .hudpic = w_sg550_hudpic, + .type = csweapon_ranged_type, .isempty = w_sg550_isempty }; diff --git a/src/shared/w_sg552.qc b/src/shared/w_sg552.qc index 6b0be03..ed0471e 100644 --- a/src/shared/w_sg552.qc +++ b/src/shared/w_sg552.qc @@ -308,6 +308,7 @@ weapon_t w_sg552 = .deathmsg = w_sg552_deathmsg, .aimanim = w_sg552_aimanim, .hudpic = w_sg552_hudpic, + .type = csweapon_ranged_type, .isempty = w_sg552_isempty }; diff --git a/src/shared/w_tmp.qc b/src/shared/w_tmp.qc index 4844c8d..7f5b828 100644 --- a/src/shared/w_tmp.qc +++ b/src/shared/w_tmp.qc @@ -282,6 +282,7 @@ weapon_t w_tmp = .deathmsg = w_tmp_deathmsg, .aimanim = w_tmp_aimanim, .hudpic = w_tmp_hudpic, + .type = csweapon_ranged_type, .isempty = w_tmp_isempty }; diff --git a/src/shared/w_ump45.qc b/src/shared/w_ump45.qc index 0d1eb77..58f4681 100644 --- a/src/shared/w_ump45.qc +++ b/src/shared/w_ump45.qc @@ -282,6 +282,7 @@ weapon_t w_ump45 = .deathmsg = w_ump45_deathmsg, .aimanim = w_ump45_aimanim, .hudpic = w_ump45_hudpic, + .type = csweapon_ranged_type, .isempty = w_ump45_isempty }; diff --git a/src/shared/w_usp45.qc b/src/shared/w_usp45.qc index fcf6e94..29ea65e 100644 --- a/src/shared/w_usp45.qc +++ b/src/shared/w_usp45.qc @@ -360,6 +360,7 @@ weapon_t w_usp45 = .deathmsg = w_usp45_deathmsg, .aimanim = w_usp45_aimanim, .hudpic = w_usp45_hudpic, + .type = csweapon_ranged_type, .isempty = w_usp45_isempty }; diff --git a/src/shared/w_xm1014.qc b/src/shared/w_xm1014.qc index 29307e5..8ebbdb9 100644 --- a/src/shared/w_xm1014.qc +++ b/src/shared/w_xm1014.qc @@ -370,6 +370,7 @@ weapon_t w_xm1014 = .deathmsg = w_xm1014_deathmsg, .aimanim = w_xm1014_aimanim, .hudpic = w_xm1014_hudpic, + .type = csweapon_ranged_type, .isempty = w_xm1014_isempty }; diff --git a/src/shared/weapons_cstrike.qc b/src/shared/weapons_cstrike.qc index a720140..e48cfc9 100644 --- a/src/shared/weapons_cstrike.qc +++ b/src/shared/weapons_cstrike.qc @@ -28,6 +28,18 @@ * to other weapons. */ +weapontype_t +csweapon_ranged_type(void) +{ + return WPNTYPE_RANGED; +} + +weapontype_t +csweapon_melee_type(void) +{ + return WPNTYPE_CLOSE; +} + /* called whenever a cstrike gun fires a successful shot */ void Cstrike_ShotMultiplierAdd(player pl, int shots)