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

customGear and fauxWeapons rebasing #594

Merged
merged 9 commits into from
Nov 13, 2024

Conversation

AChesheireCat
Copy link
Contributor

Adds a new addon "customGear" which is meant to act as a gathering point for all "new" gear/weapon items that we may want to add to potato. This'll also help clean up miscFixes since I've kinda cluttered it with things that aren't really fixes, but also aren't fit anywhere else.

As such, I've rebased the faux weapons that sat in miscFixes to this new addon.

I've also added a new thing that adds a copy of certain CUP vests as backpacks for mission makers and loadout makers to play around with.

customGear should now include the following:

  • fauxWeapons
    • fauxC7
    • fauxMG5
  • vestBackpacks
    • BAF Mk4 belt and webbing
    • RUAF Smersh in olive and coyote

Adds backpack versions of the following vests:

- BAF Osprey Mk4 belt
- BAF Osprey Mk4 webbing
- RU Smersh (Olive)
- RU Smersh (Coyote)
Moves the faux weapons (C7, MG5) from the miscFixes folder to the new customGear folder.
aka me being dumb

fixed line in script_component that referenced MISCFIXES instead of CUSTOMGEAR
Copy link
Contributor

@lambdatiger lambdatiger left a comment

Choose a reason for hiding this comment

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

Looks ok from what I can see, some feedback on structure and naming that will come up later.

addons/customGear/fauxWeapons/config.cpp Outdated Show resolved Hide resolved
addons/customGear/fauxWeapons/config.cpp Outdated Show resolved Hide resolved
@AChesheireCat AChesheireCat self-assigned this Nov 6, 2024
AChesheireCat and others added 2 commits November 5, 2024 21:26
- Moved faux weapons from its own sub-component to just a cfgWeapons

- fixed classnames to prevent breaking missions
@PabstMirror PabstMirror mentioned this pull request Nov 12, 2024
@PabstMirror PabstMirror added this to the v1.3.49 milestone Nov 12, 2024
@AChesheireCat
Copy link
Contributor Author

Should the "baseWeapon = QGVAR(MG5)" line be changed to baseWeapon = "potato_fauxMG5_MG5"? Or is it fine as it is?

@lambdatiger
Copy link
Contributor

Should the "baseWeapon = QGVAR(MG5)" line be changed to baseWeapon = "potato_fauxMG5_MG5"? Or is it fine as it is?

Yes

From QGVAR(MG5) to "potato_fauxMG5_MG5", per the classname
@PabstMirror PabstMirror merged commit 58f70c8 into BourbonWarfare:master Nov 13, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants