From 3f636e0a3d6a102b80921ccb6b1f387d2819343e Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Mon, 8 Jan 2024 15:33:27 -0800 Subject: [PATCH] Add priority/weights to the weapons. --- src/shared/w_asscan.qc | 1 + src/shared/w_autorifle.qc | 1 + src/shared/w_crowbar.qc | 2 +- src/shared/w_dbs.qc | 1 + src/shared/w_flamer.qc | 1 + src/shared/w_glauncher.qc | 1 + src/shared/w_grapple.qc | 1 + src/shared/w_incendiary.qc | 1 + src/shared/w_knife.qc | 1 + src/shared/w_medkit.qc | 1 + src/shared/w_nailgun.qc | 1 + src/shared/w_pipebomb.qc | 1 + src/shared/w_railgun.qc | 1 + src/shared/w_rpg.qc | 1 + src/shared/w_sbs.qc | 1 + src/shared/w_sniper.qc | 1 + src/shared/w_supernail.qc | 1 + src/shared/w_tranquil.qc | 1 + src/shared/w_umbrella.qc | 1 + src/shared/w_wrench.qc | 1 + src/shared/weapons.h | 22 ++++++++++++++++++++++ 21 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/shared/w_asscan.qc b/src/shared/w_asscan.qc index 2d692aa..750d454 100644 --- a/src/shared/w_asscan.qc +++ b/src/shared/w_asscan.qc @@ -275,6 +275,7 @@ weapon_t w_asscan = .id = ITEM_ASSCAN, .slot = 3, .slot_pos = 3, + .weight = WEIGHT_ASSCAN, .draw = w_asscan_draw, .holster = w_asscan_holster, .primary = w_asscan_primary, diff --git a/src/shared/w_autorifle.qc b/src/shared/w_autorifle.qc index 3602ba6..18dccbe 100644 --- a/src/shared/w_autorifle.qc +++ b/src/shared/w_autorifle.qc @@ -167,6 +167,7 @@ weapon_t w_autorifle = .id = ITEM_AUTORIFLE, .slot = 2, .slot_pos = 0, + .weight = WEIGHT_AUTORIFLE, .draw = w_autorifle_draw, .holster = __NULL__, .primary = w_autorifle_primary, diff --git a/src/shared/w_crowbar.qc b/src/shared/w_crowbar.qc index 78d35da..a6ad24b 100644 --- a/src/shared/w_crowbar.qc +++ b/src/shared/w_crowbar.qc @@ -208,7 +208,7 @@ weapon_t w_crowbar = .id = ITEM_CROWBAR, .slot = 0, .slot_pos = 0, - .weight = 0, + .weight = WEIGHT_CROWBAR, .draw = w_crowbar_draw, .holster = w_crowbar_holster, .primary = w_crowbar_primary, diff --git a/src/shared/w_dbs.qc b/src/shared/w_dbs.qc index 2d9c983..1087020 100644 --- a/src/shared/w_dbs.qc +++ b/src/shared/w_dbs.qc @@ -202,6 +202,7 @@ weapon_t w_dbs = .id = ITEM_DBS, .slot = 2, .slot_pos = 1, + .weight = WEIGHT_DBS, .draw = w_dbs_draw, .holster = w_dbs_holster, .primary = w_dbs_primary, diff --git a/src/shared/w_flamer.qc b/src/shared/w_flamer.qc index dcd6134..935600d 100644 --- a/src/shared/w_flamer.qc +++ b/src/shared/w_flamer.qc @@ -234,6 +234,7 @@ weapon_t w_flamer = .id = ITEM_FLAMER, .slot = 3, .slot_pos = 2, + .weight = WEIGHT_FLAMER, .draw = w_flamer_draw, .holster = __NULL__, .primary = w_flamer_primary, diff --git a/src/shared/w_glauncher.qc b/src/shared/w_glauncher.qc index 98ca074..ab1f707 100644 --- a/src/shared/w_glauncher.qc +++ b/src/shared/w_glauncher.qc @@ -259,6 +259,7 @@ weapon_t w_glauncher = .id = ITEM_GLAUNCHER, .slot = 3, .slot_pos = 1, + .weight = WEIGHT_GLAUNCHER, .draw = w_glauncher_draw, .holster = __NULL__, .primary = w_glauncher_primary, diff --git a/src/shared/w_grapple.qc b/src/shared/w_grapple.qc index 6d60872..fa047eb 100644 --- a/src/shared/w_grapple.qc +++ b/src/shared/w_grapple.qc @@ -96,6 +96,7 @@ weapon_t w_grapple = .id = ITEM_GRAPPLE, .slot = 5, .slot_pos = 0, + .weight = WEIGHT_GRAPPLE, .draw = w_grapple_draw, .holster = __NULL__, .primary = __NULL__, diff --git a/src/shared/w_incendiary.qc b/src/shared/w_incendiary.qc index 52a471b..b57259c 100644 --- a/src/shared/w_incendiary.qc +++ b/src/shared/w_incendiary.qc @@ -183,6 +183,7 @@ weapon_t w_incendiary = .id = ITEM_INCENDIARY, .slot = 4, .slot_pos = 3, + .weight = WEIGHT_INCENDIARY, .draw = w_incendiary_draw, .holster = __NULL__, .primary = w_incendiary_primary, diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index fd6bb8a..b2739e8 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -183,6 +183,7 @@ weapon_t w_knife = .id = ITEM_KNIFE, .slot = 0, .slot_pos = 2, + .weight = WEIGHT_KNIFE, .draw = w_knife_draw, .holster = w_knife_holster, .primary = w_knife_primary, diff --git a/src/shared/w_medkit.qc b/src/shared/w_medkit.qc index 26cd1c7..98dcc91 100644 --- a/src/shared/w_medkit.qc +++ b/src/shared/w_medkit.qc @@ -170,6 +170,7 @@ weapon_t w_medkit = .id = ITEM_MEDKIT, .slot = 0, .slot_pos = 1, + .weight = WEIGHT_MEDKIT, .draw = w_medkit_draw, .holster = __NULL__, .primary = w_medkit_primary, diff --git a/src/shared/w_nailgun.qc b/src/shared/w_nailgun.qc index 84b2eb2..9789001 100644 --- a/src/shared/w_nailgun.qc +++ b/src/shared/w_nailgun.qc @@ -194,6 +194,7 @@ weapon_t w_nailgun = .id = ITEM_NAILGUN, .slot = 3, .slot_pos = 0, + .weight = WEIGHT_NAILGUN, .draw = w_nailgun_draw, .holster = __NULL__, .primary = w_nailgun_primary, diff --git a/src/shared/w_pipebomb.qc b/src/shared/w_pipebomb.qc index 7cf0db8..4ef8219 100644 --- a/src/shared/w_pipebomb.qc +++ b/src/shared/w_pipebomb.qc @@ -289,6 +289,7 @@ weapon_t w_pipebomb = .id = ITEM_PIPEBOMB, .slot = 4, .slot_pos = 1, + .weight = WEIGHT_PIPEBOMB, .draw = w_pipebomb_draw, .holster = __NULL__, .primary = w_pipebomb_primary, diff --git a/src/shared/w_railgun.qc b/src/shared/w_railgun.qc index 9f8bc09..28731d8 100644 --- a/src/shared/w_railgun.qc +++ b/src/shared/w_railgun.qc @@ -184,6 +184,7 @@ weapon_t w_railgun = .id = ITEM_RAILGUN, .slot = 1, .slot_pos = 3, + .weight = WEIGHT_RAILGUN, .draw = w_railgun_draw, .holster = __NULL__, .primary = w_railgun_primary, diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc index ee3476e..81a7c8e 100644 --- a/src/shared/w_rpg.qc +++ b/src/shared/w_rpg.qc @@ -224,6 +224,7 @@ weapon_t w_rpg = .id = ITEM_RPG, .slot = 4, .slot_pos = 0, + .weight = WEIGHT_RPG, .draw = w_rpg_draw, .holster = __NULL__, .primary = w_rpg_primary, diff --git a/src/shared/w_sbs.qc b/src/shared/w_sbs.qc index f345479..f80641f 100644 --- a/src/shared/w_sbs.qc +++ b/src/shared/w_sbs.qc @@ -190,6 +190,7 @@ weapon_t w_sbs = .id = ITEM_SBS, .slot = 1, .slot_pos = 0, + .weight = WEIGHT_SBS, .draw = w_sbs_draw, .holster = w_sbs_holster, .primary = w_sbs_primary, diff --git a/src/shared/w_sniper.qc b/src/shared/w_sniper.qc index 25ca2bb..8bc887d 100644 --- a/src/shared/w_sniper.qc +++ b/src/shared/w_sniper.qc @@ -220,6 +220,7 @@ weapon_t w_sniper = .id = ITEM_SNIPER, .slot = 1, .slot_pos = 1, + .weight = WEIGHT_SNIPER, .draw = w_sniper_draw, .holster = __NULL__, .primary = w_sniper_primary, diff --git a/src/shared/w_supernail.qc b/src/shared/w_supernail.qc index a9bc964..3c0ff2c 100644 --- a/src/shared/w_supernail.qc +++ b/src/shared/w_supernail.qc @@ -209,6 +209,7 @@ weapon_t w_supernail = .id = ITEM_SUPERNAIL, .slot = 3, .slot_pos = 2, + .weight = WEIGHT_SUPERNAIL, .draw = w_supernail_draw, .holster = __NULL__, .primary = w_supernail_primary, diff --git a/src/shared/w_tranquil.qc b/src/shared/w_tranquil.qc index 212ee11..d09d9f2 100644 --- a/src/shared/w_tranquil.qc +++ b/src/shared/w_tranquil.qc @@ -188,6 +188,7 @@ weapon_t w_tranquil = .id = ITEM_TRANQUIL, .slot = 1, .slot_pos = 2, + .weight = WEIGHT_TRANQUIL, .draw = w_tranquil_draw, .holster = __NULL__, .primary = w_tranquil_primary, diff --git a/src/shared/w_umbrella.qc b/src/shared/w_umbrella.qc index 426604d..70f5d8b 100644 --- a/src/shared/w_umbrella.qc +++ b/src/shared/w_umbrella.qc @@ -215,6 +215,7 @@ weapon_t w_umbrella = .id = ITEM_UMBRELLA, .slot = 0, .slot_pos = 4, + .weight = WEIGHT_UMBRELLA, .draw = w_umbrella_draw, .holster = w_umbrella_holster, .primary = w_umbrella_primary, diff --git a/src/shared/w_wrench.qc b/src/shared/w_wrench.qc index a3dde92..0abc5e3 100644 --- a/src/shared/w_wrench.qc +++ b/src/shared/w_wrench.qc @@ -232,6 +232,7 @@ weapon_t w_wrench = .id = ITEM_WRENCH, .slot = 0, .slot_pos = 3, + .weight = WEIGHT_WRENCH, .draw = w_wrench_draw, .holster = w_wrench_holster, .primary = w_wrench_primary, diff --git a/src/shared/weapons.h b/src/shared/weapons.h index b85dcf2..4075391 100644 --- a/src/shared/weapons.h +++ b/src/shared/weapons.h @@ -39,3 +39,25 @@ enum WEAPON_INCENDIARY, WEAPON_GRAPPLE }; + + +#define WEIGHT_CROWBAR -1 +#define WEIGHT_MEDKIT 1 +#define WEIGHT_KNIFE 1 +#define WEIGHT_WRENCH 1 +#define WEIGHT_UMBRELLA 1 +#define WEIGHT_SBS 10 +#define WEIGHT_SNIPER 10 +#define WEIGHT_TRANQUIL 10 +#define WEIGHT_RAILGUN 10 +#define WEIGHT_AUTORIFLE 10 +#define WEIGHT_DBS 20 +#define WEIGHT_NAILGUN 20 +#define WEIGHT_GLAUNCHER 20 +#define WEIGHT_SUPERNAIL 20 +#define WEIGHT_FLAMER 20 +#define WEIGHT_RPG 20 +#define WEIGHT_PIPEBOMB 0 +#define WEIGHT_ASSCAN 20 +#define WEIGHT_INCENDIARY 20 +#define WEIGHT_GRAPPLE -1 \ No newline at end of file