hedgewars-draft: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:6e8b807bda4b
+:ba39a1d396c0
 procedure DrawGears;
 procedure DrawGearsTimers;
 procedure FreeGearsList;
 procedure AddMiscGears;
 procedure AssignHHCoords;
+procedure StartSuddenDeath;
 function  GearByUID(uid : Longword) : PGear;
 function  IsClockRunning() : boolean;
 implementation
 uses uStore, uSound, uTeams, uRandom, uIO, uLandGraphics,
 var skipFlag: boolean;
 var delay: LongWord;
 delay2: LongWord;
-step: (stDelay, stChDmg, stSweep, stTurnReact,
+step: (stInit, stDelay, stChDmg, stSweep, stTurnReact,
 stAfterDelay, stChWin, stWater, stChWin2, stHealth,
 stSpawn, stNTurn);
 NewTurnTick: LongWord;
 //SDMusic: shortstring;
 begin
 inc(tmp, ModifyDamage(Gear^.Hedgehog^.Effects[hePoisoned], Gear));
 if (GameFlags and gfResetHealth) <> 0 then
 dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
 end;
+// Apply SD health decrease as soon as SD starts
 if (TotalRounds > cSuddenDTurns - 1) then
 begin
 inc(tmp, cHealthDecrease);
 if (GameFlags and gfResetHealth) <> 0 then
 dec(Gear^.Hedgehog^.InitialHealth, cHealthDecrease)
 dec(Gear^.Hedgehog^.InitialHealth, 5)
 end
 end;
 if tmp > 0 then
 begin
-inc(Gear^.Damage, min(tmp, max(0,Gear^.Health - 1 - Gear^.Damage)));
+// SD damage never reduces health below 1
-HHHurt(Gear^.Hedgehog, dsPoison);
+tmp:= min(tmp, max(0, Gear^.Health - 1 - Gear^.Damage));
+inc(Gear^.Damage, tmp);
+if tmp > 0 then
+// Make hedgehog moan on damage
+HHHurt(Gear^.Hedgehog, dsPoison);
 end
 end;
 Gear:= Gear^.NextGear
 end;
 if stirFallers then
 begin
 t := GearsList;
 while t <> nil do
 begin
-if t^.Kind = gtGenericFaller then
+if (t^.Kind = gtGenericFaller) and (t^.Tag = 1) then
 begin
 t^.Active:= true;
 t^.X:=  int2hwFloat(GetRandom(rightX-leftX)+leftX);
 t^.Y:=  int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
 t^.dX:= _90-(GetRandomf*_360);
 curHandledGear:= nil;
 if AllInactive then
 case step of
+stInit:
+begin
+if (not bBetweenTurns) and (not isInMultiShoot) then
+ScriptCall('onEndTurn');
+inc(step)
+end;
 stDelay:
 begin
 if delay = 0 then
 delay:= cInactDelay
 else
 inc(step)
 end;
 stWater:
 if (not bBetweenTurns) and (not isInMultiShoot) then
 begin
+// Start Sudden Death water rise in the 2nd round of Sudden Death
 if TotalRounds = cSuddenDTurns + 1 then
 bWaterRising:= true;
 if bWaterRising and (cWaterRise > 0) then
 AddGear(0, 0, gtWaterUp, 0, _0, _0, 0)^.Tag:= cWaterRise;
 inc(step)
 stHealth:
 begin
 if (cWaterRise <> 0) or (cHealthDecrease <> 0) then
 begin
 if (TotalRounds = cSuddenDTurns) and (not SuddenDeath) and (not isInMultiShoot) then
-begin
+StartSuddenDeath()
-SuddenDeath:= true;
-if cHealthDecrease <> 0 then
-begin
-SuddenDeathDmg:= true;
-// flash
-ScreenFade:= sfFromWhite;
-ScreenFadeValue:= sfMax;
-ScreenFadeSpeed:= 1;
-ChangeToSDClouds;
-ChangeToSDFlakes;
-SetSkyColor(SDSkyColor.r * (SDTint.r/255) / 255, SDSkyColor.g * (SDTint.r/255) / 255, SDSkyColor.b * (SDTint.b/255) / 255);
-Ammoz[amTardis].SkipTurns:= 9999;
-Ammoz[amTardis].Probability:= 0;
-end;
-AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
-ScriptCall('onSuddenDeath');
-playSound(sndSuddenDeath);
-StopMusic;
-if SDMusicFN <> '' then PlayMusic
-end
 else if (TotalRounds < cSuddenDTurns) and (not isInMultiShoot) then
 begin
 i:= cSuddenDTurns - TotalRounds;
 s:= ansistring(inttostr(i));
 if i = 1 then
 begin
 cLaserSighting:= false;
 cLaserSightingSniper:= false
 end;
-if (GameFlags and gfArtillery) = 0 then
-cArtillery:= false;
 // have to sweep *all* current team hedgehogs since it is theoretically possible if you have enough invulnerabilities and switch turns to make your entire team invulnerable
 if (CurrentTeam <> nil) then
 with CurrentTeam^ do
 for i:= 0 to cMaxHHIndex do
 with Hedgehogs[i] do
 if (Gear <> nil) then
 begin
 if (GameFlags and gfInvulnerable) = 0 then
 Gear^.Hedgehog^.Effects[heInvulnerable]:= 0;
+if (Gear^.Hedgehog^.Effects[heArtillery] = 2) then
+Gear^.Hedgehog^.Effects[heArtillery]:= 0;
 end;
 end;
 t:= GearsList;
 while t <> nil do
 begin
 t^.PortalCounter:= 0;
 if ((GameFlags and gfResetHealth) <> 0) and (t^.Kind = gtHedgehog) and (t^.Health < t^.Hedgehog^.InitialHealth) then
 begin
+i:= t^.Hedgehog^.InitialHealth - t^.Health;
 t^.Health:= t^.Hedgehog^.InitialHealth;
+if i > 0 then
+HHHeal(t^.Hedgehog, i, false, $00FF0040);
 RenderHealth(t^.Hedgehog^);
 end;
 t:= t^.NextGear
 end;
 Effects[heInvulnerable]:= 1;
 if (GameFlags and gfLaserSight) <> 0 then
 cLaserSighting:= true;
-if (GameFlags and gfArtillery) <> 0 then
-cArtillery:= true;
 for i:= (LAND_WIDTH*LAND_HEIGHT) div 524288+2 downto 0 do
 begin
 rx:= GetRandom(rightX-leftX)+leftX;
 ry:= GetRandom(LAND_HEIGHT-topY)+topY;
 rdx:= _90-(GetRandomf*_360);
 rdy:= _90-(GetRandomf*_360);
-AddGear(rx, ry, gtGenericFaller, gstInvisible, rdx, rdy, $FFFFFFFF);
+Gear:= AddGear(rx, ry, gtGenericFaller, gstInvisible, rdx, rdy, $FFFFFFFF);
+// Tag=1: This allows this generic faller to be displaced randomly by events
+Gear^.Tag:= 1;
 end;
 snowRight:= max(LAND_WIDTH,4096)+512;
 snowLeft:= -(snowRight-LAND_WIDTH);
 FindPlace(FollowGear, true, 0, LAND_WIDTH);
 SpawnFakeCrateAt := FollowGear;
 end;
+procedure StartSuddenDeath();
+begin
+if SuddenDeath then
+exit;
+SuddenDeath:= true;
+SuddenDeathActive:= true;
+// Special effects (only w/ health decrease)
+if cHealthDecrease <> 0 then
+begin
+SuddenDeathDmg:= true;
+// White screen flash
+ScreenFade:= sfFromWhite;
+ScreenFadeValue:= sfMax;
+ScreenFadeSpeed:= 1;
+// Clouds, flakes, sky tint
+ChangeToSDClouds;
+ChangeToSDFlakes;
+SetSkyColor(SDSkyColor.r * (SDTint.r/255) / 255, SDSkyColor.g * (SDTint.g/255) / 255, SDSkyColor.b * (SDTint.b/255) / 255);
+end;
+// Disable tardis
+Ammoz[amTardis].SkipTurns:= 9999;
+Ammoz[amTardis].Probability:= 0;
+AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
+ScriptCall('onSuddenDeath');
+playSound(sndSuddenDeath);
+StopMusic;
+if SDMusicFN <> '' then
+PlayMusic
+end;
 function GearByUID(uid : Longword) : PGear;
 var gear: PGear;
 begin
 GearByUID:= nil;
 begin
 s:= s; // avoid compiler hint
 if not isExternalSource then
 SendIPC(_S',');
 uStats.Skipped;
-skipFlag:= true
+skipFlag:= true;
+ScriptCall('onSkipTurn');
 end;
 procedure chHogSay(var s: shortstring);
 var Gear: PVisualGear;
 text: shortstring;
 @doStepTardis,
 @doStepIceGun,
 @doStepAddAmmo,
 @doStepGenericFaller,
 @doStepKnife,
-@doStepDuck);
+@doStepDuck,
+@doStepMinigun,
+@doStepMinigunBullet);
 begin
 doStepHandlers:= handlers;
 RegisterVariable('skip', @chSkip, false);
 RegisterVariable('hogsay', @chHogSay, true );

branch	ios-develop
changeset 13413	ba39a1d396c0
parent 13345	e54d6db06f35
child 13569	7d2e2a5d4bff