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

Turrets: updated sprites and new entities #1692

Merged

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Jul 18, 2024

About the PR

Reworked disabler turrets added in this PR:

A Contraband Denying Energy Turret (CDET). A disabler turret with built-in microreactor. Use screwdriver to disassemble.

  • New sprites made by Stagnation (discord).
  • Reworked NT disabler turrets can be deployed and packed.

Reworked laser turrets added in this PR:

A Self-Recharging Laser Auto Turret (SLAT). A laser turret with built-in microreactor. Use screwdriver to disassemble.

  • New sprites made by Stagnation (discord).
  • Reworked NT laser turrets can be deployed and packed.

Added new ballistic turret:

An Autonomous Sentry Machine Gun Turret (ASMGT) is a magazine fed ballistic turret compatible with .20, .25, .30 and .35 cartriges. Use screwdriver to disassemble.

  • Sprites for turret and ammo boxes made by Stagnation (discord).
  • Magazine fed.
  • Can be deployed and packed.

Other changes:

  • Added heavy weapon case for new packed turrets.
  • Added SR gun safe, filled with mk58, 2 pistol mags and heavy weapon case with two Contraband Denying Energy Turret. Replaced custom filled safe in SR office with new safe.
  • Added NFSD gun safe, filled with two heavy weapon cases with Contraband Denying Energy Turrets and one heavy weapon case with Self-Recharging Laser Auto Turret. Replaced empty safe in armory with new safe.
  • @whatston3 made c# code that allows disabler turret ignore stunned characters.

To Do:

  • In hand sprites for turret kits.
  • In hand sprites for heavy weapon case.
  • Expedition loot tables integration for some turrets.
  • Map contraband denying turret weapon cases to NFSD outpost and SR office.

Why / Balance

New tools for NFSD/SR and players.

How to test

  1. Spawn WeaponCaseHeavyAsmgt
  2. Use 'packed ASMGT' to deploy turret (unpacking works like inflatable walls - take the item in your hands, click with it on unoccupied tile).
  3. Put ammo mag from the weapon case to arm the turret.
  4. Spawn hostile entities.
  5. To "pack" turret back use screwdriver on it.
  6. Spawn WeaponCaseHeavyCdet and WeaponCaseHeavySlat
  7. Use 'packed ...' to deploy turrets.
  8. Spawn hostile entities.
  9. Spawn and wear contraband gear while close to CDET - once you put on contraband clothes the turret should become hostile towards your character, once you remove contraband clothes the turret should become neutral again.
  10. To "pack" turret back use screwdriver on it.
  11. Spawn WeaponTurretAsmgtHostileUniversallyPacked
  12. Upon deployment should be friendly towards your character, but hostile to anything else. Same deal as with killer tomatoes.

Media

2024-7-18_17 35 08

2024-07-18.17-37-23.mp4
2024-07-18.17-46-35.mp4
2024-07-18.19-31-36.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog
🆑 erhardsteinhauer

  • add: Added magazine fed ballistic turret. Obtainable from expeditions.
  • add: Added heavy weapon cases with turrets to SR's gun safe and to NFSD armory.

Copy link
Contributor

github-actions bot commented Jul 18, 2024

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

Resources/Textures/_NF/Objects/Tools/guncaseheavy.rsi

State Old New Status
icon-open Added
icon Added
inhand-left Added
inhand-right Added
unshaded Added

Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi

State Old New Status
base Added
mag-1 Added
mag-10 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added

Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/disabler.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
packed Added
unshaded Added

Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/laser.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
packed Added
unshaded Added

Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/magazinefed.rsi

State Old New Status
base Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added
mag-1 Added
mag-10 Added
mag-2 Added
mag-3 Added
mag-4 Added
mag-5 Added
mag-6 Added
mag-7 Added
mag-8 Added
mag-9 Added
packed Added

Edit: diff updated after fdc6410

@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review July 18, 2024 15:39
@ErhardSteinhauer ErhardSteinhauer requested review from dvir001 and whatston3 and removed request for dvir001 July 18, 2024 15:39
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jul 18, 2024
@github-actions github-actions bot added Map-POI Map - POI Map-Outpost Map - Outpost and removed YML labels Jul 18, 2024
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.

More suggestions, one for the packed ASMGT description and one giving some sort of explanation for a multi-caliber turret.

@ErhardSteinhauer
Copy link
Contributor Author

Checks not running. Sus.

@ErhardSteinhauer ErhardSteinhauer marked this pull request as draft July 19, 2024 00:29
@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review July 19, 2024 00:31
@ErhardSteinhauer
Copy link
Contributor Author

Would it be reasonable if the turrets were (selectively) unanchorable (could maybe extend this to other frontier facilities as well)?

They don't want you to know this, but the turrets are free.

For the transportation purposes you can just pack a turret.
Not sure about giving players the ability to unanchor turrets, I think it's easily abuseable:

  1. Unanchor laser turret.
  2. Drag it behind on expedition.
  3. Upon encountering a mob, kite mob while dragging the turret.

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jul 19, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jul 19, 2024
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.

Requested changes made, will need to retest with latest changes.

@whatston3 whatston3 self-requested a review July 19, 2024 14:43
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Jul 20, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Jul 20, 2024
@whatston3 whatston3 dismissed their stale review July 20, 2024 17:19

Said it myself, requested changes made.

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.

Good.

@whatston3 whatston3 merged commit 81747ab into new-frontiers-14:master Jul 27, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Jul 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# Map-Outpost Map - Outpost Map-POI Map - POI Sprites Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants