From: Mario <mario.mario@y7mail.com>
Date: Wed, 13 Feb 2013 00:29:59 +0000 (+1100)
Subject: Fix overpowered ogre chainsaw
X-Git-Tag: xonotic-v0.8.0~241^2^2~516
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f6aa2110df4e6b311f2236dd9c643d3d2ba8878;p=xonotic%2Fxonotic-data.pk3dir.git

Fix overpowered ogre chainsaw
---

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index 3775fc20f..ccab7da25 100644
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -59,31 +59,17 @@ void ogre_swing ()
 	self.nextthink = time + 0.2;
 	self.think = ogre_swing;
 	
-	if(self.ogre_cycles <= 3)
+	if(self.ogre_cycles <= 2)
 		chainsaw(200);
-	else if(self.ogre_cycles <= 8)
+	else if(self.ogre_cycles <= 4)
 		chainsaw(-200);
 	else
 		chainsaw(0);
 	
-	if(self.ogre_cycles >= 10)
+	if(self.ogre_cycles >= 4)
 		self.think = ogre_think;
 }
 
-void ogre_smash_2 ()
-{
-	chainsaw(0);
-}
-
-void ogre_smash ()
-{
-	self.frame = ogre_anim_smash;
-	self.attack_finished_single = time + 0.5;
-	chainsaw(0);
-	self.monster_delayedattack = ogre_smash_2;
-	self.delay = time + 0.1;
-}
-
 void ogre_uzi_fire ()
 {
 	self.ogre_cycles += 1;
@@ -132,10 +118,7 @@ float ogre_missile ()
 void ogre_melee ()
 {
 	self.ogre_cycles = 0;
-	if (random() > 0.5)
-		ogre_smash();
-	else
-		ogre_swing();
+	ogre_swing();
 }
 
 void ogre_die()