Merge branch 'eukara:master' into recoil-rework
This commit is contained in:
commit
f7c6f68c1d
|
@ -21,28 +21,6 @@ switch (fHeader) {
|
||||||
case EV_OBITUARY:
|
case EV_OBITUARY:
|
||||||
Obituary_Parse();
|
Obituary_Parse();
|
||||||
break;
|
break;
|
||||||
case EV_SPARK:
|
|
||||||
vector vSparkPos, vSparkAngle;
|
|
||||||
vSparkPos[0] = readcoord();
|
|
||||||
vSparkPos[1] = readcoord();
|
|
||||||
vSparkPos[2] = readcoord();
|
|
||||||
vSparkAngle[0] = readcoord();
|
|
||||||
vSparkAngle[1] = readcoord();
|
|
||||||
vSparkAngle[2] = readcoord();
|
|
||||||
FX_Spark(vSparkPos, vSparkAngle);
|
|
||||||
break;
|
|
||||||
case EV_GIBHUMAN:
|
|
||||||
vector vGibPos;
|
|
||||||
vGibPos[0] = readcoord();
|
|
||||||
vGibPos[1] = readcoord();
|
|
||||||
vGibPos[2] = readcoord();
|
|
||||||
vector vDir;
|
|
||||||
vDir[0] = readcoord();
|
|
||||||
vDir[1] = readcoord();
|
|
||||||
vDir[2] = readcoord();
|
|
||||||
float flForce = readfloat();
|
|
||||||
FX_GibHuman(vGibPos, vDir, flForce);
|
|
||||||
break;
|
|
||||||
case EV_BLOOD:
|
case EV_BLOOD:
|
||||||
vector vBloodPos;
|
vector vBloodPos;
|
||||||
vector vBloodColor;
|
vector vBloodColor;
|
||||||
|
@ -57,45 +35,6 @@ switch (fHeader) {
|
||||||
|
|
||||||
FX_Blood(vBloodPos, vBloodColor);
|
FX_Blood(vBloodPos, vBloodColor);
|
||||||
break;
|
break;
|
||||||
case EV_EXPLOSION:
|
|
||||||
vector vExploPos;
|
|
||||||
|
|
||||||
vExploPos[0] = readcoord();
|
|
||||||
vExploPos[1] = readcoord();
|
|
||||||
vExploPos[2] = readcoord();
|
|
||||||
|
|
||||||
FX_Explosion(vExploPos);
|
|
||||||
break;
|
|
||||||
case EV_MODELGIB:
|
|
||||||
vector vecPos;
|
|
||||||
vecPos[0] = readcoord();
|
|
||||||
vecPos[1] = readcoord();
|
|
||||||
vecPos[2] = readcoord();
|
|
||||||
|
|
||||||
vector vSize;
|
|
||||||
vSize[0] = readcoord();
|
|
||||||
vSize[1] = readcoord();
|
|
||||||
vSize[2] = readcoord();
|
|
||||||
|
|
||||||
float fStyle = readbyte();
|
|
||||||
int count = readbyte();
|
|
||||||
FX_BreakModel(count, vecPos, vSize, [0,0,0], fStyle);
|
|
||||||
break;
|
|
||||||
case EV_IMPACT:
|
|
||||||
impactType_t iType;
|
|
||||||
vector vOrigin, vNormal;
|
|
||||||
|
|
||||||
iType = (impactType_t)readbyte();
|
|
||||||
vOrigin[0] = readcoord();
|
|
||||||
vOrigin[1] = readcoord();
|
|
||||||
vOrigin[2] = readcoord();
|
|
||||||
|
|
||||||
vNormal[0] = readcoord();
|
|
||||||
vNormal[1] = readcoord();
|
|
||||||
vNormal[2] = readcoord();
|
|
||||||
|
|
||||||
FX_Impact(iType, vOrigin, vNormal);
|
|
||||||
break;
|
|
||||||
case EV_SMOKE:
|
case EV_SMOKE:
|
||||||
vector vSmokePos;
|
vector vSmokePos;
|
||||||
vSmokePos[0] = readcoord();
|
vSmokePos[0] = readcoord();
|
||||||
|
|
|
@ -154,6 +154,9 @@ ClientGame_RendererRestart(string rstr)
|
||||||
precache_model("models/shotgunshell.mdl");
|
precache_model("models/shotgunshell.mdl");
|
||||||
|
|
||||||
/* there's also muzzleflash.spr, but that's just MUZZLE_SMALL again */
|
/* there's also muzzleflash.spr, but that's just MUZZLE_SMALL again */
|
||||||
|
precache_model("sprites/muzzleflash1.spr");
|
||||||
|
precache_model("sprites/muzzleflash2.spr");
|
||||||
|
precache_model("sprites/muzzleflash3.spr");
|
||||||
MUZZLE_RIFLE = (int)getmodelindex("sprites/muzzleflash1.spr");
|
MUZZLE_RIFLE = (int)getmodelindex("sprites/muzzleflash1.spr");
|
||||||
MUZZLE_SMALL = (int)getmodelindex("sprites/muzzleflash2.spr");
|
MUZZLE_SMALL = (int)getmodelindex("sprites/muzzleflash2.spr");
|
||||||
MUZZLE_WEIRD = (int)getmodelindex("sprites/muzzleflash3.spr");
|
MUZZLE_WEIRD = (int)getmodelindex("sprites/muzzleflash3.spr");
|
||||||
|
@ -162,11 +165,6 @@ ClientGame_RendererRestart(string rstr)
|
||||||
Damage_Precache();
|
Damage_Precache();
|
||||||
|
|
||||||
FX_Blood_Init();
|
FX_Blood_Init();
|
||||||
FX_BreakModel_Init();
|
|
||||||
FX_Explosion_Init();
|
|
||||||
FX_GibHuman_Init();
|
|
||||||
FX_Spark_Init();
|
|
||||||
FX_Impact_Init();
|
|
||||||
FX_Smokenade_Init();
|
FX_Smokenade_Init();
|
||||||
|
|
||||||
Radar_Init();
|
Radar_Init();
|
||||||
|
|
|
@ -37,6 +37,7 @@ crosshair.qc
|
||||||
hud_ammonotify.qc
|
hud_ammonotify.qc
|
||||||
hud.qc
|
hud.qc
|
||||||
hud_weaponselect.qc
|
hud_weaponselect.qc
|
||||||
|
../../../valve/src/client/hud_sprite.qc
|
||||||
../../../valve/src/client/scoreboard.qc
|
../../../valve/src/client/scoreboard.qc
|
||||||
radio.qc
|
radio.qc
|
||||||
../../../valve/src/client/modelevent.qc
|
../../../valve/src/client/modelevent.qc
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16)
|
/*!QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16)
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED func_bomb_target (0 .5 .8) ?
|
/*!QUAKED func_bomb_target (0 .5 .8) ?
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when bomb blows up.
|
"target" Target when bomb blows up.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED func_buyzone (0 .5 .8) ?
|
/*!QUAKED func_buyzone (0 .5 .8) ?
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED func_escapezone (0 .5 .8) ?
|
/*!QUAKED func_escapezone (0 .5 .8) ?
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED func_hostage_rescue (0 .5 .8) ?
|
/*!QUAKED func_hostage_rescue (0 .5 .8) ?
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED func_vip_safetyzone (0 .5 .8) ?
|
/*!QUAKED func_vip_safetyzone (0 .5 .8) ?
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -25,7 +25,7 @@ CSSingleplayerRules::PlayerDeath(NSClientPlayer pl)
|
||||||
|
|
||||||
if (pl.health < -50) {
|
if (pl.health < -50) {
|
||||||
pl.health = 0;
|
pl.health = 0;
|
||||||
FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f);
|
//FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,19 +14,22 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72)
|
/*!QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72)
|
||||||
|
# OVERVIEW
|
||||||
|
Hostage NPC.
|
||||||
|
Used in the Hostage Rescue mode (cs_* maps).
|
||||||
|
|
||||||
|
# KEYS
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
"model" "models/hostage.mdl"
|
|
||||||
"skin" "0"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
# TRIVIA
|
||||||
|
This entity was introduced in Counter-Strike (1999)
|
||||||
Hostage NPC.
|
|
||||||
|
|
||||||
Used in the Hostage Rescue mode (cs_* maps).
|
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/hostage.mdl"
|
||||||
|
skin="0"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16)
|
/*!QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16)
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
@ -28,10 +28,10 @@ See func_buyzone for more information.
|
||||||
class
|
class
|
||||||
info_buyzone:NSPointTrigger
|
info_buyzone:NSPointTrigger
|
||||||
{
|
{
|
||||||
void(void) info_buyzone;
|
void info_buyzone(void);
|
||||||
|
|
||||||
virtual void(void) Respawn;
|
virtual void Respawn(void);
|
||||||
virtual void(entity) Touch;
|
virtual void Touch(entity);
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16)
|
/*!QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16)
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16)
|
/*!QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16)
|
||||||
"targetname" Name
|
"targetname" Name
|
||||||
"target" Target when triggered.
|
"target" Target when triggered.
|
||||||
"killtarget" Target to kill when triggered.
|
"killtarget" Target to kill when triggered.
|
||||||
|
|
|
@ -8,12 +8,7 @@ animations.qc
|
||||||
item_c4bomb.h
|
item_c4bomb.h
|
||||||
|
|
||||||
../../../valve/src/shared/fx_blood.qc
|
../../../valve/src/shared/fx_blood.qc
|
||||||
../../../valve/src/shared/fx_breakmodel.qc
|
|
||||||
../../../valve/src/shared/fx_explosion.qc
|
|
||||||
../../../valve/src/shared/fx_gibhuman.qc
|
|
||||||
../../../valve/src/shared/fx_spark.qc
|
|
||||||
../../../valve/src/shared/fx_corpse.qc
|
../../../valve/src/shared/fx_corpse.qc
|
||||||
fx_impact.qc
|
|
||||||
fx_flashbang.qc
|
fx_flashbang.qc
|
||||||
fx_smokenade.qc
|
fx_smokenade.qc
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_ak47.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -25,6 +24,8 @@ AK-47 Weapon
|
||||||
Price: $2500
|
Price: $2500
|
||||||
Terrorists only weapon
|
Terrorists only weapon
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_ak47.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
@ -215,6 +216,7 @@ w_ak47_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::ak47_mag, player::ammo_762mm, 30);
|
Weapons_ReloadWeapon(pl, player::ak47_mag, player::ammo_762mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_aug.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -25,6 +24,8 @@ Steyr AUG Weapon
|
||||||
Price: $3500
|
Price: $3500
|
||||||
Counter-Terrorists only weapon
|
Counter-Terrorists only weapon
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_aug.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -198,6 +199,7 @@ w_aug_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::aug_mag, player::ammo_762mm, 30);
|
Weapons_ReloadWeapon(pl, player::aug_mag, player::ammo_762mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_awp.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ AWP (AI Arctic Warfare/Magnum) Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $4750
|
Price: $4750
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_awp.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
@ -269,6 +270,7 @@ w_awp_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::awp_mag, player::ammo_338mag, 10);
|
Weapons_ReloadWeapon(pl, player::awp_mag, player::ammo_338mag, 10);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_c4.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ Default arsenal for Terrorists
|
||||||
Can only be picked up by Terrorists and planted in
|
Can only be picked up by Terrorists and planted in
|
||||||
func_bombtarget brush entities.
|
func_bombtarget brush entities.
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_c4.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* C4 weapon logic */
|
/* C4 weapon logic */
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_deagle.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Desert Eagle .50 AE Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $650
|
Price: $650
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_deagle.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
@ -214,6 +215,7 @@ w_deagle_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::deagle_mag, player::ammo_50ae, 7);
|
Weapons_ReloadWeapon(pl, player::deagle_mag, player::ammo_50ae, 7);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_elite.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Dual Beretta 96G (Elites) Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1000
|
Price: $1000
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_elite.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
@ -283,6 +284,7 @@ w_elites_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::elites_mag, player::ammo_9mm, 30);
|
Weapons_ReloadWeapon(pl, player::elites_mag, player::ammo_9mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_fiveseven.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Five-SeveN Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $750
|
Price: $750
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_fiveseven.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -182,6 +183,7 @@ w_fiveseven_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::fiveseven_mag, player::ammo_57mm, 20);
|
Weapons_ReloadWeapon(pl, player::fiveseven_mag, player::ammo_57mm, 20);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_flashbang.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ When thrown, nearby players become blinded temporarily from the blast.
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $200
|
Price: $200
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_flashbang.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -162,6 +163,9 @@ w_flashbang_primary(player pl)
|
||||||
|
|
||||||
/* Ammo check */
|
/* Ammo check */
|
||||||
if (pl.ammo_fbgrenade <= 0) {
|
if (pl.ammo_fbgrenade <= 0) {
|
||||||
|
#ifdef SERVER
|
||||||
|
Weapons_RemoveItem(pl, WEAPON_FLASHBANG);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_g3sg1.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,7 +23,8 @@ Heckler & Koch G3/SG-1 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $5000
|
Price: $5000
|
||||||
|
|
||||||
*/
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_g3sg1.mdl"*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -189,7 +189,8 @@ w_g3sg1_reload(player pl)
|
||||||
#ifdef SERVER
|
#ifdef SERVER
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20);
|
Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_glock18.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ Default arsenal for Terrorists
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $400
|
Price: $400
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_glock18.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -249,6 +250,7 @@ w_glock18_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::glock18_mag, player::ammo_9mm, 20);
|
Weapons_ReloadWeapon(pl, player::glock18_mag, player::ammo_9mm, 20);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_hegrenade.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ When thrown, explodes with a fairly deadly blast radius to players.
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $300
|
Price: $300
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_hegrenade.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -102,7 +103,7 @@ w_hegrenade_throw(player pl)
|
||||||
static void hegrenade_explode(void)
|
static void hegrenade_explode(void)
|
||||||
{
|
{
|
||||||
float dmg = 100;
|
float dmg = 100;
|
||||||
FX_Explosion(self.origin);
|
pointparticles(particleeffectnum("fx_explosion.main"), self.origin, [0,0,0], 1);
|
||||||
Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HEGRENADE);
|
Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HEGRENADE);
|
||||||
Sound_Play(self, CHAN_BODY, "weapon_hegrenade.explode");
|
Sound_Play(self, CHAN_BODY, "weapon_hegrenade.explode");
|
||||||
remove(self);
|
remove(self);
|
||||||
|
@ -164,6 +165,9 @@ w_hegrenade_primary(player pl)
|
||||||
|
|
||||||
/* Ammo check */
|
/* Ammo check */
|
||||||
if (pl.ammo_hegrenade <= 0) {
|
if (pl.ammo_hegrenade <= 0) {
|
||||||
|
#ifdef SERVER
|
||||||
|
Weapons_RemoveItem(pl, WEAPON_HEGRENADE);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_knife.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -23,6 +22,8 @@ Knife Weapon
|
||||||
|
|
||||||
Default arsenal on both teams
|
Default arsenal on both teams
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_knife.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_m3.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Benneli M3 Super90 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1700
|
Price: $1700
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_m3.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_m4a1.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -25,6 +24,8 @@ Colt M4A1 Carbine Weapon
|
||||||
Price: $3100
|
Price: $3100
|
||||||
Counter-Terrorists only weapon
|
Counter-Terrorists only weapon
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_m4a1.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -245,6 +246,7 @@ w_m4a1_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::m4a1_mag, player::ammo_556mm, 30);
|
Weapons_ReloadWeapon(pl, player::m4a1_mag, player::ammo_556mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_mac10.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Ingram MAC-10 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1400
|
Price: $1400
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_mac10.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -177,6 +178,7 @@ w_mac10_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::mac10_mag, player::ammo_45acp, 30);
|
Weapons_ReloadWeapon(pl, player::mac10_mag, player::ammo_45acp, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_mp5.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Heckler & Koch MP5-Navy Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1500
|
Price: $1500
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_mp5.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -175,6 +176,7 @@ w_mp5_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::mp5_mag, player::ammo_9mm, 30);
|
Weapons_ReloadWeapon(pl, player::mp5_mag, player::ammo_9mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_ (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_p228 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_p228.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ SIG P228 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $600
|
Price: $600
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_p228.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -183,6 +184,7 @@ w_p228_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::p228_mag, player::ammo_357sig, 13);
|
Weapons_ReloadWeapon(pl, player::p228_mag, player::ammo_357sig, 13);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_p90.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ FN P90 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $2350
|
Price: $2350
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_p90.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -175,6 +176,7 @@ w_p90_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::p90_mag, player::ammo_57mm, 50);
|
Weapons_ReloadWeapon(pl, player::p90_mag, player::ammo_57mm, 50);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_m249.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ FN M249 Para Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $5750
|
Price: $5750
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_m249.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -172,6 +173,7 @@ w_para_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::para_mag, player::ammo_556mmbox, 100);
|
Weapons_ReloadWeapon(pl, player::para_mag, player::ammo_556mmbox, 100);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_scout.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Steyr Scout Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1250
|
Price: $1250
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_scout.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -230,6 +231,7 @@ w_scout_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::scout_mag, player::ammo_762mm, 10);
|
Weapons_ReloadWeapon(pl, player::scout_mag, player::ammo_762mm, 10);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_sg550.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ SIG SG 550 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $4200
|
Price: $4200
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_sg550.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -192,6 +193,7 @@ w_sg550_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::sg550_mag, player::ammo_556mm, 30);
|
Weapons_ReloadWeapon(pl, player::sg550_mag, player::ammo_556mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_sg552.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ SIG SG 552 Commando Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $3500
|
Price: $3500
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_sg552.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -195,6 +196,7 @@ w_sg552_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::sg552_mag, player::ammo_556mm, 30);
|
Weapons_ReloadWeapon(pl, player::sg552_mag, player::ammo_556mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_smokegrenade.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ When thrown, the explosion casts view-blocking smoke in that radius.
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $300
|
Price: $300
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_smokegrenade.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -162,6 +163,9 @@ w_smokegrenade_primary(player pl)
|
||||||
|
|
||||||
/* Ammo check */
|
/* Ammo check */
|
||||||
if (pl.ammo_smokegrenade <= 0) {
|
if (pl.ammo_smokegrenade <= 0) {
|
||||||
|
#ifdef SERVER
|
||||||
|
Weapons_RemoveItem(pl, WEAPON_SMOKEGRENADE);
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_tmp.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Steyr Tactical Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1250
|
Price: $1250
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_tmp.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -175,6 +176,7 @@ w_tmp_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::tmp_mag, player::ammo_9mm, 30);
|
Weapons_ReloadWeapon(pl, player::tmp_mag, player::ammo_9mm, 30);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_ump45.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Heckler & Koch UMP .45 ACP Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $1700
|
Price: $1700
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_ump45.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -174,6 +175,7 @@ w_ump45_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::ump45_mag, player::ammo_45acp, 25);
|
Weapons_ReloadWeapon(pl, player::ump45_mag, player::ammo_45acp, 25);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_usp45.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -26,6 +25,8 @@ Default arsenal for Counter-Terrorists
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $500
|
Price: $500
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_usp45.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -254,6 +255,7 @@ w_usp45_reload(player pl)
|
||||||
static void w_weapon_reload_done(void) {
|
static void w_weapon_reload_done(void) {
|
||||||
player pl = (player)self;
|
player pl = (player)self;
|
||||||
Weapons_ReloadWeapon(pl, player::usp45_mag, player::ammo_45acp, 12);
|
Weapons_ReloadWeapon(pl, player::usp45_mag, player::ammo_45acp, 12);
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
pl.think = w_weapon_reload_done;
|
pl.think = w_weapon_reload_done;
|
||||||
|
|
|
@ -14,8 +14,7 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32)
|
/*!QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32)
|
||||||
"model" "models/w_xm1014.mdl"
|
|
||||||
|
|
||||||
COUNTER-STRIKE (1999) ENTITY
|
COUNTER-STRIKE (1999) ENTITY
|
||||||
|
|
||||||
|
@ -24,6 +23,8 @@ Benneli XM1014 Weapon
|
||||||
- Buy Menu -
|
- Buy Menu -
|
||||||
Price: $3000
|
Price: $3000
|
||||||
|
|
||||||
|
-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
|
||||||
|
model="models/w_xm1014.mdl"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CLIENT
|
#ifdef CLIENT
|
||||||
|
|
|
@ -201,6 +201,14 @@ Cstrike_ShotMultiplierUpdate(player pl)
|
||||||
|
|
||||||
pl.cs_shottime = max(0, pl.cs_shottime - input_timelength);
|
pl.cs_shottime = max(0, pl.cs_shottime - input_timelength);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Cstrike_ShotReset(player pl)
|
||||||
|
{
|
||||||
|
pl.cs_shottime = 0.0f;
|
||||||
|
pl.cs_shotmultiplier = 0;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
w_cstrike_weaponrelease(void)
|
w_cstrike_weaponrelease(void)
|
||||||
{
|
{
|
||||||
|
@ -208,3 +216,9 @@ w_cstrike_weaponrelease(void)
|
||||||
pl.punchangle[1] *= 0.95;
|
pl.punchangle[1] *= 0.95;
|
||||||
Cstrike_ShotMultiplierUpdate(pl);
|
Cstrike_ShotMultiplierUpdate(pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
w_cstrke_switched(player pl)
|
||||||
|
{
|
||||||
|
Cstrike_ShotReset(pl);
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
// weapon constants
|
||||||
|
WEAPON_NONE 0
|
||||||
|
WEAPON_M3 1
|
||||||
|
WEAPON_XM1014 2
|
||||||
|
WEAPON_MP5 3
|
||||||
|
WEAPON_P90 4
|
||||||
|
WEAPON_UMP45 5
|
||||||
|
WEAPON_MAC10 6
|
||||||
|
WEAPON_TMP 7
|
||||||
|
WEAPON_AK47 8
|
||||||
|
WEAPON_SG552 9
|
||||||
|
WEAPON_M4A1 10
|
||||||
|
WEAPON_AUG 11
|
||||||
|
WEAPON_SCOUT 12
|
||||||
|
WEAPON_AWP 13
|
||||||
|
WEAPON_G3SG1 14
|
||||||
|
WEAPON_SG550 15
|
||||||
|
WEAPON_PARA 16
|
||||||
|
WEAPON_USP45 17
|
||||||
|
WEAPON_GLOCK18 18
|
||||||
|
WEAPON_DEAGLE 19
|
||||||
|
WEAPON_P228 20
|
||||||
|
WEAPON_ELITES 21
|
||||||
|
WEAPON_FIVESEVEN 22
|
||||||
|
WEAPON_KNIFE 23
|
||||||
|
WEAPON_HEGRENADE 24
|
||||||
|
WEAPON_FLASHBANG 25
|
||||||
|
WEAPON_SMOKEGRENADE 26
|
||||||
|
WEAPON_C4BOMB 27
|
Loading…
Reference in New Issue