Fixed issue with cube not targeting monsters. Updated cube damage to …

…be based on wisdom.... and not suck. Added functions to remove and reapply buff effects to fix wizard teleport.

h2/constant.hc

@@ -236,8 +236,8 @@ float CLASS_FINAL_BOSS				= 5;
 float BUFFTYPE_NORMAL				= 0;
 float BUFFTYPE_LARGE				= 1;
 float BUFFTYPE_SPECTRE				= 2;
-float BUFFTYPE_LEADER				= 4;
-
+float BUFFTYPE_GHOST				= 4;
+float BUFFTYPE_LEADER				= 8;
 
 float MAX_HEALTH					= 200;
 

h2/cube.hc

@@ -24,14 +24,14 @@ float cube_find_target(void)
 
 		if (deathmatch == 1 && item.classname == "player") //target other players in deathmatch
 			targetGood = TRUE;
-		if (item.owner.classname != "player" && item.classname == "player") //target players if owned by monster
+		if (self.owner.classname != "player" && item.classname == "player") //target players if owned by monster
 			targetGood = TRUE;
-		if (item.owner.classname == "player" && item.flags & FL_MONSTER) //target monsters if owned by player
+		if (self.owner.classname == "player" && item.flags & FL_MONSTER) //target monsters if owned by player
 			targetGood = TRUE;
 
 		if (item.health <= 0) //Don't shoot dead bodies
 			targetGood = FALSE;
-		if (item.controller.classname == self.classname) //don't shoot our own summons or anything summoned by our friends
+		if (item.controller.classname == self.controller.classname) //don't shoot our own summons or anything summoned by our friends
 			targetGood = FALSE;
 
 		if (targetGood)

h2/fireball.hc

@@ -33,6 +33,7 @@ void FireFizzle (void)
 void() fireballTouch =
 {
 	local float	damg;
+	float wismod;
 
 	if (other == self.owner)
 		return;		// don't explode on owner
@@ -44,7 +45,14 @@ void() fireballTouch =
 	}
 
 	if (self.dmg == -1)
-		damg = random(5,10);
+	{
+		damg = random(9,18);		
+		if (self.owner.classname == "cube_of_force" && self.owner.owner.classname == "player")
+		{
+			wismod = self.owner.owner.wisdom;
+			damg = random(wismod / 2, wismod);
+		}
+	}
 	else if (self.dmg)
 		damg = self.dmg;
 	else

h2/monsters.hc

@@ -334,6 +334,27 @@ void() swimmonster_start =
 };
 */
 
+void ApplyMonsterBuffEffect(entity monst)
+{
+	if (monst.bufftype & BUFFTYPE_LEADER)
+		self.effects(+)EF_DIMLIGHT;
+
+	if (monst.bufftype & BUFFTYPE_SPECTRE)
+		self.drawflags(+)DRF_TRANSLUCENT;
+	if (monst.bufftype & BUFFTYPE_GHOST)
+		self.drawflags(+)MLS_ABSLIGHT;
+}
+void RemoveMonsterBuffEffect(entity monst)
+{
+	if (monst.bufftype & BUFFTYPE_LEADER)
+		self.effects(-)EF_DIMLIGHT;
+
+	if (monst.bufftype & BUFFTYPE_SPECTRE)
+		self.drawflags(-)DRF_TRANSLUCENT;
+	if (monst.bufftype & BUFFTYPE_GHOST)
+		self.drawflags(-)MLS_ABSLIGHT;
+}
+
 //Make monster larger and stronger
 void ApplyLargeMonster(entity monst)
 {
@@ -448,6 +469,8 @@ void ApplySpectreMonster(entity monst)
 		self.experience_value *= 1.33;
 
 		self.drawflags(+)MLS_ABSLIGHT;
+
+		self.bufftype(+)BUFFTYPE_GHOST;
 	}
 
 	self = oself; //restore scope

h2/skullwiz.hc

@@ -715,6 +715,9 @@ void skullwiz_blinkin(void)
 		self.drawflags (-) SCALE_TYPE_XYONLY;
 		self.drawflags (+) SCALE_ORIGIN_BOTTOM;
 
+		//restore monster effects
+		ApplyMonsterBuffEffect(self);
+
 		skullwiz_run();
 	}
 
@@ -893,11 +896,16 @@ void skullwiz_blink(void) [++ $sktele2..$sktele30]
 			self.scale = self.tempscale;			
 		}
 
+
+		//temporarily remove monster effects
+		// Must happen before teleport in order to not break the SCALE_TYPE_MASKOUT effect
+		RemoveMonsterBuffEffect(self);
+
 		//self.drawflags = (self.drawflags & SCALE_TYPE_MASKOUT) | SCALE_TYPE_XYONLY;
 		//replacing explicite flags with adding/removing Teleport related flags
 		self.drawflags (+) SCALE_TYPE_MASKOUT;
 		self.drawflags (+) SCALE_TYPE_XYONLY;
-		self.drawflags (-) SCALE_ORIGIN_BOTTOM;
+		self.drawflags (-) SCALE_ORIGIN_BOTTOM;		
 
 		self.solid = SOLID_NOT;
 		self.th_pain=SUB_Null;