From d05bee2ac2ae858dbf690c8e6e84d9e7ea3db48f Mon Sep 17 00:00:00 2001 From: MaeJong Date: Thu, 18 May 2017 14:49:20 +0200 Subject: Make buildable/class tables values identical to data-1.1.0 overrides --- src/game/bg_misc.c | 168 ++++++++++++++++++++++++++--------------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 3fdec70..db23c25 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -153,10 +153,10 @@ buildableAttributes_t bg_buildableList[ ] = "Acid Tube", //char *humanName; "team_alien_acid_tube",//char *entityName; { "models/buildables/acid_tube/acid_tube.md3", 0, 0, 0 }, - 1.0f, //float modelScale; - { -25, -25, -25 }, //vec3_t mins; - { 25, 25, 25 }, //vec3_t maxs; - -15.0f, //float zOffset; + 0.6f, //float modelScale; + { -15, -15, -15 }, //vec3_t mins; + { 15, 15, 15 }, //vec3_t maxs; + -8.5f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; ACIDTUBE_BP, //int buildPoints; @@ -189,11 +189,11 @@ buildableAttributes_t bg_buildableList[ ] = "hive", //char *buildName; "Hive", //char *humanName; "team_alien_hive", //char *entityName; - { "models/buildables/acid_tube/acid_tube.md3", 0, 0, 0 }, + { "models/buildables/hive/hive.md3", 0, 0, 0 }, 1.0f, //float modelScale; { -35, -35, -25 }, //vec3_t mins; { 35, 35, 25 }, //vec3_t maxs; - -15.0f, //float zOffset; + 0.0f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; HIVE_BP, //int buildPoints; @@ -340,7 +340,7 @@ buildableAttributes_t bg_buildableList[ ] = { "models/buildables/telenode/telenode.md3", 0, 0, 0 }, 1.0f, //float modelScale; { -40, -40, -4 }, //vec3_t mins; - { 40, 40, 4 }, //vec3_t maxs; + { 40, 40, 6 }, //vec3_t maxs; 0.0f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; @@ -377,7 +377,7 @@ buildableAttributes_t bg_buildableList[ ] = { "models/buildables/medistat/medistat.md3", 0, 0, 0 }, 1.0f, //float modelScale; { -35, -35, -7 }, //vec3_t mins; - { 35, 35, 7 }, //vec3_t maxs; + { 35, 35, 4 }, //vec3_t maxs; 0.0f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; @@ -528,7 +528,7 @@ buildableAttributes_t bg_buildableList[ ] = 1.0f, //float modelScale; { -40, -40, -13 }, //vec3_t mins; { 40, 40, 50 }, //vec3_t maxs; - 0.0f, //float zOffset; + -2.0f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; ARMOURY_BP, //int buildPoints; @@ -562,10 +562,10 @@ buildableAttributes_t bg_buildableList[ ] = "Reactor", //char *humanName; "team_human_reactor", //char *entityName; { "models/buildables/reactor/reactor.md3", 0, 0, 0 }, - 1.0f, //float modelScale; - { -50, -50, -15 }, //vec3_t mins; - { 50, 50, 95 }, //vec3_t maxs; - 0.0f, //float zOffset; + 0.85f, //float modelScale; + { -41, -41, -15 }, //vec3_t mins; + { 41, 41, 95 }, //vec3_t maxs; + -2.0f, //float zOffset; TR_GRAVITY, //trType_t traj; 0.0, //float bounce; REACTOR_BP, //int buildPoints; @@ -1571,18 +1571,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_BUILDER0, //int classnum; "builder", //char *className; - "Builder", //char *humanName; + "Granger", //char *humanName; "builder", //char *modelname; 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; "alien_builder_hud", //char *hudname; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages - { -15, -15, -20 }, //vec3_t mins; - { 15, 15, 20 }, //vec3_t maxs; - { 15, 15, 20 }, //vec3_t crouchmaxs; - { -15, -15, -4 }, //vec3_t deadmins; - { 15, 15, 4 }, //vec3_t deadmaxs; + { -20, -20, -20 }, //vec3_t mins; + { 20, 20, 20 }, //vec3_t maxs; + { 20, 20, 20 }, //vec3_t crouchmaxs; + { -20, -20, -4 }, //vec3_t deadmins; + { 20, 20, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset 0, 0, //int viewheight, crouchviewheight; ABUILDER_HEALTH, //int health; @@ -1609,18 +1609,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_BUILDER0_UPG, //int classnum; "builderupg", //char *classname; - "Advanced Builder", //char *humanname; + "Advanced Granger", //char *humanname; "builder", //char *modelname; - 1.0f, //float modelScale; + 1.25f, //float modelScale; "advanced", //char *skinname; - 1.0f, //float shadowScale; + 1.25f, //float shadowScale; "alien_builder_hud", //char *hudname; ( 1 << S2 )|( 1 << S3 ), //int stages - { -20, -20, -20 }, //vec3_t mins; - { 20, 20, 20 }, //vec3_t maxs; - { 20, 20, 20 }, //vec3_t crouchmaxs; - { -20, -20, -4 }, //vec3_t deadmins; - { 20, 20, 4 }, //vec3_t deadmaxs; + { -25, -25, -25 }, //vec3_t mins; + { 25, 25, 25 }, //vec3_t maxs; + { 25, 25, 25 }, //vec3_t crouchmaxs; + { -25, -25, -4 }, //vec3_t deadmins; + { 25, 25, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset 0, 0, //int viewheight, crouchviewheight; ABUILDER_UPG_HEALTH, //int health; @@ -1647,9 +1647,9 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL0, //int classnum; "level0", //char *classname; - "Soldier", //char *humanname; - "jumper", //char *modelname; - 0.2f, //float modelScale; + "Dretch", //char *humanname; + "level0", //char *modelname; + 1.0f, //float modelScale; "default", //char *skinname; 0.3f, //float shadowScale; "alien_general_hud", //char *hudname; @@ -1657,8 +1657,8 @@ classAttributes_t bg_classList[ ] = { -15, -15, -15 }, //vec3_t mins; { 15, 15, 15 }, //vec3_t maxs; { 15, 15, 15 }, //vec3_t crouchmaxs; - { -15, -15, -4 }, //vec3_t deadmins; - { 15, 15, 4 }, //vec3_t deadmaxs; + { -15, -15, -15 }, //vec3_t deadmins; + { 15, 15, 15 }, //vec3_t deadmaxs; -8.0f, //float zOffset 0, 0, //int viewheight, crouchviewheight; LEVEL0_HEALTH, //int health; @@ -1686,9 +1686,9 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL1, //int classnum; "level1", //char *classname; - "Hydra", //char *humanname; - "spitter", //char *modelname; - 0.6f, //float modelScale; + "Basilisk", //char *humanname; + "level1", //char *modelname; + 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; @@ -1725,18 +1725,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL1_UPG, //int classnum; "level1upg", //char *classname; - "Hydra Upgrade", //char *humanname; - "spitter", //char *modelname; - 0.7f, //float modelScale; - "blue", //char *skinname; + "Advanced Basilisk", //char *humanname; + "level1", //char *modelname; + 1.1666f, //float modelScale; + "upgrade", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S2 )|( 1 << S3 ), //int stages - { -20, -20, -20 }, //vec3_t mins; - { 20, 20, 20 }, //vec3_t maxs; - { 20, 20, 20 }, //vec3_t crouchmaxs; - { -20, -20, -4 }, //vec3_t deadmins; - { 20, 20, 4 }, //vec3_t deadmaxs; + { -21, -21, -21 }, //vec3_t mins; + { 21, 21, 21 }, //vec3_t maxs; + { 21, 21, 21 }, //vec3_t crouchmaxs; + { -21, -21, -4.666 }, //vec3_t deadmins; + { 21, 21, 4.666 }, //vec3_t deadmaxs; 0.0f, //float zOffset 0, 0, //int viewheight, crouchviewheight; LEVEL1_UPG_HEALTH, //int health; @@ -1764,18 +1764,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL2, //int classnum; "level2", //char *classname; - "Chimera", //char *humanname; - "tarantula", //char *modelname; - 0.75f, //float modelScale; + "Marauder", //char *humanname; + "level2", //char *modelname; + 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages - { -22, -22, -22 }, //vec3_t mins; - { 22, 22, 22 }, //vec3_t maxs; - { 22, 22, 22 }, //vec3_t crouchmaxs; - { -22, -22, -4 }, //vec3_t deadmins; - { 22, 22, 4 }, //vec3_t deadmaxs; + { -25, -25, -22 }, //vec3_t mins; + { 25, 25, 16 }, //vec3_t maxs; + { 25, 25, 16 }, //vec3_t crouchmaxs; + { -25, -25, -4 }, //vec3_t deadmins; + { 25, 25, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset 10, 10, //int viewheight, crouchviewheight; LEVEL2_HEALTH, //int health; @@ -1803,18 +1803,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL2_UPG, //int classnum; "level2upg", //char *classname; - "Chimera Upgrade", //char *humanname; - "tarantula", //char *modelname; - 0.9f, //float modelScale; - "red", //char *skinname; + "Advanced Marauder", //char *humanname; + "level2", //char *modelname; + 1.1f, //float modelScale; + "adv", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S2 )|( 1 << S3 ), //int stages - { -24, -24, -24 }, //vec3_t mins; - { 24, 24, 24 }, //vec3_t maxs; - { 24, 24, 24 }, //vec3_t crouchmaxs; - { -24, -24, -4 }, //vec3_t deadmins; - { 24, 24, 4 }, //vec3_t deadmaxs; + { -26, -26, -24 }, //vec3_t mins; + { 26, 26, 18 }, //vec3_t maxs; + { 26, 26, 18 }, //vec3_t crouchmaxs; + { -26, -26, -4 }, //vec3_t deadmins; + { 26, 26, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset 12, 12, //int viewheight, crouchviewheight; LEVEL2_UPG_HEALTH, //int health; @@ -1843,17 +1843,17 @@ classAttributes_t bg_classList[ ] = PCL_ALIEN_LEVEL3, //int classnum; "level3", //char *classname; "Dragoon", //char *humanname; - "prowl", //char *modelname; + "level3", //char *modelname; 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages - { -32, -32, -21 }, //vec3_t mins; - { 32, 32, 21 }, //vec3_t maxs; - { 32, 32, 21 }, //vec3_t crouchmaxs; - { -32, -32, -4 }, //vec3_t deadmins; - { 32, 32, 4 }, //vec3_t deadmaxs; + { -26, -26, -23 }, //vec3_t mins; + { 26, 26, 23 }, //vec3_t maxs; + { 26, 26, 23 }, //vec3_t crouchmaxs; + { -26, -26, -4 }, //vec3_t deadmins; + { 26, 26, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset 24, 24, //int viewheight, crouchviewheight; LEVEL3_HEALTH, //int health; @@ -1881,16 +1881,16 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL3_UPG, //int classnum; "level3upg", //char *classname; - "Dragoon Upgrade", //char *humanname; - "prowl", //char *modelname; - 1.0f, //float modelScale; - "default", //char *skinname; + "Advanced Dragoon", //char *humanname; + "level3", //char *modelname; + 1.25f, //float modelScale; + "adv", //char *skinname; 1.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S3 ), //int stages - { -32, -32, -21 }, //vec3_t mins; - { 32, 32, 21 }, //vec3_t maxs; - { 32, 32, 21 }, //vec3_t crouchmaxs; + { -32, -32, -29 }, //vec3_t mins; + { 32, 32, 38 }, //vec3_t maxs; + { 32, 32, 38 }, //vec3_t crouchmaxs; { -32, -32, -4 }, //vec3_t deadmins; { 32, 32, 4 }, //vec3_t deadmaxs; 0.0f, //float zOffset @@ -1920,18 +1920,18 @@ classAttributes_t bg_classList[ ] = { PCL_ALIEN_LEVEL4, //int classnum; "level4", //char *classname; - "Big Mofo", //char *humanname; - "mofo", //char *modelname; + "Tyrant", //char *humanname; + "level4", //char *modelname; 1.0f, //float modelScale; "default", //char *skinname; 2.0f, //float shadowScale; "alien_general_hud", //char *hudname; ( 1 << S3 ), //int stages - { -30, -30, -20 }, //vec3_t mins; - { 30, 30, 20 }, //vec3_t maxs; - { 30, 30, 20 }, //vec3_t crouchmaxs; - { -15, -15, -4 }, //vec3_t deadmins; - { 15, 15, 4 }, //vec3_t deadmaxs; + { -32, -32, -22 }, //vec3_t mins; + { 32, 32, 70 }, //vec3_t maxs; + { 32, 32, 70 }, //vec3_t crouchmaxs; + { -32, -32, -34 }, //vec3_t deadmins; + { 32, 32, 34 }, //vec3_t deadmaxs; 0.0f, //float zOffset 35, 35, //int viewheight, crouchviewheight; LEVEL4_HEALTH, //int health; @@ -1960,7 +1960,7 @@ classAttributes_t bg_classList[ ] = PCL_HUMAN, //int classnum; "human_base", //char *classname; "Human", //char *humanname; - "sarge", //char *modelname; + "human_base", //char *modelname; 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; @@ -1971,7 +1971,7 @@ classAttributes_t bg_classList[ ] = { 15, 15, 16 }, //vec3_t crouchmaxs; { -15, -15, -4 }, //vec3_t deadmins; { 15, 15, 4 }, //vec3_t deadmaxs; - 0.0f, //float zOffset + -2.0f, //float zOffset 26, 12, //int viewheight, crouchviewheight; 100, //int health; 1.0f, //float fallDamage; @@ -1999,7 +1999,7 @@ classAttributes_t bg_classList[ ] = PCL_HUMAN_BSUIT, //int classnum; "human_bsuit", //char *classname; "bsuit", //char *humanname; - "keel", //char *modelname; + "human_bsuit", //char *modelname; 1.0f, //float modelScale; "default", //char *skinname; 1.0f, //float shadowScale; -- cgit