From 2b4061ae07fe1bf12d49fc1213d7eb3e9e34ccb6 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 12 Aug 2017 21:42:30 +0300 Subject: [PATCH] more flamer tweaks --- src/game/g_monsters.pas | 11 +++++---- src/game/g_player.pas | 16 +++++++++---- src/game/g_weapons.pas | 51 ++++++++++++++++++++++++++--------------- 3 files changed, 51 insertions(+), 27 deletions(-) diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas index cc4926a..e37e2e4 100644 --- a/src/game/g_monsters.pas +++ b/src/game/g_monsters.pas @@ -77,6 +77,7 @@ type FShellTimer: Integer; FShellType: Byte; FFirePainTime: Integer; + FFireAttacker: Word; vilefire: TAnimation; FDieTriggers: Array of Integer; @@ -124,7 +125,7 @@ type function AnimIsReverse: Boolean; function shoot(o: PObj; immediately: Boolean): Boolean; function kick(o: PObj): Boolean; - procedure CatchFire(); + procedure CatchFire(Attacker: Word); procedure OnFireFlame(Times: DWORD = 1); property MonsterType: Byte read FMonsterType; @@ -1484,6 +1485,7 @@ begin FBehaviour := BH_NORMAL; FFireTime := 0; FFirePainTime := 0; + FFireAttacker := 0; if FMonsterType in [MONSTER_ROBO, MONSTER_BARREL] then FBloodKind := BLOOD_SPARKS @@ -2063,7 +2065,7 @@ begin if (FState <> STATE_DIE) and (FState <> STATE_DEAD) then if FFirePainTime = 0 then begin - Damage(5, 0, 0, 0, HIT_FLAME); + Damage(5, FFireAttacker, 0, 0, HIT_FLAME); FFirePainTime := 18; end else @@ -4180,9 +4182,10 @@ begin SetLength(FDieTriggers, 0); end; -procedure TMonster.CatchFire(); +procedure TMonster.CatchFire(Attacker: Word); begin - FFireTime := 360; + FFireTime := 100; + FFireAttacker := Attacker; if g_Game_IsNet and g_Game_IsServer then MH_SEND_MonsterState(FUID); end; diff --git a/src/game/g_player.pas b/src/game/g_player.pas index a0496da..050e0e6 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -168,6 +168,7 @@ type FXTo, FYTo: Integer; FSpectatePlayer: Integer; FFirePainTime: Integer; + FFireAttacker: Word; FSavedState: TPlayerSavedState; @@ -308,7 +309,7 @@ type procedure RealizeCurrentWeapon(); procedure JetpackOn; procedure JetpackOff; - procedure CatchFire(); + procedure CatchFire(Attacker: Word); property Name: String read FName write FName; property Model: TPlayerModel read FModel; @@ -575,7 +576,7 @@ const // WEAPON_CHAINGUN, WEAPON_SHOTGUN1, WEAPON_SAW, // WEAPON_ROCKETLAUNCHER, WEAPON_PISTOL, WEAPON_KASTET); WEAPON_RELOAD: Array [WP_FIRST..WP_LAST] of Byte = - (5, 2, 6, 18, 36, 2, 12, 2, 14, 2, 0); + (5, 2, 6, 18, 36, 2, 12, 2, 14, 2, 2); PLAYER_SIGNATURE = $52594C50; // 'PLYR' CORPSE_SIGNATURE = $50524F43; // 'CORP' @@ -1993,6 +1994,7 @@ begin FShellTimer := -1; FFireTime := 0; FFirePainTime := 0; + FFireAttacker := 0; FActualModelName := 'doomer'; @@ -2880,9 +2882,10 @@ begin FJetSoundOff.PlayAt(FObj.X, FObj.Y); end; -procedure TPlayer.CatchFire(); +procedure TPlayer.CatchFire(Attacker: Word); begin - FFireTime := 360; + FFireTime := 100; + FFireAttacker := Attacker; if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID); end; @@ -4236,6 +4239,9 @@ begin FDamageBuffer := 0; FJetpack := False; FCanJetpack := False; + FFireTime := 0; + FFirePainTime := 0; + FFireAttacker := 0; // Àíèìàöèÿ âîçðîæäåíèÿ: if (not gLoadGameMode) and (not Silent) then @@ -4840,7 +4846,7 @@ begin if FFirePainTime <= 0 then begin if g_Game_IsServer then - Damage(5, 0, 0, 0, HIT_FLAME); + Damage(5, FFireAttacker, 0, 0, HIT_FLAME); FFirePainTime := 18; end; FFirePainTime := FFirePainTime - 1; diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas index 47de7ab..0b82e18 100644 --- a/src/game/g_weapons.pas +++ b/src/game/g_weapons.pas @@ -143,7 +143,7 @@ const SHOT_FLAME_WIDTH = 4; SHOT_FLAME_HEIGHT = 4; - SHOT_FLAME_LIFETIME = 360; + SHOT_FLAME_LIFETIME = 180; SHOT_SIGNATURE = $544F4853; // 'SHOT' @@ -358,7 +358,7 @@ begin else Result := True; if t = HIT_FLAME then - m.CatchFire(); + m.CatchFire(SpawnerUID); end else Result := True; @@ -377,7 +377,7 @@ 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(); + p.CatchFire(SpawnerUID); end; Result := True; @@ -684,10 +684,13 @@ begin Shots[i].Obj.Accel.Y := 0; if Shots[i].ShotType in [WEAPON_ROCKETLAUNCHER, WEAPON_BFG] then Shots[i].Timeout := 900 // ~25 sec - else if Shots[i].ShotType = WEAPON_FLAMETHROWER then - Shots[i].Timeout := SHOT_FLAME_LIFETIME - 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; @@ -1249,11 +1252,12 @@ begin 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; @@ -1287,10 +1291,11 @@ begin 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); @@ -1326,10 +1331,11 @@ begin 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; @@ -1364,10 +1370,11 @@ begin 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; - ShotType := WEAPON_FLAMETHROWER; Animation := nil; TextureID := 0; Stopped := 0; @@ -1403,10 +1410,11 @@ begin 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; @@ -1441,10 +1449,11 @@ begin 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; @@ -1479,10 +1488,11 @@ begin 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; @@ -1517,10 +1527,12 @@ begin 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; @@ -1555,10 +1567,12 @@ begin 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'); Animation := TAnimation.Create(FramesID, True, 4); end; @@ -1593,10 +1607,11 @@ begin 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; @@ -1928,7 +1943,7 @@ begin ShotType := 0; end; - if g_Frames_Get(_id, 'FRAMES_FLAME') then + if g_Frames_Get(_id, 'FRAMES_FLAME') and (gTime mod 2 = 0) then begin Anim := TAnimation.Create(_id, False, 2 + Random(2)); Anim.Alpha := 0; -- 2.29.2