Get rid of bouncestop and bouncefactor for electro for now (not worht the fuzz) ...
authortzork <jakob_mg@hotmail.com>
Fri, 12 Nov 2010 07:39:39 +0000 (08:39 +0100)
committertzork <jakob_mg@hotmail.com>
Fri, 12 Nov 2010 07:39:39 +0000 (08:39 +0100)
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc

index e21df9972840826ae306c41a87bb4ccd8be29296..9a0792012eede4d6804b8b1a9e1a9ffecc4dec63 100644 (file)
@@ -384,8 +384,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 1
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
@@ -435,6 +433,11 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
index 2288341d551c1c221896fc2b10d403ba84afa1f1..1e72552ae0d54d01d9c24cad2e2e9f01d08d4410 100644 (file)
@@ -395,8 +395,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 70
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
@@ -446,6 +444,11 @@ set g_balance_crylink_secondary_ammo 3
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
index b5d3fcccfab4d2d057f9aa2a63cdf1f3bc9947f3..b17358db78c33622da6105166687aea151d10e3d 100644 (file)
@@ -383,8 +383,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 1
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
@@ -434,6 +432,11 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
index 4148ce0684324a51f4ccf6e304c38cffcc94ebca..7c51b370fa582fb4e12f5dc25a69faa75d8c0a6f 100644 (file)
@@ -384,8 +384,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 50
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
@@ -434,6 +432,11 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
index c9a06f8ad1e5202f7cc4012a0ba298c1170d3565..296fb4c0665d9e37a4a75fbb9e73409406bc32fc 100644 (file)
@@ -384,8 +384,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 60
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 80
@@ -435,6 +433,11 @@ set g_balance_crylink_secondary_ammo 1
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 250
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 0
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
index d00c292c55cf6c5a278727e1176e651190702d0a..702ddc68f9c7cec53185634adbe150f7ae2352d3 100644 (file)
@@ -384,8 +384,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 1
-set g_balance_electro_secondary_bouncestop 0
 set g_balance_electro_combo_damage 40
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 80
@@ -435,6 +433,11 @@ set g_balance_crylink_secondary_ammo 1
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
index 8bb1f4859b85fcbaa6697ebd9c6b47df3b219ad3..3ba4264870a96ff28beed9370b75a8c696aa676a 100644 (file)
@@ -405,8 +405,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 2
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 0.5
-set g_balance_electro_secondary_bouncestop 0.01
 
 set g_balance_electro_combo_damage 80
 set g_balance_electro_combo_edgedamage 10
@@ -441,7 +439,6 @@ set g_balance_crylink_primary_middle_fadetime 0.25
 set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
 set g_balance_crylink_primary_other_fadetime 0.25
 
-
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 2
 set g_balance_crylink_secondary_edgedamage 0
@@ -457,6 +454,11 @@ set g_balance_crylink_secondary_ammo 1
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joinspeed 0
 set g_balance_crylink_secondary_jointime 0
+set g_balance_crylink_secondary_joinexplode 0                  
+set g_balance_crylink_secondary_joinexplode_damage 0   
+set g_balance_crylink_secondary_joinexplode_edgedamage 0
+set g_balance_crylink_secondary_joinexplode_radius 0
+set g_balance_crylink_secondary_joinexplode_force 0
 set g_balance_crylink_secondary_linkexplode 0
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
index 747dc4edc728e4942d9d065e3c5be6b72e91b140..758a2577cbcd506febc055201a50049c77593551 100644 (file)
@@ -149,14 +149,29 @@ void W_Crylink_LinkJoinEffect_Think()
                if(n >= 2)
                {
 
-                       if(cvar("g_balance_crylink_primary_joinexplode"))
+                       
+                       if(e.projectiledeathtype & HITTYPE_SECONDARY)
                        {
-                               n = n / cvar("g_balance_crylink_primary_shots");
-                               RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, 
-                                                               cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, 
-                                                               cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, 
-                                                               cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other);
+                               if(cvar("g_balance_crylink_secondary_joinexplode"))
+                               {
+                                       n = n / cvar("g_balance_crylink_secondary_shots");
+                                       RadiusDamage (e, e.realowner, cvar("g_balance_crylink_secondary_joinexplode_damage") * n, 
+                                                                       cvar("g_balance_crylink_secondary_joinexplode_edgedamage") * n, 
+                                                                       cvar("g_balance_crylink_secondary_joinexplode_radius") * n, world, 
+                                                                       cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other);
+                               }                               
                        }
+                       else
+                       {
+                               if(cvar("g_balance_crylink_primary_joinexplode"))
+                               {
+                                       n = n / cvar("g_balance_crylink_primary_shots");
+                                       RadiusDamage (e, e.realowner, cvar("g_balance_crylink_primary_joinexplode_damage") * n, 
+                                                                       cvar("g_balance_crylink_primary_joinexplode_edgedamage") * n, 
+                                                                       cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, 
+                                                                       cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other);
+                               }                               
+                       }                       
                        
                        // they seem to touch...
                        // TODO make a specific particle effect for this
@@ -166,6 +181,7 @@ void W_Crylink_LinkJoinEffect_Think()
        remove(self);
 }
 
+
 // NO bounce protection, as bounces are limited!
 void W_Crylink_Touch (void)
 {
@@ -486,22 +502,27 @@ float w_crylink(float req)
                                if(self.crylink_lastgroup)
                                {
                                        vector pos;
+                                       entity linkjoineffect;
+                                       
+                                       
                                        if(self.crylink_waitrelease == 1)
                                        {
                                                pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_primary_joinspeed"), cvar("g_balance_crylink_primary_jointime"));
+                                               
                                        }
                                        else
                                        {
                                                pos = W_Crylink_LinkJoin(self.crylink_lastgroup, cvar("g_balance_crylink_secondary_joinspeed"), cvar("g_balance_crylink_secondary_jointime"));
                                        }
-
-                                       entity linkjoineffect;
+                                       
                                        linkjoineffect = spawn();
-                                       linkjoineffect.classname = "linkjoineffect";
                                        linkjoineffect.think = W_Crylink_LinkJoinEffect_Think;
+                                       linkjoineffect.classname = "linkjoineffect";                                    
                                        linkjoineffect.nextthink = time + w_crylink_linkjoin_time;
                                        linkjoineffect.owner = self;
                                        setorigin(linkjoineffect, pos);
+
+
                                }
                                self.crylink_waitrelease = 0;
                                if(!w_crylink(WR_CHECKAMMO1) && !w_crylink(WR_CHECKAMMO2))
index 1600a1c9a1fe7f8b860743d9b556a1b07f11bd06..014fc34e51d15a4a176b793d7f34f35378ea24bc 100644 (file)
@@ -178,8 +178,8 @@ void W_Electro_Attack2()
        proj.event_damage = W_Plasma_Damage;
        proj.flags = FL_PROJECTILE;
        
-       proj.bouncefactor = cvar("g_balance_electro_secondary_bouncefactor");
-       proj.bouncestop = cvar("g_balance_electro_secondary_bouncestop");
+       //proj.bouncefactor = cvar("g_balance_electro_secondary_bouncefactor");
+       //proj.bouncestop = cvar("g_balance_electro_secondary_bouncestop");
        
 #if 0
        entity p2;