From b00a2e189528156ee0207e638ef29c8864929541 Mon Sep 17 00:00:00 2001 From: Magnus Date: Thu, 12 Jan 2006 02:12:31 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1846 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- quakec/fallout2/inventory.qc | 25 ++++++++++++++++++++++++- quakec/fallout2/menus.qc | 9 +++++++-- quakec/fallout2/mod_buy.qc | 15 +++++++++++---- quakec/fallout2/weapons.qc | 5 +++++ 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/quakec/fallout2/inventory.qc b/quakec/fallout2/inventory.qc index 860901273..806717379 100644 --- a/quakec/fallout2/inventory.qc +++ b/quakec/fallout2/inventory.qc @@ -2,7 +2,7 @@ float IID_NONE = 0; #define IsMelee(iid) (iid == IID_NONE || (iid >= IID_WP_TOOLKIT && iid <= IID_WP_POWERAXE)) #define IsGrenade(iid) (iid >= IID_GREN_FRAG && iid <= IID_GREN_FLASH) -#define IsRanged(iid) (iid >= IID_WP_USP && iid <= IID_WP_PULSERIFLE) +#define IsRanged(iid) (iid >= IID_WP_USP && iid <= IID_WP_ROCKETLAUNCHER) //weapons with ammo, things with a toggle state #define NotStackable(iid) (IsRanged(iid)) @@ -34,6 +34,7 @@ float IID_WP_SA80 = 420; float IID_WP_GAUSERIFLE = 421; //2mm EC float IID_WP_PULSERIFLE = 422; float IID_WP_FNFAL = 423; //.308 AP +float IID_WP_ROCKETLAUNCHER = 430; //and ammo for those guns @@ -47,6 +48,7 @@ float IID_AM_2MMEC = 513; //12mmec ammo"; float IID_AM_762MM = 514; //"7.62mm ammo"; float IID_AM_44MAGNUM = 515; //".44 magnum ammo"; float IID_AM_45ACP = 516; //".45 ACP ammo"; +float IID_AM_ROCKET = 517; //"explosive rocket" //grenade items float IID_GREN_FRAG = 101; @@ -481,6 +483,9 @@ string(float iid) GetItemVModel = if (iid == IID_WP_PULSERIFLE) return "progs/v_carbine.mdl"; + if (iid == IID_WP_ROCKETLAUNCHER) + return "progs/v_rocket.mdl"; + if (iid == IID_GREN_FRAG) return "progs/v_handgren.mdl"; if (iid == IID_GREN_EMP) @@ -545,6 +550,8 @@ string(float iid) GetItemWModel = return "progs/w_gauss.mdl"; if (iid == IID_WP_PULSERIFLE) return "progs/w_carbine.mdl"; + if (iid == IID_WP_ROCKETLAUNCHER) + return "progs/w_rocket.mdl"; if (iid == IID_GREN_FRAG) return "progs/grenade2.mdl"; @@ -615,6 +622,8 @@ float(float iid) WeaponAmmoType = return IID_AM_2MMEC; if (iid == IID_WP_PULSERIFLE) return IID_AM_ENERGYCELL; + if (iid == IID_WP_ROCKETLAUNCHER) + return IID_AM_ROCKET; return IID_NONE; }; @@ -659,6 +668,8 @@ float(float iid) WeaponMagQuant = return 40; if (iid == IID_WP_FNFAL) return 20; + if (iid == IID_WP_ROCKETLAUNCHER) + return 1; return 0; }; @@ -713,6 +724,8 @@ float(float iid) GetItemWeight = return 12; if (iid == IID_WP_FNFAL) return 9; + if (iid == IID_WP_ROCKETLAUNCHER) + return 10; if (iid == IID_ARM_SHIRT) @@ -812,6 +825,8 @@ string(float iid) GetItemName = return "laser carbine (energy)"; if (iid == IID_WP_FNFAL) return "fn-fal (7.62mm)"; + if (iid == IID_WP_ROCKETLAUNCHER) + return "rocket launcher"; @@ -835,6 +850,8 @@ string(float iid) GetItemName = return ".44 magnum ammo"; if (iid == IID_AM_45ACP) return ".45 ACP ammo"; + if (iid == IID_AM_ROCKET) + return "explosive rocket"; if (iid == IID_GREN_FRAG) @@ -971,6 +988,8 @@ string(float iid) GetItemImage = return "lcarbine.jpg"; if (iid == IID_WP_FNFAL) return "fnfal.jpg"; + if (iid == IID_WP_ROCKETLAUNCHER) + return "rpg.jpg"; if (iid == IID_AM_NEEDLER) @@ -993,6 +1012,8 @@ string(float iid) GetItemImage = return "44mag.jpg"; if (iid == IID_AM_45ACP) return "45acp.jpg"; + if (iid == IID_AM_ROCKET) + return "rocket.jpg"; if (iid == IID_GREN_FRAG) @@ -1112,6 +1133,8 @@ float(string itname) ItemIDOfName = return IID_WP_GAUSERIFLE; if (itname == "laser carbine") return IID_WP_PULSERIFLE; + if (itname == "rocket") + return IID_WP_ROCKETLAUNCHER; if (itname == "frag grenade") return IID_GREN_FRAG; if (itname == "emp grenade") diff --git a/quakec/fallout2/menus.qc b/quakec/fallout2/menus.qc index eca112812..fe4fba413 100644 --- a/quakec/fallout2/menus.qc +++ b/quakec/fallout2/menus.qc @@ -41,7 +41,7 @@ string () ShopString = string () WeaponString = { - return ("weaponry\n\n1‘ melee \n2‘ thrown \n3‘ pistols&smgs \n4‘ shotguns \n5‘ rifles \ne‘ leave \n"); + return ("weaponry\n\n1‘ melee \n2‘ thrown \n3‘ pistols&smgs \n4‘ shotguns \n5‘ rifles \n6‘ heavy guns \ne‘ leave \n"); }; string () TraitString = @@ -141,7 +141,12 @@ string () ShotgunString = */ string () RifleString = { - return ("rifles\n RIFLE | TYPE | WEIGHT | PRICE \n\n1‘ rangemaster 7mm 03 11$\n2‘ ak-112 5mm 04 21$\n3‘ remington .308 05 24$\n4‘ ak-74 5mm 04 27$\n5‘ moonlight .223 05 36$\n6‘ sa-80 5mm 05 32$\n7‘ plasma rifle 12 41$\n8‘ gauss rifle 2mm 07 32$\n9‘ fn-fal .308 09 25$\n"); + return ("rifles\n RIFLE | TYPE | WEIGHT | PRICE \n\n1‘ rangemaster 7mm 03 11$\n2‘ ak-112 5mm 04 21$\n3‘ remington .308 05 24$\n4‘ ak-74 5mm 04 27$\n5‘ moonlight .223 05 36$\n6‘ sa-80 5mm 05 32$\n7‘ fn-fal .308 09 25$\n"); +}; + +string () HeavyString = +{ + return ("other weaponry\n WEAPON | TYPE | WEIGHT | PRICE \n\n1‘ rocket launcher 10 30$\n2‘ gauss rifle 07 32$\n3‘ laser carbine 12 45$\n"); }; string () ChemString = diff --git a/quakec/fallout2/mod_buy.qc b/quakec/fallout2/mod_buy.qc index 8df8cd8c5..d2fd58455 100644 --- a/quakec/fallout2/mod_buy.qc +++ b/quakec/fallout2/mod_buy.qc @@ -526,6 +526,8 @@ void() W_PlayerMenu = self.currentmenu = "shop_shotguns"; if (self.impulse == 5) self.currentmenu = "shop_rifles"; + if (self.impulse == 6) + self.currentmenu = "shop_heavy"; DisplayMenu(); return; @@ -601,14 +603,19 @@ void() W_PlayerMenu = if (self.impulse == 6) BuyWeapon(4, 32, IID_WP_SA80); //weight, cost, item if (self.impulse == 7) - BuyWeapon(12, 45, IID_WP_PULSERIFLE); //weight, cost, item - if (self.impulse == 8) - BuyWeapon(7, 32, IID_WP_GAUSERIFLE); //weight, cost, item - if (self.impulse == 9) BuyWeapon(9, 25, IID_WP_FNFAL); //weight, cost, item return; } + if (self.currentmenu == "shop_heavy") + { + if (self.impulse == 1) + BuyWeapon(10, 30, IID_WP_ROCKETLAUNCHER);//weight, cost, item + if (self.impulse == 2) + BuyWeapon(7, 32, IID_WP_GAUSERIFLE); //weight, cost, item + if (self.impulse == 3) + BuyWeapon(12, 45, IID_WP_PULSERIFLE); //weight, cost, item + } if (self.currentmenu == "shop_equipment") { diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc index 1fd1dd120..83a02b619 100644 --- a/quakec/fallout2/weapons.qc +++ b/quakec/fallout2/weapons.qc @@ -2722,6 +2722,11 @@ void () DisplayMenu = menu = RifleString (); centerprint (self, menu); } + if (self.currentmenu == "shop_heavy") + { + menu = HeavyString (); + centerprint (self, menu); + } if (self.currentmenu == "shop_chems") { menu = ChemString ();