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

Weapons from Delta-V #2693

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jan 12, 2025

Reverts #2692

Fixing some issues before remerge, bless be whatstone.

Copy link
Contributor

github-actions bot commented Jan 12, 2025

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

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

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

Resources/Textures/_DV/Objects/Weapons/Guns/Pistols/universal.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/_DV/Objects/Weapons/Guns/Revolvers/faith.rsi

State Old New Status
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Weapons/Guns/Revolvers/fitz.rsi

State Old New Status
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Weapons/Guns/Revolvers/lucky.rsi

State Old New Status
bolt-open Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_DV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi

State Old New Status
base Added
equipped-BACKPACK Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/_DV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

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

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

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

Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.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 846e7e7

@dvir001 dvir001 marked this pull request as ready for review January 12, 2025 23:29
@dvir001 dvir001 changed the title Revert "Revert "Weapons from Delta-V"" Weapons from Delta-V Jan 13, 2025
@whatston3
Copy link
Contributor

Added wielded sprites for the ceremonial rifle - not the greatest, but I think it'll do.
Removed the vulcan's special price.

I think there's a genuine case for adding the Faith to the gun vendor - even at 35 damage a shot, it's got less DPS than the Argenti and Pollock, and its small capacity makes it an inferior option to other revolvers.
Could also add pistol mags if the Pollock will be there.
Haven't made either of those changes though.

@whatston3
Copy link
Contributor

Buffed universal fire rate from 3 to 4, swapped out the pollock with the universal in the vendor, added the faith to the vendor (argument above, remove it if you disagree), and added empty pistol mags to the liberation station inventory.

Contraband status on the Vulcan should be fixed, added expedition versions of most of the other existing Delta V guns, and fiddled with the tiers for weapons. The Jackdaw is available as a tier 5 item, it's comparable with the Atreides as-is.

I think most of the changes should be uncontroversial.

Should grab the tommy gun.

@dvir001 dvir001 requested a review from whatston3 January 13, 2025 17:57
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 13, 2025
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Looks good, hopefully that was the last of my screw ups.

Not sure about the typewriter/universal sounds but they're probably fine.

Would like a sanity check but I think this seems fine.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants