From b7c4b9b04986c77815c67deaf4cce3ad89d199d7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 2 Sep 2013 10:58:48 +1000 Subject: [PATCH] More whitespace --- qcsrc/common/monsters/cl_monsters.qc | 94 +++---- qcsrc/common/monsters/sv_monsters.qc | 390 +++++++++++++-------------- 2 files changed, 242 insertions(+), 242 deletions(-) diff --git a/qcsrc/common/monsters/cl_monsters.qc b/qcsrc/common/monsters/cl_monsters.qc index 7b38e78d3..0e99d4548 100644 --- a/qcsrc/common/monsters/cl_monsters.qc +++ b/qcsrc/common/monsters/cl_monsters.qc @@ -7,7 +7,7 @@ void monster_changeteam() { self.glowmod = Team_ColorRGB(self.team - 1); - + if(self.team) { self.teamradar_color = Team_ColorRGB(self.team - 1); @@ -23,7 +23,7 @@ void monster_changeteam() void monster_die() { MON_ACTION(self.monsterid, MR_DEATH); - + self.solid = SOLID_CORPSE; } @@ -31,49 +31,49 @@ void monster_draw2d() { if(self.netname == "") return; - + if(!autocvar_g_waypointsprite_monsters) return; - + if(autocvar_cl_hidewaypoints) return; - + if(self.health <= 0) return; float dist = vlen(self.origin - view_origin); - float t = (GetPlayerColor(player_localnum) + 1); + float t = (GetPlayerColor(player_localnum) + 1); vector o; string txt; - + if(autocvar_cl_vehicles_hud_tactical) if(dist < 10240 && t != self.team) { // TODO: Vehicle tactical hud o = project_3d_to_2d(self.origin + '0 0 1' * ((self.maxs_z + self.mins_z) * 0.5)); - if(o_z < 0 - || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) - || o_y < (vid_conheight * waypointsprite_edgeoffset_top) - || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) + if(o_z < 0 + || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) + || o_y < (vid_conheight * waypointsprite_edgeoffset_top) + || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) || o_y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom))) return; // Dont draw wp's for monsters out of view o_z = 0; if(hud != HUD_NORMAL) - { + { switch(hud) { case HUD_SPIDERBOT: case HUD_WAKIZASHI: case HUD_RAPTOR: - case HUD_BUMBLEBEE: + case HUD_BUMBLEBEE: vector pz = drawgetimagesize("gfx/vehicles/vth-mover.tga") * 0.25; drawpic(o - pz * 0.5, "gfx/vehicles/vth-mover.tga", pz , '1 1 1', 0.75, DRAWFLAG_NORMAL); break; } } } - + if(dist > self.maxdistance) return; @@ -81,7 +81,7 @@ void monster_draw2d() float a = self.alpha * autocvar_hud_panel_fg_alpha; vector rgb = spritelookupcolor(spriteimage, self.teamradar_color); - + if(self.maxdistance > waypointsprite_normdistance) a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent); else if(self.maxdistance > 0) @@ -90,7 +90,7 @@ void monster_draw2d() if(rgb == '0 0 0') { self.teamradar_color = '1 0 0'; - print(sprintf("WARNING: sprite of name %s has no color, using red so you notice it\n", spriteimage)); + print(sprintf("WARNING: sprite of name %s has no color, using red so you notice it\n", spriteimage)); } txt = self.netname; @@ -98,7 +98,7 @@ void monster_draw2d() txt = _("Spam"); else txt = spritelookuptext(spriteimage); - + if(autocvar_g_waypointsprite_uppercase) txt = strtoupper(txt); @@ -110,23 +110,23 @@ void monster_draw2d() if(a <= 0) return; - + rgb = fixrgbexcess(rgb); o = project_3d_to_2d(self.origin + '0 0 1' * (self.maxs_z + 15)); - if(o_z < 0 - || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) - || o_y < (vid_conheight * waypointsprite_edgeoffset_top) - || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) + if(o_z < 0 + || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) + || o_y < (vid_conheight * waypointsprite_edgeoffset_top) + || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) || o_y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom))) return; // Dont draw wp's for monsters out of view o_z = 0; float edgedistance_min, crosshairdistance; - edgedistance_min = min((o_y - (vid_conheight * waypointsprite_edgeoffset_top)), + edgedistance_min = min((o_y - (vid_conheight * waypointsprite_edgeoffset_top)), (o_x - (vid_conwidth * waypointsprite_edgeoffset_left)), - (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o_x, + (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o_x, (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)) - o_y); float vidscale = max(vid_conwidth / vid_width, vid_conheight / vid_height); @@ -150,7 +150,7 @@ void monster_draw2d() } draw_beginBoldFont(); - o = drawspritearrow(o, M_PI, rgb, a, SPRITE_ARROW_SCALE * t); + o = drawspritearrow(o, M_PI, rgb, a, SPRITE_ARROW_SCALE * t); o = drawspritetext(o, M_PI, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt); drawhealthbar( o, @@ -175,12 +175,12 @@ void monster_draw2d() void monster_draw() { float dt; - + dt = time - self.move_time; self.move_time = time; if(dt <= 0) return; - + fixedmakevectors(self.angles); //movelib_groundalign4point(50, 25, 0.25, 45); setorigin(self, self.origin + self.velocity * dt); @@ -190,16 +190,16 @@ void monster_draw() void monster_construct() { entity mon = get_monsterinfo(self.monsterid); - + if(mon.spawnflags & MONSTER_SIZE_BROKEN) self.scale = 1.3; - + self.netname = M_NAME(self.monsterid); - + setorigin(self, self.origin); setmodel(self, mon.model); setsize(self, mon.mins, mon.maxs); - + self.move_movetype = MOVETYPE_BOUNCE; self.health = 255; self.solid = SOLID_BBOX; @@ -218,61 +218,61 @@ void ent_monster() { float sf; sf = ReadByte(); - + if(sf & MSF_SETUP) { self.monsterid = ReadByte(); - + self.origin_x = ReadCoord(); self.origin_y = ReadCoord(); self.origin_z = ReadCoord(); setorigin(self, self.origin); - + self.angles_x = ReadAngle(); self.angles_y = ReadAngle(); - + self.skin = ReadByte(); self.team = ReadByte(); - + monster_construct(); monster_changeteam(); } - + if(sf & MSF_ANG) { self.move_angles_x = ReadShort(); self.move_angles_y = ReadShort(); self.angles = self.move_angles; } - + if(sf & MSF_MOVE) { self.origin_x = ReadShort(); self.origin_y = ReadShort(); self.origin_z = ReadShort(); setorigin(self, self.origin); - + self.velocity_x = ReadShort(); self.velocity_y = ReadShort(); self.velocity_z = ReadShort(); - + self.move_angles_y = ReadShort(); - + self.move_time = time; self.move_velocity = self.velocity; self.move_origin = self.origin; } - + if(sf & MSF_ANIM) { self.frame1time = ReadCoord(); self.frame = ReadByte(); } - + if(sf & MSF_STATUS) { self.skin = ReadByte(); - + float _tmp; _tmp = ReadByte(); if(_tmp != self.team) @@ -280,13 +280,13 @@ void ent_monster() self.team = _tmp; monster_changeteam(); } - + _tmp = ReadByte(); if(_tmp == 4) // respawning setmodel(self, "null"); - + _tmp = ReadByte(); - + if(_tmp == 0 && self.health != 0) monster_die(); diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index c9cf00192..f73083ba1 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -17,11 +17,11 @@ void monster_item_spawn() { if(self.monster_loot) self.monster_loot(); - + self.gravity = 1; self.velocity = randomvec() * 175 + '0 0 325'; self.touch = M_Item_Touch; - + SUB_SetFade(self, time + autocvar_g_monsters_drop_time, 1); } @@ -32,15 +32,15 @@ void monster_dropitem() vector org = self.origin + ((self.mins + self.maxs) * 0.5); entity e = spawn(); - + setorigin(e, org); - + e.monster_loot = self.monster_loot; - + other = e; MUTATOR_CALLHOOK(MonsterDropItem); e = other; - + e.think = monster_item_spawn; e.nextthink = time + 0.3; } @@ -49,7 +49,7 @@ void monsters_setframe(float _frame) { if(self.frame == _frame) return; - + self.anim_start_time = time; self.frame = _frame; self.SendFlags |= MSF_ANIM; @@ -59,61 +59,61 @@ float monster_isvalidtarget (entity targ, entity ent) { if(!targ || !ent) return FALSE; // someone doesn't exist - + if(targ == ent) return FALSE; // don't attack ourselves - + traceline(ent.origin, targ.origin, MOVE_NORMAL, ent); - + if(trace_ent != targ) if(trace_ent) targ = trace_ent; else return FALSE; - + if(targ.vehicle_flags & VHF_ISVEHICLE) if not((get_monsterinfo(ent.monsterid)).spawnflags & MON_FLAG_RANGED) return FALSE; // melee attacks are useless against vehicles - + if(time < game_starttime) return FALSE; // monsters do nothing before the match has started - + if(vlen(targ.origin - ent.origin) >= ent.target_range) return FALSE; // enemy is too far away - + if(targ.takedamage == DAMAGE_NO) return FALSE; // enemy can't be damaged - + if(targ.items & IT_INVISIBILITY) return FALSE; // enemy is invisible - + if(substring(targ.classname, 0, 10) == "onslaught_") return FALSE; // don't attack onslaught targets - + if(IS_SPEC(targ) || IS_OBSERVER(targ)) return FALSE; // enemy is a spectator - + if not(targ.vehicle_flags & VHF_ISVEHICLE) if(targ.deadflag != DEAD_NO || ent.deadflag != DEAD_NO || targ.health <= 0 || ent.health <= 0) return FALSE; // enemy/self is dead - + if(ent.monster_owner == targ) return FALSE; // don't attack our master - + if(targ.monster_owner == ent) return FALSE; // don't attack our pet - + if not(targ.vehicle_flags & VHF_ISVEHICLE) if(targ.flags & FL_NOTARGET) return FALSE; // enemy can't be targeted - + if not(autocvar_g_monsters_typefrag) if(targ.BUTTON_CHAT) return FALSE; // no typefragging! - + if not(IsDifferentTeam(targ, ent)) return FALSE; // enemy is on our team - + if(autocvar_g_monsters_target_infront || ent.spawnflags & MONSTERFLAG_INFRONT) if(ent.enemy != targ) { @@ -121,29 +121,29 @@ float monster_isvalidtarget (entity targ, entity ent) makevectors (ent.angles); dot = normalize (targ.origin - ent.origin) * v_forward; - + if(dot <= 0.3) return FALSE; } - + return TRUE; } -entity FindTarget (entity ent) +entity FindTarget (entity ent) { if(MUTATOR_CALLHOOK(MonsterFindTarget)) { return ent.enemy; } // Handled by a mutator - + entity head, closest_target = world; head = findradius(ent.origin, ent.target_range); - + while(head) // find the closest acceptable target to pass to { if(monster_isvalidtarget(head, ent)) { - // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) + // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc) vector head_center = CENTER_OR_VIEWOFS(head); vector ent_center = CENTER_OR_VIEWOFS(ent); - + //if(ctf_CheckPassDirection(head_center, ent_center, ent.v_angle, head.WarpZone_findradius_nearest)) if(closest_target) { @@ -153,10 +153,10 @@ entity FindTarget (entity ent) } else { closest_target = head; } } - + head = head.chain; } - + return closest_target; } @@ -164,7 +164,7 @@ void MonsterTouch () { if(other == world) return; - + if(self.enemy != other) if not(other.flags & FL_MONSTER) if(monster_isvalidtarget(other, self)) @@ -208,7 +208,7 @@ void precache_monstersounds() string m = (get_monsterinfo(self.monsterid)).model; float globhandle, n, i; string f; - + globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE); if (globhandle < 0) return; @@ -272,7 +272,7 @@ float LoadMonsterSounds(string f, float first) void UpdateMonsterSounds() { entity mon = get_monsterinfo(self.monsterid); - + if(self.skin == self.skin_for_monstersound) return; self.skin_for_monstersound = self.skin; @@ -288,18 +288,18 @@ void MonsterSound(.string samplefield, float sound_delay, float delaytoo, float if(delaytoo && time < self.msound_delay) return; // too early GlobalSound(self.samplefield, chan, VOICETYPE_PLAYERSOUND); - + self.msound_delay = time + sound_delay; } void monster_makevectors(entity e) { vector v; - + v = CENTER_OR_VIEWOFS(e); self.v_angle = vectoangles(v - (self.origin + self.view_ofs)); self.v_angle_x = -self.v_angle_x; - + makevectors(self.v_angle); } @@ -309,7 +309,7 @@ float monster_melee(entity targ, float damg, float anim, float er, float anim_fi if (self.health <= 0) return FALSE; // attacking while dead?! - + if(dostop) { self.velocity_x = 0; @@ -317,19 +317,19 @@ float monster_melee(entity targ, float damg, float anim, float er, float anim_fi self.state = MONSTER_STATE_ATTACK_MELEE; self.SendFlags |= MSF_MOVE; } - + monsters_setframe(anim); - + if(anim_finished != 0) self.attack_finished_single = time + anim_finished; monster_makevectors(targ); - + traceline(self.origin + self.view_ofs, self.origin + v_forward * er, 0, self); - + if(trace_ent.takedamage) Damage(trace_ent, self, self, rdmg * monster_skill, deathtype, trace_ent.origin, normalize(trace_ent.origin - self.origin)); - + return TRUE; } @@ -337,7 +337,7 @@ void Monster_CheckMinibossFlag () { if(MUTATOR_CALLHOOK(MonsterCheckBossFlag)) return; - + float chance = random() * 100; // g_monsters_miniboss_chance cvar or spawnflags 64 causes a monster to be a miniboss @@ -354,13 +354,13 @@ float Monster_CanRespawn(entity ent) other = ent; if(MUTATOR_CALLHOOK(MonsterRespawn)) return TRUE; // enabled by a mutator - + if(ent.spawnflags & MONSTERFLAG_NORESPAWN) return FALSE; - + if not(autocvar_g_monsters_respawn) return FALSE; - + return TRUE; } @@ -382,7 +382,7 @@ void Monster_Fade () setorigin(self, self.pos1); self.angles = self.pos2; self.health = self.max_health; - + self.SendFlags |= MSF_MOVE; self.SendFlags |= MSF_STATUS; } @@ -402,7 +402,7 @@ float Monster_CanJump (vector vel) return FALSE; // still attacking vector old = self.velocity; - + self.velocity = vel; tracetoss(self, self); self.velocity = old; @@ -416,16 +416,16 @@ float monster_leap (float anm, void() touchfunc, vector vel, float anim_finished { if(!Monster_CanJump(vel)) return FALSE; - + monsters_setframe(anm); self.state = MONSTER_STATE_ATTACK_LEAP; self.touch = touchfunc; self.origin_z += 1; self.velocity = vel; self.flags &= ~FL_ONGROUND; - + self.attack_finished_single = time + anim_finished; - + return TRUE; } @@ -435,13 +435,13 @@ void monster_checkattack(entity e, entity targ) return; if(targ == world) return; - + if not(e.monster_attackfunc) return; - + if(time < e.attack_finished_single) return; - + if(vlen(targ.origin - e.origin) <= e.attack_range) if(e.monster_attackfunc(MONSTER_ATTACK_MELEE)) { @@ -449,7 +449,7 @@ void monster_checkattack(entity e, entity targ) MonsterSound(monstersound_melee, 0, FALSE, CH_VOICE); return; } - + if(vlen(targ.origin - e.origin) > e.attack_range) if(e.monster_attackfunc(MONSTER_ATTACK_RANGED)) { @@ -479,7 +479,7 @@ vector monster_pickmovetarget(entity targ) self.last_trace = time + 1.2; return self.enemy.origin; } - + switch(self.monster_moveflags) { case MONSTER_MOVE_OWNER: @@ -506,11 +506,11 @@ vector monster_pickmovetarget(entity targ) vector pos; self.monster_movestate = MONSTER_MOVE_WANDER; self.last_trace = time + 2; - + self.angles_y = rint(random() * 500); makevectors(self.angles); pos = self.origin + v_forward * 600; - + if(self.flags & FL_FLY || self.flags & FL_SWIM) if(self.spawnflags & MONSTERFLAG_FLY_VERTICAL) { @@ -518,13 +518,13 @@ vector monster_pickmovetarget(entity targ) if(random() >= 0.5) pos_z *= -1; } - + if(targ) { self.last_trace = time + 0.5; pos = targ.origin; } - + return pos; } } @@ -536,35 +536,35 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ if(self.target2) self.goalentity = find(world, targetname, self.target2); - + entity targ; if(self.frozen) { self.revive_progress = bound(0, self.revive_progress + frametime * self.revive_speed, 1); self.health = max(1, self.max_health * self.revive_progress); - + self.SendFlags |= MSF_STATUS; - + movelib_beak_simple(stopspeed); - + self.velocity = '0 0 0'; self.enemy = world; self.nextthink = time + 0.1; - + if(self.revive_progress >= 1) Unfreeze(self); // wait for next think before attacking - + // don't bother updating angles here? if(self.origin != self.oldorigin) { self.oldorigin = self.origin; self.SendFlags |= MSF_MOVE; } - + return; // no moving while frozen } - + if(self.flags & FL_SWIM) { if(self.waterlevel < WATERLEVEL_WETFEET) @@ -573,7 +573,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ { self.fish_wasdrowning = TRUE; self.last_trace = time + 0.4; - + Damage (self, world, world, 2, DEATH_DROWN, self.origin, '0 0 0'); self.angles = '90 90 0'; if(random() < 0.5) @@ -588,13 +588,13 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ } self.velocity_z += random() * 150; } - - + + self.movetype = MOVETYPE_BOUNCE; //self.velocity_z = -200; - + self.SendFlags |= MSF_MOVE | MSF_ANG; - + return; } else if(self.fish_wasdrowning) @@ -604,13 +604,13 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ self.movetype = MOVETYPE_WALK; } } - + targ = self.goalentity; - + monster_target = targ; monster_speed_run = runspeed; monster_speed_walk = walkspeed; - + if(MUTATOR_CALLHOOK(MonsterMove) || gameover || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || time < game_starttime || (autocvar_g_campaign && !campaign_bots_may_start) || time < self.spawn_time) { runspeed = walkspeed = 0; @@ -624,24 +624,24 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ } return; } - + targ = monster_target; runspeed = monster_speed_run; walkspeed = monster_speed_walk; - + if(teamplay) if(autocvar_g_monsters_teams) if(IsDifferentTeam(self.monster_owner, self)) self.monster_owner = world; - + if(self.enemy && self.enemy.health < 1) self.enemy = world; // enough! - + if(time >= self.last_enemycheck) { if not(monster_isvalidtarget(self.enemy, self)) self.enemy = world; - + if not(self.enemy) { self.enemy = FindTarget(self); @@ -649,13 +649,13 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ MonsterSound(monstersound_sight, 0, FALSE, CH_VOICE); //monster_sound(self.msound_sight, 0, FALSE); } - + self.last_enemycheck = time + 0.5; } - + if(self.state == MONSTER_STATE_ATTACK_MELEE && time >= self.attack_finished_single) self.state = 0; - + if(self.state != MONSTER_STATE_ATTACK_MELEE) // don't move if set if(time >= self.last_trace || self.enemy) // update enemy instantly self.moveto = monster_pickmovetarget(targ); @@ -663,43 +663,43 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ if not(self.enemy) MonsterSound(monstersound_idle, 5, TRUE, CH_VOICE); //monster_sound(self.msound_idle, 5, TRUE); - + if(self.state != MONSTER_STATE_ATTACK_LEAP && self.state != MONSTER_STATE_ATTACK_MELEE) self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95); - + if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND)) { self.state = 0; self.touch = MonsterTouch; } - + //self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95); - + float turny = 0; vector real_angle = vectoangles(self.steerto) - self.angles; - + if(self.state != MONSTER_STATE_ATTACK_LEAP && self.state != MONSTER_STATE_ATTACK_MELEE) turny = 20; - + if(self.flags & FL_SWIM) turny = vlen(self.angles - self.moveto); - + if(turny) { turny = bound(turny * -1, shortangle_f(real_angle_y, self.angles_y), turny); self.angles_y += turny; } - + if(self.state == MONSTER_STATE_ATTACK_MELEE) self.moveto = self.origin; - + if(self.enemy && self.enemy.vehicle) runspeed = 0; - + if(((self.flags & FL_FLY) || (self.flags & FL_SWIM)) && self.spawnflags & MONSTERFLAG_FLY_VERTICAL) v_forward = normalize(self.moveto - self.origin); else - self.moveto_z = self.origin_z; + self.moveto_z = self.origin_z; if(vlen(self.origin - self.moveto) > 64) { @@ -707,7 +707,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ movelib_move_simple(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6); else movelib_move_simple_gravity(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6); - + if(time > self.pain_finished) if(time > self.attack_finished_single) if(vlen(self.velocity) > 10) @@ -722,22 +722,22 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_ self.target2 = e.target2; else if(e.target) self.target2 = e.target; - + movelib_beak_simple(stopspeed); if(time > self.attack_finished_single) if(time > self.pain_finished) if (vlen(self.velocity) <= 30) monsters_setframe(manim_idle); } - + monster_checkattack(self, self.enemy); - + if(self.angles != self.oldangles) { self.oldangles = self.angles; self.SendFlags |= MSF_ANG; } - + if(self.origin != self.oldorigin) { self.oldorigin = self.origin; @@ -749,16 +749,16 @@ void monster_dead_think() { self.think = monster_dead_think; self.nextthink = time + self.ticrate; - + self.deadflag = DEAD_DEAD; - + if(self.ltime != 0) if(time >= self.ltime) { Monster_Fade(); return; } - + if(self.oldorigin != self.origin) { self.oldorigin = self.origin; @@ -783,12 +783,12 @@ float Monster_CheckAppearFlags(entity ent) { if not(ent.spawnflags & MONSTERFLAG_APPEAR) return FALSE; - + ent.think = func_null; ent.nextthink = 0; ent.use = Monster_Appear; ent.flags = FL_MONSTER; // set so this monster can get butchered - + return TRUE; } @@ -796,14 +796,14 @@ void monsters_reset() { setorigin(self, self.pos1); self.angles = self.pos2; - + self.health = self.max_health; self.velocity = '0 0 0'; self.enemy = world; self.goalentity = world; self.attack_finished_single = 0; self.moveto = self.origin; - + self.SendFlags |= MSF_STATUS; } @@ -814,57 +814,57 @@ float monster_send(entity to, float sf) if(sf & MSF_SETUP) { WriteByte(MSG_ENTITY, self.monsterid); - + WriteCoord(MSG_ENTITY, self.origin_x); WriteCoord(MSG_ENTITY, self.origin_y); WriteCoord(MSG_ENTITY, self.origin_z); - + WriteAngle(MSG_ENTITY, self.angles_x); WriteAngle(MSG_ENTITY, self.angles_y); - + WriteByte(MSG_ENTITY, self.skin); WriteByte(MSG_ENTITY, self.team); } - + if(sf & MSF_ANG) { WriteShort(MSG_ENTITY, rint(self.angles_x)); WriteShort(MSG_ENTITY, rint(self.angles_y)); } - + if(sf & MSF_MOVE) { WriteShort(MSG_ENTITY, rint(self.origin_x)); WriteShort(MSG_ENTITY, rint(self.origin_y)); WriteShort(MSG_ENTITY, rint(self.origin_z)); - + WriteShort(MSG_ENTITY, rint(self.velocity_x)); WriteShort(MSG_ENTITY, rint(self.velocity_y)); WriteShort(MSG_ENTITY, rint(self.velocity_z)); - + WriteShort(MSG_ENTITY, rint(self.angles_y)); } - + if(sf & MSF_ANIM) { WriteCoord(MSG_ENTITY, self.anim_start_time); WriteByte(MSG_ENTITY, self.frame); } - + if(sf & MSF_STATUS) { WriteByte(MSG_ENTITY, self.skin); - + WriteByte(MSG_ENTITY, self.team); - + WriteByte(MSG_ENTITY, self.deadflag); - + if(self.health <= 0) WriteByte(MSG_ENTITY, 0); else WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255)); } - + return TRUE; } @@ -872,19 +872,19 @@ void monster_link(void() spawnproc) { Net_LinkEntity(self, TRUE, 0, monster_send); self.think = spawnproc; - self.nextthink = time; + self.nextthink = time; } void monsters_corpse_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { self.health -= damage; - + Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker); - + if(self.health <= -100) // 100 health until gone? { Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker); - + self.think = SUB_Remove; self.nextthink = time + 0.1; } @@ -895,37 +895,37 @@ void monster_die() self.think = monster_dead_think; self.nextthink = self.ticrate; self.ltime = time + 5; - + monster_dropitem(); - + MonsterSound(monstersound_death, 0, FALSE, CH_VOICE); //monster_sound(self.msound_death, 0, FALSE); - + if(!(self.spawnflags & MONSTERFLAG_SPAWNED) && !self.monster_respawned) monsters_killed += 1; - + if(self.candrop && self.weapon) - W_ThrowNewWeapon(self, self.weapon, 0, self.origin, randomvec() * 150 + '0 0 325'); - + W_ThrowNewWeapon(self, self.weapon, 0, self.origin, randomvec() * 150 + '0 0 325'); + if(IS_CLIENT(self.realowner)) self.realowner.monstercount -= 1; - - self.event_damage = monsters_corpse_damage; - self.solid = SOLID_CORPSE; - self.takedamage = DAMAGE_AIM; - self.enemy = world; + + self.event_damage = monsters_corpse_damage; + self.solid = SOLID_CORPSE; + self.takedamage = DAMAGE_AIM; + self.enemy = world; self.movetype = MOVETYPE_TOSS; self.moveto = self.origin; self.touch = MonsterTouch; // reset incase monster was pouncing - + if not(self.flags & FL_FLY) self.velocity = '0 0 0'; - + self.SendFlags |= MSF_MOVE; - + // number of monsters spawned with mobspawn command totalspawned -= 1; - + MON_ACTION(self.monsterid, MR_DEATH); } @@ -933,29 +933,29 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea { if(self.frozen && deathtype != DEATH_KILL) return; - + if(time < self.pain_finished && deathtype != DEATH_KILL) return; - + if(time < self.spawnshieldtime) return; - + vector v; float take, save; - + v = healtharmor_applydamage(self.armorvalue, self.m_armor_blockpercent, damage); take = v_x; save = v_y; - + self.health -= take; - + self.dmg_time = time; if(sound_allowed(MSG_BROADCAST, attacker) && deathtype != DEATH_DROWN) spamsound (self, CH_PAIN, "misc/bodyimpact1.wav", VOL_BASE, ATTEN_NORM); // FIXME: PLACEHOLDER - + self.velocity += force * self.damageforcescale; - + if(deathtype != DEATH_DROWN) { Violence_GibSplash_At(hitloc, force, 2, bound(0, take, 200) / 16, self, attacker); @@ -964,33 +964,33 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea if (take > 100) Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, self, attacker); } - + if(self.health <= 0) { if(deathtype == DEATH_KILL) self.candrop = FALSE; // killed by mobkill command - + // TODO: fix this? activator = attacker; other = self.enemy; SUB_UseTargets(); self.target2 = self.oldtarget2; // reset to original target on death, incase we respawn - + monster_die(); - + frag_attacker = attacker; frag_target = self; MUTATOR_CALLHOOK(MonsterDies); - + if(self.health <= -100) // check if we're already gibbed { Violence_GibSplash(self, 1, 0.5, attacker); - + self.think = SUB_Remove; self.nextthink = time + 0.1; } } - + self.SendFlags |= MSF_STATUS; } @@ -998,7 +998,7 @@ void monster_think() { self.think = monster_think; self.nextthink = self.ticrate; - + MON_ACTION(self.monsterid, MR_THINK); } @@ -1008,43 +1008,43 @@ void monster_spawn() if not(self.monster_respawned) Monster_CheckMinibossFlag(); - + self.max_health = self.health; self.pain_finished = self.nextthink; self.anim_start_time = time; - + if not(self.noalign) { setorigin(self, self.origin + '0 0 20'); tracebox(self.origin + '0 0 100', self.mins, self.maxs, self.origin - '0 0 10000', MOVE_WORLDONLY, self); setorigin(self, trace_endpos); } - + if not(self.monster_respawned) if not(self.skin) self.skin = rint(random() * 4); - + if not(self.attack_range) self.attack_range = autocvar_g_monsters_attack_range; - + self.pos1 = self.origin; - + //monster_setupsounds(self.netname); precache_monstersounds(); UpdateMonsterSounds(); //monster_precachesounds(self); - + if(teamplay) self.monster_attack = TRUE; // we can have monster enemies in team games - + //monster_sound(self.msound_spawn, 0, FALSE); MonsterSound(monstersound_spawn, 0, FALSE, CH_VOICE); - + self.think = monster_think; self.nextthink = time + self.ticrate; - + self.SendFlags |= MSF_SETUP; - + MUTATOR_CALLHOOK(MonsterSpawn); } @@ -1052,37 +1052,37 @@ float monster_initialize(float mon_id, float nodrop) { if not(autocvar_g_monsters) return FALSE; - + entity mon = get_monsterinfo(mon_id); - + // support for quake style removing monsters based on skill switch(monster_skill) { case 0: - case 1: if(self.spawnflags & MONSTERSKILL_NOTEASY) return FALSE; break; - case 2: if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) return FALSE; break; + case 1: if(self.spawnflags & MONSTERSKILL_NOTEASY) return FALSE; break; + case 2: if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) return FALSE; break; default: - case 3: if(self.spawnflags & MONSTERSKILL_NOTHARD) return FALSE; break; + case 3: if(self.spawnflags & MONSTERSKILL_NOTHARD) return FALSE; break; } - + if(self.team && !teamplay) self.team = 0; - + if not(self.spawnflags & MONSTERFLAG_SPAWNED) // naturally spawned monster if not(self.monster_respawned) monsters_total += 1; - + setsize(self, mon.mins, mon.maxs); self.flags = FL_MONSTER; - self.takedamage = DAMAGE_AIM; - self.bot_attack = TRUE; - self.iscreature = TRUE; - self.teleportable = TRUE; + self.takedamage = DAMAGE_AIM; + self.bot_attack = TRUE; + self.iscreature = TRUE; + self.teleportable = TRUE; self.damagedbycontents = TRUE; self.monsterid = mon_id; - self.damageforcescale = 0; - self.event_damage = monsters_damage; - self.touch = MonsterTouch; + self.damageforcescale = 0; + self.event_damage = monsters_damage; + self.touch = MonsterTouch; self.use = monster_use; self.solid = SOLID_BBOX; self.movetype = MOVETYPE_WALK; @@ -1102,37 +1102,37 @@ float monster_initialize(float mon_id, float nodrop) self.noalign = nodrop; self.spawn_time = time; self.gravity = 1; - self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP; - + self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP; + if(mon.spawnflags & MONSTER_TYPE_SWIM) self.flags |= FL_SWIM; - + if(mon.spawnflags & MONSTER_TYPE_FLY) { self.flags |= FL_FLY; self.movetype = MOVETYPE_FLY; } - + if(mon.spawnflags & MONSTER_SIZE_BROKEN) self.scale = 1.3; - + if not(self.ticrate) self.ticrate = autocvar_g_monsters_think_delay; - + self.ticrate = bound(sys_frametime, self.ticrate, 60); - + if not(self.m_armor_blockpercent) self.m_armor_blockpercent = 0.5; - + if not(self.target_range) self.target_range = autocvar_g_monsters_target_range; - + if not(self.respawntime) self.respawntime = autocvar_g_monsters_respawn_delay; - + if not(self.monster_moveflags) self.monster_moveflags = MONSTER_MOVE_WANDER; - + monster_link(monster_spawn); return TRUE; -- 2.39.2