Allow Silver Bullet to eject unfired rounds (hold altfire + press fire).
Polysort pass on some models. Fix a broken color escape in the Akari Project lore entry.
This commit is contained in:
parent
eec414baa1
commit
30682bf369
21 changed files with 109 additions and 15 deletions
|
|
@ -197,7 +197,7 @@ The definitive model of **Blackmann Arms**'s legendary **Silver Bullet** series.
|
|||
|
||||
**Primary fire:** Shoot the bullet. A second press chambers another round.
|
||||
|
||||
**Secondary fire:** Picks the ammo for the next reload.
|
||||
**Secondary fire:** On tap, picks the ammo for the next reload. On hold, also tap primary to manually cock (in case you want to eject unfired rounds).
|
||||
|
||||
**Reload:** Reload (what else is new) or switch ammo types.
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ SWWM_LORETXT_EMPCARBINE = "\cxDesignation:\c-\n\cf EMP Rail Carbine\c-\n\cxManuf
|
|||
SWWM_LORETAG_SILVERBULLET = "Silver Bullet JET";
|
||||
SWWM_LORETAB_SILVERBULLET = "Item";
|
||||
SWWM_LOREREL_SILVERBULLET = "Blackmann;Forx;Explodium";
|
||||
SWWM_LORETXT_SILVERBULLET = "\cxDesignation:\c-\n\cf Silver Bullet JET\c-\n\cxManufacturer:\c-\n\cf Blackmann Arms Ltd.\c-\n\cf Forx Aeronautics\c-\n\cxClassification:\c-\n\cf Ultra-High Caliber Sniper Rifle\c-\n\nThe \cfSilver Bullet JET\c- is the 1.150 member of the \cfSilver Bullet\c- series of ultra-high caliber rifles manufactured by \cfBlackmann Arms\c-. It was created as a lighter, more \"reasonable\" alternative to the 1.350 \cfBehemoth\c- model. Weighing 43 kilograms and sporting a total length of 2.4 meters, it is sufficiently compact for non-augmented human use.\n\nThe main ammunition designed for this specific model is the 1.150 \cfXSB (eXplosive Super Burst)\c-. These beastly rounds are partially based on a NATO standard 30x113mm cartridge, and employ a low density \cfExplodium\c- shaped charge as propellant, allowing high velocity while still being safe for use. The bullets themselves are composed of a tungsten carbide core, snugly wrapped in an aluminum jacket, and decorated with a thin silver plating for aesthetic appearance (Silver Bullets are, indeed, NOT really made of silver). XSB rounds can penetrate several targets before eventually stopping, depending on their size, they may also do the same for thin walls.\n\nThe secondary ammunition is the 1.150 \cfFCB (Fat Chode Bomb)\c-. Personally named by the CEO of Blackmann Arms himself, FCBs are quite similar to the standard XSB ammunition, but instead the bullets are full of additional Explodium, which on impact, is released violently, propagating its deadly blast through solid surfaces. Due to the volatility of these bullets, the propellant employed is slightly less potent, which results in a diminished potential for target penetration, but the blast definitely compensates for this. The explosive charge is so powerful that it can break some walls to pieces.\n\nIn order to compensate for its massive recoil, the weapon redirects a part of the gasses from round ignition into a set of jet compensators designed by \cfForx Aeronautics\c-. Although partially cooled in the process, it is still hot enough to cause some damage to users not wearing adequate protection.\n\n\cfPrimary Fire:\c- Shoot the bullet. Any small targets hit by it are pretty much turned to paste. A second press after firing will chamber another round.\n\n\cfSecondary Fire:\c- Switches next reload between XSB and FCB ammunition, if available.\n\n\cfReloading:\c- Reloads the weapon. Each magazine holds 5 rounds. An extra round can also be kept chambered.\n\n\cfZoom:\c- Custom-tailored adjustable telescopic sight, up to 16x. Equipped with a soft foam covering to protect the user's face during scoped fire.\n\n\cfTechniques:\c- When going prone to use the bipod, the recoil compensators will automatically disengage, resulting in increased firepower at the cost of less mobility.\n\n\cxSaya's Notes:\c-\n\cfWhat was that quote again, \"there is no kill like overkill\"? Yeah, sounds about right for this thing.\c-\n\n\cfThe fuck are you even supposed to hunt with it, wild tanks? I suppose... bigass beefy demons could also count, but you're going to just turn them all to fucking paste.\c-";
|
||||
SWWM_LORETXT_SILVERBULLET = "\cxDesignation:\c-\n\cf Silver Bullet JET\c-\n\cxManufacturer:\c-\n\cf Blackmann Arms Ltd.\c-\n\cf Forx Aeronautics\c-\n\cxClassification:\c-\n\cf Ultra-High Caliber Sniper Rifle\c-\n\nThe \cfSilver Bullet JET\c- is the 1.150 member of the \cfSilver Bullet\c- series of ultra-high caliber rifles manufactured by \cfBlackmann Arms\c-. It was created as a lighter, more \"reasonable\" alternative to the 1.350 \cfBehemoth\c- model. Weighing 43 kilograms and sporting a total length of 2.4 meters, it is sufficiently compact for non-augmented human use.\n\nThe main ammunition designed for this specific model is the 1.150 \cfXSB (eXplosive Super Burst)\c-. These beastly rounds are partially based on a NATO standard 30x113mm cartridge, and employ a low density \cfExplodium\c- shaped charge as propellant, allowing high velocity while still being safe for use. The bullets themselves are composed of a tungsten carbide core, snugly wrapped in an aluminum jacket, and decorated with a thin silver plating for aesthetic appearance (Silver Bullets are, indeed, NOT really made of silver). XSB rounds can penetrate several targets before eventually stopping, depending on their size, they may also do the same for thin walls.\n\nThe secondary ammunition is the 1.150 \cfFCB (Fat Chode Bomb)\c-. Personally named by the CEO of Blackmann Arms himself, FCBs are quite similar to the standard XSB ammunition, but instead the bullets are full of additional Explodium, which on impact, is released violently, propagating its deadly blast through solid surfaces. Due to the volatility of these bullets, the propellant employed is slightly less potent, which results in a diminished potential for target penetration, but the blast definitely compensates for this. The explosive charge is so powerful that it can break some walls to pieces.\n\nIn order to compensate for its massive recoil, the weapon redirects a part of the gasses from round ignition into a set of jet compensators designed by \cfForx Aeronautics\c-. Although partially cooled in the process, it is still hot enough to cause some damage to users not wearing adequate protection.\n\n\cfPrimary Fire:\c- Shoot the bullet. Any small targets hit by it are pretty much turned to paste. A second press after firing will chamber another round.\n\n\cfSecondary Fire:\c- Tap to switch next reload between XSB and FCB ammunition, if available. Hold and then press primary fire to manually cock, allowing you to retrieve unfired rounds.\n\n\cfReloading:\c- Reloads the weapon. Each magazine holds 5 rounds. An extra round can also be kept chambered.\n\n\cfZoom:\c- Custom-tailored adjustable telescopic sight, up to 16x. Equipped with a soft foam covering to protect the user's face during scoped fire.\n\n\cfTechniques:\c- When going prone to use the bipod, the recoil compensators will automatically disengage, resulting in increased firepower at the cost of less mobility.\n\n\cxSaya's Notes:\c-\n\cfWhat was that quote again, \"there is no kill like overkill\"? Yeah, sounds about right for this thing.\c-\n\n\cfThe fuck are you even supposed to hunt with it, wild tanks? I suppose... bigass beefy demons could also count, but you're going to just turn them all to fucking paste.\c-";
|
||||
SWWM_LORETAG_BLACKFIREIGNITER = "Blackfire Igniter";
|
||||
SWWM_LORETAB_BLACKFIREIGNITER = "Item";
|
||||
SWWM_LOREREL_BLACKFIREIGNITER = "Sankaideriha;Unissix;Gods;Saya";
|
||||
|
|
@ -454,7 +454,7 @@ SWWM_LORETAB_AKARIPROJECT = "Item";
|
|||
SWWM_LOREREL_AKARIPROJECT = "Saya;Luna;Nukuri;UAC;Hell;Kirin";
|
||||
SWWM_LORETXT_AKARIPROJECT = "\cxTitle:\c-\n\cf The Akari Project\c-\n\cxAuthor:\c-\n\cf Saya Miyamoto\c-\n\cxGenre:\c-\n\cf Science Fiction\c-\n\cxYear:\c-\n\cf 2021\c-\n\n\cfSynopsis:\c- In the year 2040, human science has evolved to levels never before seen. Mankind has explored not just their nearest planets, but those of neighboring suns too, and yet, there is more they wish, to go farther, to step beyond even the confines of their galaxy, and have every corner of the universe at the reach of their fingertips. It is then, that the greatest minds from all around the world are reunited, with one purpose, one mission: The Akari Project.\n\n\cfThe Akari Project\c- is \cfSaya Miyamoto\c-'s first foray into sci-fi novel writing, all the way back in 2021, when humanity had only just made its first alien contact through the \cfLuna Event\c-. It was advertised as a possible look into the future that the \cfNukuri\c- alliance would provide, though nowadays it's seen more as an unfortunately \"too optimistic\" vision of said future. Nevertheless, its main premise still stands to become a reality, with Saya herself promising to spearhead a real Akari Project someday, for humanity to create its own gates into the farthest corners of the universe and beyond.\n\n\cxSaya's Notes:\c-\n\cfYeah... I was really dumb back then, thinking everything would turn out so well and all, but instead look at where we are, with humankind's first interdimensional travel experiments opening a goddamn portal to Hell of all places (fuck the UAC). And let's not get started on all those \"advances\" in science I fantasized about. Most of those are way far for us, even though all the others have them (or even better stuff). We're just lagging behind because of all the stupid shit people keep doing and all the work those capitalist trashlords do to set everything back (fuck 'em).\c-\n\n\cfBut yeah, I totally want to make this real now, since I've got the know-how to do all this, mainly thanks to Zana-sama and her contacts. Well, I know the basics, at least, so I'll have to figure out the rest myself.\c-";
|
||||
SWWM_LORETXT_AKARIPROJECT2 = "\cxTitle:\c-\n\cf The Akari Project\c-\n\cxAuthor:\c-\n\cf Saya Miyamoto\c-\n\cxGenre:\c-\n\cf Science Fiction\c-\n\cxYear:\c-\n\cf 2021\c-\n\n\cfSynopsis:\c- In the year 2040, human science has evolved to levels never before seen. Mankind has explored not just their nearest planets, but those of neighboring suns too, and yet, there is more they wish, to go farther, to step beyond even the confines of their galaxy, and have every corner of the universe at the reach of their fingertips. It is then, that the greatest minds from all around the world are reunited, with one purpose, one mission: The Akari Project.\n\n\cfThe Akari Project\c- is \cfSaya Miyamoto\c-'s first foray into sci-fi novel writing, all the way back in 2021, when humanity had only just made its first alien contact through the \cfLuna Event\c-. It was advertised as a possible look into the future that the \cfNukuri\c- alliance would provide, though nowadays it's seen more as an unfortunately \"too optimistic\" vision of said future. Nevertheless, its main premise still stands to become a reality, with Saya herself promising to spearhead a real Akari Project someday, for humanity to create its own gates into the farthest corners of the universe and beyond.\n\n\cxSaya's Notes:\c-\n\cf... And then it all came true, in a way. Good shit that I ended up making the Akari Project become real. Heh, the UAC got SOOOOOOOOOOOO fucking salty over this, it was absolutely delicious. The whole goddamn multiverse is open to us now, and it's all safe and free from pesky demon intervention (unless we use it to actually go to Hell, obviously).\c-\n\n\cfOh this really is the good shit. I look back at the novel now and I'm left wondering if that romantic subplot will ever come true too. You know, when Doctor Kirishima meets Princess Ikana, and they fall in love and... *sigh* Just imagine, a cutie from another world joining us...\c-";
|
||||
SWWM_LORETXT_AKARIPROJECT3 = "\cxTitle:\c-\n\cf The Akari Project\c-\n\cxAuthor:\c-\n\cf Saya Miyamoto\c-\n\cxGenre:\c-\n\cf Science Fiction\c-\n\cxYear:\c-\n\cf 2021\c-\n\n\cfSynopsis:\c- In the year 2040, human science has evolved to levels never before seen. Mankind has explored not just their nearest planets, but those of neighboring suns too, and yet, there is more they wish, to go farther, to step beyond even the confines of their galaxy, and have every corner of the universe at the reach of their fingertips. It is then, that the greatest minds from all around the world are reunited, with one purpose, one mission: The Akari Project.\n\n\cfThe Akari Project\c- is \cfSaya Miyamoto\c-'s first foray into sci-fi novel writing, all the way back in 2021, when humanity had only just made its first alien contact through the \cfLuna Event\c-. It was advertised as a possible look into the future that the \cfNukuri\c- alliance would provide, though nowadays it's seen more as an unfortunately \"too optimistic\" vision of said future. Nevertheless, its main premise still stands to become a reality, with Saya herself promising to spearhead a real Akari Project someday, for humanity to create its own gates into the farthest corners of the universe and beyond.\n\n\cxSaya's Notes:\c-\n\cf... And then it all came true, in a way. Good shit that I ended up making the Akari Project become real. Heh, the UAC got SOOOOOOOOOOOO fucking salty over this, it was absolutely delicious. The whole goddamn multiverse is open to us now, and it's all safe and free from pesky demon intervention (unless we use it to actually go to Hell, obviously).\c-\n\n\cfOh also, remember the romance subplot? Kirishima and Ikana, yeah... huuuuuge parallels with me and Kirin-kun there, just with the genders swapped. Didn't play out exactly the same way, tho, but it's all good shit.\-\n\n\cfI wonder if he'd enjoy reading this. Could be a good way to brush up on his English, too.\c-";
|
||||
SWWM_LORETXT_AKARIPROJECT3 = "\cxTitle:\c-\n\cf The Akari Project\c-\n\cxAuthor:\c-\n\cf Saya Miyamoto\c-\n\cxGenre:\c-\n\cf Science Fiction\c-\n\cxYear:\c-\n\cf 2021\c-\n\n\cfSynopsis:\c- In the year 2040, human science has evolved to levels never before seen. Mankind has explored not just their nearest planets, but those of neighboring suns too, and yet, there is more they wish, to go farther, to step beyond even the confines of their galaxy, and have every corner of the universe at the reach of their fingertips. It is then, that the greatest minds from all around the world are reunited, with one purpose, one mission: The Akari Project.\n\n\cfThe Akari Project\c- is \cfSaya Miyamoto\c-'s first foray into sci-fi novel writing, all the way back in 2021, when humanity had only just made its first alien contact through the \cfLuna Event\c-. It was advertised as a possible look into the future that the \cfNukuri\c- alliance would provide, though nowadays it's seen more as an unfortunately \"too optimistic\" vision of said future. Nevertheless, its main premise still stands to become a reality, with Saya herself promising to spearhead a real Akari Project someday, for humanity to create its own gates into the farthest corners of the universe and beyond.\n\n\cxSaya's Notes:\c-\n\cf... And then it all came true, in a way. Good shit that I ended up making the Akari Project become real. Heh, the UAC got SOOOOOOOOOOOO fucking salty over this, it was absolutely delicious. The whole goddamn multiverse is open to us now, and it's all safe and free from pesky demon intervention (unless we use it to actually go to Hell, obviously).\c-\n\n\cfOh also, remember the romance subplot? Kirishima and Ikana, yeah... huuuuuge parallels with me and Kirin-kun there, just with the genders swapped. Didn't play out exactly the same way, tho, but it's all good shit.\c-\n\n\cfI wonder if he'd enjoy reading this. Could be a good way to brush up on his English, too.\c-";
|
||||
SWWM_LORETAG_LOCKE = "Dr. Locke";
|
||||
SWWM_LORETAB_LOCKE = "People";
|
||||
SWWM_LOREREL_LOCKE = "Kereshnovka;Saya";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,2 +1,2 @@
|
|||
[default]
|
||||
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r642 \cu(Fri 27 Nov 11:56:48 CET 2020)";
|
||||
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r643 \cu(Fri 27 Nov 13:11:29 CET 2020)";
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ TXT
|
|||
\cxSaya's Notes:\c-
|
||||
\cf... And then it all came true, in a way. Good shit that I ended up making the Akari Project become real. Heh, the UAC got SOOOOOOOOOOOO fucking salty over this, it was absolutely delicious. The whole goddamn multiverse is open to us now, and it's all safe and free from pesky demon intervention (unless we use it to actually go to Hell, obviously).\c-
|
||||
|
||||
\cfOh also, remember the romance subplot? Kirishima and Ikana, yeah... huuuuuge parallels with me and Kirin-kun there, just with the genders swapped. Didn't play out exactly the same way, tho, but it's all good shit.\-
|
||||
\cfOh also, remember the romance subplot? Kirishima and Ikana, yeah... huuuuuge parallels with me and Kirin-kun there, just with the genders swapped. Didn't play out exactly the same way, tho, but it's all good shit.\c-
|
||||
|
||||
\cfI wonder if he'd enjoy reading this. Could be a good way to brush up on his English, too.\c-
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ In order to compensate for its massive recoil, the weapon redirects a part of th
|
|||
|
||||
\cfPrimary Fire:\c- Shoot the bullet. Any small targets hit by it are pretty much turned to paste. A second press after firing will chamber another round.
|
||||
|
||||
\cfSecondary Fire:\c- Switches next reload between XSB and FCB ammunition, if available.
|
||||
\cfSecondary Fire:\c- Tap to switch next reload between XSB and FCB ammunition, if available. Hold and then press primary fire to manually cock, allowing you to retrieve unfired rounds.
|
||||
|
||||
\cfReloading:\c- Reloads the weapon. Each magazine holds 5 rounds. An extra round can also be kept chambered.
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Para poder compensar su masivo retroceso, el arma redirige una parte de los gase
|
|||
|
||||
\cfFuego Primario:\c- Dispara la bala. Cualquier objetivo alcanzado por ella queda hecho papilla. Un segundo pulsado tras disparar cargará otra bala.
|
||||
|
||||
\cfFuego Secundario:\c- Alterna entre balas XSB y FCB para la siguiente recarga, si están disponibles.
|
||||
\cfFuego Secundario:\c- Pulsa para alternar entre balas XSB y FCB para la siguiente recarga, si están disponibles. Mantén y luego pulsa fuego primario para accionar el perno manualmente, permitiéndote recuperar balas sin usar.
|
||||
|
||||
\cfRecarga:\c- Recarga el arma. Cada cargador tiene 5 balas. Se puede mantener también una bala extra en la recámara.
|
||||
|
||||
|
|
|
|||
|
|
@ -141,6 +141,37 @@ Model "SilverBullet"
|
|||
FrameIndex XZW7 V 2 22
|
||||
FrameIndex XZW7 W 2 23
|
||||
FrameIndex XZW7 X 2 24
|
||||
// Bullet (XSB)
|
||||
SurfaceSkin 2 6 ""
|
||||
SurfaceSkin 2 5 "SilverbulletBullet.png"
|
||||
SurfaceSkin 2 7 "SilverbulletBullet.png"
|
||||
FrameIndex XZWD P 2 30
|
||||
FrameIndex XZWD Q 2 31
|
||||
FrameIndex XZWD R 2 32
|
||||
FrameIndex XZWD S 2 33
|
||||
FrameIndex XZWD T 2 34
|
||||
FrameIndex XZWD U 2 35
|
||||
FrameIndex XZWD V 2 36
|
||||
FrameIndex XZWD W 2 37
|
||||
FrameIndex XZWD X 2 38
|
||||
FrameIndex XZWD Y 2 39
|
||||
FrameIndex XZWD Z 2 40
|
||||
FrameIndex XZWE A 2 41
|
||||
// Bullet (FCB)
|
||||
SurfaceSkin 2 5 "SilverbulletBullet_FCB.png"
|
||||
SurfaceSkin 2 7 "SilverbulletBullet_FCB.png"
|
||||
FrameIndex XZWE B 2 30
|
||||
FrameIndex XZWE C 2 31
|
||||
FrameIndex XZWE D 2 32
|
||||
FrameIndex XZWE E 2 33
|
||||
FrameIndex XZWE F 2 34
|
||||
FrameIndex XZWE G 2 35
|
||||
FrameIndex XZWE H 2 36
|
||||
FrameIndex XZWE I 2 37
|
||||
FrameIndex XZWE J 2 38
|
||||
FrameIndex XZWE K 2 39
|
||||
FrameIndex XZWE L 2 40
|
||||
FrameIndex XZWE M 2 41
|
||||
}
|
||||
|
||||
Model "SilverBullet"
|
||||
|
|
|
|||
BIN
models/Book_d.3d
BIN
models/Book_d.3d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1902,6 +1902,9 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
|
|||
if ( !pauseme ) pauseme = CVar.GetCVar('swwm_menupause',players[consoleplayer]);
|
||||
if ( pauseme.GetBool() ) menuactive = Menu.On;
|
||||
else menuactive = Menu.OnNoPause;
|
||||
// forcibly tick hud (mainly so interpolators can still update in the background)
|
||||
if ( !multiplayer && (menuactive == Menu.On) )
|
||||
StatusBar.Tick();
|
||||
if ( !multiplayer && ((curtab == TAB_TRADING) || (curtab == TAB_CHAT)) )
|
||||
{
|
||||
MenuSound("menu/demotab");
|
||||
|
|
|
|||
|
|
@ -1015,6 +1015,31 @@ Class SilverBullet : SWWMWeapon
|
|||
c.vel = x*FRandom[Junk](-.5,.5)+y*FRandom[Junk](4,8)-(0,0,FRandom[Junk](1,3));
|
||||
c.vel += vel*.5;
|
||||
}
|
||||
action void A_DropBullet( bool fcb = false )
|
||||
{
|
||||
Vector3 x, y, z;
|
||||
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
|
||||
Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x+10*y-8*z);
|
||||
Class<MagAmmo> mac = fcb?"SilverBullets2":"SilverBullets";
|
||||
MagAmmo ma = MagAmmo(FindInventory(mac));
|
||||
if ( !ma )
|
||||
{
|
||||
ma = MagAmmo(Spawn(mac));
|
||||
ma.Amount = 0;
|
||||
ma.AttachToOwner(self);
|
||||
}
|
||||
if ( ma.Amount < ma.MaxAmount )
|
||||
{
|
||||
ma.Amount++;
|
||||
ma.MagFill();
|
||||
}
|
||||
else
|
||||
{
|
||||
let c = Spawn(mac,origin);
|
||||
c.vel = x*FRandom[Junk](-.5,.5)+y*FRandom[Junk](4,8)-(0,0,FRandom[Junk](1,3));
|
||||
c.vel += vel*.5;
|
||||
}
|
||||
}
|
||||
action void A_DropMag()
|
||||
{
|
||||
if ( invoker.clipcount >= invoker.default.clipcount )
|
||||
|
|
@ -1096,7 +1121,14 @@ Class SilverBullet : SWWMWeapon
|
|||
action void A_AltHold()
|
||||
{
|
||||
A_WeaponReady(WRF_NOFIRE);
|
||||
// tap fire to unload round
|
||||
if ( player.cmd.buttons&BT_ATTACK )
|
||||
{
|
||||
player.SetPSPrite(PSP_WEAPON,invoker.FindState("Cock"));
|
||||
return;
|
||||
}
|
||||
if ( player.cmd.buttons&BT_ALTATTACK ) return;
|
||||
A_SwitchAmmoType();
|
||||
if ( invoker.zoomed ) player.SetPSPrite(PSP_WEAPON,invoker.FindState("ZoomReady"));
|
||||
else player.SetPSPrite(PSP_WEAPON,invoker.fcbloaded?invoker.FindState("Ready2"):invoker.FindState("Ready"));
|
||||
}
|
||||
|
|
@ -1167,12 +1199,13 @@ Class SilverBullet : SWWMWeapon
|
|||
}
|
||||
Wait;
|
||||
AltFire:
|
||||
#### # 1 A_SwitchAmmoType();
|
||||
#### # 1 A_AltHold();
|
||||
Wait;
|
||||
Fire:
|
||||
XZW2 A 1
|
||||
{
|
||||
if ( (player.cmd.buttons&BT_ALTATTACK) && invoker.chambered )
|
||||
return ResolveState("Cock");
|
||||
if ( !invoker.chambered || invoker.fired )
|
||||
{
|
||||
if ( !invoker.fired && (invoker.clipcount <= 0) && (sv_infiniteammo || FindInventory('PowerInfiniteAmmo',true) || (invoker.Ammo1.Amount > 0) || (invoker.Ammo2.Amount > 0) || (CountInv("SilverBullets") > 0) || (CountInv("SilverBullets2") > 0)) )
|
||||
|
|
@ -1241,12 +1274,20 @@ Class SilverBullet : SWWMWeapon
|
|||
XZW3 C 2
|
||||
{
|
||||
A_StartSound("silverbullet/boltopen",CHAN_WEAPON,CHANF_OVERLAP);
|
||||
invoker.fired = false;
|
||||
if ( invoker.chambered )
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Casing2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Casing");
|
||||
if ( invoker.fired )
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Casing2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Casing");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Bullet2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Bullet");
|
||||
}
|
||||
}
|
||||
invoker.fired = false;
|
||||
invoker.chambered = (invoker.clipcount>0);
|
||||
if ( invoker.clipcount > 0 ) invoker.fcbchambered = invoker.fcbloaded;
|
||||
invoker.clipcount = max(0,invoker.clipcount-1);
|
||||
|
|
@ -1263,12 +1304,20 @@ Class SilverBullet : SWWMWeapon
|
|||
XZW9 C 2
|
||||
{
|
||||
A_StartSound("silverbullet/boltopen",CHAN_WEAPON,CHANF_OVERLAP);
|
||||
invoker.fired = false;
|
||||
if ( invoker.chambered )
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Casing2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Casing");
|
||||
if ( invoker.fired )
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Casing2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Casing");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( invoker.fcbchambered ) A_Overlay(PSP_WEAPON+1,"Bullet2");
|
||||
else A_Overlay(PSP_WEAPON+1,"Bullet");
|
||||
}
|
||||
}
|
||||
invoker.fired = false;
|
||||
invoker.chambered = (invoker.clipcount>0);
|
||||
if ( invoker.clipcount > 0 ) invoker.fcbchambered = invoker.fcbloaded;
|
||||
invoker.clipcount = max(0,invoker.clipcount-1);
|
||||
|
|
@ -1288,6 +1337,17 @@ Class SilverBullet : SWWMWeapon
|
|||
XZWD FGHIJKLMNO 1;
|
||||
TNT1 A 0 A_DropCasing(true);
|
||||
Stop;
|
||||
Bullet:
|
||||
XZWD PQ 2;
|
||||
XZWD RSTUVWXYZ 1;
|
||||
XZWE A 1;
|
||||
TNT1 A 0 A_DropBullet();
|
||||
Stop;
|
||||
Bullet2:
|
||||
XZWE BC 2;
|
||||
XZWE DEFGHIJKLM 1;
|
||||
TNT1 A 0 A_DropBullet(true);
|
||||
Stop;
|
||||
ZoomFire:
|
||||
TNT1 A 24;
|
||||
TNT1 A 1 A_JumpIf(invoker.specialf1<=0.,"ZoomReady");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue