// =========================
-// SVQC Monster Properties
+// SVQC Monster Properties
// =========================
}
}
+float Monster_SkillModifier()
+{
+ float t = 0.5+self.monster_skill*((1.2-0.3)/10);
+
+ return t;
+}
+
float monster_isvalidtarget (entity targ, entity ent)
{
if(!targ || !ent)
return FALSE;
if(targ.vehicle_flags & VHF_ISVEHICLE)
- if not((get_monsterinfo(ent.monsterid)).spawnflags & MON_FLAG_RANGED)
+ if(!((get_monsterinfo(ent.monsterid)).spawnflags & MON_FLAG_RANGED))
return FALSE; // melee attacks are useless against vehicles
if(time < game_starttime)
if(IS_SPEC(targ) || IS_OBSERVER(targ))
return FALSE; // enemy is a spectator
- if not(targ.vehicle_flags & VHF_ISVEHICLE)
+ if(!(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(targ.monster_owner == ent)
return FALSE; // don't attack our pet
- if not(targ.vehicle_flags & VHF_ISVEHICLE)
+ if(!(targ.vehicle_flags & VHF_ISVEHICLE))
if(targ.flags & FL_NOTARGET)
return FALSE; // enemy can't be targeted
- if not(autocvar_g_monsters_typefrag)
+ if(!autocvar_g_monsters_typefrag)
if(targ.BUTTON_CHAT)
return FALSE; // no typefragging!
if(SAME_TEAM(targ, ent))
return FALSE; // enemy is on our team
-
- if (targ.frozen == 1 || (targ.frozen == 2 && ent.monsterid != MON_SPIDER))
+
+ if (targ.freezetag_frozen)
return FALSE; // ignore frozen
if(autocvar_g_monsters_target_infront || ent.spawnflags & MONSTERFLAG_INFRONT)
return;
if(self.enemy != other)
- if not(other.flags & FL_MONSTER)
+ if(!(other.flags & FL_MONSTER))
if(monster_isvalidtarget(other, self))
self.enemy = other;
}
float monster_melee(entity targ, float damg, float anim, float er, float anim_finished, float deathtype, float dostop)
{
- float rdmg = damg * random();
-
if (self.health <= 0)
return FALSE; // attacking while dead?!
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));
+ Damage(trace_ent, self, self, damg * Monster_SkillModifier(), deathtype, trace_ent.origin, normalize(trace_ent.origin - self.origin));
return TRUE;
}
{
self.health += autocvar_g_monsters_miniboss_healthboost;
self.effects |= EF_RED;
- if not(self.weapon)
- self.weapon = WEP_NEX;
+ if(!self.weapon)
+ self.weapon = WEP_VORTEX;
}
}
if(ent.spawnflags & MONSTERFLAG_NORESPAWN)
return FALSE;
- if not(autocvar_g_monsters_respawn)
+ if(!autocvar_g_monsters_respawn)
return FALSE;
return TRUE;
{
if(Monster_CanRespawn(self))
{
- self.monster_respawned = TRUE;
+ self.spawnflags |= MONSTERFLAG_RESPAWNED;
self.think = self.monster_spawnfunc;
self.nextthink = time + self.respawntime;
self.ltime = 0;
setmodel(self, "null");
}
else
+ {
+ // number of monsters spawned with mobspawn command
+ totalspawned -= 1;
+
+ if(IS_CLIENT(self.realowner))
+ self.realowner.monstercount -= 1;
+
SUB_SetFade(self, time + 3, 1);
+ }
}
float Monster_CanJump (vector vel)
{
if(self.state)
return FALSE; // already attacking
- if not(self.flags & FL_ONGROUND)
+ if(!(self.flags & FL_ONGROUND))
return FALSE; // not on the ground
if(self.health <= 0)
return FALSE; // called when dead?
if(targ == world)
return;
- if not(e.monster_attackfunc)
+ if(!e.monster_attackfunc)
return;
if(time < e.attack_finished_single)
void monster_use ()
{
- if not(self.enemy)
+ if(!self.enemy)
if(self.health > 0)
if(monster_isvalidtarget(activator, self))
self.enemy = activator;
entity targ;
- if(self.frozen)
- {
- self.revive_progress = bound(0, self.revive_progress + self.ticrate * self.revive_speed, 1);
- self.health = max(1, self.max_health * self.revive_progress);
-
- WaypointSprite_UpdateHealth(self.sprite, self.health);
-
- movelib_beak_simple(stopspeed);
-
- self.frame = manim_idle;
-
- self.enemy = world;
- self.nextthink = time + self.ticrate;
-
- if(self.revive_progress >= 1)
- Unfreeze(self); // wait for next think before attacking
-
- return; // no moving while frozen
- }
-
if(self.flags & FL_SWIM)
{
if(self.waterlevel < WATERLEVEL_WETFEET)
}
targ = monster_target;
- runspeed = monster_speed_run;
- walkspeed = monster_speed_walk;
+ runspeed = bound(0, monster_speed_run * Monster_SkillModifier(), runspeed * 2); // limit maxspeed to prevent craziness
+ walkspeed = bound(0, monster_speed_walk * Monster_SkillModifier(), walkspeed * 2); // limit maxspeed to prevent craziness
+
+ if(time < self.spider_slowness)
+ {
+ runspeed *= 0.5;
+ walkspeed *= 0.5;
+ }
if(teamplay)
if(autocvar_g_monsters_teams)
if(time >= self.last_enemycheck)
{
- if not(monster_isvalidtarget(self.enemy, self))
+ if(!monster_isvalidtarget(self.enemy, self))
self.enemy = world;
- if not(self.enemy)
+ if(!self.enemy)
{
self.enemy = FindTarget(self);
if(self.enemy)
if(time >= self.last_trace || self.enemy) // update enemy instantly
self.moveto = monster_pickmovetarget(targ);
- if not(self.enemy)
- MonsterSound(monstersound_idle, 5, TRUE, CH_VOICE);
+ if(!self.enemy)
+ MonsterSound(monstersound_idle, 7, TRUE, CH_VOICE);
if(self.state != MONSTER_STATE_ATTACK_LEAP && self.state != MONSTER_STATE_ATTACK_MELEE)
self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95);
monster_checkattack(self, self.enemy);
}
+void monster_remove(entity mon)
+{
+ if(!mon)
+ return; // nothing to remove
+
+ pointparticles(particleeffectnum("item_pickup"), mon.origin, '0 0 0', 1);
+
+ if(mon.weaponentity)
+ remove(mon.weaponentity);
+
+ WaypointSprite_Kill(mon.sprite);
+
+ remove(mon);
+}
+
void monster_dead_think()
{
self.nextthink = time + self.ticrate;
-
+
CSQCMODEL_AUTOUPDATE();
if(self.ltime != 0)
float Monster_CheckAppearFlags(entity ent)
{
- if not(ent.spawnflags & MONSTERFLAG_APPEAR)
+ if(!(ent.spawnflags & MONSTERFLAG_APPEAR))
return FALSE;
ent.think = func_null;
{
setorigin(self, self.pos1);
self.angles = self.pos2;
-
- Unfreeze(self); // remove any icy remains
self.health = self.max_health;
self.velocity = '0 0 0';
if(self.health <= -100) // 100 health until gone?
{
Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
-
+
+ // number of monsters spawned with mobspawn command
+ totalspawned -= 1;
+
if(IS_CLIENT(self.realowner))
- if not(self.monster_respawned)
self.realowner.monstercount -= 1;
self.think = SUB_Remove;
self.think = monster_dead_think;
self.nextthink = time;
self.ltime = time + 5;
-
- if ( self.frozen )
- {
- Unfreeze(self); // remove any icy remains
- self.health = 0; // reset by Unfreeze
- }
-
+
monster_dropitem();
MonsterSound(monstersound_death, 0, FALSE, CH_VOICE);
- if(!(self.spawnflags & MONSTERFLAG_SPAWNED) && !self.monster_respawned)
+ if(!(self.spawnflags & MONSTERFLAG_SPAWNED) && !(self.spawnflags & MONSTERFLAG_RESPAWNED))
monsters_killed += 1;
-
+
if(IS_PLAYER(attacker))
- if( autocvar_g_monsters_score_spawned ||
- ( !(self.spawnflags & MONSTERFLAG_SPAWNED) && !self.monster_respawned) )
+ if(autocvar_g_monsters_score_spawned || !((self.spawnflags & MONSTERFLAG_SPAWNED) || (self.spawnflags & MONSTERFLAG_RESPAWNED)))
PlayerScore_Add(attacker, SP_SCORE, +autocvar_g_monsters_score_kill);
- if(!Monster_CanRespawn(self) || gibbed)
+ if(gibbed)
{
// number of monsters spawned with mobspawn command
totalspawned -= 1;
-
+
if(IS_CLIENT(self.realowner))
- if not(self.monster_respawned)
self.realowner.monstercount -= 1;
}
self.state = 0;
self.attack_finished_single = 0;
- if not(self.flags & FL_FLY)
+ if(!(self.flags & FL_FLY))
self.velocity = '0 0 0';
MON_ACTION(self.monsterid, MR_DEATH);
void monsters_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
-
- if(self.frozen && deathtype != DEATH_KILL)
- return;
-
if(time < self.pain_finished && deathtype != DEATH_KILL)
return;
save = v_y;
self.health -= take;
-
+
WaypointSprite_UpdateHealth(self.sprite, self.health);
self.dmg_time = time;
self.target2 = self.oldtarget2; // reset to original target on death, incase we respawn
monster_die(attacker, (self.health <= -100 || deathtype == DEATH_KILL));
-
+
WaypointSprite_Kill(self.sprite);
-
+
frag_attacker = attacker;
frag_target = self;
MUTATOR_CALLHOOK(MonsterDies);
}
}
+void monster_setupcolors()
+{
+ if(IS_PLAYER(self.monster_owner))
+ self.colormap = self.monster_owner.colormap;
+ else if(teamplay && self.team)
+ self.colormap = 1024 + (self.team - 1) * 17;
+ else
+ {
+ if(self.monster_skill <= MONSTER_SKILL_EASY)
+ self.colormap = 1029;
+ else if(self.monster_skill <= MONSTER_SKILL_MEDIUM)
+ self.colormap = 1027;
+ else if(self.monster_skill <= MONSTER_SKILL_HARD)
+ self.colormap = 1038;
+ else if(self.monster_skill <= MONSTER_SKILL_INSANE)
+ self.colormap = 1028;
+ else if(self.monster_skill <= MONSTER_SKILL_NIGHTMARE)
+ self.colormap = 1032;
+ else
+ self.colormap = 1024;
+ }
+}
+
void monster_think()
{
self.think = monster_think;
self.nextthink = self.ticrate;
-
+
if(self.ltime)
if(time >= self.ltime)
{
}
MON_ACTION(self.monsterid, MR_THINK);
-
+
CSQCMODEL_AUTOUPDATE();
}
-void monster_spawn()
+float monster_spawn()
{
MON_ACTION(self.monsterid, MR_SETUP);
- if not(self.monster_respawned)
+ if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
+ {
Monster_CheckMinibossFlag();
+ self.health *= Monster_SkillModifier();
+ }
self.max_health = self.health;
self.pain_finished = self.nextthink;
-
+
if(IS_PLAYER(self.monster_owner))
self.effects |= EF_DIMLIGHT;
- if not(self.monster_respawned)
- if not(self.skin)
+ if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
+ if(!self.skin)
self.skin = rint(random() * 4);
- if not(self.attack_range)
+ if(!self.attack_range)
self.attack_range = autocvar_g_monsters_attack_range;
-
+
precache_monstersounds();
UpdateMonsterSounds();
if(teamplay)
self.monster_attack = TRUE; // we can have monster enemies in team games
-
+
MonsterSound(monstersound_spawn, 0, FALSE, CH_VOICE);
-
+
WaypointSprite_Spawn(M_NAME(self.monsterid), 0, 1024, self, '0 0 1' * (self.maxs_z + 15), world, self.team, self, sprite, TRUE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));
WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
WaypointSprite_UpdateHealth(self.sprite, self.health);
self.think = monster_think;
self.nextthink = time + self.ticrate;
- MUTATOR_CALLHOOK(MonsterSpawn);
+ if(MUTATOR_CALLHOOK(MonsterSpawn))
+ return FALSE;
+
+ return TRUE;
}
float monster_initialize(float mon_id, float nodrop)
{
- if not(autocvar_g_monsters)
+ if(!autocvar_g_monsters)
return FALSE;
entity mon = get_monsterinfo(mon_id);
+ if(!self.monster_skill)
+ self.monster_skill = cvar("g_monsters_skill");
+
// support for quake style removing monsters based on skill
- if(monster_skill <= 1) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return FALSE; }
- if(monster_skill == 2) if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) { return FALSE; }
- if(monster_skill >= 3) if(self.spawnflags & MONSTERSKILL_NOTHARD) { return FALSE; }
+ if(self.monster_skill == MONSTER_SKILL_EASY) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return FALSE; }
+ if(self.monster_skill == MONSTER_SKILL_MEDIUM) if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) { return FALSE; }
+ if(self.monster_skill == MONSTER_SKILL_HARD) if(self.spawnflags & MONSTERSKILL_NOTHARD) { return FALSE; }
if(self.team && !teamplay)
self.team = 0;
- if not(self.spawnflags & MONSTERFLAG_SPAWNED) // naturally spawned monster
- if not(self.monster_respawned)
+ if(!(self.spawnflags & MONSTERFLAG_SPAWNED)) // naturally spawned monster
+ if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
monsters_total += 1;
setmodel(self, mon.model);
self.scale = 1;
self.noalign = nodrop;
self.spawn_time = time;
+ self.spider_slowness = 0;
self.gravity = 1;
self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
-
+
if(autocvar_g_fullbrightplayers)
self.effects |= EF_FULLBRIGHT;
-
+
if(autocvar_g_nodepthtestplayers)
self.effects |= EF_NODEPTHTEST;
if(mon.spawnflags & MONSTER_SIZE_BROKEN)
self.scale = 1.3;
- if not(self.ticrate)
+ if(!self.ticrate)
self.ticrate = autocvar_g_monsters_think_delay;
self.ticrate = bound(sys_frametime, self.ticrate, 60);
- if not(self.m_armor_blockpercent)
+ if(!self.m_armor_blockpercent)
self.m_armor_blockpercent = 0.5;
- if not(self.target_range)
+ if(!self.target_range)
self.target_range = autocvar_g_monsters_target_range;
- if not(self.respawntime)
+ if(!self.respawntime)
self.respawntime = autocvar_g_monsters_respawn_delay;
- if not(self.monster_moveflags)
+ if(!self.monster_moveflags)
self.monster_moveflags = MONSTER_MOVE_WANDER;
-
- if not(self.noalign)
+
+ if(!self.noalign)
{
setorigin(self, self.origin + '0 0 20');
tracebox(self.origin + '0 0 64', self.mins, self.maxs, self.origin - '0 0 10000', MOVE_WORLDONLY, self);
setorigin(self, trace_endpos);
}
-
- monster_spawn();
-
+
+ if(!monster_spawn())
+ return FALSE;
+
+ if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
+ monster_setupcolors();
+
CSQCMODEL_AUTOINIT();
return TRUE;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff