Skip to content

Commit

Permalink
chore: unify E_ZZT and E_SUPERZ ELEMENTS.PAS code fragments
Browse files Browse the repository at this point in the history
  • Loading branch information
@asiekierka
asiekierka committed Dec 16, 2023
1 parent 88d0bde commit 846f91b
Showing 1 changed file with 71 additions and 51 deletions.
122 changes: 71 additions & 51 deletions SRC/E_SUPERZ/ELEMENTS.PAS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,12 @@ procedure ElementLionTick(statId: integer);
else
CalcDirectionSeek(X, Y, deltaX, deltaY);

if ElementDefs[Board.Tiles[X + deltaX][Y + deltaY].Element].Walkable then begin
MoveStat(statId, X + deltaX, Y + deltaY);
end else if Board.Tiles[X + deltaX][Y + deltaY].Element = E_PLAYER then begin
BoardAttack(statId, X + deltaX, Y + deltaY)
with Board.Tiles[X + deltaX][Y + deltaY] do begin
if ElementDefs[Element].Walkable then begin
MoveStat(statId, X + deltaX, Y + deltaY);
end else if Element = E_PLAYER then begin
BoardAttack(statId, X + deltaX, Y + deltaY)
end;
end;
end;
end;
Expand Down Expand Up @@ -843,9 +845,10 @@ procedure ElementStarDraw(x, y: integer; var ch: byte);
begin
ch := Ord(StarAnimChars[(CurrentTick and 3) + 1]);
with Board.Tiles[x][y] do begin
Inc(Color);
if Color > 15 then
Color := 9;
if Color >= 15 then
Color := 9
else
Inc(Color);
end;
end;

Expand Down Expand Up @@ -899,28 +902,34 @@ procedure ElementEnergizerTouch(x, y: integer; sourceStatId: integer; var deltaX

procedure ElementSlimeTick(statId: integer);
var
dir, color, changedTiles: integer;
dir, colorCopy, changedTiles: integer;
startX, startY: integer;
tx, ty: integer;
begin
with Board.Stats[statId] do begin
if P1 < P2 then
Inc(P1)
else begin
color := Board.Tiles[X][Y].Color;
colorCopy := Board.Tiles[X][Y].Color;
P1 := 0;
startX := X;
startY := Y;
changedTiles := 0;

for dir := 0 to 3 do begin
if ElementDefs[Board.Tiles[startX + NeighborDeltaX[dir]][startY + NeighborDeltaY[dir]].Element].Walkable then begin
tx := startX + NeighborDeltaX[dir];
ty := startY + NeighborDeltaY[dir];

if ElementDefs[Board.Tiles[tx][ty].Element].Walkable then begin
if changedTiles = 0 then begin
MoveStat(statId, startX + NeighborDeltaX[dir], startY + NeighborDeltaY[dir]);
Board.Tiles[startX][startY].Color := color;
Board.Tiles[startX][startY].Element := E_BREAKABLE;
MoveStat(statId, tx, ty);
with Board.Tiles[startX][startY] do begin
Element := E_BREAKABLE;
color := colorCopy;
end;
BoardDrawTile(startX, startY);
end else begin
AddStat(startX + NeighborDeltaX[dir], startY + NeighborDeltaY[dir], E_SLIME, color,
AddStat(tx, ty, E_SLIME, colorCopy,
ElementDefs[E_SLIME].Cycle, StatTemplateDefault);
Board.Stats[Board.StatCount].P2 := P2;
end;
Expand All @@ -931,8 +940,10 @@ procedure ElementSlimeTick(statId: integer);

if changedTiles = 0 then begin
RemoveStat(statId);
Board.Tiles[startX][startY].Element := E_BREAKABLE;
Board.Tiles[startX][startY].Color := color;
with Board.Tiles[startX][startY] do begin
Element := E_BREAKABLE;
color := colorCopy;
end;
BoardDrawTile(startX, startY);
end;
end;
Expand All @@ -941,12 +952,15 @@ procedure ElementSlimeTick(statId: integer);

procedure ElementSlimeTouch(x, y: integer; sourceStatId: integer; var deltaX, deltaY: integer);
var
color: integer;
colorCopy: integer;
begin
color := Board.Tiles[x][y].Color;
DamageStat(GetStatIdAt(x, y));
Board.Tiles[x][y].Element := E_BREAKABLE;
Board.Tiles[x][y].Color := color;
with Board.Tiles[x][y] do begin
colorCopy := Color;
DamageStat(GetStatIdAt(x, y));
Element := E_BREAKABLE;
Color := colorCopy;
end;

BoardDrawTile(x, y);
SoundQueue(2, #32#1#35#1);
end;
Expand Down Expand Up @@ -1021,8 +1035,12 @@ procedure ElementBlinkWallTick(statId: integer);
end;
hitBoundary := true;
end;
{$IFDEF DEBUGWND}
end else begin
{ TODO: Should destroying a statless player have any special behaviour? }
if DebugCompatEnabled then
DebugShowElementMessage('Illegal statless player damage', x, y);
{$ENDIF}
end;
end;

Expand Down Expand Up @@ -1078,9 +1096,8 @@ procedure ElementPushablePush(x, y: integer; deltaX, deltaY: integer);
ElementPushablePush(x + deltaX, y + deltaY, deltaX, deltaY);
{$IFDEF DEBUGWND}
end else begin
{ TODO: Should destroying a statless player have any special behaviour? }
if DebugCompatEnabled then
DebugShowElementMessage('Illegal statless player damage', x, y);
DebugShowElementMessage('Illegal pushable movement', x, y);
{$ENDIF}
end;
end;
Expand Down Expand Up @@ -1175,33 +1192,35 @@ procedure ElementDuplicatorTick(statId: integer);
Inc(P1);
end else begin
P1 := 0;
if Board.Tiles[X - StepX][Y - StepY].Element = E_PLAYER then begin
ElementDefs[Board.Tiles[X + StepX][Y + StepY].Element]
.TouchProc(X + StepX, Y + StepY, 0, InputDeltaX, InputDeltaY);
end else begin
if Board.Tiles[X - StepX][Y - StepY].Element <> E_EMPTY then
ElementPushablePush(X - StepX, Y - StepY, -StepX, -StepY);

if Board.Tiles[X - StepX][Y - StepY].Element = E_EMPTY then begin
sourceStatId := GetStatIdAt(X + StepX, Y + StepY);
if sourceStatId > 0 then begin
{ Below is always true }
{ if Board.StatCount < (MAX_STAT + 24) then begin }
with Board.Tiles[X + StepX][Y + StepY] do begin
AddStat(X - StepX, Y - StepY,
Element, Color,
Board.Stats[sourceStatId].Cycle, Board.Stats[sourceStatId]);
with Board.Tiles[X - StepX][Y - StepY] do begin
if Element = E_PLAYER then begin
ElementDefs[Board.Tiles[X + StepX][Y + StepY].Element]
.TouchProc(X + StepX, Y + StepY, 0, InputDeltaX, InputDeltaY);
end else begin
if Element <> E_EMPTY then
ElementPushablePush(X - StepX, Y - StepY, -StepX, -StepY);

if Element = E_EMPTY then begin
sourceStatId := GetStatIdAt(X + StepX, Y + StepY);
if sourceStatId > 0 then begin
{ Below is always true }
{ if Board.StatCount < (MAX_STAT + 24) then begin }
with Board.Tiles[X + StepX][Y + StepY] do begin
AddStat(X - StepX, Y - StepY,
Element, Color,
Board.Stats[sourceStatId].Cycle, Board.Stats[sourceStatId]);
BoardDrawTile(X - StepX, Y - StepY);
end;
end else if sourceStatId <> 0 then begin
Board.Tiles[X - StepX][Y - StepY]
:= Board.Tiles[X + StepX][Y + StepY];
BoardDrawTile(X - StepX, Y - StepY);
end;
end else if sourceStatId <> 0 then begin
Board.Tiles[X - StepX][Y - StepY]
:= Board.Tiles[X + StepX][Y + StepY];
BoardDrawTile(X - StepX, Y - StepY);
end;

SoundQueue(3, #48#2#50#2#52#2#53#2#55#2);
end else begin
SoundQueue(3, #24#1#22#1);
SoundQueue(3, #48#2#50#2#52#2#53#2#55#2);
end else begin
SoundQueue(3, #24#1#22#1);
end;
end;
end;

Expand Down Expand Up @@ -1377,8 +1396,9 @@ procedure ElementPusherTick(statId: integer);
startX := X;
startY := Y;

if not ElementDefs[Board.Tiles[X + StepX][Y + StepY].Element].Walkable then begin
ElementPushablePush(X + StepX, Y + StepY, StepX, StepY);
{ Microoptimization: X + StepX, but startX currently == X, etc. }
if not ElementDefs[Board.Tiles[startX + StepX][startY + StepY].Element].Walkable then begin
ElementPushablePush(startX + StepX, startY + StepY, StepX, StepY);
end;
end;

Expand All @@ -1391,7 +1411,7 @@ procedure ElementPusherTick(statId: integer);
if Board.Tiles[X - (StepX * 2)][Y - (StepY * 2)].Element = E_PUSHER then begin
i := GetStatIdAt(X - (StepX * 2), Y - (StepY * 2));
if (Board.Stats[i].StepX = StepX) and (Board.Stats[i].StepY = StepY) then
ElementDefs[E_PUSHER].TickProc(i);
ElementPusherTick(i);
end;
end;
end;
Expand Down Expand Up @@ -1513,7 +1533,7 @@ procedure DrawPlayerSurroundings(x, y: integer; bombPhase: integer);
if (Element = E_EMPTY) or (Element = E_BREAKABLE) then begin
Element := E_BREAKABLE;
Color := $09 + ZRandom(7);
BoardDrawTile(ix, iy);
{ BoardDrawTile(ix, iy); (duplicate) }
end;
end else begin
if Element = E_BREAKABLE then
Expand Down

0 comments on commit 846f91b

Please sign in to comment.