From: drjaska <drjaska83@gmail.com>
Date: Sun, 28 Nov 2021 23:32:27 +0000 (+0200)
Subject: more todo notes and fixes
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b87df92d52b361f7da0995e62aa847525aa769a;p=xonotic%2Fxonotic-data.pk3dir.git

more todo notes and fixes
---

diff --git a/qcsrc/common/gamemodes/gamemode/mh/TODO.txt b/qcsrc/common/gamemodes/gamemode/mh/TODO.txt
index cae75cc33..67a12d06f 100644
--- a/qcsrc/common/gamemodes/gamemode/mh/TODO.txt
+++ b/qcsrc/common/gamemodes/gamemode/mh/TODO.txt
@@ -1,9 +1,13 @@
 add g_mh_startitem cvars to the balance files
 
-+1 waypoint mode, waypoints for runners on round start always and waypoints for hunters when there are 3 or more hunters
++2 waypoint modes, 
+waypoints for runners on round start always and waypoints for hunters when there are 3 or more hunters
+only runners can see other runners but hunters don't see others
 
 rename teams as far as possible
 
+find a proper damage type for tagging instead of death by camping as it doesn't show kill notifications or text
+
 on-screen notification for getting tagged
 
 on-screen indication for your role
@@ -16,5 +20,4 @@ add more TODO: notes
 
 
 
-fix waypoint visibility, currently they are always visible to everyone. Fix them to not be visible for self or for spectators of that player.
-can you even see your own null waypoint?
\ No newline at end of file
+fix waypoint visibility, currently they are always visible to everyone. Fix them to not be visible for spectators of that player.
\ No newline at end of file
diff --git a/qcsrc/common/gamemodes/gamemode/mh/mh.qh b/qcsrc/common/gamemodes/gamemode/mh/mh.qh
index 090c410cc..fb3729f03 100644
--- a/qcsrc/common/gamemodes/gamemode/mh/mh.qh
+++ b/qcsrc/common/gamemodes/gamemode/mh/mh.qh
@@ -16,7 +16,7 @@ CLASS(Manhunt, Gametype)
 	}
 	METHOD(Manhunt, m_isAlwaysSupported, bool(Gametype this, int spawnpoints, float diameter))
 	{
-		if(spawnpoints >= 4 && diameter > 4096)
+		if(spawnpoints >= 2 && diameter > 4096)
 			return true;
 		return false;
 	}
diff --git a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
index a55c7bfde..947a1b212 100644
--- a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
+++ b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
@@ -57,11 +57,16 @@ MUTATOR_HOOKFUNCTION(mh, Damage_Calculate)
 	float frag_damage = M_ARGV(4, float);
 	vector frag_force = M_ARGV(6, vector);
 	
-	if(frag_deathtype==DEATH_CAMP.m_id)return;
+	if(frag_deathtype == DEATH_FALL.m_id){
+		M_ARGV(4, float) = 0; //no fall damage or splat damage
+		return;
+	}
+	
+	if(frag_deathtype==DEATH_CAMP.m_id || !IS_PLAYER(frag_attacker)return;
 	
 	if(IS_PLAYER(frag_target) && !IS_DEAD(frag_target)){ //check that the target is a player and not dead, allows anyone to knock around corpses for funsies
 
-		if(frag_deathtype == DEATH_FALL.m_id)frag_damage = 0; //no fall damage or splat damage
+		
 
 		switch(autocvar_g_mh_weapons_damage)
 		{