Changeset 77:6d865a4a045a

Timestamp:

11/22/07 12:01:03 (3 years ago)

Author:

mdoison

Branch:

madcat

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/branches/madcat@99

Message:

add mauradeur.patch (tjw 1.2)

• improve mauradeur capacities
• rewrite zap attack
• FIXME: Why zap effect never called ???

Location:

src/game

Files:

• bg_public.h (modified) (2 diffs)
• g_active.c (modified) (3 diffs)
• g_local.h (modified) (2 diffs)
• g_main.c (modified) (1 diff)
• g_weapon.c (modified) (3 diffs)
• tremulous.h (modified) (1 diff)

src/game/bg_public.h

@@ -580 +580 @@
   EV_DCC_ATTACK,      //TA: dcc under attack
 
-  EV_RPTUSE_SOUND     //TA: trigger a sound
+  EV_RPTUSE_SOUND,     //TA: trigger a sound
+  EV_LEV2_ZAP
 } entity_event_t;
 
@@ -1269 +1270 @@
   ET_MODELDOOR,
   ET_LIGHTFLARE,
-  ET_LEV2_ZAP_CHAIN,
+  ET_LEV2_ZAP_CHAIN, // TODO: REMOVE ME !!!
 
   ET_EVENTS       // any of the EV_* events can be added freestanding

src/game/g_active.c

@@ -1338 +1338 @@
 }
 
+static void G_CheckZap( gentity_t *ent )
+{
+  int i;
+
+  if( !ent->zapping )
+  {
+    // clear out established targets
+    for( i = 0; i < LEVEL2_AREAZAP_MAX_TARGETS; i++ )
+    {
+      ent->zapTargets[ i ] = -1;
+    }
+    ent->zapDmg = 0.0f;
+  }
+  ent->wasZapping = ent->zapping;
+  ent->zapping = qfalse;
+
+  if( ent->client->ps.weapon == WP_ALEVEL2_UPG &&
+    ( ent->client->pers.cmd.buttons & BUTTON_ATTACK2 ) )
+  {
+    ent->zapping = qtrue;
+  }
+  
+  if( ent->wasZapping && !ent->zapping )
+    ent->client->ps.weaponTime = LEVEL2_AREAZAP_REPEAT;
+}
+
 /*
 ==============
@@ -1691 +1717 @@
   // touch other objects
   ClientImpacts( ent, &pm );
-  
+
+  G_CheckZap( ent );
+ 
   // execute client events
   ClientEvents( ent, oldEventSequence );
@@ -1976 +2004 @@
   G_SetClientSound( ent );
 
+  G_UpdateZaps( ent );
+
   // set the latest infor
   if( g_smoothClients.integer )

src/game/g_local.h

@@ -241 +241 @@
 
   int               lastDamageTime;
+
+  qboolean          zapping;                        // adv maurader is zapping
+  qboolean          wasZapping;                     // adv maurader was zapping
+  int               zapTargets[ LEVEL2_AREAZAP_MAX_TARGETS ];
+  float             zapDmg;                         // keep track of damage
 };
 
@@ -911 +916 @@
 qboolean  CheckPounceAttack( gentity_t *ent );
 void      ChargeAttack( gentity_t *ent, gentity_t *victim );
-void      G_UpdateZaps( int msec );
+void      G_UpdateZaps( gentity_t *ent );
 
 

src/game/g_main.c

@@ -2468 +2468 @@
   G_SpawnClients( PTE_HUMANS );
   G_CalculateAvgPlayers( );
-  G_UpdateZaps( msec );
 
   // see if it is time to end the level

src/game/g_weapon.c

@@ -1018 +1018 @@
 */
 
-#define MAX_ZAPS  64
-
-static zap_t  zaps[ MAX_CLIENTS ];
-
-/*
-===============
-G_FindNewZapTarget
-===============
-*/
-static gentity_t *G_FindNewZapTarget( gentity_t *ent )
+static vec3_t sortReference;
+
+static int QDECL G_SortDistance( const void *a, const void *b )
+{
+  gentity_t    *aent, *bent;
+  float        adist, bdist;
+  aent = &g_entities[ *(int *)a ];
+  bent = &g_entities[ *(int *)b ];
+  adist = Distance( sortReference, aent->s.origin );
+  bdist = Distance( sortReference, bent->s.origin );
+  if( adist > bdist )
+    return -1;
+  else if( adist < bdist )
+    return 1;
+  else
+    return 0;
+}
+
+/*
+===============
+G_UpdateZaps
+===============
+*/
+void G_UpdateZaps( gentity_t *ent )
 {
   int       entityList[ MAX_GENTITIES ];
-  vec3_t    range = { LEVEL2_AREAZAP_RANGE, LEVEL2_AREAZAP_RANGE, LEVEL2_AREAZAP_RANGE };
+  int       hitList[ MAX_GENTITIES ];
+  vec3_t    range = { LEVEL2_AREAZAP_CUTOFF,
+                      LEVEL2_AREAZAP_CUTOFF,
+                      LEVEL2_AREAZAP_CUTOFF };
   vec3_t    mins, maxs;
-  int       i, j, k, num;
+  int       i, j;
+  int       hit = 0;
+  int       num;
   gentity_t *enemy;
+  gentity_t *effect;
   trace_t   tr;
+  qboolean  alreadyTargeted = qfalse;
+  int       damage;
+
+  if( !ent->zapping || ent->health <= 0 )
+    return;
 
   VectorScale( range, 1.0f / M_ROOT3, range );
@@ -1046 +1071 @@
     enemy = &g_entities[ entityList[ i ] ];
 
-    if( ( ( enemy->client && enemy->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) ||
+    if( ( ( enemy->client &&
+            enemy->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) ||
         ( enemy->s.eType == ET_BUILDABLE &&
-          BG_FindTeamForBuildable( enemy->s.modelindex ) == BIT_HUMANS ) ) && enemy->health > 0 )
+            BG_FindTeamForBuildable( enemy->s.modelindex ) == BIT_HUMANS ) ) &&
+        enemy->health > 0 )
     {
-      qboolean foundOldTarget = qfalse;
-
-      trap_Trace( &tr, muzzle, NULL, NULL, enemy->s.origin, ent->s.number, MASK_SHOT );
-
-      //can't see target from here
-      if( tr.entityNum == ENTITYNUM_WORLD )
-        continue;
-
-      for( j = 0; j < MAX_ZAPS; j++ )
+      alreadyTargeted = qfalse;
+      for( j = 0; j < LEVEL2_AREAZAP_MAX_TARGETS; j++ )
       {
-        zap_t *zap = &zaps[ j ];
-
-        for( k = 0; k < zap->numTargets; k++ )
+        if( ent->zapTargets[ j ] == entityList[ i ] )
         {
-          if( zap->targets[ k ] == enemy )
-          {
-            foundOldTarget = qtrue;
-            break;
-          }
-        }
-
-        if( foundOldTarget )
+          alreadyTargeted = qtrue;
           break;
-      }
-
-      // enemy is already targetted
-      if( foundOldTarget )
-        continue;
-
-      return enemy;
-    }
-  }
-
-  return NULL;
-}
-
-/*
-===============
-G_UpdateZapEffect
-===============
-*/
-static void G_UpdateZapEffect( zap_t *zap )
-{
-  int       j;
-  gentity_t *effect = zap->effectChannel;
-
-  effect->s.eType = ET_LEV2_ZAP_CHAIN;
-  effect->classname = "lev2zapchain";
-  G_SetOrigin( effect, zap->creator->s.origin );
-  effect->s.powerups = zap->creator->s.number;
-
-  effect->s.time = effect->s.time2 = effect->s.constantLight = -1;
-
-  for( j = 0; j < zap->numTargets; j++ )
-  {
-    int number = zap->targets[ j ]->s.number;
-
-    switch( j )
-    {
-      case 0: effect->s.time = number;          break;
-      case 1: effect->s.time2 = number;         break;
-      case 2: effect->s.constantLight = number; break;
-      default:                                  break;
-    }
-  }
-
-  trap_LinkEntity( effect );
-}
-
-/*
-===============
-G_CreateNewZap
-===============
-*/
-static void G_CreateNewZap( gentity_t *creator, gentity_t *target )
-{
-  int       i, j;
-  zap_t     *zap;
-
-  for( i = 0; i < MAX_ZAPS; i++ )
-  {
-    zap = &zaps[ i ];
-
-    if( !zap->used )
-    {
-      zap->used = qtrue;
-
-      zap->timeToLive = LEVEL2_AREAZAP_TIME;
-      zap->damageUsed = 0;
-
-      zap->creator = creator;
-
-      zap->targets[ 0 ] = target;
-      zap->numTargets = 1;
-
-      for( j = 1; j < MAX_ZAP_TARGETS && zap->targets[ j - 1 ]; j++ )
-      {
-        zap->targets[ j ] = G_FindNewZapTarget( zap->targets[ j - 1 ] );
-
-        if( zap->targets[ j ] )
-          zap->numTargets++;
-      }
-
-      zap->effectChannel = G_Spawn( );
-      G_UpdateZapEffect( zap );
-
-      return;
-    }
-  }
-}
-
-
-/*
-===============
-G_UpdateZaps
-===============
-*/
-void G_UpdateZaps( int msec )
-{
-  int   i, j;
-  zap_t *zap;
-  int   damage;
-
-  for( i = 0; i < MAX_ZAPS; i++ )
-  {
-    zap = &zaps[ i ];
-
-    if( zap->used )
-    {
-      //check each target is valid
-      for( j = 0; j < zap->numTargets; j++ )
-      {
-        gentity_t *source;
-        gentity_t *target = zap->targets[ j ];
-
-        if( j == 0 )
-          source = zap->creator;
-        else
-          source = zap->targets[ j - 1 ];
-
-        if( target->health <= 0 || !target->inuse || //early out
-            Distance( source->s.origin, target->s.origin ) > LEVEL2_AREAZAP_RANGE )
-        {
-          target = zap->targets[ j ] = G_FindNewZapTarget( source );
-
-          //couldn't find a target, so forget about the rest of the chain
-          if( !target )
-            zap->numTargets = j;
         }
       }
 
-      if( zap->numTargets )
+      if( !alreadyTargeted &&
+          Distance( ent->s.origin, enemy->s.origin ) > LEVEL2_AREAZAP_RANGE )
       {
-        for( j = 0; j < zap->numTargets; j++ )
-        {
-          gentity_t *source;
-          gentity_t *target = zap->targets[ j ];
-          float     r = 1.0f / zap->numTargets;
-          float     damageFraction = 2 * r - 2 * j * r * r - r * r;
-          vec3_t    forward;
-
-          if( j == 0 )
-            source = zap->creator;
-          else
-            source = zap->targets[ j - 1 ];
-
-          damage = ceil( ( (float)msec / LEVEL2_AREAZAP_TIME ) *
-              LEVEL2_AREAZAP_DMG * damageFraction );
-
-          // don't let a high msec value inflate the total damage
-          if( damage + zap->damageUsed > LEVEL2_AREAZAP_DMG )
-            damage = LEVEL2_AREAZAP_DMG - zap->damageUsed;
-
-          VectorSubtract( target->s.origin, source->s.origin, forward );
-          VectorNormalize( forward );
-
-          //do the damage
-          if( damage )
-          {
-            G_Damage( target, source, zap->creator, forward, target->s.origin,
-                    damage, DAMAGE_NO_KNOCKBACK | DAMAGE_NO_LOCDAMAGE, MOD_LEVEL2_ZAP );
-            zap->damageUsed += damage;
-          }
-        }
+        continue;
       }
-
-      G_UpdateZapEffect( zap );
-
-      zap->timeToLive -= msec;
-
-      if( zap->timeToLive <= 0 || zap->numTargets == 0 || zap->creator->health <= 0 )
-      {
-        zap->used = qfalse;
-        G_FreeEntity( zap->effectChannel );
-      }
+      trap_Trace( &tr, ent->s.origin, NULL, NULL, enemy->s.origin,
+        ent-g_entities, MASK_SHOT );
+      if( tr.entityNum == enemy-g_entities )
+        hitList[ hit++ ] = tr.entityNum;
     }
   }
-}
-
-/*
-===============
-areaZapFire
-===============
-*/
-void areaZapFire( gentity_t *ent )
-{
-  trace_t   tr;
-  vec3_t    end;
-  gentity_t *traceEnt;
-  vec3_t    mins, maxs;
-
-  VectorSet( mins, -LEVEL2_AREAZAP_WIDTH, -LEVEL2_AREAZAP_WIDTH, -LEVEL2_AREAZAP_WIDTH );
-  VectorSet( maxs, LEVEL2_AREAZAP_WIDTH, LEVEL2_AREAZAP_WIDTH, LEVEL2_AREAZAP_WIDTH );
-
-  // set aiming directions
-  AngleVectors( ent->client->ps.viewangles, forward, right, up );
-
-  CalcMuzzlePoint( ent, forward, right, up, muzzle );
-
-  VectorMA( muzzle, LEVEL2_AREAZAP_RANGE, forward, end );
-
-  G_UnlaggedOn( muzzle, LEVEL2_AREAZAP_RANGE );
-  trap_Trace( &tr, muzzle, mins, maxs, end, ent->s.number, MASK_SHOT );
-  G_UnlaggedOff( );
-
-  if( tr.surfaceFlags & SURF_NOIMPACT )
-    return;
-
-  traceEnt = &g_entities[ tr.entityNum ];
-
-  if( ( ( traceEnt->client && traceEnt->client->ps.stats[ STAT_PTEAM ] == PTE_HUMANS ) ||
-      ( traceEnt->s.eType == ET_BUILDABLE &&
-        BG_FindTeamForBuildable( traceEnt->s.modelindex ) == BIT_HUMANS ) ) && traceEnt->health > 0 )
-  {
-    G_CreateNewZap( ent, traceEnt );
-  }
-}
-
+
+  for( i = 0; i < LEVEL2_AREAZAP_MAX_TARGETS; i++ )
+    ent->zapTargets[ i ] = -1;
+
+  if( !hit )
+    return;
+
+  ent->zapDmg += ( (float)( level.time - level.previousTime ) / 1000.0f )
+                     * LEVEL2_AREAZAP_DMG;
+  damage = (int)ent->zapDmg;
+  // wait until we've accumulated enough damage for bsuit to take at
+  // least 1 HP 
+  if( damage < 5 )
+    damage = 0;
+  else
+    ent->zapDmg -= (int)damage;
+
+  VectorCopy( ent->s.origin, sortReference );
+  qsort( hitList, hit, sizeof( int ), G_SortDistance );
+
+  // FIXME: event should be EV_LEV2_ZAP, but unknow by standard client
+  // temporary give old zap effect (is it valid ?)
+  effect = G_TempEntity( ent->s.origin, ET_LEV2_ZAP_CHAIN );
+
+  effect->s.powerups = ent-g_entities;
+  effect->s.time = effect->s.time2 = effect->s.constantLight = -1;
+  for( i = 0; i < hit; i++ )
+  {
+    if( i >= LEVEL2_AREAZAP_MAX_TARGETS )
+      break;
+
+    ent->zapTargets[ i ] = hitList[ i ];
+
+    enemy = &g_entities[ hitList[ i ] ];
+
+    if( damage > 0 )    
+    {
+      G_Damage( enemy, ent, ent, NULL, enemy->s.origin,
+        damage, DAMAGE_NO_KNOCKBACK | DAMAGE_NO_LOCDAMAGE, MOD_LEVEL2_ZAP );
+    }
+    switch( i )
+    {
+      case 0: effect->s.time = hitList[ i ];          break;
+      case 1: effect->s.time2 = hitList[ i ];         break;
+      case 2: effect->s.constantLight = hitList[ i ]; break;
+      default:                                        break;
+    }
+  }
+}
 
 /*
@@ -1506 +1365 @@
       poisonCloud( ent );
       break;
-    case WP_ALEVEL2_UPG:
-      areaZapFire( ent );
-      break;
 
     case WP_LUCIFER_CANNON:

src/game/tremulous.h

@@ -75 +75 @@
 #define LEVEL2_CLAW_DMG             ADM(40)
 #define LEVEL2_CLAW_RANGE           96.0f
-#define LEVEL2_CLAW_WIDTH           12.0f
+#define LEVEL2_CLAW_WIDTH           16.0f
 #define LEVEL2_CLAW_REPEAT          500
 #define LEVEL2_CLAW_K_SCALE         1.0f
 #define LEVEL2_CLAW_U_REPEAT        400
 #define LEVEL2_CLAW_U_K_SCALE       1.0f
-#define LEVEL2_AREAZAP_DMG          ADM(80)
-#define LEVEL2_AREAZAP_RANGE        200.0f
-#define LEVEL2_AREAZAP_WIDTH        15.0f
-#define LEVEL2_AREAZAP_REPEAT       1500
-#define LEVEL2_AREAZAP_TIME         1000
+#define LEVEL2_AREAZAP_DMG          ADM(33)
+#define LEVEL2_AREAZAP_RANGE        90.0f
+#define LEVEL2_AREAZAP_CUTOFF       350.0f
+#define LEVEL2_AREAZAP_REPEAT       500
 #define LEVEL2_AREAZAP_MAX_TARGETS  3
 #define LEVEL2_WALLJUMP_MAXSPEED    1000.0f