From 353ccec81c4e4421884b6942bd01669b0c26ee77 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 11:48:33 +0000 Subject: Correcting mess involving configs/ and overrides/ --- configs/buildables/hive.cfg | 6 +++--- configs/classes/human_base.cfg | 6 +++--- configs/classes/human_bsuit.cfg | 4 ++-- configs/classes/level0.cfg | 16 ++++++++-------- configs/classes/level2.cfg | 14 +++++++------- configs/classes/level2upg.cfg | 14 +++++++------- configs/classes/level4.cfg | 4 ++-- overrides/buildables/hive.cfg | 4 ---- overrides/classes/human_base.cfg | 14 -------------- overrides/classes/human_bsuit.cfg | 13 ------------- overrides/classes/level0.cfg | 12 ------------ overrides/classes/level2.cfg | 15 --------------- overrides/classes/level2upg.cfg | 15 --------------- overrides/classes/level4.cfg | 15 --------------- 14 files changed, 32 insertions(+), 120 deletions(-) delete mode 100644 overrides/buildables/hive.cfg delete mode 100644 overrides/classes/human_base.cfg delete mode 100644 overrides/classes/human_bsuit.cfg delete mode 100644 overrides/classes/level0.cfg delete mode 100644 overrides/classes/level2.cfg delete mode 100644 overrides/classes/level2upg.cfg delete mode 100644 overrides/classes/level4.cfg diff --git a/configs/buildables/hive.cfg b/configs/buildables/hive.cfg index b700f6ed..bd427a2a 100644 --- a/configs/buildables/hive.cfg +++ b/configs/buildables/hive.cfg @@ -1,5 +1,5 @@ model 0 models/buildables/hive/hive.md3 modelScale 1.0 -mins -35 -35 -25 -maxs 35 35 25 -zOffset 0 +mins -20 -20 -20 +maxs 20 20 20 +zOffset -10 diff --git a/configs/classes/human_base.cfg b/configs/classes/human_base.cfg index a6e51ff5..2c22a08b 100644 --- a/configs/classes/human_base.cfg +++ b/configs/classes/human_base.cfg @@ -10,7 +10,7 @@ maxs 15 15 32 crouchMaxs 15 15 16 deadMins -15 -15 -4 deadMaxs 15 15 4 -zOffset 0.0 +zOffset -2.0 -viewheight 26 -crouchViewheight 12 +viewheight 24 +crouchViewheight 7 diff --git a/configs/classes/human_bsuit.cfg b/configs/classes/human_bsuit.cfg index b14f3a89..c5928835 100644 --- a/configs/classes/human_bsuit.cfg +++ b/configs/classes/human_bsuit.cfg @@ -12,5 +12,5 @@ deadMins -15 -15 -4 deadMaxs 15 15 4 zOffset -16.0 -viewheight 35 -crouchViewheight 35 +viewheight 29 +crouchViewheight 29 diff --git a/configs/classes/level0.cfg b/configs/classes/level0.cfg index fbfefffc..f443b9ab 100644 --- a/configs/classes/level0.cfg +++ b/configs/classes/level0.cfg @@ -1,16 +1,16 @@ name "Dretch" model level0 -modelScale 1.0 +modelScale 1.2 skin default -shadowScale 0.3 +shadowScale 0.5 hud alien_general_hud -mins -15 -15 -15 -maxs 15 15 15 -crouchMaxs 15 15 15 -deadMins -15 -15 -15 -deadMaxs 15 15 15 -zOffset -8.0 +mins -12 -12 -12 +maxs 12 12 12 +crouchMaxs 12 12 12 +deadMins -12 -12 -12 +deadMaxs 12 12 12 +zOffset -2.0 viewheight 0 crouchViewheight 0 diff --git a/configs/classes/level2.cfg b/configs/classes/level2.cfg index e5d54b2d..2f0fea3d 100644 --- a/configs/classes/level2.cfg +++ b/configs/classes/level2.cfg @@ -5,12 +5,12 @@ skin default shadowScale 1.0 hud alien_general_hud -mins -25 -25 -22 -maxs 25 25 16 -crouchMaxs 25 25 16 -deadMins -25 -25 -4 -deadMaxs 25 25 4 +mins -22 -22 -22 +maxs 22 22 12 +crouchMaxs 22 22 12 +deadMins -22 -22 -4 +deadMaxs 22 22 4 zOffset 0.0 -viewheight 10 -crouchViewheight 10 +viewheight 8 +crouchViewheight 8 diff --git a/configs/classes/level2upg.cfg b/configs/classes/level2upg.cfg index 2d11d274..7c559987 100644 --- a/configs/classes/level2upg.cfg +++ b/configs/classes/level2upg.cfg @@ -5,12 +5,12 @@ skin adv shadowScale 1.0 hud alien_general_hud -mins -26 -26 -24 -maxs 26 26 18 -crouchMaxs 26 26 18 -deadMins -26 -26 -4 -deadMaxs 26 26 4 +mins -24 -24 -24 +maxs 24 24 14 +crouchMaxs 24 24 14 +deadMins -24 -24 -4 +deadMaxs 24 24 4 zOffset 0.0 -viewheight 12 -crouchViewheight 12 +viewheight 10 +crouchViewheight 10 diff --git a/configs/classes/level4.cfg b/configs/classes/level4.cfg index 0cab3567..adb65e07 100644 --- a/configs/classes/level4.cfg +++ b/configs/classes/level4.cfg @@ -12,5 +12,5 @@ deadMins -32 -32 -34 deadMaxs 32 32 34 zOffset 0.0 -viewheight 35 -crouchViewheight 35 +viewheight 64 +crouchViewheight 64 diff --git a/overrides/buildables/hive.cfg b/overrides/buildables/hive.cfg deleted file mode 100644 index 76821ff5..00000000 --- a/overrides/buildables/hive.cfg +++ /dev/null @@ -1,4 +0,0 @@ -model 0 models/buildables/hive/hive.md3 -mins -20 -20 -20 -maxs 20 20 20 -zOffset -10 diff --git a/overrides/classes/human_base.cfg b/overrides/classes/human_base.cfg deleted file mode 100644 index 415c916c..00000000 --- a/overrides/classes/human_base.cfg +++ /dev/null @@ -1,14 +0,0 @@ -model human_base -modelScale 1.0 -skin default -shadowScale 1.0 -hud human_hud - -mins -15 -15 -24 -maxs 15 15 32 -crouchMaxs 15 15 16 -viewHeight 24 -crouchViewHeight 7 -deadMins -15 -15 -4 -deadMaxs 15 15 4 -zOffset -2.0 diff --git a/overrides/classes/human_bsuit.cfg b/overrides/classes/human_bsuit.cfg deleted file mode 100644 index 751b6405..00000000 --- a/overrides/classes/human_bsuit.cfg +++ /dev/null @@ -1,13 +0,0 @@ -model human_bsuit -skin default -modelScale 1.0 -shadowScale 1.0 -hud human_hud -mins -15 -15 -38 -maxs 15 15 38 -crouchMaxs 15 15 38 -viewHeight 29 -crouchViewHeight 29 -deadMins -15 -15 -4 -deadMaxs 15 15 4 -zOffset -16.0 diff --git a/overrides/classes/level0.cfg b/overrides/classes/level0.cfg deleted file mode 100644 index 5444fdfa..00000000 --- a/overrides/classes/level0.cfg +++ /dev/null @@ -1,12 +0,0 @@ -name "Dretch" -model level0 -modelScale 1.2 -skin default -shadowScale 0.5 -hud alien_general_hud -zOffset -2 -mins -12 -12 -12 -maxs 12 12 12 -crouchMaxs 12 12 12 -deadMins -12 -12 -12 -deadMaxs 12 12 12 diff --git a/overrides/classes/level2.cfg b/overrides/classes/level2.cfg deleted file mode 100644 index 11defcb0..00000000 --- a/overrides/classes/level2.cfg +++ /dev/null @@ -1,15 +0,0 @@ -name "Marauder" -model level2 -modelScale 1.0 -skin default -shadowScale 1.0 -hud alien_general_hud - -mins -22 -22 -22 -maxs 22 22 12 -crouchMaxs 22 22 12 -viewHeight 8 -crouchViewHeight 8 -deadMins -22 -22 -4 -deadMaxs 22 22 4 -zOffset 0.0 diff --git a/overrides/classes/level2upg.cfg b/overrides/classes/level2upg.cfg deleted file mode 100644 index cfe401e6..00000000 --- a/overrides/classes/level2upg.cfg +++ /dev/null @@ -1,15 +0,0 @@ -name "Advanced Marauder" -model level2 -modelScale 1.1 -skin adv -shadowScale 1.0 -hud alien_general_hud - -mins -24 -24 -24 -maxs 24 24 14 -crouchMaxs 24 24 14 -viewHeight 10 -crouchViewHeight 10 -deadMins -26 -26 -4 -deadMaxs 26 26 4 -zOffset 0.0 diff --git a/overrides/classes/level4.cfg b/overrides/classes/level4.cfg deleted file mode 100644 index 2eaa9ccc..00000000 --- a/overrides/classes/level4.cfg +++ /dev/null @@ -1,15 +0,0 @@ -name "Tyrant" -model level4 -modelScale 1.0 -skin default -shadowScale 2.0 -hud alien_general_hud - -mins -32 -32 -22 -maxs 32 32 70 -crouchMaxs 32 32 70 -viewHeight 64 -crouchViewHeight 64 -deadMins -32 -32 -34 -deadMaxs 32 32 34 -zOffset 0.0 -- cgit