From: Mario <mario.mario@y7mail.com>
Date: Mon, 22 Apr 2013 13:34:15 +0000 (+1000)
Subject: Increase monster hitboxes to match their scale
X-Git-Tag: xonotic-v0.8.0~241^2^2~311
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4aa85e0876a9581bf6b0ff4b9198d82e600999c;p=xonotic%2Fxonotic-data.pk3dir.git

Increase monster hitboxes to match their scale
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 0e213b540..dcd6f2667 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -123,6 +123,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Fiend";
 			mid2info_min = DEMON_MIN;
 			mid2info_max = DEMON_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_SHAMBLER:
@@ -131,6 +132,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Shambler";
 			mid2info_min = SHAMBLER_MIN;
 			mid2info_max = SHAMBLER_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_KNIGHT:
@@ -139,6 +141,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Knight";
 			mid2info_min = KNIGHT_MIN;
 			mid2info_max = KNIGHT_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_MARINE:
@@ -155,6 +158,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Scrag";
 			mid2info_min = WIZARD_MIN;
 			mid2info_max = WIZARD_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_DOG:
@@ -171,6 +175,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Spawn";
 			mid2info_min = TARBABY_MIN;
 			mid2info_max = TARBABY_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_HELLKNIGHT:
@@ -179,6 +184,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Hell-Knight";
 			mid2info_min = HELLKNIGHT_MIN;
 			mid2info_max = HELLKNIGHT_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_FISH:
@@ -187,6 +193,7 @@ void monster_mid2info(float _mid)
 			mid2info_name = "Rotfish";
 			mid2info_min = FISH_MIN;
 			mid2info_max = FISH_MAX;
+			self.scale = 1.3;
 			break;
 		}
 		case MONSTER_MAGE:
diff --git a/qcsrc/server/monsters/monster/demon.qc b/qcsrc/server/monsters/monster/demon.qc
index 242e7bc23..91c597601 100644
--- a/qcsrc/server/monsters/monster/demon.qc
+++ b/qcsrc/server/monsters/monster/demon.qc
@@ -1,6 +1,6 @@
 // size
-const vector DEMON_MIN = '-32 -32 -24';
-const vector DEMON_MAX = '32 32 24';
+const vector DEMON_MIN = '-41 -41 -31';
+const vector DEMON_MAX = '41 41 31';
 
 // model
 string DEMON_MODEL = "models/monsters/demon.mdl";
diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc
index ac4ad0ee0..28b71e798 100644
--- a/qcsrc/server/monsters/monster/fish.qc
+++ b/qcsrc/server/monsters/monster/fish.qc
@@ -1,6 +1,6 @@
 // size
-const vector FISH_MIN = '-16 -16 -24';
-const vector FISH_MAX = '16 16 16';
+const vector FISH_MIN = '-20 -20 -31';
+const vector FISH_MAX = '20 20 20';
 
 // model
 string FISH_MODEL = "models/monsters/fish.mdl";
diff --git a/qcsrc/server/monsters/monster/hknight.qc b/qcsrc/server/monsters/monster/hknight.qc
index e2e6fa45c..518edf5b7 100644
--- a/qcsrc/server/monsters/monster/hknight.qc
+++ b/qcsrc/server/monsters/monster/hknight.qc
@@ -1,6 +1,6 @@
 // size
-const vector HELLKNIGHT_MIN = '-16 -16 -24';
-const vector HELLKNIGHT_MAX = '16 16 32';
+const vector HELLKNIGHT_MIN = '-20 -20 -32';
+const vector HELLKNIGHT_MAX = '20 20 41';
 
 // model
 string HELLKNIGHT_MODEL = "models/monsters/hknight.mdl";
diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc
index 4b1a88a41..fa33c38e2 100644
--- a/qcsrc/server/monsters/monster/knight.qc
+++ b/qcsrc/server/monsters/monster/knight.qc
@@ -1,6 +1,6 @@
 // size
-const vector KNIGHT_MIN = '-16 -16 -24';
-const vector KNIGHT_MAX = '16 16 32';
+const vector KNIGHT_MIN = '-20 -20 -31';
+const vector KNIGHT_MAX = '20 20 53';
 
 // model
 string KNIGHT_MODEL = "models/monsters/knight.mdl";
diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 8b8a9a7e2..8b77fae53 100644
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -1,6 +1,6 @@
 // size
-const vector SHAMBLER_MIN = '-32 -32 -24';
-const vector SHAMBLER_MAX = '32 32 50';
+const vector SHAMBLER_MIN = '-41 -41 -31';
+const vector SHAMBLER_MAX = '41 41 65';
 
 // model
 string SHAMBLER_MODEL = "models/monsters/shambler.mdl";
diff --git a/qcsrc/server/monsters/monster/soldier.qc b/qcsrc/server/monsters/monster/soldier.qc
index cf0e7a7c6..d838070d0 100644
--- a/qcsrc/server/monsters/monster/soldier.qc
+++ b/qcsrc/server/monsters/monster/soldier.qc
@@ -1,6 +1,6 @@
 // size
-const vector SOLDIER_MIN = '-16 -16 -30';
-const vector SOLDIER_MAX = '16 16 24';
+const vector SOLDIER_MIN = '-20 -20 -39';
+const vector SOLDIER_MAX = '20 20 31';
 
 // model
 string SOLDIER_MODEL = "models/monsters/soldier.zym";
diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index ecfa226be..380722daa 100644
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -1,6 +1,6 @@
 // size
-const vector TARBABY_MIN = '-16 -16 -24';
-const vector TARBABY_MAX = '16 16 16';
+const vector TARBABY_MIN = '-20 -20 -31';
+const vector TARBABY_MAX = '20 20 20';
 
 // model
 string TARBABY_MODEL = "models/monsters/tarbaby.mdl";
diff --git a/qcsrc/server/monsters/monster/wizard.qc b/qcsrc/server/monsters/monster/wizard.qc
index 34e70f96b..c56bade71 100644
--- a/qcsrc/server/monsters/monster/wizard.qc
+++ b/qcsrc/server/monsters/monster/wizard.qc
@@ -1,6 +1,6 @@
 // size
-const vector WIZARD_MIN = '-16 -16 -45';
-const vector WIZARD_MAX = '16 16 16';
+const vector WIZARD_MIN = '-20 -20 -58';
+const vector WIZARD_MAX = '20 20 20';
 
 // model
 string WIZARD_MODEL = "models/monsters/wizard.mdl";