X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_monsters.pas;h=d8adad853402974c802ba9bfbd3f58761809835e;hb=6c45ab8eddd0887ecaa11ad3ed284dbdd3a3730c;hp=02bea1f632bb906c89b5b56a220b757ec2d1b484;hpb=5c84a2c9f706bc450a00bda4f7d2afc858ce75b0;p=d2df-sdl.git

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index 02bea1f..d8adad8 100644
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -125,6 +124,7 @@ type
     function Damage(aDamage: Word; VelX, VelY: Integer; SpawnerUID: Word; t: Byte): Boolean;
     function Heal(Value: Word): Boolean;
     procedure BFGHit();
+    procedure PreUpdate();
     procedure Update();
     procedure ClientUpdate();
     procedure ClientAttack(wx, wy, atx, aty: Integer);
@@ -233,6 +233,7 @@ procedure g_Monsters_Init ();
 procedure g_Monsters_Free (clearGrid: Boolean=true);
 function g_Monsters_Create (MonsterType: Byte; X, Y: Integer; Direction: TDirection;
   AdjCoord: Boolean = False; ForcedUID: Integer = -1): TMonster;
+procedure g_Monsters_PreUpdate ();
 procedure g_Monsters_Update ();
 procedure g_Monsters_Draw ();
 procedure g_Monsters_DrawHealth ();
@@ -1378,6 +1379,8 @@ begin
     FStartDirection := Direction;
     FStartX := GameX;
     FStartY := GameY;
+    FObj.oldX := FObj.X;
+    FObj.oldY := FObj.Y;
   end;
 
   mon.positionChanged();
@@ -1413,6 +1416,16 @@ begin
   end;
 end;
 
+procedure g_Monsters_PreUpdate();
+var
+  a: Integer;
+begin
+  if gMonsters = nil then Exit;
+  for a := 0 to High(gMonsters) do
+    if (gMonsters[a] <> nil) and (not gMonsters[a].FRemoved) then
+      gMonsters[a].PreUpdate();
+end;
+
 procedure g_Monsters_Update();
 var
   a: Integer;
@@ -1994,6 +2007,9 @@ var
 begin
   Result := False;
 
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
+
 // Óìèðàåò, óìåð èëè âîñêðåøàåòñÿ => óðîí äåëàòü íåêîìó:
   if (FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE) or (FState = MONSTATE_REVIVE) then
     Exit;
@@ -2008,6 +2024,15 @@ begin
     Exit;
   end;
 
+// Àð÷è íå ãîðÿò, ÷åðåïà óæå ãîðÿò
+  if (t = HIT_FLAME) and (FMonsterType in [MONSTER_VILE, MONSTER_SOUL]) then
+  begin
+  // Ïðîñíóòüñÿ âñå-òàêè ñòîèò
+    if FState = MONSTATE_SLEEP then
+      SetState(MONSTATE_GO);
+    Exit;
+  end;
+
 // Ëîâóøêà óáèâàåò ñðàçó:
   if t = HIT_TRAP then
     FHealth := -100;
@@ -2198,12 +2223,14 @@ end;
 procedure TMonster.Draw();
 var
   m: TMirrorType;
-  dx, dy, c: Integer;
+  dx, dy, c, fX, fY: Integer;
   o: TObj;
 begin
   //e_CharFont_Print(gMenuSmallFont, Obj.X+Obj.Rect.X, Obj.Y+Obj.Rect.Y, 'TYPE: '+IntToStr(FMonsterType));
   //e_CharFont_Print(gMenuSmallFont, Obj.X+Obj.Rect.X, Obj.Y+Obj.Rect.Y+16, 'STATE: '+IntToStr(FState));
 
+  FObj.lerp(gLerpFactor, fX, fY);
+
 // Åñëè êîëäóí ñòðåëÿåò, òî ðèñóåì îãîíü:
   if FMonsterType = MONSTER_VILE then
     if FState = MONSTATE_SHOOT then
@@ -2263,7 +2290,7 @@ begin
       end;
 
   // Ðèñóåì:
-    FAnim[FCurAnim, FDirection].Draw(Obj.X+dx, Obj.Y+dy, m);
+    FAnim[FCurAnim, FDirection].Draw(fX+dx, fY+dy, m);
   end;
 
   if g_debug_Frames then
@@ -2395,6 +2422,8 @@ begin
 
   FObj.X := X - FObj.Rect.X;
   FObj.Y := Y - FObj.Rect.Y;
+  FObj.oldX := FObj.X; // don't interpolate after teleport
+  FObj.oldY := FObj.Y;
   positionChanged();
 
   if dir = 1 then
@@ -2428,17 +2457,29 @@ begin
   Result := True;
 end;
 
+procedure TMonster.PreUpdate();
+begin
+  FObj.oldX := FObj.X;
+  FObj.oldY := FObj.Y;
+end;
+
 procedure TMonster.Update();
 var
   a, b, sx, sy, wx, wy, oldvelx: Integer;
   st: Word;
   o, co: TObj;
-  fall: Boolean;
+  fall, bubbles: Boolean;
   mon: TMonster;
+  mit: PMonster;
+  it: TMonsterGrid.Iter;
 label
   _end;
 begin
   fall := True;
+  bubbles := True;
+
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
 
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then
@@ -2473,11 +2514,12 @@ begin
 
 // Åñëè ãîðèì - ïîäæèãàåì äðóãèõ ìîíñòðîâ, íî íå íà 100 òèêîâ êàæäûé ðàç:
   if FFireTime > 0 then
-    for a := 0 to High(gMonsters) do
-      if (gMonsters[a] <> nil) and (gMonsters[a].alive) and
-         (gMonsters[a].FUID <> FUID) and
-         g_Obj_Collide(@FObj, @gMonsters[a].Obj) then
-        gMonsters[a].CatchFire(FFireAttacker, FFireTime);
+  begin
+    it := monsGrid.forEachInAABB(FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
+    for mit in it do
+      if mit.UID <> FUID then
+        mit.CatchFire(FFireAttacker, FFireTime);
+  end;
 
 // Âûëåòåë çà êàðòó - óäàëÿåì è çàïóñêàåì òðèããåðû:
   if WordBool(st and MOVE_FALLOUT) or (FObj.X < -1000) or
@@ -2533,23 +2575,23 @@ begin
 
 // Âîçìîæíî, ñîçäàåì ïóçûðüêè â âîäå:
   if WordBool(st and MOVE_INWATER) and (Random(32) = 0) then
+  begin
     case FMonsterType of
       MONSTER_FISH:
-        if Random(4) = 0 then
+        if Random(4) <> 0 then bubbles := False else
           g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width),
                         FObj.Y+FObj.Rect.Y + Random(4), 1, 0, 0);
       MONSTER_ROBO, MONSTER_BARREL:
         g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width),
                       FObj.Y+FObj.Rect.Y + Random(4), 1, 0, 0);
-      else begin
+      else
         g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width-4),
                       FObj.Y+FObj.Rect.Y + Random(4), 5, 4, 4);
-        if Random(2) = 0 then
-          g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y)
-        else
-          g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y);
-      end;
     end;
+    if bubbles then if Random(2) = 0
+      then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y)
+      else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y);
+  end;
 
 // Åñëè ïðîøåë ïåðâûé êàäð àíèìàöèè âçðûâà áî÷êè, òî âçðûâ:
   if FMonsterType = MONSTER_BARREL then
@@ -2897,9 +2939,9 @@ begin
                                    FObj.Rect.Width, 8, @co) and (Random(3) = 0) then
                     // Ïèíàåì òðóïû
                     if FObj.Vel.X < 0 then
-                      gCorpses[a].Damage(b*2, -b, Random(7)) // íàëåâî
+                      gCorpses[a].Damage(b*2, FUID, -b, Random(7)) // íàëåâî
                     else
-                      gCorpses[a].Damage(b*2, b, Random(7)); // íàïðàâî
+                      gCorpses[a].Damage(b*2, FUID, b, Random(7)); // íàïðàâî
                 end;
             end;
           // Åñëè öåëü âûñîêî, òî, âîçìîæíî, ïðûãàåì:
@@ -3421,13 +3463,18 @@ var
   a, b, sx, sy, oldvelx: Integer;
   st: Word;
   o, co: TObj;
-  fall: Boolean;
+  fall, bubbles: Boolean;
 label
   _end;
 begin
   sx := 0; // SHUT UP COMPILER
   sy := 0;
   fall := True;
+  bubbles := True;
+
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
+
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then
     if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then
@@ -3490,23 +3537,23 @@ begin
 
 // Âîçìîæíî, ñîçäàåì ïóçûðüêè â âîäå:
   if WordBool(st and MOVE_INWATER) and (Random(32) = 0) then
+  begin
     case FMonsterType of
       MONSTER_FISH:
-        if Random(4) = 0 then
+        if Random(4) <> 0 then bubbles := False else
           g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width),
                         FObj.Y+FObj.Rect.Y + Random(4), 1, 0, 0);
       MONSTER_ROBO, MONSTER_BARREL:
         g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width),
                       FObj.Y+FObj.Rect.Y + Random(4), 1, 0, 0);
-      else begin
+      else
         g_GFX_Bubbles(FObj.X+FObj.Rect.X + Random(FObj.Rect.Width-4),
                       FObj.Y+FObj.Rect.Y + Random(4), 5, 4, 4);
-        if Random(2) = 0 then
-          g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y)
-        else
-          g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y);
-      end;
     end;
+    if bubbles then if Random(2) = 0
+      then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', FObj.X, FObj.Y)
+      else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', FObj.X, FObj.Y);
+  end;
 
 // Åñëè ïðîøåë ïåðâûé êàäð àíèìàöèè âçðûâà áî÷êè, òî âçðûâ:
   if FMonsterType = MONSTER_BARREL then
@@ -3743,9 +3790,9 @@ begin
                                    FObj.Rect.Width, 8, @co) and (Random(3) = 0) then
                     // Ïèíàåì òðóïû
                     if FObj.Vel.X < 0 then
-                      gCorpses[a].Damage(b*2, -b, Random(7)) // íàëåâî
+                      gCorpses[a].Damage(b*2, FUID, -b, Random(7)) // íàëåâî
                     else
-                      gCorpses[a].Damage(b*2, b, Random(7)); // íàïðàâî
+                      gCorpses[a].Damage(b*2, FUID, b, Random(7)); // íàïðàâî
                 end;
             end;
           end;
@@ -4618,6 +4665,8 @@ begin
       FAnim[i, TDirection.D_RIGHT].LoadState(st);
     end;
   end;
+  // update cache
+  self.positionChanged
 end;
 
 
@@ -4648,7 +4697,11 @@ end;
 
 procedure TMonster.CatchFire(Attacker: Word; Timeout: Integer = MON_BURN_TIME);
 begin
+  if FMonsterType in [MONSTER_SOUL, MONSTER_VILE] then
+    exit; // àð÷è íå ãîðÿò, ÷åðåïà óæå ãîðÿò
   if Timeout <= 0 then exit;
+  if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then
+    exit; // íå ïîäãîðàåì â âîäå íà âñÿêèé ñëó÷àé
   if FFireTime <= 0 then
     g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y);
   FFireTime := Timeout;