make aura match cross colour, add a faint aura to resurrected hogs. basically mucking about w/ burp's weapon again.
authornemo
Sat, 30 Oct 2010 21:39:50 -0400
changeset 4036 69e535a0e43a
parent 4035 3ed9573bcf5e
child 4037 0f8ec120e90d
make aura match cross colour, add a faint aura to resurrected hogs. basically mucking about w/ burp's weapon again.
hedgewars/GSHandlers.inc
hedgewars/GearDrawing.inc
hedgewars/uConsts.pas
--- a/hedgewars/GSHandlers.inc	Sat Oct 30 21:06:55 2010 -0400
+++ b/hedgewars/GSHandlers.inc	Sat Oct 30 21:39:50 2010 -0400
@@ -4149,6 +4149,7 @@
                 DeleteGear(graves[i]);
                 RenderHealth(PHedgehog(resgear^.Hedgehog)^);
                 RecountTeamHealth(Phedgehog(resgear^.Hedgehog)^.Team);
+                PHedgehog(resgear^.Hedgehog)^.Effects[heResurrected]:= true;
                 if PHedgehog(resgear^.Hedgehog)^.Hat = 'NoHat' then
                     begin
                     FreeTexture(PHedgehog(resgear^.Hedgehog)^.HatTex);
--- a/hedgewars/GearDrawing.inc	Sat Oct 30 21:06:55 2010 -0400
+++ b/hedgewars/GearDrawing.inc	Sat Oct 30 21:39:50 2010 -0400
@@ -283,7 +283,7 @@
                 DrawRotated(sprCross, hwRound(CurAmmoGear^.X) + WorldDx,
                         hwRound(CurAmmoGear^.Y) + WorldDy + (CurAmmoGear^.Power), 0, 0);
                 defaultPos := false;
-                Tint($33, $33, $FF, max($00, floor($C0 * abs(1 - (GameTicks mod 6000) / 3000))));
+                Tint($f5, $db, $35, max($00, floor($C0 * abs(1 - (GameTicks mod 6000) / 3000))));
                 DrawTexture(sx - 108, sy - 108 + (CurAmmoGear^.Power),
                         SpritesData[sprVampiric].Texture, 4.5);
                 Tint($FF, $FF, $FF, $FF);
@@ -670,6 +670,11 @@
     Tint($00, $FF, $40, $80);
     DrawRotatedTextureF(SpritesData[sprSmokeWhite].texture, 1.5, 0, 0, sx, sy, 0, 1, 22, 22, 360 - (RealTicks shr 37) mod 360);
     end;
+if HH^.Effects[heResurrected] then
+    begin
+    Tint($f5, $db, $35, $20);
+    DrawSprite(sprVampiric, sx - 24, sy - 24, 0);
+    end;
 
 if Gear^.Invulnerable then
     begin
@@ -728,7 +733,7 @@
                     if Gear^.Health > 0 then
                         begin
                         //Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod (6000 div Gear^.Health)) / 750))));
-                        Tint($33, $33, $FF, max($40, floor($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health)))));
+                        Tint($f5, $db, $35, max($40, floor($FF * abs(1 - (GameTicks mod 1500) / (750 + Gear^.Health)))));
                         //Tint($FF, $FF, $FF, max($40, floor($FF * abs(1 - (RealTicks mod 1500) / 750))));
                         DrawSprite(sprVampiric, x - 24, y - 24, 0);
                         Tint($FF, $FF, $FF, $FF)
--- a/hedgewars/uConsts.pas	Sat Oct 30 21:06:55 2010 -0400
+++ b/hedgewars/uConsts.pas	Sat Oct 30 21:39:50 2010 -0400
@@ -187,7 +187,7 @@
             PrevTexture, NextTexture: PTexture;
             end;
 
-    THogEffect = (heInvulnerable, heResurrectable, hePoisoned);
+    THogEffect = (heInvulnerable, heResurrectable, hePoisoned, heResurrected);
 
     TScreenFade = (sfNone, sfInit, sfToBlack, sfFromBlack, sfToWhite, sfFromWhite);
 const