Skip to content

Minor Refactoring #36

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
merged 2 commits into from
Oct 8, 2024
Merged

Minor Refactoring #36

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
7a65c10
Hoist .45 ACP Encumbrance Constants into global scope
UndeadZeratul Aug 16, 2024
a36b31b
Spawn Casings on HDCasingBits, not SevenMilBrass
UndeadZeratul Oct 8, 2024
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
8 changes: 6 additions & 2 deletions zscript/HDBulletLib/Ammunition/45ACP.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
// CREATED BY POPGUY12
// ------------------------------


const ENC_45ACPLOADED = 0.55;
const ENC_45ACP = ENC_45ACPLOADED * 1.35;

class HDB_45ACP : HDBulletActor
{
Default
Expand Down Expand Up @@ -43,8 +47,8 @@ class HD45ACPAmmo : HDRoundAmmo
SplitPickupBoxableRound(10, 50, "HD45ACPBoxPickup", "45TNA0", "45RNA0");
}

const EncRoundLoaded = 0.55;
const EncRound = EncRoundLoaded * 1.35;
const EncRoundLoaded = ENC_45ACPLOADED;
const EncRound = ENC_45ACP;

Default
{
Expand Down
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 @@ -274,7 +274,7 @@ class HDBulletLibAmmoSpawner: EventHandler {
addAmmo('HD50OMGBoxPickup', spawns_50omgbox, hdb_50omg_persistent_spawning);
// .50 OMG Casing
Array<HDBLRSpawnAmmoEntry> spawns_50omgcasing;
spawns_50omgcasing.push(addAmmoEntry('SevenMilBrass', hdb_50omg_casing_spawn_bias));
spawns_50omgcasing.push(addAmmoEntry('HDCasingBits', hdb_50omg_casing_spawn_bias));
addAmmo('HDSpent50OMG', spawns_50omgcasing, hdb_50omg_persistent_spawning);

// .45 ACP Box Pickup
Expand Down Expand Up @@ -435,7 +435,7 @@ class HDBulletLibAmmoSpawner: EventHandler {
addAmmo('HD3006BoxPickup', spawns_3006box, hdb_3006_persistent_spawning);
// .30-06 Casing/Brass
Array<HDBLRSpawnAmmoEntry> spawns_3006casing;
spawns_3006casing.push(addAmmoEntry('SevenMilBrass', hdb_3006_casing_spawn_bias));
spawns_3006casing.push(addAmmoEntry('HDCasingBits', hdb_3006_casing_spawn_bias));
addAmmo('HDSpent3006', spawns_3006casing, hdb_3006_persistent_spawning);

// 4-Gauge Buckshot Box
Expand Down Expand Up @@ -486,7 +486,7 @@ class HDBulletLibAmmoSpawner: EventHandler {
addAmmo('Savage300Ammo', spawns_300savageammo, hdb_300savage_persistent_spawning);
// .300 Savage Casing
Array<HDBLRSpawnAmmoEntry> spawns_300savage_casing;
spawns_300savage_casing.push(addAmmoEntry('SevenMilBrass', hdb_300savage_casing_spawn_bias));
spawns_300savage_casing.push(addAmmoEntry('HDCasingBits', hdb_300savage_casing_spawn_bias));
addAmmo('Savage300Brass', spawns_300savage_casing, hdb_300savage_persistent_spawning);

// 7.62 Tokarev Box Pickup
Expand Down