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

V0.96.7a #818

Merged
merged 68 commits into from
Sep 12, 2020
Merged

V0.96.7a #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
0ee171e
Missing `};` in civinfo_escort.sqf
veteran29 Aug 5, 2020
f98296b
Missing `}` in civinfo_task.sqf
veteran29 Aug 5, 2020
b7319ee
Fixed not updating opforCount in FSM
veteran29 Aug 5, 2020
24cb447
Fix ACE surrendering not working properly
veteran29 Aug 5, 2020
9e415dc
Update changelog
veteran29 Aug 5, 2020
5ea431c
Fixed wrong debug variables
Wyqer Aug 5, 2020
a39b192
Fix local variable in civinfo_loop in targetEvent
Wyqer Aug 5, 2020
f0b9864
Version increment
Wyqer Aug 5, 2020
19752f4
Update Changelog
Wyqer Aug 5, 2020
b37c2f5
Contact DLC static weapons to default blacklist
Wyqer Aug 5, 2020
b98b7be
Removed T-14 from AFRF preset
Wyqer Aug 5, 2020
d407a10
Fixed wrong variable in FSM fix backport
Wyqer Aug 5, 2020
f8ac4af
Fix squad building via build menu
Wyqer Aug 5, 2020
2396324
Fixed "No unit" in permissions
Wyqer Aug 5, 2020
16381cf
Fixed possible saving of POWs at FOBs
Wyqer Aug 5, 2020
25219f0
Czech localization by MJVEVERUSKA
Wyqer Aug 5, 2020
ff0018f
Add curator creation BIS event handler
veteran29 Aug 7, 2020
2340464
Add KPLIB_fnc_requestZeus
veteran29 Aug 7, 2020
595eec8
Move curator location draw init to EventHandler
veteran29 Aug 7, 2020
c46568b
Request Zeus on Commander init
veteran29 Aug 7, 2020
c9e3f46
Delete old zm1 curator module on server init
veteran29 Aug 7, 2020
37b2292
Limited curator creation handling
veteran29 Aug 7, 2020
11ec1ea
Improvements from code review
veteran29 Aug 7, 2020
0d6893b
Reuse KPLIB zeus modules on Zeus reassign
veteran29 Aug 7, 2020
8f0f5be
Harden client/server init order
veteran29 Aug 7, 2020
203413e
Wait for server init in onPlayerRespawn.sqf
veteran29 Aug 7, 2020
839d1f8
Add missing variable prefix
veteran29 Aug 7, 2020
0517c3b
Fix invalid variable sent to KPLIB_zeusAssigned on reassign
veteran29 Aug 7, 2020
ca9ded4
Delay Commander zeus request
veteran29 Aug 7, 2020
7a9e80d
Set zeus owner with assignCurator
veteran29 Aug 7, 2020
e879a82
Activate all client addons on curator assign
veteran29 Aug 7, 2020
bdf681e
Remove sqflint workflow
veteran29 Aug 22, 2020
0ee43de
Add NATO, CSAT, AAF, LDF arsenal presets (#820)
lkvk Aug 22, 2020
892b090
Merge pull request #819 from KillahPotatoes/v0.96.71-zeus
Wyqer Aug 25, 2020
5d7fb86
Fix wrong addition of crGetMulti for ambush chance 0
Wyqer Aug 25, 2020
8d413bf
Add direct arsenal access mission parameter
Wyqer Aug 25, 2020
3185241
Removed "FOB" prefix in resource overlay
Wyqer Aug 25, 2020
e555537
Fixed opfor count in sector monitor range calc
Wyqer Aug 25, 2020
f43c0ce
Added radio tower classnames array to config
Wyqer Aug 25, 2020
553c981
Fix nested array ref for radio towers spawn
Wyqer Aug 25, 2020
71e3351
Ensure FOB actions for "start with FOB" start
Wyqer Aug 25, 2020
7356efa
Update Changelog
Wyqer Aug 25, 2020
b4d2695
Updated GM blufor presets
Wyqer Aug 25, 2020
39e48b2
Updated GM opfor presets
Wyqer Aug 25, 2020
a83d35c
Updated GM arsenal presets
Wyqer Aug 25, 2020
0accc56
Update Changelog
Wyqer Aug 25, 2020
e146aa3
Merge pull request #823 from KillahPotatoes/0.96.7a-Radio_Tower_Value
Wyqer Aug 26, 2020
4b08e5f
Add commander zeus enabled/disabled param
veteran29 Aug 30, 2020
ac30396
Do not activate addons for limited Zeus
veteran29 Aug 30, 2020
4aa9e1c
Cleanup respawn list script
veteran29 Aug 30, 2020
9fd9256
Merge branch 'v0.96.71' into 0.96.7a-GM_update
Wyqer Sep 5, 2020
42003ff
Merge pull request #824 from KillahPotatoes/0.96.7a-GM_update
Wyqer Sep 5, 2020
b193688
Add global variable with sectors under attack
veteran29 Sep 5, 2020
06f28dd
Add defines to respawn list script
veteran29 Sep 5, 2020
8e22b47
Fix removal of sector from attacked list
veteran29 Sep 5, 2020
27e4d21
Disable respawn on attacked FOBs
veteran29 Sep 5, 2020
b0e5799
Update changelog
veteran29 Sep 5, 2020
a3fa87f
Fix param diary entry
veteran29 Sep 5, 2020
d0225c0
Restore Limited zeus translations
veteran29 Sep 5, 2020
2039b49
Update Stringtable
Wyqer Sep 6, 2020
9329d1f
Update Changelog
Wyqer Sep 6, 2020
8ac5fef
Merge pull request #828 from KillahPotatoes/v0.96.71-zeus-improvements
Wyqer Sep 6, 2020
9d6833b
Update Stringtable
Wyqer Sep 6, 2020
35426ea
Localize "Under attack" for redeploy menu
Wyqer Sep 6, 2020
1d14b00
Merge branch 'v0.96.71' into v0.96.7a-respawn
Wyqer Sep 6, 2020
7757edc
Merge pull request #827 from KillahPotatoes/v0.96.7a-respawn
Wyqer Sep 6, 2020
41a9675
Update Changelog
Wyqer Sep 6, 2020
d7a8e3a
Update CHANGELOG.md
Wyqer Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ on:
pull_request: ~

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- uses: arma-actions/sqflint@v1.0
with:
args: --directory Missionframework

artifacts:
runs-on: ubuntu-latest
steps:
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Changelog

## 0.96.7a (tbd)
* Added: Contact DLC static weapon backpacks to default blacklist.
* Added: Czech translation. Thanks to [MJVEVERUSKA](https://github.com/MJVEVERUSKA)
* Added: NATO MTP arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: NATO Pacific arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: NATO Woodland arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: CSAT Hex arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: CSAT Ghex arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: AAF arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: LDF arsenal preset. Thanks to [lkvk](https://github.com/lkvk)
* Added: Mission parameter for direct arsenal access without KPLIB Loadout Dialog.
* Added: Helicopters from GM Update to GM faction presets.
* Added: ACE, TFAR and ACRE items to GM West and East arsenal presets.
* Added: Config value for radio tower classnames.
* Added: Parameter to disable Zeus for commander.
* Added: Disable respawn on attacked FOBs (adjustable via parameter)
* Added: Zeus initialization via BIS scripted events. This makes the Eden placed zeus module (zm1) obsolete.
* Removed: T-14 from RHS AFRF preset.
* Tweaked: "FOB " removed from resource overlay, so it's just e.g. "ALPHA" again.
* Fixed: Sector monitor got stuck after sector cap was reached until restarting the server.
* Fixed: Civilian Informant side mission didn't worked due to script error.
* Fixed: AI didn't surrender correctly when ACE is loaded.
* Fixed: The commander couldn't build squads via the build menu.
* Fixed: Possible "Error: no unit" appearing in permission dialog.
* Fixed: POWs could get saved when near FOB and still in player group.
* Fixed: Civilian Reputation penalty got added to ambush chance, even if ambush chance was set to 0 in config.
* Fixed: When starting with a FOB already built, the FOB actions appeared only after a server restart.
* Fixed: Zeus available mods initialization (when not limited) wasn't reliable enough.

## 0.96.7 (2020-05-10)
* Added: CfgFunctions library created from `shared/functions` and all of these functions optimized.
* Added: Mines and explosives will be saved around FOBs.
Expand Down
8 changes: 8 additions & 0 deletions Missionframework/CfgFunctions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ class KPLIB {
class spawnVehicle {};
class swapInventory {};
};
class functions_curator {
file = "functions\curator";

class initCuratorHandlers {
postInit = 1;
};
class requestZeus {};
};
class functions_ui {
file = "functions\ui";

Expand Down
71 changes: 70 additions & 1 deletion Missionframework/arsenal_presets/gm_east.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,76 @@ GRLIB_arsenal_items = [
"gm_df7x40_grn", // Binocular
"ItemMap",
"ItemWatch",
"ItemRadio"
"ItemRadio",

// ACE Items
"ACE_adenosine", // Adenosine autoinjector
"ACE_Altimeter", // Altimeter Watch
"ACE_artilleryTable", // Artillery Rangetable
"ACE_Banana", // Banana
"ACE_bloodIV_250", // Blood IV (250 ml)
"ACE_bloodIV_500", // Blood IV (500 ml)
"ACE_bloodIV", // Blood IV (1000 ml)
"ACE_bodyBag", // Bodybag
"ACE_CableTie", // Cable Tie
"ACE_Clacker", // M57 Firing Device
"ACE_DeadManSwitch", // Dead Man's Switch
"ACE_DefusalKit", // Defusal Kit
"ACE_EarPlugs", // Earplugs
"ACE_elasticBandage", // Bandage (Elastic)
"ACE_EntrenchingTool", // Entrenching Tool
"ACE_epinephrine", // Epinephrine autoinjector
"ACE_fieldDressing", // Bandage (Basic)
"ACE_Flashlight_KSF1", // KSF-1
"ACE_Flashlight_Maglite_ML300L", // Maglite ML300L
"ACE_Flashlight_MX991", // Fulton MX-991
"ACE_Flashlight_XL50", // Maglite XL50
"ACE_M26_Clacker", // M152 Firing Device
"ACE_MapTools", // Map Tools
"ACE_morphine", // Morphine autoinjector
"ACE_packingBandage", // Bandage (Packing)
"ACE_personalAidKit", // Personal Aid Kit
"ACE_plasmaIV_250", // Plasma IV (250 ml)
"ACE_plasmaIV_500", // Plasma IV (500 ml)
"ACE_plasmaIV", // Plasma IV (1000 ml)
"ACE_quikclot", // Bandage (QuickClot)
"ACE_RangeCard", // Range Card
"ACE_RangeTable_82mm", // 82 mm Rangetable
"ACE_rope12", // Rope 12.2 meters
"ACE_rope15", // Rope 15.2 meters
"ACE_rope18", // Rope 18.3 meters
"ACE_rope27", // Rope 27.4 meters
"ACE_rope36", // Rope 36.6 meters
"ACE_salineIV_250", // Saline IV (250 ml)
"ACE_salineIV_500", // Saline IV (500 ml)
"ACE_salineIV", // Saline IV (1000 ml)
"ACE_Sandbag_empty", // Sandbag (empty)
"ACE_splint", // Splint
"ACE_surgicalKit", // Surgical Kit
"ACE_tourniquet", // Tourniquet (CAT)
"ACE_Tripod", // SSWT Kit
"ACE_wirecutter", // Wirecutter

// ACRE Items
"ACRE_PRC117F", // AN/PRC-117F
"ACRE_PRC148", // AN/PRC-148
"ACRE_PRC152", // AN/PRC-152
"ACRE_PRC343", // AN/PRC-343
"ACRE_PRC77", // AN/PRC-77
"ACRE_SEM52SL", // SEM 52 SL
"ACRE_SEM70", // SEM 70
"ACRE_VHF30108", // VHF30108 GSM
"ACRE_VHF30108MAST", // VHF30108 Mast
"ACRE_VHF30108SPIKE", // VHF30108 GS

// TFAR Items
"tf_anprc148jem", // AN/PRC-148 JEM
"tf_anprc152", // AN/PRC-152
"tf_anprc154_1", // AN/PRC-154
"tf_fadak", // FADAK
"tf_microdagr", // MicroDAGR Radio Programmer
"tf_pnr1000a_1", // PNR-1000A
"tf_rf7800str" // PF-7800S-TR
];

GRLIB_arsenal_backpacks = [
Expand Down
71 changes: 70 additions & 1 deletion Missionframework/arsenal_presets/gm_west.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,76 @@ GRLIB_arsenal_items = [
"gm_watch_kosei_80",
"ItemMap",
"ItemWatch",
"ItemRadio"
"ItemRadio",

// ACE Items
"ACE_adenosine", // Adenosine autoinjector
"ACE_Altimeter", // Altimeter Watch
"ACE_artilleryTable", // Artillery Rangetable
"ACE_Banana", // Banana
"ACE_bloodIV_250", // Blood IV (250 ml)
"ACE_bloodIV_500", // Blood IV (500 ml)
"ACE_bloodIV", // Blood IV (1000 ml)
"ACE_bodyBag", // Bodybag
"ACE_CableTie", // Cable Tie
"ACE_Clacker", // M57 Firing Device
"ACE_DeadManSwitch", // Dead Man's Switch
"ACE_DefusalKit", // Defusal Kit
"ACE_EarPlugs", // Earplugs
"ACE_elasticBandage", // Bandage (Elastic)
"ACE_EntrenchingTool", // Entrenching Tool
"ACE_epinephrine", // Epinephrine autoinjector
"ACE_fieldDressing", // Bandage (Basic)
"ACE_Flashlight_KSF1", // KSF-1
"ACE_Flashlight_Maglite_ML300L", // Maglite ML300L
"ACE_Flashlight_MX991", // Fulton MX-991
"ACE_Flashlight_XL50", // Maglite XL50
"ACE_M26_Clacker", // M152 Firing Device
"ACE_MapTools", // Map Tools
"ACE_morphine", // Morphine autoinjector
"ACE_packingBandage", // Bandage (Packing)
"ACE_personalAidKit", // Personal Aid Kit
"ACE_plasmaIV_250", // Plasma IV (250 ml)
"ACE_plasmaIV_500", // Plasma IV (500 ml)
"ACE_plasmaIV", // Plasma IV (1000 ml)
"ACE_quikclot", // Bandage (QuickClot)
"ACE_RangeCard", // Range Card
"ACE_RangeTable_82mm", // 82 mm Rangetable
"ACE_rope12", // Rope 12.2 meters
"ACE_rope15", // Rope 15.2 meters
"ACE_rope18", // Rope 18.3 meters
"ACE_rope27", // Rope 27.4 meters
"ACE_rope36", // Rope 36.6 meters
"ACE_salineIV_250", // Saline IV (250 ml)
"ACE_salineIV_500", // Saline IV (500 ml)
"ACE_salineIV", // Saline IV (1000 ml)
"ACE_Sandbag_empty", // Sandbag (empty)
"ACE_splint", // Splint
"ACE_surgicalKit", // Surgical Kit
"ACE_tourniquet", // Tourniquet (CAT)
"ACE_Tripod", // SSWT Kit
"ACE_wirecutter", // Wirecutter

// ACRE Items
"ACRE_PRC117F", // AN/PRC-117F
"ACRE_PRC148", // AN/PRC-148
"ACRE_PRC152", // AN/PRC-152
"ACRE_PRC343", // AN/PRC-343
"ACRE_PRC77", // AN/PRC-77
"ACRE_SEM52SL", // SEM 52 SL
"ACRE_SEM70", // SEM 70
"ACRE_VHF30108", // VHF30108 GSM
"ACRE_VHF30108MAST", // VHF30108 Mast
"ACRE_VHF30108SPIKE", // VHF30108 GS

// TFAR Items
"tf_anprc148jem", // AN/PRC-148 JEM
"tf_anprc152", // AN/PRC-152
"tf_anprc154_1", // AN/PRC-154
"tf_fadak", // FADAK
"tf_microdagr", // MicroDAGR Radio Programmer
"tf_pnr1000a_1", // PNR-1000A
"tf_rf7800str" // PF-7800S-TR
];

GRLIB_arsenal_backpacks = [
Expand Down
Loading