Merge remote-tracking branch 'medo/B2.3' into 2.4

Medo42 · Jul 5, 2011 · 03b0cce · 03b0cce
2 parents 1532221 + b3a63a9
commit 03b0cce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml b/Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml
@@ -87,20 +87,20 @@ if ((pressedKeys &amp; $08) &amp;&amp; canCloak &amp;&amp; ((cloakAlpha &lt;= 0.
 
 switch(moveStatus) // moveStatus is reset in collision with obstacles (including doors if they reject you)
 {
-case 1: //If I am rocketing myself
+case 1: //If I am rocketing/mining myself
     controlFactor = 0.65;
     frictionFactor = 1;
     break;
-case 2: //If I am rocketing an enemy
+case 2: //If I am rocketing/mining an enemy
     controlFactor = 0.45;
     frictionFactor = 1.05;
     break;
 case 3: //Airblast
-    controlFactor = 0.3;
-    frictionFactor = 1;
+    controlFactor = 0.35;
+    frictionFactor = 1.05;
     break;
-case 4: //If I am rocketing a teamate/mining someone (more control than 2)
-    controlFactor = 0.85;
+case 4: //If I am rocketing/mining a teamate
+    controlFactor = baseControl;
     frictionFactor = 1;
     break;
 default:
@@ -152,9 +152,11 @@ if(!taunting &amp;&amp; !omnomnomnom)
     if((keyState|pressedKeys) &amp; $20 and hspeed &lt; runPower * controlFactor / (baseFriction - 1))
         hspeed += runPower*controlFactor;
 }
-if(abs(hspeed) &gt; abs(1 * baseControl / (baseFriction - 1))*2)// divide friction as normal if going way too fast, based on normal max speed
+//divide friction as normal if going way too fast, or controlling motion, based on normal max speed
+if(abs(hspeed) &gt; abs(baseControl / (baseFriction - 1) * 2) or
+   ((keyState|pressedKeys) &amp; $60 and !(abs(hspeed) &gt; abs(baseControl / (baseFriction - 1)))) )
     hspeed /= baseFriction;
-else // otherwise divide by the moveStatus's friction
+else //otherwise divide by the moveStatus's friction
     hspeed /= frictionFactor;
 
 

diff --git a/Source/gg2/Objects/Projectiles/Mine.events/Create.xml b/Source/gg2/Objects/Projectiles/Mine.events/Create.xml
@@ -22,6 +22,7 @@
     exploded = false;
     bubbled = false;
     reflector = noone;
+    knockback = 10;
 }
 </argument>
       </arguments>

diff --git a/Source/gg2/Objects/Projectiles/Mine.events/User Event 2.xml b/Source/gg2/Objects/Projectiles/Mine.events/User Event 2.xml
@@ -28,7 +28,7 @@
             var rdir, vectorfactor;
             rdir = point_direction(other.x,other.y,x,y);
             vectorfactor = point_distance(0, 0, power(sin(degtorad(rdir)), 2), power(cos(degtorad(rdir)), 2));
-            motion_add(rdir, min(15, 10-10*(distance_to_object(other)/other.blastRadius)) * vectorfactor);
+            motion_add(rdir, min(15, other.knockback-other.knockback*(distance_to_object(other)/other.blastRadius)) * vectorfactor);
             if(other.team != team or id==other.ownerPlayer.object) &amp;&amp; !ubered and hp &gt; 0
             {
                 hp -= other.explosionDamage*(1-(distance_to_object(other)/other.blastRadius));
@@ -62,11 +62,16 @@
                         blood.direction = point_direction(other.x,other.y,x,y)-180;
                     }
                 }
-                if (id==other.ownerPlayer.object and other.team == team)
+                if (id==other.ownerPlayer.object)
                 {
                     moveStatus = 1;
                     vspeed*=0.8;
                 }
+                else if (other.team == team)
+                {
+                    moveStatus = 2;
+                    vspeed*=0.8;
+                }
                 else
                 {
                     moveStatus = 4;