fn/dmc
fn/dmc
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

item_backpack now uses titles.txt string entries for the flavor text on pickup

Browse source
This commit is contained in:
Marco Cawthorne 2023-05-10 15:05:50 -07:00
parent f86934b685
commit 3fea7639fe
Signed by: eukara
GPG key ID: CE2032F0A2882A22
6 changed files with 34 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/progs.src
View file

@ -22,11 +22,11 @@ defs.h
../../../valve/src/client/draw.qc
../../../valve/src/client/damage.qc
../../../valve/src/client/init.qc
init.qc
../../../valve/src/client/flashlight.qc
entities.qc
../../../valve/src/client/cmds.qc
../../../valve/src/client/game_event.qc
game_event.qc
../../../valve/src/client/camera.qc
../../../valve/src/client/viewmodel.qc
../../../valve/src/client/view.qc

12
src/server/item_weaponbox.qc → src/server/item_backpack.qc
View file

@ -50,8 +50,16 @@ item_backpack::Touch(entity eToucher)
pl.g_items |= g_weapons[weapon_item].id;
Weapons_RefreshAmmo(pl);
sprint(pl, PRINT_HIGH, sprintf("You get the %s, %d shells, %d nails, %d rockets, %d cells\n", g_weapons[weapon_item].name, ammo_shells, ammo_nails, ammo_rockets, ammo_cells));
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
WriteByte(MSG_MULTICAST, EV_DMC_PICKUPMSG);
WriteByte(MSG_MULTICAST, weapon_item);
WriteByte(MSG_MULTICAST, ammo_shells);
WriteByte(MSG_MULTICAST, ammo_nails);
WriteByte(MSG_MULTICAST, ammo_rockets);
WriteByte(MSG_MULTICAST, ammo_cells);
msg_entity = pl;
multicast([0,0,0], MULTICAST_ONE_R);
Destroy();
}

2
src/server/progs.src
View file

@ -60,7 +60,7 @@ defs.h
../../../valve/src/server/item_suit.qc
../../../valve/src/server/item_healthkit.qc
../../../valve/src/server/item_battery.qc
item_weaponbox.qc
item_backpack.qc
../../../valve/src/server/world_items.qc
../../../valve/src/server/xen_spore_small.qc
../../../valve/src/server/xen_spore_medium.qc

61
src/server/weaponbox.qc
View file

@ -1,61 +0,0 @@
/*
* Copyright (c) 2023 Marco Cawthorne <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED weaponbox (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo container. Used to delvier more than 1 singular ammo type, as well as
more precise control.
-------- KEYS --------
"targetname" : Name
"uranium" : Amount of Uranium (Egon, Gauss) ammo to give
"357" : Amount of 357 Python ammo to give
"9mm" : Amount of 9mm Handgun/MP5 ammo to give
"ARgrenades" : Amount of MP5 grenades to give
"bolts" : Amount of Crossbow bolts
"buckshot" : Amount of Shotgun ammo to give
"rockets" : Amount of RPG ammo to give
"556" : (Oppossing Force only) Amount for the SAW Machine Gun
"762" : (Oppossing Force only) Amount for the Sniper Rifle
"spore" : (Oppossing Force only) Amount for the Spore Launcher
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
model="models/models/w_weaponbox.mdl"
*/
class
weaponbox:item_weaponbox
{
void(void) weaponbox;
virtual void(string, string) SpawnKey;
};
void
weaponbox::SpawnKey(string strKey, string strValue)
{
switch (strKey) {
}
}
void
weaponbox::weaponbox(void)
{
// do nothing
}

20
src/shared/events.h Normal file
View file

@ -0,0 +1,20 @@
/*
* Copyright (c) 2016-2020 Marco Cawthorne <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
enum
{
EV_DMC_PICKUPMSG,
};

3
src/shared/include.src
View file

@ -1,6 +1,6 @@
#includelist
../../../valve/src/shared/entities.h
../../../valve/src/shared/events.h
events.h
../../../valve/src/shared/flags.h
player.qc
../../../valve/src/shared/weapon_common.h
@ -9,7 +9,6 @@ player.qc
pmove.qc
../../../valve/src/shared/fx_blood.qc
../../../valve/src/shared/fx_gaussbeam.qc
../../../valve/src/shared/fx_breakmodel.qc
../../../valve/src/shared/fx_explosion.qc
../../../valve/src/shared/fx_gibhuman.qc