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.

Sign up for GitHub

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

Jump to bottom

CUP Norwegian Armed Forces #335

Merged
merged 6 commits into from
Oct 21, 2024
Merged

CUP Norwegian Armed Forces #335

merged 6 commits into from
Oct 21, 2024

Conversation

Azodion
Copy link

@Azodion Azodion commented Sep 25, 2024 •
edited
Loading

What type of PR is this?

  1. Bug
  2. Change
  3. Enhancement
  4. Miscellaneous

What have you changed and why?

Information:
Added Flex7103's CUP Norwegian Armed Forces to Occupants in Temperate and Arctic - Main Mod
Added Support for Norwegian F-16 Firewill Retexture - Submod
Added Support for SFP Vehicles - Submod

Please specify which Issue this PR Resolves (If Applicable).

"This PR closes #XXXX!"

Please verify the following.

  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:

Notes:
Should Work

@Azodion
CUP Norwegian Armed Forces
2b57bfc
@Azodion
Fixes/Flushing
84e14fb 
For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.
@Azodion Azodion changed the title CUP Nowegian Armed Forces CUP Norwegian Armed Forces Sep 25, 2024
@Azodion Azodion marked this pull request as ready for review September 25, 2024 20:47
SilenceIsFatto
SilenceIsFatto approved these changes Sep 26, 2024
View reviewed changes
Copy link
Owner

@SilenceIsFatto SilenceIsFatto left a comment

Choose a reason for hiding this comment

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

Seems fine, have you put the black market vehicles in our sheet?

@SilenceIsFatto SilenceIsFatto added the faction/template A new faction or template label Sep 26, 2024
@Azodion
Copy link
Author

Azodion commented Sep 26, 2024

Seems fine, have you put the black market vehicles in our sheet?

i have not, they are mostly CUP items, So I copied the prices from the sheet for those. Only one that isn't CUP or SFP, is the F-16 which I can put on the sheet though.

@SilenceIsFatto
Copy link
Owner

The sheet isn't only for pricing, we also have a python script to pull the data from it and create dealer macros (CSV Parser)

Without them in the sheet there's a possibility of them being lost next time we update it

@Azodion
Copy link
Author

Azodion commented Sep 26, 2024

gotcha, will update the sheet with everything then :)

@Azodion
Copy link
Author

Azodion commented Sep 26, 2024

Everything should be updated on the sheet now 👍

@AUC-bot AUC-bot merged commit 098855a into SilenceIsFatto:unstable Oct 21, 2024
stutpip123 added a commit that referenced this pull request Oct 21, 2024
@stutpip123
Squashed commit of the following:
bfa5eb2 
commit 6bf0b90
Merge: 9971e7b e4422ef
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 10:54:15 2024 +0100

    Merge pull request #373 from AtteKarppinen/another-limited-fasttravel

    Re-Merge Fast travel enabled only between major locations

commit 9971e7b
Merge: dcbc50f 810378f
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:43:43 2024 +0100

    Merge pull request #341 from Azodion/CUP_FFP

    CUP SFP Finnish Forces Pack

commit 810378f
Merge: 207a26a dcbc50f
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:43:36 2024 +0100

    Merge branch 'unstable' into CUP_FFP

commit dcbc50f
Merge: d1b2e35 be2dbfd
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:39:51 2024 +0100

    Merge pull request #348 from Azodion/YLArms_Arms_Dealer

    YLArms Arms Dealer

commit be2dbfd
Merge: a9d1478 d1b2e35
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:39:44 2024 +0100

    Merge branch 'unstable' into YLArms_Arms_Dealer

commit d1b2e35
Merge: 98f58e6 06a3d9f
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:37:27 2024 +0100

    Merge pull request #338 from Azodion/ProjInf_Arms_Dealer

    Project Infinite Arms Dealer

commit 06a3d9f
Merge: 73b3f2d 98f58e6
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:37:21 2024 +0100

    Merge branch 'unstable' into ProjInf_Arms_Dealer

commit 98f58e6
Merge: d3c46b6 6ada415
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:37:07 2024 +0100

    Merge pull request #337 from Azodion/JCA_Arms_Dealer

    JCA Arms Dealer

commit 6ada415
Merge: f63a926 d3c46b6
Author: stutpip123 <[email protected]>
Date:   Mon Oct 21 09:36:59 2024 +0100

    Merge branch 'unstable' into JCA_Arms_Dealer

commit d3c46b6
Author: MaxxLite <[email protected]>
Date:   Mon Oct 21 11:36:10 2024 +0300

    Main menu update (#342)

    * base changes

    * bug fixes

    * added images

    * documentation

    * removed unused fnc

    * future proofing

    * Set naming/case consistency, quality consistency

    ---------

    Co-authored-by: SilenceIsFatto <[email protected]>
    Co-authored-by: stutpip123 <[email protected]>

commit 69b97bf
Author: MaxxLite <[email protected]>
Date:   Mon Oct 21 11:36:06 2024 +0300

    economic victory needed amount fix / bug fixes (#339)

    * economic victory per map

    * hud warning weapon sway

    * updated to use correct values

commit 098855a
Author: Hophri <[email protected]>
Date:   Mon Oct 21 03:35:59 2024 -0500

    CUP Norwegian Armed Forces (#335)

    * CUP Norwegian Armed Forces

    * Fixes/Flushing

    For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

    * F-16C Price Update to Match Sheet

    * Vehicle Prices Match to Sheet

    ---------

    Co-authored-by: stutpip123 <[email protected]>

commit d21eb36
Author: AtteKarppinen <[email protected]>
Date:   Mon Oct 21 11:35:57 2024 +0300

    Fast travel enabled only between major locations (#332)

commit 3c35bfe
Author: wersal454 <[email protected]>
Date:   Mon Oct 21 11:35:54 2024 +0300

    Air vehicle access on milbases (#282)

    * air vehicle access on milbases (whaaaaaaaaa)

    whaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

    * Update CUP_AI_BAF_Temperate.sqf

    * Update CUP_AI_BAF_Arid.sqf

    * roll back

    * roll back

    ---------

    Co-authored-by: Silence <[email protected]>

commit 207a26a
Author: Hophri <[email protected]>
Date:   Sat Oct 19 08:13:58 2024 -0500

    SFP ZU-23 to CUP ZU-23

commit 2626a69
Merge: 78d79d1 4bc4c98
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:45:33 2024 +0100

    Merge branch 'TestingBranch' into CUP_FFP

commit 4bc4c98
Merge: 465d23b bbb583d
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:43:20 2024 +0100

    Merge pull request #357 from Azodion/CUP_HAFM

    Cup hafm

commit bbb583d
Merge: a83e71c 465d23b
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:43:08 2024 +0100

    Merge branch 'TestingBranch' into CUP_HAFM

commit 465d23b
Merge: c9a60a0 73b3f2d
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:39:41 2024 +0100

    Merge pull request #356 from Azodion/ProjInf_Arms_Dealer

    Proj inf arms dealer

commit 73b3f2d
Merge: 1e8f16f c9a60a0
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:39:36 2024 +0100

    Merge branch 'TestingBranch' into ProjInf_Arms_Dealer

commit c9a60a0
Merge: a553b07 f63a926
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:37:46 2024 +0100

    Merge pull request #355 from Azodion/JCA_Arms_Dealer

    Jca arms dealer

commit f63a926
Merge: 25dab01 a553b07
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:37:39 2024 +0100

    Merge branch 'TestingBranch' into JCA_Arms_Dealer

commit a553b07
Merge: 9adaa73 355d4b2
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:36:54 2024 +0100

    Merge pull request #354 from Azodion/noraf_cup

    Noraf cup

commit 355d4b2
Merge: 6752350 9adaa73
Author: stutpip123 <[email protected]>
Date:   Tue Oct 8 09:36:33 2024 +0100

    Merge branch 'TestingBranch' into noraf_cup

commit a9d1478
Author: Hophri <[email protected]>
Date:   Sun Oct 6 06:25:48 2024 -0500

    Fixes

commit 5de64ad
Author: Hophri <[email protected]>
Date:   Sun Oct 6 06:04:45 2024 -0500

    Start

commit 6752350
Merge: 332f3d3 07579a2
Author: Hophri <[email protected]>
Date:   Sat Oct 5 21:12:08 2024 -0500

    Merge branch 'unstable' into noraf_cup

commit 1e8f16f
Merge: d29d9a0 07579a2
Author: Hophri <[email protected]>
Date:   Sat Oct 5 21:11:52 2024 -0500

    Merge branch 'unstable' into ProjInf_Arms_Dealer

commit a83e71c
Merge: e8a8818 07579a2
Author: Hophri <[email protected]>
Date:   Sat Oct 5 21:11:38 2024 -0500

    Merge branch 'unstable' into CUP_HAFM

commit 78d79d1
Merge: 6a4160d 07579a2
Author: Hophri <[email protected]>
Date:   Sat Oct 5 21:11:14 2024 -0500

    Merge branch 'unstable' into CUP_FFP

commit 25dab01
Merge: d6f638a 07579a2
Author: Hophri <[email protected]>
Date:   Sat Oct 5 20:30:34 2024 -0500

    Merge branch 'unstable' into JCA_Arms_Dealer

commit d6f638a
Author: Hophri <[email protected]>
Date:   Sat Oct 5 20:26:37 2024 -0500

    M16 Addition

commit 6a4160d
Author: Hophri <[email protected]>
Date:   Sat Oct 5 08:56:02 2024 -0500

    requiredAddons Fix

commit 027e3f1
Merge: daf9a20 ed7ff76
Author: Hophri <[email protected]>
Date:   Sat Oct 5 04:47:39 2024 -0500

    Merge branch 'unstable' into CUP_FFP

commit daf9a20
Author: Hophri <[email protected]>
Date:   Sat Sep 28 23:37:22 2024 -0500

    Fixes and Additions

commit e8a8818
Author: Hophri <[email protected]>
Date:   Sat Sep 28 00:02:50 2024 -0500

    Fixing Mistake

commit 9120f36
Author: Hophri <[email protected]>
Date:   Fri Sep 27 08:14:06 2024 -0500

    Correcting Mistake

commit e876a41
Author: Hophri <[email protected]>
Date:   Fri Sep 27 08:11:00 2024 -0500

    CUP FFP

commit 711ac23
Author: Hophri <[email protected]>
Date:   Fri Sep 27 00:54:45 2024 -0500

    CUP HAFM

    Gives a RVMAT Error whenever the GD420 Spawns. But it's not a crashing error.

commit d29d9a0
Author: Hophri <[email protected]>
Date:   Thu Sep 26 09:35:36 2024 -0500

    Naming Consistency

commit 332f3d3
Author: Hophri <[email protected]>
Date:   Thu Sep 26 09:25:10 2024 -0500

    Vehicle Prices Match to Sheet

commit 7538cb7
Author: Hophri <[email protected]>
Date:   Thu Sep 26 08:42:30 2024 -0500

    F-16C Price Update to Match Sheet

commit ceb5b60
Author: Hophri <[email protected]>
Date:   Thu Sep 26 08:26:24 2024 -0500

    Naming Consistency

commit 760adbc
Author: Hophri <[email protected]>
Date:   Wed Sep 25 17:12:27 2024 -0500

    Project Infinite Arms Dealer

commit 3e4a600
Author: Hophri <[email protected]>
Date:   Wed Sep 25 16:50:46 2024 -0500

    JCA Arms Dealer

commit 84e14fb
Author: Hophri <[email protected]>
Date:   Wed Sep 25 15:08:15 2024 -0500

    Fixes/Flushing

    For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

commit 2b57bfc
Author: Hophri <[email protected]>
Date:   Wed Sep 25 14:02:21 2024 -0500

    CUP Norwegian Armed Forces

commit e4422ef
Author: Pvt.Unknown <[email protected]>
Date:   Sat Sep 21 20:00:29 2024 +0300

    Fast travel enabled only between major locations
@SilenceIsFatto SilenceIsFatto mentioned this pull request Dec 5, 2024
Merged
8 tasks
SilenceIsFatto added a commit that referenced this pull request Dec 5, 2024
@SilenceIsFatto @wersal454
@AtteKarppinen @Azodion @UAC-MaxxLite @stutpip123 @PlayerBotPro @Brenner650 @AUC-bot
V11.4.0 (#407)
c71c116 
* port official-antistasi-community#3369

adopted to ultimate functions
needs testing

* port official-antistasi-community#3364

needs testing

* port official-antistasi-community#3349

adopted to ultimate functions

Needs heavy testing and probably some work to integrate rivals

* port official-antistasi-community#3273

* port official-antistasi-community#3231

* port official-antistasi-community#3205

* port official-antistasi-community#3207

* unit traits changes

* Fast travel enabled only between major locations

* CUP Norwegian Armed Forces

* Fixes/Flushing

For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

* JCA Arms Dealer

* Project Infinite Arms Dealer

* Naming Consistency

* F-16C Price Update to Match Sheet

* Vehicle Prices Match to Sheet

* Naming Consistency

* CUP HAFM

Gives a RVMAT Error whenever the GD420 Spawns. But it's not a crashing error.

* CUP FFP

* Correcting Mistake

* fixes

* Fixing Mistake

* Fixes and Additions

* Add names function for templates

* requiredAddons Fix

* basic structure

* leftover fix

* M16 Addition

* Start

* Fixes

* ChernarusRedux Initial Port

* CUP NATO + BAF Fix

CUP NATO
BAF SF + BW Elite + US Army Military + Czech Militia

* Vehicle Market - Use diminishing returns approach on HQ vehicle price

* Vehicle Market - Use diminishing returns approach on black market vehicle price

* more zones and stuff

* Update mission.sqm

* Update common.inc

* Update fn_moveOutCrew.sqf

* Update A3A/addons/core/functions/REINF/fn_postmortem.sqf

Co-authored-by: Silence <[email protected]>

* Update fn_compatibilityLoadFaction.sqf

* Update fn_loadRivals.sqf

* Update fn_initVarServer.sqf

* changed some music and radio files

* updated money item yield and make money spawn in random houses

* volume and maxDistance

* 3AS DC17M replace Legion

* Update mission.sqm

* Update mission.sqm

* Add names (cup, rhs, vanilla), add functionality

* Update mission.sqm

* more audio files and changes

* done

* Create fn_RivalsCreateUnit.sqf

* Update fn_itemset_medicalSupplies.sqf

* SFP ZU-23 to CUP ZU-23

* bunch of fixes

no driver issue fix
tags error fix
wind param fix
vehicle don't fit in tent hangar "fix"
duplicate string for ldf fix

* fixes for fixes

* add another outpost, clear more roads

* Air vehicle access on milbases (#282)

* air vehicle access on milbases (whaaaaaaaaa)

whaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Update CUP_AI_BAF_Temperate.sqf

* Update CUP_AI_BAF_Arid.sqf

* roll back

* roll back

---------

Co-authored-by: Silence <[email protected]>

* Fast travel enabled only between major locations (#332)

* CUP Norwegian Armed Forces (#335)

* CUP Norwegian Armed Forces

* Fixes/Flushing

For some reason the "script_component.hpp" wasn't available in the Templates folder. So, I added that back.

* F-16C Price Update to Match Sheet

* Vehicle Prices Match to Sheet

---------

Co-authored-by: stutpip123 <[email protected]>

* economic victory needed amount fix / bug fixes (#339)

* economic victory per map

* hud warning weapon sway

* updated to use correct values

* Main menu update (#342)

* base changes

* bug fixes

* added images

* documentation

* removed unused fnc

* future proofing

* Set naming/case consistency, quality consistency

---------

Co-authored-by: SilenceIsFatto <[email protected]>
Co-authored-by: stutpip123 <[email protected]>

* Revert "Merge pull request #341 from Azodion/CUP_FFP"

This reverts commit 9971e7b, reversing
changes made to dcbc50f.

* Reapply "Merge pull request #341 from Azodion/CUP_FFP"

This reverts commit aabf384.

* Update templates.hpp

* Update cfgPlaneLoadouts.hpp

* support new anomalies mod

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* Update Aegis_AI_CSAT_Temperate.sqf

* Update Aegis_AI_NATO_Arid.sqf

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* Update WS_AI_NATO&UNA.sqf

* Create fn_liberatedeserter.sqf

* Update fn_destroyCity.sqf

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

Actually need to test this one, if good, uncomment

* revert the revert

@SilenceIsFatto

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* revert the revert

* community ports official-antistasi-community#3388 and official-antistasi-community#3418

* community port official-antistasi-community#3397

* cleanup

* Update fn_SUP_cruiseMissileAvailable.sqf

* Fix helmet default unlocks (again)

* 3AS Update

add Gozanti Cruiser to WM Empire templates and arms dealer

* Add missing variable

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Missing semicolons fixed

* Update fn_airspaceControl.sqf

* Petros Ambient sounds

* Revert "Merge branch 'ambient-sound-change' into unstable"

This reverts commit 9bb7c70, reversing
changes made to 1e94ef9.

* delete _laser to avoid spam

* delete pods 

untested

* delete pods

untested

* Fix anomaly height/spawning

* cleanup

* cleanup

* remove laggy bit

* cleanup

* Unmerge ambient sounds (#2)

* Update script_version.hpp

* compile gunships variable

I dunno, probably required

* Fix grass/view distance being set in main menu

* Re-add addon entries and strings, update dealers

* Update script_version.hpp

v11.3.1

* DELETE THE F LASER

* Fix Respawning on Redux

* disable invinsiblity

untested

* Update A3A/addons/gui/CfgFunctions.hpp

Co-authored-by: Silence <[email protected]>

* Update Stringtable.xml

* Expeditionary Forces arms dealer

* Re-add removed entries

* EAW Updates

add new planes to template and dealer

* EF support

* EF part 1

* Add fallbacks for identity, convert to hashmap

* part 2

next stop, weapons and gear

* Add EF helicopters, change `py` to `python`

* part 3

next stop, logistics

* part 4

finished

Next stop, QRFNaval?

* part 4.1

Oups, almost forgot

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Temperate.sqf

Co-authored-by: Silence <[email protected]>

* Update A3A/addons/core/Templates/Templates/EF/EF_AI_MJTF_Arid.sqf

Co-authored-by: Silence <[email protected]>

* fixes

* Add initACE to CfgFunctions.hpp

* fix

* fix

* fix

* Remove CUP names, replace with vanilla

* price adjustment for the support

* Fix syntax errors, incorrect var declarations

* 11.4

---------

Co-authored-by: wersal454 <[email protected]>
Co-authored-by: Pvt.Unknown <[email protected]>
Co-authored-by: Hophri <[email protected]>
Co-authored-by: MaxxLite <[email protected]>
Co-authored-by: stutpip123 <[email protected]>
Co-authored-by: Bot <[email protected]>
Co-authored-by: AtteKarppinen <[email protected]>
Co-authored-by: Brenner650 <[email protected]>
Co-authored-by: Antistasi Ultimate Community Bot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SilenceIsFatto SilenceIsFatto SilenceIsFatto approved these changes

Assignees
No one assigned
Labels
faction/template A new faction or template ready-for-merge ready-for-testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Azodion @SilenceIsFatto @AUC-bot @stutpip123