hedgewars: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:73b0bcc4396d
+:7845c77c8d31
 			Tex: PTexture;
 			Z: Longword;
 			IntersectGear: PGear;
 			TriggerId: Longword;
 			uid: Longword;
+Text: shortstring;
 			end;
 function  AddGear(X, Y: LongInt; Kind: TGearType; State: Longword; dX, dY: hwFloat; Timer: LongWord): PGear;
 procedure ProcessGears;
 procedure ResetUtilities;
+procedure ApplyDamage(Gear: PGear; Damage: Longword);
 procedure SetAllToActive;
 procedure SetAllHHToActive;
 procedure DrawGears;
 procedure FreeGearsList;
 procedure AddMiscGears;
 procedure RemoveGearFromList(Gear: PGear);
 var CurAmmoGear: PGear = nil;
 GearsList: PGear = nil;
 KilledHHs: Longword = 0;
+SuddenDeathDmg: Boolean = false;
+SpeechType: Longword = 1;
+SpeechText: shortstring;
 implementation
 uses uWorld, uMisc, uStore, uConsole, uSound, uTeams, uRandom, uCollisions,
 	uLand, uIO, uLandGraphics, uAIMisc, uLocale, uAI, uAmmos, uTriggers,
 {$IFDEF IPHONE}
 			@doStepSmokeTrace,
 			@doStepWaterUp,
 			@doStepDrill,
 			@doStepBallgun,
 			@doStepBomb,
-			@doStepRCPlane
+			@doStepRCPlane,
+			@doStepSpeechBubble
 			);
 procedure InsertGearToList(Gear: PGear);
 var tmp, ptmp: PGear;
 begin
 gtAmmo_Grenade: begin
 Result^.Radius:= 4;
 end;
 gtHealthTag: begin
 Result^.Timer:= 1500;
-Result^.Z:= 2001;
+Result^.Z:= 2002;
+end;
+gtSpeechBubble: begin
+Result^.Z:= 2003;
 end;
 gtGrave: begin
 Result^.Radius:= 10;
 Result^.Elasticity:= _0_6;
 end;
 	if Gear^.Kind = gtHedgehog then
 		begin
 		if (Gear^.Damage <> 0) and
 		(not Gear^.Invulnerable) then
 			begin
-if (PHedgehog(Gear^.Hedgehog)^.Team = CurrentTeam) and
-(Gear^.Damage <> int(cHealthDecrease)) then
-Gear^.State:= Gear^.State or gstLoser;
 			CheckNoDamage:= false;
 			uStats.HedgehogDamaged(Gear);
 			dmg:= Gear^.Damage;
 			if Gear^.Health < dmg then
 				Gear^.Health:= 0
 			else
 				dec(Gear^.Health, dmg);
+if (PHedgehog(Gear^.Hedgehog)^.Team = CurrentTeam) and
+not SuddenDeathDmg then
+Gear^.State:= Gear^.State or gstLoser;
 			AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) - cHHRadius - 12,
 					gtHealthTag, dmg, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
 			RenderHealth(PHedgehog(Gear^.Hedgehog)^);
 			RecountTeamHealth(PHedgehog(Gear^.Hedgehog)^.Team);
 			end;
 		Gear^.Damage:= 0;
 		end;
 	Gear:= Gear^.NextGear
 	end;
+SuddenDeathDmg:= false;
 end;
 procedure HealthMachine;
 var Gear: PGear;
 begin
 				or isInMultiShoot
 				or (TotalRounds = 0) then inc(step)
 			else begin
 				bBetweenTurns:= true;
 				HealthMachine;
+SuddenDeathDmg:= true;
 				step:= stChDmg
 				end
 			end;
 	stSpawn: begin
 			if not isInMultiShoot then SpawnBoxOfSmth;
 //Purpose, to reset all transient attributes toggled by a utility.
 //If any of these are set as permanent toggles in the frontend, that needs to be checked and skipped here.
 procedure ResetUtilities;
 var  i: LongInt;
 begin
+SpeechText:= ''; // in case it hasn't been consumed
 if (GameFlags and gfLowGravity) = 0 then
 cGravity:= cMaxWindSpeed;
+if (GameFlags and gfVampiric) = 0 then
+cVampiric:= false;
 cDamageModifier:= _1;
 if (GameFlags and gfLaserSight) = 0 then
 cLaserSighting:= false;
 with CurrentTeam^ do
 for i:= 0 to cMaxHHIndex do
 with Hedgehogs[i] do
 if (Gear <> nil) then
 Gear^.Invulnerable:= false;
+end;
+procedure ApplyDamage(Gear: PGear; Damage: Longword);
+var s: shortstring;
+vampDmg: Longword;
+begin
+	inc(Gear^.Damage, Damage);
+	if Gear^.Kind = gtHedgehog then
+begin
+	AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), Damage, PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.Color);
+Damage:= min(Damage, Gear^.Health);
+if (Gear <> CurrentHedgehog^.Gear) and (CurrentHedgehog^.Gear <> nil) and (Damage >= 1) then
+begin
+if cVampiric then
+begin
+vampDmg:= hwRound(int2hwFloat(Damage)*_0_8);
+// was considering pulsing on attack, Tiy thinks it should be permanent while in play
+//CurrentHedgehog^.Gear^.State:= CurrentHedgehog^.Gear^.State or gstVampiric;
+inc(CurrentHedgehog^.Gear^.Health,vampDmg);
+str(vampDmg, s);
+s:= '+' + s;
+AddCaption(s, CurrentHedgehog^.Team^.Clan^.Color, capgrpAmmoinfo);
+RenderHealth(CurrentHedgehog^);
+RecountTeamHealth(CurrentHedgehog^.Team);
+end;
+if ((GameFlags and gfKarma) <> 0) and
+((GameFlags and gfInvulnerable) = 0) and
+not CurrentHedgehog^.Gear^.Invulnerable then
+begin // this cannot just use Damage or it interrupts shotgun and gets you called stupid
+if CurrentHedgehog^.Gear^.Health < int(Damage) then
+begin
+// Add damage to trigger normal resolution
+CurrentHedgehog^.Gear^.Health := 0;
+inc(CurrentHedgehog^.Gear^.Damage);
+end
+else
+dec(CurrentHedgehog^.Gear^.Health, Damage);
+AddGear(hwRound(Gear^.X),
+hwRound(Gear^.Y),
+gtHealthTag, Damage, _0, _0, 0)^.Hedgehog:= CurrentHedgehog;
+RenderHealth(CurrentHedgehog^);
+RecountTeamHealth(CurrentHedgehog^.Team);
+end;
+end;
+end;
 end;
 procedure SetAllToActive;
 var t: PGear;
 begin
 		DrawHedgehog(sx, sy,
 			hwSign(Gear^.dX),
 			1,
 			1,
 			0);
+	HatVisible:= true;
 	defaultPos:= false
 	end else
 	if (Gear^.Message and (gm_Left or gm_Right) <> 0) and (not isCursorVisible) then
 		begin
 		defaultPos:= false
 	end
 end else // not gstHHDriven
 	begin
 	if (Gear^.Damage > 0)
-	and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003) then
+	and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003)
+// ARTILLERY
+//and (1=0)
+then
 		begin
 		DrawHedgehog(sx, sy,
 			hwSign(Gear^.dX),
 			2,
 			1,
 					end
 			end
 	end;
 if Gear^.Invulnerable then
 begin
 DrawSprite(sprInvulnerable, sx - 24, sy - 24, 0);
 end;
+if cVampiric and
+(CurrentHedgehog^.Gear <> nil) and
+(CurrentHedgehog^.Gear = Gear) then
+begin
+DrawSprite(sprVampiric, sx - 24, sy - 24, 0);
+end;
 end;
 procedure DrawGears;
 var Gear, HHGear: PGear;
 i: Longword;
 gtHedgehog: DrawHH(Gear);
 gtAmmo_Grenade: DrawRotated(sprGrenade, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
 gtHealthTag: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
+gtSpeechBubble: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
 gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
 gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);
 		end;
 if (GameFlags and gfLowGravity) <> 0 then
 cGravity:= cMaxWindSpeed / 2;
+if (GameFlags and gfVampiric) <> 0 then
+cVampiric:= true;
 Gear:= GearsList;
 if (GameFlags and gfInvulnerable) <> 0 then
 while Gear <> nil do
 begin
 Gear^.Invulnerable:= true;  // this is only checked on hogs right now, so no need for gear type check
 				gtFlame: begin
 						//{$IFDEF DEBUGFILE}AddFileLog('Damage: ' + inttostr(dmg));{$ENDIF}
 						if (Mask and EXPLNoDamage) = 0 then
 							begin
 							if not Gear^.Invulnerable then
-								begin
+ApplyDamage(Gear, dmg)
-							    inc(Gear^.Damage, dmg);
-							    if Gear^.Kind = gtHedgehog then
-								    AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.Color);
-end
 else
 Gear^.State:= Gear^.State or gstWinner;
 							end;
 						if ((Mask and EXPLDoNotTouchHH) = 0) or (Gear^.Kind <> gtHedgehog) then
 							begin
 		gtHedgehog,
 			gtMine,
 			gtCase,
 			gtTarget: begin
 if (not t^.Invulnerable) then
-begin
+ApplyDamage(t, dmg)
-					    inc(t^.Damage, dmg);
-					    if t^.Kind = gtHedgehog then
-						    AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, PHedgehog(t^.Hedgehog)^.Team^.Clan^.Color);
-end
 else
 Gear^.State:= Gear^.State or gstWinner;
 					DeleteCI(t);
 					t^.dX:= t^.dX + Gear^.dX * dmg * _0_01 + SignAs(cHHKick, Gear^.dX);
 			gtMine,
 			gtTarget,
 			gtCase: begin
 					if (Ammo^.Kind = gtDrill) then begin Ammo^.Timer:= 0; exit; end;
 if (not t^.ar[i]^.Invulnerable) then
-begin
+ApplyDamage(t^.ar[i], Damage)
-					    inc(t^.ar[i]^.Damage, Damage);
-if (t^.ar[i]^.Kind = gtHedgehog) and (Damage > 0) then
-AddDamageTag(hwRound(t^.ar[i]^.X), hwRound(t^.ar[i]^.Y), Damage, PHedgehog(t^.ar[i]^.Hedgehog)^.Team^.Clan^.Color);
-end
 else
 t^.ar[i]^.State:= t^.ar[i]^.State or gstWinner;
 					DeleteCI(t^.ar[i]);
 					t^.ar[i]^.dX:= Ammo^.dX * Power * _0_01;
 while t <> nil do
 	begin
 	if (t^.Kind = gtHedgehog) and (t^.Y < Ammo^.Y) then
 		if not (hwSqr(Ammo^.X - t^.X) + hwSqr(Ammo^.Y - t^.Y - int2hwFloat(cHHRadius)) * 2 > _2) then
 			begin
-			inc(t^.Damage, 5);
+ApplyDamage(t, 5);
 			t^.dX:= t^.dX + (t^.X - Ammo^.X) * _0_02;
 			t^.dY:= - _0_25;
 			t^.Active:= true;
 			DeleteCI(t);
 			FollowGear:= t
 (CountGears(gtCase) >= 5) or
 (getrandom(cCaseFactor) <> 0) then exit;
 FollowGear:= nil;
-t:= getrandom(20);  // TEMPORARY  REMOVE WHEN CRATE PROBABILITY IS ADDED
+if shoppa then  // TEMPORARY  REMOVE WHEN CRATE PROBABILITY IS ADDED
-if shoppa then
 t:= 7
 else
 t:= getrandom(20);
 //case getrandom(20) of

changeset 2017	7845c77c8d31
parent 2005	aa79f631711b
child 2020	f8cd566204ef