Skip to content
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.

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

ballistics rework pt1 #10

Merged
merged 9 commits into from
Jan 3, 2025
Merged

ballistics rework pt1 #10

merged 9 commits into from
Jan 3, 2025

Conversation

MilonPL
Copy link
Collaborator

@MilonPL MilonPL commented Dec 30, 2024

About the PR

part 1 of the ballistics rework
the product of staring at yaml for 9,5 hours
still needs wield sprites

changes calibers to be more realistic:
.20 rifle > 7.62x51mm
.30 rifle > 5.56x45mm
.35 auto > 9x19mm
.25 caseless > 4.73x33mm
.50 > 12 gauge
.45 magnum > .44 Magnum

adds a new caliber - 10mm auto, which is meant for heavy sidearms

adds 7 new weapons:

  • m-90 (no gl version, 5.56mm)
  • Tenebra (7.62mm, rare security/syndicate MBR
  • SC-84 Vulcan (7.62, security MBR)
  • AS-9 Nightshade (PAST/spec ops caseless silenced rifle)
  • M25 Tactical (10mm auto sec pistol)
  • Pollock (10mm auto sec/uplink pistol)
  • M23 Patrol (9x19mm Mk58 replacement)
  • Vector (10mm auto SMG)

renamed vulcan to AR-19 Lecter, rechambered into 5.56mm
added atreidas to the uplink
added pollock to the uplink
removed hristov from the uplink
re-chambered a bunch of other weapons

adjusted mag capacity (see below)

boosted the damage of all calibers:
.44 magnum - 45
7.62mm - 42
5.56mm - 34
10mm - 28
4.73mm - 26
9mm - 22
12 gauge pellet: 12 (times 6)
12 gauge slug: 40

boosted the muzzle velocity of all guns (bullets are faster than a nerf dart now)

image

added gun examine
shift clicking shows the caliber

image

detailed gun examine shows the specs (you can grep the repo anyways so theres no reason to not show it to new players)

image

added random safe spawners

image

added tracer ammunition

image

@MilonPL MilonPL added the S: Do Not Merge Don't merge this yet label Dec 30, 2024
@MilonPL MilonPL requested review from a team as code owners December 30, 2024 09:53
@github-actions github-actions bot added S: Needs Review size/M 100-999 lines Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files and removed S: Needs Review size/M 100-999 lines labels Dec 30, 2024
Copy link
Contributor

github-actions bot commented Dec 30, 2024

RSI Diff Bot; head commit d7b5483 merging into 8d66a90
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi

State Old New Status
incendiary Added
red-icon Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi

State Old New Status
red-icon Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m23.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/m25.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Pistols/pollock.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/carbinenogl.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/nightshade.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/tenebra.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_Emberfall/Objects/Weapons/Guns/Rifles/vulcan.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
equipped-SUITSTORAGE Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
wielded-inhand-left Added
wielded-inhand-right Added

Edit: diff updated after d7b5483

@github-actions github-actions bot added the size/M 100-999 lines label Dec 31, 2024
@MilonPL MilonPL removed the S: Do Not Merge Don't merge this yet label Dec 31, 2024
Monotheonist
Monotheonist previously approved these changes Jan 2, 2025
Copy link

@Monotheonist Monotheonist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very clean yaml, what the fuck.

Other than the C# component this should be fine. I'm gonna blindly approve. I have no idea what that does. 👍

@MilonPL
Copy link
Collaborator Author

MilonPL commented Jan 3, 2025

i think this is good to go
i probably overlooked something or fucked up somewhere, but what's the worst that could happen

@MilonPL MilonPL merged commit b9dda67 into master Jan 3, 2025
14 checks passed
@MilonPL MilonPL deleted the ballistics branch January 3, 2025 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any audio files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files size/M 100-999 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants