Tesla Gen and effects

4 files changed, 27 insertions, 27 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 9d0d288b..fdc371e0 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -450,29 +450,27 @@ gitem_t bg_itemlist[] =
     ""
   },*/
 
-/*QUAKED weapon_lightning (.3 .3 1) (-16 -16 -16) (16 16 16) suspended
+/*QUAKED weapon_teslagen (.3 .3 1) (-16 -16 -16) (16 16 16) suspended
 */
-  /*{
-    "weapon_lightning",
+  {
+    "weapon_teslagen",
     "sound/misc/w_pkup.wav",
-    { "models/weapons2/lightning/lightning.md3",
-    0, 0, 0},
+    { 0, 0, 0, 0},
     "icons/iconw_lightning",
-    "Lightning Gun",
+    "Tesla Generator",
     100,
     IT_WEAPON,
-    WP_LIGHTNING,
+    WP_TESLAGEN,
     "",
     ""
-  },*/
+  },
 
 /*QUAKED weapon_railgun (.3 .3 1) (-16 -16 -16) (16 16 16) suspended
 */
   {
     "weapon_railgun",
     "sound/misc/w_pkup.wav",
-    { "models/weapons2/railgun/railgun.md3",
-    0, 0, 0},
+    { 0, 0, 0, 0},
     "icons/iconw_railgun",
     "Railgun",
     10,
@@ -981,11 +979,11 @@ TA: human defense item
 TA: human defense item
 */
   {
-    "team_human_def3",
+    "team_human_tesla",
     "sound/items/holdable.wav",
-    { "models/buildables/plasmaturret/pturret_base.md3", 0, 0, 0 },
+    { "models/buildables/tesla/tesla.md3", 0, 0, 0 },
     "icons/teleporter", //icon
-    "Human Defense3",      //pickup
+    "Human Tesla Generator",      //pickup
     0,
     IT_BUILDABLE,
     BA_H_DEF3,
@@ -1511,10 +1509,10 @@ buildableAttributes_t bg_buildableList[ ] =
   },
   {
     BA_H_DEF3,             //int       buildNum;
-    "railturret",          //char      *buildName;
-    "team_human_def3",     //char      *entityName;
-    { -24, -24, -11 },     //vec3_t    mins;
-    { 24, 24, 11 },        //vec3_t    maxs;
+    "tesla",               //char      *buildName;
+    "team_human_tesla",    //char      *entityName;
+    { -22, -22, -40 },     //vec3_t    mins;
+    { 22, 22, 40 },        //vec3_t    maxs;
     TR_GRAVITY,            //trType_t traj;
     0.0,                   //float        bounce;
     80,                    //int       buildPoints;
@@ -1529,7 +1527,7 @@ buildableAttributes_t bg_buildableList[ ] =
     150,                   //int       nextthink;
     4000,                  //int       turretFireSpeed;
     1500,                  //int       turretRange;
-    WP_LIGHTNING,          //weapon_t  turretProjType;
+    WP_TESLAGEN,           //weapon_t  turretProjType;
     0.707f,                //float     minNormal;
     qfalse,                //qboolean  invertNormal;
     qfalse,                //qboolean  creepTest;
@@ -3805,6 +3803,7 @@ char *eventnames[] = {
   "EV_MISSILE_MISS_METAL",
   "EV_ITEM_EXPLOSION", //TA: human item explosions
   "EV_RAILTRAIL",
+  "EV_TESLATRAIL",
   "EV_SHOTGUN",
   "EV_BULLET",        // otherEntity is the shooter
 
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 8bad877c..fe307307 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2325,7 +2325,7 @@ static void PM_Weapon( void )
     case WP_GAUNTLET:
       addTime = 400;
       break;
-    case WP_LIGHTNING:
+    case WP_TESLAGEN:
       addTime = 50;
       break;
     case WP_SHOTGUN:
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 4dbe2542..c96ef9e2 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -341,7 +341,7 @@ typedef enum
   WP_GRENADE_LAUNCHER,
   WP_ROCKET_LAUNCHER,
   WP_LOCKBLOB_LAUNCHER,
-  WP_LIGHTNING,
+  WP_TESLAGEN,
   WP_RAILGUN,
   WP_FLAMER,
   WP_PLASMAGUN,
@@ -528,6 +528,7 @@ typedef enum {
   EV_MISSILE_MISS_METAL,
   EV_ITEM_EXPLOSION, //TA: human item explosions
   EV_RAILTRAIL,
+  EV_TESLATRAIL,
   EV_SHOTGUN,
   EV_BULLET,        // otherEntity is the shooter
 
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 6bfdcc30..d4599572 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -566,13 +566,13 @@ void Weapon_HookThink (gentity_t *ent)
 /*
 ======================================================================
 
-LIGHTNING GUN
+TESLA GENERATOR
 
 ======================================================================
 */
 
 
-void Weapon_LightningFire( gentity_t *ent )
+void Weapon_TeslaFire( gentity_t *ent )
 {
   trace_t   tr;
   vec3_t    end;
@@ -600,7 +600,7 @@ void Weapon_LightningFire( gentity_t *ent )
   SnapVectorTowards( tr.endpos, muzzle );
 
   // send railgun beam effect
-  tent = G_TempEntity( tr.endpos, EV_RAILTRAIL );
+  tent = G_TempEntity( tr.endpos, EV_TESLATRAIL );
 
   // set player number for custom colors on the railtrail
   tent->s.clientNum = ent->s.clientNum;
@@ -1050,8 +1050,8 @@ void FireWeapon2( gentity_t *ent )
     case WP_GAUNTLET:
       Weapon_Gauntlet( ent );
       break;
-    case WP_LIGHTNING:
-      Weapon_LightningFire( ent );
+    case WP_TESLAGEN:
+      Weapon_TeslaFire( ent );
       break;
     case WP_SHOTGUN:
       weapon_supershotgun_fire( ent );
@@ -1142,8 +1142,8 @@ void FireWeapon( gentity_t *ent )
     case WP_GAUNTLET:
       Weapon_Gauntlet( ent );
       break;
-    case WP_LIGHTNING:
-      Weapon_LightningFire( ent );
+    case WP_TESLAGEN:
+      Weapon_TeslaFire( ent );
       break;
     case WP_SHOTGUN:
       weapon_supershotgun_fire( ent );