SERVER: PHD Flopper fix

source/server/damage.qc

@@ -39,6 +39,7 @@ float(float current_health_delay, float current_perks) Gamemode_GetHealthRegenDe
 #define DMG_SCORE_GRENADE		50 		// Death by Grenade.
 #define DMG_SCORE_EXPLOSIVE		60  	// Death by Explosive Weapon.
 #define DMG_SCORE_TESLA			50  	// Death by Tesla.
+#define DMG_SCORE_FLOPPER		50		// Death by PhD Flopper
 #define DMG_SCORE_STDDAMAGE		10  	// Standard Damage reward.
 
 void() Barrel_Hit;
@@ -274,6 +275,9 @@ void(entity attacker, float d_style) DieHandler =
 			case DMG_TYPE_UPPERTORSO:
 				points_earned = DMG_SCORE_UPPERTORSO;
 				break;
+			case DMG_TYPE_FLOPPER:
+				points_earned = DMG_SCORE_FLOPPER;
+				break;
 			default:
 				if (cvar("developer"))
 					bprint(PRINT_HIGH, "DieHandler: Received invalid style\n");
@@ -580,7 +584,7 @@ void(entity inflictor, entity attacker, float damage2, float mindamage, float ra
 			} else if (inflictor.classname == "player") {
 				// phd flopper.
 				final_damage = calculate_proximity_value(mindamage, damage2, inflictor.origin, ent.origin, radius);
-				damage_style = DMG_TYPE_GRENADE;
+				damage_style = DMG_TYPE_FLOPPER;
 			} else {
 				r = rounds;
 				multi = 1.07;

source/server/gamemodes/core.qc

@@ -203,6 +203,7 @@ void(entity attacker, float death_style) Gamemode_DieHandler =
 {
     switch(current_gamemode) {
         case GAMEMODE_STICKSNSTONES: Gamemode_Sticks_DieHandler(attacker, death_style); break;
+        case GAMEMODE_GUNGAME: Gamemode_GunGame_DieHandler(attacker, death_style); break;
         default: break;
     }
 };

source/server/gamemodes/festive.qc

@@ -215,6 +215,8 @@ float(float current_earned_score, float damage_style) Gamemode_Festive_ScoreForD
         case DMG_TYPE_GRENADE:
         case DMG_TYPE_TESLA:
             return 90;
+        case DMG_TYPE_FLOPPER:
+            return 90;
     }
 
     return current_earned_score;

source/server/gamemodes/gun_game.qc

@@ -363,4 +363,14 @@ void(float score_earned) Gamemode_GunGame_PlayerAddScore =
             }
         }
     }
+};
+
+void(entity attacker, float death_style) Gamemode_GunGame_DieHandler =
+{
+
+    // possible fix for PHD Flopper giving points toward your weapon
+    switch(death_style) {
+        case DMG_TYPE_FLOPPER:
+            return 0;
+    }
 };

source/server/tests/test_score.qc

@@ -55,7 +55,8 @@ void() Test_AddScore_DamageTypes =
         DMG_TYPE_GRENADE, 
         DMG_TYPE_EXPLOSIVE,
         DMG_TYPE_LOWERTORSO,
-        DMG_TYPE_UPPERTORSO
+        DMG_TYPE_UPPERTORSO,
+        DMG_TYPE_FLOPPER
     };
 
     float scores[] = {
@@ -66,7 +67,8 @@ void() Test_AddScore_DamageTypes =
         DMG_SCORE_GRENADE,
         DMG_SCORE_EXPLOSIVE,
         DMG_SCORE_LOWERTORSO,
-        DMG_SCORE_UPPERTORSO
+        DMG_SCORE_UPPERTORSO,
+        DMG_SCORE_FLOPPER
     };
 
     for (float i = 0; i < styles.length; i++) {
@@ -110,4 +112,40 @@ void() Test_AddScore_MysteryBoxLeave =
 
     remove(mystery_box_ent);
     remove(owner_ent);
+};
+
+
+//
+// Test_AddScore_PhD_GunGame()
+// Asserts we are giving correct amount
+// of score for PhD Flopper in gun game
+// Should return 0
+// (https://github.com/nzp-team/nzportable/issues/1363)
+//
+void() Test_AddScore_PhD_GunGame =
+{
+    float score_pre = self.points;
+
+    Gamemode_GunGame_DieHandler(self, DMG_TYPE_FLOPPER);
+
+    float score_post = self.points;
+    float score_delta = score_post - score_pre;
+
+
+
+    Test_Assert((score_delta == 0), sprintf("Unexpected score earned, expected 0 but got [%d]!", score_delta));
+};
+
+//
+// Test_AddScore_PhD_Festive()
+// Asserts we are giving correct amount
+// of score for PhD Flopper in Festive
+// Should return 90
+// (https://github.com/nzp-team/nzportable/issues/1363)
+//
+void() Test_AddScore_PhD_Festive =
+{
+    float pointsEarned = Gamemode_Festive_ScoreForDamage(DMG_SCORE_FLOPPER, DMG_TYPE_FLOPPER);
+
+    Test_Assert((pointsEarned == 90), sprintf("Unexpected score earned, expected 90 but got [%d]!", pointsEarned));
 };

source/server/weapons/weapon_core.qc

@@ -1841,8 +1841,8 @@ void() CheckPlayer =
 		traceline(self.origin, self.origin + (v_up * -40), 0, self);
 
 		if (trace_ent.classname == "player") {
-			DamageHandler(self, trace_ent, 100000, DMG_TYPE_OTHER);
-			DamageHandler(trace_ent, self, 100000, DMG_TYPE_OTHER);
+			DamageHandler(self, trace_ent, 100000, DMG_TYPE_FLOPPER);
+			DamageHandler(trace_ent, self, 100000, DMG_TYPE_FLOPPER);
 		}
 	}
 
@@ -1874,7 +1874,7 @@ void() CheckPlayer =
             float damage = over * 0.68;
 			if (damage > 98) damage = 98;
 
-			DamageHandler (self, other, damage, DMG_TYPE_OTHER); 
+			DamageHandler (self, other, damage, DMG_TYPE_FLOPPER); 
 
 			if (self.health <= 5)
 				GiveAchievement(7, self);	

source/shared/shared_defs.qc

@@ -301,6 +301,7 @@ float 	map_compatibility_mode;
 #define DMG_TYPE_ZOMBIESWIPE	9  		// Zombie-inflicted: Any attack on Player
 #define DMG_TYPE_ELECTRICTRAP	10 		// Trap-inflicted: Electric trap damage
 #define DMG_TYPE_OTHER 			11 		// For use with misc. damage infliction
+#define DMG_TYPE_FLOPPER		12		// Player-inflicted: PhD Flopper explosion
 
 //Perk types
 #define 	P_JUG		1