Changeset 78:dcde131dddae

Timestamp:

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

Author:

mdoison

Branch:

madcat

convert_revision:

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

Message:

add goon.patch (tjw 1.2)

• goon+ is now at s2
• improve goons capacities
• pounce give always a knockback
• improve pounce effect
• give splash damage to pounceball

Location:

src/game

Files:

• bg_misc.c (modified) (1 diff)
• bg_pmove.c (modified) (2 diffs)
• g_active.c (modified) (1 diff)
• g_combat.c (modified) (1 diff)
• g_local.h (modified) (1 diff)
• g_missile.c (modified) (1 diff)
• g_weapon.c (modified) (4 diffs)
• tremulous.h (modified) (2 diffs)

src/game/bg_misc.c

@@ -1884 +1884 @@
     1.0f,                                           //float   shadowScale;
     "alien_general_hud",                            //char    *hudname;
-    ( 1 << S3 ),                                    //int  stages
+    ( 1 << S2 )|( 1 << S3 ),                                    //int  stages
     { -32, -32, -21 },                              //vec3_t  mins;
     { 32, 32, 21 },                                 //vec3_t  maxs;

src/game/bg_pmove.c

@@ -523 +523 @@
     && ( pm->ps->pm_flags & PMF_CHARGE ) )
   {
-    pm->ps->weaponTime += LEVEL3_POUNCE_TIME;
     pm->ps->pm_flags &= ~PMF_CHARGE;
+    return qfalse;
   }
 
@@ -2868 +2868 @@
       attack3 = pm->cmd.buttons & BUTTON_USE_HOLDABLE;
 
-      if( !pm->autoWeaponHit[ pm->ps->weapon ] && !attack1 && !attack2 && !attack3 )
-      {
-        pm->ps->weaponTime = 0;
-        pm->ps->weaponstate = WEAPON_READY;
+      // pounce is autohit
+      if( !attack1 && !attack2 && !attack3 )
         return;
-      }
       break;
 

src/game/g_active.c

@@ -634 +634 @@
       if( client->ps.stats[ STAT_MISC ] < pounceSpeed && ucmd->buttons & BUTTON_ATTACK2 )
         client->ps.stats[ STAT_MISC ] += ( 100.0f / (float)LEVEL3_POUNCE_CHARGE_TIME ) * pounceSpeed;
-
-      if( !( ucmd->buttons & BUTTON_ATTACK2 ) )
-      {
-        if( client->pmext.pouncePayload > 0 )
-          client->allowedToPounce = qtrue;
-      }
 
       if( client->ps.stats[ STAT_MISC ] > pounceSpeed )

src/game/g_combat.c

@@ -987 +987 @@
   }
 
+  // ...and for goon pouncing
+  if( mod == MOD_LEVEL3_POUNCE )
+    knockback *= 1.5f;
+
   if( targ->client )
   {

src/game/g_local.h

@@ -453 +453 @@
   int                 medKitIncrementTime;
   int                 lastCreepSlowTime;    // time until creep can be removed
-
-  qboolean            allowedToPounce;
 
   qboolean            charging;

src/game/g_missile.c

@@ -791 +791 @@
   bolt->parent = self;
   bolt->damage = LEVEL3_BOUNCEBALL_DMG;
-  bolt->splashDamage = 0;
-  bolt->splashRadius = 0;
+  bolt->splashDamage = LEVEL3_BOUNCEBALL_DMG;
+  bolt->splashRadius = LEVEL3_BOUNCEBALL_RADIUS;
   bolt->methodOfDeath = MOD_LEVEL3_BOUNCEBALL;
   bolt->splashMethodOfDeath = MOD_LEVEL3_BOUNCEBALL;

src/game/g_weapon.c

@@ -1169 +1169 @@
   int       damage;
   vec3_t    mins, maxs;
+  int       payload;
+
+  if( ent->client->pmext.pouncePayload <= 0 )
+    return qfalse;
+
+  // in case the goon lands on his target, he get's one shot after landing
+  payload = ent->client->pmext.pouncePayload;
+  if( !( ent->client->ps.pm_flags & PMF_CHARGE ) )
+    ent->client->pmext.pouncePayload = 0;
 
   VectorSet( mins, -LEVEL3_POUNCE_WIDTH, -LEVEL3_POUNCE_WIDTH, -LEVEL3_POUNCE_WIDTH );
   VectorSet( maxs, LEVEL3_POUNCE_WIDTH, LEVEL3_POUNCE_WIDTH, LEVEL3_POUNCE_WIDTH );
-
-  if( ent->client->ps.groundEntityNum != ENTITYNUM_NONE )
-  {
-    ent->client->allowedToPounce = qfalse;
-    ent->client->pmext.pouncePayload = 0;
-  }
-
-  if( !ent->client->allowedToPounce )
-    return qfalse;
 
   if( ent->client->ps.weaponTime )
@@ -1212 +1212 @@
     tent->s.eventParm = DirToByte( tr.plane.normal );
     tent->s.weapon = ent->s.weapon;
-    tent->s.generic1 = ent->s.generic1; //weaponMode
+    tent->s.generic1 = WPM_SECONDARY;
   }
 
@@ -1218 +1218 @@
     return qfalse;
 
-  damage = (int)( ( (float)ent->client->pmext.pouncePayload
-    / (float)LEVEL3_POUNCE_SPEED ) * LEVEL3_POUNCE_DMG );
+  damage = (int)( ( (float)payload / (float)LEVEL3_POUNCE_SPEED )
+    * LEVEL3_POUNCE_DMG );
 
   ent->client->pmext.pouncePayload = 0;
 
   G_Damage( traceEnt, ent, ent, forward, tr.endpos, damage,
-      DAMAGE_NO_KNOCKBACK|DAMAGE_NO_LOCDAMAGE, MOD_LEVEL3_POUNCE );
-
-  ent->client->allowedToPounce = qfalse;
+      DAMAGE_NO_LOCDAMAGE, MOD_LEVEL3_POUNCE );
+
+  ent->client->ps.weaponTime += LEVEL3_POUNCE_TIME;
 
   return qtrue;
@@ -1408 +1408 @@
       break;
     case WP_ALEVEL3:
+      meleeAttack( ent, LEVEL3_CLAW_RANGE, LEVEL3_CLAW_WIDTH, LEVEL3_CLAW_DMG, MOD_LEVEL3_CLAW );
+      break;
     case WP_ALEVEL3_UPG:
-      meleeAttack( ent, LEVEL3_CLAW_RANGE, LEVEL3_CLAW_WIDTH, LEVEL3_CLAW_DMG, MOD_LEVEL3_CLAW );
+      meleeAttack( ent, LEVEL3_CLAW_UPG_RANGE, LEVEL3_CLAW_WIDTH, LEVEL3_CLAW_DMG, MOD_LEVEL3_CLAW );
       break;
     case WP_ALEVEL2:

src/game/tremulous.h

@@ -88 +88 @@
 
 #define LEVEL3_CLAW_DMG             ADM(80)
-#define LEVEL3_CLAW_RANGE           96.0f
-#define LEVEL3_CLAW_WIDTH           16.0f
+#define LEVEL3_CLAW_RANGE           72.0f
+#define LEVEL3_CLAW_UPG_RANGE       96.0f
+#define LEVEL3_CLAW_WIDTH           12.0f
 #define LEVEL3_CLAW_REPEAT          700
 #define LEVEL3_CLAW_K_SCALE         1.0f
@@ -101 +102 @@
 #define LEVEL3_POUNCE_SPEED_MOD     0.75f
 #define LEVEL3_POUNCE_CHARGE_TIME   700
+#define LEVEL3_POUNCE_CHARGE_MIN    400
 #define LEVEL3_POUNCE_TIME          400
 #define LEVEL3_BOUNCEBALL_DMG       ADM(110)
 #define LEVEL3_BOUNCEBALL_REPEAT    1000
 #define LEVEL3_BOUNCEBALL_SPEED     1000.0f
+#define LEVEL3_BOUNCEBALL_RADIUS    30
 
 #define LEVEL4_CLAW_DMG             ADM(100)