Skip to content

Taking Extra Precautions for .50AE #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UndeadZeratul merged 2 commits into from
Jul 15, 2025
Merged

Taking Extra Precautions for .50AE #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b1fcd
Minor Formatting
UndeadZeratul Jun 1, 2025
0522e67
Fully Comment-out .50AE file
UndeadZeratul Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 83 additions & 83 deletions zscript/HDBulletLib/Ammunition/50AE.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,94 +2,94 @@
// CREATED BY ACCENSUS
// ------------------------------

class HDB_50AE : HDBulletActor
{
Default
{
PushFactor 0.375;
Mass 220;
Speed HDCONST_MPSTODUPT * 520;
Accuracy 260;
Stamina 1270;
WoundHealth 45;
HDBulletActor.Hardness 3;
}
}
// class HDB_50AE : HDBulletActor
// {
// Default
// {
// PushFactor 0.375;
// Mass 220;
// Speed HDCONST_MPSTODUPT * 520;
// Accuracy 260;
// Stamina 1270;
// WoundHealth 45;
// HDBulletActor.Hardness 3;
// }
// }

class HDSpent50AE : HDSpent9mm
{
Default
{
BounceSound "misc/casing";
XScale 0.8;
YScale 0.7;
}
States
{
Spawn:
PBRS A 2 NoDelay
{
A_SetRoll(roll + 45, SPF_INTERPOLATE);
}
Loop;
Death:
PBRS # -1;
Stop;
}
}
// class HDSpent50AE : HDSpent9mm
// {
// Default
// {
// BounceSound "misc/casing";
// XScale 0.8;
// YScale 0.7;
// }
// States
// {
// Spawn:
// PBRS A 2 NoDelay
// {
// A_SetRoll(roll + 45, SPF_INTERPOLATE);
// }
// Loop;
// Death:
// PBRS # -1;
// Stop;
// }
// }

class HD50AEAmmo : HDRoundAmmo
{
override void SplitPickup()
{
SplitPickupBoxableRound(10, 50, "HD50AEBoxPickup", "TEN9A0", "PRNDA0");
}
// class HD50AEAmmo : HDRoundAmmo
// {
// override void SplitPickup()
// {
// SplitPickupBoxableRound(10, 50, "HD50AEBoxPickup", "TEN9A0", "PRNDA0");
// }

const EncRoundLoaded = 0.65;
const EncRound = EncRoundLoaded * 1.4;
// const EncRoundLoaded = 0.65;
// const EncRound = EncRoundLoaded * 1.4;

Default
{
+INVENTORY.IGNORESKILL
+CANNOTPUSH
+FORCEXYBILLBOARD
+ROLLSPRITE
+ROLLCENTER
+HDPICKUP.MULTIPICKUP
XScale 0.9;
YScale 0.8;
Tag "$TAG_50AE";
Inventory.icon "TEN9A0";
Inventory.PickupMessage "$PICKUP_50AE";
HDPickup.RefId "50r";
HDPickup.Bulk EncRound;
}
// Default
// {
// +INVENTORY.IGNORESKILL
// +CANNOTPUSH
// +FORCEXYBILLBOARD
// +ROLLSPRITE
// +ROLLCENTER
// +HDPICKUP.MULTIPICKUP
// XScale 0.9;
// YScale 0.8;
// Tag "$TAG_50AE";
// Inventory.icon "TEN9A0";
// Inventory.PickupMessage "$PICKUP_50AE";
// HDPickup.RefId "50r";
// HDPickup.Bulk EncRound;
// }

States
{
Spawn:
PRND A -1;
TEN9 A -1;
Stop;
}
}
// States
// {
// Spawn:
// PRND A -1;
// TEN9 A -1;
// Stop;
// }
// }


class HD50AEBoxPickup : HDUPK
{
Default
{
Scale 0.32;
HDUPK.Amount 50;
HDUPK.PickupSound "weapons/pocket";
HDUPK.PickupMessage "$PICKUP_50AEBOX";
HDUPK.PickupType "HD50AEAmmo";
}
// class HD50AEBoxPickup : HDUPK
// {
// Default
// {
// Scale 0.32;
// HDUPK.Amount 50;
// HDUPK.PickupSound "weapons/pocket";
// HDUPK.PickupMessage "$PICKUP_50AEBOX";
// HDUPK.PickupType "HD50AEAmmo";
// }

states
{
Spawn:
50AE X -1;
Stop;
}
}
// states
// {
// Spawn:
// 50AE X -1;
// Stop;
// }
// }
6 changes: 3 additions & 3 deletions zscript/HDBulletLib/SpawnHandler.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const HDCONST_HDBLEVENT = HDCONST_BPSPAWNPOOLEVENT + 1;
class HDBulletLibHandler : EventHandler {
// [Ace] Order here must match bitshifting order in menudef and zscript files. - [Ted, UZ]
static const class<HDAmmo> RemovedClasses[] = {
'HDNDMLoose',
'HDNDMLoose',
'HDSlugAmmo',
'HD500SWLightAmmo',
'HD500SWHeavyAmmo',
Expand Down Expand Up @@ -621,8 +621,8 @@ class HDBulletLibAmmoSpawner: EventHandler {
let item = Inventory(thing);
if (
(prespawn || ammoSpawn.isPersistent)
&& (!(item && item.owner) && prespawn)
&& !ammoSpawn.replaceAmmo
&& (!(item && item.owner) && prespawn)
&& !ammoSpawn.replaceAmmo
) {
foreach (spawnReplace : ammoSpawn.spawnReplaces) {
if (spawnReplace.name ~== candidateName) {
Expand Down