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

Weapon Racks Update #805

Merged
merged 6 commits into from
Jan 2, 2024

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Jan 1, 2024

About the PR

Some changes to weapon racks:

  • Weapon racks no longer act like lockers in disguise.
  • Cleaned up .yml files.
  • Cleaned up .rsi.
  • Started introducing departmental variations: Security, Command (Captain), Salvage, Mercenary (will add more thematically fitting weapon sprites to racks later).
  • Crossbows now can be stored in gun racks.

Why / Balance

Bugfixes.

Technical details

.yml changes, .rsi folder structure changes

Media

image image

  • I have added screenshots/videos to this PR showcasing its changes ingame.

Breaking changes

Some entities were deleted: WeaponRackRestricted, WeaponRackWallmountedRestricted, WeaponRackMeleeRestricted, WeaponRackMeleeWallmountedRestricted, WeaponRackPistolRestricted and WeaponRackPistolWallmountedRestricted

Changelog
🆑 erhardsteinhauer

  • add: Added Weapon Racks variations - Security, Command, Salvage, Mercenary.
  • fix: Fixed Weapon Rack acting as lockers in disguise.

Copy link
Contributor

github-actions bot commented Jan 1, 2024

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

Resources/Textures/_NF/Structures/Furniture/Armory/gunrack.rsi

State Old New Status
door Removed
empty Removed
weapon6 Removed

Resources/Textures/_NF/Structures/Furniture/Armory/gunrack_wallmounted.rsi

State Old New Status
base Removed
door Removed
empty Removed
unlocked Removed
weapon1 Removed
weapon2 Removed
weapon3 Removed
weapon4 Removed
weapon5 Removed
weapon6 Removed

Resources/Textures/_NF/Structures/Furniture/Armory/meleerack.rsi

State Old New Status
base Removed
door Removed
empty Removed
unlocked Removed
weapon6 Removed

Resources/Textures/_NF/Structures/Furniture/Armory/meleerack_wallmounted.rsi

State Old New Status
door Removed
empty Removed
unlocked Removed
weapon1 Removed
weapon2 Removed
weapon3 Removed
weapon4 Removed
weapon5 Removed
weapon6 Removed

Resources/Textures/_NF/Structures/Furniture/Armory/pistolrack.rsi

State Old New Status
door Removed
empty Removed

Resources/Textures/_NF/Structures/Furniture/Armory/pistolrack_wallmounted.rsi

State Old New Status
door Removed
empty Removed
locked Removed
unlocked Removed
weapon1 Removed
weapon2 Removed
weapon3 Removed
weapon4 Removed

Resources/Textures/_NF/Structures/Furniture/Armory/melee_weapon_racks.rsi

State Old New Status
base_generic_meleerack_wallmounted Added

Edit: diff updated after 1318a4c

@dvir001
Copy link
Contributor

dvir001 commented Jan 1, 2024

Im using one in the merc dungeon tileset.
Can you add some migration to it or edit the map to fix it on the same PR?

@ErhardSteinhauer
Copy link
Contributor Author

Dunno how to add migration.
I guess I can create merc specific variation with the freshly deleted IDs.

@dvir001
Copy link
Contributor

dvir001 commented Jan 1, 2024

Dunno how to add migration. I guess I can create merc specific variation with the freshly deleted IDs.

No need, just replace it on the grid with map editor
Its in the bounty hunter office.
lava_mercenary.yml

@ErhardSteinhauer
Copy link
Contributor Author

Dunno how to add migration. I guess I can create merc specific variation with the freshly deleted IDs.

No need, just replace it on the grid with map editor Its in the bounty hunter office. lava_mercenary.yml

Do I save it as grid after editing?

@dvir001
Copy link
Contributor

dvir001 commented Jan 1, 2024

Dunno how to add migration. I guess I can create merc specific variation with the freshly deleted IDs.

No need, just replace it on the grid with map editor Its in the bounty hunter office. lava_mercenary.yml

Do I save it as grid after editing?

Yes

@github-actions github-actions bot added the Map label Jan 1, 2024
@ErhardSteinhauer
Copy link
Contributor Author

Prolly fixed now

@dvir001 dvir001 added Enhancement New feature or request Status: Needs Review This PR is awaiting reviews and removed Map labels Jan 2, 2024
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

Working fine.

@dvir001 dvir001 merged commit 7c35695 into new-frontiers-14:master Jan 2, 2024
11 of 12 checks passed
FrontierATC added a commit that referenced this pull request Jan 2, 2024
@ErhardSteinhauer ErhardSteinhauer deleted the Weapon-Racks-Upd branch January 31, 2024 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants