hedgewars: comparison hedgewars/uGearsHedgehog.pas

equal deleted inserted replaced

-:8054d9d775fd
+:2759212a27de
 {$INCLUDE "options.inc"}
 unit uGearsHedgehog;
 interface
-uses uTypes;
+uses uTypes, uGearsHandlersMess;
 procedure doStepHedgehog(Gear: PGear);
 procedure AfterAttack;
 procedure HedgehogStep(Gear: PGear);
 procedure doStepHedgehogMoving(Gear: PGear);
 implementation
 uses uConsts, uVariables, uFloat, uAmmos, uSound, uCaptions,
 uCommands, uLocale, uUtils, uStats, uIO, uScript,
 uGearsList, uCollisions, uRandom, uStore, uTeams,
-uGearsUtils, uVisualGearsList;
+uGearsUtils, uVisualGearsList, uChat;
 var GHStepTicks: LongWord = 0;
+procedure AFKSkip;
+var
+t: byte;
+begin
+t:= 0;
+while (TeamsArray[t] <> CurrentTeam) do inc(t);
+SendHogSpeech(#1 + char(t) + 'AFK');
+ParseCommand('/skip', true)
+end;
 // Shouldn't more of this ammo switching stuff be moved to uAmmos ?
 function ChangeAmmo(HHGear: PGear): boolean;
 var slot, i: Longword;
 ammoidx: LongInt;
 with HHGear^.Hedgehog^ do
 begin
 HHGear^.Message:= HHGear^.Message and (not gmSlot);
 prevAmmo:= CurAmmoType;
 ammoidx:= 0;
-if ((HHGear^.State and (gstAttacking or gstAttacked)) <> 0)
+if (((HHGear^.State and (gstAttacking or gstAttacked)) <> 0) and (GameFlags and gfInfAttack = 0))
 or ((HHGear^.State and gstHHDriven) = 0) then
 exit;
 ChangeAmmo:= true;
 while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do
 LoadHedgehogHat(HHGear^.Hedgehog^, 'Reserved/chef')
 else if prevAmmo = amKnife then
 LoadHedgehogHat(HHGear^.Hedgehog^, Hat);
 end;
 // Try again in the next slot
-if CurAmmoType = prevAmmo then
+if (CurAmmoType = prevAmmo) and (slot < cMaxSlotIndex) then
 begin
-if slot >= cMaxSlotIndex then slot:= 0 else inc(slot);
+inc(slot);
 HHGear^.MsgParam:= slot;
 ChangeAmmo(HHGear)
 end
 end
 end;
 procedure HHSetWeapon(HHGear: PGear);
 var t: LongInt;
 weap: TAmmoType;
 Hedgehog: PHedgehog;
 s: boolean;
+prevState, newState: LongWord;
 begin
 s:= false;
 weap:= TAmmoType(HHGear^.MsgParam);
 Hedgehog:= HHGear^.Hedgehog;
 t:= cMaxSlotAmmoIndex;
 HHGear^.Message:= HHGear^.Message and (not gmWeapon);
+prevState:= HHGear^.State;
+newState:= prevState;
 with Hedgehog^ do
 while (CurAmmoType <> weap) and (t >= 0) do
 begin
 s:= ChangeAmmo(HHGear);
+if HHGear^.State <> prevState then // so we can keep gstAttacked out of consideration when looping
+newState:= HHGear^.State;
+HHGear^.State:= prevState;
 dec(t)
 end;
+HHGear^.State:= newState;
 if s then
 ApplyAmmoChanges(HHGear^.Hedgehog^)
 end;
 amMineStrike: newGear:= AddGear(CurWeapon^.Pos, 0, gtAirAttack, 1, _0, _0, 0);
 amDrillStrike: newGear:= AddGear(CurWeapon^.Pos, 0, gtAirAttack, 3, _0, _0, CurWeapon^.Timer);
 amNapalm: newGear:= AddGear(CurWeapon^.Pos, 0, gtAirAttack, 2, _0, _0, 0);
 amBlowTorch: newGear:= AddGear(hwRound(lx), hwRound(ly), gtBlowTorch, 0, SignAs(_0_5, dX), _0, 0);
 amGirder: newGear:= AddGear(0, 0, gtGirder, CurWeapon^.Pos, _0, _0, 0);
+amRubber: begin
+newGear:= AddGear(0, 0, gtGirder, CurWeapon^.Pos, _0, _0, 0);
+newGear^.AmmoType:= amRubber
+end;
 amTeleport: newGear:= AddGear(CurWeapon^.Pos, 0, gtTeleport, 0, _0, _0, 0);
 amSwitch: newGear:= AddGear(hwRound(lx), hwRound(ly), gtSwitcher, 0, _0, _0, 0);
 amMortar: begin
 playSound(sndMortar);
 newGear:= AddGear(hwRound(lx), hwRound(ly), gtMortar,  0, xx*cMaxPower/cPowerDivisor, yy*cMaxPower/cPowerDivisor, 0);
 end;
 amExtraDamage: begin
 PlaySound(sndHellishImpact4);
 cDamageModifier:= _1_5
 end;
-amInvulnerable: Invulnerable:= true;
+amInvulnerable: Effects[heInvulnerable]:= 1;
 amExtraTime: begin
 PlaySound(sndSwitchHog);
 TurnTimeLeft:= TurnTimeLeft + 30000
 end;
 amLaserSight: cLaserSighting:= true;
 amResurrector: begin
 newGear:= AddGear(hwRound(lx), hwRound(ly), gtResurrector, 0, _0, _0, 0);
 newGear^.SoundChannel := LoopSound(sndResurrector);
 end;
 //amStructure: newGear:= AddGear(hwRound(lx) + hwSign(dX) * 7, hwRound(ly), gtStructure, gstWait, SignAs(_0_02, dX), _0, 3000);
-amTardis: newGear:= AddGear(hwRound(X), hwRound(Y), gtTardis, 0, _0, _0, 5000);
+amTardis: newGear:= AddGear(hwRound(X), hwRound(Y), gtTardis, 0, _0, _0, 0);
 amIceGun: newGear:= AddGear(hwRound(X), hwRound(Y), gtIceGun, 0, _0, _0, 0);
 end;
 if altUse and (newGear <> nil) and
 ((CurAmmoGear = nil) or (CurAmmoGear^.AmmoType <> amJetpack) or (Gear^.Message and gmPrecise = 0)) then
 begin
 amSeduction, amBallgun,
 amJetpack, amBirdy,
 amFlamethrower, amLandGun,
 amResurrector, //amStructure,
 amTardis, amPiano,
-amIceGun: CurAmmoGear:= newGear;
+amIceGun, amRubber: CurAmmoGear:= newGear;
 end;
 if ((CurAmmoType = amMine) or (CurAmmoType = amSMine)) and (GameFlags and gfInfAttack <> 0) then
 newGear^.FlightTime:= GameTicks + 1000
 else if CurAmmoType = amDrill then
 if ((Gear^.Message and gmLJump ) <> 0) then
 begin
 Gear^.Message:= Gear^.Message and (not gmLJump);
 DeleteCI(Gear);
 if TestCollisionYwithGear(Gear, -1) = 0 then
-if not TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) then
+if TestCollisionXwithXYShift(Gear, _0, -2, hwSign(Gear^.dX)) = 0 then
 Gear^.Y:= Gear^.Y - _2
 else
-if not TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) then
+if TestCollisionXwithXYShift(Gear, _0, -1, hwSign(Gear^.dX)) = 0 then
 Gear^.Y:= Gear^.Y - _1;
-if not (TestCollisionXwithGear(Gear, hwSign(Gear^.dX))
+if (TestCollisionXwithGear(Gear, hwSign(Gear^.dX)) = 0) and
-or   (TestCollisionYwithGear(Gear, -1) <> 0)) then
+(TestCollisionYwithGear(Gear, -1) = 0) then
 begin
 Gear^.dY:= -_0_15;
 if not cArtillery then
 Gear^.dX:= SignAs(_0_15, Gear^.dX);
 Gear^.State:= Gear^.State or gstMoving or gstHHJumping;
 Gear^.dY:= _0;
 Gear^.dX:= _0;
 Gear^.State:= Gear^.State and (not gstMoving);
 exit
 end;
-isFalling:= (Gear^.dY.isNegative) or (not TestCollisionYKick(Gear, 1));
+isFalling:= (Gear^.dY.isNegative) or (TestCollisionYKick(Gear, 1) = 0);
 if isFalling then
 begin
-if (Gear^.dY.isNegative) and TestCollisionYKick(Gear, -1) then
+land:= TestCollisionYKick(Gear, -1);
-Gear^.dY:= _0;
+if (Gear^.dY.isNegative) and (land <> 0) then
+begin
+if land and lfBouncy <> 0 then
+begin
+doStepFallingGear(Gear);
+Gear^.dX:= Gear^.dX * _0_8
+end;
+if (land and lfBouncy = 0) or (Gear^.State and gstCollision <> 0) then
+Gear^.dY:= _0;
+Gear^.State:= Gear^.State and not gstCollision
+end;
 Gear^.State:= Gear^.State or gstMoving;
 if (CurrentHedgehog^.Gear = Gear) and (CurrentHedgehog^.Gear^.State and gstHHDriven <> 0) and
 (not CurrentTeam^.ExtDriven) and (hwSqr(Gear^.dX) + hwSqr(Gear^.dY) > _0_003) then
 begin
 // TODO: why so aggressive at setting FollowGear when falling?
 end
 end
 else
 begin
 land:= TestCollisionYwithGear(Gear, 1);
 if ((Gear^.dX.QWordValue + Gear^.dY.QWordValue) < _0_55.QWordValue) and ((land and lfIce) = 0)
+and ((land and lfBouncy = 0) or (Gear^.State and gstCollision <> 0))
 and ((Gear^.State and gstHHJumping) <> 0) then
 SetLittle(Gear^.dX);
 if not Gear^.dY.isNegative then
 begin
+if land and lfBouncy <> 0 then
+begin
+doStepFallingGear(Gear);
+// hogs for some reason have very low friction. slippery little buggers
+Gear^.dX:= Gear^.dX * _0_8
+end;
 CheckHHDamage(Gear);
-if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery)
+if (land and lfBouncy = 0) or (Gear^.State and gstCollision <> 0) then
-and (Gear^.dX.QWordValue < _0_02.QWordValue) then
+begin
-Gear^.dX.isNegative:= not Gear^.dX.isNegative; // landing after high jump
+if ((Gear^.State and gstHHHJump) <> 0) and (not cArtillery)
-Gear^.State:= Gear^.State and (not (gstHHJumping or gstHHHJump));
+and (Gear^.dX.QWordValue < _0_02.QWordValue) then
-Gear^.dY:= _0;
+begin
+if land and lfBouncy <> 0 then
+Gear^.dY:= _0;
+Gear^.dX.isNegative:= not Gear^.dX.isNegative // landing after high jump
+end;
+Gear^.State:= Gear^.State and (not (gstHHJumping or gstHHHJump));
+if (land and lfBouncy = 0) or (Gear^.dX.QWordValue < _0_02.QWordValue) then
+Gear^.dY:= _0
+end;
+Gear^.State:= Gear^.State and not gstCollision
 end
 else
 Gear^.dY:= Gear^.dY + cGravity;
 if ((Gear^.State and gstMoving) <> 0) then
 Gear^.dY:= Gear^.dY * _0_999;
 Gear^.dX:= Gear^.dX * _0_999;
 end;
 if (Gear^.State and gstMoving) <> 0 then
-if TestCollisionXKick(Gear, hwSign(Gear^.dX)) then
+if TestCollisionXKick(Gear, hwSign(Gear^.dX)) <> 0 then
 if not isFalling then
 if hwAbs(Gear^.dX) > _0_01 then
-if not (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -1, hwSign(Gear^.dX)) or
+if  (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -1, hwSign(Gear^.dX)) = 0) and
-(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1))) then
+(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1) = 0) then
 begin
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.dX:= Gear^.dX * _0_96;
 Gear^.Y:= Gear^.Y - _1
 end
 else
-if not (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -2, hwSign(Gear^.dX)) or
+if  (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -2, hwSign(Gear^.dX)) = 0) and
-(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1))) then
+(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1) = 0) then
 begin
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.dX:= Gear^.dX * _0_93;
 Gear^.Y:= Gear^.Y - _2
 end
 else
-if not (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -3, hwSign(Gear^.dX)) or
+if  (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -3, hwSign(Gear^.dX)) = 0) and
-(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1))) then
+(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1) = 0) then
 begin
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.dX:= Gear^.dX * _0_9 ;
 Gear^.Y:= Gear^.Y - _3
 end
 else
-if not (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -4, hwSign(Gear^.dX)) or
+if (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -4, hwSign(Gear^.dX)) = 0) and
-(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1))) then
+(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1) = 0) then
 begin
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.dX:= Gear^.dX * _0_87;
 Gear^.Y:= Gear^.Y - _4
 end
 else
-if not (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -5, hwSign(Gear^.dX)) or
+if (TestCollisionXwithXYShift(Gear, int2hwFloat(hwSign(Gear^.dX)) - Gear^.dX, -5, hwSign(Gear^.dX)) = 0) and
-(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1))) then
+(TestCollisionYwithXYShift(Gear, hwSign(Gear^.dX) - hwRound(Gear^.dX), -1, -1) = 0) then
 begin
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.dX:= Gear^.dX * _0_84;
 Gear^.Y:= Gear^.Y - _5
 end
 if (not isFalling)
 and (hwAbs(Gear^.dX) + hwAbs(Gear^.dY) < _0_03) then
 begin
 Gear^.State:= Gear^.State and (not gstWinner);
 Gear^.State:= Gear^.State and (not gstMoving);
-while (TestCollisionYWithGear(Gear,1) = 0) and (not CheckGearDrowning(Gear)) and (Gear <> nil) do
+while (not CheckGearDrowning(Gear)) and (Gear <> nil) and (TestCollisionYWithGear(Gear,1) = 0) do
 Gear^.Y:= Gear^.Y + _1;
 // could become nil in CheckGearDrowning if ai's hog fails to respawn in ai survival
 if Gear = nil then exit;
 SetLittle(Gear^.dX);
 begin
 Gear^.State:= Gear^.State and (not gstAnimation);
 // ARTILLERY but not being moved by explosions
 Gear^.X:= Gear^.X + Gear^.dX;
 Gear^.Y:= Gear^.Y + Gear^.dY;
-if (not Gear^.dY.isNegative) and (not TestCollisionYKick(Gear, 1))
+if (not Gear^.dY.isNegative) and (TestCollisionYKick(Gear, 1) = 0) then
-and TestCollisionYwithXYShift(Gear, 0, 1, 1) then
+begin
-begin
+land:= TestCollisionYwithXYShift(Gear, 0, 1, 1);
-CheckHHDamage(Gear);
+if land and lfBouncy <> 0 then
-Gear^.dY:= _0;
+doStepFallingGear(Gear);
-Gear^.Y:= Gear^.Y + _1
-end;
+if (land <> 0) and ((land and lfBouncy = 0) or (Gear^.State and gstCollision <> 0)) then
+begin
-CheckGearDrowning(Gear);
+CheckHHDamage(Gear);
+Gear^.dY:= _0;
+Gear^.Y:= Gear^.Y + _1
+end;
+Gear^.State:= Gear^.State and not gstCollision
+end;
 // could become nil if ai's hog fails to respawn in ai survival
 if Gear = nil then exit;
 // hide target cursor if current hog is drowning
 if (Gear^.State and gstDrowning) <> 0 then
 if (CurrentHedgehog^.Gear = Gear) then
 if HHGear^.Damage > 0 then
 HHGear^.State:= HHGear^.State and (not (gstHHJumping or gstHHHJump));
 exit
 end;
+if isAFK and (not CurrentTeam^.ExtDriven) and (CurrentHedgehog^.BotLevel = 0) then
+begin
+AFKSkip;
+exit
+end;
 if (HHGear^.State and gstAnimation) <> 0 then
 begin
 HHGear^.Message:= 0;
 if (HHGear^.Pos = Wavez[TWave(HHGear^.Tag)].VoiceDelay) and (HHGear^.Timer = 0) then
 PlaySoundV(Wavez[TWave(HHGear^.Tag)].Voice, Hedgehog^.Team^.voicepack);
 PlaySoundV(sndJump2, Hedgehog^.Team^.voicepack)
 end;
 HHGear^.Message:= HHGear^.Message and (not (gmLJump or gmHJump));
-if (not cArtillery) and wasJumping and TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) then
+if (not cArtillery) and wasJumping and (TestCollisionXwithGear(HHGear, hwSign(HHGear^.dX)) <> 0) then
 SetLittle(HHGear^.dX);
 if Hedgehog^.Gear <> nil then
 doStepHedgehogMoving(HHGear);
 var slope: hwFloat;
 begin
 if (Gear^.Message and (gmAllStoppable or gmLJump or gmHJump) = 0)
 and (Gear^.State and (gstHHJumping or gstHHHJump or gstAttacking) = 0)
 and ((Gear^.Hedgehog = nil) or ((Gear^.Hedgehog^.Effects[heFrozen] = 0) or (Gear^.Hedgehog^.Effects[heFrozen] > 255)))
-and (not Gear^.dY.isNegative) and (TurnTimeLeft > 0) and (TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then
+and (not Gear^.dY.isNegative) and TurnClockActive and (TestCollisionYwithGear(Gear, 1) and lfIce <> 0) then
 begin
 slope:= CalcSlopeBelowGear(Gear);
 if slope.QWordValue > 730144440 then // ignore mild slopes
 begin
 Gear^.dX:=Gear^.dX+slope*cGravity*_256;
 AddVisualGear(x + hwRound(_50 * slope), y - hwRound(_50 * slope), vgtSmokeTrace); *)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepHedgehog(Gear: PGear);
-begin
+var tX: hwFloat;
-if WorldWrap(Gear) and (WorldEdge <> weBounce) and
+begin
-(Gear = CurrentHedgehog^.Gear) and (CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) then
+CheckGearDrowning(Gear);
-CurAmmoGear^.PortalCounter:= 1;
+if Gear = nil then exit;
+tX:= Gear^.X;
+if WorldWrap(Gear) then
+begin
+if (WorldEdge <> weBounce) and (Gear = CurrentHedgehog^.Gear) and
+(CurAmmoGear <> nil) and (CurAmmoGear^.Kind =gtRope) and (CurAmmoGear^.Elasticity <> _0) then
+CurAmmoGear^.PortalCounter:= 1;
+if (WorldEdge = weWrap) and ((TestCollisionXwithGear(Gear, 1) <> 0) or (TestCollisionXwithGear(Gear, -1) <> 0))  then
+begin
+Gear^.X:= tX;
+Gear^.dX.isNegative:= (hwRound(tX) > LongInt(leftX) + Gear^.Radius * 2)
+end
+end;
 CheckSum:= CheckSum xor Gear^.Hedgehog^.BotLevel;
 if (Gear^.Message and gmDestroy) <> 0 then
 begin
 DeleteGear(Gear);
 exit
 end;
-if GameTicks mod 100 = 0 then CheckIce(Gear);
+if GameTicks mod 128 = 0 then CheckIce(Gear);
 (*
 if Gear^.Hedgehog^.Effects[heFrozen] > 0 then
 begin
 if (Gear^.Hedgehog^.Effects[heFrozen] > 256) and (CurrentHedgehog^.Team^.Clan <> Gear^.Hedgehog^.Team^.Clan) then
 dec(Gear^.Hedgehog^.Effects[heFrozen])

branch	webgl
changeset 9950	2759212a27de
parent 9521	8054d9d775fd
parent 9917	1ca194a8b509
child 9954	bf51bc7e2808