From 9bd659e731022d4ba5f7d6e8bf98b24264c9098b Mon Sep 17 00:00:00 2001 From: ketmar Date: Thu, 10 Aug 2023 08:24:29 +0000 Subject: [PATCH] FragfireGun: less casings; nerfed flamethrower a little FossilOrigin-Name: e6946d6c55b53adef4d2a682a452d2a1e22764df9358f30174f8cf781213d65f --- decorate/Weapons/FragfireGun.txt | 48 ++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/decorate/Weapons/FragfireGun.txt b/decorate/Weapons/FragfireGun.txt index 20563a1..159ff64 100644 --- a/decorate/Weapons/FragfireGun.txt +++ b/decorate/Weapons/FragfireGun.txt @@ -304,6 +304,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { Goto ReadyIdle // for sound Fire: + // throw less casing TNT1 A 0 A_JumpIfNoAmmo("Reload") TNT1 A 0 A_JumpIf(waterlevel==3, "UnderwaterDryFire") SPGH A 0 @@ -313,9 +314,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { A_PlaySound("Weapons/FragfireGunFire", CHAN_WEAPON); A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(-1, 3)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing')) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -324,9 +323,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(0, 4)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing') && random(0, 100) > 60) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -335,9 +332,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(1, 5)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing')) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -346,9 +341,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(2, 6)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing') && random(0, 100) > 60) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -357,9 +350,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(3, 7)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing')) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -368,9 +359,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(4, 8)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing') && random(0, 100) > 60) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -379,9 +368,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(5, 9)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing')) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -390,9 +377,7 @@ ACTOR FragfireGun : Weapon replaces Shotgun { { A_SetPitch(-1.0+pitch); A_FireProjectile("FragShot", frandom(-2.5, 2.5), 1, /*3*/0, 0, FPF_NOAUTOAIM, frandom(6, 10)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing') && random(0, 100) > 60) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -421,13 +406,12 @@ ACTOR FragfireGun : Weapon replaces Shotgun { TNT1 A 0 { user_lowPauseCount = -666; - A_TakeInventory("FragfireGunLoaded", 1); + // spend more ammo, because flamethrower is too powerful; was "1" + A_TakeInventory("FragfireGunLoaded", 1+1); A_GunFlash("Flash"); A_SetPitch(-0.3+pitch); A_FireCustomMissile("FlameShot", frandom(-3, 3), 0, 4, -3, FPF_NOAUTOAIM, frandom(-3, 3)); - //if (IsActorClassExists("Zan_FragfireGunCasingSpawn")) - if (GetCVarB('k8ZanMod_FragCasing')) - { + if (GetCVarB('k8ZanMod_FragCasing')) { A_FireCustomMissileEx("Zan_FragfireGunCasingSpawn", 5, false, 4+randompick(0, 1, 2, 3), -6, -6, FPF_NOAUTOAIM); } } @@ -552,8 +536,8 @@ ACTOR FlameShot /*: FastProjectile*/ { Speed 25 Mass 5 Scale 0.7 - //Damage (1*random(2, 6)) - Damage (1*random(12, 16)) + //Damage (1*random(2, 6)) // original + Damage (1*random(12, 16)) // k8 "improved" DamageType "Fire" Projectile ProjectileKickBack 0 @@ -616,8 +600,8 @@ ACTOR FlameShot /*: FastProjectile*/ { TNT1 A 0 A_SpawnItemEx("FireTinyDie3", 0, 0, 1, 0, 0, 0, 0, 0, 170) TNT1 A 0 A_SpawnItemEx("SteamPuffMedium", 0, 0, -25) TNT1 A 0 A_PlaySound("Weapons/FlameDeath", CHAN_WEAPON) - //PFRA M 2 bright A_Explode(random(8, 12), 160, 0, false, 80) - PFRA M 2 bright A_Explode(random(18, 22), 160, 0, false, 80) + //PFRA M 2 bright A_Explode(random(8, 12), 160, 0, false, 80) // original + PFRA M 2 bright A_Explode(random(10, 16), 160, XF_NOSPLASH | XF_THRUSTLESS, false, 80) // k8 "improved" PFRA NOPQ 2 bright Stop -- 2.11.4.GIT