* Added zoom function to weapons

* Added code for reload binding
* Turrents now give up an out of range target
* Reactor cannot be used once destroyed
* Reduced effectiveness of acid tube, turret and hive
* Raised advanced build times
* Reduced overall alien damage slightly
* Raised mofo health (again)
* Raised dragoon projectile damage

1 files changed, 65 insertions, 64 deletions

diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 008bd5c0..d4bc9ace 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -3366,71 +3366,72 @@ typedef struct
 
 static bind_t g_bindings[] = 
 {
-  {"+scores",      K_TAB,       -1,   -1, -1},
-  {"+button2",     K_ENTER,     -1,   -1, -1},
-  {"+speed",       K_SHIFT,     -1,   -1, -1},
-  {"boost",        'x',         -1,   -1, -1}, //TA: human sprinting
-  {"+forward",     K_UPARROW,   -1,   -1, -1},
-  {"+back",        K_DOWNARROW, -1,   -1, -1},
-  {"+moveleft",    ',',         -1,   -1, -1},
-  {"+moveright",   '.',         -1,   -1, -1},
-  {"+moveup",      K_SPACE,     -1,   -1, -1},
-  {"+movedown",    'c',         -1,   -1, -1},
-  {"+left",        K_LEFTARROW, -1,   -1, -1},
-  {"+right",       K_RIGHTARROW,  -1,   -1, -1},
-  {"+strafe",      K_ALT,       -1,   -1, -1},
-  {"+lookup",      K_PGDN,        -1,   -1, -1},
-  {"+lookdown",    K_DEL,       -1,   -1, -1},
-  {"+mlook",       '/',         -1,   -1, -1},
-  {"centerview",   K_END,       -1,   -1, -1},
-  {"+zoom",        -1,            -1,   -1, -1},
-  {"weapon 1",     '1',         -1,   -1, -1},
-  {"weapon 2",     '2',         -1,   -1, -1},
-  {"weapon 3",     '3',         -1,   -1, -1},
-  {"weapon 4",     '4',         -1,   -1, -1},
-  {"weapon 5",     '5',         -1,   -1, -1},
-  {"weapon 6",     '6',         -1,   -1, -1},
-  {"weapon 7",     '7',         -1,   -1, -1},
-  {"weapon 8",     '8',         -1,   -1, -1},
-  {"weapon 9",     '9',         -1,   -1, -1},
-  {"weapon 10",    '0',         -1,   -1, -1},
-  {"weapon 11",    -1,          -1,   -1, -1},
-  {"weapon 12",    -1,          -1,   -1, -1},
-  {"weapon 13",    -1,          -1,   -1, -1},
-  {"+attack",      K_MOUSE1,        -1,   -1, -1},
-  {"+button5",     K_MOUSE2,        -1,   -1, -1}, //TA: secondary attack
-  {"+button7",     'q',       -1,   -1, -1}, //TA: buildable use
-  {"deconstruct",  'e',       -1,   -1, -1}, //TA: buildable destroy
-  {"weapprev",     '[',         -1,   -1, -1},
-  {"weapnext",     ']',         -1,   -1, -1},
-  {"+button3",     K_MOUSE3,      -1,   -1, -1},
-  {"+button4",     K_MOUSE4,      -1,   -1, -1},
-  {"prevTeamMember", 'w',         -1,   -1, -1},
-  {"nextTeamMember", 'r',         -1,   -1, -1},
-  {"nextOrder", 't',          -1,   -1, -1},
-  {"confirmOrder", 'y',         -1,   -1, -1},
-  {"denyOrder", 'n',          -1,   -1, -1},
-  {"taskOffense", 'o',          -1,   -1, -1},
-  {"taskDefense", 'd',          -1,   -1, -1},
-  {"taskPatrol", 'p',         -1,   -1, -1},
-  {"taskCamp", 'c',         -1,   -1, -1},
-  {"taskFollow", 'f',         -1,   -1, -1},
-  {"taskRetrieve", 'v',         -1,   -1, -1},
-  {"taskEscort", 'l',         -1,   -1, -1},
-  {"taskOwnFlag", 'i',          -1,   -1, -1},
-  {"taskSuicide", 'k',          -1,   -1, -1},
-  {"tauntKillInsult", K_F1,     -1,   -1, -1},
-  {"tauntPraise", K_F2,     -1,   -1, -1},
-  {"tauntTaunt", K_F3,      -1,   -1, -1},
-  {"tauntDeathInsult", K_F4,      -1,   -1, -1},
-  {"tauntGauntlet", K_F5,     -1,   -1, -1},
-  {"scoresUp", K_KP_PGUP,     -1,   -1, -1},
-  {"scoresDown", K_KP_PGDN,     -1,   -1, -1},
+  { "+scores",      K_TAB,         -1, -1, -1 },
+  { "+button2",     K_ENTER,       -1, -1, -1 },
+  { "+speed",       K_SHIFT,       -1, -1, -1 },
+  { "boost",        'x',           -1, -1, -1 }, //TA: human sprinting
+  { "+forward",     K_UPARROW,     -1, -1, -1 },
+  { "+back",        K_DOWNARROW,   -1, -1, -1 },
+  { "+moveleft",    ',',           -1, -1, -1 },
+  { "+moveright",   '.',           -1, -1, -1 },
+  { "+moveup",      K_SPACE,       -1, -1, -1 },
+  { "+movedown",    'c',           -1, -1, -1 },
+  { "+left",        K_LEFTARROW,   -1, -1, -1 },
+  { "+right",       K_RIGHTARROW,  -1, -1, -1 },
+  { "+strafe",      K_ALT,         -1, -1, -1 },
+  { "+lookup",      K_PGDN,        -1, -1, -1 },
+  { "+lookdown",    K_DEL,         -1, -1, -1 },
+  { "+mlook",       '/',           -1, -1, -1 },
+  { "centerview",   K_END,         -1, -1, -1 },
+  { "+zoom",        -1,            -1, -1, -1 },
+  { "weapon 1",     '1',           -1, -1, -1 },
+  { "weapon 2",     '2',           -1, -1, -1 },
+  { "weapon 3",     '3',           -1, -1, -1 },
+  { "weapon 4",     '4',           -1, -1, -1 },
+  { "weapon 5",     '5',           -1, -1, -1 },
+  { "weapon 6",     '6',           -1, -1, -1 },
+  { "weapon 7",     '7',           -1, -1, -1 },
+  { "weapon 8",     '8',           -1, -1, -1 },
+  { "weapon 9",     '9',           -1, -1, -1 },
+  { "weapon 10",    '0',           -1, -1, -1 },
+  { "weapon 11",    -1,            -1, -1, -1 },
+  { "weapon 12",    -1,            -1, -1, -1 },
+  { "weapon 13",    -1,            -1, -1, -1 },
+  { "+attack",      K_MOUSE1,      -1, -1, -1 },
+  { "+button5",     K_MOUSE2,      -1, -1, -1 }, //TA: secondary attack
+  { "reload",       'r',           -1, -1, -1 }, //TA: reload
+  { "+button7",     'q',           -1, -1, -1 }, //TA: buildable use
+  { "deconstruct",  'e',           -1, -1, -1 }, //TA: buildable destroy
+  { "weapprev",     '[',           -1, -1, -1 },
+  { "weapnext",     ']',           -1, -1, -1 },
+  { "+button3",     K_MOUSE3,      -1, -1, -1 },
+  { "+button4",     K_MOUSE4,      -1, -1, -1 },
+  { "prevTeamMember", 'w',         -1, -1, -1 },
+  { "nextTeamMember", 'r',         -1, -1, -1 },
+  { "nextOrder",    't',           -1, -1, -1 },
+  { "confirmOrder", 'y',           -1, -1, -1 },
+  { "denyOrder",    'n',           -1, -1, -1 },
+  { "taskOffense",  'o',           -1, -1, -1 },
+  { "taskDefense",  'd',           -1, -1, -1 },
+  { "taskPatrol",   'p',           -1, -1, -1 },
+  { "taskCamp",     'c',           -1, -1, -1 },
+  { "taskFollow",   'f',           -1, -1, -1 },
+  { "taskRetrieve", 'v',           -1, -1, -1 },
+  { "taskEscort",   'l',           -1, -1, -1 },
+  { "taskOwnFlag",  'i',           -1, -1, -1 },
+  { "taskSuicide",  'k',           -1, -1, -1 },
+  { "tauntKillInsult", K_F1,       -1, -1, -1 },
+  { "tauntPraise",   K_F2,         -1, -1, -1 },
+  { "tauntTaunt",    K_F3,         -1, -1, -1 },
+  { "tauntDeathInsult", K_F4,      -1, -1, -1 },
+  { "tauntGauntlet", K_F5,         -1, -1, -1 },
+  { "scoresUp",      K_KP_PGUP,    -1, -1, -1 },
+  { "scoresDown",    K_KP_PGDN,    -1, -1, -1 },
   // bk001205 - this one below was:  '-1' 
-  {"messagemode",  -1,          -1,   -1, -1},
-  {"messagemode2", -1,            -1,   -1, -1},
-  {"messagemode3", -1,            -1,   -1, -1},
-  {"messagemode4", -1,            -1,   -1, -1}
+  { "messagemode",  -1,            -1, -1, -1 },
+  { "messagemode2", -1,            -1, -1, -1 },
+  { "messagemode3", -1,            -1, -1, -1 },
+  { "messagemode4", -1,            -1, -1, -1 }
 };