The new non-localized damage calculation method (based on Norfenstein's

idea) require rebalancing of the Human damage regions. A number of 
errors with incorrect angles and crouching were also fixed.

5 files changed, 86 insertions, 82 deletions

diff --git a/armour/bsuit.armour b/armour/bsuit.armour
index 93ab9411..df139f91 100644
--- a/armour/bsuit.armour
+++ b/armour/bsuit.armour
@@ -1,4 +1,4 @@
-//entire body ;)
+// body
 {
   minHeight 0.0
   maxHeight 0.8
@@ -6,27 +6,13 @@
   maxAngle  360
   modifier  0.2
 }
-{
-  minHeight 0.8
-  maxHeight 1.0
-  minAngle  0
-  maxAngle  360
-  modifier  0.27
-}
 
+// head
 {
-  crouch
-  minHeight 0.0
-  maxHeight 0.8
-  minAngle  0
-  maxAngle  360
-  modifier  0.2
-}
-{
-  crouch
   minHeight 0.8
   maxHeight 1.0
   minAngle  0
   maxAngle  360
   modifier  0.27
 }
+
diff --git a/armour/helmet.armour b/armour/helmet.armour
index a19785a2..c873d27d 100644
--- a/armour/helmet.armour
+++ b/armour/helmet.armour
@@ -1,4 +1,4 @@
-//head
+// head
 {
   minHeight 0.8
   maxHeight 1.0
@@ -6,8 +6,10 @@
   maxAngle  360
   modifier  0.4
 }
+
+// head, crouched
 {
-  minHeight 0.8
+  minHeight 0.72
   maxHeight 1.0
   minAngle  0
   maxAngle  360
diff --git a/armour/larmour.armour b/armour/larmour.armour
index 745abd17..e1a5fb6b 100644
--- a/armour/larmour.armour
+++ b/armour/larmour.armour
@@ -1,37 +1,29 @@
-//chest, standing
+// torso
 {
   minHeight 0.5
   maxHeight 0.8
-  minAngle  130
-  maxAngle  230
+  minAngle  0
+  maxAngle  360
   modifier  0.35
 }
-//back, standing
-{
-  minHeight 0.5
-  maxHeight 0.8
-  minAngle  310
-  maxAngle  50
-  modifier  0.4
-}
 
-//left arm, standing
+// arm bonus
 {
   minHeight 0.5
   maxHeight 0.8
-  minAngle  50
-  maxAngle  130
-  modifier  0.3
+  minAngle  55
+  maxAngle  125
+  modifier  0.75
 }
-//right arm, standing
 {
   minHeight 0.5
   maxHeight 0.8
-  minAngle  230
-  maxAngle  310
-  modifier  0.3
+  minAngle  225
+  maxAngle  315
+  modifier  0.75
 }
-//legs, standing
+
+// legs
 {
   minHeight 0.0
   maxHeight 0.5
@@ -40,48 +32,40 @@
   modifier  0.3
 }
 
-//chest, crouching
+// torso, crouching
 {
-  minHeight 0.2
-  maxHeight 0.8
-  minAngle  130
-  maxAngle  230
-  modifier  0.3
-  crouch
-}
-//back, crouching
-{
-  minHeight 0.2
-  maxHeight 0.8
-  minAngle  310
-  maxAngle  50
-  modifier  0.4
+  minHeight 0.3
+  maxHeight 0.72
+  minAngle  0
+  maxAngle  360
+  modifier  0.35
   crouch
 }
-//left arm, crouching
+
+// arm bonus, crouching
 {
-  minHeight 0.2
-  maxHeight 0.8
-  minAngle  50
-  maxAngle  130
-  modifier  0.25
+  minHeight 0.3
+  maxHeight 0.72
+  minAngle  55
+  maxAngle  125
+  modifier  0.75
   crouch
 }
-//right arm, crouching
 {
-  minHeight 0.2
-  maxHeight 0.8
-  minAngle  230
-  maxAngle  310
-  modifier  0.25
+  minHeight 0.3
+  maxHeight 0.72
+  minAngle  225
+  maxAngle  315
+  modifier  0.75
   crouch
 }
-//legs, crouching
+
+// legs, crouching
 {
   minHeight 0.0
   maxHeight 0.3
   minAngle  0
   maxAngle  360
-  modifier  0.25
+  modifier  0.3
   crouch
 }
diff --git a/models/players/human_base/locdamage.cfg b/models/players/human_base/locdamage.cfg
index c95cc62e..11a7393e 100644
--- a/models/players/human_base/locdamage.cfg
+++ b/models/players/human_base/locdamage.cfg
@@ -1,26 +1,57 @@
-//legs
+// legs
 {
   minHeight 0.0
   maxHeight 0.5
   minAngle 0
   maxAngle 360
-  modifier 0.5
+  modifier 0.75
 }
 
-//torso
+// back
 {
   minHeight 0.5
   maxHeight 0.9
+  minAngle 270
+  maxAngle 90
+  modifier 1.25
+}
+
+// head
+{
+  minHeight 0.9
+  maxHeight 1.0
   minAngle 0
   maxAngle 360
-  modifier 1.0
+  modifier 1.5
 }
-//head
+
+// legs, crouched
 {
-  minHeight 0.9
+  minHeight 0.0
+  maxHeight 0.3
+  minAngle 0
+  maxAngle 360
+  modifier 0.75
+  crouch
+}
+
+// back, crouched
+{
+  minHeight 0.3
+  maxHeight 0.86
+  minAngle 270
+  maxAngle 90
+  modifier 1.25
+  crouch
+}
+
+// head, crouched
+{
+  minHeight 0.86
   maxHeight 1.0
   minAngle 0
   maxAngle 360
   modifier 1.5
+  crouch
 }
     
diff --git a/models/players/human_bsuit/locdamage.cfg b/models/players/human_bsuit/locdamage.cfg
index c95cc62e..a269e2cd 100644
--- a/models/players/human_bsuit/locdamage.cfg
+++ b/models/players/human_bsuit/locdamage.cfg
@@ -1,21 +1,22 @@
-//legs
+// legs
 {
   minHeight 0.0
   maxHeight 0.5
   minAngle 0
   maxAngle 360
-  modifier 0.5
+  modifier 0.75
 }
 
-//torso
+// back
 {
   minHeight 0.5
   maxHeight 0.9
-  minAngle 0
-  maxAngle 360
-  modifier 1.0
+  minAngle 270
+  maxAngle 90
+  modifier 1.25
 }
-//head
+
+// head
 {
   minHeight 0.9
   maxHeight 1.0
@@ -23,4 +24,4 @@
   maxAngle 360
   modifier 1.5
 }
-    
+