ent.dphitcontentsmask = oldsolid; // restore solid type (generally SOLID_SLIDEBOX)\r
\r
if (!g_norecoil)\r
- ent.punchangle_x = recoil * -1;\r
+ {\r
+ ent.punchangle_x += crandom() * recoil;\r
+ ent.punchangle_y += crandom() * recoil;\r
+ }\r
\r
if (snd != "")\r
{\r
sound (ent, CHAN_WEAPON, snd, VOL_BASE, ATTN_NORM);\r
}\r
\r
- if (ent.items & IT_STRENGTH)\r
- sound (ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);\r
+ if (ent.items & IT_STRENGTH && maxdamage)\r
+ sound (ent, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);\r
};\r
\r
#define W_SetupShot_ProjectileSize(ent,mi,ma,antilag,recoil,snd,maxdamage) W_SetupShot_Dir_ProjectileSize(ent, v_forward, mi, ma, antilag, recoil, snd, maxdamage)\r
other = other.enemy; // also do this for the player we are spectating\r
\r
if not(chase || other.classname == "observer") // the observer check prevents a bug\r
- if(other.predator == self.owner || other.fakepredator == self.owner)\r
+ if(other.predator == self.owner)\r
{\r
setmodel(self, "");\r
return TRUE;\r
}\r
\r
- self.effects &~= EF_NODEPTHTEST;\r
+ if(cvar("g_nodepthtestplayers"))\r
+ self.effects |= EF_NODEPTHTEST;\r
+ else\r
+ self.effects &~= EF_NODEPTHTEST;\r
+ if(cvar("g_fullbrightplayers"))\r
+ self.effects |= EF_FULLBRIGHT;\r
+\r
if not(self.owner.stat_eaten)\r
setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3"));\r
- else if(cvar("g_vore_neighborprey_distance") && (other.predator == self.owner.predator || other.fakepredator == self.owner.predator) && !(chase || other.classname == "observer"))\r
+ else if(cvar("g_vore_neighborprey_distance") && other.predator == self.owner.predator && !(chase || other.classname == "observer"))\r
{\r
setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); // allow seeing neighboring prey's weapon model\r
self.effects |= EF_NODEPTHTEST; // don't hide behind the stomach's own EF_NODEPTHTEST\r
return;\r
}\r
if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)\r
+ if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
{\r
self.cnt = self.owner.weapon;\r
self.dmg = self.owner.modelindex;\r
animfilename = strcat("models/weapons/h_", self.owner.weaponname, ".iqm.animinfo");\r
animfile = fopen(animfilename, FILE_READ);\r
// preset some defaults that work great for renamed zym files (which don't need an animinfo)\r
- self.anim_fire1 = '0 1 0.01';\r
- self.anim_fire2 = '1 1 0.01';\r
- self.anim_idle = '2 1 0.01';\r
- self.anim_reload = '3 1 0.01';\r
- if (animfile >= 0)\r
- {\r
- animparseerror = FALSE;\r
- self.anim_fire1 = animparseline(animfile);\r
- self.anim_fire2 = animparseline(animfile);\r
- self.anim_idle = animparseline(animfile);\r
- self.anim_reload = animparseline(animfile);\r
- fclose(animfile);\r
- if (animparseerror)\r
- print("Parse error in ", animfilename, ", some player animations are broken\n");\r
- }\r
+ self.anim_fire1 = animfixfps(self, '0 1 0.01');\r
+ self.anim_fire2 = animfixfps(self, '1 1 0.01');\r
+ self.anim_idle = animfixfps(self, '2 1 0.01');\r
+ self.anim_reload = animfixfps(self, '3 1 0.01');\r
\r
// if we have a "weapon" tag, let's attach the v_ model to it ("invisible hand" style model)\r
// if we don't, this is a "real" animated model\r
self.movedir = '0 0 0';\r
self.spawnorigin = '0 0 0';\r
self.oldorigin = '0 0 0';\r
- self.anim_fire1 = '0 1 0.01';\r
- self.anim_fire2 = '0 1 0.01';\r
- self.anim_idle = '0 1 0.01';\r
- self.anim_reload = '0 1 0.01';\r
+ self.anim_fire1 = animfixfps(self, '0 1 0.01');\r
+ self.anim_fire2 = animfixfps(self, '0 1 0.01');\r
+ self.anim_idle = animfixfps(self, '0 1 0.01');\r
+ self.anim_reload = animfixfps(self, '0 1 0.01');\r
}\r
\r
self.view_ofs = '0 0 0';\r
\r
}\r
\r
- // create or update the lasertarget entity\r
-\r
// if we are a micro or macro, size the weapon model accordingly\r
- if(self.owner.scale && cvar("g_healthsize_weapon_scalefactor"))\r
- if(self.model != "")\r
+ if(cvar("g_healthsize") && cvar("g_healthsize_weapon_scalefactor"))\r
+ if(self.owner.scale) // prevents some exceptions\r
{\r
- self.weaponentity.scale = (1 + cvar("g_healthsize_weapon_scalefactor")) - cvar("g_healthsize_weapon_scalefactor") * self.owner.scale;\r
- self.weaponentity.origin_z = (1 - self.weaponentity.scale) * cvar("g_healthsize_weapon_scalefactor_pos");\r
+ self.scale = pow(1 / self.owner.scale, cvar("g_healthsize_weapon_scalefactor"));\r
+ if(self.scale < 0.1)\r
+ self.scale = 0.1; // stuff breaks if scale is smaller than this\r
+ self.origin_z = (1 - self.scale) * cvar("g_healthsize_weapon_scalefactor_pos");\r
+\r
+ // copy properties to the static weapon entity as well\r
+ if(self.weaponentity != world) // prevents assignment to world\r
+ {\r
+ self.weaponentity.scale = self.scale;\r
+ self.weaponentity.origin = self.origin;\r
+ }\r
}\r
};\r
\r
return;\r
}\r
if (self.cnt != self.owner.weapon || self.dmg != self.owner.modelindex || self.deadflag != self.owner.deadflag)\r
+ if (substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
{\r
self.cnt = self.owner.weapon;\r
self.dmg = self.owner.modelindex;\r
self.tag_index = tag_found;\r
self.tag_entity = self.owner;\r
}\r
- else if(substring(self.owner.model, -4, 4) != ".md3") // not a stomach model\r
+ else\r
setattachment(self, self.owner, "bip01 r hand");\r
\r
// if that didn't find a tag, hide the exterior weapon model\r
if (t)\r
if (!self.crouch) // shoot anim stands up, this looks bad\r
{\r
- local vector anim;\r
- anim = self.anim_shoot;\r
- anim_z = anim_y / (t + sys_frametime);\r
- setanim(self, anim, FALSE, TRUE, TRUE);\r
+ vector anim;\r
+ if(self.weapon == WEP_GRABBER && self.BUTTON_ATCK2)\r
+ {\r
+ // use melee attack animation for grabber alt fire\r
+ anim = self.anim_melee;\r
+ anim_z = anim_y / (t + sys_frametime);\r
+ setanim(self, anim, FALSE, TRUE, TRUE);\r
+ }\r
+ else\r
+ {\r
+ anim = self.anim_shoot;\r
+ anim_z = anim_y / (t + sys_frametime);\r
+ setanim(self, anim, FALSE, TRUE, TRUE);\r
+ }\r
}\r
};\r
\r
if(ammo_reload)\r
{\r
self.clip_load -= ammo_use;\r
- self.weapon_load[self.weapon] = self.clip_load;\r
+ self.(weapon_load[self.weapon]) = self.clip_load;\r
}\r
else\r
self.(self.current_ammo) -= ammo_use;\r
// if we are inside the stomach, don't allow reloading, and schedule the weapon to reload once when we're out\r
if(self.stat_eaten)\r
{\r
- self.clip_load = self.weapon_load[self.weapon] = -1;\r
+ self.clip_load = self.(weapon_load[self.weapon]) = -1;\r
w_ready(); // don't keep executing each frame\r
return;\r
}\r
self.(self.current_ammo) -= 1;\r
}\r
}\r
- self.weapon_load[self.weapon] = self.clip_load;\r
+ self.(weapon_load[self.weapon]) = self.clip_load;\r
\r
// do not set ATTACK_FINISHED in reload code any more. This causes annoying delays if eg: You start reloading a weapon,\r
// then quickly switch to another weapon and back. Reloading is canceled, but the reload delay is still there,\r
if(self.clip_load < 0)\r
self.clip_load = 0;\r
self.old_clip_load = self.clip_load;\r
- self.clip_load = self.weapon_load[self.weapon] = -1;\r
-}
\ No newline at end of file
+ self.clip_load = self.(weapon_load[self.weapon]) = -1;\r
+}\r
projects / voretournament / voretournament.git / blobdiff