diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:15:10 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:47 +0000 |
| commit | acf169219a3f51db82750851cf1dad44ff331de5 (patch) | |
| tree | 28d321632209aa965414c33e873d0ccdabb7e83e /armour | |
| parent | b4d3fc69f691cbe19cecf0f3c99e8eed64dc3ddf (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 'armour')
| -rw-r--r-- | armour/bsuit.armour | 5 | ||||
| -rw-r--r-- | armour/helmet.armour | 5 | ||||
| -rw-r--r-- | armour/larmour.armour | 21 |
3 files changed, 17 insertions, 14 deletions
diff --git a/armour/bsuit.armour b/armour/bsuit.armour index df139f91..c05a09d3 100644 --- a/armour/bsuit.armour +++ b/armour/bsuit.armour @@ -1,5 +1,6 @@ -// body + { + name "bsuit body" minHeight 0.0 maxHeight 0.8 minAngle 0 @@ -7,8 +8,8 @@ modifier 0.2 } -// head { + name "bsuit head" minHeight 0.8 maxHeight 1.0 minAngle 0 diff --git a/armour/helmet.armour b/armour/helmet.armour index c873d27d..afe2bd28 100644 --- a/armour/helmet.armour +++ b/armour/helmet.armour @@ -1,5 +1,6 @@ -// head + { + name "helmet" minHeight 0.8 maxHeight 1.0 minAngle 0 @@ -7,8 +8,8 @@ modifier 0.4 } -// head, crouched { + name "helmet crouch" minHeight 0.72 maxHeight 1.0 minAngle 0 diff --git a/armour/larmour.armour b/armour/larmour.armour index 488ff71c..ba35a0c2 100644 --- a/armour/larmour.armour +++ b/armour/larmour.armour @@ -1,5 +1,6 @@ -// chest + { + name "larmour chest" minHeight 0.5 maxHeight 0.8 minAngle 310 @@ -7,8 +8,8 @@ modifier 0.35 } -// left arm { + name "larmour left arm" minHeight 0.5 maxHeight 0.8 minAngle 50 @@ -16,8 +17,8 @@ modifier 0.3 } -// back { + name "larmour back" minHeight 0.5 maxHeight 0.8 minAngle 130 @@ -25,8 +26,8 @@ modifier 0.4 } -// right arm { + name "larmour right arm" minHeight 0.5 maxHeight 0.8 minAngle 230 @@ -34,8 +35,8 @@ modifier 0.3 } -// legs { + name "larmour legs" minHeight 0.0 maxHeight 0.5 minAngle 0 @@ -43,8 +44,8 @@ modifier 0.3 } -// chest, crouching { + name "larmour chest crouch" minHeight 0.3 maxHeight 0.72 minAngle 310 @@ -53,8 +54,8 @@ crouch } -// left arm, crouching { + name "larmour left arm crouch" minHeight 0.3 maxHeight 0.72 minAngle 50 @@ -63,8 +64,8 @@ crouch } -// back, crouching { + name "larmour back crouch" minHeight 0.3 maxHeight 0.72 minAngle 130 @@ -73,8 +74,8 @@ crouch } -// right arm, crouching { + name "larmour right arm crouch" minHeight 0.3 maxHeight 0.72 minAngle 230 @@ -83,8 +84,8 @@ crouch } -// legs, crouching { + name "larmour legs crouch" minHeight 0.0 maxHeight 0.3 minAngle 0 |