From 810df0fb74dd96d966577c7fed7ed611856bdcf2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 6 Dec 2022 19:43:27 +1000 Subject: [PATCH] Add classic guns to multiplayer --- src/game/botinv.c | 16 ++++++++-------- src/game/mplayer/mplayer.c | 8 ++++++++ src/include/constants.h | 38 +++++++++++++++++++++++--------------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/game/botinv.c b/src/game/botinv.c index 157695623..c61dd91a4 100644 --- a/src/game/botinv.c +++ b/src/game/botinv.c @@ -69,14 +69,14 @@ struct aibotweaponpreference g_AibotWeaponPreferences[] = { /*0x21*/ { 40, 176, 0, 0, 0, 0, BOTDISTCFG_THROWEXPLOSIVE, BOTDISTCFG_DEFAULT, 5, 5, 1, 1, 1, 0 }, // WEAPON_PROXIMITYMINE /*0x22*/ { 44, 156, 0, 0, 1, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 5, 5, 2, 2, 1, 0 }, // WEAPON_REMOTEMINE /*0x23*/ { 8, 8, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_COMBATBOOST - /*0x24*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_PP9I - /*0x25*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_CC13 - /*0x26*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_KL01313 - /*0x27*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_KF7SPECIAL - /*0x28*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_ZZT - /*0x29*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_DMC - /*0x2a*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_AR53 - /*0x2b*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_RCP45 + /*0x24*/ { 56, 60, 84, 88, 1, 1, BOTDISTCFG_PISTOL, BOTDISTCFG_CLOSE, 30, 0, 10, 0, 1, 0 }, // WEAPON_PP9I + /*0x25*/ { 76, 88, 104, 120, 1, 1, BOTDISTCFG_PISTOL, BOTDISTCFG_DEFAULT, 30, 30, 10, 10, 1, 0 }, // WEAPON_CC13 + /*0x26*/ { 120, 128, 132, 140, 1, 1, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 150, 150, 50, 50, 2, 0 }, // WEAPON_KL01313 + /*0x27*/ { 124, 148, 140, 156, 1, 1, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 90, 0, 30, 0, 1, 0 }, // WEAPON_KF7SPECIAL + /*0x28*/ { 116, 128, 136, 152, 1, 1, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 100, 100, 30, 30, 2, 0 }, // WEAPON_ZZT + /*0x29*/ { 152, 176, 172, 196, 1, 1, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 100, 70, 25, 15, 2, 0 }, // WEAPON_DMC + /*0x2a*/ { 156, 180, 176, 200, 1, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 150, 0, 40, 0, 2, 0 }, // WEAPON_AR53 + /*0x2b*/ { 172, 188, 192, 208, 1, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 300, 0, 40, 0, 2, 0 }, // WEAPON_RCP45 /*0x2c*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_PSYCHOSISGUN /*0x2d*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_NIGHTVISION /*0x2e*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_EYESPY diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 26148844d..1eee225f8 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -95,6 +95,14 @@ struct mpweapon g_MpWeapons[NUM_MPWEAPONS] = { /*0x22*/ { WEAPON_XRAYSCANNER, 0x00, 0x00, 0x00, 0x00, 1, MPFEATURE_WEAPON_XRAYSCANNER, MODEL_CHRNIGHTSIGHT, 0x0100 }, /*0x23*/ { WEAPON_CLOAKINGDEVICE, 0x00, 0x00, 0x00, 0x00, 1, MPFEATURE_WEAPON_CLOAKINGDEVICE, MODEL_CHRCLOAKER, 0x0100 }, /*0x24*/ { WEAPON_COMBATBOOST, 0x00, 0x00, 0x00, 0x00, 1, MPFEATURE_WEAPON_COMBATBOOST, MODEL_CHRSPEEDPILL, 0x0100 }, + /*0x24*/ { WEAPON_PP9I, AMMOTYPE_PISTOL, 0x50, 0x00, 0x00, 1, 0, MODEL_CHRWPPK, 0x0100 }, + /*0x25*/ { WEAPON_CC13, AMMOTYPE_PISTOL, 0x50, 0x00, 0x00, 1, 0, MODEL_CHRTT33, 0x0100 }, + /*0x26*/ { WEAPON_KL01313, AMMOTYPE_SMG, 0x64, 0x00, 0x00, 1, 0, MODEL_CHRSKORPION, 0x0100 }, + /*0x27*/ { WEAPON_KF7SPECIAL, AMMOTYPE_RIFLE, 0x64, 0x00, 0x00, 1, 0, MODEL_CHRKALASH, 0x0100 }, + /*0x28*/ { WEAPON_ZZT, AMMOTYPE_SMG, 0x64, 0x00, 0x00, 1, 0, MODEL_CHRUZI, 0x0100 }, + /*0x29*/ { WEAPON_DMC, AMMOTYPE_SMG, 0x64, 0x00, 0x00, 1, 0, MODEL_CHRMP5K, 0x0100 }, + /*0x2a*/ { WEAPON_AR53, AMMOTYPE_RIFLE, 0x96, 0x00, 0x00, 1, 0, MODEL_CHRM16, 0x0100 }, + /*0x2b*/ { WEAPON_RCP45, AMMOTYPE_SMG, 0x96, 0x00, 0x00, 1, 0, MODEL_CHRFNP90, 0x0100 }, /*0x25*/ { WEAPON_MPSHIELD, 0x00, 0x00, 0x00, 0x00, 1, MPFEATURE_WEAPON_SHIELD, MODEL_CHRSHIELD, 0x0100 }, /*0x26*/ { WEAPON_DISABLED }, }; diff --git a/src/include/constants.h b/src/include/constants.h index 954fa3178..027f77efc 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -2979,21 +2979,29 @@ #define MPWEAPON_DEVASTATOR 0x16 #define MPWEAPON_ROCKETLAUNCHER 0x17 #define MPWEAPON_SLAYER 0x18 -#define MPWEAPON_COMBATKNIFE (VERSION == VERSION_JPN_FINAL ? 0 : 0x19) -#define MPWEAPON_CROSSBOW (VERSION == VERSION_JPN_FINAL ? 0x19 : 0x1a) -#define MPWEAPON_TRANQUILIZER (VERSION == VERSION_JPN_FINAL ? 0x1a : 0x1b) -#define MPWEAPON_GRENADE (VERSION == VERSION_JPN_FINAL ? 0x1b : 0x1c) -#define MPWEAPON_NBOMB (VERSION == VERSION_JPN_FINAL ? 0x1c : 0x1d) -#define MPWEAPON_TIMEDMINE (VERSION == VERSION_JPN_FINAL ? 0x1d : 0x1e) -#define MPWEAPON_PROXIMITYMINE (VERSION == VERSION_JPN_FINAL ? 0x1e : 0x1f) -#define MPWEAPON_REMOTEMINE (VERSION == VERSION_JPN_FINAL ? 0x1f : 0x20) -#define MPWEAPON_LASER (VERSION == VERSION_JPN_FINAL ? 0x20 : 0x21) -#define MPWEAPON_XRAYSCANNER (VERSION == VERSION_JPN_FINAL ? 0x21 : 0x22) -#define MPWEAPON_CLOAKINGDEVICE (VERSION == VERSION_JPN_FINAL ? 0x22 : 0x23) -#define MPWEAPON_COMBATBOOST (VERSION == VERSION_JPN_FINAL ? 0x23 : 0x24) -#define MPWEAPON_SHIELD (VERSION == VERSION_JPN_FINAL ? 0x24 : 0x25) -#define MPWEAPON_DISABLED (VERSION == VERSION_JPN_FINAL ? 0x25 : 0x26) -#define NUM_MPWEAPONS (VERSION == VERSION_JPN_FINAL ? 0x26 : 0x27) +#define MPWEAPON_COMBATKNIFE 0x19 +#define MPWEAPON_CROSSBOW 0x1a +#define MPWEAPON_TRANQUILIZER 0x1b +#define MPWEAPON_GRENADE 0x1c +#define MPWEAPON_NBOMB 0x1d +#define MPWEAPON_TIMEDMINE 0x1e +#define MPWEAPON_PROXIMITYMINE 0x1f +#define MPWEAPON_REMOTEMINE 0x20 +#define MPWEAPON_LASER 0x21 +#define MPWEAPON_XRAYSCANNER 0x22 +#define MPWEAPON_CLOAKINGDEVICE 0x23 +#define MPWEAPON_COMBATBOOST 0x24 +#define MPWEAPON_SHIELD 0x25 +#define MPWEAPON_DISABLED 0x26 +#define MPWEAPON_PP9I 0x27 +#define MPWEAPON_CC13 0x28 +#define MPWEAPON_KL01313 0x29 +#define MPWEAPON_KF7SPECIAL 0x2a +#define MPWEAPON_ZZT 0x2b +#define MPWEAPON_DMC 0x2c +#define MPWEAPON_AR53 0x2d +#define MPWEAPON_RCP45 0x2e +#define NUM_MPWEAPONS 0x2f #define MUSICEVENTTYPE_PLAY 1 #define MUSICEVENTTYPE_STOP 2