-
-
Notifications
You must be signed in to change notification settings - Fork 155
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
Templates - Unsung Templates #2201
Templates - Unsung Templates #2201
Conversation
third times the charm
I'll take care of merge conflicts after it is reviewed and approved. Just ping me on Discord. |
whereabouts am I supposed to ping, I've been waiting for instructions on what to change or do next for months |
We are dang busy right now so it might take a while, sorry 'bout that. |
I assumed you all were. Its not a problem. Just let me know when there is something to be done |
We will have to see if Frost can Merge into the PR, as you didn't allow Maintainers to Edit the PR. If he can't you will have to Merge https://github.com/official-antistasi-community/A3-Antistasi/tree/Update-2201-%F0%9F%99%84 into your Branch which should resolve all Conflicts Update to Unstable and fix a few small mistakes here and there. |
allow edits by maintainers is ticked on my end. |
Huh, i will try again |
Frost is trying with a PR, check on your Pull Requests and see if that works |
PR got merged by stut |
And it actually solved the Merge conflicts 🥳 i mostly checked Logistics so far and a few things with Formating etc. Updated so it works with the new Selction etc. had to rename the files for that too. In Logistics you did the Funny of using = instead of Append resulting in me loosing my mind for a while as the = just kills all previous Logistic entries and only sets what was in Unsung Nodes. Also Adding the Nodes to Helicopters is interesting but they are neither a Car or a Boat. A3-Antistasi/A3A/addons/core/functions/Logistics/functions/fn_logistics_tryLoad.sqf Lines 26 to 28 in d40c2c8
I will see when i get around checking the rest. Also if you want to test/Check your stuff you have to build the Mod now and load it to use the Missions, here is one Guide. |
Having never used Visual Studio all the instructions on "how to build" make no sense to me. I've never made or worked on an arma 3 mod, only missions. Edit: so far with Silences help the best we got was an error when trying to load the mod |
@Lazejun had any chance to look at it again? |
It's a bitch to work with due to the way it's forked, I will redo the PR and Co Author Stutpip so Credit isn't lost. I was kinda waiting on feedback/awnser to the previous question. Like the Logistics nodes include Helis but Helis are not recognised by Logistics, but it could be a nice feature as most Helis could carry a minimum of 1 Node ---> Loot box |
I have no objection to add helis to the list. |
This PR continues in #2379 |
Adds Logistic Nodes and Templates by @stutpip123, Added Helicopters as possible Logistic Vehicles (This needs to be done for the rest of the Templates at some point too). Added Unsungs Category Chaos to fn_categoryOverrides Mod Integration: Unsung (#2379) * Add files via upload * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update detector.sqf * Update selector.sqf * Update params.hpp * reduced number of CAS and AA planes * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Add Unsung AA Planes * Update params.hpp * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Update Unsung_Logistics_Nodes.sqf * Update selector.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update Templates.hpp * Renaming/Small changes to files to work * Update Categories for Unsung * Add Cas Loadouts * Add Helis as Possible Logistics vehicle * Update Templates.hpp * Add Identities, Casing etc. * Update fn_equipmentSort.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update UNS_Civ.sqf * Update * Equipment Fun Co-authored-by: stutpip123 <[email protected]>
Adds Logistic Nodes and Templates by @stutpip123, Added Helicopters as possible Logistic Vehicles (This needs to be done for the rest of the Templates at some point too). Added Unsungs Category Chaos to fn_categoryOverrides Mod Integration: Unsung (official-antistasi-community#2379) * Add files via upload * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update detector.sqf * Update selector.sqf * Update params.hpp * reduced number of CAS and AA planes * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Add Unsung AA Planes * Update params.hpp * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_Reb_VC_Tropical.sqf * Update Unsung_AI_NVA_Tropical.sqf * Update Unsung_Logistics_Nodes.sqf * Update Unsung_Logistics_Nodes.sqf * Update selector.sqf * Update Unsung_AI_US_Tropical.sqf * Update Unsung_AI_US_Tropical.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update Templates.hpp * Renaming/Small changes to files to work * Update Categories for Unsung * Add Cas Loadouts * Add Helis as Possible Logistics vehicle * Update Templates.hpp * Add Identities, Casing etc. * Update fn_equipmentSort.sqf * Update fn_equipmentIsValidForCurrentModset.sqf * Update UNS_Civ.sqf * Update * Equipment Fun Co-authored-by: stutpip123 <[email protected]>
What type of PR is this.
What have you changed and why?
Information:
Added Unsung Templates, NVA, US, VC and Civ
Added Unsung Logistics Nodes
Changed Detector, Selector and Params to allow loading of templates
Added Unsung AA Planes to fn_setPlaneLoadout.sqf
Please verify the following and ensure all checks are completed.
Is further testing or are further changes required?
How can the changes be tested?
Steps:
Running the mission on a server with Unsung the templates will load and play.
Needs checking over for mistakes and issues or missing things, then play testing
Notes:
fn_setPlaneLoadout.sqf needs Unsung CAS Planes adding