From: Mario Date: Mon, 22 Apr 2013 13:20:40 +0000 (+1000) Subject: Remove some remaining scale modifiers X-Git-Tag: xonotic-v0.8.0~241^2^2~312 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c9b30ebb2cd3627d39150748a5fda353fc5116f;p=xonotic%2Fxonotic-data.pk3dir.git Remove some remaining scale modifiers --- diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc index 6f45f4662..242e7bc23 100644 --- a/qcsrc/server/monsters/monster/demon.qc +++ b/qcsrc/server/monsters/monster/demon.qc @@ -43,14 +43,12 @@ void Demon_JumpTouch () { if (self.health <= 0) return; - - float bigdmg = autocvar_g_monster_demon_attack_jump_damage * self.scale; if (monster_isvalidtarget(other, self)) { if (vlen(self.velocity) > 300) { - Damage(other, self, self, bigdmg * monster_skill, DEATH_MONSTER_FIEND, other.origin, normalize(other.origin - self.origin)); + Damage(other, self, self, autocvar_g_monster_demon_attack_jump_damage * monster_skill, DEATH_MONSTER_FIEND, other.origin, normalize(other.origin - self.origin)); self.touch = MonsterTouch; // instantly turn it off to stop damage spam } } @@ -83,7 +81,7 @@ void demon_die () void demon_spawn () { if not(self.health) - self.health = autocvar_g_monster_demon_health * self.scale; + self.health = autocvar_g_monster_demon_health; self.damageforcescale = 0; self.classname = "monster_demon"; diff --git a/qcsrc/server/monsters/monster/dog.qc b/qcsrc/server/monsters/monster/dog.qc index 638e4cd51..2fc197350 100644 --- a/qcsrc/server/monsters/monster/dog.qc +++ b/qcsrc/server/monsters/monster/dog.qc @@ -24,14 +24,13 @@ const float dog_anim_pain = 5; void Dog_JumpTouch () { - float bigdmg = autocvar_g_monster_dog_attack_jump_damage * self.scale; if (self.health <= 0) return; if (other.takedamage) { if (vlen(self.velocity) > 300) - Damage(self.enemy, self, self, bigdmg * monster_skill, DEATH_MONSTER_DOG_JUMP, self.enemy.origin, normalize(self.enemy.origin - self.origin)); + Damage(self.enemy, self, self, autocvar_g_monster_dog_attack_jump_damage * monster_skill, DEATH_MONSTER_DOG_JUMP, self.enemy.origin, normalize(self.enemy.origin - self.origin)); } if(self.flags & FL_ONGROUND) @@ -78,7 +77,7 @@ void dog_die () void dog_spawn () { if not(self.health) - self.health = autocvar_g_monster_dog_health * self.scale; + self.health = autocvar_g_monster_dog_health; self.damageforcescale = 0; self.classname = "monster_dog"; diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc index 7a01b50f5..ac4ad0ee0 100644 --- a/qcsrc/server/monsters/monster/fish.qc +++ b/qcsrc/server/monsters/monster/fish.qc @@ -50,7 +50,7 @@ void fish_die () void fish_spawn () { if not(self.health) - self.health = autocvar_g_monster_fish_health * self.scale; + self.health = autocvar_g_monster_fish_health; self.damageforcescale = 0.5; self.classname = "monster_fish"; diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc index 215cf8a5f..e2e6fa45c 100644 --- a/qcsrc/server/monsters/monster/hknight.qc +++ b/qcsrc/server/monsters/monster/hknight.qc @@ -49,7 +49,7 @@ void hknight_spike_think() { if(self) { - RadiusDamage (self, self.realowner, autocvar_g_monster_hellknight_spike_damage * self.realowner.scale, autocvar_g_monster_hellknight_spike_edgedamage, autocvar_g_monster_hellknight_spike_force, world, autocvar_g_monster_hellknight_spike_radius, DEATH_MONSTER_HKNIGHT_SPIKE, other); + RadiusDamage (self, self.realowner, autocvar_g_monster_hellknight_spike_damage, autocvar_g_monster_hellknight_spike_edgedamage, autocvar_g_monster_hellknight_spike_force, world, autocvar_g_monster_hellknight_spike_radius, DEATH_MONSTER_HKNIGHT_SPIKE, other); remove(self); } } @@ -192,10 +192,9 @@ void hellknight_magic () void hknight_fireball_explode(entity targ) { - float scle = self.realowner.scale; if(self) { - RadiusDamage (self, self.realowner, autocvar_g_monster_hellknight_fireball_damage * scle, autocvar_g_monster_hellknight_fireball_edgedamage * scle, autocvar_g_monster_hellknight_fireball_force * scle, world, autocvar_g_monster_hellknight_fireball_radius * scle, self.projectiledeathtype, targ); + RadiusDamage (self, self.realowner, autocvar_g_monster_hellknight_fireball_damage, autocvar_g_monster_hellknight_fireball_edgedamage, autocvar_g_monster_hellknight_fireball_force, world, autocvar_g_monster_hellknight_fireball_radius, self.projectiledeathtype, targ); if(targ) Fire_AddDamage(targ, self, 5 * monster_skill, autocvar_g_monster_hellknight_inferno_damagetime, self.projectiledeathtype); remove(self); @@ -218,7 +217,7 @@ void hellknight_fireball () { local entity missile = spawn(); local vector dir = normalize((self.enemy.origin + '0 0 10') - self.origin); - vector fmins = ((self.scale >= 2) ? '-16 -16 -16' : '-4 -4 -4'), fmaxs = ((self.scale >= 2) ? '16 16 16' : '4 4 4'); + vector fmins = '-4 -4 -4', fmaxs = '4 4 4'; self.effects |= EF_MUZZLEFLASH; sound (self, CHAN_WEAPON, "weapons/fireball2.wav", 1, ATTN_NORM); @@ -236,7 +235,7 @@ void hellknight_fireball () missile.think = hknight_fireball_think; missile.enemy = self.enemy; missile.touch = hknight_fireball_touch; - CSQCProjectile(missile, TRUE, ((self.scale >= 2) ? PROJECTILE_FIREBALL : PROJECTILE_FIREMINE), TRUE); + CSQCProjectile(missile, TRUE, PROJECTILE_FIREMINE, TRUE); self.delay = -1; } @@ -351,7 +350,7 @@ float hknight_magic () RandomSelection_Add(world, 0, "inferno", autocvar_g_monster_hellknight_inferno_chance, 1); RandomSelection_Add(world, 0, "spikes", autocvar_g_monster_hellknight_spike_chance, 1); if(self.health >= 100) - RandomSelection_Add(world, 0, "jump", ((vlen(self.enemy.origin - self.origin) > autocvar_g_monster_hellknight_jump_dist * self.scale) ? 1 : autocvar_g_monster_hellknight_jump_chance), 1); + RandomSelection_Add(world, 0, "jump", ((vlen(self.enemy.origin - self.origin) > autocvar_g_monster_hellknight_jump_dist) ? 1 : autocvar_g_monster_hellknight_jump_chance), 1); switch(RandomSelection_chosen_string) { @@ -414,7 +413,7 @@ void hellknight_die () void hellknight_spawn () { if not(self.health) - self.health = autocvar_g_monster_hellknight_health * self.scale; + self.health = autocvar_g_monster_hellknight_health; self.damageforcescale = 0.003; self.classname = "monster_hellknight"; diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc index 742194521..4b1a88a41 100644 --- a/qcsrc/server/monsters/monster/knight.qc +++ b/qcsrc/server/monsters/monster/knight.qc @@ -60,7 +60,7 @@ void knight_die () void knight_spawn () { if not(self.health) - self.health = autocvar_g_monster_knight_health * self.scale; + self.health = autocvar_g_monster_knight_health; self.damageforcescale = 0.003; self.classname = "monster_knight"; diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc index 955c34811..e8cd8906d 100644 --- a/qcsrc/server/monsters/monster/ogre.qc +++ b/qcsrc/server/monsters/monster/ogre.qc @@ -210,7 +210,7 @@ void ogre_die() void ogre_spawn() { if not(self.health) - self.health = autocvar_g_monster_ogre_health * self.scale; + self.health = autocvar_g_monster_ogre_health; self.damageforcescale = 0.003; self.classname = "monster_ogre"; diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc index 137104187..ae2804b31 100644 --- a/qcsrc/server/monsters/monster/shalrath.qc +++ b/qcsrc/server/monsters/monster/shalrath.qc @@ -53,7 +53,7 @@ void shalrath_think () { if not(IsDifferentTeam(head, self)) if(head.health > 0) - if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range * self.scale) + if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range) if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells)) { friend_needshelp = TRUE; @@ -64,7 +64,7 @@ void shalrath_think () { if not(IsDifferentTeam(head, self)) if(head.health > 0) - if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range * self.scale) + if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range) if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells)) { friend_needshelp = TRUE; @@ -316,7 +316,7 @@ void shalrath_heal() { if(head.health > 0) if not(head.frozen) - if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range * self.scale) + if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range) if not(IsDifferentTeam(head, self)) { if(IS_PLAYER(head)) @@ -393,7 +393,7 @@ void shalrath_die () void shalrath_spawn () { if not(self.health) - self.health = autocvar_g_monster_shalrath_health * self.scale; + self.health = autocvar_g_monster_shalrath_health; self.damageforcescale = 0.003; self.classname = "monster_shalrath"; diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc index a3ba1e736..8b8a9a7e2 100644 --- a/qcsrc/server/monsters/monster/shambler.qc +++ b/qcsrc/server/monsters/monster/shambler.qc @@ -101,7 +101,7 @@ void CastLightning () self.effects |= EF_MUZZLEFLASH; - org = self.origin + '0 0 40' * self.scale; + org = self.origin + '0 0 40'; dir = self.enemy.origin + '0 0 16' - org; dir = normalize (dir); @@ -144,7 +144,7 @@ void shambler_die () void shambler_spawn () { if not(self.health) - self.health = autocvar_g_monster_shambler_health * self.scale; + self.health = autocvar_g_monster_shambler_health; self.damageforcescale = 0.003; self.classname = "monster_shambler"; diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc index b225b41ce..cf0e7a7c6 100644 --- a/qcsrc/server/monsters/monster/soldier.qc +++ b/qcsrc/server/monsters/monster/soldier.qc @@ -306,7 +306,7 @@ void soldier_die() void soldier_spawn () { if not(self.health) - self.health = autocvar_g_monster_soldier_health * self.scale; + self.health = autocvar_g_monster_soldier_health; self.damageforcescale = 0.003; self.classname = "monster_soldier"; diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc index 6cd4ea45c..56ffdab96 100644 --- a/qcsrc/server/monsters/monster/spider.qc +++ b/qcsrc/server/monsters/monster/spider.qc @@ -87,13 +87,13 @@ void spider_shootweb(float ptype) snd = "weapons/electro_fire2.wav"; break; case SPIDER_TYPE_FIRE: - p = ((self.scale >= 2) ? PROJECTILE_FIREBALL : PROJECTILE_FIREMINE); + p = PROJECTILE_FIREMINE; dt = WEP_FIREBALL; snd = "weapons/fireball_fire.wav"; break; } - vector fmins = ((self.scale >= 2) ? '-16 -16 -16' : '-4 -4 -4'), fmaxs = ((self.scale >= 2) ? '16 16 16' : '4 4 4'); + vector fmins = '-4 -4 -4', fmaxs = '4 4 4'; W_SetupShot_ProjectileSize(self, fmins, fmaxs, FALSE, 2, snd, CH_WEAPON_A, 0); @@ -178,7 +178,7 @@ void spider_die () void spider_spawn() { if not(self.health) - self.health = autocvar_g_monster_spider_health * self.scale; + self.health = autocvar_g_monster_spider_health; self.classname = "monster_spider"; self.nextthink = time + random() * 0.5 + 0.1; diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc index ff51ac628..ecfa226be 100644 --- a/qcsrc/server/monsters/monster/tarbaby.qc +++ b/qcsrc/server/monsters/monster/tarbaby.qc @@ -62,9 +62,8 @@ float tbaby_jump () void tarbaby_blowup () { - float bigboom = 250 * (self.scale * 0.7); - RadiusDamage(self, self, 250 * monster_skill, 15, bigboom * (monster_skill * 0.7), world, 250, DEATH_MONSTER_TARBABY, world); - pointparticles(particleeffectnum(((self.scale > 3) ? "explosion_big" : "explosion_medium")), self.origin, '0 0 0', 1); + RadiusDamage(self, self, 250 * monster_skill, 15, 250 * (monster_skill * 0.7), world, 250, DEATH_MONSTER_TARBABY, world); + pointparticles(particleeffectnum("explosion_medium"), self.origin, '0 0 0', 1); sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); Monster_CheckDropCvars ("tarbaby"); // drop items after exploding to prevent player picking up item before dying @@ -99,7 +98,7 @@ void tarbaby_die () void tarbaby_spawn () { if not(self.health) - self.health = autocvar_g_monster_tarbaby_health * self.scale; + self.health = autocvar_g_monster_tarbaby_health; self.damageforcescale = 0.003; self.classname = "monster_tarbaby"; diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc index b8095b4e8..34e70f96b 100644 --- a/qcsrc/server/monsters/monster/wizard.qc +++ b/qcsrc/server/monsters/monster/wizard.qc @@ -123,7 +123,7 @@ float Wiz_Missile () void wizard_spawn () { if not(self.health) - self.health = autocvar_g_monster_wizard_health * self.scale; + self.health = autocvar_g_monster_wizard_health; self.classname = "monster_wizard"; self.checkattack = GenericCheckAttack; diff --git a/qcsrc/server/monsters/monster/zombie.qc b/qcsrc/server/monsters/monster/zombie.qc index 131374b74..d9d239b2c 100644 --- a/qcsrc/server/monsters/monster/zombie.qc +++ b/qcsrc/server/monsters/monster/zombie.qc @@ -76,13 +76,12 @@ void zombie_attack_leap_touch () return; vector angles_face; - float bigdmg = autocvar_g_monster_zombie_attack_leap_damage * self.scale; if (monster_isvalidtarget(other, self)) { angles_face = vectoangles(self.moveto - self.origin); angles_face = normalize(angles_face) * autocvar_g_monster_zombie_attack_leap_force; - Damage(other, self, self, bigdmg * monster_skill, DEATH_MONSTER_ZOMBIE_JUMP, other.origin, angles_face); + Damage(other, self, self, autocvar_g_monster_zombie_attack_leap_damage * monster_skill, DEATH_MONSTER_ZOMBIE_JUMP, other.origin, angles_face); self.touch = MonsterTouch; // instantly turn it off to stop damage spam } @@ -122,7 +121,7 @@ void zombie_die () void zombie_spawn() { if not(self.health) - self.health = autocvar_g_monster_zombie_health * self.scale; + self.health = autocvar_g_monster_zombie_health; self.classname = "monster_zombie"; self.spawn_time = time + 2.1;