summaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorMichael Levin <risujin@fastmail.fm>2009-10-03 11:15:10 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:14:47 +0000
commitacf169219a3f51db82750851cf1dad44ff331de5 (patch)
tree28d321632209aa965414c33e873d0ccdabb7e83e /models
parentb4d3fc69f691cbe19cecf0f3c99e8eed64dc3ddf (diff)
* MAX()/MIN() macros need to be wrapped in parenthesis to work as
expected! * Armour and local damage processing merged * Armour and local damage scripts now accept a "name" parameter for debug output * Norfenstein's non-locational damage formula now perfectly implemented -- there are restrictions! There can only be ONE layer of armour and all locational damage region files must cover the entire body and cannot overlap! * Turning on g_debugDamage to 2 or 3 provides additional information on how the damage modifier was calculated
Diffstat (limited to 'models')
-rw-r--r--models/players/human_base/locdamage.cfg30
-rw-r--r--models/players/human_bsuit/locdamage.cfg16
2 files changed, 40 insertions, 6 deletions
diff --git a/models/players/human_base/locdamage.cfg b/models/players/human_base/locdamage.cfg
index cc4fd655..7dfb6fea 100644
--- a/models/players/human_base/locdamage.cfg
+++ b/models/players/human_base/locdamage.cfg
@@ -1,5 +1,8 @@
-// legs
+// These regions must cover the entire body and cannot overlap otherwise
+// the non-locational damage calculation will not be correct!
+
{
+ name "legs"
minHeight 0.0
maxHeight 0.5
minAngle 0
@@ -7,8 +10,17 @@
modifier 0.5
}
-// head
{
+ name "torso"
+ minHeight 0.5
+ maxHeight 0.9
+ minAngle 0
+ maxAngle 360
+ modifier 1.0
+}
+
+{
+ name "head"
minHeight 0.9
maxHeight 1.0
minAngle 0
@@ -16,8 +28,8 @@
modifier 1.5
}
-// legs, crouched
{
+ name "legs crouch"
minHeight 0.0
maxHeight 0.3
minAngle 0
@@ -26,8 +38,18 @@
crouch
}
-// head, crouched
{
+ name "torso crouch"
+ minHeight 0.3
+ maxHeight 0.86
+ minAngle 0
+ maxAngle 360
+ modifier 1.0
+ crouch
+}
+
+{
+ name "head crouch"
minHeight 0.86
maxHeight 1.0
minAngle 0
diff --git a/models/players/human_bsuit/locdamage.cfg b/models/players/human_bsuit/locdamage.cfg
index 53545954..63a6264b 100644
--- a/models/players/human_bsuit/locdamage.cfg
+++ b/models/players/human_bsuit/locdamage.cfg
@@ -1,5 +1,8 @@
-// legs
+// These regions must cover the entire body and cannot overlap otherwise
+// the non-locational damage calculation will not be correct!
+
{
+ name "legs"
minHeight 0.0
maxHeight 0.5
minAngle 0
@@ -7,8 +10,17 @@
modifier 0.5
}
-// head
{
+ name "torso"
+ minHeight 0.5
+ maxHeight 0.9
+ minAngle 0
+ maxAngle 360
+ modifier 1.0
+}
+
+{
+ name "head"
minHeight 0.9
maxHeight 1.0
minAngle 0