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

Templates - Unsung Templates #2201

Closed

Conversation

stutpip123
Copy link

@stutpip123 stutpip123 commented Nov 27, 2021

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

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.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

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

@stutpip123 stutpip123 marked this pull request as ready for review November 29, 2021 14:10
@Lazejun Lazejun self-assigned this Nov 30, 2021
@Lazejun Lazejun added Enhancement New feature or request Review pending labels Nov 30, 2021
@Lazejun Lazejun self-requested a review November 30, 2021 18:27
@Lazejun Lazejun added this to the Not organized yet milestone Nov 30, 2021
@killerswin2 killerswin2 changed the title Unsung Templates Templates - Unsung Templates Dec 4, 2021
@killerswin2 killerswin2 added the Templates Items related to templates label Dec 4, 2021
@CalebSerafin
Copy link
Member

I'll take care of merge conflicts after it is reviewed and approved. Just ping me on Discord.

@stutpip123
Copy link
Author

whereabouts am I supposed to ping, I've been waiting for instructions on what to change or do next for months

@Bob-Murphy
Copy link

We are dang busy right now so it might take a while, sorry 'bout that.
When somebody has looked at it, feedback will be here.
It's currently lower priority but certainly not forgotten.

@stutpip123
Copy link
Author

stutpip123 commented Mar 9, 2022

I assumed you all were. Its not a problem. Just let me know when there is something to be done

@Lazejun
Copy link

Lazejun commented Mar 9, 2022

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.

@stutpip123
Copy link
Author

stutpip123 commented Mar 9, 2022

allow edits by maintainers is ticked on my end.
the merge to get unstable into my fork is probably not working because its forked off of hakon not the main official-antistasi-community. but this PR is definitely ticked to allow it

@Lazejun
Copy link

Lazejun commented Mar 9, 2022

Huh, i will try again

@Lazejun
Copy link

Lazejun commented Mar 9, 2022

Frost is trying with a PR, check on your Pull Requests and see if that works

@Bob-Murphy
Copy link

PR got merged by stut

@Lazejun
Copy link

Lazejun commented Mar 10, 2022

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.

private _vehicles = (nearestObjects [_cargo,["Car","Ship"], 10]) - [_cargo];
private _vehicle = _vehicles#0;
if (isNil "_vehicle") exitWith {["Logistics", "No vehicle is close enough."] remoteExec ["A3A_fnc_customHint", remoteExecutedOwner]};

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.

https://github.com/official-antistasi-community/A3-Antistasi/blob/unstable/How%20to%20build.md

@stutpip123
Copy link
Author

stutpip123 commented Mar 11, 2022

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
"Include file x\A3A\addons\core\Includes\script_mod.hpp not found"

@Bob-Murphy
Copy link

@Lazejun had any chance to look at it again?
Also MeRgE cOnFlIcTs again.

@Lazejun
Copy link

Lazejun commented Jun 10, 2022

@Lazejun had any chance to look at it again? Also MeRgE cOnFlIcTs 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

@Bob-Murphy
Copy link

I have no objection to add helis to the list.
If it fits, it sits.

@Lazejun Lazejun mentioned this pull request Jun 12, 2022
15 tasks
@Lazejun
Copy link

Lazejun commented Jun 12, 2022

This PR continues in #2379

@Lazejun Lazejun closed this Jun 12, 2022
CalebSerafin pushed a commit that referenced this pull request Sep 4, 2022
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]>
igorkis-scrts pushed a commit to igorkis-scrts/A3-Antistasi-Plus that referenced this pull request Aug 8, 2023
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request Review pending Templates Items related to templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants