diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 6f6b60be4f374bee6f2a45d9bce097425dbbfa72..b5e46d11e930755b647728f1c8f9eae179555c98 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
+(* Copyright (C) DooM 2D:Forever Developers
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$MODE DELPHI}
unit g_weapons;
interface
Animation: TAnimation;
TextureID: DWORD;
Timeout: DWORD;
+ Stopped: Byte;
end;
var
function g_Weapon_chainsaw(x, y: Integer; d, SpawnerUID: Word): Integer;
procedure g_Weapon_rocket(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False);
procedure g_Weapon_revf(x, y, xd, yd: Integer; SpawnerUID, TargetUID: Word; WID: Integer = -1; Silent: Boolean = False);
+procedure g_Weapon_flame(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False);
procedure g_Weapon_plasma(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False);
procedure g_Weapon_ball1(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False);
procedure g_Weapon_ball2(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1; Silent: Boolean = False);
WEAPON_PLASMA = 7;
WEAPON_BFG = 8;
WEAPON_SUPERPULEMET = 9;
- WEAPON_MEGAKASTET = 10;
+ WEAPON_FLAMETHROWER = 10;
WEAPON_ZOMBY_PISTOL = 20;
WEAPON_IMP_FIRE = 21;
WEAPON_BSP_FIRE = 22;
WEAPON_MANCUB_FIRE = 25;
WEAPON_SKEL_FIRE = 26;
+ WP_FIRST = WEAPON_KASTET;
+ WP_LAST = WEAPON_FLAMETHROWER;
+
implementation
uses
end;
const
- SHOT_ROCKETLAUNCHER_WIDTH = 27;
- SHOT_ROCKETLAUNCHER_HEIGHT = 12;
+ SHOT_ROCKETLAUNCHER_WIDTH = 14;
+ SHOT_ROCKETLAUNCHER_HEIGHT = 14;
- SHOT_SKELFIRE_WIDTH = 32;
- SHOT_SKELFIRE_HEIGHT = 16;
+ SHOT_SKELFIRE_WIDTH = 14;
+ SHOT_SKELFIRE_HEIGHT = 14;
SHOT_PLASMA_WIDTH = 16;
SHOT_PLASMA_HEIGHT = 16;
SHOT_BFG_DAMAGE = 100;
SHOT_BFG_RADIUS = 256;
+ SHOT_FLAME_WIDTH = 4;
+ SHOT_FLAME_HEIGHT = 4;
+ SHOT_FLAME_LIFETIME = 180;
+
SHOT_SIGNATURE = $544F4853; // 'SHOT'
var
end;
if g_Game_IsServer then
- Result := m.Damage(d, vx, vy, SpawnerUID, t)
+ begin
+ if (t <> HIT_FLAME) or (m.FFireTime = 0) or (vx <> 0) or (vy <> 0) then
+ Result := m.Damage(d, vx, vy, SpawnerUID, t)
+ else
+ Result := True;
+ if t = HIT_FLAME then
+ m.CatchFire(SpawnerUID);
+ end
else
Result := True;
end;
if (p.UID = SpawnerUID) and (t <> HIT_ROCKET) and (t <> HIT_ELECTRO) then
Exit;
- if g_Game_IsServer then p.Damage(d, SpawnerUID, vx, vy, t);
+ if g_Game_IsServer then
+ begin
+ if (t <> HIT_FLAME) or (p.FFireTime = 0) or (vx <> 0) or (vy <> 0) then
+ p.Damage(d, SpawnerUID, vx, vy, t);
+ if (t = HIT_FLAME) then
+ p.CatchFire(SpawnerUID);
+ end;
Result := True;
end;
end;
end;
+ WEAPON_FLAMETHROWER:
+ begin
+ with Shots[find_id] do
+ begin
+ g_Obj_Init(@Obj);
+
+ Obj.Rect.Width := SHOT_FLAME_WIDTH;
+ Obj.Rect.Height := SHOT_FLAME_HEIGHT;
+
+ Triggers := nil;
+ ShotType := WEAPON_FLAMETHROWER;
+ Animation := nil;
+ TextureID := 0;
+ g_Frames_Get(TextureID, 'FRAMES_FLAME');
+ end;
+ end;
+
WEAPON_IMP_FIRE:
begin
with Shots[find_id] do
Shots[find_id].Obj.Accel.X := 0;
Shots[find_id].Obj.Accel.Y := 0;
Shots[find_id].SpawnerUID := Spawner;
+ if (ShotType = WEAPON_FLAMETHROWER) and (XV = 0) and (YV = 0) then
+ Shots[find_id].Stopped := 255
+ else
+ Shots[find_id].Stopped := 0;
Result := find_id;
end;
Shots[i].Obj.Vel.Y := (yd*s) div a;
Shots[i].Obj.Accel.X := 0;
Shots[i].Obj.Accel.Y := 0;
+ Shots[i].Stopped := 0;
if Shots[i].ShotType in [WEAPON_ROCKETLAUNCHER, WEAPON_BFG] then
Shots[i].Timeout := 900 // ~25 sec
- else
- Shots[i].Timeout := 550 // ~15 sec
+ else
+ begin
+ if Shots[i].ShotType = WEAPON_FLAMETHROWER then
+ Shots[i].Timeout := SHOT_FLAME_LIFETIME
+ else
+ Shots[i].Timeout := 550; // ~15 sec
+ end;
end;
function g_Weapon_Hit(obj: PObj; d: Integer; SpawnerUID: Word; t: Byte; HitCorpses: Boolean = True): Byte;
g_Frames_CreateWAD(nil, 'FRAMES_EXPLODE_IMPFIRE', GameWAD+':TEXTURES\EIMPFIRE', 64, 64, 3);
g_Frames_CreateWAD(nil, 'FRAMES_BFGHIT', GameWAD+':TEXTURES\BFGHIT', 64, 64, 4);
g_Frames_CreateWAD(nil, 'FRAMES_FIRE', GameWAD+':TEXTURES\FIRE', 64, 128, 8);
+ g_Frames_CreateWAD(nil, 'FRAMES_FLAME', GameWAD+':TEXTURES\FLAME', 32, 32, 11);
g_Frames_CreateWAD(nil, 'FRAMES_EXPLODE_PLASMA', GameWAD+':TEXTURES\EPLASMA', 32, 32, 4, True);
g_Frames_CreateWAD(nil, 'FRAMES_EXPLODE_BSPFIRE', GameWAD+':TEXTURES\EBSPFIRE', 32, 32, 5);
g_Frames_CreateWAD(nil, 'FRAMES_EXPLODE_CACOFIRE', GameWAD+':TEXTURES\ECACOFIRE', 64, 64, 3);
Obj.Rect.Width := SHOT_ROCKETLAUNCHER_WIDTH;
Obj.Rect.Height := SHOT_ROCKETLAUNCHER_HEIGHT;
- dx := IfThen(xd>x, -Obj.Rect.Width, 0);
+ dx := IfThen(xd > x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_ROCKETLAUNCHER;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 12);
Animation := nil;
triggers := nil;
- ShotType := WEAPON_ROCKETLAUNCHER;
g_Texture_Get('TEXTURE_WEAPON_ROCKET', TextureID);
end;
Obj.Rect.Width := SHOT_SKELFIRE_WIDTH;
Obj.Rect.Height := SHOT_SKELFIRE_HEIGHT;
- dx := IfThen(xd>x, -Obj.Rect.Width, 0);
+ dx := -(Obj.Rect.Width div 2);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_SKEL_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 12);
triggers := nil;
- ShotType := WEAPON_SKEL_FIRE;
target := TargetUID;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_SKELFIRE');
Animation := TAnimation.Create(FramesID, True, 5);
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_PLASMA;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_PLASMA;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_PLASMA');
Animation := TAnimation.Create(FramesID, True, 5);
end;
g_Sound_PlayExAt('SOUND_WEAPON_FIREPLASMA', x, y);
end;
+procedure g_Weapon_flame(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1;
+ Silent: Boolean = False);
+var
+ find_id, FramesID: DWORD;
+ dx, dy: Integer;
+begin
+ if WID < 0 then
+ find_id := FindShot()
+ else
+ begin
+ find_id := WID;
+ if Integer(find_id) >= High(Shots) then
+ SetLength(Shots, find_id + 64);
+ end;
+
+ with Shots[find_id] do
+ begin
+ g_Obj_Init(@Obj);
+
+ Obj.Rect.Width := SHOT_FLAME_WIDTH;
+ Obj.Rect.Height := SHOT_FLAME_HEIGHT;
+
+ dx := IfThen(xd>x, -Obj.Rect.Width, 0);
+ dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_FLAMETHROWER;
+ throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
+
+ triggers := nil;
+ Animation := nil;
+ TextureID := 0;
+ g_Frames_Get(TextureID, 'FRAMES_FLAME');
+ end;
+
+ Shots[find_id].SpawnerUID := SpawnerUID;
+
+ // if not Silent then
+ // g_Sound_PlayExAt('SOUND_WEAPON_FIREPLASMA', x, y);
+end;
+
procedure g_Weapon_ball1(x, y, xd, yd: Integer; SpawnerUID: Word; WID: Integer = -1;
Silent: Boolean = False);
var
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_IMP_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_IMP_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_IMPFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_CACO_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_CACO_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_CACOFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BARON_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BARON_FIRE;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BARONFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BSP_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BSP_FIRE;
+
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BSPFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_MANCUB_FIRE;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_MANCUB_FIRE;
- g_Frames_Get(FramesID, 'FRAMES_WEAPON_MANCUBFIRE');
+
+ g_Frames_Get(FramesID, 'FRAMES_WEAPON_MANCUBFIRE');
Animation := TAnimation.Create(FramesID, True, 4);
end;
if Integer(find_id) >= High(Shots) then
SetLength(Shots, find_id + 64)
end;
-
+
with Shots[find_id] do
begin
g_Obj_Init(@Obj);
dx := IfThen(xd>x, -Obj.Rect.Width, 0);
dy := -(Obj.Rect.Height div 2);
+
+ ShotType := WEAPON_BFG;
throw(find_id, x+dx, y+dy, xd+dx, yd+dy, 16);
triggers := nil;
- ShotType := WEAPON_BFG;
g_Frames_Get(FramesID, 'FRAMES_WEAPON_BFG');
Animation := TAnimation.Create(FramesID, True, 6);
end;
procedure g_Weapon_Update();
var
- i, a, h, cx, cy, oldvx, oldvy: Integer;
+ i, a, h, cx, cy, oldvx, oldvy, tf: Integer;
_id: DWORD;
Anim: TAnimation;
t: DWArray;
oldvx := Obj.Vel.X;
oldvy := Obj.Vel.Y;
// Àêòèâèðîâàòü òðèããåðû ïî ïóòè (êðîìå óæå àêòèâèðîâàííûõ):
- if g_Game_IsServer then
+ if (Stopped = 0) and g_Game_IsServer then
t := g_Triggers_PressR(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height,
SpawnerUID, ACTIVATE_SHOT, triggers)
else
// Äâèæåíèå:
spl := (ShotType <> WEAPON_PLASMA) and
(ShotType <> WEAPON_BFG) and
- (ShotType <> WEAPON_BSP_FIRE);
+ (ShotType <> WEAPON_BSP_FIRE) and
+ (ShotType <> WEAPON_FLAMETHROWER);
- st := g_Obj_Move(@Obj, False, spl);
+ if Stopped = 0 then
+ st := g_Obj_Move(@Obj, False, spl)
+ else
+ st := 0;
if WordBool(st and MOVE_FALLOUT) or (Obj.X < -1000) or
(Obj.X > gMapInfo.Width+1000) or (Obj.Y < -1000) then
begin
Anim := TAnimation.Create(_id, False, 3);
Anim.Alpha := 150;
- g_GFX_OnceAnim(Obj.X-8+Random(9),
+ g_GFX_OnceAnim(Obj.X-14+Random(9),
Obj.Y+(Obj.Rect.Height div 2)-20+Random(9),
Anim, ONCEANIM_SMOKE);
Anim.Free();
begin
Anim := TAnimation.Create(TextureID, False, 8);
Anim.Blending := False;
- g_GFX_OnceAnim((Obj.X+32)-32, (Obj.Y+8)-32, Anim);
+ g_GFX_OnceAnim((Obj.X+32)-58, (Obj.Y+8)-36, Anim);
Anim.Free();
end;
end
end;
end;
+ WEAPON_FLAMETHROWER: // Îãíåìåò
+ begin
+ // Ñî âðåìåíåì óìèðàåò
+ if (Timeout < 1) then
+ begin
+ ShotType := 0;
+ Continue;
+ end;
+ // Ïîä âîäîé òîæå
+ if WordBool(st and (MOVE_HITWATER or MOVE_INWATER)) then
+ begin
+ if WordBool(st and MOVE_HITWATER) then
+ begin
+ if g_Frames_Get(_id, 'FRAMES_SMOKE') then
+ begin
+ Anim := TAnimation.Create(_id, False, 3);
+ Anim.Alpha := 0;
+ g_GFX_OnceAnim(cx-4+Random(8)-(Anim.Width div 2),
+ cy-4+Random(8)-(Anim.Height div 2),
+ Anim, ONCEANIM_SMOKE);
+ Anim.Free();
+ end;
+ end
+ else
+ g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
+ ShotType := 0;
+ Continue;
+ end;
+
+ // Ãðàâèòàöèÿ
+ if Stopped = 0 then
+ Obj.Accel.Y := Obj.Accel.Y + 1;
+ // Ïîïàëè â ñòåíó èëè â âîäó:
+ if WordBool(st and (MOVE_HITWALL or MOVE_HITLAND or MOVE_HITCEIL or MOVE_HITWATER)) then
+ begin
+ // Ïðèëèïàåì:
+ Obj.Vel.X := 0;
+ Obj.Vel.Y := 0;
+ Obj.Accel.Y := 0;
+ if WordBool(st and MOVE_HITWALL) then
+ Stopped := MOVE_HITWALL
+ else if WordBool(st and MOVE_HITLAND) then
+ Stopped := MOVE_HITLAND
+ else if WordBool(st and MOVE_HITCEIL) then
+ Stopped := MOVE_HITCEIL;
+ end;
+
+ a := IfThen(Stopped = 0, 3, 1);
+ // Åñëè â êîãî-òî ïîïàëè
+ if g_Weapon_Hit(@Obj, a, SpawnerUID, HIT_FLAME, False) <> 0 then
+ begin
+ // HIT_FLAME ñàì ïîäîææåò
+ // Åñëè â ïîëåòå ïîïàëè, èñ÷åçàåì
+ if Stopped = 0 then
+ ShotType := 0;
+ end;
+
+ if Stopped = 0 then
+ tf := 2
+ else
+ tf := 3;
+
+ if (gTime mod tf = 0) then
+ begin
+ Anim := TAnimation.Create(TextureID, False, 2 + Random(2));
+ Anim.Alpha := 0;
+ case Stopped of
+ MOVE_HITWALL: g_GFX_OnceAnim(cx-4+Random(8)-(Anim.Width div 2),
+ cy-12+Random(24)-(Anim.Height div 2),
+ Anim, ONCEANIM_SMOKE);
+ MOVE_HITLAND: g_GFX_OnceAnim(cx-12+Random(24)-(Anim.Width div 2),
+ cy-10+Random(8)-(Anim.Height div 2),
+ Anim, ONCEANIM_SMOKE);
+ MOVE_HITCEIL: g_GFX_OnceAnim(cx-12+Random(24)-(Anim.Width div 2),
+ cy+6+Random(8)-(Anim.Height div 2),
+ Anim, ONCEANIM_SMOKE);
+ else g_GFX_OnceAnim(cx-4+Random(8)-(Anim.Width div 2),
+ cy-4+Random(8)-(Anim.Height div 2),
+ Anim, ONCEANIM_SMOKE);
+ end;
+ Anim.Free();
+ end;
+ end;
+
WEAPON_BFG: // BFG
begin
// Ïîïàëà â âîäó - ýëåêòðîøîê ïî âîäå:
begin
if gGameSettings.GameType = GT_SERVER then
MH_SEND_DeleteShot(i, Obj.X, Obj.Y, Loud);
- Animation.Free();
- Animation := nil;
+ if Animation <> nil then
+ begin
+ Animation.Free();
+ Animation := nil;
+ end;
end
- else if (oldvx <> Obj.Vel.X) or (oldvy <> Obj.Vel.Y) then
+ else if (ShotType <> WEAPON_FLAMETHROWER) and ((oldvx <> Obj.Vel.X) or (oldvy <> Obj.Vel.Y)) then
if gGameSettings.GameType = GT_SERVER then
MH_SEND_UpdateShot(i);
end;
else
Animation.Draw(Obj.X, Obj.Y, M_NONE);
end
- else
+ else if TextureID <> 0 then
begin
if (Shots[i].ShotType = WEAPON_ROCKETLAUNCHER) then
e_DrawAdv(TextureID, Obj.X, Obj.Y, 0, True, False, a, @p, M_NONE)
- else
+ else if (Shots[i].ShotType <> WEAPON_FLAMETHROWER) then
e_Draw(TextureID, Obj.X, Obj.Y, 0, True, False);
end;
+
+ if g_debug_Frames then
+ begin
+ e_DrawQuad(Obj.X+Obj.Rect.X,
+ Obj.Y+Obj.Rect.Y,
+ Obj.X+Obj.Rect.X+Obj.Rect.Width-1,
+ Obj.Y+Obj.Rect.Y+Obj.Rect.Height-1,
+ 0, 255, 0);
+ end;
end;
end;
Mem.WriteDWORD(Shots[i].Triggers[j]);
// Îáúåêò ñíàðÿäà:
Obj_SaveState(@Shots[i].Obj, Mem);
+ // Êîñòûëèíà åáàíàÿ:
+ Mem.WriteByte(Shots[i].Stopped);
end;
end;
Mem.ReadDWORD(Shots[i].Triggers[j]);
// Îáúåêò ïðåäìåòà:
Obj_LoadState(@Shots[i].Obj, Mem);
+ // Êîñòûëèíà åáàíàÿ:
+ Mem.ReadByte(Shots[i].Stopped);
// Óñòàíîâêà òåêñòóðû èëè àíèìàöèè:
Shots[i].TextureID := DWORD(-1);
if Shots = nil then
Exit;
if (I > High(Shots)) or (I < 0) then Exit;
-
+
with Shots[I] do
begin
if ShotType = 0 then Exit;
s := 'FRAMES_EXPLODE_PLASMA'
else
s := 'FRAMES_EXPLODE_BSPFIRE';
-
+
if g_Frames_Get(TextureID, s) and loud then
begin
Anim := TAnimation.Create(TextureID, False, 3);