Increase monster hitboxes to match their scale

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 0e213b540f590be1d4e5e6a9178b082d18b7b731..dcd6f26675c4e0234b3c4b525d88371e19e73ac4 100644 (file)
--- 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 242e7bc230f3c8e0a990e7ce02ee7c3d296a2c69..91c59760173aa715e15316c0b815ce5bb2056d15 100644 (file)
--- 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 ac4ad0ee08b382446b2db78d0198422fcf07add4..28b71e7983eab2aba8ef6a2388be5b0bfad47ffd 100644 (file)
--- 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 e2e6fa45c8fb84b49ab3bc315abad3c19c1837d9..518edf5b7f16b874a65eb800201f5e72041687ad 100644 (file)
--- 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 4b1a88a41a728faf5c2734e33cfbab8d9b02b310..fa33c38e2f339c92c9f9fb8c261a73112a44f4cd 100644 (file)
--- 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 8b8a9a7e298b73f7d048b95d32b3cd8ffcef71fb..8b77fae53d180562c8dd4861010c7aaeee097f50 100644 (file)
--- 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 cf0e7a7c6c881b06d327b18f6ac4ecc885a2c73a..d838070d0be167266a1395b40c55283401b5f98b 100644 (file)
--- 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 ecfa226beaaddd5fb47798721176e7fcc19d7629..380722daa0c2a51ee7d3ff74f15298b5029045e9 100644 (file)
--- 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 34e70f96bd037d36cf1a20e781ae118ea515d671..c56bade719c0299af6287ef021c73a9b545e27f3 100644 (file)
--- 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";