fix #27 life increasing bug, small optimisations to MonsterShadow (#28)

Author: shrimpza

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 611 to 612:
+ - Deaths via traps reduce the life count, rather than increasing it
+ - Performance optimisations for monster shadows
+
 ## 610 to 611:
  - Moved logic for several actions into separate "extension" classes:
    - `MonsterHuntScoreExtension`: Allows implementation of custom scoring for monster kills and player deaths  

buildscript/buildconfig.sh

@@ -7,8 +7,8 @@ SCRIPTS_DIR=$(dirname $(realpath $0))
 
 export name="Monster Hunt"
 export package=MonsterHunt
-export build=611
-export version=611
+export build=612
+export version=612
 export packagefull=$package
 export packagedist=$package$version
 export debug=1

src/Classes/MonsterHunt.uc

@@ -404,13 +404,17 @@ function CheckEndGame() {
 function Killed(Pawn killer, Pawn other, name damageType) {
 	Super.Killed(killer, other, damageType);
 
-	if (killer == None || other == None) return;
+	if (other == None) return;
 
 	if (other.PlayerReplicationInfo == None) return;
 
 	if (scoreExtension != None) other.PlayerReplicationInfo.Score += scoreExtension.PlayerKilled(killer, other);
 
 	if (MonsterReplicationInfo(GameReplicationInfo).bUseLives && other.bIsPlayer) {
+		// if there was no killer (trap death), super increases the deaths count, while we're decreasing it here.
+		// avoiding introduction of a new PRI value for life countdown, since some things elsewhere may now rely on it.
+		// so we need to decrease it by two, as a giant hack :(
+		if (killer == None) other.PlayerReplicationInfo.Deaths -= 1;
 		other.PlayerReplicationInfo.Deaths -= 1;
 		CheckEndGame();
 	}

src/Classes/MonsterHuntScoreExtension.uc

@@ -53,11 +53,11 @@ function int ScoreKill(Pawn killer, Pawn other) {
 }
 
 function int PlayerKilled(Pawn killer, Pawn other) {
-	// suicide
-	if (Killer == Other) return -4;
+	// suicide, or death by traps
+	if (killer == None || killer == Other) return -4;
 
 	// player was killed by a monster
-	if (Killer.IsA('ScriptedPawn') && Other.bIsPlayer && !MonsterReplicationInfo(GameReplicationInfo).bUseLives) {
+	if (killer.IsA('ScriptedPawn') && Other.bIsPlayer && !MonsterReplicationInfo(GameReplicationInfo).bUseLives) {
 		return -5;
 	}
 

src/Classes/MonsterShadow.uc

@@ -7,23 +7,28 @@
 //          For more info, https://shrimpworks.za.net
 // ============================================================
 
-class MonsterShadow extends Decal;
+class MonsterShadow extends Decal
+	config(MonsterHunt);
+
+#exec TEXTURE IMPORT NAME=MHShadow FILE=Textures\MHShadow.pcx LODSET=2
 
 var vector OldOwnerLocation;
-var vector offset;
+
+const ShadowDir = vect(0.1, 0.1, 0);
+const ShadowDrop = vect(0, 0, 300);
 
 function AttachToSurface() {
 }
 
 simulated event PostBeginPlay() {
-	DrawScale = 0.03 * Owner.CollisionRadius;
-	if (Owner.IsA('Nali') || Owner.IsA('Slith')) DrawScale *= 0.75;
-	if (Owner.IsA('Pupae')) DrawScale = 0.03 * (Owner.CollisionRadius / 2);
+	DrawScale = 0.09 * Owner.CollisionRadius;
+	if (Owner.IsA('Nali') || Owner.IsA('Slith')) DrawScale *= 1.0;
+	if (Owner.IsA('Pupae')) DrawScale = 0.12 * (Owner.CollisionRadius / 2);
 }
 
 simulated function Tick(float DeltaTime) {
 	local Actor HitActor;
-	local Vector HitNormal, HitLocation, ShadowStart, ShadowDir;
+	local Vector HitNormal, HitLocation, ShadowStart;
 
 	if (Owner == None) {
 		Destroy();
@@ -36,10 +41,8 @@ simulated function Tick(float DeltaTime) {
 
 	DetachDecal();
 
-	ShadowDir = vect(0.1, 0.1, 0);
-
 	ShadowStart = Owner.Location + Owner.CollisionRadius * ShadowDir;
-	HitActor = Trace(HitLocation, HitNormal, ShadowStart - vect(0, 0, 300), ShadowStart, false);
+	HitActor = Trace(HitLocation, HitNormal, ShadowStart - ShadowDrop, ShadowStart, false);
 
 	if (HitActor == None) return;
 
@@ -50,6 +53,6 @@ simulated function Tick(float DeltaTime) {
 
 defaultproperties {
 	MultiDecalLevel=3
-	Texture=Texture'Botpack.energymark'
+	Texture=Texture'MHShadow'
 	DrawScale=0.500000
 }