Changeset 76:f4ace509735c

Timestamp:

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

Author:

mdoison

Branch:

madcat

convert_revision:

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

Message:

Add basilisk.patch (tjw 1.2)

• Improve jump magnitude
• Improve many capacities
• Remove cloud damages
• Decrease could time against armoried
• Decrease speed if clouded
• FIXME: where activate cloud against BS ?

Location:

src/game

Files:

• bg_misc.c (modified) (2 diffs)
• bg_pmove.c (modified) (1 diff)
• g_active.c (modified) (2 diffs)
• tremulous.h (modified) (5 diffs)

src/game/bg_misc.c

@@ -1713 +1713 @@
     6.0f,                                           //float   friction;
     300.0f,                                         //float   stopSpeed;
-    270.0f,                                         //float   jumpMagnitude;
+    360.0f,                                         //float   jumpMagnitude;
     1.2f,                                           //float   knockbackScale;
     { PCL_ALIEN_LEVEL2, PCL_ALIEN_LEVEL1_UPG, PCL_NONE },   //int     children[ 3 ];
@@ -1752 +1752 @@
     6.0f,                                           //float   friction;
     300.0f,                                         //float   stopSpeed;
-    270.0f,                                         //float   jumpMagnitude;
+    360.0f,                                         //float   jumpMagnitude;
     1.1f,                                           //float   knockbackScale;
     { PCL_ALIEN_LEVEL2, PCL_NONE, PCL_NONE },       //int     children[ 3 ];

src/game/bg_pmove.c

@@ -387 +387 @@
       else
         modifier *= CREEP_MODIFIER;
+    }
+    if( pm->ps->stats[ STAT_STATE ] & SS_POISONCLOUDED )
+    {
+      if( BG_InventoryContainsUpgrade( UP_LIGHTARMOUR, pm->ps->stats ) ||
+          BG_InventoryContainsUpgrade( UP_BATTLESUIT, pm->ps->stats ) )
+        modifier *= PCLOUD_ARMOUR_MODIFIER;
+      else
+        modifier *= PCLOUD_MODIFIER;
     }
   }

src/game/g_active.c

@@ -821 +821 @@
       }
     }
-
-    //client is poison clouded
-    if( client->ps.stats[ STAT_STATE ] & SS_POISONCLOUDED )
-      G_Damage( ent, client->lastPoisonCloudedClient, client->lastPoisonCloudedClient, NULL, NULL,
-                LEVEL1_PCLOUD_DMG, 0, MOD_LEVEL1_PCLOUD );
 
     //client is poisoned
@@ -1497 +1492 @@
     client->ps.stats[ STAT_STATE ] &= ~SS_BOOSTED;
 
-  if( client->ps.stats[ STAT_STATE ] & SS_POISONCLOUDED &&
-      client->lastPoisonCloudedTime + LEVEL1_PCLOUD_TIME < level.time )
-    client->ps.stats[ STAT_STATE ] &= ~SS_POISONCLOUDED;
+  if( client->ps.stats[ STAT_STATE ] & SS_POISONCLOUDED )
+  {
+    int timeLeft = LEVEL1_PCLOUD_TIME -
+      ( level.time - client->lastPoisonCloudedTime );
+ 
+    if( BG_InventoryContainsUpgrade( UP_BATTLESUIT, client->ps.stats ) )
+      timeLeft -= BSUIT_PCLOUD_PROTECTION;
+    if( BG_InventoryContainsUpgrade( UP_HELMET, client->ps.stats ) )
+      timeLeft -= HELMET_PCLOUD_PROTECTION;
+    if( BG_InventoryContainsUpgrade( UP_LIGHTARMOUR, client->ps.stats ) )
+      timeLeft -= LIGHTARMOUR_PCLOUD_PROTECTION;
+  
+    if( timeLeft <= 0 )
+      client->ps.stats[ STAT_STATE ] &= ~SS_POISONCLOUDED;
+  }
 
   if( client->ps.stats[ STAT_STATE ] & SS_POISONED &&

src/game/tremulous.h

@@ -57 +57 @@
 
 #define LEVEL1_CLAW_DMG             ADM(32)
-#define LEVEL1_CLAW_RANGE           96.0f
+#define LEVEL1_CLAW_RANGE           64.0f
 #define LEVEL1_CLAW_WIDTH           10.0f
 #define LEVEL1_CLAW_REPEAT          600
@@ -63 +63 @@
 #define LEVEL1_CLAW_K_SCALE         1.0f
 #define LEVEL1_CLAW_U_K_SCALE       1.0f
-#define LEVEL1_GRAB_RANGE           64.0f
-#define LEVEL1_GRAB_TIME            300
-#define LEVEL1_GRAB_U_TIME          450
+#define LEVEL1_GRAB_RANGE           96.0f
+#define LEVEL1_GRAB_TIME            400
+#define LEVEL1_GRAB_U_TIME          600
 #define LEVEL1_PCLOUD_DMG           ADM(4)
-#define LEVEL1_PCLOUD_RANGE         200.0f
-#define LEVEL1_PCLOUD_REPEAT        2000
+#define LEVEL1_PCLOUD_RANGE         150.0f
+#define LEVEL1_PCLOUD_REPEAT        2500
 #define LEVEL1_PCLOUD_TIME          10000
+#define LEVEL1_REGEN_MOD            2.0f
+#define LEVEL1_UPG_REGEN_MOD        3.0f
 
 #define LEVEL2_CLAW_DMG             ADM(40)
@@ -223 +225 @@
 #define CREEP_SCALEDOWN_TIME        3000
 
+#define PCLOUD_MODIFIER             0.5f
+#define PCLOUD_ARMOUR_MODIFIER      0.75f
+
 #define ASPAWN_BP                   10
 #define ASPAWN_BT                   15000
@@ -454 +459 @@
 
 #define LIGHTARMOUR_PRICE           70
+#define LIGHTARMOUR_PCLOUD_PROTECTION 1000
 
 #define HELMET_PRICE                90
 #define HELMET_RANGE                1000.0f
+#define HELMET_PCLOUD_PROTECTION    1000
 
 #define MEDKIT_PRICE                0
@@ -470 +477 @@
 
 #define BSUIT_PRICE                 400
+#define BSUIT_PCLOUD_PROTECTION     3000 
 
 #define MGCLIP_PRICE                0