Compare commits

...

3980 Commits

Author SHA1 Message Date
Applevangelist d6d9c9d8cf Merge remote-tracking branch 'origin/master' into develop 2024-09-08 13:22:34 +02:00
Applevangelist 68007306b3 Merge remote-tracking branch 'origin/develop' into develop 2024-09-08 11:44:47 +02:00
Applevangelist 0c3f97370c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2024-09-08 11:44:44 +02:00
Thomas 6bc766e95f Merge pull request #2175 from FlightControl-Master/master
Update CSAR.lua
2024-09-07 09:03:00 +02:00
Applevangelist c2aeb1ebcd Merge remote-tracking branch 'origin/master' into develop 2024-09-06 16:41:11 +02:00
Applevangelist 6243137d4c QoL 2024-09-06 13:42:14 +02:00
Applevangelist 8695953d5a #SPAWN - performance tuning for event workaround 2024-09-03 16:47:17 +02:00
Applevangelist 6afb68390b Merge remote-tracking branch 'origin/master' into develop 2024-09-01 15:37:31 +02:00
Applevangelist 8151700ad7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2024-09-01 13:37:34 +02:00
Thomas a3102a7381 Merge pull request #2172 from DarthZyll/patch-5
Update CTLD.lua for missing self.ChinookTroopCircleRadius
2024-09-01 08:55:18 +02:00
Mike Young d41b5e8ede Update CTLD.lua for missing self.ChinookTroopCircleRadius
self.ChinookTroopCircleRadius was not being set
2024-09-01 02:52:33 -04:00
Applevangelist a45856c925 Merge remote-tracking branch 'origin/master' into develop 2024-08-29 10:25:40 +02:00
Applevangelist f4b2f07656 Merge remote-tracking branch 'origin/master' into develop 2024-08-29 10:22:32 +02:00
Applevangelist f7e64d98bc Merge remote-tracking branch 'origin/master' into develop 2024-08-27 18:37:56 +02:00
Applevangelist 4380c1be2e Merge remote-tracking branch 'origin/master' into develop 2024-08-27 13:19:24 +02:00
Applevangelist db2d4e97a6 Merge remote-tracking branch 'origin/master' into develop 2024-08-27 10:56:46 +02:00
Applevangelist b4653be54e Merge remote-tracking branch 'origin/master' into develop 2024-08-26 18:31:07 +02:00
Applevangelist e2b6efde7a Merge remote-tracking branch 'origin/master' into develop 2024-08-26 18:22:59 +02:00
Applevangelist 3eea17bc76 Merge remote-tracking branch 'origin/develop' into develop 2024-08-26 15:53:23 +02:00
Applevangelist 2894bcc833 Merge remote-tracking branch 'origin/master' into develop 2024-08-26 15:53:20 +02:00
Thomas ff52197707 Merge pull request #2171 from FlightControl-Master/master
Update Utils.lua
2024-08-25 11:23:42 +02:00
Applevangelist b025abaa88 Merge remote-tracking branch 'origin/master' into develop 2024-08-24 18:18:36 +02:00
Applevangelist dac637f360 Merge remote-tracking branch 'origin/master' into develop 2024-08-23 16:29:18 +02:00
Applevangelist 861588205a Merge remote-tracking branch 'origin/master' into develop 2024-08-23 13:56:58 +02:00
Applevangelist 4d3fb2990e Merge remote-tracking branch 'origin/master' into develop 2024-08-23 12:47:37 +02:00
Applevangelist cce878e759 Merge remote-tracking branch 'origin/master' into develop 2024-08-22 18:27:00 +02:00
Applevangelist 2dbad7cb1b Merge remote-tracking branch 'origin/master' into develop 2024-08-22 17:18:13 +02:00
Applevangelist 7a0fa629b5 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 18:03:59 +02:00
Applevangelist aee7bd8bb6 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 10:56:08 +02:00
Applevangelist b1a40407b3 Merge remote-tracking branch 'origin/master' into develop 2024-08-20 10:47:56 +02:00
Thomas 0496571c92 Merge pull request #2170 from DarthZyll/patch-4
Update CSAR.lua - remove luadoc param addBeacon on SpawnCASEVAC()
2024-08-20 09:35:34 +02:00
Mike Young 62a0adce5a Update CSAR.lua - remove luadoc param addBeacon on SpawnCASEVAC()
this param doesn't actually exist, purely a luadoc correction
2024-08-19 13:46:21 -04:00
Applevangelist d1a1be1a9e Merge remote-tracking branch 'origin/develop' into develop 2024-08-18 19:38:27 +02:00
Applevangelist 80011f4e4e Merge remote-tracking branch 'origin/master' into develop 2024-08-18 19:38:24 +02:00
Frank c2933b6bed Update Legion.lua
- commented out debug info line
2024-08-18 18:19:05 +02:00
Frank fc4ba9f21d Merge branch 'master' into develop 2024-08-18 18:06:30 +02:00
Applevangelist 5bbd122fa4 Merge remote-tracking branch 'origin/master' into develop 2024-08-18 14:09:10 +02:00
Applevangelist 928c20c867 Merge remote-tracking branch 'origin/develop' into develop 2024-08-18 13:58:58 +02:00
Applevangelist 4bd36a4786 Merge remote-tracking branch 'origin/master' into develop 2024-08-18 13:58:55 +02:00
Frank ad7dba6fac Merge pull request #2168 from FlightControl-Master/FF/Ops
CHIEF v0.6.1
2024-08-17 23:56:07 +02:00
Frank 9efe0fe243 CHIEF v0.6.1
- Strategic zone: If zero transports are available and min carriers is zero, cargo assets need to go by themselfs.
2024-08-17 23:50:52 +02:00
Thomas 2836d7a40f Merge pull request #2167 from FlightControl-Master/Applevangelist-DC-1
Update DynamicCargo.lua
2024-08-17 14:20:51 +02:00
Thomas f1bf62e3c1 Update DynamicCargo.lua
#DYNAMICCARGO
2024-08-17 14:20:31 +02:00
Applevangelist a560d65ce7 Merge remote-tracking branch 'origin/master' into develop 2024-08-17 11:37:11 +02:00
Applevangelist 9de3cb73f7 Merge remote-tracking branch 'origin/develop' into develop 2024-08-17 11:36:17 +02:00
Applevangelist 757cc86a68 xx 2024-08-17 11:36:13 +02:00
Frank 2af1483724 Merge branch 'master' into develop 2024-08-16 23:13:22 +02:00
Applevangelist f23dd0a5dd Merge remote-tracking branch 'origin/master' into develop 2024-08-16 16:23:42 +02:00
Applevangelist 8336b744bb Merge remote-tracking branch 'origin/master' into develop 2024-08-16 15:46:34 +02:00
Applevangelist 9c47e35d54 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 15:22:45 +02:00
Applevangelist 16030d4fa1 Delete some non ready classes 2024-08-16 11:28:50 +02:00
Applevangelist 37d2dd17d7 Merge remote-tracking branch 'origin/master' into develop 2024-08-16 09:44:42 +02:00
Applevangelist 36bf2436b6 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Event.lua
#	Moose Development/Moose/Ops/CTLD.lua
#	Moose Development/Moose/Wrapper/DynamicCargo.lua
2024-08-16 09:39:48 +02:00
Applevangelist b8e09afcce Merge remote-tracking branch 'origin/master' into develop 2024-08-14 15:43:24 +02:00
Applevangelist ed690ee6e9 Merge remote-tracking branch 'origin/master' into develop 2024-08-14 11:34:27 +02:00
Applevangelist c0dcd12ada Merge remote-tracking branch 'origin/master' into develop 2024-08-14 09:47:39 +02:00
Applevangelist 5d98672de5 #ATIS - Polar circle fixes 2024-08-13 10:31:26 +02:00
Applevangelist e2fa1f992b Merge remote-tracking branch 'origin/master' into develop 2024-08-12 19:06:01 +02:00
Applevangelist bb865aef38 Merge branch 'master' into develop 2024-08-12 17:01:13 +02:00
Applevangelist 875b5fb34d Merge remote-tracking branch 'origin/develop' into develop 2024-08-12 16:17:30 +02:00
Applevangelist 19187bcb14 xx 2024-08-12 16:17:21 +02:00
Thomas ebe6e9fb9f Merge pull request #2165 from FlightControl-Master/master
Various
2024-08-12 11:40:43 +02:00
Thomas 5f7f75b1c9 BASE and SPAWN tuning (#2162)
* Update Base.lua (#2159)

Performance tuning - the BASE:I, F, T calls rank very high in overall number of calls taken from Moose. Ensure only the minimum number of actions based on trace state and level is taken

* Update Spawn.lua (#2161)

Updating this class as it calls BASE I,F,T a lot. Making it less noisy for some performance tuning
2024-08-12 10:18:14 +02:00
Thomas 59963e152d Update Base.lua (#2159) (#2160)
Performance tuning - the BASE:I, F, T calls rank very high in overall number of calls taken from Moose. Ensure only the minimum number of actions based on trace state and level is taken
2024-08-12 09:47:38 +02:00
Applevangelist e768ec3c17 Merge remote-tracking branch 'origin/master' into develop 2024-08-10 18:54:12 +02:00
Applevangelist c307de67c2 Merge remote-tracking branch 'origin/master' into develop 2024-08-10 18:17:21 +02:00
Applevangelist a962841528 Image docu path 2024-08-10 18:03:00 +02:00
Thomas 8ecfb52c61 Update Modules.lua 2024-08-10 17:34:45 +02:00
Thomas b9828fb713 Update Modules.lua (#2156) 2024-08-10 17:30:47 +02:00
Thomas 09073244ad Update Moose.files (#2157) 2024-08-10 17:30:31 +02:00
Applevangelist 3c82e6700d Merge remote-tracking branch 'origin/master' into develop 2024-08-10 10:15:59 +02:00
Applevangelist 50bbea327b Merge remote-tracking branch 'origin/master' into develop 2024-08-10 09:58:49 +02:00
Applevangelist df93ca309c Merge remote-tracking branch 'origin/master' into develop 2024-08-09 10:13:23 +02:00
Applevangelist 6e27877949 Merge remote-tracking branch 'origin/master' into develop 2024-08-08 09:21:27 +02:00
Applevangelist ef27584d0b Merge remote-tracking branch 'origin/master' into develop 2024-08-03 14:33:52 +02:00
Applevangelist ed82a4715d Merge remote-tracking branch 'origin/develop' into develop 2024-08-03 14:31:24 +02:00
Applevangelist 6a21db24c8 Merge remote-tracking branch 'origin/master' into develop 2024-08-03 14:30:48 +02:00
Applevangelist 1802d0dc29 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Modules_local.lua
#	Moose Setup/Moose.files
2024-08-03 14:06:59 +02:00
Applevangelist fc2a820a34 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-08-03 14:05:25 +02:00
Applevangelist cb4eccf57f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-08-03 14:02:52 +02:00
Applevangelist d1b4f63eb7 Merge remote-tracking branch 'origin/develop' into develop 2024-08-03 13:49:13 +02:00
Applevangelist 2e82793c3b Merge remote-tracking branch 'origin/master' into develop 2024-08-03 13:49:09 +02:00
Applevangelist d17d263fa3 Merge remote-tracking branch 'origin/master' into develop 2024-08-03 13:48:40 +02:00
Applevangelist e301efc690 xx 2024-08-03 13:47:38 +02:00
Applevangelist e77bf1f10e Merge remote-tracking branch 'origin/develop' into develop 2024-07-30 07:48:28 +02:00
Applevangelist ee37a325d4 Merge remote-tracking branch 'origin/master' into develop 2024-07-30 07:48:25 +02:00
Applevangelist 4a36eea5e6 xx 2024-07-30 07:48:01 +02:00
Applevangelist 27b9f32758 Merge remote-tracking branch 'origin/master' into develop 2024-07-30 07:47:50 +02:00
Applevangelist 37540bbbfb Docu 2024-07-30 07:47:06 +02:00
Applevangelist f14457380f xxx 2024-07-30 07:44:55 +02:00
Applevangelist 0369aa8080 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
2024-07-29 13:03:10 +02:00
Applevangelist 4c8b367644 Merge remote-tracking branch 'origin/master' into develop 2024-07-29 13:02:14 +02:00
Applevangelist 4f64ae6057 Merge remote-tracking branch 'origin/master' into develop 2024-07-29 13:01:42 +02:00
Applevangelist da8ce95adf xx 2024-07-29 13:01:06 +02:00
Applevangelist 23697f4fe3 xx 2024-07-28 17:54:27 +02:00
Applevangelist b4ceafca50 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 17:25:55 +02:00
Applevangelist 1c24580d3f #PLAYERTASKCONTROLLER - variable type checks 2024-07-28 17:25:20 +02:00
Applevangelist 801e03551f Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 15:21:45 +02:00
Applevangelist 5dd4435b7d #PLAYERTASKMANAGER - added listening to EVENTS.UnitLost 2024-07-28 15:20:54 +02:00
Applevangelist 01bfd8e141 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 13:42:13 +02:00
Applevangelist 9d84042ce8 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 13:42:10 +02:00
Applevangelist a63a8c78a8 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 13:41:41 +02:00
Applevangelist e4a8c36754 xx 2024-07-28 13:41:26 +02:00
Applevangelist c59bf3f334 xx 2024-07-28 13:40:59 +02:00
Applevangelist 9f581ee660 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 12:44:50 +02:00
Applevangelist ba2bfd5599 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 12:44:17 +02:00
Applevangelist fb31c25ab7 PLAYERTASK - nil check for client messaging 2024-07-28 12:43:57 +02:00
Applevangelist 8effa153b0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-28 12:43:22 +02:00
Applevangelist 086f687e32 Merge remote-tracking branch 'origin/master' into develop 2024-07-28 12:43:18 +02:00
Applevangelist 8ae8c94b27 xx 2024-07-28 12:42:52 +02:00
Applevangelist 03cd390baf EASYGCICAP - added a bit of housekeeping 2024-07-28 12:07:34 +02:00
Applevangelist 72303ffbad xx 2024-07-28 12:05:31 +02:00
Applevangelist 1f721ff9b4 Merge remote-tracking branch 'origin/develop' into develop 2024-07-27 16:21:39 +02:00
Applevangelist e3f780fda7 Merge remote-tracking branch 'origin/master' into develop 2024-07-27 16:21:36 +02:00
kaltokri 490bfe6a46 Merge branch 'master' into develop 2024-07-24 20:07:17 +02:00
Frank 51e703326e Merge pull request #2151 from w3z315/patch-1
Fix ZoneCaptureCoalition on player ejects / gets killed in zone
2024-07-21 00:35:02 +02:00
Frank 273170b4f4 Merge pull request #2152 from FlightControl-Master/FF/Ops
AUFTRAG
2024-07-21 00:29:52 +02:00
Frank 61e6ffa76c AUFTRAG
- Added new type STRAFING for corresponding DCS task
2024-07-21 00:29:25 +02:00
Alex 041cd238df Fix ZoneCaptureCoalition on player ejects / gets killed in zone
ZoneCaptureCoalition.lua:879 calls GetScannedSetUnit and will stop the scheduler if the error message for STATICs is raised. We already have a check if it is present so we can add this explicitly here.
2024-07-21 00:11:23 +02:00
Frank d07107d937 Merge pull request #2150 from FlightControl-Master/FF/Ops
Update NavyGroup.lua
2024-07-20 17:55:54 +02:00
Frank 5172ca7536 Update NavyGroup.lua
- Added old turn into wind code `NAVYGROUP:SetIntoWindLegacy`()`
- Added option to extend duration of turn into wind `NAVYGROUP:ExtendTurnIntoWind(Duration, TurnIntoWind)`
2024-07-20 17:44:58 +02:00
Applevangelist 10088879ce Merge remote-tracking branch 'origin/develop' into develop 2024-07-20 12:17:06 +02:00
Applevangelist 42a9333c53 Merge remote-tracking branch 'origin/master' into develop 2024-07-20 12:17:02 +02:00
Applevangelist 70622413dc Merge remote-tracking branch 'origin/master' into develop 2024-07-20 12:16:30 +02:00
Applevangelist 5596fab8e0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-18 16:09:34 +02:00
Applevangelist c3193fd6df Merge remote-tracking branch 'origin/master' into develop 2024-07-18 16:09:31 +02:00
Applevangelist 124262667e Merge remote-tracking branch 'origin/master' into develop 2024-07-18 16:08:22 +02:00
Applevangelist bb90ac58ba xx 2024-07-18 16:07:08 +02:00
Applevangelist e32d6138b3 Merge remote-tracking branch 'origin/develop' into develop 2024-07-18 14:36:14 +02:00
Applevangelist 90a6b6216e Merge remote-tracking branch 'origin/master' into develop 2024-07-18 14:36:11 +02:00
Applevangelist f0e01845d3 Merge remote-tracking branch 'origin/master' into develop 2024-07-18 14:35:38 +02:00
Applevangelist a813f8299f Range 2024-07-18 14:32:22 +02:00
Applevangelist de2bba63a5 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 16:04:05 +02:00
Applevangelist e758a0418a Merge remote-tracking branch 'origin/master' into develop 2024-07-16 16:04:02 +02:00
Applevangelist 31b76da69d Merge remote-tracking branch 'origin/master' into develop 2024-07-16 16:03:16 +02:00
Applevangelist e5bf7f104d xx 2024-07-16 16:02:47 +02:00
Applevangelist b47ba61762 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 13:39:35 +02:00
Applevangelist 0aff4bf98c Merge remote-tracking branch 'origin/master' into develop 2024-07-16 13:39:32 +02:00
Applevangelist 15996b43e6 Merge remote-tracking branch 'origin/master' into develop 2024-07-16 13:39:05 +02:00
Applevangelist b6b99a2e99 xx 2024-07-16 13:38:14 +02:00
Applevangelist d35c941748 Merge remote-tracking branch 'origin/develop' into develop 2024-07-16 11:55:21 +02:00
Applevangelist cfc8312b21 Merge remote-tracking branch 'origin/master' into develop 2024-07-16 11:54:58 +02:00
Applevangelist c040d2fa3f Merge remote-tracking branch 'origin/master' into develop 2024-07-16 11:54:46 +02:00
Applevangelist f6b4e81111 Merge remote-tracking branch 'origin/develop' into develop 2024-07-15 17:24:42 +02:00
Applevangelist c8da1277de Merge remote-tracking branch 'origin/master' into develop 2024-07-15 17:24:39 +02:00
Applevangelist 91a0e992cd Merge remote-tracking branch 'origin/master' into develop 2024-07-15 17:24:13 +02:00
Applevangelist b890dc22a3 xx 2024-07-15 17:23:45 +02:00
Applevangelist 703589d8e4 xx 2024-07-15 14:32:38 +02:00
Applevangelist 379c31b28a Merge remote-tracking branch 'origin/master' into develop 2024-07-15 14:32:17 +02:00
Applevangelist 8a89ed5857 Merge remote-tracking branch 'origin/master' into develop 2024-07-14 19:16:00 +02:00
Applevangelist 87b866eca1 xx 2024-07-14 19:15:33 +02:00
Applevangelist 6557a6cf0b Merge remote-tracking branch 'origin/develop' into develop 2024-07-14 18:49:23 +02:00
Applevangelist 0128381f4f Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:49:17 +02:00
Applevangelist 4511a68a2b Merge remote-tracking branch 'origin/master' into develop 2024-07-14 18:48:44 +02:00
Applevangelist 9ecaca365f xx 2024-07-14 18:48:23 +02:00
Applevangelist 504e56e827 Merge remote-tracking branch 'origin/master' into develop 2024-07-14 17:49:53 +02:00
Applevangelist cfc0cc66b2 xxx 2024-07-14 17:48:48 +02:00
Applevangelist 2442adfd2f Merge remote-tracking branch 'origin/master' into develop 2024-07-13 15:22:18 +02:00
Applevangelist a833703731 xx 2024-07-13 15:21:51 +02:00
Applevangelist af85745433 CONTROLLABLE:TaskLandAtVec2( Vec2, Duration , CombatLanding, DirectionAfterLand) 2024-07-12 19:33:35 +02:00
Applevangelist ef58cae59f Merge remote-tracking branch 'origin/master' into develop 2024-07-12 19:33:17 +02:00
Applevangelist 86fc8db9e6 #AUFTRAG LANDATCOORDINATE - added combat land options 2024-07-12 19:32:24 +02:00
Applevangelist 7bc7fee6d7 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 13:38:35 +02:00
Applevangelist 46c5b50077 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:38:30 +02:00
Applevangelist 5c54f47527 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:37:46 +02:00
Applevangelist d9aad161b0 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 13:31:21 +02:00
Applevangelist fea2098c40 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:31:17 +02:00
Applevangelist 03f8b1e301 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 13:30:51 +02:00
Applevangelist d298ed2a83 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 12:20:53 +02:00
Applevangelist 515ac2c060 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 12:20:50 +02:00
Applevangelist 6a31e47705 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 12:20:16 +02:00
Applevangelist 70e4454fa9 Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 11:46:38 +02:00
Applevangelist 82b4f4ee58 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:46:35 +02:00
Applevangelist 925233709b xx 2024-07-12 11:46:12 +02:00
Applevangelist 0af15699f3 Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:45:53 +02:00
Applevangelist 5b596516fe Merge remote-tracking branch 'origin/master' into develop 2024-07-12 11:37:27 +02:00
Applevangelist df6c97bec8 #EASYGCICAP - avoid launching intercepts if airwing conquered by other coalition 2024-07-12 09:36:29 +02:00
Applevangelist c7e73f3b1a #EASYGCICAP - fix launching interceptors from conquered, wrong coalition wings 2024-07-12 08:38:42 +02:00
Applevangelist ccc7b431dc Merge remote-tracking branch 'origin/develop' into develop 2024-07-12 08:10:24 +02:00
Applevangelist 079e60163d Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:10:20 +02:00
Applevangelist 29fb03e903 xx 2024-07-12 08:09:59 +02:00
Applevangelist 6e917049af Merge remote-tracking branch 'origin/master' into develop 2024-07-12 08:09:39 +02:00
Applevangelist c8d49916df #RAT - dimensions workaround for Saab 340 2024-07-12 08:08:32 +02:00
Applevangelist 32297da2b0 #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:32 +02:00
Applevangelist 336ac9eddb #AWACS - MS TTS - fix spelling out B-R-A in Threat call 2024-07-11 08:35:16 +02:00
Applevangelist 1d64ac3469 Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:32:28 +02:00
Applevangelist 26adb7934e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
2024-07-09 11:32:23 +02:00
Applevangelist c51a6da5ff Merge remote-tracking branch 'origin/develop' into develop 2024-07-09 11:31:33 +02:00
Applevangelist 5629a8fcd6 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
2024-07-09 11:31:29 +02:00
Frank 1a0e2e0ea1 OPS
- Added method to reduce asset count for cohorts #2103
- Added tacview on legion level
2024-07-07 23:15:20 +02:00
Frank f74c0e29a5 Merge branch 'master' into develop 2024-07-07 11:32:08 +02:00
Frank 6f3d9a497a Update Chief.lua
- Added unsupported mission type for OPSZONE to error log output
2024-07-06 21:51:20 +02:00
Frank ead7844e5f Merge branch 'master' into develop 2024-07-05 21:36:12 +02:00
Frank d25d89afbb Merge branch 'master' into develop 2024-07-05 17:54:06 +02:00
Frank e30fb1c9bd Merge branch 'master' into develop 2024-07-03 23:17:49 +02:00
Frank 64039ae770 Merge branch 'master' into develop 2024-07-03 17:45:33 +02:00
Frank 0aa78ec0c8 Merge branch 'master' into develop 2024-07-03 09:47:07 +02:00
Frank 34698a1b4e Merge branch 'master' into develop 2024-07-02 15:52:55 +02:00
Applevangelist 083bedcc2d Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 12:48:15 +02:00
Applevangelist aad17f97fc Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2024-07-02 12:48:09 +02:00
Applevangelist 6a83b48429 Merge remote-tracking branch 'origin/develop' into develop 2024-07-02 12:46:50 +02:00
Applevangelist 77a1150037 #EASYGCICAP - add options to set default despawn after holding or landing 2024-07-02 12:46:45 +02:00
Applevangelist 19ff7ce9a0 #EASYGCICAP - add options to set default despawn after holding or landing 2024-07-02 12:46:35 +02:00
Frank 86508d49ee Merge branch 'master' into develop 2024-07-01 22:15:39 +02:00
Applevangelist 0058383e64 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
2024-06-30 16:02:11 +02:00
Applevangelist 1549ca1cc4 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 16:01:22 +02:00
Applevangelist 7abb6680b4 fixes 2024-06-30 16:01:02 +02:00
Applevangelist 9479b338c5 xxx 2024-06-30 15:57:09 +02:00
Applevangelist b6ac1e86e4 xx 2024-06-30 15:20:23 +02:00
Applevangelist a4b187d561 xx 2024-06-30 15:20:17 +02:00
Applevangelist 335bd897d5 Merge remote-tracking branch 'origin/master' into develop 2024-06-30 11:31:51 +02:00
Applevangelist 897a0d4f40 xxx 2024-06-25 13:41:31 +02:00
Applevangelist 7229439d84 Merge remote-tracking branch 'origin/develop' into develop 2024-06-25 13:09:55 +02:00
Applevangelist 1be62b9c4e Merge remote-tracking branch 'origin/master' into develop 2024-06-25 13:09:48 +02:00
Applevangelist 30fd2230b0 Merge remote-tracking branch 'origin/master' into develop 2024-06-25 13:09:16 +02:00
Applevangelist 50ff9f162a Merge remote-tracking branch 'origin/develop' into develop 2024-06-25 10:46:55 +02:00
Applevangelist e94a918bbe Merge remote-tracking branch 'origin/master' into develop 2024-06-25 10:46:51 +02:00
Applevangelist af261048a6 Merge remote-tracking branch 'origin/master' into develop 2024-06-25 10:46:17 +02:00
Applevangelist 2fc2f5d798 #ARTY fixed counting the right artillery shells and some logic problems 2024-06-25 10:44:53 +02:00
Frank ba41d6421d FLIGHTGROUP
- Added nil checks if client template does not exist
2024-06-25 09:38:29 +02:00
Frank faadbdecfb Merge branch 'master' into develop 2024-06-24 23:55:13 +02:00
Applevangelist 21b5823bc0 Merge remote-tracking branch 'origin/develop' into develop 2024-06-23 19:19:19 +02:00
Applevangelist 81c38d2221 Merge remote-tracking branch 'origin/master' into develop 2024-06-23 19:19:16 +02:00
Applevangelist a994942a02 Merge remote-tracking branch 'origin/master' into develop 2024-06-23 19:18:47 +02:00
Applevangelist bd6d23c7f8 #UNIT - improved GetAmmunition() to also report Tank HE and AP shells and added query functions for arti, HE and AP type of ammunition
#OPSZONE - added FindByName()
2024-06-23 19:17:32 +02:00
Applevangelist f15e89e7aa xxx 2024-06-23 19:15:57 +02:00
Applevangelist 7bb5e324f9 Merge remote-tracking branch 'origin/develop' into develop 2024-06-22 11:54:58 +02:00
Applevangelist 209149b8de Merge remote-tracking branch 'origin/master' into develop 2024-06-22 11:54:55 +02:00
Applevangelist b701fa61fa xxx 2024-06-22 11:54:35 +02:00
Applevangelist 97abe32f75 Merge remote-tracking branch 'origin/master' into develop 2024-06-22 11:54:19 +02:00
Applevangelist ef7d354109 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 18:10:11 +02:00
Applevangelist f5551e202d Merge remote-tracking branch 'origin/master' into develop 2024-06-20 18:10:06 +02:00
Applevangelist 796b71474b Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 18:08:55 +02:00
Applevangelist 662412dd02 Merge remote-tracking branch 'origin/master' into develop 2024-06-20 18:08:52 +02:00
Applevangelist 97c1653614 Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 08:53:11 +02:00
Applevangelist 07dc55b284 Merge remote-tracking branch 'origin/master' into develop 2024-06-20 08:53:08 +02:00
Applevangelist cc925271aa Merge remote-tracking branch 'origin/develop' into develop-2 2024-06-20 08:52:50 +02:00
Applevangelist 753cbaa2b9 xxx 2024-06-20 08:52:47 +02:00
Applevangelist b8f7cf44cc Merge remote-tracking branch 'origin/develop' into develop 2024-06-20 08:52:28 +02:00
Applevangelist 7d6f9fc4b5 Merge remote-tracking branch 'origin/master' into develop 2024-06-20 08:52:25 +02:00
Frank 3fac5ac9f0 Update FlightGroup.lua
- Fixed refueling issue
2024-06-18 23:15:50 +02:00
Frank d83cabbab6 Merge branch 'master' into develop 2024-06-18 09:21:12 +02:00
Frank bdd9efa2cc Update FlightControl.lua
- Added `FLIGHTCONTROL:SetTransmitOnlyWithPlayers()`
2024-06-17 18:08:45 +02:00
Frank a778e910f7 Merge pull request #2139 from FlightControl-Master/FF/Ops
Update FlightControl.lua
2024-06-17 16:11:40 +02:00
Frank 24b09e22f7 Update FlightControl.lua
- Added `FLIGHTCONTROL:SetRadioOnlyIfPlayers`
2024-06-17 16:09:01 +02:00
Thomas b40331b04e Kiowa type name fix (#2138)
* Update CSAR.lua

Kiowa type name

* Update CTLD.lua
2024-06-15 08:14:58 +02:00
Applevangelist fe6d69fdcc xxx 2024-06-14 16:37:36 +02:00
Applevangelist 7a0f53ebf3 docu fix 2024-06-14 16:37:21 +02:00
Applevangelist af17265efc Merge remote-tracking branch 'origin/develop' into develop 2024-06-11 10:21:32 +02:00
Applevangelist 12b8740bad Merge remote-tracking branch 'origin/master' into develop 2024-06-11 10:21:27 +02:00
Applevangelist a2580122de Merge remote-tracking branch 'origin/master' into develop 2024-06-11 10:20:52 +02:00
Applevangelist 5e62791837 fixes 2024-06-11 09:02:31 +02:00
Applevangelist 85fc601a7a Merge remote-tracking branch 'origin/develop' into develop 2024-06-09 18:33:01 +02:00
Applevangelist 1d5f9cc4cc Merge remote-tracking branch 'origin/master' into develop 2024-06-09 18:32:57 +02:00
Applevangelist 5e3b50c158 Merge remote-tracking branch 'origin/develop' into develop 2024-06-09 18:32:32 +02:00
Applevangelist 2262f27d18 Merge remote-tracking branch 'origin/master' into develop 2024-06-09 18:32:28 +02:00
Frank 1fc526e80f Merge branch 'master' into develop 2024-06-09 17:59:14 +02:00
kaltokri 6f7a29d372 Merge branch 'master' into develop 2024-06-09 11:00:19 +02:00
Applevangelist 1d8658122a Merge remote-tracking branch 'origin/develop' into develop 2024-06-08 11:49:40 +02:00
Applevangelist 344eff535a Merge remote-tracking branch 'origin/master' into develop 2024-06-08 11:49:34 +02:00
Applevangelist e375f3a401 Merge remote-tracking branch 'origin/master' into develop 2024-06-08 11:49:06 +02:00
Applevangelist 10986f8a0d #MANTIS - fix omission to set own name 2024-06-08 11:48:47 +02:00
Applevangelist f4ae0c9547 #MANTIS - fix omission to set own name 2024-06-08 11:48:41 +02:00
Applevangelist 4bddf16c82 Merge remote-tracking branch 'origin/develop' into develop 2024-06-07 16:05:44 +02:00
Applevangelist cc414862a4 Merge remote-tracking branch 'origin/master' into develop 2024-06-07 16:05:40 +02:00
Applevangelist 1355f2f562 Merge remote-tracking branch 'origin/develop' into develop 2024-06-07 16:04:45 +02:00
Applevangelist e620062a95 Merge remote-tracking branch 'origin/master' into develop 2024-06-07 16:04:41 +02:00
Thomas 813b9d90aa Update Set.lua: added handler for EVENTS.PlayerLeaveUnit in SET_GROUP:FilterStart() (#2134) (#2136)
Ops.CSAR was throwing the following errors constantly when a player would leave the CSAR helo:

GROUP05000.GetDCSObject((ERROR: Could not get DCS group object of group Archer-1 because DCS object could not be found!))

This was because the SET_GROUP FilterStart on allheligroupset was not handling the scenario when a player left w/o a death.

Co-authored-by: Mike Young <117502908+DarthZyll@users.noreply.github.com>
2024-06-01 07:33:56 +02:00
Frank 5fc39daa9d Update Chief.lua
- added GetStrategy method
2024-05-28 23:54:39 +02:00
Applevangelist 09372df86d AUTOLASE - less menu builds 2024-05-27 18:31:14 +02:00
Applevangelist 26d0f2f4e3 xxx 2024-05-27 18:16:57 +02:00
Applevangelist e010a13f85 Merge remote-tracking branch 'origin/develop' into develop 2024-05-27 17:09:47 +02:00
Applevangelist cffca96755 Merge remote-tracking branch 'origin/master' into develop 2024-05-27 17:09:42 +02:00
Applevangelist 7c0605e82f Merge remote-tracking branch 'origin/master' into develop 2024-05-27 17:09:11 +02:00
Applevangelist a847d890ba Small fixes 2024-05-27 17:08:05 +02:00
Applevangelist 97635f4bba xxx 2024-05-27 17:07:12 +02:00
Applevangelist 2657c3aa52 Merge remote-tracking branch 'origin/master' into develop 2024-05-26 12:59:33 +02:00
Applevangelist 1f1ab1664c Merge remote-tracking branch 'origin/master' into develop 2024-05-26 12:59:10 +02:00
Applevangelist 17b1e08532 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Range.lua
2024-05-24 10:07:19 +02:00
Applevangelist 987f613aae Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Range.lua
2024-05-24 10:05:36 +02:00
Applevangelist dead785133 Autolase 2024-05-24 10:04:08 +02:00
Thomas dade17a67f Update Autolase.lua (#2133)
* Update Autolase.lua

Added menu option to change threatlevel lasing in the fly

* Update Autolase.lua

Menu option for lasing threat level
2024-05-24 10:03:27 +02:00
Applevangelist 64be0ffee5 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Range.lua
2024-05-23 18:13:05 +02:00
kaltokri 59ceb01d19 Fixed link in Func.Range to "476 vFG - Air Weapons Range Objects"
# Conflicts:
#	Moose Development/Moose/Functional/Range.lua
2024-05-21 19:49:27 +02:00
Applevangelist c225456cd4 Merge remote-tracking branch 'origin/develop' into develop 2024-05-21 15:19:36 +02:00
Applevangelist 3ea3dfb486 Merge remote-tracking branch 'origin/master' into develop 2024-05-21 15:19:24 +02:00
Applevangelist 7dec189358 xxx 2024-05-21 15:18:57 +02:00
Applevangelist 42d8a9f59d #STRATEGO - Island hopping 2024-05-21 15:18:31 +02:00
Thomas 9e7caba089 Update Message.lua (#2130) (#2131)
the Label and port were not being pulled from MSRS Config, causing them to default to "MESSAGE" and 5002 when calling the MESSAGE.SetMSRS() function with no params

Co-authored-by: Mike Young <117502908+DarthZyll@users.noreply.github.com>
2024-05-21 06:41:28 +02:00
Applevangelist 9df6467cd1 Merge remote-tracking branch 'origin/develop' into develop 2024-05-20 11:16:57 +02:00
Applevangelist 399f9883a9 #STRATEGO, option in FindRoute to not optimize the route 2024-05-20 11:16:16 +02:00
Applevangelist dd7c1a9245 xxx 2024-05-20 11:15:47 +02:00
Applevangelist 593f21bd3b xxx 2024-05-19 13:12:35 +02:00
Applevangelist 9815216bd5 xx 2024-05-19 13:12:09 +02:00
Applevangelist da8a02465e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Functional/Mantis.lua
2024-05-19 12:50:41 +02:00
Applevangelist ce01534535 Merge remote-tracking branch 'origin/master' into develop 2024-05-19 12:48:09 +02:00
Applevangelist 639c5bc71a xxx 2024-05-19 12:47:54 +02:00
Applevangelist aec65209d0 #STRATEGO 2024-05-19 12:47:31 +02:00
Applevangelist d0ca76926e Merge remote-tracking branch 'origin/develop' into develop 2024-05-19 11:32:31 +02:00
Applevangelist 1fd15bcd4d Merge remote-tracking branch 'origin/master' into develop 2024-05-19 11:32:29 +02:00
kaltokri 073e619015 Merge branch 'master' into develop 2024-05-18 16:57:41 +02:00
Applevangelist d9528292af Merge remote-tracking branch 'origin/master' into develop 2024-05-16 17:56:36 +02:00
Applevangelist f022c87f25 #MANTIS - Option to avoid friendly fire 2024-05-16 17:55:05 +02:00
Applevangelist 5d8260b28e fix 2024-05-16 11:50:35 +02:00
Applevangelist 830dd05514 fix 2024-05-16 11:50:20 +02:00
Applevangelist d432ec8105 Merge remote-tracking branch 'origin/develop' into develop 2024-05-16 09:55:24 +02:00
Applevangelist 7a24b491e9 Merge remote-tracking branch 'origin/master' into develop 2024-05-16 09:55:20 +02:00
Applevangelist ca7949d8c4 Merge remote-tracking branch 'origin/master' into develop 2024-05-16 09:54:53 +02:00
Applevangelist efca40d481 SPAWN - Fix for KeepUnitNames 2024-05-16 09:54:00 +02:00
Applevangelist 34fde09c12 #PLAYERTASKCONTROLLER - Added target elevation to task info 2024-05-16 09:34:29 +02:00
Applevangelist 0e40dc70b2 xxx 2024-05-16 09:34:03 +02:00
Applevangelist 52452b45b1 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 09:57:45 +02:00
Applevangelist b9bfd781d0 Merge remote-tracking branch 'origin/master' into develop 2024-05-13 09:57:41 +02:00
Applevangelist 983d518a69 Merge remote-tracking branch 'origin/develop' into develop 2024-05-13 09:57:06 +02:00
Applevangelist c14dec7412 Too much logging 2024-05-13 09:57:02 +02:00
Applevangelist 662885aaa6 xxx 2024-05-13 09:56:48 +02:00
Frank 78ab7547f3 Merge branch 'master' into develop 2024-05-11 09:51:00 +02:00
Applevangelist 5d67009b18 Merge remote-tracking branch 'origin/develop' into develop 2024-05-11 09:38:32 +02:00
Applevangelist 4ffe6a04c2 Merge remote-tracking branch 'origin/master' into develop 2024-05-11 09:38:28 +02:00
Applevangelist 7081448c40 Merge remote-tracking branch 'origin/master' into develop 2024-05-11 09:37:52 +02:00
Applevangelist dfca4d8bec xxx 2024-05-11 09:36:36 +02:00
Applevangelist 0bd245aee5 Merge remote-tracking branch 'origin/develop' into develop 2024-05-10 18:26:10 +02:00
Applevangelist fe730da72f Merge remote-tracking branch 'origin/master' into develop 2024-05-10 18:26:06 +02:00
Frank c7c1bcfff4 Merge branch 'master' into develop 2024-05-09 16:57:33 +02:00
Frank 4f25c9a408 Merge branch 'master' into develop 2024-05-09 16:03:11 +02:00
Applevangelist 4179e63e30 Merge remote-tracking branch 'origin/develop' into develop 2024-05-07 14:34:33 +02:00
Applevangelist 7868a2e9de #STRATEGO - Smarter route finding 2024-05-07 14:34:02 +02:00
Applevangelist b1f3cda7f7 #STRATEGO - Smarter route finding 2024-05-07 14:33:49 +02:00
Applevangelist 522c5e4eaa Merge remote-tracking branch 'origin/develop' into develop 2024-05-06 19:02:07 +02:00
Applevangelist 1e9608de3a Merge remote-tracking branch 'origin/master' into develop 2024-05-06 19:02:02 +02:00
Applevangelist 04b4f7cc0f XXX 2024-05-06 19:01:42 +02:00
Applevangelist b7db198125 Merge remote-tracking branch 'origin/master' into develop 2024-05-06 19:01:24 +02:00
Applevangelist 00b8c39455 Merge remote-tracking branch 'origin/develop' into develop 2024-05-04 14:56:50 +02:00
Applevangelist cd0e4bfb04 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 14:56:46 +02:00
Applevangelist 4364cb8e53 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 14:56:07 +02:00
Applevangelist ad882dd72e Merge remote-tracking branch 'origin/develop' into develop 2024-05-04 13:42:18 +02:00
Applevangelist d4d0dcec61 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 13:42:13 +02:00
Applevangelist 84857d2a32 Merge remote-tracking branch 'origin/master' into develop 2024-05-04 13:10:30 +02:00
Applevangelist 2a33aa029d Merge remote-tracking branch 'origin/develop' into develop 2024-05-01 13:53:12 +02:00
Applevangelist c72f96be19 Merge remote-tracking branch 'origin/master' into develop 2024-05-01 13:53:08 +02:00
Applevangelist 02db5ba532 Merge remote-tracking branch 'origin/master' into develop 2024-05-01 13:52:39 +02:00
Applevangelist e7f270630c Merge remote-tracking branch 'origin/develop' into develop 2024-04-30 09:21:27 +02:00
Applevangelist 29a3c0d554 Merge remote-tracking branch 'origin/master' into develop 2024-04-30 09:21:23 +02:00
Applevangelist 0f5f2658a6 Merge remote-tracking branch 'origin/master' into develop 2024-04-30 09:20:07 +02:00
Applevangelist 6df872eed2 Merge remote-tracking branch 'origin/develop' into develop 2024-04-29 16:46:50 +02:00
Thomas 9ce1b90eb1 STRATEGO (#2123)
Added option to set Capture Object Categories (ie static and/or units) to capture a node.
2024-04-29 10:50:48 +02:00
Applevangelist 38c19b1442 Merge remote-tracking branch 'origin/master' into develop 2024-04-27 17:29:41 +02:00
Applevangelist bbae343b0e Merge remote-tracking branch 'origin/develop' into develop 2024-04-27 17:29:15 +02:00
Applevangelist 5f5b781f04 Merge remote-tracking branch 'origin/master' into develop 2024-04-27 17:29:11 +02:00
Applevangelist 8e99f37306 xxx 2024-04-27 17:28:50 +02:00
Thomas 2f34526c55 Update build-docs.yml 2024-04-24 13:26:51 +02:00
Thomas ebc355ee6a Shapes - added images (#2122)
* Update Triangle.lua (#2121)

* Update Polygon.lua (#2120)

* Update Oval.lua (#2119)

* Update Line.lua (#2118)

* Update Cube.lua (#2117)

* Update Circle.lua (#2116)
2024-04-24 10:46:16 +02:00
Frank 1bfc98fa99 Merge pull request #2115 from FlightControl-Master/FF/OpsRat
RAT v3.0
2024-04-23 23:21:56 +02:00
Frank efb687cbb5 Update Base.lua 2024-04-23 23:18:53 +02:00
Frank 668f12391e Merge branch 'develop' into FF/OpsRat 2024-04-23 23:12:31 +02:00
Frank dfaccd6aa5 Update Message.lua 2024-04-23 23:12:17 +02:00
Applevangelist 2220f1829f #STRATEGO -- add SetStrategoZone 2024-04-23 10:13:09 +02:00
Applevangelist 65aeb56c2f #STRATEGO -- add SetStrategoZone 2024-04-23 10:12:11 +02:00
Applevangelist 47ad79b81d Merge remote-tracking branch 'origin/develop' into develop 2024-04-23 09:26:42 +02:00
Applevangelist 956035b856 Merge remote-tracking branch 'origin/master' into develop 2024-04-23 09:26:39 +02:00
Applevangelist 76fde11f47 Merge remote-tracking branch 'origin/master' into develop 2024-04-23 09:26:11 +02:00
Applevangelist c0ac5d1487 Merge remote-tracking branch 'origin/develop' into develop 2024-04-23 09:18:44 +02:00
Applevangelist f8852ca759 Merge remote-tracking branch 'origin/master' into develop 2024-04-23 09:18:40 +02:00
Applevangelist 1f041a8acf Merge remote-tracking branch 'origin/master' into develop 2024-04-23 09:18:07 +02:00
Applevangelist 2f957899e1 xxx 2024-04-23 09:17:31 +02:00
Thomas 892cb90d62 Adding Shapes (#2114)
* Adding SHAPES (#2110)

* Adding a new TerminalType (100)that seems to be introduced in the update that brought Muwaffaq Salti. The base has a couple of spots (like 04, 05, 06) that can only accommodate smaller type fixed wing aircraft, like the F-16, but not bigger types like the Warthog of the Strike Eagle.

Because we weren't checking for this new type, spawning in these particular spots always resulted in an airstart, because `_CheckTerminalType` would always return `false`

* Adding Shapes over from old MOOSE branch

* cleanup

* adding HEXtoRGBA

* Revert "Adding SHAPES (#2110)" (#2112)

This reverts commit 26deaca166.

* Adding SHAPES (#2113)

* Adding a new TerminalType (100)that seems to be introduced in the update that brought Muwaffaq Salti. The base has a couple of spots (like 04, 05, 06) that can only accommodate smaller type fixed wing aircraft, like the F-16, but not bigger types like the Warthog of the Strike Eagle.

Because we weren't checking for this new type, spawning in these particular spots always resulted in an airstart, because `_CheckTerminalType` would always return `false`

* Adding Shapes over from old MOOSE branch

* cleanup

* adding HEXtoRGBA

* removing Arrow.lua, it's part of Polygon.lua

---------

Co-authored-by: Niels Vaes <nielsvaes@gmail.com>
2024-04-23 09:16:44 +02:00
Frank 3fa3644e1e ARMYGROUP
- on road fix
2024-04-21 10:58:13 +02:00
Applevangelist 9b26ed7042 xxx 2024-04-20 16:21:19 +02:00
Applevangelist 1346317ad9 #STRATEGO - add functions to set weight, baseweight manually# 2024-04-20 16:21:02 +02:00
Applevangelist 05b547b640 Merge remote-tracking branch 'origin/develop' into develop 2024-04-19 15:59:46 +02:00
Applevangelist afa8d9c4d1 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Spawn.lua
2024-04-19 15:59:41 +02:00
Applevangelist e11bb71c2d Merge remote-tracking branch 'origin/master' into develop 2024-04-19 15:58:17 +02:00
Applevangelist 672f1ae2d6 xxx 2024-04-19 15:57:02 +02:00
Applevangelist 0b607eb751 xx 2024-04-19 15:55:08 +02:00
Applevangelist 89d945037d xxx 2024-04-19 15:54:30 +02:00
Applevangelist 39471212d3 Merge remote-tracking branch 'origin/master' into develop 2024-04-19 15:45:33 +02:00
Applevangelist 6c1a4f1e0d Merge remote-tracking branch 'origin/master' into develop 2024-04-19 11:33:41 +02:00
Applevangelist 235cbbe23a #CSAR - add'l logging 2024-04-19 11:32:35 +02:00
Applevangelist f771607f40 Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 18:42:04 +02:00
Applevangelist 2cf7047617 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 18:41:58 +02:00
Applevangelist b338f486e5 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 18:41:29 +02:00
Applevangelist 202d649085 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 14:52:21 +02:00
Applevangelist 1beb5934c2 xxx 2024-04-18 14:51:53 +02:00
Applevangelist e1e0095d9b Merge remote-tracking branch 'origin/master' into develop 2024-04-18 14:42:12 +02:00
Applevangelist 5d00a2d806 xxx 2024-04-18 14:41:44 +02:00
Applevangelist 5adb943939 SPAWN 2024-04-18 13:52:10 +02:00
Frank a8cbf81851 Merge branch 'FF/Ops' into FF/OpsRat 2024-04-18 10:36:42 +02:00
Frank 0e78e9c92b Merge branch 'develop' into FF/Ops 2024-04-18 10:36:28 +02:00
Applevangelist 13309663fb Merge remote-tracking branch 'origin/develop' into develop 2024-04-18 09:33:16 +02:00
Applevangelist 4baa593fde Merge remote-tracking branch 'origin/master' into develop 2024-04-18 09:33:11 +02:00
Applevangelist 186b64ea81 #CTLD 2024-04-18 09:32:27 +02:00
Applevangelist 7c4d640690 Merge remote-tracking branch 'origin/master' into develop 2024-04-18 09:30:56 +02:00
Frank 833206a3b5 RAT
- Uncontrolled
2024-04-16 16:42:26 +02:00
Applevangelist 743baac945 Small fix for callsign not traversing from Squadron to Flightgroup 2024-04-16 16:01:43 +02:00
Applevangelist 0764d076db Housekeeping 2024-04-16 08:46:06 +02:00
Applevangelist c9fd56116e Housekeeping 2024-04-16 08:45:53 +02:00
Applevangelist e21240e711 Merge remote-tracking branch 'origin/develop' into develop 2024-04-15 18:56:07 +02:00
Applevangelist 99d32a7854 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:56:03 +02:00
Applevangelist 620df5ad3e xx 2024-04-15 18:54:59 +02:00
Applevangelist 504aa19c03 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 18:54:46 +02:00
Applevangelist d4a49ae68b #CLIENTMENU/MANAGER
* Attempt to avoid dual menu builds for multi-seated aircraft
2024-04-15 12:52:19 +02:00
Applevangelist b9cb6dbffb xxx 2024-04-15 12:50:15 +02:00
Applevangelist be85aab755 Merge remote-tracking branch 'origin/develop' into develop 2024-04-15 08:59:15 +02:00
Applevangelist fcb7a2c3e7 Merge remote-tracking branch 'origin/master' into develop 2024-04-15 08:59:11 +02:00
Applevangelist ca1018f80b Merge remote-tracking branch 'origin/master' into develop 2024-04-15 08:58:37 +02:00
Frank 21412e0061 Update RAT.lua
- Added Stop function
2024-04-08 01:18:04 +02:00
Frank 5761e11157 Merge branch 'develop' into FF/OpsRat 2024-04-07 22:58:44 +02:00
Frank 7d3f1235e7 Update RAT.lua
- respawn on landing adjustment
2024-04-05 23:57:54 +02:00
Frank 473001c95b Update RAT.lua 2024-04-04 23:50:24 +02:00
Frank 532cc0b4df RAT
- options set via flightgroup
- fixed little bug in OPSGROUP emission default
2024-04-04 23:39:56 +02:00
Frank 08fb4e3736 Update RAT.lua
- Improved ATC and FLIGHTCONTROL integration
2024-04-04 19:08:18 +02:00
Applevangelist 6b7e66efa5 Merge remote-tracking branch 'origin/master' into develop 2024-04-04 17:23:08 +02:00
Frank 5fd8139f00 Update RAT.lua
- RATMANAGER
2024-04-04 14:21:52 +02:00
Frank ac68744deb Merge branch 'FF/Ops' into FF/OpsRat 2024-04-04 09:36:13 +02:00
Frank cec02bc44f Merge branch 'develop' into FF/Ops 2024-04-04 09:34:37 +02:00
Frank a924a0b641 Update RAT.lua 2024-04-03 21:56:24 +02:00
Frank ee15b04142 Update RAT.lua 2024-04-03 14:27:10 +02:00
Frank 2c67a66d88 Update RAT.lua 2024-04-02 23:18:30 +02:00
Frank 1fdb3b7daa RAT
- Improved respawn/despawn
- Added stuck check
2024-04-02 17:33:41 +02:00
Applevangelist 483cf09676 xxx 2024-04-02 13:23:36 +02:00
Applevangelist 181ed6046e Merge remote-tracking branch 'origin/master' into develop 2024-04-02 13:23:21 +02:00
Applevangelist 8ca9c4e7b8 Merge remote-tracking branch 'origin/develop' into develop 2024-04-02 10:50:06 +02:00
Applevangelist bd28c10492 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:50:01 +02:00
Applevangelist 4c890d18d1 Merge remote-tracking branch 'origin/master' into develop 2024-04-02 10:48:57 +02:00
Applevangelist 67d53034df bugfix 2024-04-01 19:11:53 +02:00
Applevangelist 355230a97f xxx 2024-04-01 19:11:33 +02:00
Applevangelist bde5859879 Merge remote-tracking branch 'origin/develop' into develop 2024-04-01 13:30:30 +02:00
Applevangelist 630e02f1ce Merge remote-tracking branch 'origin/master' into develop 2024-04-01 13:30:26 +02:00
Applevangelist b4d1118c88 Merge remote-tracking branch 'origin/master' into develop 2024-04-01 12:59:39 +02:00
Applevangelist 1ea2f091e0 Fix 2024-04-01 12:58:20 +02:00
Frank a5632ec3a4 RAT
- More cleanup

OPSGROUP
- Fixed group init (masterunit)
2024-03-31 23:33:37 +02:00
Frank 0804a3567a Merge branch 'develop' into FF/Ops 2024-03-30 22:34:13 +01:00
Frank ef8c71d27c RAT
- FLIGHTCONTROL
- RAT ATC
2024-03-30 22:22:00 +01:00
Frank 879ea847e9 RAT v3
- improved stuff for helos
2024-03-29 21:54:13 +01:00
Frank be3c418919 Update RAT.lua
- Improved keeping parking spot after respawn
- Improved ratcraft object
2024-03-28 23:15:50 +01:00
Applevangelist 7aa252e42f xxx 2024-03-28 11:13:13 +01:00
Applevangelist be3db86470 Merge remote-tracking branch 'origin/master' into develop 2024-03-28 11:12:57 +01:00
Applevangelist 577fefab3a Merge remote-tracking branch 'origin/master' into develop 2024-03-28 08:45:18 +01:00
Applevangelist a52df9ae9a xxx 2024-03-28 08:44:12 +01:00
Frank 2c749bf5c9 Merge branch 'develop' into FF/Ops 2024-03-27 22:25:54 +01:00
Frank 24eaa7441c Update RAT.lua 2024-03-27 22:15:17 +01:00
Applevangelist 1b072e11ad xxx 2024-03-27 18:00:50 +01:00
Applevangelist 0dec9418ca Merge remote-tracking branch 'origin/develop' into develop 2024-03-27 14:41:48 +01:00
Applevangelist 9a2174ac2b Merge remote-tracking branch 'origin/master' into develop 2024-03-27 14:41:43 +01:00
Applevangelist 523375c765 Merge remote-tracking branch 'origin/master' into develop 2024-03-27 14:41:11 +01:00
Applevangelist 371b100672 xxx 2024-03-27 14:40:47 +01:00
Frank 82f4c9d526 Update RAT.lua 2024-03-26 22:26:58 +01:00
Applevangelist eac87c97af Merge remote-tracking branch 'origin/develop' into develop 2024-03-25 18:26:49 +01:00
Applevangelist 00dc9969b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:45 +01:00
Applevangelist 5b8416d5fd Merge remote-tracking branch 'origin/master' into develop 2024-03-25 18:26:17 +01:00
Frank 2205100942 RAT 2024-03-24 22:51:11 +01:00
Frank 801475e146 Merge branch 'FF/Ops' into FF/OpsRat 2024-03-24 17:59:27 +01:00
Frank d7ee243a00 Merge branch 'develop' into FF/Ops 2024-03-24 17:59:06 +01:00
Frank a105ddba3d Merge branch 'master' into develop 2024-03-24 17:58:13 +01:00
Frank d5ceabadb0 Merge branch 'develop' into FF/Ops 2024-03-24 17:23:02 +01:00
Applevangelist f3ec69ac2a Merge remote-tracking branch 'origin/develop' into develop 2024-03-24 13:27:52 +01:00
Applevangelist 8a6cbeda74 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-03-24 13:27:46 +01:00
Applevangelist 8bd39b41f4 Merge remote-tracking branch 'origin/master' into develop 2024-03-24 13:25:00 +01:00
Applevangelist 13cdb77957 xxx 2024-03-24 13:22:54 +01:00
Applevangelist caedc314b7 xx 2024-03-23 15:12:16 +01:00
Applevangelist a712d74e2e Merge remote-tracking branch 'origin/master' into develop 2024-03-23 14:59:20 +01:00
Applevangelist d7963bb161 xx 2024-03-22 16:04:58 +01:00
Applevangelist e86afefe79 xxx 2024-03-22 09:27:58 +01:00
Applevangelist c7e694dfb8 #AWACS - fix for too many TAC/MELD/THREAT calls 2024-03-22 09:27:40 +01:00
Applevangelist d6c9195555 Merge remote-tracking branch 'origin/master' into develop 2024-03-22 08:56:28 +01:00
Frank 1253e241ff Merge branch 'develop' into FF/Ops 2024-03-19 18:04:03 +01:00
Applevangelist d4daa54210 Merge remote-tracking branch 'origin/develop' into develop 2024-03-16 12:37:51 +01:00
Applevangelist 5c3081a7eb Merge remote-tracking branch 'origin/master' into develop 2024-03-16 12:37:48 +01:00
Applevangelist 3389d3284a Fix self.speedmax for immobile groups 2024-03-16 12:37:11 +01:00
Applevangelist b10819220c Merge remote-tracking branch 'origin/master' into develop 2024-03-15 10:26:18 +01:00
Applevangelist b66ff35b63 #minor fixes 2024-03-15 10:25:58 +01:00
Applevangelist 6ae2f6f105 Merge remote-tracking branch 'origin/develop' into develop 2024-03-13 09:09:32 +01:00
Applevangelist c4deb317bd Merge remote-tracking branch 'origin/master' into develop 2024-03-13 09:09:28 +01:00
Applevangelist 4b1a1cbcff Merge remote-tracking branch 'origin/master' into develop 2024-03-13 09:09:02 +01:00
Applevangelist f7f28877da Fix for speed nil in ops groups 2024-03-13 07:39:56 +01:00
Applevangelist ada8629c01 Fix for speed nil 2024-03-13 07:38:56 +01:00
Applevangelist efd48c87e9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-12 15:35:26 +01:00
Applevangelist 35c1a76675 Merge remote-tracking branch 'origin/master' into develop 2024-03-12 15:35:22 +01:00
Applevangelist e3d2dec91f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2024-03-12 15:34:53 +01:00
Thomas 470c4ef13c Update Controllable.lua 2024-03-12 11:54:44 +01:00
Thomas 77c4fd7696 Update Controllable.lua (#2105) (#2106)
Added setting of AI radio options
2024-03-12 11:20:57 +01:00
Applevangelist edf445de1a Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 18:20:16 +01:00
Applevangelist 5b1cc052b6 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:20:13 +01:00
Applevangelist dcd278e2a1 Merge remote-tracking branch 'origin/master' into develop 2024-03-11 18:19:44 +01:00
Applevangelist ebb58cd976 xxx 2024-03-11 18:18:00 +01:00
Applevangelist e32b393f39 Merge remote-tracking branch 'origin/develop' into develop 2024-03-11 08:31:06 +01:00
Applevangelist 3d073891bc Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:31:02 +01:00
Applevangelist b62f2afd8d Merge remote-tracking branch 'origin/master' into develop 2024-03-11 08:30:22 +01:00
Applevangelist 078137af4b Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 18:00:39 +01:00
Applevangelist 0172772ead Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:36 +01:00
Applevangelist 70ee6a1121 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 18:00:02 +01:00
Applevangelist fa3a805172 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:53:34 +01:00
Applevangelist b7ef0e57ab Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:31 +01:00
Applevangelist 408321decf Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:53:05 +01:00
Applevangelist 5881aa0ad3 #SPAWN
* Fix an issue for SPAWN:NewFromTemplate when re-using same template over and again
2024-03-10 16:52:03 +01:00
Applevangelist 755dde8e10 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:59 +01:00
Applevangelist 1856f89cf9 Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:56 +01:00
Applevangelist 383eff4cd6 Merge remote-tracking branch 'origin/develop' into develop 2024-03-10 16:20:32 +01:00
Applevangelist 6cda61c9dd Merge remote-tracking branch 'origin/master' into develop 2024-03-10 16:20:29 +01:00
Applevangelist fc5d540ec6 #MARKEROPS
* Coalition in events fix
2024-03-10 16:19:29 +01:00
Applevangelist 032e73d382 Merge remote-tracking branch 'origin/develop' into develop 2024-03-09 17:24:58 +01:00
Applevangelist c6bb7c8bbd Merge remote-tracking branch 'origin/develop' into develop-2 2024-03-09 17:24:47 +01:00
Applevangelist bd3042410b ccc 2024-03-09 17:24:32 +01:00
Applevangelist 7c9cf96d2e OPSGROUP extra check 2024-03-09 17:24:15 +01:00
Applevangelist 5bf70d9950 Merge remote-tracking branch 'origin/develop' into develop 2024-03-08 10:07:30 +01:00
Applevangelist 94ca67feb9 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:07:26 +01:00
Applevangelist ef30bd36a5 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:06:51 +01:00
Applevangelist 5286926609 xx 2024-03-08 10:06:31 +01:00
Applevangelist 1ef50f45f1 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:21:23 +01:00
Applevangelist d76cd91d50 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:21:19 +01:00
Applevangelist 5bde0c7605 Merge remote-tracking branch 'origin/develop' into develop 2024-03-07 10:20:56 +01:00
Applevangelist 4f2d8144e9 Merge remote-tracking branch 'origin/master' into develop 2024-03-07 10:20:53 +01:00
Applevangelist d7fd9d0968 xxx 2024-03-07 10:20:02 +01:00
kaltokri 736204d163 Merge branch 'master' into develop 2024-03-05 22:29:36 +01:00
kaltokri cca6b0cf55 Merge branch 'master' into develop 2024-03-05 22:11:34 +01:00
Applevangelist 9e112e6f2c Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 16:39:32 +01:00
Applevangelist a51329d3e7 xxx 2024-03-05 16:39:08 +01:00
Applevangelist fd0e6053ee #COMMANDER - remove dual AltToKIAS calc for TankerZone etc 2024-03-05 16:38:45 +01:00
Applevangelist f99eac0de4 Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 10:35:23 +01:00
Applevangelist 89b06fb7a6 Merge remote-tracking branch 'origin/master' into develop 2024-03-05 10:35:18 +01:00
Applevangelist 7a19a81985 Merge remote-tracking branch 'origin/develop' into develop 2024-03-05 10:34:50 +01:00
Applevangelist e359640bfd Merge remote-tracking branch 'origin/master' into develop 2024-03-05 10:34:46 +01:00
Applevangelist b3f7991269 xxx 2024-03-05 10:34:27 +01:00
kaltokri 3d1207a079 Merge branch 'master' into develop 2024-03-02 15:07:53 +01:00
Applevangelist 1f18b6e2a9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 14:27:02 +01:00
Applevangelist 43bc4ba681 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/SpawnStatic.lua
2024-03-02 14:26:58 +01:00
Applevangelist b34597d732 xxx 2024-03-02 14:25:56 +01:00
Applevangelist 3e727f7777 Merge remote-tracking branch 'origin/develop' into develop 2024-03-02 14:25:42 +01:00
Applevangelist 091083b5aa #AWACS
* Fix tac radios when using an AWACS plane
* AWACS info shows STN set
2024-03-02 14:24:39 +01:00
kaltokri b0d0fb9ae1 Merge branch 'master' into develop 2024-03-01 17:22:33 +01:00
Applevangelist 503ca091f9 Merge remote-tracking branch 'origin/develop' into develop 2024-03-01 08:35:48 +01:00
Applevangelist 08ebcbf11d Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:35:44 +01:00
Applevangelist 7a1cfa9fe3 Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:35:13 +01:00
Applevangelist 7239e2c5fa Merge remote-tracking branch 'origin/develop' into develop 2024-03-01 08:24:25 +01:00
Applevangelist a7fcc95b71 Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:24:22 +01:00
Applevangelist 5ff4d84a9a Merge remote-tracking branch 'origin/develop' into develop 2024-03-01 08:23:53 +01:00
Applevangelist c71d0ed7cf Merge remote-tracking branch 'origin/master' into develop 2024-03-01 08:23:50 +01:00
kaltokri 370bfc893d Merge branch 'master' into develop 2024-02-29 19:52:36 +01:00
kaltokri 50e55e1df2 Merge branch 'master' into develop 2024-02-29 19:00:55 +01:00
kaltokri 219353faad Update of all Airbases (uptodate and sorted) 2024-02-29 10:33:21 +01:00
Applevangelist 66d00331ae Merge remote-tracking branch 'origin/develop' into develop 2024-02-29 09:55:50 +01:00
Applevangelist 5746213850 Merge remote-tracking branch 'origin/master' into develop 2024-02-29 09:55:46 +01:00
Applevangelist 4c4ecccb01 Merge remote-tracking branch 'origin/develop' into develop 2024-02-29 09:55:12 +01:00
Applevangelist 0e1cbe45b9 Merge remote-tracking branch 'origin/master' into develop 2024-02-29 09:54:38 +01:00
Applevangelist d9cfaaaa0d SCORING 2024-02-29 09:53:46 +01:00
kaltokri 34937c2cf6 Merge branch 'master' into develop 2024-02-28 19:43:26 +01:00
kaltokri 42ca05af57 Merge branch 'master' into develop 2024-02-28 17:39:25 +01:00
kaltokri 960746245f Merge branch 'master' into develop 2024-02-28 17:34:51 +01:00
Applevangelist a472c4b3f8 Merge remote-tracking branch 'origin/develop' into develop 2024-02-27 18:15:09 +01:00
Applevangelist 1f220cab3e Merge remote-tracking branch 'origin/master' into develop 2024-02-27 18:15:06 +01:00
Applevangelist 4b50d8f16f Merge remote-tracking branch 'origin/develop' into develop 2024-02-27 18:14:40 +01:00
Applevangelist c320f1a0a7 Merge remote-tracking branch 'origin/master' into develop 2024-02-27 18:14:34 +01:00
Applevangelist 82b5269040 #BRIGADE Fixes to save/loadback assets for persistence 2024-02-27 18:14:11 +01:00
Applevangelist 1e954de951 #BRIGADE Fixes to save/loadback assets for persistence 2024-02-27 18:13:41 +01:00
kaltokri 80bf992806 Merge branch 'master' into develop 2024-02-27 16:38:42 +01:00
Applevangelist c36dbe1b09 Merge remote-tracking branch 'origin/develop' into develop 2024-02-27 10:28:56 +01:00
Applevangelist 93e344732c Merge remote-tracking branch 'origin/master' into develop 2024-02-27 10:28:52 +01:00
Applevangelist 2dc908d926 Merge remote-tracking branch 'origin/master' into develop 2024-02-27 10:28:30 +01:00
Applevangelist d291e7417d CTLD 2024-02-27 10:19:48 +01:00
Applevangelist d3e6b0366b Merge remote-tracking branch 'origin/master' into develop 2024-02-25 11:58:12 +01:00
Applevangelist ad155ab071 Merge remote-tracking branch 'origin/develop' into develop 2024-02-25 11:57:34 +01:00
Applevangelist ab56f903c2 Merge remote-tracking branch 'origin/master' into develop 2024-02-25 11:57:30 +01:00
kaltokri 1545add510 Enhancement of troubleshooting tips in the docs 2024-02-24 22:25:26 +01:00
kaltokri 9f8428c7ba Merge branch 'master' into develop 2024-02-24 22:04:42 +01:00
kaltokri 8c6c1e481b Merge branch 'master' into develop 2024-02-24 14:26:45 +01:00
Rolf Geuenich d13173e336 Added Links to new demo mission repository 2024-02-23 11:33:50 +01:00
Applevangelist 04b2e9459d Merge remote-tracking branch 'origin/develop' into develop 2024-02-23 11:17:10 +01:00
Applevangelist fd63edad37 Merge remote-tracking branch 'origin/master' into develop 2024-02-23 11:17:07 +01:00
Applevangelist fa80f0a162 Merge remote-tracking branch 'origin/master' into develop 2024-02-23 11:16:36 +01:00
Applevangelist 6e12e8f9b9 #AIRBASE - New Syria airbases added 2024-02-23 11:15:29 +01:00
Frank 80b2b26018 Merge branch 'FF/OpsRat' of https://github.com/FlightControl-Master/MOOSE into FF/OpsRat 2024-02-23 00:31:19 +01:00
Frank e3f523d648 Update RAT.lua 2024-02-23 00:31:15 +01:00
Applevangelist bf82cd9e2a Merge remote-tracking branch 'origin/develop' into develop 2024-02-22 17:29:21 +01:00
Applevangelist 5b86bf9605 #AWACS - Added a warning to set up SRS before Tac Radios 2024-02-22 17:28:44 +01:00
Applevangelist b952161794 warning 2024-02-22 17:28:09 +01:00
Applevangelist b2e3e23182 Merge remote-tracking branch 'origin/develop' into develop 2024-02-22 12:15:26 +01:00
Applevangelist 13c0a42d5b Merge remote-tracking branch 'origin/master' into develop 2024-02-22 12:15:23 +01:00
Applevangelist c5ece16753 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 12:14:44 +01:00
Applevangelist a734cb8a7e xxx 2024-02-22 12:14:03 +01:00
Applevangelist 7d708339a5 Merge remote-tracking branch 'origin/develop' into develop 2024-02-22 11:54:08 +01:00
Applevangelist 43e30ce426 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 11:54:03 +01:00
Applevangelist 4505b60859 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 11:53:24 +01:00
Applevangelist fdfc21187c sss 2024-02-22 11:52:54 +01:00
Applevangelist 59c5acc1f2 Merge remote-tracking branch 'origin/develop' into develop 2024-02-22 09:21:03 +01:00
Applevangelist 1c293c2f62 Merge remote-tracking branch 'origin/master' into develop 2024-02-22 09:20:59 +01:00
Applevangelist 7e21a1070a Merge remote-tracking branch 'origin/master' into develop 2024-02-22 09:19:43 +01:00
Applevangelist bfaca9dd5f Merge remote-tracking branch 'origin/master' into develop 2024-02-22 09:01:23 +01:00
Applevangelist 0ad2226e47 Merge remote-tracking branch 'origin/develop' into develop 2024-02-20 14:39:39 +01:00
Applevangelist 5246647d62 Merge remote-tracking branch 'origin/master' into develop 2024-02-20 14:39:34 +01:00
Applevangelist e946916fc0 Merge remote-tracking branch 'origin/master' into develop 2024-02-20 14:32:17 +01:00
Applevangelist 1f74899f8a SPAWN/DATABASE - try to ensure unique STN/SADL numbers 2024-02-20 14:27:54 +01:00
Applevangelist e97a5493e4 Merge remote-tracking branch 'origin/develop' into develop 2024-02-20 12:09:23 +01:00
Applevangelist fa3e73e577 Merge remote-tracking branch 'origin/master' into develop 2024-02-20 12:09:20 +01:00
Applevangelist ee17d3e995 Merge remote-tracking branch 'origin/develop' into develop 2024-02-20 12:08:33 +01:00
Applevangelist a48e09b434 Merge remote-tracking branch 'origin/master' into develop 2024-02-20 12:08:27 +01:00
Applevangelist 15cee84695 Minor fixes 2024-02-20 12:07:08 +01:00
Thomas 3baf52d307 Update Airbase.lua (#2104)
One space too many fix gor Deanland
2024-02-18 20:13:52 +01:00
Applevangelist 7c483b4bb6 Merge remote-tracking branch 'origin/develop' into develop 2024-02-18 12:38:25 +01:00
Applevangelist 9f2f1c7de7 Merge remote-tracking branch 'origin/master' into develop 2024-02-18 12:38:21 +01:00
kaltokri 79189d4d93 Merge branch 'master' into develop 2024-02-17 18:50:46 +01:00
Thomas 8d886a75d6 Update Airboss.lua (#2101)
Groove def
2024-02-17 13:12:25 +01:00
Applevangelist 62b2a9197b Merge remote-tracking branch 'origin/develop' into develop 2024-02-16 14:10:14 +01:00
Applevangelist 3b139a92fb xxx 2024-02-16 14:09:42 +01:00
Applevangelist a16e22818d Merge remote-tracking branch 'origin/develop' into develop 2024-02-16 14:09:18 +01:00
Applevangelist 0cc959bf34 #STRATEGO
* Exclude Ships as they cannot be conquered anyway
* Streamline target finding a bit
2024-02-16 14:09:14 +01:00
Frank 2fcb31f3ac Update RAT.lua 2024-02-16 00:11:43 +01:00
Applevangelist e3e101b8ff Merge remote-tracking branch 'origin/develop' into develop 2024-02-15 18:18:44 +01:00
Applevangelist 525a11d21d Merge remote-tracking branch 'origin/master' into develop 2024-02-15 18:18:39 +01:00
Applevangelist aa948b57d8 Merge remote-tracking branch 'origin/develop' into develop-2 2024-02-15 18:18:23 +01:00
Applevangelist 6ca459b38c xx 2024-02-15 18:18:19 +01:00
Applevangelist 79da4cbf27 Merge remote-tracking branch 'origin/develop' into develop 2024-02-15 18:17:48 +01:00
Applevangelist e5a60a2ef1 #AWACS
* Ensure not only one Merged-Call
* Enable Tac, Meld, Threat calls also for non-tasked flights
2024-02-15 18:17:44 +01:00
kaltokri 7e2ae60e43 Merge branch 'master' into develop 2024-02-15 16:48:40 +01:00
Applevangelist eef41c067d Merge remote-tracking branch 'origin/develop' into develop 2024-02-13 16:46:08 +01:00
Applevangelist 48a0400213 Merge remote-tracking branch 'origin/master' into develop 2024-02-13 16:46:05 +01:00
Applevangelist d7969e9455 Merge remote-tracking branch 'origin/master' into develop 2024-02-13 16:45:36 +01:00
Applevangelist 48b20299b2 xx 2024-02-13 16:45:20 +01:00
Applevangelist 50094894aa Merge remote-tracking branch 'origin/develop' into develop 2024-02-12 18:36:25 +01:00
Applevangelist e355a2f6d5 Merge remote-tracking branch 'origin/master' into develop 2024-02-12 18:36:20 +01:00
Applevangelist 0e6bf1f46b Merge remote-tracking branch 'origin/master' into develop 2024-02-12 18:35:51 +01:00
Applevangelist a1151584e1 Nicer Self:I() etc output 2024-02-12 18:33:18 +01:00
Frank 2fce93d925 RAT 2024-02-12 00:10:36 +01:00
Applevangelist df0dbc9108 PLAYERTASK - small fix for a possibly missing coordinate 2024-02-08 11:59:23 +01:00
Applevangelist 25a5e821ef PLAYERTASK - small fix for possibly missing coordinate on the taskinfo function 2024-02-08 11:58:46 +01:00
Frank db6354b60d Merge branch 'develop' into FF/Ops 2024-02-06 11:09:35 +01:00
Applevangelist 4307ddcad3 CLIENTMENUMANAGER - dicu 2024-02-04 13:13:06 +01:00
Applevangelist 969a658e15 CLIENTMENUMANAGER - docu 2024-02-04 13:11:57 +01:00
Applevangelist daa734009e Merge remote-tracking branch 'origin/master' into develop 2024-02-03 12:49:33 +01:00
Applevangelist a66ad1f086 MANTIS 2024-02-03 12:23:18 +01:00
Applevangelist 65cf53ce28 Merge remote-tracking branch 'origin/master' into develop 2024-02-03 12:22:59 +01:00
Applevangelist 29ff59b128 Merge remote-tracking branch 'origin/develop' into develop 2024-02-03 09:11:49 +01:00
Applevangelist fe2e257dc0 Merge remote-tracking branch 'origin/master' into develop 2024-02-03 09:11:45 +01:00
Applevangelist 78d1a215e4 Merge remote-tracking branch 'origin/develop' into develop 2024-02-03 09:11:17 +01:00
Applevangelist 14daca9a72 Merge remote-tracking branch 'origin/master' into develop 2024-02-03 09:11:12 +01:00
Applevangelist 11551a9816 Sam Data 2024-02-03 09:10:25 +01:00
kaltokri 2ca847e845 Fixed dead links for Ops.Intel and Ops.Airwing 2024-02-02 13:30:22 +01:00
kaltokri 11c74ddc17 Another fix for dead links (case sensitivity)
linkinator hides multiple problems sometimes
2024-02-02 12:24:31 +01:00
kaltokri c38917fa2f Fix for dead links (case sensitivity) 2024-02-02 12:15:40 +01:00
Applevangelist d5b7fdab24 Merge remote-tracking branch 'origin/develop' into develop 2024-02-01 09:04:04 +01:00
Applevangelist 1847a2372c Docu 2024-02-01 09:03:39 +01:00
Applevangelist 7bd03d55ba Merge remote-tracking branch 'origin/develop' into develop 2024-01-31 17:54:47 +01:00
Applevangelist d23347e14e Merge remote-tracking branch 'origin/master' into develop 2024-01-31 17:54:42 +01:00
Applevangelist fd155f8277 Merge remote-tracking branch 'origin/master' into develop 2024-01-31 17:54:09 +01:00
Applevangelist e5112597a2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-27 15:29:18 +01:00
Applevangelist 24271e6780 Merge remote-tracking branch 'origin/master' into develop 2024-01-27 15:29:13 +01:00
Applevangelist bd5c1af335 Merge remote-tracking branch 'origin/develop' into develop 2024-01-27 15:28:46 +01:00
Applevangelist 53f556a4e6 Merge remote-tracking branch 'origin/master' into develop 2024-01-27 15:28:42 +01:00
Applevangelist fb16a29392 M2K specific helper for tostringLL 2024-01-27 14:41:49 +01:00
Frank 2893bfb290 Merge branch 'master' into develop 2024-01-24 14:47:13 +01:00
Frank f10d676921 Merge branch 'develop' into FF/Ops 2024-01-23 10:59:13 +01:00
Applevangelist 5dd8bec6b9 Merge remote-tracking branch 'origin/develop' into develop 2024-01-23 10:05:57 +01:00
Applevangelist 5ee190602e Merge remote-tracking branch 'origin/master' into develop 2024-01-23 10:05:53 +01:00
Applevangelist f02b774242 Merge remote-tracking branch 'origin/develop' into develop 2024-01-23 10:05:13 +01:00
Applevangelist 5ede860361 Merge remote-tracking branch 'origin/master' into develop 2024-01-23 10:05:09 +01:00
Applevangelist d0d52246f4 #STRATEGO
* Change strategy for finding strategic targets from base to consolidated weight
2024-01-23 10:04:50 +01:00
Applevangelist 02aee6f936 Merge remote-tracking branch 'origin/develop' into develop 2024-01-23 09:51:01 +01:00
Applevangelist da45ee201e Merge remote-tracking branch 'origin/master' into develop 2024-01-23 09:50:57 +01:00
Applevangelist c4d8b64713 Stratego 2024-01-23 09:50:34 +01:00
Frank 1b4e170271 Update FlightGroup.lua
- Added menu update after cruise. (Fixes launches from aircraft carriers.)
2024-01-22 21:49:31 +01:00
Thomas a3d56b6d1b Update Pathline.lua (#2097) (#2098)
Small fixes
2024-01-22 06:32:42 +01:00
Applevangelist c90c5c3bfc Merge remote-tracking branch 'origin/develop' into develop 2024-01-21 16:47:13 +01:00
Applevangelist 5d9fc356e0 Merge remote-tracking branch 'origin/master' into develop 2024-01-21 16:47:09 +01:00
Applevangelist 23df6bbc2a Merge remote-tracking branch 'origin/master' into develop 2024-01-21 16:46:40 +01:00
Applevangelist f2fc321ded TARGET - declare Scenery target dead if <= 25% of life0 2024-01-21 16:46:24 +01:00
Applevangelist b03add80c6 SCENERY additions 2024-01-21 16:45:48 +01:00
Applevangelist d5322466e9 SCENERY add-ons 2024-01-21 16:44:31 +01:00
Applevangelist e50d54f6bc Spawned FARP issue 2024-01-19 19:31:49 +01:00
Applevangelist 290609d581 FARP issue 2024-01-19 19:30:48 +01:00
Applevangelist c2a0b1c16b Merge remote-tracking branch 'origin/develop' into develop 2024-01-19 19:10:10 +01:00
Applevangelist a5526d0c73 Merge remote-tracking branch 'origin/master' into develop 2024-01-19 19:10:06 +01:00
Applevangelist 6e60a66d0c Merge remote-tracking branch 'origin/master' into develop 2024-01-19 19:09:28 +01:00
Applevangelist 11f0b2899d Minor fixes 2024-01-19 19:09:08 +01:00
Applevangelist c408485c5b Minor fixes 2024-01-19 19:08:42 +01:00
Applevangelist 4762b88980 AVoid for pairs error 2024-01-19 19:06:34 +01:00
Applevangelist 661094d113 Merge remote-tracking branch 'origin/develop' into develop 2024-01-18 14:36:33 +01:00
Applevangelist 6e06288228 Merge remote-tracking branch 'origin/master' into develop 2024-01-18 14:36:30 +01:00
Applevangelist 0ce3a189c3 Merge remote-tracking branch 'origin/master' into develop 2024-01-18 14:35:54 +01:00
Applevangelist f5f86e9ba6 xxx 2024-01-18 14:27:09 +01:00
Applevangelist f562130e96 Merge remote-tracking branch 'origin/develop' into develop 2024-01-17 12:18:01 +01:00
Applevangelist 35fbacb196 Merge remote-tracking branch 'origin/master' into develop 2024-01-17 12:17:57 +01:00
Applevangelist 9208d7a70d Merge remote-tracking branch 'origin/master' into develop 2024-01-17 12:17:34 +01:00
Applevangelist 4076ff5bb5 #AIRWING, #EASYGCICAP
* Added SetCapStartTimeVariation()
2024-01-17 12:17:14 +01:00
Applevangelist 90d825c809 xxx 2024-01-17 12:13:41 +01:00
Applevangelist 48f81d90cc Merge remote-tracking branch 'origin/develop' into develop 2024-01-17 08:10:46 +01:00
Applevangelist 68756681fa #PLAYERTASKCONTROLLER
* Additions for lasing unit being an ARMYGROUP
2024-01-17 08:10:17 +01:00
Applevangelist 056b761ebc #PLAYERTASKCONTROLLER
* Additions for lasing unit being an ARMYGROUP
2024-01-17 08:10:01 +01:00
Frank 0532c54cd5 Merge branch 'develop' into FF/Ops 2024-01-16 17:11:16 +01:00
Applevangelist 298c569f93 #PLAYERTASK
* Add a height of 2m on laser coordinates to ensure LOS test works
2024-01-16 15:09:51 +01:00
Applevangelist 32dbb520d6 #AUTOLASE
* Allow switching Smoke targets menu to be switched off and on
2024-01-16 15:09:12 +01:00
Applevangelist 5c90afea76 xxx 2024-01-16 15:06:54 +01:00
Applevangelist b6b344a69a Merge remote-tracking branch 'origin/develop' into develop 2024-01-14 14:58:16 +01:00
Applevangelist 6af66db4c3 Minor changes 2024-01-14 14:57:21 +01:00
Applevangelist 601c8165d8 Minor changes 2024-01-14 14:57:07 +01:00
Applevangelist b612c3a846 Merge remote-tracking branch 'origin/develop' into develop 2024-01-12 18:47:32 +01:00
Applevangelist 0bf1204499 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Functional/Artillery.lua
2024-01-12 18:47:28 +01:00
Applevangelist ff84d682bd Merge remote-tracking branch 'origin/develop' into develop 2024-01-12 18:44:38 +01:00
Applevangelist d2b7d46227 STRATEGO
* functional additions
2024-01-12 18:44:34 +01:00
Applevangelist 58f4eead1c #AUFTRAG
* Helos: Added AUFTRAG:NewLANDATCOORDINATE
2024-01-12 18:43:48 +01:00
Applevangelist 36a6d5fede xxx 2024-01-12 18:42:26 +01:00
Rolf Geuenich f3bafd5803 Merge branch 'master' into develop 2024-01-12 16:05:46 +01:00
Rolf Geuenich 2946c2e225 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Artillery.lua
2024-01-12 15:45:50 +01:00
Rolf Geuenich 2e386be2f6 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2024-01-12 15:35:17 +01:00
Applevangelist 884b3c7b8d Merge remote-tracking branch 'origin/develop' into develop 2024-01-11 17:32:45 +01:00
Applevangelist 4dd6b956aa Merge remote-tracking branch 'origin/master' into develop 2024-01-11 17:32:41 +01:00
Applevangelist 9c0c93507a Merge remote-tracking branch 'origin/master' into develop 2024-01-11 17:32:04 +01:00
Applevangelist baf7123364 Merge remote-tracking branch 'origin/master' into develop 2024-01-11 17:14:43 +01:00
Applevangelist f6b6a6a577 #EASYGCICAP
* Added assignment of in-flight groups to intercepts
2024-01-11 16:11:51 +01:00
Applevangelist aedd2a6391 #EASYGCICAP
* Added assignment of in-flight groups to intercepts
2024-01-11 16:10:40 +01:00
Applevangelist c2d5f9f428 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2024-01-11 12:53:39 +01:00
Applevangelist 54b49ff0d6 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2024-01-11 12:53:30 +01:00
Applevangelist 4d7d34b71f Merge remote-tracking branch 'origin/master' into develop 2024-01-11 12:52:42 +01:00
Applevangelist 82bea9d5ff Merge remote-tracking branch 'origin/develop' into develop 2024-01-11 12:52:19 +01:00
Applevangelist 35d91c9c94 EASYGCICAP Additions 2024-01-11 12:52:15 +01:00
Applevangelist 5680344dfd EASYGCICAP Additions 2024-01-11 12:51:36 +01:00
kaltokri a44ad5c755 Changed order to match master branch for better auto-merge 2024-01-11 10:05:22 +01:00
kaltokri b7236eeb58 Merge branch 'master' into develop 2024-01-10 15:43:38 +01:00
kaltokri 09933b307b Merge branch 'master' into develop 2024-01-10 15:41:02 +01:00
kaltokri 21babb548c Fixed typo off manual merge and added PyCharm to gitignore 2024-01-10 15:39:23 +01:00
Applevangelist 11967bd608 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2024-01-10 15:21:16 +01:00
Applevangelist ea6e63dc9b Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Airboss.lua
2024-01-10 15:20:29 +01:00
Applevangelist b0e0926b70 Added player name to ...PilotDown() event 2024-01-10 15:17:24 +01:00
kaltokri 547579ffb0 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/Airboss.lua
2024-01-10 14:26:55 +01:00
Applevangelist 27158ee7e8 xxx 2024-01-10 13:38:59 +01:00
Applevangelist 697042eac6 EASYGCICAP - less noise 2024-01-10 13:38:48 +01:00
Applevangelist b1be1f5f71 Merge remote-tracking branch 'origin/develop' into develop 2024-01-09 17:48:54 +01:00
Applevangelist 6b020e011e Merge remote-tracking branch 'origin/master' into develop 2024-01-09 17:48:51 +01:00
Applevangelist 30d6936f1d MSRS changes 2024-01-09 17:47:14 +01:00
Applevangelist 7995940579 SRS changes 2024-01-09 17:27:26 +01:00
Applevangelist 3ffdb4fe4b Merge remote-tracking branch 'origin/develop' into develop 2024-01-09 08:59:47 +01:00
Applevangelist 9211770056 xx 2024-01-09 08:58:22 +01:00
Applevangelist b315375ade xxx 2024-01-09 08:58:07 +01:00
Frank becaf47a66 Merge branch 'develop' into FF/Ops 2024-01-07 21:16:15 +01:00
Applevangelist 57919704be Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 18:08:34 +01:00
Frank e26647c2ca OPSTRANSPORT
- Fixed SET not working with FilterActive
2024-01-07 17:24:51 +01:00
Applevangelist 4ddd278471 #AWACS
* Picture clean, correct order of callsigns
2024-01-07 15:40:17 +01:00
Applevangelist 20f881f0a9 #AWACS
* Picture clean, correct order of callsigns
2024-01-07 15:40:08 +01:00
Applevangelist 7275a934a2 Merge remote-tracking branch 'origin/develop' into develop 2024-01-07 14:45:38 +01:00
Applevangelist 6a54056ec8 Merge remote-tracking branch 'origin/master' into develop 2024-01-07 14:45:34 +01:00
Applevangelist e5658b3298 xxx 2024-01-07 14:45:10 +01:00
Applevangelist 72e31b90a9 Merge remote-tracking branch 'origin/master' into develop 2024-01-07 14:44:45 +01:00
ttrebuchon 677d888d96 Use total cargo weight when computing asset score for transport missions (#2065)
* Optimize carrier assets for OPSTRANSPORT based on total cargo weight

* Clean up code/comments for TotalWeight scoring

* Add missing parameter documentation
2024-01-07 13:26:58 +01:00
Applevangelist 06c3ca0079 MSRS additions 2024-01-07 13:25:32 +01:00
Applevangelist cf4d35efa2 xxx 2024-01-07 13:25:14 +01:00
Applevangelist 7e842fbd46 xxx 2024-01-07 13:16:52 +01:00
Applevangelist 0009539eef Merge remote-tracking branch 'origin/develop' into develop 2024-01-06 18:23:46 +01:00
Applevangelist 1490eee0e9 Merge remote-tracking branch 'origin/master' into develop 2024-01-06 18:23:42 +01:00
Applevangelist 406dbb707a Merge remote-tracking branch 'origin/develop' into develop 2024-01-06 18:22:41 +01:00
Applevangelist 4758af61c2 Merge remote-tracking branch 'origin/master' into develop 2024-01-06 18:22:36 +01:00
Applevangelist 729c1f5e33 Fixes for MSRS changes
#STRATEGO
* fix for an AB not having a zone
2024-01-06 18:22:18 +01:00
Applevangelist 45fb191483 Fixes for MSRS changes 2024-01-06 18:21:10 +01:00
Applevangelist cfe99341d7 STRATEGO
* Fix if an airbase has no zone predefined
2024-01-06 18:20:55 +01:00
Applevangelist 0db96082a1 xxx 2024-01-06 18:17:56 +01:00
kaltokri 8386fe5f67 Merge branch 'master' into develop 2024-01-06 12:22:25 +01:00
Applevangelist 0d224ee2fd Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 16:09:59 +01:00
Applevangelist 15482bb734 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 16:09:55 +01:00
Applevangelist 2c695e187f Merge remote-tracking branch 'origin/master' into develop 2024-01-05 16:09:22 +01:00
Applevangelist 048ab6acfe Fixes for 4th SRS Parameter 2024-01-05 16:09:05 +01:00
Applevangelist fd86b17b6d Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 15:52:21 +01:00
Applevangelist 492900d5d1 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:52:16 +01:00
Applevangelist f2783c46c2 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:51:35 +01:00
Applevangelist df1bc5c55d Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:46:45 +01:00
Applevangelist fba19bc755 Merge remote-tracking branch 'origin/master' into develop 2024-01-05 15:46:10 +01:00
Applevangelist 0c3caffe93 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 15:44:32 +01:00
Applevangelist 642824818c Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-01-05 15:44:24 +01:00
Applevangelist e53a80783e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-01-05 15:43:33 +01:00
Applevangelist a1fb09285b STRATEGO - Improvements 2024-01-05 15:42:33 +01:00
Applevangelist 1a1c3a6c9f xx 2024-01-05 15:41:01 +01:00
Applevangelist e2bf1f727d FLIGHTGROUP - Amending landing on an AFB w/o runways
SRS - some improvements
2024-01-05 15:37:52 +01:00
Applevangelist b90853f431 xxx 2024-01-05 15:36:03 +01:00
Applevangelist 4ad51b8866 xxx 2024-01-05 15:35:54 +01:00
Applevangelist 71f12f1856 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 12:20:21 +01:00
Applevangelist b329bf8088 xxx 2024-01-05 12:13:18 +01:00
Applevangelist 65315251b5 PLAYERTASK, AWACS - small fix for the revamped SRS 2024-01-05 12:13:04 +01:00
Applevangelist b8f5e55ac9 Merge remote-tracking branch 'origin/develop' into develop 2024-01-05 10:26:07 +01:00
Applevangelist 2a9e98c21e Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 18:49:50 +01:00
Applevangelist b40c1e4575 Fixes 2024-01-04 18:49:47 +01:00
Applevangelist 8171e3aad2 xxx 2024-01-04 18:48:26 +01:00
Frank 9ea8443286 Merge branch 'develop' into FF/Ops 2024-01-04 15:13:46 +01:00
Frank a9befc4d96 Merge branch 'master' into develop 2024-01-04 15:13:26 +01:00
Applevangelist 039be9790d Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 14:02:09 +01:00
Applevangelist 1599b14beb Merge remote-tracking branch 'origin/master' into develop 2024-01-04 14:02:04 +01:00
Applevangelist 170f97d013 xxx 2024-01-04 14:01:02 +01:00
Applevangelist 65fb22b6cc xxx 2024-01-04 14:00:43 +01:00
Applevangelist d0346c4aa3 MSRS
line 953 has no self
2024-01-04 13:59:41 +01:00
Applevangelist 96da09b9e0 Picture link 2024-01-04 12:44:43 +01:00
Applevangelist 8fa89753b6 Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:29:10 +01:00
Applevangelist 67bd4429f5 Merge remote-tracking branch 'origin/master' into develop 2024-01-04 11:29:06 +01:00
Applevangelist c1d468b35f Merge remote-tracking branch 'origin/develop' into develop 2024-01-04 11:27:54 +01:00
Applevangelist 109270d717 STRATEGO
* Renamed knots to nodes to have the correc lingo
2024-01-04 11:27:48 +01:00
Applevangelist 98d131881f xxx 2024-01-04 11:27:24 +01:00
Frank f80e7a2166 Merge branch 'master' into develop 2024-01-03 22:32:50 +01:00
Applevangelist de6c7d636b docu 2024-01-03 18:56:43 +01:00
Applevangelist 57ff653dc3 xxx 2024-01-03 18:56:28 +01:00
Applevangelist f8a3e7fc2e Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Stratego.lua
#	Moose Development/Moose/Functional/Tiresias.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2024-01-03 18:16:59 +01:00
Applevangelist 8910311c5c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
2024-01-03 18:15:58 +01:00
Applevangelist f57beab6d2 #STRATEGO 2024-01-03 18:14:12 +01:00
Applevangelist 29414bfd21 Merge remote-tracking branch 'origin/develop' into develop 2024-01-03 18:06:21 +01:00
Applevangelist 60b8a5f5af Merge remote-tracking branch 'origin/master' into develop 2024-01-03 18:06:15 +01:00
Applevangelist e5fbaeafcd xxx 2024-01-03 18:03:53 +01:00
Applevangelist 90e7711788 STRATEGO 2024-01-03 18:03:45 +01:00
kaltokri aaf3553597 Merge branch 'master' into develop 2024-01-03 11:59:27 +01:00
kaltokri 4e50bd213c No fixes for broken links 2024-01-03 09:04:43 +01:00
kaltokri c813e2dbc4 Fixed broken links 2024-01-03 07:53:41 +01:00
kaltokri 761d83a68f Fix broken link in Awacs.lua 2024-01-02 22:10:08 +01:00
kaltokri 3d93c268b3 Merge branch 'master' into develop 2024-01-02 22:07:29 +01:00
kaltokri d6a0fff993 Fix for broken links in documentation 2024-01-02 20:03:18 +01:00
kaltokri 8d45ea00e8 Merge branch 'master' into develop 2024-01-02 19:03:47 +01:00
Applevangelist 2d17c4d21a Merge remote-tracking branch 'origin/master' into develop 2024-01-02 18:13:14 +01:00
Applevangelist 29e255a7bd xxx 2024-01-02 18:12:57 +01:00
Frank f76fa58a5f Merge branch 'develop' into FF/Ops 2024-01-02 17:07:03 +01:00
Frank d8b046491b Merge branch 'master' into develop 2024-01-02 17:06:41 +01:00
kaltokri b20eb84d19 Merge branch 'master' into develop 2024-01-02 13:33:40 +01:00
Frank c8b36b8c99 Merge branch 'develop' into FF/Ops 2024-01-01 21:54:51 +01:00
kaltokri c2be4fbcf1 Merge branch 'master' into develop 2024-01-01 19:06:45 +01:00
kaltokri 58d9637c5d Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2024-01-01 15:54:53 +01:00
Applevangelist e0a108e00d #TIRESIAS
* Initial release
2024-01-01 13:11:44 +01:00
Applevangelist e36f5b3fbd xxx 2024-01-01 13:06:52 +01:00
Applevangelist 04125cef3d xxx 2024-01-01 09:26:19 +01:00
kaltokri acf37f6133 Merge branch 'master' into develop 2024-01-01 00:39:11 +01:00
Applevangelist 55f35e7067 Merge remote-tracking branch 'origin/develop' into develop 2023-12-31 17:27:09 +01:00
Applevangelist 8fc6f511c8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-31 17:26:28 +01:00
Applevangelist dd771a089c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-31 17:25:32 +01:00
Applevangelist 3f927b16e5 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-31 17:23:20 +01:00
kaltokri 833a0561c3 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-31 17:19:51 +01:00
Applevangelist d20101095c Merge remote-tracking branch 'origin/develop' into develop 2023-12-31 14:58:57 +01:00
Applevangelist 2d26c11ad7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2023-12-31 14:58:53 +01:00
Applevangelist cf48b21073 Merge remote-tracking branch 'origin/master' into develop 2023-12-31 14:58:02 +01:00
Applevangelist fea05b552c xxx 2023-12-31 14:55:57 +01:00
Applevangelist a70ad71689 Merge remote-tracking branch 'origin/master' into develop 2023-12-30 16:53:22 +01:00
Applevangelist e1ac5633f9 xxx 2023-12-30 16:48:59 +01:00
Applevangelist e3a577ad24 xxx 2023-12-30 16:48:48 +01:00
Applevangelist 596334dab9 TIRESIAS 2023-12-30 16:48:17 +01:00
Applevangelist 6d818cbc1d Merge remote-tracking branch 'origin/develop' into develop 2023-12-29 15:03:58 +01:00
Applevangelist 326621504b Merge remote-tracking branch 'origin/master' into develop 2023-12-29 15:03:54 +01:00
Applevangelist 7557e79c0c Merge branch 'master' into develop 2023-12-29 15:03:09 +01:00
Applevangelist 3a4c5e307c AIRBOSS - Superfluous error message removal 2023-12-29 15:02:20 +01:00
Applevangelist 67cec4c564 Merge remote-tracking branch 'origin/develop' into develop 2023-12-29 14:51:48 +01:00
Applevangelist 0ef70d0b6a Merge remote-tracking branch 'origin/master' into develop 2023-12-29 14:51:44 +01:00
Applevangelist c11ca9df4d xxx 2023-12-29 14:51:19 +01:00
Applevangelist 1b7eef5419 Merge remote-tracking branch 'origin/develop' into develop 2023-12-29 14:50:57 +01:00
Applevangelist 029bdc3bd1 Merge branch 'master' into develop 2023-12-29 14:50:53 +01:00
kaltokri 93acd870ea Merge branch 'master' into develop 2023-12-28 16:38:57 +01:00
Applevangelist 93cdb92e76 Merge remote-tracking branch 'origin/master' into develop 2023-12-28 13:33:37 +01:00
Applevangelist bfab0fa542 xxx 2023-12-28 13:33:06 +01:00
Applevangelist 39b89d937e Merge remote-tracking branch 'origin/master' into develop 2023-12-27 19:34:42 +01:00
Applevangelist 7938b8245e Merge remote-tracking branch 'origin/develop' into develop 2023-12-27 19:29:16 +01:00
Applevangelist 8c684c2f54 Merge remote-tracking branch 'origin/master' into develop 2023-12-27 19:29:12 +01:00
Applevangelist b488d43d78 Merge remote-tracking branch 'origin/master' into develop 2023-12-27 19:28:49 +01:00
Applevangelist ec9119d1d0 xxx 2023-12-27 19:27:40 +01:00
Applevangelist 7aa150f287 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:19:45 +01:00
Applevangelist 853ecf9add Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:19:39 +01:00
Applevangelist 2be85fb187 CTLD 2023-12-26 19:19:10 +01:00
Applevangelist 33259be4d9 Merge remote-tracking branch 'origin/develop' into develop 2023-12-26 19:18:54 +01:00
Applevangelist e4cea7b3c4 Merge remote-tracking branch 'origin/master' into develop 2023-12-26 19:18:36 +01:00
kaltokri 6f5f89a0ee Merge branch 'master' into develop 2023-12-26 14:51:28 +01:00
Thomas e2e9bd7de0 Update EasyGCICAP.lua 2023-12-26 08:53:11 +01:00
Frank 1b01b89343 TARGET
- Fixed IsAlive
2023-12-25 23:12:55 +01:00
Applevangelist 4e36ed170b Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 13:59:27 +01:00
Applevangelist bf0ad93bf7 AICSAR Fix 2023-12-25 13:59:23 +01:00
Thomas a51afeda14 Update build-includes.yml 2023-12-25 13:31:35 +01:00
Applevangelist e46b148721 SRS 2023-12-25 13:28:00 +01:00
Applevangelist 8765ebe2c6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	.github/workflows/build-includes.yml
2023-12-25 13:22:47 +01:00
Applevangelist b55b11be09 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 13:22:16 +01:00
Thomas 2a7dbad02a Update build-includes.yml 2023-12-25 13:21:51 +01:00
Thomas 44b3f41ae4 Update build-includes.yml (#2075) 2023-12-25 12:49:54 +01:00
Thomas c5dec374c8 Update build-includes.yml (#2074) 2023-12-25 12:40:33 +01:00
Thomas 3f384d72ab Update build-includes.yml (#2073) 2023-12-25 12:38:18 +01:00
Thomas 1d5952b4a5 Update build-includes.yml (#2072) 2023-12-25 12:34:57 +01:00
Thomas 8eec7fcc9e Update build-includes.yml (#2071) 2023-12-25 12:29:40 +01:00
Applevangelist 0f57901b70 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 12:16:17 +01:00
Applevangelist 1ec5721198 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 12:16:10 +01:00
Applevangelist db7e94d879 New SRS Fixes 2023-12-25 12:14:57 +01:00
Applevangelist d010c3a9fa New SRS fixes 2023-12-25 12:14:18 +01:00
Applevangelist c43e6f44fe Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:44:59 +01:00
Applevangelist c9b0632a46 Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:44:55 +01:00
kaltokri f482dac491 Merge branch 'master' into develop 2023-12-25 11:28:19 +01:00
Applevangelist d855788e19 Merge remote-tracking branch 'origin/develop' into develop 2023-12-25 11:08:03 +01:00
Applevangelist e9d9578eee Merge remote-tracking branch 'origin/master' into develop 2023-12-25 11:07:59 +01:00
Applevangelist e913e83596 xxx 2023-12-25 11:07:39 +01:00
kaltokri 73fa021476 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-25 09:41:57 +01:00
kaltokri cd8abd97c5 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-12-25 06:13:40 +01:00
kaltokri e25eeee0cc Merge branch 'master' into develop 2023-12-25 06:00:55 +01:00
kaltokri 0261020796 Merge branch 'master' into develop 2023-12-25 05:35:55 +01:00
Frank 257530d421 Merge branch 'master' into develop 2023-12-24 03:26:53 +01:00
Applevangelist a48a31a469 Merge remote-tracking branch 'origin/develop' into develop 2023-12-23 14:54:11 +01:00
Applevangelist 9c624e6742 Merge remote-tracking branch 'origin/master' into develop 2023-12-23 14:54:07 +01:00
Applevangelist a14435ce54 Merge remote-tracking branch 'origin/develop' into develop 2023-12-23 14:53:42 +01:00
Applevangelist e82e4f7dd7 Merge remote-tracking branch 'origin/master' into develop 2023-12-23 14:53:36 +01:00
Applevangelist c7ef270d4d #FLIGHTCONTROL
* Added a delay in spawning the parking guard so in MP we have time to get the heading of the Player's plane
2023-12-23 14:53:11 +01:00
Applevangelist 668ba51ba2 xxx 2023-12-23 14:50:57 +01:00
Frank a9a56b3738 Merge branch 'master' into develop 2023-12-22 21:11:41 +01:00
Applevangelist fdab492c98 Merge remote-tracking branch 'origin/develop' into develop 2023-12-22 10:53:50 +01:00
Applevangelist c8ab26ab93 Merge remote-tracking branch 'origin/master' into develop 2023-12-22 10:53:46 +01:00
Frank 0d1fc2fbf2 Merge branch 'master' into develop 2023-12-22 10:36:34 +01:00
Applevangelist 63acca90fd xxx 2023-12-21 11:06:31 +01:00
Applevangelist fc0c54c7fd xx 2023-12-20 10:08:26 +01:00
Applevangelist 63a0224ea4 Merge remote-tracking branch 'origin/master' into develop 2023-12-20 10:08:14 +01:00
Applevangelist 831bde7042 utils 2023-12-20 09:18:21 +01:00
Applevangelist 2485b7766e Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 17:39:24 +01:00
Applevangelist c245505e58 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 17:39:20 +01:00
Applevangelist 69fa6f4ee6 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 17:38:51 +01:00
Applevangelist 6c204758e3 Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 12:12:12 +01:00
Applevangelist a437285c56 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 12:12:08 +01:00
Applevangelist 1c4e3cb801 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 12:11:37 +01:00
Applevangelist 549abc88c4 Merge remote-tracking branch 'origin/develop' into develop 2023-12-19 10:21:10 +01:00
Applevangelist c26dde326c Merge remote-tracking branch 'origin/master' into develop 2023-12-19 10:21:06 +01:00
Applevangelist ab516e0cd8 Merge remote-tracking branch 'origin/master' into develop 2023-12-19 10:20:12 +01:00
Applevangelist af2517343d #ZONE_POLYGON 2023-12-19 10:15:30 +01:00
kaltokri f2ba2022c2 Merge branch 'master' into develop 2023-12-18 16:22:38 +01:00
Applevangelist f967244834 Merge remote-tracking branch 'origin/develop' into develop 2023-12-18 10:59:03 +01:00
Applevangelist 33122a5bf9 Merge remote-tracking branch 'origin/master' into develop 2023-12-18 10:58:59 +01:00
Frank 5b37e7b249 Merge branch 'develop' into FF/Ops 2023-12-16 09:32:14 +01:00
Frank 5b7e0ce375 Merge branch 'master' into develop 2023-12-16 09:31:56 +01:00
kaltokri c250712e53 Merge branch 'master' into develop 2023-12-15 14:13:03 +01:00
Applevangelist 52d1f0811d Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 12:44:36 +01:00
Applevangelist bc6c663f90 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:32 +01:00
Applevangelist 566ebb67e3 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 12:44:00 +01:00
Applevangelist e42fed18ea Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 11:16:03 +01:00
Applevangelist 3fba1ec1d5 Merge remote-tracking branch 'origin/master' into develop 2023-12-14 11:15:58 +01:00
Applevangelist 6c21dfa48c Merge branch 'master' into develop 2023-12-14 11:13:06 +01:00
Applevangelist b31fc3ed44 Limit Attacked() to have at least the capture threatlevel 2023-12-14 11:12:50 +01:00
Applevangelist f948a07d44 xxx 2023-12-14 11:10:12 +01:00
Applevangelist 38e1ef95a3 Merge remote-tracking branch 'origin/develop' into develop 2023-12-14 09:25:07 +01:00
Applevangelist a9e88d234b Merge remote-tracking branch 'origin/master' into develop 2023-12-14 09:25:02 +01:00
Thomas 42fd2322d2 Update Range.lua (#2066) (#2067)
MSRS config compatibility
2023-12-13 19:33:07 +01:00
Applevangelist 7e080f2fb0 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Intelligence.lua
2023-12-12 10:56:09 +01:00
Applevangelist 0bebb791a8 Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:55:29 +01:00
Applevangelist 585901dc7d Merge remote-tracking branch 'origin/master' into develop 2023-12-12 10:54:32 +01:00
Applevangelist 2a7213c1b7 xxx 2023-12-12 10:54:16 +01:00
Applevangelist 42468f3505 xxx 2023-12-12 10:54:01 +01:00
Applevangelist 9eee7e8c9d Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Setup/Moose.files
2023-12-11 16:55:46 +01:00
Applevangelist 6c646dd331 Merge remote-tracking branch 'origin/master' into develop 2023-12-11 16:54:41 +01:00
Thomas 945a81b745 Update Intelligence.lua 2023-12-11 13:17:30 +01:00
ttrebuchon cd4fb0c6c5 Add missing files to Moose.files: (#2062)
Utilities/Socket.lua
Core/Astar.lua
Core/MarkerOps_Base.lua
Functional/ZoneGoalCargo.lua
Ops/OpsZone.lua
Ops/ArmyGroup.lua
Ops/OpsTransport.lua
Ops/Target.lua
2023-12-11 11:50:09 +01:00
Thomas b8d44643c1 Update Detection.lua (#2063) (#2064)
# RadarBlur - make burn-through limit configureable
2023-12-11 11:49:00 +01:00
Applevangelist dab220f897 Merge remote-tracking branch 'origin/develop' into develop 2023-12-10 14:38:48 +01:00
Applevangelist 4a2e824057 Merge remote-tracking branch 'origin/master' into develop 2023-12-10 14:38:43 +01:00
Applevangelist a50ee191e5 xxx 2023-12-10 14:38:19 +01:00
Applevangelist 47d01f18c1 Merge remote-tracking branch 'origin/master' into develop 2023-12-10 14:38:06 +01:00
Applevangelist 8a1c9c0e54 Merge remote-tracking branch 'origin/master' into develop 2023-12-10 11:58:55 +01:00
Applevangelist ec7dd6154d xxx 2023-12-10 11:58:34 +01:00
Applevangelist 918aafa84c Merge remote-tracking branch 'origin/develop' into develop 2023-12-09 18:17:39 +01:00
Applevangelist f2593fcecc Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Detection.lua
2023-12-09 18:17:35 +01:00
Applevangelist a4fd55e87d Merge remote-tracking branch 'origin/master' into develop 2023-12-09 18:16:52 +01:00
Applevangelist 8c57e9cb09 xxx 2023-12-09 18:16:10 +01:00
Applevangelist 0cee9b78eb Merge remote-tracking branch 'origin/develop' into develop 2023-12-09 15:54:12 +01:00
Applevangelist 98b2320aa8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Detection.lua
2023-12-09 15:54:04 +01:00
Applevangelist 5243a408cc Merge remote-tracking branch 'origin/master' into develop 2023-12-09 15:52:16 +01:00
Applevangelist e60e8b37e6 xx 2023-12-09 15:50:47 +01:00
Applevangelist b224739df3 Merge remote-tracking branch 'origin/master' into develop 2023-12-09 14:35:02 +01:00
Applevangelist e9266ed01c xx 2023-12-09 14:34:21 +01:00
Applevangelist ff26e4d1dc Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:54:43 +01:00
Applevangelist af3af14d77 # DETECTION_BASE
* Added `SetRadarBlur(minheight,thresheight,thresblur)`
2023-12-09 13:51:16 +01:00
Applevangelist e0eba9473e Merge remote-tracking branch 'origin/develop' into develop 2023-12-09 13:04:55 +01:00
Applevangelist 691d4c771a Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:04:51 +01:00
Applevangelist 1f17fd89a4 Merge remote-tracking branch 'origin/master' into develop 2023-12-09 13:03:57 +01:00
Applevangelist 6fbe981ce1 xxx 2023-12-09 13:01:32 +01:00
Applevangelist 99a55a3c8a Merge remote-tracking branch 'origin/develop' into develop 2023-12-07 16:10:23 +01:00
Applevangelist 32ded0b34f Merge remote-tracking branch 'origin/master' into develop 2023-12-07 16:10:20 +01:00
Applevangelist a199915731 xxx 2023-12-07 16:09:57 +01:00
Applevangelist a8e35a552d Merge remote-tracking branch 'origin/master' into develop 2023-12-07 16:09:13 +01:00
Applevangelist 6ee1afc670 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 15:12:18 +01:00
Applevangelist e86413b031 Merge remote-tracking branch 'origin/develop' into develop 2023-12-07 13:47:22 +01:00
Applevangelist 3d0db6a800 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 13:47:18 +01:00
Applevangelist 3b8bbdd4c1 Merge branch 'master' into develop 2023-12-07 13:46:52 +01:00
Applevangelist ef4853d0ae Merge remote-tracking branch 'origin/develop' into develop 2023-12-07 13:32:36 +01:00
Applevangelist 9fbbb4ae02 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 13:32:33 +01:00
Applevangelist 7e5a97e7c7 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 13:32:03 +01:00
Applevangelist 99e7d6ae92 #CTLD
* Spawn dropped troops in a nice circle 5m (hover: 1.5m) left of the helo
2023-12-07 13:31:32 +01:00
Applevangelist dcefbdc470 Merge remote-tracking branch 'origin/develop' into develop 2023-12-07 12:16:29 +01:00
Applevangelist 91fb98e32a Merge remote-tracking branch 'origin/master' into develop 2023-12-07 12:16:26 +01:00
Applevangelist f342ba758e Merge remote-tracking branch 'origin/master' into develop 2023-12-07 12:15:56 +01:00
Applevangelist 26c5f7bf79 xxx 2023-12-07 12:15:27 +01:00
Applevangelist e9ab628173 Merge remote-tracking branch 'origin/develop' into develop 2023-12-07 11:23:55 +01:00
Applevangelist 911ea10f3c Merge remote-tracking branch 'origin/master' into develop 2023-12-07 11:23:50 +01:00
Applevangelist 018d8eecf6 Merge remote-tracking branch 'origin/master' into develop 2023-12-07 11:22:20 +01:00
Applevangelist fe9d841af5 #PLAYERRECCE
* Fixed visual targets not being smoked
* Added option to smoke an average coordinate of targets instead of all
* Defaulted self-smoking of player to false
2023-12-07 11:21:52 +01:00
Applevangelist e8c7e62900 xx 2023-12-07 11:20:20 +01:00
Applevangelist 69c20e78fb Merge remote-tracking branch 'origin/develop' into develop 2023-12-06 08:44:15 +01:00
Applevangelist 22175456a5 Merge remote-tracking branch 'origin/master' into develop 2023-12-06 08:44:10 +01:00
Applevangelist 58fa533f79 xxx 2023-12-06 08:43:43 +01:00
Applevangelist d0491b3b5a Merge remote-tracking branch 'origin/master' into develop 2023-12-06 08:43:09 +01:00
Frank f789fbac70 Update Zone.lua
- Fixed ZONE_POLYGON:New called without initial points
2023-12-05 17:48:34 +01:00
Frank bc3a5271dc Update OpsGroup.lua
- Fixed group returning to legion when told not to
2023-12-04 22:19:31 +01:00
Applevangelist 4d4b8862c2 Merge remote-tracking branch 'origin/develop' into develop 2023-12-04 10:42:26 +01:00
Applevangelist 31b75b7d17 Merge remote-tracking branch 'origin/master' into develop 2023-12-04 10:42:23 +01:00
Frank cfca4fdc46 Merge branch 'develop' into FF/Ops 2023-12-03 21:09:17 +01:00
Frank cca5a5d55d Fixes
- Fixed A/C starting on ALERT5
- Fixed nil check for DrawID in UndrawZone
2023-12-03 20:51:19 +01:00
Applevangelist 1f5f08a9ea Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 15:36:05 +01:00
Applevangelist b6c748064f Merge remote-tracking branch 'origin/master' into develop 2023-12-03 15:36:01 +01:00
Applevangelist 3243c92331 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 15:35:17 +01:00
Applevangelist 1f4721b10e #clarifications 2023-12-03 15:34:39 +01:00
Applevangelist f6d3e01a9f Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:40:04 +01:00
Applevangelist 2627b27e38 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:40:01 +01:00
Applevangelist eab37d5e48 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:39:34 +01:00
Applevangelist b61201a60f Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:26:22 +01:00
Applevangelist 818b21d124 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:26:19 +01:00
Applevangelist e838431b28 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:25:51 +01:00
Applevangelist e36d6bb7b7 Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:12:37 +01:00
Applevangelist f8e3e7ff99 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:12:34 +01:00
Applevangelist 1c10bfea92 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:11:55 +01:00
Applevangelist f2ce03e9ea Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 12:04:15 +01:00
Applevangelist 05d9854df0 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:04:11 +01:00
Applevangelist 2dc9f19d78 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 12:03:41 +01:00
Applevangelist 19465c7698 Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-12-03 11:36:01 +01:00
Applevangelist 4e9f6487df Merge remote-tracking branch 'origin/develop' into develop 2023-12-03 11:35:56 +01:00
Applevangelist 83b0282ec0 Merge remote-tracking branch 'origin/master' into develop 2023-12-03 11:35:53 +01:00
Niels Vaes fd191be274 Added ZONE_OVAL. (#2057)
* Added ZONE_OVAL. This can be useful for simulating the area of a view zone from an object looking down at the ground for example.

Can be constructed from a Mission Editor drawing.

* add to DB
2023-12-03 11:34:52 +01:00
Thomas 4e19c91be5 Update Event.lua (#2055)
Fix for playername in weapon target
2023-12-03 09:26:39 +01:00
Thomas 31bdde130a Update Event.lua (#2056)
Fix for playername in weapon target
2023-12-03 09:26:09 +01:00
Frank 494550fe91 Merge pull request #2054 from nielsvaes/moose_develop_vanilla
Update on the ZONE_POLYGON class, so we can finally use it with drawings made in the Mission Editor as well
2023-12-02 20:48:26 +01:00
Niels Vaes 29c0d81c27 Update on the ZONE_POLYGON class, so we can finally use it with drawings made in the Mission Editor as well.
Supports closed line segments, rects and freely drawn polygons.

Added the correct way of generating a point within a polygon with trial and error

Added a way to get the surface area.

Added a helper class (_ZONE_TRIANGLE), which shouldn't ever be used on its own. It's there to support the update ZONE_POLYGON.

Some test code, assuming there's a poygon drawn in the mission editor called "poly":

```Lua
-- make a new zone from a drawing
poly = ZONE_POLYGON:NewFromDrawing("poly")
-- draw the zone for everyone, include the individual triangles that make up the polygon
poly:DrawZone(-1, {1,0,0}, 1, {1,0,0}, 255, 4, false, true)
-- generate 500 random points, evenly distributed in the polygon
for i=1, 500 do
	COORDINATE:NewFromVec2(poly:GetRandomVec2()):CircleToAll(1000)
end

-- remove the drawing from the game
poly:UndrawZone()
```
2023-12-02 20:33:30 +01:00
Applevangelist f009b9adee Merge remote-tracking branch 'origin/develop' into develop 2023-12-02 15:12:09 +01:00
Applevangelist 77dd4f86b9 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:12:05 +01:00
Applevangelist e79c2481da Merge remote-tracking branch 'origin/master' into develop 2023-12-02 15:11:35 +01:00
Applevangelist 5eabc41256 Merge remote-tracking branch 'origin/develop' into develop 2023-12-02 14:46:41 +01:00
Applevangelist dda2fc6ad5 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 14:46:37 +01:00
Applevangelist 460ad9db39 Merge remote-tracking branch 'origin/master' into develop 2023-12-02 14:46:04 +01:00
Applevangelist 9a2126dfc7 Merge remote-tracking branch 'origin/develop' into develop 2023-12-01 16:30:53 +01:00
Applevangelist 2f5598de5a Merge remote-tracking branch 'origin/master' into develop 2023-12-01 16:30:48 +01:00
Applevangelist 099f059eec Merge remote-tracking branch 'origin/develop' into develop 2023-12-01 16:29:52 +01:00
Applevangelist c3bba7d1fc #PLAYERRECCE
* Make the laser corridor a bit wider

#FLIGHtCONTROL
* Also create non-info when ATIS isn't set
2023-12-01 16:29:49 +01:00
Applevangelist d7c7a1a1dd xxx 2023-12-01 16:28:04 +01:00
Frank db71610d72 Merge branch 'master' into develop 2023-11-30 23:29:39 +01:00
Applevangelist 1dc31cc852 spawn 2023-11-29 18:01:37 +01:00
Applevangelist 2488c0dd05 #SPAWN
* Link16 Team Members
2023-11-29 17:36:57 +01:00
Applevangelist 37dab7b8bd color 2023-11-29 16:42:55 +01:00
Applevangelist 68b97773fe #OPSZONE
* Added option to set own pikey-ish zone colors
2023-11-29 16:42:30 +01:00
Applevangelist 3024d4b52f Merge remote-tracking branch 'origin/develop' into develop 2023-11-28 10:38:36 +01:00
Applevangelist 3c0e977584 #PLAYERRECCE
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
2023-11-28 10:37:45 +01:00
Applevangelist b33df5374f #PLAYERRECCE
* Bug fix for clock view calculation
* Ensure lasing is switched off when using the menu
* Create SPOT more often
2023-11-28 10:36:28 +01:00
Applevangelist f5e3c843c4 Merge remote-tracking branch 'origin/develop' into develop 2023-11-27 16:51:17 +01:00
Applevangelist dd57089fcf Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2023-11-27 16:51:13 +01:00
Applevangelist f03a48b118 Merge remote-tracking branch 'origin/master' into develop 2023-11-27 16:49:56 +01:00
Applevangelist 73a62d3a1a #GROUP
STNs
2023-11-27 16:46:47 +01:00
Frank a4704d0e2f Update ArmyGroup.lua 2023-11-26 23:57:21 +01:00
Applevangelist 76493fb6d7 Merge remote-tracking branch 'origin/develop' into develop 2023-11-26 17:00:57 +01:00
Applevangelist 1e783fad29 Merge remote-tracking branch 'origin/master' into develop 2023-11-26 17:00:53 +01:00
Applevangelist 4747dae51a Merge remote-tracking branch 'origin/master' into develop 2023-11-26 17:00:17 +01:00
Applevangelist b1e8ba74a8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Spawn.lua
2023-11-26 16:59:57 +01:00
Applevangelist f6af379be6 #UNIT
* Added `GetSTN()` to obtain Link16 info from a unit
2023-11-26 16:59:22 +01:00
Frank 7538f63c00 Merge branch 'develop' into FF/Ops 2023-11-26 16:46:13 +01:00
Applevangelist 54277da8a5 Merge remote-tracking branch 'origin/develop' into develop 2023-11-26 15:55:06 +01:00
Applevangelist 12111c27ad Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Spawn.lua
2023-11-26 15:55:02 +01:00
Applevangelist 52ed645f6c -- noise 2023-11-25 18:44:38 +01:00
Applevangelist b0c294b59b -- noise 2023-11-25 18:44:07 +01:00
Applevangelist 60dedb4cbe Merge remote-tracking branch 'origin/develop' into develop 2023-11-25 18:31:23 +01:00
Applevangelist 57b55246a6 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2023-11-25 18:31:18 +01:00
Applevangelist 9f41cc51be Merge remote-tracking branch 'origin/master' into develop 2023-11-25 18:30:04 +01:00
Applevangelist ac4702b57c xxx 2023-11-25 18:26:43 +01:00
Applevangelist 14ff3028e3 xxx 2023-11-25 14:49:06 +01:00
Applevangelist 6390b223b0 Merge remote-tracking branch 'origin/master' into develop 2023-11-24 12:17:56 +01:00
Applevangelist dd9752b6ed Merge remote-tracking branch 'origin/develop' into develop 2023-11-24 08:58:30 +01:00
Applevangelist 7978bbc612 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-11-24 08:58:23 +01:00
Thomas 62e8302753 Update SRS.lua (#2047)
Fix for config load when not desanitized
2023-11-24 06:35:32 +01:00
Frank bfaf88f017 Merge branch 'develop' into FF/Ops 2023-11-23 22:23:50 +01:00
Frank cc79dc74d4 Merge branch 'master' into develop 2023-11-23 22:23:17 +01:00
Applevangelist 4f4e8b17c1 Merge remote-tracking branch 'origin/master' into develop 2023-11-23 18:46:03 +01:00
Applevangelist 9eb05fa447 ATC_GROUND fix for scheduler 2023-11-23 18:45:25 +01:00
Applevangelist 0850796368 Merge remote-tracking branch 'origin/master' into develop 2023-11-23 18:15:01 +01:00
Applevangelist 454a6a8350 SPAWN 2023-11-23 18:14:40 +01:00
Applevangelist 1f9cc15fb1 Merge remote-tracking branch 'origin/develop' into develop 2023-11-23 17:03:06 +01:00
Applevangelist 6db8ba9e2f Merge remote-tracking branch 'origin/master' into develop 2023-11-23 17:02:59 +01:00
Applevangelist ff58649954 Merge remote-tracking branch 'origin/master' into develop 2023-11-23 17:02:20 +01:00
Applevangelist bbf793febe #CLIENTMENU 2023-11-23 17:01:33 +01:00
Applevangelist a89c96e3c4 fixes 2023-11-23 17:00:38 +01:00
Applevangelist f071c674d0 fix 2023-11-22 18:35:23 +01:00
Applevangelist fc32252db7 xx 2023-11-22 18:35:04 +01:00
Applevangelist fb15a10bc4 Merge remote-tracking branch 'origin/develop' into develop 2023-11-22 17:58:24 +01:00
Applevangelist 37dd629cea Merge remote-tracking branch 'origin/master' into develop 2023-11-22 17:58:21 +01:00
Applevangelist 3c53f627c2 Merge remote-tracking branch 'origin/master' into develop 2023-11-22 17:57:51 +01:00
Applevangelist ed851ebc86 SRS 2023-11-22 17:52:37 +01:00
Applevangelist 3d972411f1 Merge remote-tracking branch 'origin/develop' into develop 2023-11-21 13:23:23 +01:00
Applevangelist c1cc36f18a Merge remote-tracking branch 'origin/master' into develop 2023-11-21 13:23:19 +01:00
Applevangelist 2dfde7d1fd xxx 2023-11-21 13:22:51 +01:00
Applevangelist c011d38313 Merge remote-tracking branch 'origin/master' into develop 2023-11-21 13:21:48 +01:00
Applevangelist 9014e27edc xxx 2023-11-21 13:21:02 +01:00
Applevangelist da5a66d200 Merge remote-tracking branch 'origin/develop' into develop 2023-11-21 10:13:55 +01:00
Applevangelist f246631d3f Merge remote-tracking branch 'origin/master' into develop 2023-11-21 10:13:51 +01:00
Applevangelist f922b94eb1 xx 2023-11-21 10:13:29 +01:00
Applevangelist 68350d6824 Merge remote-tracking branch 'origin/master' into develop 2023-11-21 10:13:08 +01:00
Thomas 2e6cac7bee Update Utils.lua 2023-11-20 14:50:12 +01:00
Frank b5965bbf81 Merge branch 'develop' into FF/Ops 2023-11-20 13:52:16 +01:00
kaltokri a0429458d0 Merge branch 'master' into develop 2023-11-20 10:15:46 +01:00
kaltokri 847dc1839f Merge branch 'master' into develop 2023-11-20 09:59:36 +01:00
Applevangelist c7d8916085 Merge remote-tracking branch 'origin/develop' into develop 2023-11-19 15:37:36 +01:00
Applevangelist 76a7a7f6da Merge remote-tracking branch 'origin/master' into develop 2023-11-19 15:37:32 +01:00
Applevangelist 0dd4da1db4 Merge remote-tracking branch 'origin/master' into develop 2023-11-19 15:36:46 +01:00
Applevangelist 264d7bd3a8 Merge remote-tracking branch 'origin/develop' into develop 2023-11-19 12:41:35 +01:00
Applevangelist d3a3a14e96 Merge remote-tracking branch 'origin/master' into develop 2023-11-19 12:41:31 +01:00
Applevangelist 4d4f8e9d61 Merge remote-tracking branch 'origin/master' into develop 2023-11-19 12:40:45 +01:00
Applevangelist f397b47a8f Merge remote-tracking branch 'origin/develop' into develop 2023-11-18 17:17:41 +01:00
Applevangelist 9f942e0fda Merge remote-tracking branch 'origin/master' into develop 2023-11-18 17:17:37 +01:00
Applevangelist 6fe883a17a Merge remote-tracking branch 'origin/master' into develop 2023-11-18 17:17:05 +01:00
Applevangelist 540861dd25 Advanced scoot and shoot 2023-11-18 17:15:53 +01:00
Applevangelist 2a63a128cd Merge remote-tracking branch 'origin/develop' into develop 2023-11-18 16:45:35 +01:00
Applevangelist c1d42ef10c Merge remote-tracking branch 'origin/master' into develop 2023-11-18 16:45:31 +01:00
Applevangelist fbbdac9b7e Merge remote-tracking branch 'origin/master' into develop 2023-11-18 16:44:46 +01:00
Applevangelist b737ebb962 xx 2023-11-18 16:43:44 +01:00
Applevangelist de380614fb Merge remote-tracking branch 'origin/master' into develop 2023-11-18 13:23:58 +01:00
Frank bcbda4eb64 Merge branch 'develop' into FF/Ops 2023-11-17 18:04:49 +01:00
Applevangelist 34335d09b7 Merge remote-tracking branch 'origin/develop' into develop 2023-11-17 15:08:53 +01:00
Applevangelist 0e00e15578 Merge remote-tracking branch 'origin/master' into develop 2023-11-17 15:08:47 +01:00
Applevangelist f6fdff927b Merge remote-tracking branch 'origin/master' into develop 2023-11-17 15:07:46 +01:00
Applevangelist 58ce4b001e #PLAYERRECCE
* Fix issue which stops lasing though target is alive and in sight
2023-11-17 15:07:29 +01:00
Applevangelist 51be801637 #PLAYERRECCE 2023-11-17 15:03:29 +01:00
Applevangelist d09f409359 Merge remote-tracking branch 'origin/develop' into develop 2023-11-17 12:57:27 +01:00
Applevangelist 9a360a3bd5 #AWACS
* Small fix for no text on clean call
2023-11-17 12:05:14 +01:00
Applevangelist 9df5e5165d #AWACS
* Small fix for no text on clean call
2023-11-17 12:05:01 +01:00
Applevangelist 96c1425ffe Merge remote-tracking branch 'origin/develop' into develop 2023-11-17 11:39:59 +01:00
Applevangelist 15a2d5bd73 Merge remote-tracking branch 'origin/master' into develop 2023-11-17 11:39:55 +01:00
Applevangelist 217b8fe71e Merge remote-tracking branch 'origin/master' into develop 2023-11-17 11:05:53 +01:00
Applevangelist f32784395c Merge remote-tracking branch 'origin/develop' into develop 2023-11-17 10:47:44 +01:00
Applevangelist 7d71b4f955 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Object.lua
2023-11-17 10:47:40 +01:00
Thomas 32ae4986ca Update PlayerTask.lua
Weapon check for bomb runway task
2023-11-17 06:28:33 +01:00
Frank 2a0086d3fe Merge branch 'master' into develop 2023-11-17 00:26:33 +01:00
Frank 75a6a798ac Update OpsZone.lua
- Fix for new `getCategory` behaviour
2023-11-16 22:52:13 +01:00
Frank 067285f870 Merge branch 'master' into develop 2023-11-16 22:32:17 +01:00
Applevangelist 0bb95ef5a3 Merge remote-tracking branch 'origin/develop' into develop 2023-11-16 18:12:45 +01:00
Applevangelist db02075b4b Merge remote-tracking branch 'origin/master' into develop 2023-11-16 18:12:41 +01:00
Applevangelist 8b20f6cab2 xx 2023-11-16 18:12:17 +01:00
Applevangelist 8075be92a7 Merge remote-tracking branch 'origin/master' into develop 2023-11-16 18:11:58 +01:00
Applevangelist f453619c78 Merge remote-tracking branch 'origin/master' into develop 2023-11-16 16:11:20 +01:00
Applevangelist ca20e059a6 #PLAYERRECCE
* Fixes for new Gazelle models
2023-11-16 14:08:33 +01:00
Applevangelist 9f08d53262 #PLAYERRECCE
* Fixes for new Gazelle models
2023-11-16 14:07:26 +01:00
Applevangelist 4b60d7a10e Merge remote-tracking branch 'origin/develop' into develop 2023-11-15 18:21:12 +01:00
Applevangelist 42229b956e Merge remote-tracking branch 'origin/master' into develop 2023-11-15 18:21:09 +01:00
Applevangelist 2044068393 Merge remote-tracking branch 'origin/master' into develop 2023-11-15 18:17:23 +01:00
Applevangelist 078ffc9baf #MESSAGE
* Fixes for ToSRS via MS Desktop
2023-11-15 18:15:23 +01:00
Applevangelist 57ae54d665 #bugfix, docu 2023-11-15 10:17:26 +01:00
Thomas 2c3e9e992d Update PlayerTask.lua
Bugfix
2023-11-15 07:24:01 +01:00
Applevangelist ef27daa282 Merge remote-tracking branch 'origin/master' into develop 2023-11-14 12:15:48 +01:00
Applevangelist 59784c4af5 Merge remote-tracking branch 'origin/develop' into develop 2023-11-14 11:53:35 +01:00
Applevangelist b962fc2a4c Merge remote-tracking branch 'origin/master' into develop 2023-11-14 11:53:29 +01:00
Applevangelist b32453bd9c #Shoot&Scoot 2023-11-14 11:52:55 +01:00
Applevangelist e36ade55d2 Merge remote-tracking branch 'origin/master' into develop 2023-11-12 16:54:07 +01:00
Applevangelist b9606ceceb #SEAD
* Added data and actions for TALD ADM_141
2023-11-12 16:53:46 +01:00
Applevangelist 77488078bf Merge remote-tracking branch 'origin/develop' into develop 2023-11-12 12:14:44 +01:00
Applevangelist 02403251ce Merge remote-tracking branch 'origin/master' into develop 2023-11-12 12:14:38 +01:00
Applevangelist 2d631cba3f #AUTOLASE - Menu for smoking 2023-11-12 12:13:12 +01:00
Applevangelist 2483cadbbd Autolase smoke menu 2023-11-12 12:12:49 +01:00
Applevangelist 9ccfcb8fb1 Merge remote-tracking branch 'origin/develop' into develop 2023-11-11 19:02:34 +01:00
Applevangelist a8e58b8121 #AUTOLASE
* Added menu to change the laser code
2023-11-11 19:02:26 +01:00
Applevangelist fb4914a120 changes 2023-11-11 19:01:51 +01:00
kaltokri dcc968c290 Merge branch 'master' into develop 2023-11-11 16:06:52 +01:00
kaltokri 36aa697936 Merge branch 'master' into develop 2023-11-10 16:54:58 +01:00
kaltokri 8bace684c2 Merge branch 'master' into develop 2023-11-10 16:23:27 +01:00
kaltokri aa5163fe3a Merge branch 'master' into develop 2023-11-10 15:37:20 +01:00
kaltokri 097e0a3214 Merge branch 'master' into develop 2023-11-10 10:52:53 +01:00
kaltokri b5c9598cb0 Merge branch 'master' into develop 2023-11-09 16:39:15 +01:00
Applevangelist bc454fdec2 #docu changes 2023-11-09 15:16:51 +01:00
Applevangelist 847df24ab0 docu 2023-11-09 15:16:35 +01:00
Applevangelist 92e9e5390b Merge remote-tracking branch 'origin/develop' into develop 2023-11-09 15:10:13 +01:00
Applevangelist 92575367ae Merge remote-tracking branch 'origin/master' into develop 2023-11-09 15:10:09 +01:00
Applevangelist 166a7ab7db #DATABASE
* Register players joining CA slots as CLIENTs
2023-11-09 15:09:39 +01:00
Applevangelist f459372720 #CLIENTMENUMANAGER
* Added `CLIENTMENUMANAGER:InitAutoPropagation()`

#PLAYERTASK
* Some menu fixes
2023-11-09 15:08:28 +01:00
Applevangelist 7b57bf3ece Fixes 2023-11-09 15:05:25 +01:00
Applevangelist 9cb4f166f2 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2023-11-08 17:54:58 +01:00
Applevangelist f5d2439d69 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:54:08 +01:00
Applevangelist 04c092b9ef Merge remote-tracking branch 'origin/develop' into develop 2023-11-08 17:44:12 +01:00
Applevangelist 7af920891d Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:44:08 +01:00
Applevangelist 7913b83f20 matching 2023-11-08 17:43:39 +01:00
kaltokri d9d333a7af Merge branch 'master' into develop 2023-11-08 17:39:40 +01:00
kaltokri 8f73a4c27c Merge branch 'master' into develop 2023-11-08 17:33:57 +01:00
kaltokri f4b83a97a9 Merge branch 'master' into develop 2023-11-08 17:27:30 +01:00
Applevangelist e5dc191584 Merge remote-tracking branch 'origin/develop' into develop 2023-11-08 17:02:57 +01:00
Applevangelist 57ca4f37a3 Merge remote-tracking branch 'origin/master' into develop 2023-11-08 17:02:53 +01:00
Applevangelist 3360f511ee Merge remote-tracking branch 'origin/develop' into develop 2023-11-08 17:01:57 +01:00
Applevangelist f64ec74d1c #PLAYERRECCE
* Added doku for OnAfter.. calls
2023-11-08 17:01:50 +01:00
Applevangelist 40da0fbb1c #PLAYERRECCE
* Added doku for OnAfter.. calls
2023-11-08 17:01:32 +01:00
kaltokri b885ef7767 Merge branch 'master' into develop 2023-11-08 16:59:31 +01:00
kaltokri 22f5104805 Merge branch 'master' into develop 2023-11-08 16:23:47 +01:00
kaltokri 266e34a92d Merge branch 'master' into develop 2023-11-08 13:45:53 +01:00
Applevangelist 3f6342f0c6 Merge remote-tracking branch 'origin/develop' into develop 2023-11-08 11:25:44 +01:00
Applevangelist bb3675ad11 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Client.lua
2023-11-08 11:25:34 +01:00
Applevangelist a7366103c9 CLIENT 2023-11-08 11:24:34 +01:00
Applevangelist 500a7f938f Merge remote-tracking branch 'origin/master' into develop 2023-11-08 11:24:00 +01:00
Applevangelist f408c11506 Merge remote-tracking branch 'origin/develop' into develop 2023-11-08 11:23:38 +01:00
Applevangelist d5a9f776f7 Various 2023-11-08 11:09:49 +01:00
Applevangelist b4058ecab2 #FLIGHTCONTROL
* Fix for shelters, puts the guy out front and not on top.
2023-11-08 11:09:39 +01:00
Applevangelist 7f650913d9 #EVENT
* Add player UCID to event data structure (for multi-player)
2023-11-07 11:07:28 +01:00
Frank 7306cc1102 Merge branch 'develop' into FF/Ops 2023-11-07 00:05:16 +01:00
Frank 21aadc14b1 Merge branch 'master' into develop 2023-11-06 22:01:26 +01:00
Applevangelist eed6119193 #FLIGHTGROUP
* Resolve a stalemate when all jobs are done but _CheckGroupDone isn't called any longer
2023-11-06 18:36:02 +01:00
Applevangelist c765070401 #FLIGHTGROUP
* Resolve a stalemate when all jobs are done but _CheckGroupDone isn't called any longer
2023-11-06 18:35:17 +01:00
Applevangelist 1e974c7d3a Merge remote-tracking branch 'origin/develop' into develop 2023-11-05 13:02:28 +01:00
Applevangelist 20f74c95bf Merge remote-tracking branch 'origin/master' into develop 2023-11-05 13:02:24 +01:00
Applevangelist 6db2e333ad Merge remote-tracking branch 'origin/master' into develop 2023-11-05 13:01:59 +01:00
Applevangelist b7159f7334 # 2023-11-05 13:01:38 +01:00
Applevangelist 7a97fed8a1 #SRS 2023-11-04 17:26:28 +01:00
kaltokri 0eb9dfc7de Merge branch 'master' into develop 2023-11-03 16:34:36 +01:00
Applevangelist 1064f2123b Merge remote-tracking branch 'origin/develop' into develop 2023-11-03 13:39:36 +01:00
Applevangelist 6e72c4c40a Merge remote-tracking branch 'origin/master' into develop 2023-11-03 13:39:32 +01:00
Applevangelist 4eb0f8e9ca Merge remote-tracking branch 'origin/master' into develop 2023-11-03 13:39:02 +01:00
Applevangelist 5a583671a7 #SRS - Improvements, set also a coordinate 2023-11-03 13:38:37 +01:00
Applevangelist b1823824c2 #SRS Improvements 2023-11-03 13:37:37 +01:00
Frank 6406ce696b Merge branch 'develop' into FF/Ops 2023-11-02 20:31:57 +01:00
Applevangelist f0de6ca9e1 #ATIS 2023-11-02 19:26:51 +01:00
Applevangelist e560c3ffdd Merge remote-tracking branch 'origin/master' into develop 2023-11-02 19:25:50 +01:00
Applevangelist 1e015fd988 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_Escort_Request.lua
#	Moose Development/Moose/AI/AI_Formation.lua
2023-11-02 18:22:30 +01:00
Applevangelist 74bd41743b Merge remote-tracking branch 'origin/develop' into develop 2023-11-02 18:20:49 +01:00
Applevangelist 56d4143a05 Merge remote-tracking branch 'origin/master' into develop 2023-11-02 18:20:45 +01:00
Applevangelist 1093e55ea8 #OPSGROUP #FLIGHTCONTROL
* Added setting coordinate for SRS
2023-11-02 18:19:55 +01:00
Applevangelist 408f9d9c0c #ATIS and #SRS 2023-11-02 18:16:30 +01:00
kaltokri cc95c45fb0 Merge branch 'master' into develop 2023-11-02 15:16:41 +01:00
Frank 6c36910ac7 Update FlightGroup.lua
#2033
2023-11-02 01:41:39 +01:00
Frank d60f20a162 Merge branch 'master' into develop 2023-11-02 01:40:01 +01:00
Thomas dc26134845 Merge from master (#2036)
* Update Storage.lua

* Update Storage.lua (#2035)
2023-11-01 06:21:56 +01:00
Frank 0d9d0be0c3 Merge branch 'develop' into FF/Ops 2023-10-31 20:14:46 +01:00
Frank adad7ef901 Merge branch 'master' into develop 2023-10-31 19:53:35 +01:00
kaltokri bb6bb20179 Merge branch 'master' into develop 2023-10-31 16:37:19 +01:00
kaltokri 07cac604cf Merge branch 'master' into develop 2023-10-31 16:31:01 +01:00
kaltokri 28cb44874f Merge branch 'master' into develop 2023-10-31 16:06:06 +01:00
kaltokri 616f204f5b Merge branch 'master' into develop 2023-10-31 15:44:22 +01:00
kaltokri 211e1b41b0 Merge branch 'master' into develop 2023-10-31 15:23:53 +01:00
Frank cd316e6719 Merge branch 'master' into develop 2023-10-31 13:44:56 +01:00
kaltokri 0fb8fd8886 Merge branch 'master' into develop 2023-10-31 13:07:02 +01:00
Applevangelist afe54e1472 Merge remote-tracking branch 'origin/develop' into develop 2023-10-31 12:49:08 +01:00
Applevangelist 0f7c3533ba Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Gci.lua
#	Moose Development/Moose/AI/AI_A2A_Patrol.lua
#	Moose Development/Moose/AI/AI_A2G_BAI.lua
#	Moose Development/Moose/AI/AI_A2G_CAS.lua
#	Moose Development/Moose/AI/AI_A2G_SEAD.lua
#	Moose Development/Moose/AI/AI_Air_Engage.lua
#	Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
2023-10-31 12:49:03 +01:00
Frank 059d8ccfc0 Merge branch 'FF/Ops' of https://github.com/FlightControl-Master/MOOSE into FF/Ops 2023-10-31 10:45:58 +01:00
Frank bd9022c010 ARMYGROUP
Added parameter to delay init group
2023-10-31 10:45:56 +01:00
kaltokri 261a389ca5 Merge branch 'master' into develop 2023-10-31 10:25:38 +01:00
kaltokri 708838c404 Merge branch 'master' into develop 2023-10-30 18:02:27 +01:00
kaltokri 974a56b135 Merge branch 'master' into develop 2023-10-30 14:56:32 +01:00
kaltokri 85c551cc59 Merge branch 'master' into develop 2023-10-29 23:06:31 +01:00
kaltokri f33ccee7b1 Merge branch 'master' into develop 2023-10-29 19:44:24 +01:00
Applevangelist 5221645b0b Merge remote-tracking branch 'origin/develop' into develop 2023-10-29 17:46:14 +01:00
Applevangelist a3de5fc589 Merge remote-tracking branch 'origin/master' into develop 2023-10-29 17:46:11 +01:00
Applevangelist 7277221905 Merge remote-tracking branch 'origin/master' into develop 2023-10-29 17:45:23 +01:00
Applevangelist 497ac367ba #CTLD
* Adding re-packing dropped units
2023-10-29 17:45:02 +01:00
Applevangelist b8ffb626b9 #CTLD
* Adding re-packing dropped units
2023-10-29 17:44:47 +01:00
Xavier V 92e2414612 Added pack crates (#2019) 2023-10-29 17:29:01 +01:00
kaltokri 3ca4898860 Merge branch 'master' into develop 2023-10-27 17:49:14 +02:00
kaltokri e4d6e6d80e Merge branch 'master' into develop 2023-10-27 17:28:19 +02:00
kaltokri 99ebebe13c Merge branch 'master' into develop 2023-10-27 17:05:11 +02:00
Applevangelist b42990d65b Merge remote-tracking branch 'origin/develop' into develop 2023-10-27 09:10:40 +02:00
Applevangelist 07865f1b12 Merge remote-tracking branch 'origin/master' into develop 2023-10-27 09:10:34 +02:00
Applevangelist bf604da2ae Merge remote-tracking branch 'origin/master' into develop 2023-10-27 09:10:04 +02:00
Applevangelist bca3abe2c2 Merge remote-tracking branch 'origin/develop' into develop 2023-10-26 12:46:20 +02:00
Applevangelist 3a06f6314e Merge remote-tracking branch 'origin/master' into develop 2023-10-26 12:46:16 +02:00
Applevangelist b5ff10d960 #UNIT 2023-10-26 12:45:11 +02:00
Applevangelist 50eeae0b3f SPAWN 2023-10-26 09:43:56 +02:00
kaltokri e7f7199a39 Merge branch 'master' into develop 2023-10-25 15:35:59 +02:00
Applevangelist 73e05872ea Merge remote-tracking branch 'origin/develop' into develop 2023-10-25 13:48:19 +02:00
Applevangelist cdce54e855 Merge remote-tracking branch 'origin/master' into develop 2023-10-25 13:48:12 +02:00
Applevangelist a429f8c0aa #FC 2023-10-25 13:47:20 +02:00
Applevangelist 6e1dabfe9b #FLIGHTCONTROL
* Added option to switch subs on/off per instance
2023-10-25 13:47:11 +02:00
Applevangelist e48a823560 #EASYGCICAP, CONTROLLABLE, OPSGROUP, AUFTRAG
* Changed patrol race track alt to be ASL not AGL by default
2023-10-25 08:46:52 +02:00
Applevangelist d728afd6f2 #docu 2023-10-25 08:45:36 +02:00
Applevangelist 3c252f01be #OPSGROUP, CONTROLLER
* AUFTRAG Patrol Race Track will use ASL not AGL as default
2023-10-25 08:39:11 +02:00
Applevangelist 8f1e2a1d54 Merge remote-tracking branch 'origin/develop' into develop 2023-10-24 18:25:09 +02:00
Applevangelist 74d54637d5 #PLAYERTASK
* Remove client from task, even if only player name is available
2023-10-24 18:25:02 +02:00
Applevangelist d7788a2a2e #PLAYERTASK
* Remove client from task, even if only player name is available
2023-10-24 18:24:49 +02:00
kaltokri 1126b7753a Merge branch 'master' into develop 2023-10-24 17:04:00 +02:00
Applevangelist 07851f449a Merge remote-tracking branch 'origin/develop' into develop 2023-10-24 13:47:33 +02:00
Applevangelist ff883f48e9 Merge remote-tracking branch 'origin/master' into develop 2023-10-24 13:47:28 +02:00
Applevangelist e24acb28f7 Merge remote-tracking branch 'origin/master' into develop 2023-10-24 13:46:35 +02:00
Applevangelist f28f807ee7 #EASYGCICAP
* Closer turning cap routes
2023-10-24 13:45:15 +02:00
Applevangelist 3ffb6e192a #EASYGCICAP - added better race track options 2023-10-24 13:35:10 +02:00
Applevangelist 20f28d30c0 Merge remote-tracking branch 'origin/develop' into develop 2023-10-21 12:44:42 +02:00
Applevangelist 34dfb1e43f Merge remote-tracking branch 'origin/master' into develop 2023-10-21 12:44:37 +02:00
Applevangelist 6035544193 #RECOVERYTANKER
* Added option to set unlimited fuel
2023-10-21 12:44:12 +02:00
Applevangelist 375a564446 Merge remote-tracking branch 'origin/master' into develop 2023-10-21 12:43:48 +02:00
kaltokri c00da0f925 Merge branch 'master' into develop 2023-10-20 23:37:57 +02:00
kaltokri 6161da3a22 Merge branch 'master' into develop 2023-10-20 22:52:07 +02:00
Applevangelist 9c0cbe2ef8 Merge remote-tracking branch 'origin/develop' into develop 2023-10-20 18:45:49 +02:00
Applevangelist 0139286dff Merge remote-tracking branch 'origin/master' into develop 2023-10-20 18:45:44 +02:00
Applevangelist d890b3fe92 #Con 2023-10-20 18:45:20 +02:00
Applevangelist 54e44299d8 Merge remote-tracking branch 'origin/develop' into develop 2023-10-20 18:45:05 +02:00
Applevangelist f71d6f3f30 Merge remote-tracking branch 'origin/master' into develop 2023-10-20 18:45:02 +02:00
kaltokri daae77def5 Merge branch 'master' into develop 2023-10-20 16:15:43 +02:00
Applevangelist 52e83c7863 Merge remote-tracking branch 'origin/develop' into develop 2023-10-20 12:39:44 +02:00
Applevangelist 26f3a8cf64 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2023-10-20 12:39:35 +02:00
kaltokri b808f2f568 Merge branch 'master' into develop 2023-10-20 09:59:06 +02:00
kaltokri 91aa2eb9f2 Merge branch 'master' into develop 2023-10-19 18:54:17 +02:00
kaltokri 3d697211bd Merge branch 'master' into develop 2023-10-19 18:25:07 +02:00
kaltokri 4fced3416a Merge branch 'master' into develop 2023-10-19 18:17:12 +02:00
Rolf Geuenich 1b5067088f Merge branch 'master' into develop
Added new build system with GitHub Action Workflows
2023-10-19 14:00:22 +02:00
Applevangelist 8920f7e25f Merge remote-tracking branch 'origin/develop' into develop 2023-10-19 13:12:10 +02:00
Applevangelist 8dc008e428 Merge remote-tracking branch 'origin/master' into develop 2023-10-19 13:12:06 +02:00
Rolf Geuenich 2986a33a56 Merge branch 'master' into develop
Align Moose_Create.lua with the dev branch
2023-10-19 11:39:33 +02:00
Rolf Geuenich ce6624fe0b Merge branch 'master' into develop
Preperation for new build system
2023-10-19 11:11:46 +02:00
Applevangelist 06b983870f Merge remote-tracking branch 'origin/develop' into develop 2023-10-17 16:59:15 +02:00
Applevangelist 5f1451f012 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:59:10 +02:00
Applevangelist 3ba868b3b9 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:58:40 +02:00
Applevangelist 73464a09f1 srs 2023-10-17 16:06:11 +02:00
Applevangelist cb048bb406 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-17 16:06:03 +02:00
Applevangelist 07c86ec2dc Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Zone.lua
2023-10-17 16:05:24 +02:00
Applevangelist 443e853d2a #trigger 2023-10-17 16:03:47 +02:00
Applevangelist 85b10fb1c9 Merge remote-tracking branch 'origin/master' into develop 2023-10-17 16:03:24 +02:00
Applevangelist e578a673d9 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-17 11:08:13 +02:00
Applevangelist d8bb2fe1f1 #MSRS 2023-10-17 11:01:18 +02:00
Applevangelist 7558b7ee1d #MSRS
* Added loading config file
2023-10-17 09:28:20 +02:00
Applevangelist ab197699b6 ATIS 2023-10-14 17:23:26 +02:00
Applevangelist 12d23266c3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-14 17:21:51 +02:00
Applevangelist 9451956914 #MSRS
* Added config file loading
2023-10-14 16:49:55 +02:00
Applevangelist 3f04249d07 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
2023-10-13 16:15:23 +02:00
Applevangelist c9cad84419 #SRS 2023-10-13 16:12:38 +02:00
Applevangelist 013a6f134e AUFTRAG 2023-10-12 18:05:23 +02:00
Applevangelist 8dc601bf48 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
2023-10-12 18:04:21 +02:00
Applevangelist 3f8c7eaa94 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:03:08 +02:00
Applevangelist b8a2b28462 Merge remote-tracking branch 'origin/master' into develop 2023-10-12 18:02:33 +02:00
Applevangelist 9ccde838e7 #AUFTRAG
* More Bryce fixes
2023-10-12 18:01:56 +02:00
Applevangelist 6ba62e3e04 #AUFTRAG
* bear trap for Bryce using RECON Auftrags
2023-10-12 17:56:31 +02:00
Applevangelist 0c97bc5b59 #AUFTRAG 2023-10-12 17:55:54 +02:00
Applevangelist dca57c97de Syntax 2023-10-12 10:54:00 +02:00
Applevangelist 400ae46e03 #RAT
* DOcu
2023-10-12 08:52:23 +02:00
Applevangelist 80817a1af3 Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 15:50:55 +02:00
Applevangelist 3d44af3042 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 15:50:51 +02:00
Applevangelist fb1b5b209e Merge remote-tracking branch 'origin/master' into develop 2023-10-06 15:50:10 +02:00
Applevangelist fd0f55099f Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 13:24:11 +02:00
Applevangelist c8a20afb87 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 13:24:06 +02:00
Applevangelist 9493570e6b Merge remote-tracking branch 'origin/master' into develop 2023-10-06 13:18:50 +02:00
Applevangelist 8d37414eac #MESSAGE
* Added `ToSRS()`
2023-10-06 13:17:54 +02:00
Applevangelist 439c11c376 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:43:50 +02:00
Applevangelist aed6438648 Merge remote-tracking branch 'origin/develop' into develop 2023-10-06 11:43:27 +02:00
Applevangelist 00b466c6a5 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:43:23 +02:00
Applevangelist a6c244f670 Merge remote-tracking branch 'origin/master' into develop 2023-10-06 11:31:59 +02:00
Applevangelist 8c44cf8fca #EasyGCICAP
* Added Recon Patrol points
2023-10-06 11:31:35 +02:00
Applevangelist ed7821ad1c #EasyGCICAP 2023-10-06 11:30:31 +02:00
Applevangelist 8f71e6c5c4 #EasyGCICAP
* Recon Points option added
2023-10-06 11:16:30 +02:00
Applevangelist 7adf99f82e #INTEL
* Added Conflict zones
2023-10-05 17:39:55 +02:00
Frank ffea9708d1 Merge branch 'master' into develop 2023-09-29 15:39:28 +02:00
Applevangelist 034c1aa481 Merge remote-tracking branch 'origin/develop' into develop 2023-09-29 10:21:08 +02:00
Applevangelist 40fa3afbde Merge remote-tracking branch 'origin/master' into develop 2023-09-29 10:21:03 +02:00
Applevangelist b108bd9ac6 Merge branch 'master' into develop 2023-09-29 10:20:27 +02:00
Applevangelist 00c837c361 Merge remote-tracking branch 'origin/develop' into develop 2023-09-28 13:29:20 +02:00
Applevangelist d6e3caaa9b #EasyGCICAP
* Docu additions
2023-09-28 13:28:49 +02:00
Applevangelist a54b785ca3 #EasyGCICAP
* Docu additions
2023-09-28 13:28:35 +02:00
Applevangelist 6c3f3cf0d2 #EasyGCICAP
* Added option for an AWACS patrol point and Squad
* Added option to make Tanker and AWACS invisible
2023-09-28 13:15:56 +02:00
Applevangelist 98a11a8aad #EasyGCICAP
* Added option for an AWACS patrol point and Squad
* Added option to make Tanker and AWACS invisible
2023-09-28 13:15:27 +02:00
Applevangelist 963b2f1b46 Merge remote-tracking branch 'origin/develop' into develop 2023-09-28 08:06:04 +02:00
Applevangelist f602f05c5a Merge remote-tracking branch 'origin/master' into develop 2023-09-28 08:05:59 +02:00
Frank bd79750efa Merge branch 'master' into develop 2023-09-27 22:28:58 +02:00
Applevangelist 39fc112e53 Merge remote-tracking branch 'origin/master' into develop 2023-09-27 18:08:25 +02:00
Applevangelist 5dc5736976 #EasyGCICAP
* Added success criteria if intruder leaves monitored zones
2023-09-27 18:07:50 +02:00
Applevangelist 3ea0cc6427 #EasyGCICAP
* Added success criteria if intruder leaves monitored zones
2023-09-27 18:07:34 +02:00
Applevangelist 1f23525799 Merge remote-tracking branch 'origin/develop' into develop 2023-09-27 15:42:26 +02:00
Applevangelist f390616e41 Merge remote-tracking branch 'origin/master' into develop 2023-09-27 15:42:23 +02:00
Applevangelist 258f9f7bb7 Zones 2023-09-27 15:40:44 +02:00
Applevangelist 6f673583ab pos 2023-09-27 15:39:51 +02:00
Frank dfc7f17308 NAVYGROUP
- Improved heading into wind
2023-09-27 10:57:12 +02:00
Applevangelist 0477ef669a docu 2023-09-26 13:29:35 +02:00
Applevangelist c4e8ad50c8 Docu adds 2023-09-26 13:29:09 +02:00
Applevangelist b023ec2d3f Merge remote-tracking branch 'origin/develop' into develop 2023-09-26 13:11:33 +02:00
Applevangelist 652df5570a #EasyGCICAP
* initial release
2023-09-26 13:07:41 +02:00
Applevangelist 3c9bf1de77 #EasyGCICAP
* Initial Release
2023-09-26 13:07:10 +02:00
Applevangelist 4e86197d62 Merge remote-tracking branch 'origin/develop' into develop 2023-09-25 08:44:22 +02:00
Applevangelist 816fd9b758 Merge remote-tracking branch 'origin/master' into develop 2023-09-25 08:44:19 +02:00
Applevangelist bb8e6eb7a1 Merge remote-tracking branch 'origin/master' into develop 2023-09-25 08:43:50 +02:00
Applevangelist c1c7279e01 mods 2023-09-25 08:43:00 +02:00
Applevangelist baf8edfc9c chief typo 2023-09-25 08:42:49 +02:00
Applevangelist d2450ff776 Merge remote-tracking branch 'origin/develop' into develop 2023-09-21 09:01:49 +02:00
Frank b7b369e78f Merge pull request #2003 from FlightControl-Master/FF/Ops
LEGION
2023-09-20 21:55:03 +02:00
Frank b1436b66d4 LEGION
- Added random asset score
- Added nil check for request.cargogroupset in :onafterAssetDead
2023-09-20 21:52:28 +02:00
Applevangelist d2107466cc Merge remote-tracking branch 'origin/develop' into develop 2023-09-20 17:17:43 +02:00
Applevangelist 3975e1961e Merge remote-tracking branch 'origin/master' into develop 2023-09-20 17:17:40 +02:00
Applevangelist f71039e840 #ATIS
* Added Spanish TTS locale ("es"
2023-09-20 17:16:52 +02:00
Frank 78ffaf6e0a Update OpsGroup.lua
- Fix that loading is never done
2023-09-20 14:38:24 +02:00
Applevangelist 01bd921d30 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 18:09:00 +02:00
Applevangelist ad079cc416 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 18:08:56 +02:00
Applevangelist 7c3c39c1ba Merge remote-tracking branch 'origin/master' into develop 2023-09-19 18:08:16 +02:00
Applevangelist 1e966ee217 #ATIS
* Added SRS localization
2023-09-19 18:06:48 +02:00
Applevangelist 523c36100a Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 12:15:01 +02:00
Applevangelist fa4e3ebc7e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2023-09-19 12:14:54 +02:00
Applevangelist 147f39981b Merge remote-tracking branch 'origin/master' into develop 2023-09-19 12:14:19 +02:00
Applevangelist 3cc6f53374 Serialize 2023-09-19 12:10:04 +02:00
Applevangelist 80fdbc4960 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:31:18 +02:00
Applevangelist 03e1b28c97 Typo 2023-09-19 11:30:27 +02:00
Applevangelist 2a761ff8d0 Merge remote-tracking branch 'origin/develop' into develop 2023-09-19 11:11:18 +02:00
Applevangelist ed6a388a8e Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:11:14 +02:00
Applevangelist fc9ddae9b2 Merge remote-tracking branch 'origin/master' into develop 2023-09-19 11:10:33 +02:00
Applevangelist 75529958f6 #SEAD
* Better calculation of switch-on again time
2023-09-19 11:09:55 +02:00
Applevangelist 2e7cbe989a Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 17:17:13 +02:00
Applevangelist b0db51fa5a Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:17:03 +02:00
Applevangelist d0330cc696 Merge remote-tracking branch 'origin/master' into develop 2023-09-17 17:16:30 +02:00
Applevangelist 5886d154ae #SPAWN
* Added option for Modex pre- and postfix
2023-09-17 17:13:51 +02:00
Applevangelist f6fcf41c70 Merge remote-tracking branch 'origin/develop' into develop 2023-09-17 16:54:02 +02:00
Applevangelist a22ad88bda Merge remote-tracking branch 'origin/master' into develop 2023-09-17 16:53:58 +02:00
Applevangelist c173fe0cb8 Quick check on airbase being a string 2023-09-17 16:52:45 +02:00
Frank dca70eaa05 Merge branch 'master' into develop 2023-09-17 16:13:50 +02:00
Applevangelist 7b027c0802 Merge remote-tracking branch 'origin/develop' into develop 2023-09-15 09:13:05 +02:00
Applevangelist df05290180 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Enums.lua
2023-09-15 09:13:01 +02:00
Applevangelist 5048201771 #Startup
* Re-instate suppression of error box.
2023-09-15 09:12:17 +02:00
Applevangelist dd41cd4b4f #Startup
* Re-instate suppression of error box.
2023-09-15 09:11:20 +02:00
Applevangelist c4e3e4420c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2023-09-14 16:34:24 +02:00
Applevangelist 5e36425058 #PLAYERTASKCONTROLLER
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
2023-09-14 12:36:51 +02:00
Applevangelist 97809cdb65 #PLAYERTASKCONTROLLER
* Fix a problem that sometimes the object event is called prior to the SET_CLIENT event for players joining, leading to false negatives on specifically filtered SET_CLIENT objects
2023-09-14 12:35:43 +02:00
Applevangelist 4e44d979a1 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 16:05:02 +02:00
Applevangelist 0e0d22e7ce Merge remote-tracking branch 'origin/master' into develop 2023-09-13 16:04:57 +02:00
Applevangelist 3f1ad24f6a Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Functional/MissileTrainer.lua
2023-09-13 16:04:23 +02:00
Applevangelist 674fef554d Intellisense docu fixes 2023-09-13 16:03:32 +02:00
Applevangelist 74f87b3f2d Intellisense 2023-09-13 16:02:38 +02:00
Applevangelist 0e3d4205c9 Merge remote-tracking branch 'origin/develop' into develop 2023-09-13 15:31:55 +02:00
Applevangelist fc44894bc0 Merge remote-tracking branch 'origin/master' into develop 2023-09-13 15:31:50 +02:00
Applevangelist cf34e7f165 docu 2023-09-13 15:31:07 +02:00
Frank 3e2d312202 Merge branch 'master' into develop 2023-09-13 11:11:43 +02:00
Frank 6ccfd499c8 Update SRS.lua
- Fixed bug in GRPC backend
2023-09-10 22:42:39 +02:00
Frank 468a8fed8b Merge branch 'master' into develop 2023-09-10 22:40:17 +02:00
Applevangelist ae7f27ed6f Cleanup 2023-09-10 15:58:35 +02:00
Applevangelist 3bbfaad77b Cleanup 2023-09-10 15:46:32 +02:00
Applevangelist 1282b03547 Merge remote-tracking branch 'origin/develop' into develop 2023-09-10 15:43:21 +02:00
Applevangelist 70a44217f5 Merge remote-tracking branch 'origin/master' into develop 2023-09-10 15:43:15 +02:00
Applevangelist ef3127fdab Merge remote-tracking branch 'origin/master' into develop 2023-09-10 15:42:48 +02:00
Applevangelist 88741d943e docu 2023-09-10 15:41:16 +02:00
Applevangelist 52764cc900 #AICSAR
* changes from OPSTRANSPORT
2023-09-09 13:09:46 +02:00
Applevangelist ab1e3e6c60 #AICSAR
* Force LoadingDone, UnloadingDone since changes in OPSTRANSPORT
2023-09-09 13:09:20 +02:00
Applevangelist 50b7fb0d5d Merge branch 'master' into develop 2023-09-09 12:29:32 +02:00
Applevangelist 0a812d8283 Merge branch 'develop-2' into develop
# Conflicts:
#	Moose Development/Moose/Modules_local.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Wrapper/Group.lua
2023-09-09 12:29:26 +02:00
Thomas 515764bb88 Update Group.lua
Docu fix
2023-09-09 11:56:28 +02:00
Applevangelist 917f06fe04 Revert "Auxiliary commit to revert individual files from e5e81dbc35d61a32f5f6308b275eef278c970f2c"
This reverts commit 4f771489b473634ca3c758a02fd090e0cd26a964, reversing
changes made to c5f3bfe4a9.
2023-09-08 11:21:25 +02:00
Applevangelist e5e81dbc35 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2023-09-08 11:20:11 +02:00
Applevangelist 2afde85ef0 #Remove routines 2023-09-07 18:39:07 +02:00
Applevangelist 568f76b0b2 #UTILS
* Remove utils.routines
2023-09-07 18:01:16 +02:00
Applevangelist 58f60dbf1b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-09-07 16:17:44 +02:00
Applevangelist 559c8d763b Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:16:19 +02:00
Applevangelist c5f3bfe4a9 Merge remote-tracking branch 'origin/master' into develop 2023-09-07 16:15:08 +02:00
Applevangelist 5329745325 Merge remote-tracking branch 'origin/develop' into develop 2023-09-07 12:45:30 +02:00
Applevangelist 792222f567 #PLAYERTASK, #CLIENTMENU
* Fixes
2023-09-07 12:45:26 +02:00
Applevangelist e6a7416acf #PLAYERTASK 2023-09-07 12:43:23 +02:00
Frank a8f14fca70 Merge branch 'master' into develop 2023-09-06 21:33:29 +02:00
Frank 02105b1efc Update Airboss.lua
Fixed bug missing end in if statement
2023-09-05 20:53:02 +02:00
Applevangelist 93fd9e5d42 #CLIENTMENU
* Catch error on Menu removes
2023-09-05 10:35:12 +02:00
Applevangelist f43924fbb0 #CLIENTMENU 2023-09-05 10:34:07 +02:00
Applevangelist da77741dab Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-09-01 09:49:13 +02:00
Applevangelist d367f85f06 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 09:47:30 +02:00
Applevangelist 65c384622c #AIRBOSS
* Suppress unnecessary SRS TTS calls with empty text
2023-09-01 09:46:52 +02:00
Applevangelist d9c656f6d2 #Airboss 2023-09-01 09:42:24 +02:00
Applevangelist 379dd44c04 Merge remote-tracking branch 'origin/develop' into develop 2023-09-01 08:53:28 +02:00
Applevangelist d9a11588b7 Merge remote-tracking branch 'origin/master' into develop 2023-09-01 08:53:22 +02:00
Applevangelist d7b87b63d8 #MANTIS
* Added zone filter option.
2023-09-01 08:52:46 +02:00
Applevangelist cb6dd0d6c7 #MANTIS 2023-09-01 08:51:51 +02:00
Applevangelist ab2e8efad5 Merge remote-tracking branch 'origin/develop' into develop 2023-08-31 15:12:41 +02:00
Applevangelist 0f5ea8516b Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Mantis.lua
2023-08-31 15:12:00 +02:00
Frank b5b079d75f Merge pull request #2001 from ttrebuchon/tt/auftrag-newcap-nil-ref-bugfix
Fix error in AUFTRAG:NewCAP when Altitude is not explicitly provided
2023-08-31 14:57:31 +02:00
ttrebuchon d0421f5226 Ensure Altitude is not nil in NewCAP to avoid breaking KnotsToAltKIAS. 2023-08-31 08:48:08 -04:00
Applevangelist 7769ca8c3f #MANTIS
* Add zone filter option
2023-08-31 11:59:03 +02:00
Applevangelist 2940eaed63 #AIRBOSS 2023-08-31 11:53:13 +02:00
Applevangelist 79ddc01bf7 Merge remote-tracking branch 'origin/master' into develop 2023-08-30 16:47:19 +02:00
Applevangelist 219e46793e #MANTIS
* CH assets
2023-08-30 16:46:33 +02:00
Applevangelist 0fa7897de4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-29 15:50:16 +02:00
Applevangelist fe120542f3 Merge remote-tracking branch 'origin/master' into develop 2023-08-29 15:50:11 +02:00
Applevangelist c4b874e3f9 #MANTIS
* Added two more CH mod types
2023-08-29 15:49:20 +02:00
Frank 8b04d32839 Merge pull request #2000 from FlightControl-Master/FF/Ops
Update OpsGroup.lua
2023-08-28 20:27:39 +02:00
Frank 382605d4cf Update OpsGroup.lua
- Fixed bug loading opsgroups as cargo
2023-08-28 20:23:51 +02:00
Frank 1337815f05 Merge pull request #1999 from FlightControl-Master/FF/Ops
OPSTRANSPORT
2023-08-27 18:46:50 +02:00
Frank 1cd3b6a26b OPSTRANSPORT
- Docs
2023-08-27 15:13:07 +02:00
Frank f34dcdb3db OPSGROUP
- Added parameter to selfdestruct single element
2023-08-27 12:03:26 +02:00
Frank e3b7a85956 OPSTRANSPORT
- Improved storage transport
2023-08-26 23:55:21 +02:00
Applevangelist 1644db1503 Merge remote-tracking branch 'origin/develop' into develop 2023-08-26 16:09:17 +02:00
Applevangelist eb67e938f8 Merge remote-tracking branch 'origin/master' into develop 2023-08-26 16:09:10 +02:00
Applevangelist 30cadf0d42 test 2023-08-26 16:08:45 +02:00
Frank 655282a034 Merge branch 'develop' into FF/Ops 2023-08-26 14:06:15 +02:00
Frank 94dde73561 Merge branch 'master' into develop 2023-08-26 14:05:51 +02:00
Frank 45008c9d57 Update OpsGroup.lua 2023-08-26 10:26:11 +02:00
Frank 92b0ab3c8d Update OpsGroup.lua
- Storage transport
2023-08-25 22:15:50 +02:00
Frank 7074b70e86 Merge branch 'develop' into FF/Ops 2023-08-25 20:46:52 +02:00
Frank e15d335f3f OPSTRANSPORT
- Storage
2023-08-25 20:46:42 +02:00
Frank 840b14f4ce OPSTRANSPORT
- Storage transport improved
2023-08-24 23:37:33 +02:00
Frank 887f7aa3e9 OPSTRANSPORT
- Storage
2023-08-23 23:37:23 +02:00
Thomas 48b6b06503 Update Set.lua Docu (#1995) (#1997)
* Update Set.lua Docu

Added regex explanation

* Update Set.lua
2023-08-23 11:46:08 +02:00
Thomas a8daf70dad Update Set.lua Docu (#1995) (#1996)
* Update Set.lua Docu

Added regex explanation

* Update Set.lua
2023-08-23 11:43:37 +02:00
Applevangelist 6edac3c145 Merge remote-tracking branch 'origin/develop' into develop 2023-08-22 12:41:27 +02:00
Applevangelist 8df796b6db Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2023-08-22 12:41:17 +02:00
Applevangelist 3e36e5f2b2 #Controllable
* Added Aerobtics tasks
2023-08-22 10:25:26 +02:00
Applevangelist fd80339431 #Controllable
* Added Aerobtics tasks
2023-08-22 10:24:19 +02:00
Frank c3f5405288 OPSTRANSPORT
Storage
2023-08-22 01:41:34 +02:00
Applevangelist 0ddf9ff807 Merge branch 'develop-2' into develop 2023-08-21 16:44:57 +02:00
Applevangelist c40f310e10 Merge branch 'master' into develop 2023-08-21 16:44:51 +02:00
Thomas 084b47edb7 ENUMS error (#1993)
* Storages Enum

* Update Enums.lua

Error in ENUM
2023-08-21 11:36:15 +02:00
Frank f84e2ede66 OPSTRANSPORT
Storage
2023-08-21 01:02:04 +02:00
Applevangelist 13f025aee1 Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 15:23:38 +02:00
Applevangelist 675b1ef962 Merge remote-tracking branch 'origin/master' into develop 2023-08-20 15:23:33 +02:00
Applevangelist 0a8782c890 Storages enum 2023-08-20 15:23:09 +02:00
Applevangelist 5fff8a60ba Storages 2023-08-20 15:22:29 +02:00
Applevangelist 36ae5a6bc2 Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 15:14:33 +02:00
Applevangelist 939160e8df Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Enums.lua
2023-08-20 15:14:29 +02:00
Applevangelist 0460cc7e3e ENUMS.Storage.weapons 2023-08-20 15:13:32 +02:00
Applevangelist 5dd32d92c0 Merge remote-tracking branch 'origin/master' into develop 2023-08-20 15:13:18 +02:00
Applevangelist d96cc26cd8 ENUMS.Storage.weapons 2023-08-20 15:12:59 +02:00
Applevangelist be5c1bed3b #PLAYERRECCE
* QoL Fixes for menu, smoke, reports etc
2023-08-20 14:18:43 +02:00
Applevangelist e0acd4fd7d Merge remote-tracking branch 'origin/develop' into develop 2023-08-20 14:18:10 +02:00
Applevangelist caf2fa4a5a Merge remote-tracking branch 'origin/master' into develop 2023-08-20 14:18:04 +02:00
Applevangelist a0e8f7f3a9 #PLAYERRECCE
* QoL Fixes for menus
2023-08-20 14:17:39 +02:00
Applevangelist 7f4baaae4d Fix for #1984 2023-08-20 13:27:46 +02:00
Applevangelist 2ee8516427 Fixes 2023-08-20 11:20:07 +02:00
Applevangelist 2eafadcedf Merge remote-tracking branch 'origin/master' into develop 2023-08-20 11:19:24 +02:00
Applevangelist 6b4c08d53f Merge remote-tracking branch 'origin/master' into develop 2023-08-18 11:08:47 +02:00
Applevangelist 4c2f71e818 Merge remote-tracking branch 'origin/develop' into develop 2023-08-18 11:08:20 +02:00
Applevangelist d4942ab8f8 Merge remote-tracking branch 'origin/master' into develop 2023-08-18 11:08:14 +02:00
Applevangelist 53712b8e40 POS 2023-08-18 11:05:48 +02:00
ttrebuchon 83bae9c2f7 Make default cargo bay capacity values configurable (#1989)
* Add POSITIONABLE.CargoBayCapacityValues for manual configuration of cargo capacities.

* Add comment documenting local variable

* Remove extraneous semicolon

* Update Positionable.lua

Updated a bit plus documentation and working enumerator

---------

Co-authored-by: Thomas <72444570+Applevangelist@users.noreply.github.com>
2023-08-18 11:01:38 +02:00
Applevangelist 4e4bd000d4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-18 08:49:56 +02:00
Applevangelist b873b7993e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
2023-08-18 08:49:50 +02:00
Frank 944ef6332b Merge branch 'develop' into FF/Ops 2023-08-17 19:14:23 +02:00
Frank 1329cd23fd Merge branch 'master' into develop 2023-08-17 19:13:47 +02:00
Frank dbd78f35a4 Merge pull request #1987 from ttrebuchon/tt/misc-bug-fixes
Misc Bug Fixes
2023-08-13 22:57:06 +02:00
ttrebuchon a2772c97d5 Merge branch 'develop' into tt/misc-bug-fixes 2023-08-13 15:34:40 -04:00
ttrebuchon 4f8e65b515 Merge branch 'tt/warehouse-asset-size-fix' into tt/misc-bug-fixes 2023-08-13 15:27:29 -04:00
ttrebuchon 1d6437f9e2 Merge branch 'tt/commander-incorrect-argument-ordering' into tt/misc-bug-fixes 2023-08-13 15:27:25 -04:00
ttrebuchon a733b17840 Merge branch 'tt/auftrag-UpdateMarker-null-ref-check' into tt/misc-bug-fixes 2023-08-13 15:27:16 -04:00
ttrebuchon 3adf6d635a Handle OPSGROUP:MarkWaypoints() when waypoint altitude is nil 2023-08-13 15:22:05 -04:00
ttrebuchon 2e9320df03 Add check for whether targetcoord is nil in UpdateMarker() call 2023-08-13 15:18:09 -04:00
ttrebuchon d08219f9d9 Add missing "Mission.escortMissionType" argument to call to AssignAssetsForEscort 2023-08-13 15:16:46 -04:00
ttrebuchon f929951dbe Fix WAREHOUSE.AssetItem size calculation 2023-08-13 15:12:51 -04:00
Frank 76a36cb9f9 Merge branch 'develop' into FF/Ops 2023-08-13 18:20:23 +02:00
Frank 56aebfbee8 Merge branch 'master' into develop 2023-08-13 18:20:09 +02:00
Applevangelist 18296fb4b1 Merge remote-tracking branch 'origin/develop' into develop 2023-08-02 18:03:36 +02:00
Applevangelist f66f135f79 Merge remote-tracking branch 'origin/master' into develop 2023-08-02 18:03:32 +02:00
Applevangelist ffdcfa0129 Merge remote-tracking branch 'origin/master' into develop 2023-08-02 18:03:03 +02:00
Applevangelist bbae91bb6c #CONTROLLABLE
* Added EnRouteTaskCAP()
2023-08-02 18:02:22 +02:00
Applevangelist cd7d307fc4 Merge remote-tracking branch 'origin/develop' into develop 2023-08-01 16:27:33 +02:00
Applevangelist bda25fb4cf Merge remote-tracking branch 'origin/master' into develop 2023-08-01 16:27:23 +02:00
Applevangelist 5231bc8372 # 2023-08-01 16:26:51 +02:00
Applevangelist 268b7ef80c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Scenery.lua
2023-08-01 16:26:14 +02:00
Applevangelist 172004b822 Merge remote-tracking branch 'origin/master' into develop 2023-08-01 16:19:33 +02:00
Applevangelist 6aa4683080 #PLAYERTASK 2023-08-01 16:19:03 +02:00
Applevangelist f085a5423a SCENERY 2023-08-01 16:18:41 +02:00
Applevangelist 2ccb4c128a Zone 2023-08-01 16:16:20 +02:00
Applevangelist 9a9ac6f2e1 SCENERY 2023-08-01 11:38:02 +02:00
Thomas 677a64c3dc Update Scenery.lua (#1980) (#1981)
_id might be nil in :FindByZoneName()
2023-08-01 10:38:39 +02:00
phr0gz 56fcd8f37f Add RemoveGciCapZone in Chief (#1973)
This will add the ability to remove CGI CAP zone from chief.
2023-08-01 10:00:17 +02:00
Applevangelist 090de85388 joa 2023-07-31 18:03:54 +02:00
Thomas 09d4e155de Update PlayerTask.lua (#1977)
Prevent Events being available before the menu structure has been created
2023-07-31 14:24:47 +02:00
Applevangelist 9d4b5cfc0b Debugs 2023-07-29 17:20:06 +02:00
Applevangelist 65703d1092 Debugs 2023-07-29 17:19:51 +02:00
Applevangelist 2afd09b878 Merge remote-tracking branch 'origin/master' into develop 2023-07-29 16:48:08 +02:00
Applevangelist 9c7e42ed1e Merge remote-tracking branch 'origin/develop' into develop 2023-07-29 16:47:16 +02:00
Applevangelist 83aefc416a Merge remote-tracking branch 'origin/master' into develop 2023-07-29 16:47:10 +02:00
Applevangelist 4ed2b0610d #AWACS
* ensure tactical frequencies are handed back

#PlayerTask
* Add'l check for stale tasks to rebuild menu
2023-07-29 16:44:25 +02:00
Applevangelist 29947d69c3 Changes 2023-07-29 16:40:46 +02:00
Applevangelist 3b2850e042 changes 2023-07-29 16:02:42 +02:00
Applevangelist 5c2b77cf76 #Chmages 2023-07-29 15:56:28 +02:00
Applevangelist 9c95b91086 #changes 2023-07-29 15:56:20 +02:00
phr0gz cbd371b40f Chief zone removal Tanker, AWACS (#1975)
Add the ability to remove a zone for Tanker and AWACS.
2023-07-29 15:44:13 +02:00
phr0gz 80e9cb692c Add FSM OnAfter and OnBefore (#1974)
Add FSM Function OnAfter and OnBefore in FlightGroup.
2023-07-29 13:37:07 +02:00
Applevangelist 27fd726ce3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-07-26 17:45:25 +02:00
Applevangelist d58e93e2a4 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-07-26 17:43:16 +02:00
Frank 3c74aef378 Merge branch 'master' into develop 2023-07-26 17:23:34 +02:00
Frank 7e2233d8c7 Merge branch 'develop' into FF/Ops 2023-07-26 16:11:27 +02:00
Thomas 065717b2f5 Update FlightGroup.lua
coord might be nil in GetParking(airbase)
2023-07-26 15:36:09 +02:00
Applevangelist 9a695ef5bf #AWACS 2023-07-26 07:49:52 +02:00
Applevangelist 63a524f25c #AWACS
* Remove tactical subscription when client logs out or dies
2023-07-26 07:49:35 +02:00
Applevangelist 838e11de05 #AWACS
* Added tactical radio option
2023-07-25 14:50:29 +02:00
Applevangelist b9828f3cd1 #AWACS
* Tactical Radioi Option added
2023-07-25 14:49:28 +02:00
Applevangelist 53952b1636 Merge remote-tracking branch 'origin/develop' into develop 2023-07-25 12:03:06 +02:00
Applevangelist 13ac4c386a Merge remote-tracking branch 'origin/master' into develop 2023-07-25 12:03:02 +02:00
Applevangelist 6fa90c7f39 #AWACS 2023-07-25 12:02:42 +02:00
Applevangelist 6fcaccdfb1 * fixes 2023-07-25 12:02:09 +02:00
Applevangelist 2a56da4bb3 Merge remote-tracking branch 'origin/master' into develop 2023-07-25 12:01:48 +02:00
Applevangelist 070cd6e7c6 Merge remote-tracking branch 'origin/develop' into develop 2023-07-23 12:43:35 +02:00
Applevangelist 64e87a906f Merge remote-tracking branch 'origin/master' into develop 2023-07-23 12:43:31 +02:00
Applevangelist f84d02d8a1 Merge remote-tracking branch 'origin/master' into develop 2023-07-23 12:42:59 +02:00
Applevangelist 7d3a08cde2 #CLIENTMENU, #PLAYERTASK
* Fixes for "No current task" not being deleted later on
2023-07-23 12:42:36 +02:00
Applevangelist 1fbadd02f9 #Updates 2023-07-23 12:41:46 +02:00
Applevangelist 02fadaf17e #AIRBASE, #ATIS 2023-07-23 12:38:21 +02:00
Frank a7857670d3 Merge branch 'develop' into FF/Ops 2023-07-22 10:16:40 +02:00
Frank c41b256775 Update SRS.lua 2023-07-22 10:16:31 +02:00
Applevangelist c4a13f985e Merge remote-tracking branch 'origin/develop' into develop 2023-07-19 16:08:21 +02:00
Applevangelist e2929a78c4 #AICSAR - correct code version 2023-07-19 16:06:44 +02:00
Applevangelist 15bf379cdc #AICSAR
* Added FSM Event "HeloOnDuty"
2023-07-19 09:56:27 +02:00
Applevangelist 7367e15121 #AICSAR
* Added FSM Event "HeloOnDuty"
2023-07-19 09:56:09 +02:00
Applevangelist 07cdc36181 Merge remote-tracking branch 'origin/develop' into develop 2023-07-17 16:28:35 +02:00
Applevangelist 69fc2dca42 Merge remote-tracking branch 'origin/master' into develop 2023-07-17 16:28:29 +02:00
Applevangelist 8a8e40e810 #PLAYERTASK
* Refactored menubuilds to use new CLIENTMENU/CLIENTMENUCONTROLLER classes
2023-07-17 16:27:54 +02:00
Applevangelist 2c8adf58cb #CLIENTMENU
* Rewrite with a different data approach
2023-07-17 16:26:53 +02:00
Applevangelist e8432db26e #ClientMenu 2023-07-17 16:26:06 +02:00
Applevangelist bb579fff5b Merge remote-tracking branch 'origin/master' into develop 2023-07-16 11:28:24 +02:00
Applevangelist e8ad649770 #PT 2023-07-16 11:26:47 +02:00
Applevangelist 63770fdf79 Merge remote-tracking branch 'origin/develop' into develop 2023-07-15 18:02:45 +02:00
Applevangelist b48d713fda Merge remote-tracking branch 'origin/master' into develop 2023-07-15 18:02:39 +02:00
Applevangelist 77955bc03c #changes 2023-07-15 18:02:12 +02:00
Thomas 1ad538ea9f Commits from master (#1972)
* #SPAWN

* Update Spot.lua

Fix
2023-07-15 09:46:55 +02:00
Applevangelist 99b41c6715 Merge remote-tracking branch 'origin/develop' into develop 2023-07-13 16:15:33 +02:00
Applevangelist 62e6eb91fc Merge remote-tracking branch 'origin/master' into develop 2023-07-13 16:15:28 +02:00
Applevangelist 191f7a7377 Merge remote-tracking branch 'origin/master' into develop 2023-07-13 16:13:26 +02:00
Applevangelist eba9c697e3 #SPAWN 2023-07-13 16:06:23 +02:00
Applevangelist 643ba17d80 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Core/ClientMenu.lua
#	Moose Setup/Moose.files
2023-07-13 16:06:14 +02:00
Applevangelist 301f49078e Merge remote-tracking branch 'origin/master' into develop 2023-07-12 17:55:50 +02:00
Applevangelist 77d2804fce Merge remote-tracking branch 'origin/master' into develop 2023-07-12 17:55:07 +02:00
Applevangelist 6c5cf814b4 #Spot 2023-07-12 17:54:35 +02:00
Applevangelist 63ba50a83a #CLIENTMENUMANAGER Docu 2023-07-11 16:10:40 +02:00
Applevangelist 45adc6160d #CLIENTMENUMANAGER Docu 2023-07-11 16:10:08 +02:00
Applevangelist 0326bee7a3 # 2023-07-11 15:42:14 +02:00
Applevangelist fb8f804af2 # CLIENTMENU
* Initial release
2023-07-11 15:41:06 +02:00
Applevangelist ee7fca09b6 Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:16:10 +02:00
Applevangelist fd1257052b # 2023-07-07 15:15:28 +02:00
Applevangelist ffbab7453c Merge remote-tracking branch 'origin/master' into develop 2023-07-07 15:15:09 +02:00
Applevangelist 102a48bf97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
2023-07-03 17:30:50 +02:00
Applevangelist 2537fc44bb Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:29:36 +02:00
Applevangelist 10872918bb #AUFTRAG
* Added GROUNDESCORT from the DCS Task with same name
2023-07-03 17:29:06 +02:00
Applevangelist 7dd270dc8b #GROUND ESCORT 2023-07-03 17:26:47 +02:00
Applevangelist 8979097fd7 Merge remote-tracking branch 'origin/master' into develop 2023-07-03 17:06:47 +02:00
Applevangelist 71b2cc1ee5 #AMMOTRUCK
* Added TTL
2023-07-03 17:06:31 +02:00
Applevangelist be3fc2c964 #GROUNDESCORT 2023-07-03 17:05:54 +02:00
Applevangelist 0d6fe49a41 changes 2023-07-03 16:45:02 +02:00
Thomas ffcfc448be Update Controllable.lua 2023-07-03 13:53:59 +02:00
Thomas 303a15eb50 Ammotruck
* Added feature for # of re-munitions a truck can do
2023-07-03 12:21:05 +02:00
Applevangelist ebf3d8d55e Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:17:58 +02:00
Applevangelist 3909a4b2dc Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:51 +02:00
Applevangelist 389d5c7e5b Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:17:19 +02:00
Applevangelist 30f8a57556 Merge remote-tracking branch 'origin/develop' into develop 2023-07-01 13:15:31 +02:00
Applevangelist 03a18d5237 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Utilities/Utils.lua
2023-07-01 13:15:24 +02:00
Applevangelist 178005346d Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:54 +02:00
Applevangelist 041c21a883 Merge remote-tracking branch 'origin/master' into develop 2023-07-01 13:12:03 +02:00
Applevangelist fd946e971a #AWACS
* Bugfixes
2023-07-01 13:08:27 +02:00
Applevangelist b3e9a2b64d #fixes 2023-07-01 13:08:00 +02:00
Applevangelist 23740d12eb Merge remote-tracking branch 'origin/develop' into develop 2023-06-26 17:29:40 +02:00
Applevangelist 52138eee98 Merge remote-tracking branch 'origin/master' into develop 2023-06-26 17:29:34 +02:00
Applevangelist c7a66e0f99 #Fixes 2023-06-26 17:29:02 +02:00
Thomas 0dab316514 Point - BRAANATO (#1969) (#1970)
corrected Track to be direction of travel of bogey (self in this case)
2023-06-26 13:29:34 +02:00
Applevangelist 248228720e Merge remote-tracking branch 'origin/master' into develop 2023-06-24 14:04:32 +02:00
Applevangelist e9c1b6d268 Merge remote-tracking branch 'origin/master' into develop 2023-06-22 13:52:19 +02:00
Thomas 08be2d6e93 CTLD (#1967) (#1968)
* Added option for troops subcategories in menu
2023-06-22 13:49:21 +02:00
Applevangelist a2d3205701 #CTLD
* Added option for troops subcategories
2023-06-22 13:41:58 +02:00
Applevangelist e8ab86ab7f #CTLD
* Added categories for Troops
2023-06-22 12:57:08 +02:00
Applevangelist abf694aa81 # Docu fixes 2023-06-22 12:19:20 +02:00
Applevangelist 24c58acf85 #AIRBOSS
* Bugfix
2023-06-22 09:34:21 +02:00
Applevangelist ac386d5ebe #AIRBOSS
* Bug fix
2023-06-22 09:34:02 +02:00
Frank 74c1e9d991 Merge branch 'develop' into FF/Ops 2023-06-21 22:00:14 +02:00
Frank 0e72717cdb OPSGROUP
Track
2023-06-21 22:00:04 +02:00
Applevangelist 37cbafde3e Merge remote-tracking branch 'origin/develop' into develop 2023-06-21 14:05:54 +02:00
Applevangelist 1df525b9c5 #NAVY
* Min speed 4kn due to rudder effectiveness
2023-06-21 14:05:17 +02:00
Applevangelist cdbbad809a Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:40 +02:00
Applevangelist 8af5a532e3 Merge remote-tracking branch 'origin/master' into develop 2023-06-21 10:43:08 +02:00
Applevangelist a5fa33e72f Merge remote-tracking branch 'origin/develop' into develop 2023-06-21 10:25:52 +02:00
Applevangelist 925ac7907b #AIRBOSS SRS 2023-06-21 10:25:30 +02:00
Applevangelist 970275e96e #AIRBOSS
* Added adjustment degrees for wind speed
2023-06-21 10:25:00 +02:00
Applevangelist c88bb3bbdb #PLAYERTASKCONTROLLER
* Menu build lock
2023-06-18 13:29:25 +02:00
Applevangelist 5456cd04c3 #PLAYERTASKCONTROLLER
* Menu build lock
2023-06-18 13:29:07 +02:00
Applevangelist d005064c28 #PLAYERTASK
* Menu build finetuning
2023-06-18 13:12:35 +02:00
Applevangelist f8963b33a3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
2023-06-18 12:21:40 +02:00
Applevangelist 1cdbe55cdd Merge remote-tracking branch 'origin/develop' into develop 2023-06-18 12:19:37 +02:00
Applevangelist 0577e5171b #AIRBOSS
* SRS: Remove lines starting with # from being spelled out
2023-06-18 12:19:28 +02:00
Applevangelist 09f0c9e069 #AIRBOSS 2023-06-18 12:18:09 +02:00
Frank 97376320f4 Merge pull request #1965 from ttrebuchon/tt/ops-auftrag-transport-attributes-and-properties
AUFTRAG Transport Attributes, Categories, and Properties Filters
2023-06-18 01:08:10 +02:00
ttrebuchon 9c1acc731a Make Attributes parameter documentation conform to other similar descriptions 2023-06-17 17:32:49 -04:00
ttrebuchon 92f81614ba Update/fix lua docs for new AUFTRAG transport fields 2023-06-17 17:09:50 -04:00
ttrebuchon 2a11c4c98a Rename AUFTRAG.transportCategories/etc to carrierCategories/etc 2023-06-17 17:07:56 -04:00
ttrebuchon e284773492 Move transport categories/etc to SetRequiredCarriers, to allow for specifying them without always needing to specify zones 2023-06-17 17:06:16 -04:00
ttrebuchon b3d46618c2 Missed 2 spots in Legion/Commander for transport filters. 2023-06-17 16:56:46 -04:00
ttrebuchon 4e36e2011f Add categories/attributes/properties filters for AUFTRAG transports 2023-06-17 15:35:11 -04:00
Applevangelist 0d40b36613 #AIRBOSS
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
2023-06-17 15:01:57 +02:00
Applevangelist a3876c296e #AIRBOSS
* Added option to set Airboss voice for SRS etc
* Nicer read out of weather info and carrier info
2023-06-17 15:01:33 +02:00
Applevangelist c80213b4cf #AIRBOSS
* Initial SRS addition
2023-06-16 18:18:18 +02:00
Applevangelist ef17399128 #AIRBOSS SRS 2023-06-16 18:10:07 +02:00
Applevangelist bfe7bf1af5 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
2023-06-16 11:11:37 +02:00
Applevangelist cca8c31ff4 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
2023-06-16 11:08:54 +02:00
Applevangelist fde398e80b Merge remote-tracking branch 'origin/master' into develop 2023-06-16 11:07:40 +02:00
Frank f28d92e865 Merge pull request #1963 from FlightControl-Master/FF/Ops
OPS
2023-06-15 19:15:34 +02:00
Frank bffb3e7778 OPS
UNIT and POSITIONABLE
- Removed pcall for GetVec3 and GetAmmo

CHIEF
- Deploy resources if zone is empty and owned by itself
2023-06-15 19:12:26 +02:00
Applevangelist fd2e9fbafc Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:52:40 +02:00
Applevangelist 15e93cc60d Merge remote-tracking branch 'origin/master' into develop 2023-06-15 14:52:36 +02:00
Applevangelist d4c2de9dd1 Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:52:09 +02:00
Applevangelist ab5425bd83 Merge remote-tracking branch 'origin/master' into develop 2023-06-15 14:52:02 +02:00
Applevangelist b2c95e37ae Merge remote-tracking branch 'origin/develop' into develop 2023-06-15 14:50:30 +02:00
Applevangelist aec3eee3a5 #NET
* Slight improvements
2023-06-15 14:50:11 +02:00
Frank eec7e5f8d9 Merge branch 'develop' into FF/Ops 2023-06-15 01:25:10 +02:00
Frank a9b51cca93 Update Auftrag.lua 2023-06-15 01:24:59 +02:00
Frank 14ddba69b0 Merge pull request #1962 from ttrebuchon/tt/ops-chief-RecruitAssetsForZone-nmin-nmax-typo-fix
Fix typo (Nmax -> Nmin) in CHIEF:RecruitAssetsForZone
2023-06-15 00:39:45 +02:00
ttrebuchon a7806deb76 Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. 2023-06-14 12:41:05 -04:00
Applevangelist 1da1b9d2cb Merge remote-tracking branch 'origin/develop' into develop 2023-06-14 17:42:23 +02:00
Applevangelist 978c953e0d Merge remote-tracking branch 'origin/master' into develop 2023-06-14 17:41:43 +02:00
Applevangelist 0cf35b664f Merge remote-tracking branch 'origin/master' into develop 2023-06-14 17:41:13 +02:00
Applevangelist 27011f3ce6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-14 17:25:33 +02:00
Applevangelist cd5ac59c40 Merge remote-tracking branch 'origin/master' into develop 2023-06-14 17:25:28 +02:00
Frank c3ffffbb52 Merge branch 'master' into develop 2023-06-13 21:53:29 +02:00
Frank d96a55d83c Merge pull request #1961 from ttrebuchon/tt/flightgroup-getparkingspot-ship-fix
FLIGHTGROUP:GetParkingSpot Carrier Issue Fix
2023-06-13 19:09:42 +02:00
ttrebuchon 83353d710d Use GetRelativeCoordinate in FLIGHTGROUP:GetParkingSpot 2023-06-13 13:04:24 -04:00
Frank 9a4c09d249 Merge branch 'master' into develop 2023-06-13 19:03:11 +02:00
ttrebuchon c825191556 Add POSITIONABLE:GetRelativeCoordinate 2023-06-13 12:54:38 -04:00
Applevangelist e2e2b44fb8 Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:01:46 +02:00
Applevangelist a8be273479 FIXES 2023-06-13 18:01:13 +02:00
Applevangelist 27e85e921f Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 18:00:18 +02:00
Applevangelist c120a48879 #UNIT
* Test to not return a stored DCS Object if the API doesn't think it's still there
2023-06-13 18:00:15 +02:00
Frank 4a03074571 Merge branch 'develop' of https://github.com/FlightControl-Master/MOOSE into develop 2023-06-13 16:02:00 +02:00
Frank 8855b117a8 Update OpsGroup.lua
- exists check for ammo and vec3
2023-06-13 16:01:47 +02:00
Applevangelist 2cedb5e996 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 08:40:21 +02:00
Applevangelist 9e84c6af1b Merge remote-tracking branch 'origin/develop' into develop 2023-06-13 08:35:53 +02:00
Applevangelist 84e7460a67 Merge remote-tracking branch 'origin/master' into develop 2023-06-13 08:35:48 +02:00
Applevangelist 8802709d3c Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-06-13 08:35:30 +02:00
Applevangelist 253ed62d46 Fixes 2023-06-13 08:35:27 +02:00
Frank 0af68cd780 Merge branch 'master' into develop 2023-06-12 23:01:36 +02:00
Thomas 4d247e75f2 Airbase fixes (#1958)
* Update Airbase.lua

Corrected enumerator for Ben-Gurion (Ben_Gurion)

* Update Airbase.lua (#1957)

Deleted raj al … airbases #1955
2023-06-12 06:29:24 +02:00
Thomas 6a58748cd1 Airbase (#1954)
* #UTILS
* Sinai TIme

* fix

* Update Airbase.lua

Corrected enumerator for Ben-Gurion (Ben_Gurion)

* Update Airbase.lua (#1957)

Deleted raj al … airbases #1955
2023-06-12 06:27:52 +02:00
Frank d31db1351a Merge pull request #1956 from FlightControl-Master/FF/Ops
AUFTRAG
2023-06-11 22:52:28 +02:00
Frank 0f33603ecc AUFTRAG
- Changed ingress waypoint of CASENHANCED
2023-06-11 22:45:59 +02:00
Frank 3bbd55cfc2 Merge pull request #1953 from ttrebuchon/tt/fix-opsgroup-getlifepoints-typo
Set life0 based on itself, rather than off of life
2023-06-11 00:52:13 +02:00
ttrebuchon 163273096c Set life0 based on itself, rather than off of life 2023-06-10 18:08:29 -04:00
Applevangelist 3d4eb1545e Merge remote-tracking branch 'origin/develop' into develop 2023-06-10 19:12:04 +02:00
Applevangelist 5006d01932 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2023-06-10 19:11:59 +02:00
Applevangelist ccc11623c3 #UTILS
* Sinai Time
2023-06-10 19:04:18 +02:00
Frank 6d1030925c Merge branch 'master' into develop 2023-06-10 10:08:35 +02:00
Applevangelist dd5399a41d Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 15:17:20 +02:00
Applevangelist 9da6b2a4f5 Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:17:12 +02:00
Applevangelist dabe8a58d1 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 15:16:41 +02:00
Applevangelist 16cf6693ab Merge remote-tracking branch 'origin/master' into develop 2023-06-09 15:16:38 +02:00
Applevangelist 23e71e991f #AIRBASE
* Sinai airfield enumerator
2023-06-09 15:13:20 +02:00
Applevangelist 8658804c82 Merge remote-tracking branch 'origin/develop' into develop 2023-06-09 13:25:54 +02:00
Applevangelist fd51ec6932 #FIX 2023-06-09 13:25:29 +02:00
Frank 7a16a5dda8 Merge pull request #1952 from FlightControl-Master/FF/Ops
OPS
2023-06-08 19:55:30 +02:00
Frank 1b6648996c OPSGROUP
- Improved CAPTUREZONE for FLIGHTGROUP
2023-06-08 19:51:09 +02:00
Frank f45a22fe78 Merge branch 'develop' into FF/Ops 2023-06-08 15:52:25 +02:00
Applevangelist 77c4eb0d54 Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:59:05 +02:00
Applevangelist 238640ec91 Merge remote-tracking branch 'origin/master' into develop 2023-06-08 13:58:58 +02:00
Applevangelist 4314959cbb Merge remote-tracking branch 'origin/develop' into develop 2023-06-08 13:57:03 +02:00
Applevangelist fad85ef7ed #PLAYERTASK
* Added basic scoring
2023-06-08 13:56:59 +02:00
Applevangelist 0a0a4684f8 #PLAYERTASKCONTROLLER
* Added basic scoring
2023-06-08 13:55:52 +02:00
Frank 569b3df6af Merge branch 'master' into develop 2023-06-08 09:46:24 +02:00
Applevangelist 910da86caf Merge remote-tracking branch 'origin/develop' into develop 2023-06-07 17:25:49 +02:00
ttrebuchon 73ff2c576d Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) 2023-06-07 17:26:20 +02:00
Applevangelist d5ffb48548 #PLAYERTASK
* Fix for one tts output
2023-06-07 17:25:45 +02:00
Frank 8ce371f898 WAREHOUSE
- Runway destroyed event only triggered if it was operational
2023-06-07 09:03:01 +02:00
Applevangelist a12f874e34 Merge remote-tracking branch 'origin/develop' into develop 2023-06-06 16:29:22 +02:00
Thomas 6f02f23240 PlayerTask.lua (#1948)
Small fix for one tts text
2023-06-06 16:20:16 +02:00
Applevangelist 00f89f0855 PLAYERTASK
* Small fix in TTS text
2023-06-06 16:13:23 +02:00
ttrebuchon 0a1d469c68 Fix Offset values being saved to the ZONE_UNIT class itself (#1947) 2023-06-03 20:15:33 +02:00
Applevangelist 4cc14b93b6 Merge remote-tracking branch 'origin/develop' into develop 2023-06-03 12:35:59 +02:00
Applevangelist f5aa294c70 Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:54 +02:00
Applevangelist 823f8fb4fb Merge remote-tracking branch 'origin/master' into develop 2023-06-03 12:35:05 +02:00
Applevangelist bb17e8cc1f #CTLD
* Ensure new menus can be build if player changes helos
2023-06-03 12:34:09 +02:00
Applevangelist 69f2acae72 Merge remote-tracking branch 'origin/develop' into develop 2023-06-02 08:46:56 +02:00
Applevangelist 00ecbc98ba Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
2023-06-02 08:46:48 +02:00
Applevangelist f7e64bc9b5 #UNIT #CTLD
* Stabilize that sometimes a unit coordinate cannot be found
2023-06-02 08:45:35 +02:00
Applevangelist 065c59f167 #UNIT #CTLD
* Stabilize that sometimes a unit coordinate cannot be found
2023-06-02 08:44:43 +02:00
Applevangelist 261f79851c Merge remote-tracking branch 'origin/master' into develop 2023-06-01 10:03:34 +02:00
Applevangelist 878169f51c Fixes 2023-06-01 10:00:31 +02:00
Applevangelist d9ee3a2323 Merge remote-tracking branch 'origin/develop' into develop 2023-05-30 12:06:46 +02:00
Applevangelist 6773ac7841 #PLAYERTASK
* Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER

#PLAYERTASKCONTROLLER
* Added FSM event"TaskProgess" (see above). The event function will recveive the PLAYERTASK and the current target count
* Changed the menu build strategy to ensure a lot less menu rebuilds. Menus are now only build if
	* A new player joins (for the joining single player)
	* On joining a task (for the joining single player)
	* When aborting a task (for the aborting single player)
	* On Task succes (for all players)
	* Removal of time based builds: The status loop will now only enforce the menu build if the task count in the queue is smaller than the menu item limit. This effectively enforces a time-based order of tasks, and newer, even higher prio task will not bubble into the task list of pilots automatically.
2023-05-30 12:06:03 +02:00
Applevangelist 5afad6e313 #PLAYERTASK
* Added FSM event "Progress" that will be triggered if the targetcount goes down for a task, but is not yet zero. This will bubble up to PLAYERTASKCONTROLLER

#PLAYERTASKCONTROLLER
* Added FSM event"TaskProgess" (see above). The event function will recveive the PLAYERTASK and the current target count
* Changed the menu build strategy to ensure a lot less menu rebuilds. Menus are now only build if
	* A new player joins (for the joining single player)
	* On joining a task (for the joining single player)
	* When aborting a task (for the aborting single player)
	* On Task succes (for all players)
	* Removal of time based builds: The status loop will now only enforce the menu build if the task count in the queue is smaller than the menu item limit. This effectively enforces a time-based order of tasks, and newer, even higher prio task will not bubble into the task list of pilots automatically.
2023-05-30 12:05:51 +02:00
Applevangelist 631d82216e SET 2023-05-30 11:53:15 +02:00
Applevangelist 0b7148f675 Merge remote-tracking branch 'origin/develop' into develop 2023-05-30 07:40:41 +02:00
Applevangelist b03f03bf06 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CSAR.lua
2023-05-30 07:40:32 +02:00
Applevangelist 39f29b066b Merge remote-tracking branch 'origin/master' into develop 2023-05-30 07:38:48 +02:00
Applevangelist cf39f494f8 #CSAR
* Corrected flare distance to kms
2023-05-30 07:38:05 +02:00
Applevangelist ca9a5187f6 Merge remote-tracking branch 'origin/develop' into develop 2023-05-28 15:29:40 +02:00
Applevangelist f8201ffed7 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:29:30 +02:00
Applevangelist b70780162b #SPAWN
* Logic fix for the last parameter of `NewFromTemplate()`
2023-05-28 15:29:01 +02:00
Applevangelist 246879c003 Merge remote-tracking branch 'origin/master' into develop 2023-05-28 15:28:37 +02:00
Applevangelist da312cd5ac Merge remote-tracking branch 'origin/develop' into develop 2023-05-27 16:31:12 +02:00
Frank 709621967d Merge pull request #1945 from FlightControl-Master/FF/Ops
OPSTRANSPORT
2023-05-27 14:38:30 +02:00
Frank 0c376aec63 OPSTRANSPORT
Fixed loaded not correctly checked in OPSGROUP
2023-05-27 14:28:53 +02:00
Frank 725efc3e70 Merge pull request #1944 from FlightControl-Master/FF/Ops
AUFTRAG
2023-05-26 11:42:26 +02:00
Frank 81abe422de Merge branch 'develop' into FF/Ops 2023-05-26 11:38:26 +02:00
Frank fb202012da AUFTRAG
Reinforcing
- improved check if reinforcing is still ongoing
- improved handling by commander/chief
- added check that assets are not added to a mission twice
2023-05-26 11:37:19 +02:00
Applevangelist 5938e1426e Merge remote-tracking branch 'origin/develop' into develop 2023-05-26 08:29:28 +02:00
Applevangelist f695639839 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 08:29:22 +02:00
Applevangelist 89223ae142 Merge remote-tracking branch 'origin/master' into develop 2023-05-26 08:28:45 +02:00
Applevangelist 016fbe0a10 Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 09:00:44 +02:00
Applevangelist dd496d35a8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2023-05-25 09:00:33 +02:00
Applevangelist 158ffde780 #CONTROLLER
* Fix for Link4
2023-05-25 08:58:21 +02:00
Applevangelist 2967de8f6e #CONTROLLER
* Fix for Link4
2023-05-25 08:57:54 +02:00
Applevangelist 402674470f Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:26:23 +02:00
Applevangelist 31174ae97c Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:26:06 +02:00
Applevangelist 9c5260f801 Merge remote-tracking branch 'origin/develop' into develop 2023-05-25 08:24:35 +02:00
Applevangelist 4d9ce80c98 Merge remote-tracking branch 'origin/master' into develop 2023-05-25 08:24:16 +02:00
Applevangelist 4c7239c5ec Bugfixes 2023-05-25 08:22:51 +02:00
Frank ee055531b6 Merge branch 'master' into develop 2023-05-24 11:16:36 +02:00
Frank c9b90e884d Merge pull request #1943 from FlightControl-Master/FF/Ops
OPS
2023-05-23 01:46:51 +02:00
Frank 21db80afad Merge branch 'develop' into FF/Ops 2023-05-23 01:29:04 +02:00
Frank d9d5458450 OPS
**AUFTRAG**
- New type `FAC`

**OPSZONE**
- Improved drawzone on capture
2023-05-23 01:28:52 +02:00
Applevangelist 93a63cc868 Merge remote-tracking branch 'origin/develop' into develop 2023-05-22 17:58:28 +02:00
Applevangelist b5aa3dd869 Merge remote-tracking branch 'origin/master' into develop 2023-05-22 17:58:21 +02:00
Applevangelist 0575b366dd #SPAWN
* Tweaked NewFromTemplate, and gave a better example
2023-05-22 17:57:50 +02:00
Applevangelist a69e62a66b #SPAWN
* Tweaked NewFromTemplate, and gave a better example
2023-05-22 17:56:53 +02:00
Applevangelist 7c3fa4ebc2 Merge remote-tracking branch 'origin/develop' into develop 2023-05-20 12:14:23 +02:00
Applevangelist 668162845c Merge remote-tracking branch 'origin/master' into develop 2023-05-20 12:14:16 +02:00
Applevangelist 034b2444ff Merge remote-tracking branch 'origin/master' into develop 2023-05-20 12:13:35 +02:00
Applevangelist c6051f30d0 Small fix 2023-05-20 12:12:00 +02:00
Applevangelist 7901d53d54 #POINT
* Added FindClosestStatic()
2023-05-19 17:13:17 +02:00
Applevangelist f78354eedb Merge remote-tracking branch 'origin/develop' into develop 2023-05-19 17:12:45 +02:00
Applevangelist d83079ecb8 Merge remote-tracking branch 'origin/master' into develop 2023-05-19 17:12:34 +02:00
Applevangelist f1b030f3d5 #Added findcloseststatic 2023-05-19 17:11:26 +02:00
Applevangelist 88f34e5bb0 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:28:11 +02:00
Applevangelist 019e826515 Merge remote-tracking branch 'origin/develop' into develop 2023-05-17 10:27:43 +02:00
Applevangelist 16b9464da5 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 10:27:36 +02:00
Applevangelist a33ca69368 fixes 2023-05-17 10:26:58 +02:00
Applevangelist 49f3e3fc2f Merge remote-tracking branch 'origin/develop' into develop 2023-05-17 09:41:32 +02:00
Applevangelist cae084a352 Merge remote-tracking branch 'origin/master' into develop 2023-05-17 09:41:27 +02:00
Applevangelist c8c031d05f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2023-05-17 09:40:40 +02:00
Frank 6d07f7c48c Merge branch 'develop' into FF/Ops 2023-05-13 23:36:36 +02:00
Frank 014fea5f10 Merge branch 'master' into develop 2023-05-13 23:36:12 +02:00
Frank d07709a167 Update Auftrag.lua 2023-05-13 23:06:56 +02:00
Frank ac4db4a392 Merge branch 'develop' into FF/Ops 2023-05-13 17:57:23 +02:00
Applevangelist b30cdd073b Merge remote-tracking branch 'origin/master' into develop 2023-05-11 18:23:01 +02:00
Applevangelist c84b54a214 #CTLD
* placement of dropped crates to better align to unit length
2023-05-11 15:30:25 +02:00
Applevangelist f5fb179304 Merge remote-tracking branch 'origin/develop' into develop 2023-05-09 09:50:30 +02:00
Applevangelist f2003fa75f Merge remote-tracking branch 'origin/master' into develop 2023-05-09 09:50:23 +02:00
Applevangelist a12e93c7cb Merge remote-tracking branch 'origin/master' into develop 2023-05-09 09:49:47 +02:00
Applevangelist bd01946f88 #AI_A2X...
* Fixes
2023-05-09 09:49:13 +02:00
Applevangelist bda0736527 #AI_A2X...
* Fixes
2023-05-09 09:48:49 +02:00
Applevangelist 8d25bdec7c Merge remote-tracking branch 'origin/master' into develop 2023-05-05 10:33:55 +02:00
Applevangelist 439856945e Merge remote-tracking branch 'origin/develop' into develop 2023-05-05 10:33:18 +02:00
Applevangelist 3a81d449da Merge remote-tracking branch 'origin/master' into develop 2023-05-05 10:33:09 +02:00
Applevangelist a29dcbb956 #COORDINATE
* Added `IsInSteepArea()`and `IsInFlatArea()`
2023-05-05 10:31:43 +02:00
Applevangelist 8da228c9a2 #COORDINATE
* Added `IsInSteepArea()`and `IsInFlatArea()`
2023-05-05 10:31:00 +02:00
Applevangelist 74abcce956 Merge remote-tracking branch 'origin/develop' into develop 2023-04-27 10:34:21 +02:00
Applevangelist 2032c2cfbf # AUFTRAG
* Bring options for afterburner usage down to AUFTRAG level

# OpsGroup (Flightgroup)
* Follow setting option for AB usage from mission, if set, generally and for execution phase of the AUFTRAG
2023-04-27 10:34:17 +02:00
Applevangelist 265fb4a8e8 #AUFTRAG
* Bring options for afterburner usage down to AUFTRAG level

#OpsGroup (Flightgroup)
* Follow setting option for AB usage from mission, if set, generally and for execution phase of the AUFTRAG
2023-04-27 10:32:32 +02:00
Applevangelist a4e576e26d #AUFTRAG
* Bring options for afterburner usage down to AUFTRAG level

#OpsGroup (Flightgroup)
* Follow setting option for AB usage from mission, if set, generally and for execution phase of the AUFTRAG
2023-04-27 10:32:16 +02:00
Frank fb070a0c86 Merge branch 'develop' into FF/Ops 2023-04-25 21:54:04 +02:00
Frank 817c69bb11 Merge branch 'master' into develop 2023-04-25 21:53:39 +02:00
Applevangelist 6cd56e4de4 Merge remote-tracking branch 'origin/master' into develop 2023-04-25 09:13:27 +02:00
Applevangelist a0219e4a08 #SCENERY
* Added update of Life0 value if `GetLife()`is called
#SET_SCENERY
* Added Documentation
2023-04-25 09:12:47 +02:00
Applevangelist 19a4ec48bb Merge remote-tracking branch 'origin/master' into develop 2023-04-24 16:45:31 +02:00
Applevangelist a41ee3279e #SET_SCENERY
* Added functions to count Life0, Life and RelativeLife points of SET_SCENERY
2023-04-24 16:44:54 +02:00
Applevangelist f8f1547f27 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-04-24 16:18:34 +02:00
Applevangelist 4724ae3566 Merge remote-tracking branch 'origin/master' into develop 2023-04-24 16:16:23 +02:00
Thomas c7d990850a AIRBASE - add Normandy AFBs (#1937) (#1938)
Add Normandy AFBs
2023-04-24 11:16:45 +02:00
Applevangelist e99917b8f7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2023-04-22 17:53:47 +02:00
Frank 885d3b5228 Merge branch 'develop' into FF/Ops 2023-04-22 14:29:18 +02:00
Frank 7379b8135a Merge branch 'master' into develop 2023-04-22 14:08:05 +02:00
Applevangelist 96467d79b8 #CTLD 2023-04-20 08:22:46 +02:00
Applevangelist 549c9b9ce5 #CTLD
* Docu changes
2023-04-20 08:22:31 +02:00
Applevangelist f4080d93e8 #SET
- Minus one log entry
2023-04-20 08:06:57 +02:00
Applevangelist 94b74b7056 Merge remote-tracking branch 'origin/develop' into develop 2023-04-20 08:05:15 +02:00
Applevangelist 6886107934 #SET
* Active Zone Filtering
2023-04-20 08:05:11 +02:00
Applevangelist 65357943e7 #SET
* Active Zone Filtering
2023-04-20 08:04:40 +02:00
Thomas f65783ed6c SET - added continous zone filtering (#1934)
SET - added continous zone filtering for SET_GROUP, SET_UNIT and SET_CLIENT. Adresses request #1933
2023-04-18 12:28:17 +02:00
Applevangelist d8e765a9b1 Fixes for getPlayerName() errors if DCS object is not a UNIT 2023-04-18 10:28:00 +02:00
Applevangelist 2470632e84 Fixes for getPlayerName errors 2023-04-18 10:26:43 +02:00
Frank 526f241dc3 Merge branch 'develop' into FF/Ops 2023-04-17 17:18:54 +02:00
Applevangelist 2a11b64de4 Merge remote-tracking branch 'origin/develop' into develop 2023-04-16 16:12:21 +02:00
Applevangelist 44bae0c3a2 Merge remote-tracking branch 'origin/master' into develop 2023-04-16 16:12:08 +02:00
Applevangelist dffb1c0768 Merge remote-tracking branch 'origin/master' into develop 2023-04-16 16:11:12 +02:00
Applevangelist d5eb97863b #CTLD
* Update saving/loading to include structure
2023-04-16 16:09:58 +02:00
Frank f30f32732c Merge branch 'master' into develop 2023-04-16 12:30:19 +02:00
Frank 9cd3027ea6 Update FlightGroup.lua 2023-04-16 11:16:54 +02:00
Applevangelist ad031a172d Merge remote-tracking branch 'origin/develop' into develop 2023-04-15 16:25:32 +02:00
Applevangelist 52bd4be012 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2023-04-15 16:25:21 +02:00
Applevangelist b4c7b63381 #CTLD
* Small fix allowing minus signs in template names for repairs
2023-04-15 16:17:39 +02:00
Applevangelist 0782532763 Merge remote-tracking branch 'origin/master' into develop 2023-04-13 15:51:55 +02:00
Applevangelist a6af53d78c #CTLD
* Allow loadbacks with preciser coordinates
2023-04-13 15:49:21 +02:00
Applevangelist 82a144b12e Merge remote-tracking branch 'origin/develop' into develop 2023-04-04 10:34:30 +02:00
Applevangelist 91d4f6a8b4 Merge remote-tracking branch 'origin/master' into develop 2023-04-04 10:34:20 +02:00
Applevangelist 6fa9e5894e #DATABASE
* Small fix for CLIENT:FindByName()
2023-04-04 10:33:41 +02:00
Applevangelist 17e49b6a2f #DATABASE
* Small fix for CLIENT:FindByName()
2023-04-04 10:32:38 +02:00
Applevangelist 34d994beec Merge remote-tracking branch 'origin/develop' into develop 2023-04-03 12:17:11 +02:00
Applevangelist c594ac1be1 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 12:17:03 +02:00
Applevangelist c0bc9b393c #NET
* Fix for ucid can be nil
2023-04-03 12:16:25 +02:00
Applevangelist 7ae9fa3225 #NET
* Fix for ucid can be nil
2023-04-03 12:15:49 +02:00
Applevangelist 80fa8c1c05 Merge remote-tracking branch 'origin/develop' into develop 2023-03-30 12:23:49 +02:00
Applevangelist 6b34083af0 Merge remote-tracking branch 'origin/master' into develop 2023-03-30 12:23:40 +02:00
Applevangelist a97e844aca Added Init Methods to set Unit Positions on Spawn 2023-03-30 12:23:07 +02:00
Applevangelist 42d5421cd8 Added Init Methods to set Unit Positions on Spawn 2023-03-30 12:22:30 +02:00
Applevangelist d2e91ffcd2 Small fix for SET_UNIT if used in capture zone coalition with a polygon zone 2023-03-30 09:24:48 +02:00
Applevangelist f093fef8f8 Small fix for SET_UNIT if used in capture zone coalition with a polygon zone 2023-03-30 09:23:51 +02:00
Applevangelist 484fab26e0 Merge remote-tracking branch 'origin/develop' into develop 2023-03-28 11:04:18 +02:00
Applevangelist 2c164f3797 Merge remote-tracking branch 'origin/master' into develop 2023-03-28 11:04:10 +02:00
Applevangelist d9eee7ea46 SET_STATIC - Added GetClosestStatic() 2023-03-28 11:03:34 +02:00
Applevangelist 08c72df1e5 SET_STATIC - Added GetClosestStatic() 2023-03-28 11:02:42 +02:00
Applevangelist 837d327308 Merge remote-tracking branch 'origin/develop' into develop 2023-03-24 10:29:19 +01:00
Applevangelist b1e233421e Fix possible DCS Unit not existing in OPSGROUP:onafterElementDamaged(From, Event, To, Element) 2023-03-24 10:28:36 +01:00
Applevangelist fd562a1d9e Typo fix 2023-03-23 09:22:13 +01:00
Applevangelist 7157836eb1 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 09:21:58 +01:00
Applevangelist 019f2fe068 Merge remote-tracking branch 'origin/develop' into develop 2023-03-23 08:47:40 +01:00
Applevangelist f1496d52c0 Merge remote-tracking branch 'origin/master' into develop 2023-03-23 08:47:34 +01:00
Applevangelist 53fa850d66 Add'l check in UNIT:GetLife() 2023-03-23 08:46:29 +01:00
Applevangelist 18a946d2cc Merge remote-tracking branch 'origin/develop' into develop 2023-03-16 08:45:59 +01:00
Applevangelist e76d7e3234 Merge remote-tracking branch 'origin/master' into develop 2023-03-16 08:45:52 +01:00
Applevangelist 033c52ae54 Merge remote-tracking branch 'origin/develop' into develop 2023-03-16 08:45:17 +01:00
Applevangelist e08b44187e #AIRBASE
* Added/changed:
  ["Hipico_Flying_Club"] = "Hipico Flying Club",
  ["Aeropuerto_de_Gobernador_Gregores"] = "Aeropuerto de Gobernador Gregores",
  ["Aerodromo_O_Higgins"] = "Aerodromo O'Higgins",
  ["Cullen_Airport"] = "Cullen Airport",
  ["Gull_Point"] = "Gull Point",
2023-03-16 08:45:14 +01:00
Applevangelist 0315530f2c #AIRBASE
* Added/changed:
  ["Hipico_Flying_Club"] = "Hipico Flying Club",
  ["Aeropuerto_de_Gobernador_Gregores"] = "Aeropuerto de Gobernador Gregores",
  ["Aerodromo_O_Higgins"] = "Aerodromo O'Higgins",
  ["Cullen_Airport"] = "Cullen Airport",
  ["Gull_Point"] = "Gull Point",
2023-03-16 08:44:31 +01:00
Thomas 0d29c39724 Drop crates from herc as CTLD_Cargo (#1929) (#1930)
Adds option to drop crates from a herc via parachute drop as CTLD_Cargo that needs proper unpacking - can be picked up be a helo.

Co-authored-by: UglySkyfire <69476075+UglySkyfire@users.noreply.github.com>
2023-03-15 21:07:19 +01:00
Applevangelist 5fdbfc17ca Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 10:10:22 +01:00
Applevangelist c3974e4b9d Merge remote-tracking branch 'origin/master' into develop 2023-03-10 10:10:14 +01:00
Applevangelist 6946d8d185 Merge remote-tracking branch 'origin/master' into develop 2023-03-10 10:09:40 +01:00
Applevangelist 9d3e069090 #CTLD
* Added/completed add/get/set stock functions
2023-03-10 10:07:58 +01:00
Applevangelist 8783c21cf1 Merge remote-tracking branch 'origin/develop' into develop 2023-03-09 08:54:53 +01:00
Applevangelist 9194a97756 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2023-03-09 08:54:41 +01:00
Applevangelist 6ac1d66aae #GROUP
* Fix for GetMaxHeight()
2023-03-09 08:49:53 +01:00
Applevangelist 62bca72c6d #GROUP
* Fix for GetMaxHeight()
2023-03-09 08:49:24 +01:00
Applevangelist 7409afb11f UTILS.PlotRacetrack 2023-03-07 10:56:08 +01:00
Applevangelist a67bae4f0d #UTILS
* Added UTILS.PlotRacetrack courtesy of Buur!
2023-03-07 10:55:42 +01:00
Applevangelist 4e7c689f7a Merge branch 'master' into develop 2023-03-05 11:04:22 +01:00
Applevangelist 125ecb44c5 #GROUP
* Callsign translation refactor
2023-03-05 11:03:47 +01:00
Anthony De Vellis f73ff10edb Refactored GROUP:GetCustomCallSign so that bespoke callsigns override parsing player name and playername overrides vanilla callsigns. Previously Bespoke callsigns would never be used if names contained # or |. If CallsignTranslations is unset, previous priority will be applied. (#1927) 2023-03-05 11:01:37 +01:00
Applevangelist b6397b2926 Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 08:01:21 +01:00
Applevangelist 0a7d520473 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 08:01:15 +01:00
Applevangelist 949e2f9ff3 #SPAWN
* clarified docu for SpawnScheduled()
* Added parameter to SpawnScheduled() for a delayed spawn
2023-02-28 08:00:43 +01:00
Applevangelist edf1e1a3e3 #SPAWN 2023-02-28 07:59:01 +01:00
Applevangelist 3e692d6677 Merge remote-tracking branch 'origin/develop' into develop 2023-02-28 07:39:42 +01:00
Applevangelist 28a44d9e05 Merge remote-tracking branch 'origin/master' into develop 2023-02-28 07:39:36 +01:00
Thomas cb9ab26522 Update Enums.lua (#1925) 2023-02-26 19:06:45 +01:00
Applevangelist 7db7919207 Merge remote-tracking branch 'origin/develop' into develop 2023-02-26 10:25:21 +01:00
Frank 7aa4aaf371 Update Auftrag.lua
- Fixed wrong IAS to TAS convertion for orbit missions
2023-02-26 01:02:39 +01:00
Frank 901480d99c Merge branch 'FF/Ops' into develop 2023-02-24 23:29:32 +01:00
Frank 84dbda6f2b OPS
- Rm laser marker
2023-02-24 23:29:03 +01:00
Applevangelist 095f2eef5d Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 14:06:03 +01:00
Applevangelist 4bc4e631d8 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:05:57 +01:00
Applevangelist 9d00ec0c25 Merge remote-tracking branch 'origin/master' into develop 2023-02-24 14:04:53 +01:00
Applevangelist 0d08d732a5 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:12:05 +01:00
Applevangelist 3c2a4dcc70 #AWACS - do not convert speed to IAS, as already done in AUFTRAG 2023-02-23 11:11:48 +01:00
Applevangelist 8c0f960e39 Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:32:38 +01:00
Applevangelist 5670764f3b Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:31:59 +01:00
Applevangelist d0e6a29486 Merge remote-tracking branch 'origin/develop' into develop 2023-02-23 10:20:22 +01:00
Applevangelist a92790c9d0 Merge remote-tracking branch 'origin/master' into develop 2023-02-23 10:18:39 +01:00
Frank b0978b362e Merge pull request #1924 from FlightControl-Master/FF/Ops
OPS
2023-02-22 23:18:29 +01:00
Frank ffef3183c7 OpsGroup
- Fixed bug in checklos
2023-02-22 23:01:47 +01:00
Frank 20a9857fcf Merge branch 'FF/OpsDev' into FF/Ops 2023-02-22 22:17:49 +01:00
Frank 828395c398 Merge branch 'develop' into FF/Ops 2023-02-22 22:17:35 +01:00
Frank 462e29da6e RANGE and OPS
** RANGE**
- Added scenery as target

**OPSGROUP**
- Added option that group does not return to its legion

**AUFTRAG**
- Added option that assets do not return to its legion
2023-02-22 22:16:42 +01:00
Applevangelist 29ebe94015 #CTLD logic correction for loading 2023-02-21 11:39:23 +01:00
Applevangelist 0b692d045f #CTLD logic correction for loading 2023-02-21 11:38:24 +01:00
Applevangelist 7b58ca9134 Merge remote-tracking branch 'origin/develop' into develop 2023-02-19 17:17:45 +01:00
Applevangelist 8e6eb17ef5 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Net.lua
2023-02-19 17:17:35 +01:00
Applevangelist ce7b30b54e Merge remote-tracking branch 'origin/master' into develop 2023-02-19 17:16:34 +01:00
Applevangelist 93c92d49f7 NET 2023-02-19 17:15:35 +01:00
Applevangelist feeb0c01f2 Merge remote-tracking branch 'origin/master' into develop 2023-02-19 12:32:29 +01:00
Applevangelist 70386811e6 AICSAR 2023-02-19 12:31:57 +01:00
Applevangelist bef8e53347 #AICSAR - added option to use eject event 2023-02-19 12:30:00 +01:00
Applevangelist 46c3ed72c3 Merge remote-tracking branch 'origin/master' into develop 2023-02-18 15:04:36 +01:00
Applevangelist 55a055a047 #NET - further ado 2023-02-18 15:03:07 +01:00
Applevangelist 1fd8f4d837 #AICSAR
* Named functions for the events
2023-02-18 11:04:49 +01:00
Applevangelist 9b62710d64 #AICSAR
* Named functions for the events
2023-02-18 11:04:37 +01:00
Applevangelist a1f028aa5e Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:43:01 +01:00
Applevangelist 5187bc04c1 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:42:56 +01:00
Applevangelist 7959f650d5 NET 2023-02-17 16:42:25 +01:00
Applevangelist 6f3fbb25cf Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:42:10 +01:00
Applevangelist 05b8df0d88 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:24:21 +01:00
Applevangelist 6a9e868035 Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:23:52 +01:00
Applevangelist 5da82a6b01 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 16:23:46 +01:00
Applevangelist ffb6cbfb17 NET 2023-02-17 16:23:16 +01:00
Applevangelist a4dcb643bd #NET Fixes 2023-02-17 15:41:33 +01:00
Applevangelist 2b02f6659a #Net 2023-02-17 15:41:10 +01:00
Applevangelist 6acf051539 #Net Fixes 2023-02-17 15:02:03 +01:00
Applevangelist 9e23cda02a #NET Fixes 2023-02-17 15:01:49 +01:00
Applevangelist c29b67df55 #NET small fix 2023-02-17 14:33:32 +01:00
Applevangelist 8c083cccc8 #NET - bug fix 2023-02-17 14:32:17 +01:00
Applevangelist bd312b86d2 Merge remote-tracking branch 'origin/master' into develop 2023-02-17 13:23:10 +01:00
Applevangelist d132447af8 #Net 2023-02-17 13:22:39 +01:00
Applevangelist 822b95e8aa Merge remote-tracking branch 'origin/master' into develop 2023-02-17 08:55:27 +01:00
Applevangelist a7e45338e3 #AICSAR - Added alt/speed options 2023-02-17 08:54:54 +01:00
Applevangelist 985adc0267 Fixes 2023-02-17 08:54:33 +01:00
Applevangelist 39b94a2ac1 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2023-02-16 18:24:35 +01:00
Applevangelist 5f007be781 Merge remote-tracking branch 'origin/master' into develop 2023-02-16 18:23:18 +01:00
Applevangelist 578b68f635 #AICSAR 2023-02-16 18:22:26 +01:00
Applevangelist 7637f0c6ce Merge remote-tracking branch 'origin/develop' into develop 2023-02-16 18:22:10 +01:00
Applevangelist 6ec43b72ce #AICSAR
* Added PlayerName to `OnAfterPilotRescued(From,Event,To,PilotName)` if available
2023-02-16 18:22:06 +01:00
Frank 91e80bf1a6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-16 17:30:47 +01:00
Frank e6464dc5cb Merge branch 'develop' into FF/Ops 2023-02-16 17:30:15 +01:00
Frank 34c799b668 Merge branch 'master' into develop 2023-02-16 17:29:54 +01:00
Applevangelist dbd7634f0e #NET
* Added event management for clients and block/unblock functions
2023-02-16 11:42:46 +01:00
Applevangelist 44b6315361 #NET
* Added event management for clients and block/unblock functions
2023-02-16 11:42:10 +01:00
Frank baa1dcbf8f OPSGROUP
- mission nothing is cancelled if transport is due
2023-02-15 23:06:34 +01:00
Applevangelist 660ebeadfe Merge remote-tracking branch 'origin/master' into develop 2023-02-15 12:24:09 +01:00
Applevangelist a3f9219460 fx 2023-02-15 12:19:55 +01:00
Applevangelist 65d3c3f277 #SPOT - minor fixes 2023-02-15 12:17:49 +01:00
Applevangelist 250b12c041 fix 2023-02-15 12:16:46 +01:00
Applevangelist ef0ddddb46 #PLAYERTASK
* added group/unit check for UseTypeNames
2023-02-15 10:32:30 +01:00
Applevangelist b649ad73a8 Fixes 2023-02-15 10:31:40 +01:00
Applevangelist bf50adaa22 #PLAYERTASKCONTROLLER
* Added ship detail types
2023-02-14 12:58:39 +01:00
Applevangelist 77a39364f4 #PLAYERTASKCONTROLLER
* Added ship detail types
2023-02-14 12:58:23 +01:00
Applevangelist 055cbf4f7a DB 2023-02-13 17:12:25 +01:00
Applevangelist 6d9e2fbfe1 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2023-02-13 16:41:32 +01:00
Frank dc0a2bccd6 Update Legion.lua
- Increase score for nearby ground groups
2023-02-12 15:19:34 +01:00
Frank ac1b458eb4 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 13:53:47 +01:00
Frank f5938bc235 Merge branch 'develop' into FF/Ops 2023-02-12 13:53:25 +01:00
Frank 7280c17506 Merge branch 'master' into develop 2023-02-12 13:04:32 +01:00
Frank 4e280f02b6 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-12 11:53:42 +01:00
Frank 854f6ae6ae Merge branch 'develop' into FF/Ops 2023-02-12 11:52:13 +01:00
Frank 0487487e7c Merge branch 'master' into develop 2023-02-12 11:51:16 +01:00
Frank 9ec66912c8 Update OpsGroup.lua
- Added SetCargoBayLimit function
2023-02-12 09:36:35 +01:00
Thomas 960f261ddd Master merge (#1920)
* #NET
* Initial release

* Update MarkerOps_Base.lua (#1919)
2023-02-11 22:17:24 +01:00
Frank e55f96f393 OPSTRANSPORT 2023-02-11 00:21:15 +01:00
Applevangelist 713a5b067f #PLAYERTASKCONTROLLER
* Added `AddAgentSet()`
2023-02-10 11:40:15 +01:00
Applevangelist 0ec039bb39 #PLAYERTASKCONTROLLER
* Added `AddAgentSet()`
2023-02-10 11:38:45 +01:00
Applevangelist 0823eb1ed0 #fix 2023-02-10 11:37:51 +01:00
Applevangelist d6aa7ec17c #Net
* Initial Release
2023-02-10 10:45:23 +01:00
Applevangelist c1ab696774 #NET 2023-02-10 10:41:59 +01:00
Applevangelist 93d61a99fa Merge remote-tracking branch 'origin/develop' into develop 2023-02-09 16:13:11 +01:00
Applevangelist c2b8261133 Merge remote-tracking branch 'origin/master' into develop 2023-02-09 16:13:06 +01:00
Applevangelist 2da2ddb5bb #DETECTION
* Docu fixes
2023-02-09 16:12:39 +01:00
Applevangelist cb00a3fa38 #DETECTION
* Docu fixes
2023-02-09 16:11:59 +01:00
Applevangelist 48aaf8179d Merge remote-tracking branch 'origin/develop' into develop 2023-02-09 13:21:25 +01:00
Applevangelist 608033f38f #AICSAR
* Docu additions
2023-02-09 13:17:49 +01:00
Applevangelist 292bc790ee #AICSAR
* Docu additions
2023-02-09 13:17:34 +01:00
Applevangelist 5a0a761c08 Merge remote-tracking branch 'origin/Apple/Develop' into develop 2023-02-09 11:57:46 +01:00
Applevangelist e44f61181a #AICSAR
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
2023-02-09 11:57:41 +01:00
Applevangelist 28c25816a6 #AICSAR
* Fixed issue with underlying OpsTransport
* Added FSM Transition OnAfterPilotUnloaded()
* Added options for SRS TTS output - no sound files
* Added voice options for downed pilot and operator - these can have different voices
2023-02-09 11:57:28 +01:00
Applevangelist 387aef6626 fxi 2023-02-09 11:53:45 +01:00
Frank 709fccd96c OSPTRANSPORT 2023-02-09 01:06:36 +01:00
Frank 2c24e56aa5 Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:35:49 +01:00
Frank f104ddbe64 Merge branch 'FF/Ops' into FF/OpsDev 2023-02-08 16:15:22 +01:00
Frank bbd8ceb8c0 Merge branch 'develop' into FF/Ops 2023-02-08 16:15:06 +01:00
Frank b8498fa58f Merge branch 'FF/MasterDevel' into FF/OpsDev 2023-02-08 16:14:45 +01:00
Frank 34c26c44bc Merge branch 'develop' into FF/OpsDev 2023-02-07 22:53:19 +01:00
Thomas da93126d58 Update Moose.files 2023-02-07 11:05:54 +01:00
Applevangelist 49c45f97fc Test smaller dev moose 2023-02-07 10:51:14 +01:00
Applevangelist b225e44cfa Merge remote-tracking branch 'origin/develop' into develop 2023-02-07 08:02:11 +01:00
Applevangelist afa17f95f9 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:02:05 +01:00
Applevangelist c97f1791b0 Merge remote-tracking branch 'origin/master' into develop 2023-02-07 08:01:34 +01:00
Applevangelist 790f8ec127 Merge remote-tracking branch 'origin/develop' into develop 2023-02-06 08:18:21 +01:00
Applevangelist b4d5650cb0 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:18:08 +01:00
Applevangelist 9ea831a0f2 added weapon 2023-02-06 08:17:43 +01:00
Applevangelist 63b16e5bd4 Merge remote-tracking branch 'origin/master' into develop 2023-02-06 08:17:05 +01:00
dogjutsu 184f93168b MSRS_BACKEND_DCSGRPC bug fix (#1916)
* Add another DCS-gRPC example for MSRS docu (ATIS)

* Fixes MSRS_BACKEND_DCSGRPC bad _GetLatLongAlt call
2023-02-06 08:16:14 +01:00
Applevangelist f44893e4c1 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2023-02-05 13:51:22 +01:00
Applevangelist 10dd7eff78 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2023-02-05 13:50:25 +01:00
Frank 0400f1a23e Merge branch 'FF/Ops' into FF/OpsDev 2023-02-05 00:23:42 +01:00
Frank d3d60757c1 Merge branch 'develop' into FF/Ops 2023-02-05 00:23:25 +01:00
Frank 57079e5104 Merge branch 'master' into develop 2023-02-04 23:34:14 +01:00
Frank 6d967358da WEAPON v0.1.0
**WEAPON**
- Improments of class
- ARTY works
- FOX works
- RANGE should work, not tested.
2023-02-04 23:28:45 +01:00
Applevangelist 095121d83c Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 21:51:39 +01:00
Applevangelist a415b131c4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:51:35 +01:00
Applevangelist 02d63e244d Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 21:51:05 +01:00
Applevangelist dd10a49519 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 21:50:59 +01:00
Thomas 54a1ea9f56 Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1907)
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
2023-02-04 21:50:17 +01:00
Thomas b250111d57 Scoring credits a kill to player who hit the same unit before it spawned (#1905) (#1906)
Co-authored-by: Mr.Alien <124381209+MrAlien753@users.noreply.github.com>
2023-02-04 21:48:23 +01:00
Applevangelist 2dce134d15 Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 17:22:43 +01:00
Applevangelist b4793811a4 Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:22:37 +01:00
Applevangelist 23091ff851 #CTLD
* Added method `CTLD:PreloadCrates(Unit,Cratesname,NumberOfCrates)`
2023-02-04 17:21:52 +01:00
Applevangelist 8a45f78251 fix 2023-02-04 17:20:05 +01:00
Applevangelist 7fec084227 Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 17:16:57 +01:00
Applevangelist 3a120c0a3c Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:52 +01:00
Applevangelist 5571b49b4f Merge remote-tracking branch 'origin/master' into develop 2023-02-04 17:16:10 +01:00
Applevangelist c08b39f148 #NET
* Added logic to get player ID from client object
2023-02-04 17:15:19 +01:00
Applevangelist 036b6b77b1 #CTLD
* Added preload crates
2023-02-04 17:14:52 +01:00
Applevangelist a4dd15013d #changes 2023-02-03 16:41:11 +01:00
Applevangelist 2c411736e5 #NET - initial version 2023-02-03 16:41:01 +01:00
Frank 4b4708e2a8 Weapon 2023-02-02 23:50:00 +01:00
Applevangelist 789a4c4b7f Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:47:29 +01:00
Applevangelist 3775053609 PLAYERRECCE - bug fix 2023-02-02 09:47:25 +01:00
Applevangelist b81bf447a9 fix 2023-02-02 09:47:05 +01:00
Applevangelist 09a2a79a78 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:59 +01:00
Applevangelist 35da50b67a Merge remote-tracking branch 'origin/develop' into develop-2 2023-02-02 09:38:32 +01:00
Applevangelist 69ba31b44d Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:38:15 +01:00
Applevangelist 710b488663 Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:38:06 +01:00
Applevangelist 9be30338a5 Herc fix 2023-02-02 09:37:47 +01:00
Applevangelist 6510cca837 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 09:36:48 +01:00
Applevangelist 08b8dfbe0e Merge remote-tracking branch 'origin/master' into develop 2023-02-02 09:36:44 +01:00
Frank 9af242854a Weapon 2023-02-01 23:51:47 +01:00
Frank bfe9a1888e Merge pull request #1899 from ttrebuchon/tt/airwing-sortpayloads-fix
Airwing sortpayloads criteria fix
2023-02-01 19:07:46 +01:00
ttrebuchon fec496f154 Fix missing check for b.unlimited~=true in sortpayloads function. 2023-02-01 12:30:52 -05:00
Thomas 28fd35ad7e PlayerRecce - Added Shark_3 as type 2023-02-01 12:17:54 +01:00
Frank c5deb09c2c WEAPON v0.0.1
- New class
2023-01-31 23:22:48 +01:00
Applevangelist 26fa0693b0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-31 11:28:45 +01:00
Applevangelist 75b30ad2f9 Merge remote-tracking branch 'origin/master' into develop 2023-01-31 11:28:40 +01:00
Applevangelist 9dac61cbb6 #CTLD
* Added Subcategories for static cargo objects
2023-01-31 11:28:14 +01:00
Applevangelist ee6d34a9bd #CTLD
* Added Subcategories for static cargo objects
2023-01-31 11:28:00 +01:00
Frank 6e6bb1e88d RANGE 2023-01-30 23:29:03 +01:00
Frank 0b3aea2bf3 Scenery 2023-01-30 21:52:22 +01:00
Applevangelist d504472418 Merge remote-tracking branch 'origin/master' into develop 2023-01-30 18:02:45 +01:00
Applevangelist f731ec7b2f #POINT
* Added COORDINATE:SetAtLandheight()
2023-01-30 18:01:04 +01:00
Applevangelist 375e4231aa #POINT
* Added COORDINATE:SetAtLandheight()
2023-01-30 18:00:29 +01:00
Applevangelist e5c003a6bf Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 18:38:02 +01:00
Applevangelist fdf2d936f9 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:57 +01:00
Applevangelist 5b8f840d6e Merge remote-tracking branch 'origin/master' into develop 2023-01-29 18:37:19 +01:00
Applevangelist ab4bf1f0a8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-29 17:21:30 +01:00
Applevangelist 332dcf9fe5 Merge remote-tracking branch 'origin/master' into develop 2023-01-29 17:21:16 +01:00
Frank 694ad5d33d Merge branch 'develop' into FF/Ops 2023-01-29 12:57:09 +01:00
Frank 383ee00e71 Merge branch 'master' into develop 2023-01-29 12:54:13 +01:00
Frank c279ab6311 Update Auftrag.lua 2023-01-29 12:19:04 +01:00
Frank 4cc1db1365 Update Auftrag.lua
- condition success and failure evaluation
2023-01-28 22:31:53 +01:00
Frank f3d1378692 Merge branch 'master' into develop 2023-01-28 18:42:57 +01:00
Frank cfb3004142 Merge pull request #1893 from FlightControl-Master/FF/Ops
OPS
2023-01-28 10:47:49 +01:00
Thomas 016643e494 Merge from. Master (#1892)
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

* Changed documentation for Marker.lua and MarkerOps_Base.lua (#1891)

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
Co-authored-by: grandpaSam <wouldyukindly@gmail.com>
2023-01-28 09:05:23 +01:00
Thomas 5ec18d45a2 Merge (#1890)
* #CSAR - Add Persistence (#1889)

* Adds a modified version of ops.CTLD's Persistence to ops.CSAR

* Update Marker.lua

---------

Co-authored-by: Jason du Plessis <33880363+TheChosenOn3@users.noreply.github.com>
2023-01-27 18:36:38 +01:00
dogjutsu f4c9bced45 Add another DCS-gRPC example for MSRS docu (ATIS) (#1883) 2023-01-26 11:25:01 +01:00
Applevangelist c2aee52bc0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:56:44 +01:00
Applevangelist 14a851d582 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:56:34 +01:00
Applevangelist 58032b0075 * AIRBASE.SouthAtlantic.Rio_Turbio 2023-01-25 17:56:03 +01:00
Applevangelist e106ca3da5 * AIRBASE added airfields Falklands
* RANGE  added google key usage
2023-01-25 17:55:34 +01:00
Applevangelist 262c8ffc59 Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:19:03 +01:00
Applevangelist affde2f030 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:59 +01:00
Applevangelist 3055793cff Merge remote-tracking branch 'origin/develop' into develop 2023-01-25 17:18:22 +01:00
Applevangelist 1e749747b4 Merge remote-tracking branch 'origin/master' into develop 2023-01-25 17:18:16 +01:00
Thomas a4982bd24e Update Utils.lua (#1886) (#1887) 2023-01-24 20:58:24 +01:00
Applevangelist 3d86aee249 Merge remote-tracking branch 'origin/develop' into develop 2023-01-24 15:28:00 +01:00
Applevangelist cd8845299f #CTLD added documentation 2023-01-24 15:27:50 +01:00
Applevangelist 1099e8e876 #CTLD added documentation 2023-01-24 15:27:09 +01:00
Applevangelist 6a4356fa94 #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:06:40 +01:00
Applevangelist 95d149274f #1885
#PSEUDOATC - Menu shows Waypoint name if it has been set
2023-01-24 10:05:39 +01:00
Applevangelist 3880c3deac Merge remote-tracking branch 'origin/develop' into develop 2023-01-23 17:13:59 +01:00
Applevangelist 8c68a6d9ce Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2023-01-23 17:13:51 +01:00
Applevangelist 2ec8d94e38 #CONTROLLABLE
* Added CommandActivateACLS()
* Added CommandDeactivateACLS()
2023-01-23 17:12:01 +01:00
Applevangelist 67cad1963f #CONTROLLABLE
* Added CommandActivateACLS()
* Added CommandDeactivateACLS()
2023-01-23 17:10:52 +01:00
Thomas cad8f8678e Adding ACLS 2023-01-23 10:53:58 +01:00
Applevangelist cb0de264e8 Merge remote-tracking branch 'origin/develop' into develop 2023-01-22 13:23:18 +01:00
Applevangelist 30654806e8 Merge remote-tracking branch 'origin/master' into develop 2023-01-22 13:23:11 +01:00
Applevangelist 24d47ef353 Merge remote-tracking branch 'origin/master' into develop 2023-01-22 13:11:13 +01:00
Applevangelist b62058b36a changes 2023-01-22 13:10:45 +01:00
Frank 76ebf8df07 Merge branch 'develop' into FF/Ops 2023-01-21 22:43:11 +01:00
Frank a4e52c6c3c Legion
- Added enroute task SEAD to escort
2023-01-21 22:42:57 +01:00
Applevangelist a6c194f5c4 Merge remote-tracking branch 'origin/develop' into develop 2023-01-21 15:40:47 +01:00
Applevangelist 23553f0f4c #AUFTRAG
* Added checking of bespoke conditions within the status call of AUFTRAG and not only when AUFTRAG is done already
2023-01-21 15:40:18 +01:00
Applevangelist 285f8d102b #AUFTRAG
* Added checking of bespoke conditions within the status call of AUFTRAG and not only when AUFTRAG is done already
2023-01-21 15:39:44 +01:00
Applevangelist 6b7fe137ca Merge remote-tracking branch 'origin/develop' into develop 2023-01-20 10:36:17 +01:00
Applevangelist d12def4a97 Merge remote-tracking branch 'origin/master' into develop 2023-01-20 10:36:09 +01:00
Frank d0d21a6b5d Merge branch 'master' into develop 2023-01-19 19:11:09 +01:00
Applevangelist dcacba6803 F 2023-01-19 17:03:07 +01:00
Applevangelist ff58a47244 #FG - added nil check on GetClosestAirbase() 2023-01-19 17:01:59 +01:00
Applevangelist df9a572656 #FG - nil check on GetClosestAirbase() 2023-01-19 16:58:31 +01:00
Applevangelist 8648b0a24d Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 15:01:45 +01:00
Applevangelist 511ca918f4 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 15:01:34 +01:00
Applevangelist 6e666b0ac8 #UTILS - make LoadSetOfGroups save(r) for groups spawned with SpawnScheduled 2023-01-19 15:00:49 +01:00
Applevangelist a51176967c #UTILS - make LoadSetOfGroups save(r) for groups spawned with SpawnScheduled 2023-01-19 15:00:18 +01:00
Applevangelist 47684e8717 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 10:35:02 +01:00
Applevangelist 9a8727f499 Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 10:34:17 +01:00
Applevangelist 03ea4ccd44 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 10:34:10 +01:00
Applevangelist 0d0292385f #OPSGROUP - added docu 2023-01-19 10:33:26 +01:00
Applevangelist 83e20f8062 #Controllable - docu changes 2023-01-17 12:09:23 +01:00
Applevangelist 0b1c287f68 #Controllable - docu changes 2023-01-17 12:08:57 +01:00
Applevangelist eef7675d95 Merge remote-tracking branch 'origin/develop' into develop 2023-01-17 09:26:47 +01:00
Applevangelist a06f2f9731 Merge remote-tracking branch 'origin/master' into develop 2023-01-17 09:26:40 +01:00
Applevangelist 5943ae0a46 #ATIS docu fix 2023-01-17 09:25:58 +01:00
Applevangelist b04624bd60 #ATIS docu fix 2023-01-17 09:25:24 +01:00
Applevangelist 808fb4f5ac Merge remote-tracking branch 'origin/develop' into develop 2023-01-15 17:40:31 +01:00
Applevangelist 26d675dc26 Merge remote-tracking branch 'origin/master' into develop 2023-01-15 17:40:24 +01:00
Applevangelist 56c4a11626 #CSAR
* Docu corrections
2023-01-15 17:39:28 +01:00
Applevangelist 144b50cfc9 Merge remote-tracking branch 'origin/develop' into develop 2023-01-12 13:21:30 +01:00
Applevangelist 28df12c1a9 Merge remote-tracking branch 'origin/master' into develop 2023-01-12 13:21:23 +01:00
Applevangelist f0f42df374 #CTLD - Adde Shark III typename 2023-01-12 13:20:44 +01:00
Applevangelist 5898bc7f07 #PLAYERTASK
* Even nicer MGRS readouts
2023-01-10 17:09:17 +01:00
Applevangelist 44f6f0fd40 #PLAYERTASK
* Even nicer MGRS readouts
2023-01-10 17:08:08 +01:00
Applevangelist 0d8b94c7fd #AIRBASE - docu fixes 2023-01-10 13:09:25 +01:00
Applevangelist 01cf713ec2 Merge remote-tracking branch 'origin/develop' into develop 2023-01-10 13:08:44 +01:00
Applevangelist 85422f3427 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 13:08:36 +01:00
Applevangelist 43123ec93e #AWACS
* Fixed initial screen text on bogey dope just being x group(s)
#PLAYERTASK
* Improved logic to declare task succes even if not player is assigned
2023-01-10 12:45:34 +01:00
Applevangelist 0fa4be7c4a #AWACS
* Fixed initial screen text on bogey dope just being x group(s)
#PLAYERTASK
* Improved logic to declare task succes even if not player is assigned
2023-01-10 12:45:17 +01:00
Applevangelist e5dd9661d7 Merge remote-tracking branch 'origin/develop' into develop 2023-01-10 07:49:44 +01:00
Applevangelist 6f5e6240bc Merge remote-tracking branch 'origin/master' into develop 2023-01-10 07:49:37 +01:00
Applevangelist a7bad8e9f4 #PSEUDOATC
* Fix for debug messages
2023-01-10 07:49:02 +01:00
Applevangelist 581b5b3de9 fix 2023-01-10 07:48:13 +01:00
Applevangelist 5dd48cbd23 Merge remote-tracking branch 'origin/develop' into develop 2023-01-10 07:32:02 +01:00
Frank 40276d190a Merge pull request #1882 from FlightControl-Master/FF/Ops
OPSZONE
2023-01-09 23:12:49 +01:00
Frank 71ccd23953 Merge branch 'develop' into FF/Ops 2023-01-09 23:03:12 +01:00
Frank 4e68e33ec7 Update OpsZone.lua
- Remove marker
2023-01-09 23:03:01 +01:00
Applevangelist 79c8b31042 #GROUP
* Improve functionality of GetUnit(x)
* Added GetFirstUnit()
2023-01-09 17:08:48 +01:00
Applevangelist 10eb512244 Merge remote-tracking branch 'origin/develop' into develop 2023-01-09 17:08:06 +01:00
Applevangelist c232f8ccff Merge remote-tracking branch 'origin/master' into develop 2023-01-09 17:07:59 +01:00
Frank cee72c1d09 Merge branch 'master' into develop 2023-01-08 19:32:50 +01:00
Applevangelist cf4d6f46b5 Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 18:38:56 +01:00
Applevangelist a7c8954740 Docu typo 2023-01-08 18:38:12 +01:00
Applevangelist a21b9b382e Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 18:09:26 +01:00
Applevangelist ef0b76a632 #PLAYERTASK
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
2023-01-08 18:09:22 +01:00
Applevangelist 4b19cbcf67 #PLAYERTASK
* Added FSM events PlayerJoinedTask and PlayerAbortedTask
2023-01-08 18:08:53 +01:00
Mike 2806d3a191 Merge pull request #1880 from dogjutsu/dogjutsu/MSRS-gRPC-docs-cleanup
Doc fixes related to MSRS w/ DCS-gRPC alt backend
2023-01-08 16:41:38 +00:00
dogjutsu 9688c7ef01 Doc fixes related to MSRS w/ DCS-gRPC alt backend 2023-01-08 08:34:52 -08:00
Applevangelist 85aa46ad2b Merge remote-tracking branch 'origin/develop' into develop 2023-01-08 14:50:11 +01:00
dogjutsu d6181d26f8 Add DCS-gRPC TTS altnerate backend for MSRS (#1879) 2023-01-08 08:37:11 +01:00
Frank aa5e8662ed Merge pull request #1877 from FlightControl-Master/FF/Ops
OPSGROUP
2023-01-07 17:19:34 +01:00
Frank ca11e724ab Merge branch 'develop' into FF/Ops 2023-01-07 17:12:04 +01:00
Frank ab272da46e FLIGHTGROUP
- Increased dealy before Route to base to 1.0 sec. Previous delay of 0.1 sec was apparently too short for the stop flag to take effect and the task was not called done. Hence the mission was also not done.
2023-01-07 17:04:34 +01:00
Frank 584e932769 ARMYGROUP
- No retreat on out-of-ammo if rearming mission is in the queue
2023-01-07 10:53:46 +01:00
Applevangelist 691a500381 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 11:00:06 +01:00
Applevangelist 1b6169bf2e Merge remote-tracking branch 'origin/develop' into develop 2023-01-05 10:59:31 +01:00
Applevangelist 6b995f8b13 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:59:23 +01:00
Applevangelist 21a2df0830 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 10:49:13 +01:00
Applevangelist d56bc000a1 Merge remote-tracking branch 'origin/develop' into develop 2023-01-05 10:48:03 +01:00
Applevangelist b38f167a27 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2023-01-05 10:47:52 +01:00
Applevangelist 16af086cc5 #CTLD 2023-01-05 10:46:06 +01:00
Thomas 24cc5ca32d Update CTLD.lua 2023-01-04 11:53:59 +01:00
Thomas 47f6f7e8cc Update CTLD.lua 2023-01-04 11:42:56 +01:00
Thomas dde458aea0 Update CSAR.lua 2023-01-04 11:42:25 +01:00
Thomas d34d902413 Develop (#1874)
* #FG
* make us AB the default

* OPS

**CHIEF**
- Fixed bugs of polygon opszones
- Added option to use CAPTUREZONE auftrag for opszones

**OPSZONE**
- Fixed bug when marker off

**ZONE_POLYGON_BASE**
- Added `GetRadius()` function

**LEGION**
- Improved Reinforcement

* AWACS -correct error in SetAwacsDetails (#1873)

Corrected setting of Angels

Co-authored-by: Frank <frank@inter-zone.de>
2023-01-04 09:24:57 +01:00
Thomas 4773a83a24 AWACS -correct error in SetAwacsDetails (#1873)
Corrected setting of Angels
2023-01-04 09:21:00 +01:00
Frank 09e9377e54 Merge pull request #1872 from FlightControl-Master/FF/Ops
OPS
2023-01-03 22:13:28 +01:00
Frank 19a90b7d9d Merge branch 'develop' into FF/Ops 2023-01-03 22:10:09 +01:00
Frank dbaed1e97b OPS
**CHIEF**
- Fixed bugs of polygon opszones
- Added option to use CAPTUREZONE auftrag for opszones

**OPSZONE**
- Fixed bug when marker off

**ZONE_POLYGON_BASE**
- Added `GetRadius()` function

**LEGION**
- Improved Reinforcement
2023-01-03 22:09:56 +01:00
Applevangelist 812aff7f2e AB useage 2023-01-03 10:34:07 +01:00
Applevangelist 9695789843 #FG
* make us AB the default
2023-01-03 10:33:51 +01:00
Applevangelist 75ddd2e1e0 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:23:34 +01:00
Applevangelist 39535cef7b Merge remote-tracking branch 'origin/develop' into develop 2023-01-03 10:23:02 +01:00
Applevangelist d3ba0bbb22 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:22:55 +01:00
Applevangelist 43c81afd12 Merge remote-tracking branch 'origin/master' into develop 2023-01-03 10:17:48 +01:00
Applevangelist 88a837b769 #FlightGroup
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
2023-01-03 10:15:35 +01:00
Applevangelist f401179c57 #FlightGroup
* Added options to allow afterburner, jettison of empty tanks and jettison of weapons
2023-01-03 10:14:06 +01:00
Applevangelist 0bd481d4f0 Merge remote-tracking branch 'origin/develop' into develop 2023-01-02 17:29:15 +01:00
Applevangelist 0942f02d2c Merge remote-tracking branch 'origin/master' into develop 2023-01-02 17:29:09 +01:00
Applevangelist 55656761d2 #FIXES 2023-01-02 17:28:20 +01:00
Applevangelist 659188e3cb UNIT 2023-01-02 17:27:27 +01:00
Applevangelist 9657976f63 FG 2023-01-02 17:27:20 +01:00
Applevangelist 97e44b2042 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
2023-01-02 16:56:29 +01:00
Applevangelist 112457cb4b Merge remote-tracking branch 'origin/master' into develop 2023-01-02 16:55:49 +01:00
Thomas dcd9915fe0 Merge master in Apple-Dev (#1871)
* #TIMER
* Added `StartIf()`

* PseudoATC - Option to display playername (#1870)

Use `myatc:SetReportPlayername()` to switch this on #1864
2023-01-02 14:34:12 +01:00
Thomas 4373ee8d13 Develop (#1869)
* #TIMER
* Added `StartIf()`

* OPS

request

* AUFTRAG CAP

- Fixed mission speed (unit conversion)

* ZONE

Co-authored-by: Frank <frank@inter-zone.de>
2023-01-02 13:56:55 +01:00
Thomas 8ed85795c6 #TIMER (#1867)
* Added `StartIf()`
2023-01-02 13:34:32 +01:00
Thomas 671f4a131e Update FlightGroup.lua
Output 3775 AddWaypoint Controls
2023-01-02 13:32:51 +01:00
Thomas 9680f38dc8 Update Auftrag.lua
NewCAP Line 1313: mission.missionSpeed = UTILS.KnotsToKmph(UTILS.KnotsToAltKIAS(Speed or 350, Altitude))
2023-01-02 13:28:36 +01:00
Frank 92710f4625 Merge pull request #1866 from FlightControl-Master/FF/Ops
Zones
2023-01-02 12:08:37 +01:00
Frank 58dc353bcd ZONE 2023-01-02 11:54:05 +01:00
Frank b194985827 Merge branch 'develop' into FF/Ops 2023-01-01 20:10:28 +01:00
Frank bdd283956c AUFTRAG CAP
- Fixed mission speed (unit conversion)
2023-01-01 20:07:14 +01:00
Frank a9b0017c04 OPS
request
2023-01-01 20:01:36 +01:00
Applevangelist d36ceb861a FG Mission Speed Fix 2023-01-01 13:30:46 +01:00
Applevangelist 8f185d1291 #TIMER
* Added `StartIf()`
2023-01-01 12:34:32 +01:00
Applevangelist 6fa3f0a11c #TIMER
* Added `StartIf()`
2023-01-01 12:33:35 +01:00
Applevangelist 144521936a Merge branch 'develop-2' into develop 2023-01-01 11:48:11 +01:00
Frank 9564d9d893 Merge pull request #1861 from FlightControl-Master/FF/Ops
Update FlightGroup.lua
2023-01-01 09:30:15 +01:00
Frank fe01c6196e Update FlightGroup.lua
- fixed bug that mission does not exist
2023-01-01 09:27:05 +01:00
Frank c8d9377dbb Merge pull request #1860 from FlightControl-Master/FF/Ops
OPS
2023-01-01 01:08:59 +01:00
Frank d53f01232d OPS 2023-01-01 01:06:02 +01:00
Applevangelist 1d3abdb268 Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 18:09:08 +01:00
Applevangelist a35d3e180b FG 2022-12-31 18:08:20 +01:00
Applevangelist e3f9a27f87 # FF changes from today 2022-12-31 18:07:35 +01:00
Applevangelist e25b9155b4 Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 18:02:35 +01:00
Applevangelist b769568df1 #FG - let planes not limp around 2022-12-31 18:02:15 +01:00
Thomas daa60ac501 Update Auftrag.lua 2022-12-31 18:01:28 +01:00
Applevangelist b811aa09a8 # FG improvements 2022-12-31 17:54:04 +01:00
Applevangelist ecf4f14222 #PLAYERTASK -menu issues 2022-12-31 15:56:21 +01:00
Applevangelist 0340d17ab8 #PLAYERTASKCONTROLLER
* honing the menu build a bit
2022-12-31 15:56:01 +01:00
Applevangelist 892be1b2cf Merge remote-tracking branch 'origin/develop' into develop 2022-12-31 12:43:10 +01:00
Frank c33f637717 Merge pull request #1859 from FlightControl-Master/FF/Ops
OPS
2022-12-31 12:42:02 +01:00
Frank 334af52ddf Merge branch 'develop' into FF/Ops 2022-12-31 12:35:59 +01:00
Frank 9a949c02c5 OPS
- Fixed bug task for recoverytanker mission
- Improved capturezone auftrag
2022-12-31 12:35:48 +01:00
Applevangelist 095c36b3ba #AWACS
* Block Helos from getting CAP assignments
2022-12-31 12:24:49 +01:00
Applevangelist 41be279a89 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2022-12-31 12:18:49 +01:00
Applevangelist 56b7364a13 # Helo 2022-12-31 12:18:12 +01:00
Frank ff7ebb4f92 Merge pull request #1858 from FlightControl-Master/FF/Ops
OPS Capture Zone
2022-12-30 22:30:57 +01:00
Frank 3834991e6a Merge branch 'develop' into FF/Ops 2022-12-30 22:08:41 +01:00
Frank 67af073b95 OPS
Capture
2022-12-30 22:08:27 +01:00
Applevangelist 5a44948050 #FLIGHTGROUP
* Make one is local
2022-12-30 17:40:10 +01:00
Applevangelist d12799a892 OPS 2022-12-30 17:39:18 +01:00
Frank 3011d625b2 OPS
Capture Zone
2022-12-30 02:44:16 +01:00
Applevangelist 1f1efe553a Merge remote-tracking branch 'origin/master' into develop 2022-12-29 16:34:39 +01:00
Applevangelist d25efe2293 #ATIS
* Make SRS say TACAN and FARP and not spell the single characters
2022-12-29 16:34:11 +01:00
Applevangelist 8202791518 #AWACS
* Added option for helos to sign-in

#ATIS
* Make SRS say TACAN and FARP and not spell the single characters
2022-12-29 16:33:43 +01:00
Applevangelist 65f8da77d2 # Make SRS say TACAN not T A C A N 2022-12-29 16:32:29 +01:00
Applevangelist 193f83fcc3 #AWACS
* Added option for helos
2022-12-29 11:57:18 +01:00
Applevangelist 9871bf82d3 #UTILS
* Load/Save Improvements
2022-12-28 15:48:46 +01:00
Applevangelist 972f079bd5 Merge remote-tracking branch 'origin/master' into develop 2022-12-28 15:48:03 +01:00
Applevangelist 340c5abdb5 #UTILS 2022-12-28 15:47:44 +01:00
Applevangelist f9c1d62173 #ATIS
* FARP support
2022-12-25 14:20:25 +01:00
Applevangelist 86ea757a16 #ATIS
* FARP support
2022-12-25 14:19:27 +01:00
Applevangelist 89d854f5be #EVENT
* Small fix for hit event on coordinates
2022-12-24 12:04:08 +01:00
Applevangelist c6f4c6f0fa #EVENT
* Small fix for hit event on coordinates
2022-12-24 12:03:34 +01:00
Applevangelist 849c6ae88b #AUFTRAG 2022-12-23 13:47:35 +01:00
Applevangelist 7ff5e13876 Merge remote-tracking branch 'origin/develop' into develop 2022-12-23 13:45:24 +01:00
phr0gz f1e0bacadb CAPGROUP (#1853)
Fix help typo
2022-12-23 13:44:38 +01:00
Applevangelist 1b0131bd9d Merge remote-tracking branch 'origin/master' into develop 2022-12-23 13:43:43 +01:00
Applevangelist f833137455 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 13:42:56 +01:00
Applevangelist 68092e5966 #CTLD 2022-12-23 13:42:48 +01:00
Applevangelist 2f6cd20cbd Merge remote-tracking branch 'origin/master' into develop 2022-12-21 14:12:23 +01:00
Applevangelist e5a9bf6568 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Unit.lua
2022-12-21 14:11:54 +01:00
Applevangelist d66d99a24e #CTLD
* Added option to inject troops into helo cargo
2022-12-21 14:07:21 +01:00
Applevangelist e74c377bfd #CTLD
* Added option to inject troops into helo
2022-12-21 14:06:28 +01:00
Applevangelist 9e823f12c2 #SET_SCENERY
* Added GetAliveSet
2022-12-21 12:55:38 +01:00
Applevangelist ef5ea01bc1 #TARGET
* Fixes for Scenery and Static Objects
2022-12-21 12:53:08 +01:00
Applevangelist 669e55d435 #Fixes 2022-12-21 12:52:24 +01:00
Frank 30e6542887 OPS 2022-12-20 23:51:18 +01:00
Applevangelist 3564843e1b #fixes 2022-12-20 18:18:44 +01:00
Applevangelist b501eec306 #AUFTRAG
* Fix Orbit w&w/o racetrack
2022-12-20 18:18:24 +01:00
Applevangelist 79e99dcb38 #PLAYERTASK
* Added `GetTarget()`
2022-12-20 16:05:50 +01:00
Applevangelist f6eccba966 #SET_UNIT - docu fixes
#UNIT - Improved GetGroup() as after the Dec/22 patch getGroup() might be nil
2022-12-19 16:14:41 +01:00
Applevangelist 56c9cb2978 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 16:13:21 +01:00
Applevangelist aa072b5ad8 fixes 2022-12-19 16:12:41 +01:00
Applevangelist fa1f67420d #CTLD
* Fix to also save crates which have not been moved
2022-12-19 14:05:21 +01:00
Applevangelist c08f79de50 #CTLD 2022-12-19 14:03:35 +01:00
Applevangelist 9c665f83d3 #Fixes 2022-12-19 13:52:49 +01:00
Applevangelist 6e26e7eac3 #AUFTRAG
* Fix for orbit racetrack missing coordinate object
2022-12-19 13:08:35 +01:00
Applevangelist a151c5587a AUFTRAG - fix for racetrack orbit 2022-12-19 13:07:01 +01:00
Applevangelist 0a04ff4f3c #AIRBASE
* Added Rio Chico
2022-12-16 18:45:21 +01:00
Applevangelist 676d942d54 Merge remote-tracking branch 'origin/master' into develop 2022-12-16 18:44:35 +01:00
Applevangelist 99023a3053 #UTILS
* UTILS.LoadSetOfStatics(Path,Filename) ignore statics which do not exist
2022-12-15 18:29:46 +01:00
Applevangelist a02d9817ce Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2022-12-15 18:28:57 +01:00
Applevangelist d88b31f43a #UTILS
* UTILS.LoadSetOfStatics(Path,Filename) ignore statics which do not exist
2022-12-15 18:28:24 +01:00
Applevangelist a3fd583d9d #PLAYERTASK
* additions for multiple setups
2022-12-15 11:50:05 +01:00
Applevangelist b8e2d438c6 #SET_CLIENT
* Additions
2022-12-15 11:47:36 +01:00
Applevangelist df4cf982dd #PLAYERTASK - additions for multiple setups 2022-12-15 11:47:15 +01:00
Applevangelist 21da2625e9 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2022-12-14 15:06:08 +01:00
Applevangelist a6e7ea6590 #SET_CLIENT
* Added FilterCallsigns()
* Added FilterPlayernames()
2022-12-14 14:50:06 +01:00
Applevangelist 52d20ed8ef Additions 2022-12-14 14:48:49 +01:00
Applevangelist 178e4ceb7f #PLAYERTASKCONTROLLER
* Added PLAYERTASKCONTROLLER:AddPlayerTaskToQueue(PlayerTask,Silent,TaskFilter) TaskFilter switch
2022-12-14 11:42:12 +01:00
Applevangelist e12455d154 #AI GCI DISPATCHER
* Fix demo mission link
2022-12-14 09:43:34 +01:00
Applevangelist 21e12068c7 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 09:42:33 +01:00
Applevangelist 9cf209d62b #SET_Client additions 2022-12-14 09:42:10 +01:00
Thomas 4368bef32f Update Set.lua
Added SET_CLIENT:FilterCallsigns() and SET_CLIENT:FilterPlayernames()
2022-12-13 16:59:06 +01:00
Applevangelist 71d5983adf #AIRBASE
* docu typo
2022-12-12 16:25:07 +01:00
Applevangelist 696569f749 #PLAYERTASK
* Added typename combos as option for menu entries
2022-12-12 16:24:25 +01:00
Applevangelist 2e4f7956ac #PlayerTask
* typename options added
2022-12-12 16:23:23 +01:00
Applevangelist 90eca9f6a3 #minor enhancements 2022-12-11 15:51:41 +01:00
Applevangelist 4892a58084 #SET
* improve GetRandom() a bit
2022-12-11 15:51:22 +01:00
Applevangelist 75d8d55691 #AWACS
* Skip Task Assignement Menus if PlayerCapAssignement is false
2022-12-11 15:50:36 +01:00
Applevangelist 614cfcd7f7 Merge remote-tracking branch 'origin/master' into develop 2022-12-09 12:38:02 +01:00
Applevangelist 7dc8285fd5 #CTLD
* Added disallow building in loadzones: my_ctld.nobuildinloadzones = true
2022-12-09 12:37:24 +01:00
Applevangelist ba5b2e827c Merge remote-tracking branch 'origin/develop' into develop 2022-12-09 09:07:58 +01:00
Thomas 2c75ea1a18 Update Set.lua
Improve GetLast and GetRandom
2022-12-08 14:33:50 +01:00
phr0gz 8eef039312 New CAP auftrag (#1850)
Add Ability to CAP escort Ground group or helo with a new auftrag: AUFTRAG:NewCAPGROUP
2022-12-08 13:15:07 +01:00
Applevangelist 047a108689 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2022-12-07 19:00:59 +01:00
Applevangelist f6a88db46b #CTLD Fix for Beacon Zone disappearing too fast 2022-12-07 18:58:56 +01:00
Applevangelist 9c5847153a Merge remote-tracking branch 'origin/develop' into develop 2022-12-07 18:58:11 +01:00
Applevangelist cdfb47448f #AWACS
* Fix setting of CapVoices according to documentation
#PLAYERRECCE
* Speed up Marker Build
#PLAYERTASK
* Improve menu build
2022-12-07 18:58:07 +01:00
Applevangelist 2fc2031665 #minor enhancements 2022-12-07 18:55:32 +01:00
Applevangelist aed8cb9cf5 #CTLD - enforce modulation on beacons 2022-12-07 18:55:03 +01:00
Applevangelist 96344e3abf Radio enum 2022-12-07 18:54:56 +01:00
Frank 0adca414ce Merge branch 'develop' into FF/Ops 2022-12-07 18:36:04 +01:00
Frank 16bfbabf19 Merge branch 'master' into develop 2022-12-07 18:35:27 +01:00
Frank 539dfd6a38 OPS Operation
- Condition
- Armygroup
- Auftrag
- OPS
2022-12-07 18:32:50 +01:00
Applevangelist 525666be7c #PLAYERRECCE
* Smoke own position on ground, not mid-air
2022-12-06 18:05:41 +01:00
Applevangelist 73d53176d1 #PLAYERRECCE
* Smoke own position on ground, not mid-air
2022-12-06 18:05:29 +01:00
Applevangelist edb0f25449 Merge remote-tracking branch 'origin/master' into develop 2022-12-06 12:50:38 +01:00
Applevangelist 386171bcab #PLAYERTASKCONTROLLER
* Make callout of MGRS coordinates slower
2022-12-06 12:50:08 +01:00
Applevangelist 2b572f4948 #PLAYERTASK
* slower callout for MGRS coordinates
#CTLD
* Reduce log noise
2022-12-06 12:49:05 +01:00
Applevangelist 55383575e0 #PLAYERTASKCONTROLLER
* Make callout of MGRS coordinates slower
2022-12-06 12:48:20 +01:00
Applevangelist 9659bfa553 #CTLD Fix for Beacon Zone disappearing too fast 2022-12-03 14:38:57 +01:00
Applevangelist df901e7433 Merge branch 'master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Set.lua
2022-12-03 14:38:27 +01:00
Applevangelist 85504fbe62 Small Fixes 2022-12-03 14:36:28 +01:00
Applevangelist 60d91cb2fb Small fixes 2022-12-03 14:36:14 +01:00
Applevangelist d011c8e72f #CTLD Frequency Beacons 2022-12-02 17:30:59 +01:00
Applevangelist 3295dd3635 # CTLD BEACON zone fixes 2022-12-02 16:52:20 +01:00
Applevangelist de8dcc4024 Merge remote-tracking branch 'origin/master' into develop 2022-12-02 16:39:45 +01:00
Applevangelist b7413f1dff * Small fixes 2022-12-02 16:36:33 +01:00
Applevangelist 620c8eaa27 Merge remote-tracking branch 'origin/master' into develop 2022-12-01 13:29:20 +01:00
Applevangelist 7c689d0f5c Merge remote-tracking branch 'origin/master' into develop 2022-12-01 13:24:20 +01:00
Applevangelist 3281b669ae * minor fixes 2022-12-01 13:23:57 +01:00
Frank 3f296554ed Merge branch 'develop' into FF/Ops 2022-11-30 18:37:51 +01:00
Frank 2a8d166c54 Merge branch 'master' into develop 2022-11-30 18:37:28 +01:00
Frank 6bc263bd2b CONDITON and OPERATION 2022-11-30 13:36:13 +01:00
Applevangelist 2a4d339ff3 Merge remote-tracking branch 'origin/master' into develop 2022-11-29 17:54:40 +01:00
Applevangelist 907d62c4e7 Merge remote-tracking branch 'origin/master' into develop 2022-11-29 17:54:15 +01:00
Applevangelist 35c6e4b9fb Merge remote-tracking branch 'origin/master' into develop 2022-11-29 15:43:12 +01:00
Applevangelist 6965d319ef #CTLD
* Fix for BEACON zones
2022-11-29 15:42:49 +01:00
Applevangelist d674f55343 #PLAYERTASK
* Added Silent option for PLAYERTASKCONTROLLER:AddPlayerTaskToQueue(PlayerTask,Silent)
2022-11-29 15:42:04 +01:00
Applevangelist 65d25f6544 #PLAYERTASK
* PLAYERTASKCONTROLLER:AddPlayerTaskToQueue(PlayerTask,Silent) Silent option added
#CTLD
* Small fix for BEACON Zones
2022-11-29 15:40:58 +01:00
Applevangelist af0106d466 Merge remote-tracking branch 'origin/master' into develop 2022-11-28 17:46:28 +01:00
Thomas 75bc95167f Update RAT.lua (#1849)
Fix #1848
2022-11-28 17:45:47 +01:00
Thomas df94c89ce8 RAT - Remove the #... at the end on ATC callouts
RAT - Remove the #... at the end on ATC callouts to nicefy immersion
2022-11-28 09:28:55 +01:00
Applevangelist 8faf911df8 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Utilities/Utils.lua
2022-11-27 17:36:38 +01:00
Applevangelist 66bf32351a Merge remote-tracking branch 'origin/master' into develop 2022-11-27 17:35:42 +01:00
Applevangelist 136d4109f5 * less noise 2022-11-27 17:34:46 +01:00
Applevangelist 1a8f9fca26 #Auftrag
* Fix for Orbit task
2022-11-23 12:58:26 +01:00
Applevangelist fe9a5aea2a #AUFTRAG
* Fix for orbit task not able to get a Vec2 from a Vec2...
2022-11-23 12:57:54 +01:00
Applevangelist b99d963cd5 #SPAWN
* Fix callsign dupplication of numbers introduced with 2.8
2022-11-23 09:56:37 +01:00
Applevangelist 2304ea3829 #SPAWN
* Fix callsign dupplication of numbers introduced with 2.8
2022-11-23 09:56:08 +01:00
Applevangelist dd7dfcff68 Merge remote-tracking branch 'origin/master' into develop 2022-11-21 15:53:33 +01:00
Frank b8398af5a3 Merge branch 'master' into develop 2022-11-20 20:56:07 +01:00
Applevangelist 959e4883df Merge remote-tracking branch 'origin/master' into develop 2022-11-20 11:52:25 +01:00
Frank 10d8af2536 Merge branch 'master' into develop 2022-11-19 19:37:54 +01:00
Frank e79941bb8b Merge pull request #1846 from FlightControl-Master/FF/Ops
OPS
2022-11-18 20:02:15 +01:00
Frank 4124b6d084 OPS
**LEGION**
- Added `Captured` event

**COMMANDER**
- Improved behaviour when legion/warehouse is captured
- Added `LegionLost` event
- Added `RemoveLegion` function

**CHIEF**
- Improved behaviour when legion/warehouse is captured
- Added `LegionLost` event
- Added `RemoveLegion` function
2022-11-18 19:56:30 +01:00
Applevangelist ae9c258531 Merge remote-tracking branch 'origin/master' into develop 2022-11-18 11:29:45 +01:00
Applevangelist f7e42b6e31 Merge remote-tracking branch 'origin/master' into develop 2022-11-18 11:29:18 +01:00
Applevangelist df17a3d2a3 # TaskRecoveryTanker 2022-11-18 11:28:33 +01:00
Applevangelist 0eb5834e1c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
2022-11-18 11:25:47 +01:00
Applevangelist 6f02f67168 #GROUP
* Added additional push of tanker task to GROUP:SetAsRecoveryTanker() for a working setup
2022-11-18 11:24:54 +01:00
Applevangelist b47737bda3 #GROUP
* Added additional push of tanker task to GROUP:SetAsRecoveryTanker() for a working setup
2022-11-18 11:24:36 +01:00
Applevangelist 96bb475306 #GROUP/CONTROLLABLE
* Added RecoveryTanker Task
2022-11-18 09:59:43 +01:00
Applevangelist 74b1a23ca8 #GROUP/CONTROLLABLE
* Added RecoveryTanker Task
2022-11-18 09:59:00 +01:00
Applevangelist 7490796637 #AIRBASE
* Added enumerators for
-- * AIRBASE.SouthAtlantic.Puerto_Santa_Cruz
-- * AIRBASE.SouthAtlantic.Comandante_Luis_Piedrabuena
-- * AIRBASE.SouthAtlantic.Aerodromo_De_Tolhuin
-- * AIRBASE.SouthAtlantic.Porvenir_Airfield
-- * AIRBASE.SouthAtlantic.Almirante_Schroeders
-- * AIRBASE.SouthAtlantic.Rio_Turbio
2022-11-17 17:14:52 +01:00
Applevangelist 592ca34923 #AIRBASE
* Added enumerators for
-- * AIRBASE.SouthAtlantic.Puerto_Santa_Cruz
-- * AIRBASE.SouthAtlantic.Comandante_Luis_Piedrabuena
-- * AIRBASE.SouthAtlantic.Aerodromo_De_Tolhuin
-- * AIRBASE.SouthAtlantic.Porvenir_Airfield
-- * AIRBASE.SouthAtlantic.Almirante_Schroeders
-- * AIRBASE.SouthAtlantic.Rio_Turbio
2022-11-17 17:14:16 +01:00
Applevangelist d77c347f24 #CSAR
* Make rescued pilot's weight configureable
2022-11-17 13:56:10 +01:00
Applevangelist a9f2df83ff #CSAR
* Make rescued pilot's weight configureable
2022-11-17 13:55:42 +01:00
Applevangelist 50aca57112 #PLAYERTASK
* Extended use of marker ops:
-- Enable the function like so:
--          mycontroller:EnableMarkerOps("TASK")
-- Then as a player in a client slot, you can add a map marker on the F10 map. Next edit the text
-- in the marker to make it identifiable, e.g
--
-- TASK Name=Tanks Sochi, Text=Destroy tank group located near Sochi!
--
-- Where **TASK** is the tag that tells the controller this mark is a target location (must).
-- **Name=** ended by a comma **,** tells the controller the supposed menu entry name (optional). No extra spaces! End with a comma!
-- **Text=** tells the controller the supposed free text task description (optional, only taken if **Name=** is present first). No extra spaces!
function PLAYERTASKCONTROLLER:EnableMarkerOps(Tag)
2022-11-17 13:22:34 +01:00
Applevangelist 45b78a2e26 Fixes 2022-11-17 13:21:57 +01:00
Applevangelist 416ea2490c Merge remote-tracking branch 'origin/develop' into develop 2022-11-16 11:18:18 +01:00
Applevangelist 5011269586 #SPAWN
* Ensure we have a numbered table for InitRandomizeTemplate/Zone so math.random actually works
* Also, pre-shuffle tables
2022-11-16 11:17:19 +01:00
Applevangelist 567c290117 Merge remote-tracking branch 'origin/master' into develop 2022-11-16 11:16:48 +01:00
Applevangelist aab22ef402 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
#	Moose Development/Moose/Ops/Awacs.lua
2022-11-16 11:16:25 +01:00
Applevangelist 502a8a0186 #SPAWN
* Ensure we have a numbered table for InitRandomizeTemplate/Zone so math.random actually works
* Also, pre-shuffle tables
2022-11-16 11:13:07 +01:00
Frank bd42032e3a Merge pull request #1844 from FlightControl-Master/FF/Ops
OPS
2022-11-16 10:44:00 +01:00
Frank 1256cc3bd1 OPS
**FLIGHTGROUP**
- Waypoint altitude for helos is not radar (AGL)
- Increased cruise speed thresholds for helos to 110 kts and 380 kts for fixed wing
2022-11-16 10:41:33 +01:00
Applevangelist 62122a15bc #MESSAGE
* Added ToCountry()
* Added country names in country.id enum
2022-11-16 09:42:36 +01:00
Applevangelist 591132deac Merge remote-tracking branch 'origin/master' into develop 2022-11-16 09:40:31 +01:00
Applevangelist f86db5f134 #PLAYERTASK
* Verbose to false
* Verbose add message for marker ops showing coordinate as per _SETTINGS
2022-11-15 17:56:29 +01:00
Applevangelist 709da6b6e6 #Fixes 2022-11-15 17:55:24 +01:00
Applevangelist 67a2deb3a4 #PLAYERTASK
* Added option to show coord of target in info (always)
2022-11-15 16:33:12 +01:00
Thomas 2acb841539 Update PlayerTask.lua
Feature added #1841 `PLAYERTASKCONTROLLER:SetInfoShowsCoordinate(OnOff,LLDDM)`
2022-11-15 15:59:03 +01:00
Applevangelist 6724bb8edd # Bug fixes 2022-11-14 18:17:27 +01:00
Applevangelist ed84d7453d #Bug fixes 2022-11-14 18:14:04 +01:00
Applevangelist 7b5b5e0bd2 #ATIS
* Honor Stop() function
2022-11-14 17:38:46 +01:00
Applevangelist 243ac3027f #PLAYERTASK
* Added a couple of QOL functions for internal INTEL object
2022-11-14 17:38:07 +01:00
Applevangelist 6365298e4b #PLAYERTASK
* Added a couple of QOL functions for internal INTEL object
2022-11-14 17:37:49 +01:00
Applevangelist 79a4af44d3 Merge remote-tracking branch 'origin/master' into develop 2022-11-13 13:51:59 +01:00
Applevangelist f0bbc5a777 Merge remote-tracking branch 'origin/master' into develop 2022-11-13 13:51:32 +01:00
Applevangelist 180a0b39d1 Merge remote-tracking branch 'origin/develop' into develop 2022-11-13 13:38:13 +01:00
Applevangelist 2664c36a14 #CTLD
* Change call order to move troops, vehicle on `onafter..` internally
* added pseudo-function for "OnBefore..."
2022-11-13 13:37:55 +01:00
Applevangelist 159f7f3b29 #CTLD
* Change call order to move troops, vehicle on `onafter..` internally
* added pseudo-function for "OnBefore..."
2022-11-13 13:37:45 +01:00
Rolln 911f4523a1 F10 Marker text fix (#1840) 2022-11-11 20:01:32 +01:00
Applevangelist 38b17ff66a * Fix NewHover 2022-11-11 15:40:22 +01:00
Applevangelist 09b86d6fdf #OPSGROUP
* Fix for NewHover
2022-11-11 15:40:03 +01:00
Applevangelist 484ea06c80 Merge remote-tracking branch 'origin/master' into develop 2022-11-11 11:43:01 +01:00
Applevangelist 5ec8a4674c Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/DCS.lua
2022-11-11 11:42:30 +01:00
Applevangelist 2a567c9f74 Docu Headlines part II 2022-11-11 11:40:22 +01:00
Applevangelist b9a7fc9409 #AUFTRAG
* Corrected speed setting in NewHover
2022-11-11 10:00:13 +01:00
Applevangelist f1ff66b39c #AUFTRAG - slight improvement to NewHover 2022-11-11 09:59:11 +01:00
Applevangelist 0db13b6cdf Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
#	Moose Development/Moose/Functional/ZoneGoalCoalition.lua
2022-11-11 09:38:27 +01:00
Applevangelist 27a2f42e48 Merge remote-tracking branch 'origin/master' into develop 2022-11-11 09:36:38 +01:00
Applevangelist 08c7409627 Docu Headlines 2022-11-11 09:22:48 +01:00
Applevangelist 744427da46 tdada 2022-11-10 17:53:43 +01:00
Applevangelist c38cb046cd #AMMOTRUCK
* Added demo mission link
2022-11-10 17:53:29 +01:00
Applevangelist 037b168825 Merge remote-tracking branch 'origin/master' into develop 2022-11-10 17:33:52 +01:00
Applevangelist 3ae8b05e1f Merge remote-tracking branch 'origin/master' into develop 2022-11-10 17:33:15 +01:00
Applevangelist 3907e49b9e #Docu fixes 2022-11-10 17:30:00 +01:00
Applevangelist 41a928b775 #Docu fixes 2022-11-10 17:29:19 +01:00
Applevangelist 27598406d1 #AMMOTRUCK
* Initial Release
2022-11-10 17:11:29 +01:00
Applevangelist 4194614d65 #AMMOTRUCK 2022-11-10 17:11:00 +01:00
Applevangelist ff10144ad7 #AWACS
* SRS output for "ShowTask"
* Some minor bug fixing
2022-11-10 12:20:39 +01:00
Applevangelist a0ad5292b9 #AWACS
* SRS output for "ShowTask"
* Some minor bug fixing
2022-11-10 12:18:18 +01:00
Frank a1a258f48e Merge pull request #1838 from FlightControl-Master/FF/Ops
OPS
2022-11-10 00:40:15 +01:00
Frank 4a0040a12f Merge branch 'develop' into FF/Ops 2022-11-10 00:36:14 +01:00
Frank ab13b5f198 Update Intelligence.lua
- Added check for filter categories.
2022-11-10 00:36:02 +01:00
Applevangelist 788d2d49b9 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:11:44 +01:00
Applevangelist 54247d17c1 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:11:02 +01:00
Applevangelist 326733a312 AWACS 2022-11-09 16:10:34 +01:00
Applevangelist fb203df364 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Awacs.lua
2022-11-09 16:06:40 +01:00
Applevangelist 8d5fe02105 Merge remote-tracking branch 'origin/master' into develop 2022-11-09 16:06:01 +01:00
Thomas dda96d8f05 AWACS - Speak task info
Feature request
2022-11-09 13:08:06 +01:00
Frank 6c342ef910 Merge pull request #1834 from FlightControl-Master/FF/Ops
OPS
2022-11-08 22:11:21 +01:00
Frank a4b5362347 Update Cohort.lua
- Added functions to get and set attributes
- Added function to get category and properties
2022-11-08 22:01:44 +01:00
Frank 0e78be86e4 CHIEF
- Added resource.carrierProperties for LEGION.AssignAssetsForTransport
- Ensure table for carrier categories, attributes and properties
2022-11-08 20:29:51 +01:00
Applevangelist e348bbc344 #AWACS
* Minor Enhancements
2022-11-08 17:24:32 +01:00
Applevangelist e2bae31e55 #AWACS
* Minor Enhancements
2022-11-08 17:24:11 +01:00
Applevangelist dcaaa11608 #AWACS
* Minor Enhancements
2022-11-08 16:59:29 +01:00
Applevangelist bad17c39d1 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:46 +01:00
Applevangelist 8ed30da473 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:14 +01:00
Applevangelist b057e83898 * POINT/PLAYERTASK
* Added option to get BR/BRA with add'l magnetic heading
2022-11-08 15:43:00 +01:00
Applevangelist af1083d0f1 #MSRS
* Docu corrections
* Added `AddFrequencies()` and `AddModulations()`
2022-11-08 10:11:28 +01:00
Applevangelist 17f2a3e79a #MSRS
* Docu corrections
* Added `AddFrequencies()` and `AddModulations()`
2022-11-08 10:10:57 +01:00
Applevangelist 4fff842c90 #CTLD Fix Ship Zones 2022-11-07 19:14:09 +01:00
Applevangelist 071b72e3fd Merge remote-tracking branch 'origin/master' into develop 2022-11-07 19:13:21 +01:00
Applevangelist 63aff9dcd1 #CTLD Fix Ship Zones 2022-11-07 19:12:36 +01:00
Applevangelist 7f81039f46 #CTLD - Added Bronco support 2022-11-07 18:21:36 +01:00
Applevangelist b63be6dd28 #PLAYERTASK
* Fix #1826 CTLD/CSAR closing immediately
2022-11-07 17:39:11 +01:00
Applevangelist 1bc7e5d6cd Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2022-11-07 17:37:18 +01:00
Applevangelist 565a5294e2 Merge remote-tracking branch 'origin/master' into develop 2022-11-07 16:09:00 +01:00
Thomas c08d54c16b CTLD - Fix Ship Zones
CTLD - Fix Ship Zones
2022-11-07 14:11:16 +01:00
Thomas 2eea8520d8 Merge CTLD Bronco update into master (#1829)
* Update Range.lua (#1825)

Add meter text to RANGE bombing result.

* CTLD - added Bronco (#1828)

Added data for the Bronco-OV-10A - needs further additions to ensure to work, as this is a plane, not a chopper #1827

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-11-07 11:23:39 +01:00
Frank 254d43fef1 AIRWING/WAREHOUSE
- Improved parking spot check if explicitly given for an airwing or squadron
- Improved parking check if airstart is requested.
2022-11-06 12:17:07 +01:00
Applevangelist 6f254b06b0 #SCORING
* Added option to switch AutoSave
2022-11-06 11:28:20 +01:00
Applevangelist 5819884c98 #SCORING
* Added option to switch AutoSave
2022-11-06 11:27:27 +01:00
Frank cb43f9c392 CHIEF
- cleaned up resources
2022-11-05 23:48:42 +01:00
Applevangelist e512569d5c Merge remote-tracking branch 'origin/develop' into develop 2022-11-05 14:05:16 +01:00
Applevangelist d805352a97 Merge remote-tracking branch 'origin/master' into develop 2022-11-05 14:04:39 +01:00
Applevangelist ed677b7682 Merge remote-tracking branch 'origin/master' into develop 2022-11-05 14:04:06 +01:00
Frank ead8411454 Merge pull request #1824 from FlightControl-Master/FF/Ops
OPS
2022-11-04 22:55:24 +01:00
Frank 1fc9f13919 Version 2022-11-04 22:36:20 +01:00
Frank 6bf077e0aa Merge branch 'develop' into FF/Ops 2022-11-04 19:47:52 +01:00
Applevangelist 0de8c0beb2 #INTEL
* Added `INTEL:GetHighestThreatContact(Cluster)`
2022-11-04 13:31:33 +01:00
Applevangelist ce7a86842f #INTEL 2022-11-04 13:31:03 +01:00
Frank 39f690f2b4 OPS
- AUFTRAG: Orbit is now in KIAS
- CHIEF: fixes for resource
2022-11-03 22:46:10 +01:00
Frank 1a575d9364 Update OpsGroup.lua
- Improved mission ingreess on-off-road waypoint
2022-11-02 23:51:53 +01:00
Frank fe58253a44 Update Chief.lua
added remove conflict zone
2022-11-02 23:30:19 +01:00
Frank 65cc72e28b Merge branch 'develop' into FF/Ops 2022-11-02 22:59:19 +01:00
Frank 00f8fccfae Update ArmyGroup.lua
- Improved updateroute waypoints
2022-11-02 22:57:05 +01:00
Applevangelist 1fea016ac1 Merge remote-tracking branch 'origin/master' into develop 2022-11-02 17:33:34 +01:00
Applevangelist 13e5b03aa8 Merge remote-tracking branch 'origin/master' into develop 2022-11-02 17:33:00 +01:00
Applevangelist 35057b9d05 Merge remote-tracking branch 'origin/develop' into develop 2022-11-02 17:32:20 +01:00
Applevangelist b2fdcd5cf0 #CHIEF
* Fix to auto-create CAS/CAS-Enhanced Missions from detected targets; Added BAI mission option for TANKS as target
2022-11-02 17:32:12 +01:00
Applevangelist 0e2ec4836a Merge remote-tracking branch 'origin/Apple/Develop' into develop 2022-11-02 17:31:38 +01:00
Applevangelist 0c35cd9680 #CHIEF
* Fix to auto-create CAS/CAS-Enhanced Missions from detected targets; Added BAI mission option for TANKS as target
2022-11-02 17:31:26 +01:00
Thomas 2b3363de40 Documentation fixes. (#1820) (#1821)
* Documentation fixes.

* Update Airboss.lua

Escape links.

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-11-02 11:24:59 +01:00
Thomas 0839055b7e Documentation fixes. (#1820) (#1822)
* Documentation fixes.

* Update Airboss.lua

Escape links.

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-11-02 11:24:40 +01:00
Frank d031651b58 Fixes for OPSTRANSPOTRT formation 2022-11-01 23:35:18 +01:00
Applevangelist c8d2a0540f Merge remote-tracking branch 'origin/master' into develop 2022-11-01 16:33:09 +01:00
Applevangelist 8fb66ed329 #ZONE_POLYGON
* Scan for Scenery - changed scan strategy as box seems not to work properly all the time
2022-11-01 16:32:40 +01:00
Applevangelist 3ba981a890 #ZONE_POLYGON
* Scan for Scenery - changed scan strategy as box seems not to work properly all the time
2022-11-01 16:32:03 +01:00
Applevangelist e841a38866 #CTLD
* added option for build time delay
2022-11-01 14:33:06 +01:00
Applevangelist e3e2c68114 Merge remote-tracking branch 'origin/master' into develop 2022-11-01 14:32:31 +01:00
Applevangelist 4b0d48922d #CHIEF, CTLD, UNIT 2022-11-01 14:30:09 +01:00
Frank addb7ba36a restore 2022-10-31 20:53:20 +01:00
Frank d4b5e24364 ARMYGROUP
- Fixed opstransport not being readded to brigade
2022-10-31 20:50:35 +01:00
Applevangelist bb9ce9e26f Merge remote-tracking branch 'origin/master' into develop 2022-10-31 16:08:10 +01:00
Applevangelist feca5acc7e #CTLD_HERCULES
* Fix for `CTLD_HERCULES:Cargo_Track(cargo, initiator)` when flying very low
2022-10-31 16:07:41 +01:00
Applevangelist dd32d2e53c #CTLD_HERCULES
* Fix for `CTLD_HERCULES:Cargo_Track(cargo, initiator)` when flying very low
2022-10-31 16:07:25 +01:00
Applevangelist 85cf78407c #EVENT
* Added events from 2.8.0
2022-10-31 15:44:50 +01:00
Applevangelist cc1e071e35 #EVENT
* Added events from 2.8.0
2022-10-31 15:44:29 +01:00
Frank 3f8efae23f Update Chief.lua
resources
2022-10-31 13:26:35 +01:00
Applevangelist 33f4ace038 #AWACS
* Added airborne check
2022-10-31 12:22:59 +01:00
Applevangelist 8ee8898a78 #AWACS
* Added airborne check for detected groups
2022-10-31 12:22:34 +01:00
Applevangelist fc77df4b5d Merge remote-tracking branch 'origin/master' into develop 2022-10-31 10:26:45 +01:00
Applevangelist b613f59b42 Merge remote-tracking branch 'origin/master' into develop 2022-10-31 10:26:02 +01:00
Applevangelist fc829c79c7 or self:HasAttribute("Modern Tanks") 2022-10-31 10:25:34 +01:00
Applevangelist 2925e0b8e3 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
2022-10-31 08:06:10 +01:00
Applevangelist 911bfc44c1 Merge remote-tracking branch 'origin/master' into develop 2022-10-31 08:04:57 +01:00
Applevangelist 13018ed96a Merge remote-tracking branch 'origin/master' into develop 2022-10-31 08:02:21 +01:00
Frank 236e7afcfc AUFTRAG
- New mission type ORBIT_GROUP
- Updated mission type RECOVERYTANKER
2022-10-30 14:10:55 +01:00
Thomas 946a1de931 Merge docu changes (#1818)
* Documentation fixes. (#1810)

Fix documentation references.
Correct spelling errors.
Remove empty whitespaces.
Correct a single mis-spelled ZONE_BASE variable, see 'Core/Zone.lua' (variable "Sureface" -> "Surface", no references to mis-spelled "Sureface" throughout the codebase).
Correct mis-spelling of "coaltion" in 'Functional/Mantis.lua', corrected to "coalition".

* Documentation fixes. (#1811)

Update documentation text and links.
Fix spelling errors.
Other minor adjustments where appropriate, such as remove whitespaces and format code.

* Documentation fixes. (#1815)

Minor documentation and code formatting fixes.
This is mostly intended to have something re-trigger the documentation generation to see if the filename capitalization is resolved.

* Code formatting preparation. (#1817)

Use EmmyLuaCodeStyle that comes with "Lua" VS Code extension (https://marketplace.visualstudio.com/items?itemName=sumneko.lua). More features and configurability than LuaFormatter, and no need for additional extension (beyond "Lua").
Formatting file set up from default template with some tweaks to correspond to most common coding style observed in the code base. Further tweaks are likely required.

* Documentation fixes. (#1816)

Co-authored-by: TommyC81 <tommyc81@gmail.com>
2022-10-29 10:49:18 +02:00
Frank 2840865b83 Up 2022-10-27 23:19:35 +02:00
Applevangelist 1411309204 Fixes 2022-10-21 15:15:51 +02:00
Applevangelist 7731b6c892 fixes 2022-10-21 15:15:32 +02:00
Applevangelist 60927e6728 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 15:11:46 +02:00
Applevangelist 485b743208 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 15:10:49 +02:00
Applevangelist a6c9ba2ec8 #Ops - fixes 2022-10-21 15:10:14 +02:00
Applevangelist 4b11a6a304 #OPS - typos 2022-10-21 15:09:35 +02:00
Applevangelist 37a00f25bc #OPERATION
* Added GetTargets()

#TARGET
* Also call Dead() when no targets left over

#PLAYERTASKCONTROLLER
* Added FSM events for Flaring, Smoking, and Illumination
* Added Illumination of targets in menu if it is night
* Rename menu parent setting to SetParentMenu(Menu)
2022-10-21 09:51:44 +02:00
Applevangelist 1fc541a9df Merge remote-tracking branch 'origin/master' into develop 2022-10-21 08:58:48 +02:00
Applevangelist e0648b7f36 Merge remote-tracking branch 'origin/master' into develop 2022-10-21 08:57:23 +02:00
Applevangelist 5db3775b96 #OPERATION
* Added GetTargets()

#TARGET
* Also call Dead() when no targets left over

#PLAYERTASKCONTROLLER
* Added FSM events for Flaring, Smoking, and Illumination
* Added Illumination of targets in menu if it is night
* Rename menu parent setting to SetParentMenu(Menu)
2022-10-21 08:56:40 +02:00
Applevangelist a82252680d Merge remote-tracking branch 'origin/master' into develop 2022-10-20 11:41:34 +02:00
Applevangelist c3cd732254 #MANTIS
* Add systems from SMA mod
2022-10-20 11:40:57 +02:00
Applevangelist b6394ad7d3 #MANTIS
* Add systems from SMA mod
2022-10-20 11:39:29 +02:00
Applevangelist 59e436ba69 #TARGET additions 2022-10-19 19:14:16 +02:00
Applevangelist 8f7694111b #TARGET
* Docu additions
2022-10-19 19:13:55 +02:00
Applevangelist 2854a2d93e #TARGET
* Some QOL additions, docu, stuff for SCENERY
2022-10-19 17:26:40 +02:00
Applevangelist 3308f16de6 #TARGET
* Some additions for ease of use, and SCENERY
2022-10-19 17:24:58 +02:00
Applevangelist 78c209a96f #PLAYERTASKCONTROLLER
* No spaces in callsign numbers on pilot list in task info screen
2022-10-19 13:05:19 +02:00
Applevangelist 4e79123c11 #PLAYERTASKCONTROLLER
* No spaces in callsign-Nos in task info pilot list
2022-10-19 13:03:25 +02:00
Applevangelist 9809f08954 Merge remote-tracking branch 'origin/master' into develop 2022-10-19 12:46:17 +02:00
Applevangelist bf1fa581ba Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Zone.lua
2022-10-19 12:44:28 +02:00
Applevangelist 4e671ce995 Merge remote-tracking branch 'origin/master' into develop 2022-10-19 12:28:26 +02:00
Applevangelist 3214316663 Merge remote-tracking branch 'origin/master' into develop 2022-10-19 12:27:22 +02:00
Applevangelist 6d92bff3e9 #SCENERY; SET_SCENERY
* enhancements
2022-10-19 12:26:26 +02:00
Rolln b5fd737cea Playertaskcontroller parent menu (#1806)
* Ability to set parent menu of PlayerTaskController

* Updated Docmentation

* Update PlayerTask.lua

Co-authored-by: Thomas <72444570+Applevangelist@users.noreply.github.com>
2022-10-19 12:21:16 +02:00
Frank 6f82fd7eb6 Merge branch 'develop' into FF/Ops 2022-10-18 22:33:07 +02:00
Applevangelist 9cd2346cd5 #CTLD
* added a check for zones; not added when zone does not exist
2022-10-18 17:27:33 +02:00
Applevangelist 542fe20782 #CTLD
* added a check for zones; not added when zone does not exist
2022-10-18 17:26:24 +02:00
Applevangelist 92591432d3 #CSAR
* Added use of custom callsigns
* Added cargo weight for rescued pilots
* Improved o'clock calculation

#CTLD
* Docu additions
2022-10-18 17:01:32 +02:00
Applevangelist a20cdac9c3 #CSAR
* Added use of custom callsigns
* Added cargo weight for rescued pilots
* Improved o'clock calculation

#CTLD
* Docu additions
2022-10-18 17:00:56 +02:00
Applevangelist 19ec4af427 Merge remote-tracking branch 'origin/master' into develop 2022-10-18 17:00:25 +02:00
Applevangelist 7e12a48a8a #Ops - various fixes 2022-10-18 16:55:54 +02:00
Applevangelist 2bf5cc2369 #CSAR - use custom callsigns, add weight to helo per saved pilot 2022-10-18 16:14:32 +02:00
Applevangelist 23f45359f8 #PLAYERTASK - show freetext briefing also if not using SRS 2022-10-18 13:32:18 +02:00
Applevangelist 30ce1aa907 PlayerTask 2022-10-18 13:26:48 +02:00
Applevangelist 4c073a30d7 RECCE 2022-10-18 12:54:09 +02:00
Applevangelist f495a583eb #PLAYERRECCE - add picture 2022-10-18 10:29:34 +02:00
Applevangelist 0bc09548cf #PLAYERRECCE - add picture 2022-10-18 10:27:25 +02:00
Applevangelist 7c724bdee7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Set.lua
2022-10-17 18:09:27 +02:00
Applevangelist 59578a8868 #SET_SCENERY 2022-10-17 18:08:31 +02:00
Applevangelist ee30ab48ae #SET_SCENERY
* additions
2022-10-17 18:07:55 +02:00
Applevangelist 3028a384a4 #TARGET
* Added SET_SCENERY
2022-10-17 18:07:04 +02:00
Applevangelist dc239c8137 #SET_SCENERY - Scenery and Target additions 2022-10-17 17:57:31 +02:00
Applevangelist c0bc62d79a Merge remote-tracking branch 'origin/master' into develop 2022-10-17 17:04:05 +02:00
Thomas 7428ad21ee Update Set.lua 2022-10-17 15:53:15 +02:00
Thomas fb52fb0517 Update Scenery.lua 2022-10-17 15:49:45 +02:00
Thomas 53023c97c5 CTLD - No radius check (#1800) (#1802)
Get rid of radius check in IsUnitInZone()
2022-10-17 12:45:37 +02:00
Thomas f17db43501 CTLD - No radius check (#1800) (#1801)
Get rid of radius check in IsUnitInZone()
2022-10-17 12:44:27 +02:00
Applevangelist 4263abae70 Merge remote-tracking branch 'origin/master' into develop 2022-10-16 13:48:55 +02:00
Applevangelist b40b4ec500 #PLAYERTASKCONTROLLER
* Show Freetext as Briefing in all tasks when available
* Use average coordinates in TARGET
2022-10-16 13:48:23 +02:00
Applevangelist 7dd46ec24f #PLAYERTASKCONTROLLER
* Show Freetext as Briefing in all tasks when available
* TARGET - added Average coordinate option from GROUP
2022-10-16 13:47:52 +02:00
Applevangelist cefb5d98f0 #GROUP
* Added function to obtain *average* Vec3 of the GROUP
* Added function to obtain *average* Coordinate of the GROUP

#TARGET
* Make use of new coordinate function in GROUP
2022-10-16 13:38:54 +02:00
Applevangelist 57f34f934c short if 2022-10-16 12:05:38 +02:00
Thomas e750a99636 Update PlayerRecce.lua
Event Handler simplification
2022-10-16 09:30:55 +02:00
Applevangelist 798684e300 #Docu additions 2022-10-14 16:51:59 +02:00
Applevangelist bacbf33d1d Merge remote-tracking branch 'origin/master' into develop 2022-10-14 16:51:15 +02:00
Applevangelist 60a1ceb7a0 #Docu changes 2022-10-14 16:50:54 +02:00
Applevangelist 7c004ee37c #docu 2022-10-14 16:50:16 +02:00
Applevangelist 0a4bc23fb8 #PLAYERRECCE
* Added switchable smoking of own position
* Changed smoking - now laser target single, other targets as combined coordinate
* Added battle field illumination
* Added support for the KA-50. Note - camera is seen as "always on". For lasing, target needs to be head-on 12 o'clock
2022-10-14 16:19:53 +02:00
Applevangelist 13a5146010 #PLAYERRECCE
* Added switchable smoking of own position
* Changed smoking - now laser target single, other targets as combined coordinate
* Added battle field illumination
* Added support for the KA-50. Note - camera is seen as "always on". For lasing, target needs to be head-on 12 o'clock
2022-10-14 16:19:21 +02:00
Applevangelist 8279ac79c8 #PLAYERRECCE
* Added switchable smoking of own position
* Changed smoking - now laser target single, other targets as combined coordinate
* Added battle field illumination
* Added support for the KA-50. Note - camera is seen as "always on". For lasing, target needs to be head-on 12 o'clock
2022-10-14 16:16:50 +02:00
Frank 55fe3630c5 Update FlightGroup.lua
- Fixed bug that function `:GetAirWing` was renamed to `:GetAirwing()`
2022-10-13 23:11:09 +02:00
Applevangelist 265196398a #PLAYERTASK - CSAR, CTLD integration 2022-10-13 17:45:33 +02:00
Applevangelist 141d00e160 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 17:44:04 +02:00
Applevangelist 220e530bf3 #PLAYERTASK - CSAR Integration 2022-10-13 17:42:02 +02:00
Applevangelist b7552a6579 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 12:54:40 +02:00
Applevangelist 5c8d90f50e #SCENERY
* Improvements
2022-10-13 12:54:10 +02:00
Applevangelist 1bda9d40e1 #SCENERY
* Improvements
2022-10-13 12:53:13 +02:00
Applevangelist 6f2354f8fc #SCENERY - Improvements 2022-10-13 10:50:34 +02:00
Applevangelist 351a2463a2 #SCENERY - Improvements 2022-10-13 10:49:58 +02:00
Applevangelist d0b6791efd #SCENERY - Improvements 2022-10-13 10:48:51 +02:00
Applevangelist dc6159f90a Merge remote-tracking branch 'origin/master' into develop 2022-10-12 16:23:32 +02:00
Applevangelist 751f84befd #SCENERY 2022-10-12 16:22:58 +02:00
Applevangelist f604f0f913 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 16:22:37 +02:00
Applevangelist 9a2829730c #CTLD PlayerTask 2022-10-12 12:46:32 +02:00
Applevangelist 7afe76212d #CTLD
* Added connection to PlayerTask/Controller
#PLAYERTASK
* Added helper functions
2022-10-12 12:36:33 +02:00
Applevangelist a777b40613 #PLAYERTASKCONTROLLER
* Initial additions for CTLD tasks
2022-10-12 10:14:40 +02:00
Applevangelist 11ef7c6a00 #STATIC
* Added GetLife() GetLife0()
#TARGET
* Added usesage of Life functions to TARGET
2022-10-12 09:36:42 +02:00
Applevangelist d6363d0f80 Misc 2022-10-12 09:33:57 +02:00
Applevangelist b5bc881d52 Merge remote-tracking branch 'origin/master' into develop 2022-10-10 17:44:55 +02:00
Applevangelist 66d5ba9981 #Core.Point
* Cleanup GetClosestAirbase()
2022-10-10 17:44:20 +02:00
Applevangelist 72085a7962 #Core.Point
* Cleanup GetClosestAirbase()
2022-10-10 17:44:03 +02:00
Applevangelist aaa956287f #Core.Point
* Cleanup GetClosestAirbase()
2022-10-10 17:43:12 +02:00
Applevangelist c659bc6f2f Merge remote-tracking branch 'origin/Apple/Develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
2022-10-10 16:56:49 +02:00
Applevangelist 0323144248 #Playertask 2022-10-10 16:55:58 +02:00
Thomas 19ca30527e Update PlayerTask.lua
Added PLAYERTASK:IlluminateTarget(Power,Height)
2022-10-10 14:30:54 +02:00
Thomas 2b6eba0106 Update PlayerTask.lua
#PLAYERTASK
* Added Coalition, Freetext and FreetextTTS addition options
2022-10-10 14:02:37 +02:00
Applevangelist eecef9a0aa #PLAYERRECCE
* minor enhancements
2022-10-09 12:56:54 +02:00
Applevangelist 7e6aa20168 #PLAYERRECCE
* Minor Enhancement
2022-10-09 12:56:00 +02:00
Applevangelist c0845443d0 #PLAYERRECCE
* Minor enhancements
2022-10-09 12:51:53 +02:00
Applevangelist 69a80a6c38 #PLAYERRECCE
* Added setting of laser distance as camera sight calc is a non-starter
* Added specific laser zone of 20m x length to catch targets to lase
* Reworked detection of hit on lased target
2022-10-07 14:33:38 +02:00
Applevangelist ff194b4425 #PLAYERRECCE
* Added setting of laser distance as camera sight calc is a no-starter
* Added specific laser zone of 20mxlength to catch targets to lase
* Reworked detection of hit on lased target
2022-10-07 14:29:54 +02:00
Applevangelist 6a22e03689 #PLAYERTASKCONTROLLER
* Enable PLAYERTASKCONTROLLER:EnableBuddyLasing(Recce) - buddy lasing precision bombing tasks with a PLAYERRECCE connection
2022-10-06 17:05:35 +02:00
Applevangelist d63ab1138c #PLAYERTASKCONTROLLER
* Enable PLAYERTASKCONTROLLER:EnableBuddyLasing(Recce) - buddy lasing precision bombing tasks with a PLAYERRECCE connection
2022-10-06 17:05:16 +02:00
Applevangelist f790c4fb9e #PLAYERRECCE
* Gazelle optics refinement
* Added Shack FSM event
2022-10-06 13:29:58 +02:00
Applevangelist 40427c75b9 #FlightGroup dual naming in functions 2022-10-06 13:28:19 +02:00
Applevangelist 120b77d853 #PLAYERRECCE
* Gazelle sight correcions
* Added Shack event
2022-10-06 13:27:26 +02:00
Applevangelist e18a5e4832 #PLAYERTASKCONTROLLER
* Switch comms on opening task
2022-10-06 08:15:39 +02:00
Applevangelist e2dce132df #PLAYERTASKCONTROLLER
* switch names on opening comms
2022-10-06 08:14:54 +02:00
Applevangelist b7c572f800 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerRecce.lua
2022-10-06 08:09:04 +02:00
Applevangelist 44f7df2ea5 Fixes 2022-10-06 08:07:54 +02:00
Applevangelist 4d2a58e428 Fixes 2022-10-06 08:07:37 +02:00
Applevangelist 005d6d2b06 Merge remote-tracking branch 'origin/master' into develop 2022-10-06 08:03:07 +02:00
Applevangelist c9ab7dd8e7 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Zone.lua
2022-10-06 08:02:09 +02:00
Thomas 7ada57033a Update PlayerRecce.lua (#1796)
* Update PlayerRecce.lua

* Update PlayerRecce.lua
2022-10-06 07:25:24 +02:00
Thomas 22d98fe753 Update Zone.lua
fix for #1797
2022-10-05 16:01:56 +02:00
Thomas 929f3d2e16 Update PlayerRecce.lua 2022-10-05 14:27:03 +02:00
Thomas db85478381 ZONE_BASE/RADIUS not registering in the DB
if not _DATABASE:FindZone(ZoneName) then
	  _EVENTDISPATCHER:CreateEventNewZone(self)
  end

-- problem when creating zones on the fly and trying to find them with :FindByName() laters
2022-10-05 14:19:39 +02:00
Applevangelist 8fa4c04b16 Merge remote-tracking branch 'origin/develop' into develop 2022-10-05 07:34:27 +02:00
Applevangelist 1a332ae6ab Merge remote-tracking branch 'origin/master' into develop 2022-10-05 07:33:46 +02:00
Applevangelist 41cd3ea23c Merge remote-tracking branch 'origin/master' into develop 2022-10-05 07:33:17 +02:00
Applevangelist dae2da4a5d PlayerRecce 2022-10-05 07:32:57 +02:00
Frank 064e082a12 Airwing
- Added `:IncreasePayloadAmount` function
2022-10-03 19:12:19 +02:00
Frank 10eec8a47b Update FlightGroup.lua
- Added `GetSquadronName` and `GetAirwingName` functions
2022-10-03 16:32:55 +02:00
Frank db469d1b84 Merge branch 'develop' into FF/Ops 2022-10-02 22:10:52 +02:00
Frank 1e04aaa77d Update Airboss.lua
- reenabled ai handling
2022-10-02 19:45:48 +02:00
Applevangelist 63a03dc361 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/Airboss.lua
2022-10-02 19:36:41 +02:00
Applevangelist e97753125d Merge remote-tracking branch 'origin/master' into develop 2022-10-02 19:35:15 +02:00
Applevangelist 1474ff9b88 Merge remote-tracking branch 'origin/develop' into develop 2022-10-02 19:34:09 +02:00
Applevangelist 39bb95f127 #PLAYERRECCE
-- DONE: Sort for multiple targets in one direction
-- DONE: Targets with forget timeout, also report
2022-10-02 19:34:04 +02:00
Applevangelist 94fb59f8bf #PLAYERRECCE
-- DONE: Sort for multiple targets in one direction
-- DONE: Targets with forget timeout, also report
2022-10-02 19:33:46 +02:00
Frank 42baf6c8d2 AIRBOSS v1.3.0
- Added Invincible parameters from master branch
- Increased version number
2022-10-02 19:13:51 +02:00
Frank 73b9552b5c Merge branch 'master' into develop 2022-10-02 16:55:47 +02:00
Frank 60cf7506f8 Update Airboss.lua
- Added `landingdist` as carrier parameter and into LSO result
- Case III does not check groove time for unicorns
2022-10-02 16:10:14 +02:00
Applevangelist 6c7a5d1321 Merge remote-tracking branch 'origin/master' into develop 2022-10-02 13:17:27 +02:00
Applevangelist 894062c757 #POINT
* Added COORDINATE:ToStringFromRPShort
2022-10-02 13:16:56 +02:00
Applevangelist d9acce04b6 #POINT
* Added COORDINATE:ToStringFromRPShort
2022-10-02 13:16:21 +02:00
Applevangelist 165a5d7364 #PLAYERRECCE
* Message improvements
* Laser Distance 8km
* Option to set RP Reference Point
2022-10-02 13:16:00 +02:00
Applevangelist 405e66ea72 #PLAYERTASK
* SRS transmit option only when players are on
2022-10-01 16:36:29 +02:00
Applevangelist c351c446a0 * SRS silent when no player is on 2022-10-01 16:35:51 +02:00
Applevangelist ad49b051e1 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerRecce.lua
2022-10-01 16:07:29 +02:00
Applevangelist a42ff85406 #PLAYERRECCE
* Integrated SRS
* Integrated PLAYERTASKCONTROLLER (optional), can upload target data from Recce
2022-10-01 16:03:05 +02:00
Applevangelist ddde0f8629 #PLAYERRECCE
* Integrated SRS
* Integrated PLAYERTASKCONTROLLER (optional), can upload target data from Recce
2022-10-01 16:01:41 +02:00
Applevangelist 6574544edc Merge remote-tracking branch 'origin/master' into develop 2022-10-01 11:59:08 +02:00
Applevangelist 2eba68b35c #ATIS, MSRSQUEUE
* Added option to only transmit via SRS if there are active Players
2022-10-01 11:58:28 +02:00
Applevangelist dd1cd3bc79 ATIS 2022-10-01 11:56:39 +02:00
Applevangelist fb4f7acb16 SRS additions 2022-10-01 11:53:50 +02:00
Frank efe7673c4c Merge branch 'develop' into FF/Ops 2022-09-30 19:34:23 +02:00
Applevangelist ab42e506e8 #PLAYERRECCE
* Some nicefications
2022-09-30 19:07:26 +02:00
Applevangelist ca92d7d569 #PLAYERRECCE
* Some nicefications
2022-09-30 19:07:12 +02:00
Applevangelist 0ee2baadce #AWACS
* Make Markers and Drawings strictly coalition specific
2022-09-30 19:03:26 +02:00
Applevangelist 3322609f87 #AWACS
* Make markers and drawings strictly coalition specific
2022-09-30 19:02:45 +02:00
Applevangelist 43856341e6 #PLAYERRECCE
* Initial Release
2022-09-30 18:49:08 +02:00
Applevangelist c7baaa26f2 #PLAYERRECCE
* Initial Release
2022-09-30 18:47:28 +02:00
Applevangelist aefc655535 Merge remote-tracking branch 'origin/develop' into develop 2022-09-30 14:49:30 +02:00
Applevangelist 054fc7c5a6 Merge remote-tracking branch 'origin/master' into develop 2022-09-30 14:49:09 +02:00
Applevangelist 61aed403d9 #SET
* Added code to`SET:IsInSet(Object)` to be functional
2022-09-30 14:48:35 +02:00
Applevangelist c8600cd24b *SET
* Added IsInSet()
2022-09-30 14:42:17 +02:00
Applevangelist a8a92c00fe #AUTOLASE
* Don't forget min threatlevel 0 on unit targets
2022-09-30 14:41:38 +02:00
Applevangelist 84c41aa554 Merge remote-tracking branch 'origin/master' into develop 2022-09-29 16:45:29 +02:00
Applevangelist 4cdcbdc6fa Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Core/Spot.lua
2022-09-29 16:44:51 +02:00
Applevangelist 26025bb2a1 #SPOT - Set relative position to start lasing
#ZONE_POLYGON - Added `ZONE_POLYGON:NewFromPointsArray( ZoneName, PointsArray )`
2022-09-29 16:42:08 +02:00
Applevangelist 03dbdd5ed6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Autolase.lua
2022-09-28 13:22:19 +02:00
Applevangelist de415384f3 #PLAYERTASK - a target can only be smoked again after 5 mins (that's how long smoke lasts)
#PLAYERTASKCONTROLLER - added option to hide smoke&flare menus
2022-09-28 13:07:37 +02:00
Applevangelist 7d938ac8fa #PLAYERTASK - a target can only be smoked again after 5 mins (that's how long smoke lasts)
#PLAYERTASKCONTROLLER - added option to hide smoke&flare menus
2022-09-28 13:06:54 +02:00
Applevangelist 117e41dafb #ZONE_CAPTURE_COALITION - allow zone to be a ZONE_POLYGON 2022-09-28 11:51:59 +02:00
Applevangelist 8a9ee747c1 #ZONE_CAPTURE_COALITION - allow zone to be a ZONE_POLYGON
#1789
2022-09-28 11:51:22 +02:00
Applevangelist 5e5f1398fa #ZONE_CAPTURE_COALITION - allow zone to be a ZONE_POLYGON
#RANGE Messaging changes in case >1 player per group
2022-09-28 11:49:56 +02:00
Applevangelist 9121624c3c Merge remote-tracking branch 'origin/master' into develop 2022-09-27 11:17:33 +02:00
Applevangelist 2eeb918c8a #ATIS
* Fixed SetILS report not working
* Use new AIRBASE additions to set takeoff/landing runway
* Fixed Visibility is reported twice
* Added SetReportmBar() to report for mBar/hpa QNH/QFE even if not metric
* Added option to output additional freetext information when using SRS SetAdditionalInformation()

#1792
2022-09-27 11:17:04 +02:00
Applevangelist 811c37549a #ATIS
* Fixed SetILS report not working
* Use new AIRBASE additions to set takeoff/landing runway
* Fixed Visibility is reported twice
* Added SetReportmBar() to report for mBar/hpa QNH/QFE even if not metric
* Added option to output additional freetext information when using SRS SetAdditionalInformation()

#1792
2022-09-27 11:15:44 +02:00
Applevangelist 72aa596317 #1790 Fix for error in GetCustomCallsign if the player name contains a |-sign but no string at the end or just numbers 2022-09-27 09:31:08 +02:00
Applevangelist c171e756f0 Merge remote-tracking branch 'origin/master' into develop 2022-09-27 09:30:02 +02:00
Frank 6de3a45a51 CHIEF
**CHIEF** v0.5.0
- Added `CHIEF:AddTransportToResource` function

**OPSZONE**
- Added `Undraw` option

**UTILS**
- Added `UTILS.EnsureTable` function
2022-09-26 19:00:26 +02:00
Applevangelist 28a826b35d #CSAR
* Added mycsar.ADFRadioPwr = 1000 for ADF beacon radio sending power
2022-09-26 17:03:08 +02:00
Applevangelist 693497265a #CSAR
* Added mycsar.ADFRadioPwr = 1000 for ADF beacon radio sending power
2022-09-26 17:02:09 +02:00
Applevangelist 41813dcc53 #AWACS - corrected aggressive 2022-09-25 15:04:39 +02:00
Applevangelist 60d25ea131 #AWACS - corrected aggressive 2022-09-25 15:04:24 +02:00
Applevangelist 716bb26800 Merge remote-tracking branch 'origin/master' into develop 2022-09-25 14:43:25 +02:00
Applevangelist 6290409e54 #ATIS - added google option
#SRS - corrected enumerator
2022-09-25 14:42:51 +02:00
Applevangelist 8806c91dd9 ATIS - added google option 2022-09-25 14:41:00 +02:00
Applevangelist e4002233ef #FlightControl - Option to set Google key once on New() 2022-09-25 14:40:47 +02:00
Applevangelist 4355b3a2c8 SRS - correct enumerator 2022-09-25 14:40:42 +02:00
Applevangelist 25033f4f6b #FlightControl - Option to set Google key once on New() 2022-09-25 14:40:17 +02:00
Applevangelist b8fae00c1e #MSRS - put "" around frequencies and modulations 2022-09-25 14:16:19 +02:00
Applevangelist bc7345704d #MSRS - put "" around frequencies and modulations 2022-09-25 14:15:27 +02:00
Applevangelist 6d4e4e2f69 #AWACS - give full radio freq in info 2022-09-25 14:12:46 +02:00
Applevangelist d17f4cf46c #AWACS - give full frequency in info 2022-09-25 14:11:40 +02:00
Applevangelist 1cde688fbb #RANGE
* Added 2 more SRS outputs
2022-09-24 10:11:23 +02:00
Applevangelist 737465064b Merge remote-tracking branch 'origin/master' into develop 2022-09-24 10:10:33 +02:00
Applevangelist e3493fbe3e #CSAR
* Added option to change top menu name
2022-09-23 10:29:41 +02:00
Applevangelist 24b2794696 Merge remote-tracking branch 'origin/master' into develop 2022-09-23 10:29:07 +02:00
Applevangelist ba6f16943d #CSAR
* Added option to change top menu name
2022-09-23 10:28:20 +02:00
Applevangelist 0698ba3a18 Merge remote-tracking branch 'origin/master' into develop 2022-09-23 10:00:38 +02:00
Applevangelist 1b691a3dd7 #FOX
* Typo in Event function fixed
2022-09-23 10:00:09 +02:00
Applevangelist 3022dce26e #CTLD
* check on loadable mass when loading troops added
2022-09-22 17:32:43 +02:00
Applevangelist b6358933b2 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
2022-09-22 17:31:47 +02:00
Applevangelist 276805ab28 CTLD
* make troops mass count
2022-09-22 17:30:44 +02:00
Applevangelist 9780a65f09 #AIRBOSS, #UTILS
* Alitude to Altitude
* Deck height Nimitz class to 18.30m
2022-09-22 15:51:28 +02:00
Applevangelist 31882458dc Merge remote-tracking branch 'origin/master' into develop 2022-09-22 15:50:26 +02:00
Applevangelist 34dd864c8b #SPAWN
* Fix for InitCleanup()
2022-09-22 10:58:50 +02:00
Applevangelist 22a5f05e32 #SPAWN
* Fix for InitCleanup()
2022-09-22 10:57:26 +02:00
Thomas 69b70bfed6 Update Spawn.lua (#1786)
Update function SPAWN:_SpawnCleanUpScheduler() to better cater for Helos
2022-09-21 11:43:54 +02:00
Applevangelist 9b16519a7e #ATIS
* Added MSRSQueue to avoid overlapping speech
2022-09-20 17:18:00 +02:00
Applevangelist 8d2660508b Merge remote-tracking branch 'origin/master' into develop 2022-09-20 17:16:48 +02:00
Applevangelist 13d9562bcd #ATIS
* Added MSRSQueue to avoid overlaps
2022-09-20 17:16:20 +02:00
Applevangelist 76321343c2 #AIRBASE, ATIS
* less noise in log

#SRS
* Added enumerator for voices MSRS.Voices.Microsoft... and MSRS.Voices.Google...

#RANGE
* Added SRS support, some bug fixing
2022-09-20 15:53:09 +02:00
Applevangelist a908e159e2 Merge remote-tracking branch 'origin/master' into develop 2022-09-20 15:52:17 +02:00
Applevangelist 9f7729fa0f #AIRBASE, ATIS
* less noise in log

#SRS
* Added enumerator for voices MSRS.Voices.Microsoft... and MSRS.Voices.Google...

#RANGE
* Added SRS support, some bug fixing
2022-09-20 15:51:36 +02:00
Applevangelist 9ebc4fd5fe Merge remote-tracking branch 'origin/master' into develop 2022-09-20 10:48:47 +02:00
Applevangelist 4f4182f574 #RANGE
* Add using SRS
2022-09-20 10:48:13 +02:00
Applevangelist 0159ce5b1d Merge remote-tracking branch 'origin/master' into develop 2022-09-20 10:27:06 +02:00
Applevangelist 5abec25c58 #UTILS
* Fix for loading back set of groups. Thanks to @BlueEcko!
2022-09-20 08:24:50 +02:00
Applevangelist d9de1e866f Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:26:56 +02:00
Applevangelist 3585a40d56 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 18:26:26 +02:00
Applevangelist 1ae8e7d55e Merge remote-tracking branch 'origin/master' into develop 2022-09-19 13:22:18 +02:00
Applevangelist 273858a34a Merge remote-tracking branch 'origin/master' into develop 2022-09-19 13:21:43 +02:00
Applevangelist d2872bebe9 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 11:46:49 +02:00
Applevangelist d8b0c1903f Changes 2022-09-19 11:45:29 +02:00
Applevangelist 67dc4521e9 Merge remote-tracking branch 'origin/master' into develop 2022-09-19 11:44:59 +02:00
Applevangelist 852ebba530 #AUTOLASE
* also show A2G BR Settings
2022-09-19 11:42:50 +02:00
Applevangelist 0df1e58e16 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/OpsGroup.lua
2022-09-19 08:48:14 +02:00
jojom4n 79669d9a69 Make AWACS SRS talk as own coalition; Typo (#1784)
* Make AWACS SRS talk as own coalition

Set MSRS coalition to make AWACS talk only to its coalition, not to spectators

* Typo

SetModernEraAgressive() function should be SetModernEraAggressive() (two 'g')
2022-09-18 19:04:40 +02:00
Applevangelist 11d37bcb93 #CSAR
- triple try to get coordinate for beacon
2022-09-15 19:54:36 +02:00
Applevangelist 282b199754 #CSAR
- triple try to get coordinate for beacon
2022-09-15 19:54:00 +02:00
Applevangelist c95d5dc320 #PLAYERTASK
* coord text fix
2022-09-15 19:50:45 +02:00
Applevangelist c461c1e2e3 * coordtext fix 2022-09-15 19:50:19 +02:00
Applevangelist 5b5380c746 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Ops/PlayerTask.lua
2022-09-15 14:11:37 +02:00
Applevangelist 92044c7797 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 14:02:09 +02:00
Applevangelist 7084d9e084 #OPSGROUP
* Allow for customized CallSigns

#PLAYERTASK
* SRS output finetuning
2022-09-15 13:59:16 +02:00
Applevangelist af96e2f143 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 13:52:20 +02:00
Applevangelist 255a28cdf8 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 13:51:45 +02:00
Applevangelist ab0a722f2c #OPSGROUP
* Allow for customized CallSigns

#PLAYERTASK
* SRS output finetuning
2022-09-15 13:51:01 +02:00
Applevangelist 6226a2a2d7 #ATIS
* No radio queue when using SRS

#FLIGHTCONTROL
* Allow for multiple frequencies, modulations to be used
* Use same callsign logic as AWACS and PLAYERTASK

#FLIGHTGROUP
* Nicefy message output
2022-09-15 13:49:40 +02:00
Applevangelist 9ca2a2f624 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 08:19:27 +02:00
Applevangelist f7560714e7 Merge remote-tracking branch 'origin/master' into develop 2022-09-15 08:18:19 +02:00
Applevangelist 498b7a033f #AWACS
* Align CallSign Generation
2022-09-14 18:08:12 +02:00
Applevangelist 785c5e66ec bump number 2022-09-14 18:07:53 +02:00
Applevangelist f281e5aa95 #AWACS
* Align CallSign Generation
2022-09-14 18:06:36 +02:00
Applevangelist 55f0f5271d #PLAYERTASKCONTROLLER
* Clean up menu builds
2022-09-13 17:19:44 +02:00
Applevangelist 83a7055065 #PLAYERTASKCONTROLLER
* Clean up menu builds
2022-09-13 17:19:29 +02:00
Applevangelist b6fb7d94c8 'Menu changes 2022-09-13 13:13:06 +02:00
Applevangelist 4dbfef028e *options 2022-09-13 11:02:03 +02:00
Applevangelist b60d3a771d Merge remote-tracking branch 'origin/master' into develop 2022-09-13 10:55:57 +02:00
Applevangelist 439f858a82 Merge remote-tracking branch 'origin/master' into develop 2022-09-13 10:55:14 +02:00
Applevangelist d2132b2e64 #PLAYERTASKCONTROLLER
* Align creation of (player) callsigns with what is used in AWACS
2022-09-13 10:11:10 +02:00
Applevangelist 2f62ae4e8b Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:34:50 +02:00
Applevangelist 95494c0d03 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:34:21 +02:00
Applevangelist acab17a21f Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Wrapper/Group.lua
2022-09-12 17:32:18 +02:00
Applevangelist 76a8286c04 Merge remote-tracking branch 'origin/master' into develop 2022-09-12 17:29:47 +02:00
Thomas 53380409de GROUP / customizes, TTS Callsigns
Added function to get customized TTS friendly callsigns from the GROUP
2022-09-12 14:38:44 +02:00
Applevangelist 3890375272 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
2022-09-11 18:24:04 +02:00
Applevangelist e4f1e1a57a #AWACS
* Fix custom AWACS callsign not observed
2022-09-11 18:22:35 +02:00
Applevangelist eca8d6dd8d #AWACS
* Fixed AWACS custom callsigns not observed
2022-09-11 18:21:58 +02:00
Applevangelist 04abebfa10 Merge remote-tracking branch 'origin/master' into develop 2022-09-11 14:27:12 +02:00
Applevangelist 93abef86dc VArious fixes 2022-09-11 14:23:48 +02:00
Applevangelist e6ae034f7e Merge remote-tracking branch 'origin/develop' into develop 2022-09-11 14:22:52 +02:00
Applevangelist 236b4efb9b #PLAYERTASKCONTROLLER
* Various fixes and improvements
2022-09-11 14:22:47 +02:00
Frank 4b4c9ba959 Merge branch 'master' into develop 2022-09-11 13:38:40 +02:00
Applevangelist 6bf05741a9 Merge remote-tracking branch 'origin/master' into develop 2022-09-10 15:16:47 +02:00
Applevangelist 5d1998accb #CONTROLLABLE
*Foreign class definiton removed
2022-09-10 15:14:41 +02:00
Applevangelist 2d2f901545 Foreign class definition 2022-09-10 15:13:55 +02:00
Applevangelist 24df7c02f6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Moose Setup/Moose.files
2022-09-10 12:56:06 +02:00
Applevangelist 3aa9ffc241 #MODULES
* ordered list
2022-09-10 12:54:37 +02:00
Applevangelist e97c294849 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2022-09-10 12:23:33 +02:00
Applevangelist 8ab5575e0a Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/Modules.lua
#	Moose Setup/Moose.files
2022-09-10 12:19:23 +02:00
Applevangelist 3980b8a9c8 Merge remote-tracking branch 'origin/master' into develop 2022-09-10 11:34:56 +02:00
Applevangelist 8d8bd162b3 #AmmoTruck 2022-09-10 11:34:24 +02:00
Applevangelist 3dc7e458e1 Merge remote-tracking branch 'origin/develop' into develop 2022-09-09 17:52:23 +02:00
Thomas 27550d7ec9 Merge changes from master into dev for GROUP (#1781)
* #GROUP
* changes from Dev
#UNIT
* changes from Dev

* #GROUP
Fix GetSpeedMax() always returns zero
2022-09-09 17:50:18 +02:00
Applevangelist 91d2e43671 Merge remote-tracking branch 'origin/master' into develop 2022-09-09 17:36:07 +02:00
Applevangelist 5d6488bfa4 #OPSGROUP 2022-09-09 17:32:00 +02:00
Applevangelist f8fa6acc60 #AMMOTRUCK 2022-09-09 15:30:39 +02:00
Applevangelist 9ad4ce7a49 #AMMOTRUCK
* optionally use ARMYGROUP (but routing there sucks)
2022-09-09 15:01:34 +02:00
Applevangelist 247377e98c #OPSGROUP
* Fix for always teleporting
2022-09-09 15:01:00 +02:00
Applevangelist 612419e615 ZONE
* change to distance calc for finding spots w/o buildings
2022-09-09 15:00:42 +02:00
Thomas 35513e1e21 #GROUP (#1779)
* changes from Dev
#UNIT
* changes from Dev
2022-09-08 16:10:38 +02:00
Thomas 949e1fc013 Update Moose.files 2022-09-08 15:56:45 +02:00
Applevangelist 34b80727a2 #AMMOTRUCK
* Initial Release
2022-09-08 15:54:22 +02:00
Applevangelist 825e88353a Merge remote-tracking branch 'origin/master' into develop 2022-09-08 15:51:34 +02:00
Applevangelist 31cd125954 #GROUP, #UNIT
* Improve GetAmmunition() to include artillery shells
2022-09-08 15:51:07 +02:00
Applevangelist 3bc274a651 Merge remote-tracking branch 'origin/develop' into develop 2022-09-08 11:59:15 +02:00
Applevangelist 15496aed44 Merge remote-tracking branch 'origin/Apple/Develop' into develop
# Conflicts:
#	Moose Development/Moose/Functional/Autolase.lua
2022-09-08 11:58:29 +02:00
Applevangelist eed41a121c #AUTOLASE
* Added option for blacklist of attributes
* Added radar unit higher priority over launchers
* Removed the "#001-01" appendix on message output for spawned Recce
2022-09-08 11:57:02 +02:00
Applevangelist 27408c191d #AUTOLASE
* Added option for blacklist atttributes
* Added higher priority for radar units
* Removed the "#001-01" appendix of spawned Recce on messages
2022-09-08 11:55:29 +02:00
Applevangelist 4b6c6717ad #Autolase
* SetMinThreatLevel
2022-09-08 09:11:26 +02:00
Applevangelist c0bc3d8061 Merge remote-tracking branch 'origin/develop' into develop 2022-09-08 08:45:16 +02:00
Thomas fe5f252bc9 Update Autolase.lua (#1778) 2022-09-07 15:22:00 +02:00
Applevangelist e25af085fc Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Core/Base.lua
#	Moose Development/Moose/Core/Beacon.lua
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Core/MarkerOps_Base.lua
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Core/ScheduleDispatcher.lua
#	Moose Development/Moose/Core/Scheduler.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Spawn.lua
#	Moose Development/Moose/Core/Zone.lua
#	Moose Development/Moose/DCS.lua
#	Moose Development/Moose/Functional/Detection.lua
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Functional/Range.lua
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Functional/Sead.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/ATIS.lua
#	Moose Development/Moose/Ops/Airboss.lua
#	Moose Development/Moose/Sound/UserSound.lua
#	Moose Development/Moose/Utilities/Enums.lua
#	Moose Development/Moose/Utilities/FiFo.lua
#	Moose Development/Moose/Utilities/Profiler.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Utilities/STTS.lua
#	Moose Development/Moose/Utilities/Utils.lua
#	Moose Development/Moose/Wrapper/Airbase.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
#	Moose Development/Moose/Wrapper/Group.lua
#	Moose Development/Moose/Wrapper/Marker.lua
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
#	Moose Setup/Moose.files
2022-09-06 13:51:59 +02:00
Applevangelist 400da676fa UTILS 2022-09-06 10:48:37 +02:00
Applevangelist bf9f02e53a DATABASE 2022-09-06 10:47:33 +02:00
Applevangelist a437da76ec Merge remote-tracking branch 'origin/Apple/Develop' into develop
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Utilities/Profiler.lua
2022-09-06 10:43:48 +02:00
Applevangelist 8cceee49ea Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Core/Base.lua
#	Moose Development/Moose/Core/Beacon.lua
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Core/MarkerOps_Base.lua
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Core/ScheduleDispatcher.lua
#	Moose Development/Moose/Core/Scheduler.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Spawn.lua
#	Moose Development/Moose/Core/Zone.lua
#	Moose Development/Moose/DCS.lua
#	Moose Development/Moose/Functional/Detection.lua
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Functional/Range.lua
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Functional/Sead.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/ATIS.lua
#	Moose Development/Moose/Ops/Airboss.lua
#	Moose Development/Moose/Sound/UserSound.lua
#	Moose Development/Moose/Utilities/Enums.lua
#	Moose Development/Moose/Utilities/FiFo.lua
#	Moose Development/Moose/Utilities/Profiler.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Utilities/STTS.lua
#	Moose Development/Moose/Utilities/Utils.lua
#	Moose Development/Moose/Wrapper/Airbase.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
#	Moose Development/Moose/Wrapper/Group.lua
#	Moose Development/Moose/Wrapper/Marker.lua
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
#	Moose Setup/Moose.files
2022-09-06 10:27:28 +02:00
Applevangelist 34ff03936a Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Core/Base.lua
#	Moose Development/Moose/Core/Beacon.lua
#	Moose Development/Moose/Core/Database.lua
#	Moose Development/Moose/Core/Fsm.lua
#	Moose Development/Moose/Core/MarkerOps_Base.lua
#	Moose Development/Moose/Core/Menu.lua
#	Moose Development/Moose/Core/Message.lua
#	Moose Development/Moose/Core/Point.lua
#	Moose Development/Moose/Core/ScheduleDispatcher.lua
#	Moose Development/Moose/Core/Scheduler.lua
#	Moose Development/Moose/Core/Set.lua
#	Moose Development/Moose/Core/Spawn.lua
#	Moose Development/Moose/Core/Zone.lua
#	Moose Development/Moose/DCS.lua
#	Moose Development/Moose/Functional/Detection.lua
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Functional/Range.lua
#	Moose Development/Moose/Functional/Scoring.lua
#	Moose Development/Moose/Functional/Sead.lua
#	Moose Development/Moose/Modules.lua
#	Moose Development/Moose/Ops/ATIS.lua
#	Moose Development/Moose/Ops/Airboss.lua
#	Moose Development/Moose/Sound/UserSound.lua
#	Moose Development/Moose/Utilities/Enums.lua
#	Moose Development/Moose/Utilities/FiFo.lua
#	Moose Development/Moose/Utilities/Profiler.lua
#	Moose Development/Moose/Utilities/Routines.lua
#	Moose Development/Moose/Utilities/STTS.lua
#	Moose Development/Moose/Utilities/Utils.lua
#	Moose Development/Moose/Wrapper/Airbase.lua
#	Moose Development/Moose/Wrapper/Controllable.lua
#	Moose Development/Moose/Wrapper/Group.lua
#	Moose Development/Moose/Wrapper/Marker.lua
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua
#	Moose Setup/Moose.files
2022-09-06 09:53:22 +02:00
Thomas bf3ee93c23 Update PlayerTask.lua (#1777) 2022-09-05 06:14:58 +02:00
Frank a3260b4ce3 Merge pull request #1776 from FlightControl-Master/FF/Ops
OPS
2022-09-04 21:04:59 +02:00
Frank ea8cf7b62a OPS
**OPSZONE**
- Added `:SetTimeCapture()` function to set time interval until a zone is captured.

**FLIGHTCONTROL**
- Added coalition to tower and pilot msrs.
2022-09-04 21:01:32 +02:00
Applevangelist 7168681918 #PLAYERTASKCONTROLLER
* Delay auto-start between 5 to 10 secs

#ATIS
* Add label to SRS
2022-09-04 14:48:06 +02:00
Applevangelist 233291b30c #AWACS
* added option for AWACS to send messages on multiple frequencies
2022-09-04 12:19:06 +02:00
Applevangelist e53ff167ee #PLAYERTASKCONTROLLER
* Menu build changed slightly to delayed
2022-09-03 16:28:32 +02:00
dogjutsu df54d09494 Fix usage example comment for ZONE_BASE:GetProperty() (#1775)
* Fixed some typos of forms of the word 'strategy'.

* Fix ZONE_BASE:GetProperty() usage example comment

Co-authored-by: dogjutsu <dogjutsu@mattjay.net>
2022-09-02 18:28:18 +02:00
Applevangelist 4aa3edc508 Errors
added docu
2022-09-02 17:01:39 +02:00
Applevangelist 4ea1b93f8d #PLAYERTASKCONTROLLER
* All map markers to be deleteable
2022-09-02 16:32:29 +02:00
Applevangelist 361ca2cece #MARKEROPS
* Added option to enforce case sensitive matches on Tagname

#PLAYERTASKCONTROLLER
* Text tweaking
* Fixed "mark on map" not showing subtitles
* Revamped menu build to have less rebuilds
* Added option to show additional info menu for tasks before joining
2022-09-02 13:12:52 +02:00
dogjutsu fa0d076a09 Dogjutsu/develop/feature/zone properties (#1774)
* Fixed some typos of forms of the word 'strategy'.

* Retrieve Zone 'properties' with ZONE_BASE.

* Extraneous comment cleanup.

Co-authored-by: dogjutsu <dogjutsu@mattjay.net>
2022-09-02 06:19:50 +02:00
Frank da5a1e0945 Merge pull request #1773 from FlightControl-Master/FF/Ops
Update Socket.lua
2022-09-01 23:50:04 +02:00
Frank 6d187f0d9a Update Socket.lua 2022-09-01 23:44:45 +02:00
Frank 85eca4c464 Merge pull request #1772 from FlightControl-Master/FF/Ops
SOCKET
2022-09-01 22:44:43 +02:00
Frank 1efbce7661 Update Airboss.lua
- Removed output
2022-09-01 22:37:31 +02:00
Frank edf69d1ef1 Removed
Removed MOOSE_INCLUDE subdirectory
2022-09-01 22:34:48 +02:00
Frank 375e7db449 Merge branch 'develop' into FF/Ops 2022-09-01 22:31:52 +02:00
Frank ac71e38d96 FunkMan
**RANGE**
- Changed keyword in result tables to "command" for compatibility with DCSServerBot

**AIRBOSS**
- Changed keyword in result tables to "command" for compatibility with DCSServerBot
- Fix bug in Alt and AoA data round function when creating trapsheet data

**SOCKET**
- Changed for compatibility with DCSServerBot
2022-09-01 22:27:25 +02:00
Applevangelist ae5fd91cd4 #PLAYERTASK
* Fix to avoid double failed messages
2022-09-01 15:50:35 +02:00
Applevangelist 14e8b2ef17 #PLAYERTASK
* Added logging Errors and Documentation for trying to set zones before set up of detection
2022-09-01 09:22:18 +02:00
Applevangelist 5bacea8b50 UNIT - added optical tracker to HasSEAD() 2022-09-01 08:36:21 +02:00
Applevangelist 15dff87200 #GROUP
* Added Optical Tracker to ID SAMs, corrected logic error in ID'ing SAMs

#PLAYERTASKCONTROLLER
* Added documentation in MarkerOps
* Corrected Cluster radius to be in KM
* Corrected set up of SEAD attribute table to work
2022-09-01 08:07:40 +02:00
Applevangelist ae45c77523 UTILS - added NDB 305kHz in frequency generator 2022-08-31 18:10:57 +02:00
Applevangelist 7c834993f6 Slight change of attack order 2022-08-31 17:40:15 +02:00
Applevangelist 5f5749ac8f bugfix 2022-08-31 17:32:41 +02:00
Thomas c99a7b6666 PlayerTaskController - SEAD attributes configure (#1769)
Making SEAD attributes for the task decision tree configure-able. Added ` PLAYERTASKCONTROLLER:SetSEADAttributes(Attributes)`
2022-08-31 16:57:20 +02:00
Applevangelist b4e2d3edfe #ZONE
* Added `ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(...)`

#MARKEROPS
* Some documentation improvement

#PLAYTASKCONTROLLER
* Added `PLAYERTASKCONTROLLER:EnableMarkerOps(Tag)`

#OPSGROUP
* Changed offset to 2m for lasing ground units

*AUFTRAG
* Documentation correction `NewARMOREDGUARD`
2022-08-30 14:29:41 +02:00
Frank 8f9308f349 Update Airboss.lua 2022-08-29 23:10:12 +02:00
Frank fc48473e40 Merge branch 'develop' into FF/Ops 2022-08-29 00:37:34 +02:00
Frank 71317db4cb FunkMan
**SOCKET**
- Changed port to 10042.
- Removed port as optional parameter in functions.

**AIRBOSS**
- Added FunkMan function
- Added onAfterLSOGrade which sends results table to socket

**RANGE**
- Compat to FunkMan.
2022-08-29 00:37:21 +02:00
Applevangelist 23815429e2 #PLAYERTASK
* remove two filters for task state where they do not belong
2022-08-27 18:26:04 +02:00
Applevangelist b468134432 #PLAYERTASK
* Remove filtering for task state preventing further players to join
2022-08-27 16:05:47 +02:00
Applevangelist 3e38db16f6 #PLAYERTASK
* Added option to use ArmyGroup as lasing unit
* Added TTS output to task info report for PRECISIONBOMBING to tell if unit is in reach and is lasing
2022-08-26 18:46:07 +02:00
Applevangelist bf591cc01e #RANGE
* Minor updates

#AWACS
* Added localisation
2022-08-26 14:23:55 +02:00
Applevangelist 3178cbc563 #RANGE
- fix for #1753
2022-08-25 16:00:03 +02:00
Applevangelist 1c54f6b2f4 #AUTOLASE
* Fix for "self" error after start
2022-08-25 13:28:20 +02:00
Applevangelist 7743456d7d #PLAYERTASK
* Short playername usage for broadcast
2022-08-25 12:10:20 +02:00
Applevangelist 4dc43263a5 usage correction 2022-08-25 11:41:27 +02:00
Applevangelist 5d84f1c523 #AIRBASE
* Added 3 new airports to the enumerator
2022-08-25 10:38:04 +02:00
Applevangelist 8289ebbe50 #PLAYERTASK
* added coalition check to event handler
2022-08-25 09:44:45 +02:00
Applevangelist 94741f1b4a #PLAYERTASK
* Added precision bombing option

#AUTOLASE
* Added "nomenu" option

#MENU_GROUP
* Added MENU_GROUP:RefreshAndOrderByTag()
2022-08-24 19:22:33 +02:00
Applevangelist a5b394aa93 #AWACS
- added docu on PikesSpecialSwitch
- added option to read callsign from playername
2022-08-23 12:44:42 +02:00
Applevangelist 9f3d152d8c #AWACS
* Fixed logic for CallSignTranslations which now applies to both AI and Players, a set overwrite in the group name for a player still takes precedence.
* Added a switch self.PikesSpecialSwitch to omit "doing xy knots" from the station assignment
2022-08-23 09:58:06 +02:00
Applevangelist 94c91614d6 #Range
* Fix F10 Sheet
* Fix Typos
2022-08-22 17:28:01 +02:00
Applevangelist 02a59b0742 #UTILS
* Fix for GetOSTime
2022-08-22 17:05:02 +02:00
Applevangelist 882c2e2378 #ATC_GROUND
* Added universally working ATC_GROUND_UNIVERSAL as base class, can be used on any map without further changes
* Kept sub-class names for compatibility
* Added `:SetAirbaseBoundaries(Airbase, Zone)`
* Added `:DrawBoundaries( Color )`
2022-08-21 19:46:01 +02:00
Applevangelist f6b56735b6 #PLAYERTASK
* Speak "BR" as "Bee, Arr"
2022-08-20 09:45:09 +02:00
Applevangelist 8aec463eb4 #PLAYERTASK
* Some changes to SRS call order, documentation
2022-08-20 09:24:52 +02:00
Applevangelist 37cdcf93e6 #PLAYERTASK
* Demo mission link added
2022-08-19 10:34:36 +02:00
Applevangelist 9547a06f39 #PLAYERTASK
* Slight text change for TASKADDED
2022-08-19 08:12:06 +02:00
Applevangelist a8d5d2ace1 fix typos 2022-08-18 18:24:37 +02:00
Applevangelist e8a0464f6c Docu corrections 2022-08-18 18:19:27 +02:00
Applevangelist 85a39e64c1 #PLAYERTASKCONTROLLER
* Own picture for header
* Some docu additions
2022-08-18 18:06:41 +02:00
Applevangelist e18cf759f9 #PLAYERTASKCONTROLLER
* Add'l docu
2022-08-18 16:43:39 +02:00
Applevangelist 7e1ab1e6b0 #PLAYERTASKCONTROLLER
* Added base documentation
2022-08-18 16:01:34 +02:00
Frank eed74d72cd SOCKEt
- Added new SOCKET class
- Fixed bug in RANGE that self.PlayerSetti**n**gs was misspelled.
2022-08-18 01:33:09 +02:00
Applevangelist fa8c96af13 #AUTOLASE
* Update SRS stuff

#PLAYERTASKCONTROLLER
* Fix SRS to actually use Gender, Culture, Voice, Port
2022-08-17 17:33:29 +02:00
Applevangelist 18ec2ff458 #PLAYERTASK
* Corrected usage example on `SetTaskWhiteList()`
* Mark on map will add some basic info text
2022-08-17 16:23:37 +02:00
Applevangelist c38a737421 #PLAYERTASK
* Added option to whitelist task types
* Added localization. Contains "en" and "de" texts and tts texts
2022-08-17 15:38:20 +02:00
Applevangelist 0166b53e21 #PLAYERTASKCONTROLLER
* Added option to suppress screen output
* Added target information via SRS
* Added target radius for BAI vs CAS and target type COORDINATE to be configureable
* Refined SRS output
* Added STATIC targets to get task type BOMBING
* Added solution to detect bombing runways (kind of, bombing occuring in AFB zone)
* Added solution for COORDINATE and ZONE type TARGETs (find enemy GROUP and/or STATIC objects in target radius)
* Refined documentation
2022-08-16 16:48:13 +02:00
Applevangelist 724da4e500 #PLAYERTASKCONTROLLER
* Added Accept and Reject Zones to detection
* Added SRS Stuff
* Tasks sorted by priority
2022-08-15 19:07:05 +02:00
Applevangelist ce15e8dfe0 #PLAYERTASKCONTROLLER
* Set menu name
* Better menu buildup and refresh
2022-08-15 13:11:09 +02:00
Applevangelist b968d0d694 #PLAYERTASKCONTROLLER
* Added detection setup
* Added number of joined players in join task overview, and a star when it's new
2022-08-14 16:50:57 +02:00
Frank fa0549f34f Merge pull request #1756 from FlightControl-Master/FF/Ops
Update Airboss.lua
2022-08-04 22:13:18 +02:00
Frank 999ef36963 Update Airboss.lua
#1755
2022-08-04 21:18:38 +02:00
Frank 7affd05247 Merge pull request #1754 from FlightControl-Master/FF/Ops
Updates
2022-08-03 09:14:12 +02:00
Frank 2ccf4011ed Merge branch 'develop' into FF/Ops 2022-08-03 09:12:32 +02:00
Frank 61f3908d33 Updates
**AIRBOSS**
- Stennis now takes dimensions of other super carriers

**FLIGHTCONTROL**
- Added queue for sounds
- Fixed bugs and minor improvements

**ZONE**
- Added defaults when getting colors if not set

**SRS**
- Added new class `MSRSQUEUE`
2022-08-03 09:12:22 +02:00
Applevangelist 08e429210a Update Unit.lua 2022-07-31 09:16:46 +02:00
Frank f94944c41a Merge pull request #1750 from FlightControl-Master/FF/Ops
ZONE
2022-07-31 01:16:55 +02:00
Frank 200631e57e Merge branch 'develop' into FF/Ops 2022-07-31 01:13:53 +02:00
Frank 9c83d5e752 ZONE
- Added new class `ZONE_ELASTIC`
2022-07-31 01:13:42 +02:00
Applevangelist 894bff2e35 PLAYERTASK - added list of pilots to TaskInfo 2022-07-30 12:26:29 +02:00
Applevangelist 6ff0a699c0 #PLAYERTASKCONTROLLER
* Added Event handling stuff in case client leaves/ejects/dies
* A2A - removed menus for smoke/flare
* Task menu entries now refreshed more intelligently
* Added `PLAYERTASKCONTROLLER:OnAfterTaskAdded(From, Event, To, Task)`
2022-07-30 12:06:11 +02:00
Frank 5083428a06 Merge branch 'develop' into FF/Ops 2022-07-30 01:24:52 +02:00
Applevangelist c74a14fcb0 PLAYERTASK - debugging 2022-07-29 15:31:56 +02:00
Applevangelist d060c7535a PLAYERTASK - added a couple of FSM events so task events bubble up to the controller 2022-07-29 14:53:23 +02:00
Applevangelist 5eb134f7b5 PLAYERTASK - Additions 2022-07-29 14:14:22 +02:00
Applevangelist c1c5117f01 Update Moose.files (#1749) 2022-07-29 12:25:45 +02:00
Applevangelist 8ce1f5884f PlayerTask Beta 2022-07-29 12:24:36 +02:00
Applevangelist 1f8b51fafe SET - fix for dead units 2022-07-29 08:51:00 +02:00
Applevangelist 80f73f0bb1 AUTOLASE - added per player settings observance, also 2022-07-27 19:41:20 +02:00
Applevangelist 88e7b3fb47 AUTOLASE - observe global _SETTINGS for coordinates 2022-07-27 19:28:36 +02:00
Frank 3bb36044c1 OPS
- Added check that cohorts cannot have the same name.
- Made clearer that cohorts cannot have the same name in the docs.
2022-07-25 22:45:43 +02:00
Applevangelist f9ace54fab UNIT - added get altitude function with AGL option 2022-07-25 08:12:10 +02:00
Applevangelist 498d7e2f66 Airbase - added 2 AFB to SA map 2022-07-22 11:02:08 +02:00
Frank 420526df9d Merge pull request #1747 from FlightControl-Master/FF/Ops
OPS
2022-07-20 22:58:57 +02:00
Frank ab00d9534d Merge branch 'develop' into FF/Ops 2022-07-20 22:21:17 +02:00
Frank 4bb9073ce1 OPS
- Increased selection score for GCICAP/INTERCEPT
2022-07-20 22:20:26 +02:00
Applevangelist 58cb0118b4 AWACS - added option for custom TTS callsigns 2022-07-19 09:34:40 +02:00
Applevangelist f19740e376 Beacon - added deactivate Link4 2022-07-19 08:30:09 +02:00
Applevangelist ab50d0a514 Controllable/Beacon - added function to switch on Link4
A2A - typo in documentation
2022-07-19 08:10:35 +02:00
Frank e551212516 Merge branch 'develop' into FF/OpsDev 2022-07-18 23:00:01 +02:00
Frank 888734b7d1 OPS
- Fixed bug in parking spot distance for ships.
- Added enroute  anti-ship task for anti-ship missions.
2022-07-18 22:59:49 +02:00
Applevangelist 90d1a01998 AWACS - delete open tasks on player leaving unit 2022-07-14 14:06:20 +02:00
Anthony De Vellis ab1dd2b374 AWACS - Tweaked escort logic to use one AUFTRAG per escort fighter and tweaked positioning logic. Allows more control over escort fighters which will support a future PR (#1746) 2022-07-12 08:18:47 +02:00
Anthony De Vellis 0e4d731068 AWACS - added the ability to use custom callsigns with TTS/messaging (#1745)
* AWACS - added the ability to use custom callsigns with TTS. Revised section 5.1 of documentation to demonstrate

* AWACS - Added nil check to callsign construction when looking for replacement
2022-07-12 08:13:24 +02:00
Frank f23416dfb8 Merge branch 'develop' into FF/OpsDev 2022-07-11 23:23:11 +02:00
Frank 469cc3d508 OPS
CHIEF: SetResponseOnTarget
TRANSPORT: improved transfer of loaded cargo
2022-07-11 23:22:58 +02:00
Applevangelist 5ad88be997 AWACS - change setup as TACS slightly 2022-07-09 15:34:08 +02:00
Applevangelist 536341b6de AWACS allow startasgci to process a string instead of a GROUP 2022-07-09 15:02:14 +02:00
Applevangelist 18dcd0a5d2 AWACS - some additions 2022-07-09 14:52:49 +02:00
Applevangelist 5f8a0643f4 AWACS - added GCI plane-less option 2022-07-07 17:55:35 +02:00
Applevangelist ccbf8b34ef Fix for #1736 2022-07-07 08:51:28 +02:00
Applevangelist 25915c077e Various fixes 2022-07-07 08:47:43 +02:00
Frank bcb574e618 Merge branch 'develop' into FF/OpsDev 2022-07-01 23:19:02 +02:00
Frank 6cfa24340f Update Range.lua
- Fixed bug in strafing runs
2022-07-01 23:10:10 +02:00
Frank 0dc26216c2 OPS 2022-07-01 23:00:25 +02:00
Frank 8dd850d685 OPS Operation 2022-06-29 22:25:08 +02:00
Frank 638f261bf4 OPS
- Improved FLIGHTCONTROL and minor other classes
2022-06-28 18:55:43 +02:00
Applevangelist ad5a0a5cd9 CSAR - hand back descriptive name as 3rd parameter on event Boarded() 2022-06-25 17:24:37 +02:00
Applevangelist 7dda54f36d UTILS - Fix for Gazelle Door Check 2022-06-25 14:28:04 +02:00
Frank a8477940e2 Merge branch 'FF/Ops' into FF/OpsDev 2022-06-21 16:15:03 +02:00
Frank 6a26f62ca1 Merge branch 'develop' into FF/Ops 2022-06-21 16:14:31 +02:00
Frank 06d0bfadca FLIGHTCONTROL v0.6.0 2022-06-21 16:08:46 +02:00
Applevangelist b805d7fe19 CSAR - fix for oncrash 2022-06-16 15:42:13 +02:00
Applevangelist b784671397 CSAR - added event for "Landed" at a friendly/neutral AFB. Fixed Airbase rescue. 2022-06-16 13:40:35 +02:00
Applevangelist 4784a31513 UTILS - Falklands additions 2022-06-14 17:20:12 +02:00
Applevangelist 3eb9bfe9ee COORDINATE - additions to BRAANATO
AWACS - make bogey dope use the priority queue to avoid collisions. Say "very low" and not "zero thousand", drop "vanished" if not tags is requested
2022-06-14 13:08:18 +02:00
Applevangelist ab31aecdac CSAR - some fixes for latest open beta 2022-06-14 12:37:56 +02:00
Applevangelist 5cb2bd1332 Update Beacon.lua 2022-06-13 15:41:19 +02:00
Applevangelist 8bff9efc5c Beacon - update docs (#1733)
Updated docs to point to ActivateTacan as better option to AAATACAN
2022-06-13 15:21:50 +02:00
Applevangelist d01360ca19 CSAR - Put wounded group back into status green, so they run to the chopper 2022-06-12 12:47:10 +02:00
Applevangelist f48c71f30c AWACS - Added option to use marker to create, move and delete a player station 2022-06-10 11:56:19 +02:00
Applevangelist a2b3190b1d More docu 2022-06-09 12:12:45 +02:00
Applevangelist 913d5a532d CTLD - further documentation 2022-06-09 11:46:17 +02:00
Applevangelist 96c6c372fd Added documentation for CTLD_HERCULES 2022-06-09 10:56:33 +02:00
Frank 8926e06e44 Runways
**AIRBASE**
- Runways are now retrieved from DCS API function
2022-06-08 23:42:17 +02:00
Applevangelist 6636e89a0b AIRBASE added South Atlantic 2022-06-08 20:24:31 +02:00
Applevangelist 01e9e83641 AWACS - PlayerGuidance makes picture calls refer to asking player BRA, delete contact engagement label on checking out 2022-06-07 11:30:20 +02:00
Applevangelist 30dc338636 CSAR - added a couple of more lines to go out via TTS 2022-06-07 08:56:25 +02:00
Applevangelist d4999de214 CSAR - added options to use Google TTS 2022-06-07 08:12:57 +02:00
Frank a53595a055 OPS
Enhanced OPERATION and FLIGHTCONTROL features.
2022-06-06 22:05:57 +02:00
Applevangelist 0cb7415a4c AWACS -- enforce EPLRS 2022-06-05 18:03:39 +02:00
Applevangelist 9f287d0d7f AWACS 0.1.27
* Added options for NoMissileCals and PlayerCapAssignment
* Added documentation on options
2022-06-04 13:56:57 +02:00
Applevangelist feddda2948 AWACS - added docu for speech queue padding options 2022-06-03 14:42:08 +02:00
Applevangelist 613b7eda8a AWACS 0.1.26 - corrected player picture call to use B/E references, bogey dope to announce only one group. ZipLip will also remove group tags. 2022-06-03 09:27:01 +02:00
Applevangelist bd3364a3cf AWACS - limit merge calls 2022-06-02 17:39:39 +02:00
Applevangelist 3f918bd309 AWACS 0.1.25
* Added Function ZipLip
* Changed merge distance to 5nm for account for delay in speech generation
* Altered RadioQueue to not save all calls until a player connects
* Some bugfixes
2022-06-02 15:31:03 +02:00
Frank 9b3f2ae3c7 OPS 2022-05-31 22:54:37 +02:00
Applevangelist 6c33c5701f Awacs 2022-05-31 16:21:19 +02:00
Applevangelist e731fe9b98 AWACS 0.1.24 - Added merge call, google now says "zero" not "oh", aligned some callouts to more realistic versions, bulls related calls without aspect now. 2022-05-31 14:02:14 +02:00
Frank edbfa9117d OPS
- Added new **CONDITION** class
- Added new **OPERATION** class
2022-05-30 11:45:56 +02:00
Frank ae54cd8fde OPS
** ARMYGROUP**
- Added suppression option

**COMMANDER**
- Added function to add targets with defined resources

**OPSGROUP**
- Added option to pause multiple missions

**INTEL**
- Fixed bug in cluster calc

**LEGION**
- Added function to get alive opsgroups

**TARGET**
* Added start condition
2022-05-27 22:14:21 +02:00
Applevangelist 91686e252c AWACS FSM Functions Docu 2022-05-24 16:05:04 +02:00
Applevangelist 88d132931e AWACS - Nicefy docs 2022-05-24 14:44:23 +02:00
Applevangelist 4afedcf126 AWACS - added documentation, added option to suppress group tags 2022-05-24 14:04:52 +02:00
Frank d3d815f26a Merge branch 'FF/Ops' into FF/OpsDev 2022-05-23 23:11:37 +02:00
Frank 62725b1930 OPS
**AUFTRAG**
- Added *invisible* and *immortal* options

**TARGET**
- Added `AddResource` function

**OPSGROUP**
- Added *invisible* and *immortal* options

**LEGION**
- Fixed bug in properties requirement

**COMMANDER**
- Added `AddTarget` function (still **WIP**)

**ARMYGROUP**
- Fixed routing bug after teleporting
2022-05-23 23:11:23 +02:00
Frank 06d509b5ac Update Airboss.lua
- Improved Case III entry waypoint
2022-05-22 22:36:43 +02:00
Applevangelist 77aba38625 AWACS - added docu 2022-05-22 17:14:14 +02:00
Applevangelist ce33e1d242 AWACS - Options to Draw Zones 2022-05-22 13:03:38 +02:00
Applevangelist 591cf29edf Update README.md 2022-05-22 11:17:20 +02:00
Frank dd81823e29 FC
**FLIGHTCONTROL**
- Less output to dcs log file

**FLIGHTGROUP**
- Added function :SetReadyForTakeoff
2022-05-21 22:25:08 +02:00
Frank 15994e7be8 FC
- Changed holding point to holding pattern or stack
- Replaced MESSAGE by TextMessageToFlight
2022-05-20 20:53:45 +02:00
Frank 61f3b87dae Update Airboss.lua
- Wind is calculated at 15 m (not 50 m)
2022-05-20 20:15:11 +02:00
Frank 6279f1920e FC
**FLIGHTCONTROL**
- Improved menus
- Added more menus
- Improved radio messages overlap
- Added options to limit number of fights taxiing and taking off
2022-05-20 20:08:28 +02:00
Applevangelist d169d60d8d AWACS BETA 0.1.22 - added some QOL functions, corrected standard TOS for AWACS and CAP, now 4 hours. 2022-05-20 19:31:11 +02:00
Applevangelist f49cf43fb1 Awacs - Documentation 2022-05-20 16:19:51 +02:00
Applevangelist aa94ae8759 AWACS moving to beta 1.22 - added documentation, some fixes 2022-05-20 15:51:54 +02:00
Applevangelist 8ad20b57fd TARGET - small typo 2022-05-19 14:41:06 +02:00
Frank 7c4cb5ea7f FC
- Improvements
2022-05-18 12:51:25 +02:00
Frank 23733bb1a6 Merge branch 'FF/Ops' into FF/OpsDev 2022-05-17 23:00:29 +02:00
Frank 5be3f333f3 Merge pull request #1731 from FlightControl-Master/FF/Ops
OPS
2022-05-17 22:53:10 +02:00
Frank b14f3f53aa Merge branch 'develop' into FF/Ops 2022-05-17 22:51:02 +02:00
Frank 47c3fc35e3 OPS
**OPSGROUP**
- Improved routing for ground.

**NAVYGROUP**
- Fixed U-turn of turn into wind

**ARMYGROUP**
- Improved updateroute

**LEGION** and **COMMANDER**
- Set mission range LARGE for relocation mission

**AUFTRAG**
- Fixed bug in Nassets for relocation
2022-05-17 22:50:35 +02:00
Applevangelist 0fd1497496 AWACS 0.0.19 2022-05-15 12:49:36 +02:00
Applevangelist 6c9c983f72 Positionable - added 6 passengers (cargo weight) to Toyota HL/LC new with 2.7.2 OB 2022-05-14 13:11:17 +02:00
Applevangelist 0422eee9af SRS - added hints on using Google with TTS 2022-05-13 16:38:10 +02:00
Frank 97a4b79713 OPS FC
- Improved holding point
2022-05-12 21:19:55 +02:00
Applevangelist 0785ee3099 Point - added option to add an SSML tag to ToStringBRAANATO
AWACS - 0.0.18
2022-05-12 14:48:56 +02:00
Frank d58d04d6a0 Merge branch 'FF/Ops' into FF/OpsDev 2022-05-12 11:04:13 +02:00
Frank 9bb2b17c77 Merge pull request #1730 from FlightControl-Master/FF/Ops
OPS
2022-05-12 10:50:47 +02:00
Frank 64e70d8e92 OPSGROUP
- #1677
- Fixed that damaged is triggered when group is despawned.
- Fixed total ammo calculation when group is dead
- Fixed assets do not carry out patrol zone after transport
2022-05-12 10:49:18 +02:00
Frank 6fa9eb558a Merge branch 'develop' into FF/Ops 2022-05-12 08:03:25 +02:00
Frank ddcc851951 FC
- Improved FC
2022-05-12 08:03:08 +02:00
Applevangelist dc2e5afe3e SRS - put volume in "" - just in case 2022-05-11 07:30:39 +02:00
Applevangelist d8e9997987 SRS - actually pass the volume to the command line 2022-05-11 06:18:48 +02:00
Applevangelist 3d919cd937 AIRBASE - corrected ["Deir_ez_Zor"] = "Deir ez-Zor" (minus doesn't work in enum) 2022-05-10 19:40:44 +02:00
Applevangelist b094c2d78f Correct link to demo missions 2022-05-10 16:17:46 +02:00
Applevangelist 9b699ba374 Update AI_Air.lua 2022-05-10 10:11:25 +02:00
Frank f8e5efc874 Merge branch 'develop' into FF/Ops 2022-05-09 08:41:55 +02:00
Frank 2c61c695d5 Update Chief.lua
- Added target in zone check to abort missions
2022-05-09 08:41:33 +02:00
Frank b6e806adbc Update FlightGroup.lua
-No despawn after player landed.
2022-05-08 00:29:36 +02:00
Applevangelist e74aa160af Group - small change 2022-05-07 19:42:10 +02:00
Clément Fassot 6793228fbe Add an option to display arrows if clusters are moving (#1728) 2022-05-07 15:32:48 +02:00
Applevangelist e83ea8124e GROUP - change to GetUnits(n) to make it more robust, now returns first alive unit,actually. Similar changes to GetHeading() 2022-05-07 11:54:48 +02:00
Frank 313f99d09d OPS
**AUFTRAG**
- Added option to specify mission type for escorts, *e.g.* `AUFTRAG.Type.SEAD`

**LEGION** and **COMMANDER**
- Improved handling of SEAD escorts.
2022-05-06 21:50:23 +02:00
Applevangelist 28de292107 ##AWACS Alpha 0.0.17
* Added RejectZone (foreign border)
* Option to suppress screen output
* Option to add google key in SetSRS
* Some corrections to callouts
* Menu option to show base info
* WIP - Basic player task assignment
2022-05-06 16:36:57 +02:00
Applevangelist 10efb98eb3 Fallout fixes 2022-05-06 11:44:59 +02:00
Applevangelist 8ac2241372 AI Patrol - life check on route 2022-05-06 10:36:51 +02:00
Applevangelist 092434a103 UNIT Register - small fix for trains 2022-05-06 08:01:18 +02:00
Applevangelist a777997f79 AI_CAP - more fallout from the dead units in the API 2022-05-05 17:40:17 +02:00
Applevangelist 36cf7f718b AI_AIR - restrict AB on RTB 2022-05-05 16:41:15 +02:00
Applevangelist 7989267d51 AI/ZONE - Some fixes for units unreachable 2022-05-05 12:08:43 +02:00
Applevangelist ef4398a5f1 SRS - adding volume setting and a test on OS and IO available
OpsGroup - added volume options for `SetSRS`
2022-05-05 11:35:27 +02:00
Applevangelist 0da8afc108 SRS - adding volume setting and a test on OS and IO available 2022-05-05 08:57:15 +02:00
Frank 0e74d36227 Update Range.lua
**RANGE** v2.4.0
- Copy from updated
2022-05-04 22:40:22 +02:00
Applevangelist 290cc151bc SET - further event related stuff not working any more
AWACS - update
2022-05-04 18:10:20 +02:00
Applevangelist 21f93aa7e8 AWACS - 0.0.12 2022-05-04 13:29:14 +02:00
Applevangelist 04c77e9760 Some fixes to make the SpawnScheduled work again 2022-05-04 09:58:30 +02:00
Frank c6da6544da Merge pull request #1725 from FlightControl-Master/FF/Ops
Dead Event
2022-05-04 09:49:37 +02:00
Frank 94d3e38bc7 Merge branch 'develop' into FF/Ops 2022-05-04 09:47:30 +02:00
Frank 5fcf992920 Dead Event
**EVENT**
- Improved handling of delayed dead event

**SPAWN**
- Improved handling of delayed dead event
2022-05-04 09:46:00 +02:00
Frank 22cc9eabc0 Merge pull request #1724 from Ked57/develop
Replace log MESSAGE when updating cluster markers in INTEL with a log
2022-05-03 23:31:15 +02:00
Clément Fassot b191c0d341 Replace log MESSAGE when updating cluster markers in INTEL with a log (#1) 2022-05-03 23:08:26 +02:00
Frank d2d431ce2e OPS (#1723)
**INTEL**
- Added nil check for cluster position update

**OPSGROUP**
- Improved fire at point task to take only max avail shots and relative shot amount
- Fixed tasks not executed after teleport
2022-05-03 09:41:22 +02:00
Frank 3a6b58ea8c Merge branch 'develop' into FF/Ops 2022-05-03 09:25:15 +02:00
Frank 2d8fc40307 OPS
**INTEL**
- Added nil check for cluster position update

**OPSGROUP**
- Improved fire at point task to take only max avail shots and relative shot amount
- Fixed tasks not executed after teleport
2022-05-03 09:23:53 +02:00
Applevangelist 68dce2f247 extra nil checks for dead units 2022-05-03 08:46:23 +02:00
Applevangelist bc03eb2e65 FIFO - FIFO:HasUniqueID(UniqueID)
GROUP - added GROUP:IsPlayer()
INTEL - added clustering by flight deck (10'k ft) for AIR
SET - added option to NOT set the cargo bay weight limit automatically on SET_GROUP:AddGroup( group, DontSetCargoBayLimit )
2022-05-02 17:18:48 +02:00
Frank f725709e5b Merge pull request #1721 from FlightControl-Master/FF/Ops
OPS
2022-04-29 22:02:24 +02:00
Frank ba591c9dc5 OPS
**AUFTRAG**
- Added new type `NOTHING` (similar to `ALERT5` but for ground/naval)
2022-04-29 22:00:23 +02:00
Applevangelist def5d33055 GROUP - making GetCoordinate() a bit more resilient
POINT - slight changes to ToStringBRAANATO
2022-04-29 18:48:27 +02:00
Applevangelist 1aaa51c4be COORDINATE - added bogey option to COORDINATE:ToStringBRAANATO(FromCoordinate,Bogey,Spades) 2022-04-29 12:19:06 +02:00
Applevangelist 37206bcc83 Range - added nil check for playerData 2022-04-29 12:10:16 +02:00
Frank c2b86bac4b Update Airboss.lua
- Fixed DATABASE:GetFlightGroup to DATABASE:GetOpsGroup
2022-04-28 20:52:47 +02:00
Frank 02dad179cd Recovery tanker 2022-04-28 20:50:30 +02:00
Applevangelist adb94f8773 Nicefy docs 2022-04-28 17:10:49 +02:00
Applevangelist 035110df75 AWACS - removed banner from docs 2022-04-28 16:48:24 +02:00
Applevangelist 5adb65899c USERSOUND - added USERSOUND:ToUnit() 2022-04-28 16:48:07 +02:00
Applevangelist 764a373e7d POSITIONABLE - added POSITIONABLE:MessageToUnit(), and :MessageToSetUnit() 2022-04-28 16:47:42 +02:00
Applevangelist 8114327c7e MESSAGE - added MESSAGE:ToUnit(), altered MESSAGE:ToClient() to message the unit only 2022-04-28 16:46:28 +02:00
Applevangelist 6404417dad luacheck barking 2022-04-28 13:48:48 +02:00
Applevangelist d89cb8f1e9 Added Awacs WIP to working tree, Enums - corrected Hawkeye, added Super_Hercules 2022-04-28 13:11:04 +02:00
Applevangelist dee95c2f08 Update Moose.files 2022-04-28 13:04:22 +02:00
Frank 3a907ec7c2 Merge pull request #1720 from FlightControl-Master/FF/Ops
Ff/ops
2022-04-28 09:19:01 +02:00
Frank 851dff6e8c Update Intelligence.lua
- Added function to add detection group
- Added functions to retrieve contact details
2022-04-28 09:17:33 +02:00
Frank 47e7364976 Merge branch 'develop' into FF/Ops 2022-04-27 22:46:36 +02:00
Frank 41f8207b3a Merge pull request #1719 from FlightControl-Master/FF/Ops
**CHIEF**
- Added resources as parameters to `:AddStrategicZone` function

**COMMANDER**
- Added function to relocate cohorts `:RelocateCohort`

**AUFTRAG**
- Added new type `AIRDEFENSE`
- Added new type `EWR`
- Added option to teleport assets to the mission ingress waypoint via `:SetTeleport`
- Added `:SetRequiredAttribute` and `:SetRequiredProperty` functions
- Added `:SetEmission` function

**LEGION**
- Fixed bug that assets on GCI dont get additional score for INTERCEPT missions
- Assets on ONGUARD or PATROLZONE are not considered for ARTY and GROUNDATTACK missions
- Added option for transport to `RelocateCohort` function
- Ground/naval assets now automatically return when out of ammo

**OPSGROUP**
- Immobile groups are teleported to mission ingress point

**RECOVERYTANKER**
- Added parameter to set TACAN mode/band (e.g. "X")

**GROUP**
- Fixed bug in `:GetSpeedMax` function

**BEACON**
- Allowed TACAN "X" mode for AA
2022-04-27 22:38:34 +02:00
Frank ed0a3a22ab OPS
**CHIEF**
- Added resources as parameters to `:AddStrategicZone` function

**COMMANDER**
- Added function to relocate cohorts `:RelocateCohort`

**AUFTRAG**
- Added new type `AIRDEFENSE`
- Added new type `EWR`
- Added option to teleport assets to the mission ingress waypoint via `:SetTeleport`
- Added `:SetRequiredAttribute` and `:SetRequiredProperty` functions
- Added `:SetEmission` function

**LEGION**
- Fixed bug that assets on GCI dont get additional score for INTERCEPT missions
- Assets on ONGUARD or PATROLZONE are not considered for ARTY and GROUNDATTACK missions
- Added option for transport to `RelocateCohort` function
- Ground/naval assets now automatically return when out of ammo

**OPSGROUP**
- Immobile groups are teleported to mission ingress point

**RECOVERYTANKER**
- Added parameter to set TACAN mode/band (e.g. "X")

**GROUP**
- Fixed bug in `:GetSpeedMax` function

**BEACON**
- Allowed TACAN "X" mode for AA
2022-04-27 22:36:13 +02:00
Applevangelist 3a513da942 Awacs next Alpha 2022-04-27 14:37:38 +02:00
Applevangelist a4f1c60da2 Enums - added a couple of names 2022-04-26 10:09:05 +02:00
Applevangelist de0bf7d814 typo 2022-04-25 10:36:10 +02:00
Applevangelist 71fd72e462 adding ZONE_POLYGON_BASE:IsVec3InZone( Vec3 ) (might be called from POSITIONABLE), closes gap for GROUP/UNIT:IsInZone(Zone_Polygon)
GROUP - better docu
2022-04-25 09:59:44 +02:00
Applevangelist 619cc3c047 various 2022-04-24 19:11:08 +02:00
Applevangelist 68c75a4e34 Menu Refresh cleanup 2022-04-24 14:06:24 +02:00
Applevangelist 37671cefa3 GROUP - overwrite GetHeight() inherited from POSITIONABLE with something that is actually working for groups 2022-04-24 13:50:23 +02:00
Applevangelist d9f409069a INTEL - add platform type for AIR contacts (Foxbat ... ), defaults to Bogey for AIR and Unknown for everything else
SRS- added option to set a label for the SRS radio overlay
OpsGroup - added options to use said label, and option to override a frequency for an SRS (TTS) sender
2022-04-24 12:46:11 +02:00
Applevangelist fd5a190490 AWACS Alpha 2022-04-23 18:58:27 +02:00
Applevangelist 2f4d5b32b6 GROUP/UNIT - added :GetNatoReportingName() 2022-04-23 16:41:47 +02:00
Applevangelist 4c7ac68858 UTILS - UTILS.GetReportingName(Typename)
ENUMS - added ENUMS.ReportingName
2022-04-23 15:09:02 +02:00
Applevangelist ad3a3c5266 AWACS a0.0.7 - cleaned up AWACS calls, implemented DECLARE 2022-04-22 20:34:24 +02:00
Applevangelist 51d924c1b8 BRAANato - make bearing a 3digit number 2022-04-22 13:32:34 +02:00
Applevangelist 83491f535a Point - BRAANATO - will return BRA only if no aspect can be generated 2022-04-21 18:56:51 +02:00
Applevangelist 380731a244 AWACS 0.0.6 2022-04-21 18:56:09 +02:00
Applevangelist 60c78da0f6 Utils/Point - Corrections 2022-04-21 12:56:40 +02:00
Frank 2d02f4f962 Merge branch 'develop' into FF/Ops 2022-04-21 08:40:45 +02:00
Frank 982bd89924 Merge branch 'develop' into FF/Ops 2022-04-20 22:03:24 +02:00
Frank 04f60747d9 Merge pull request #1716 from FlightControl-Master/FF/Ops
OPS
2022-04-20 21:51:09 +02:00
Frank 28c107b089 OPS
**AIRWING**
- Added option to start in air `:SetTakeoffAir()`
- Added option to despawn near airbase `:SetDespawnAfterHolding()`
- Added option to despawn after landing `:SetDepawnAfterLanding()`

**SQUADRON**
- Added option to start in air `:SetTakeoffAir()`
- Added option to despawn near airbase `:SetDespawnAfterHolding()`
- Added option to despawn after landing `:SetDepawnAfterLanding()`
- Squadron settings overrule Airwing settings

**OPSGROUP**
- Improved `:Teleport()` function
2022-04-20 21:48:03 +02:00
Applevangelist e6cc8757ac Utils typo 2022-04-20 19:14:19 +02:00
Applevangelist 9169bfc608 COORDINATE - Added Precision to GetDistanceText as an option 2022-04-20 19:04:37 +02:00
Applevangelist 610e33e4a4 COORDINATE - added ToStringBRAANATO (works hopfully ;)) 2022-04-20 18:54:51 +02:00
Applevangelist 77dd40fb4a SET - clarified return value of SET_GROUP:GetAliveSET() (table, not SET)
UTILS - BRAANATO
ZONE - added examples to ZONE_RADIUS:Scan()
2022-04-20 14:01:26 +02:00
Applevangelist 5a63c51316 Utils - docu spelling 2022-04-20 12:45:33 +02:00
Applevangelist eabc8b5854 UTILS - added BearingToCardinal, added ToStringBRAANATO 2022-04-20 12:43:24 +02:00
Applevangelist 1a798886a2 AIRWING - added function to callback AWACS "onafterflightonmission" 2022-04-20 08:33:49 +02:00
Applevangelist 8735dadbca Awacs updates 2022-04-20 08:33:11 +02:00
Applevangelist 2c53ebc0e4 FIFO Added Routines 2022-04-20 08:32:57 +02:00
Applevangelist f93033695d Alpha Updates 2022-04-19 15:38:29 +02:00
Applevangelist 2d0f5817d0 Minor Changes 2022-04-19 15:36:44 +02:00
Applevangelist 2033e22216 AWACS Alpha 0.0.2 (WIP) (#1714)
TBD
2022-04-18 16:57:33 +02:00
Applevangelist bada6f64ae Update Moose.files (#1713) 2022-04-18 12:27:58 +02:00
Applevangelist bc141698c8 FIFO - make own file in Utils
AUFTRAG - Add base missions params for NewNOTHING
Marker - typo
Modules - FiFo added
UTILS - removed FiFo code
2022-04-18 12:27:14 +02:00
Applevangelist 75fddd9349 FIFO/LIFO - Read functions. Count as alternative to GetSize() 2022-04-17 11:25:48 +02:00
Applevangelist b1a417295f TextAndSound - Docu 2022-04-17 11:24:36 +02:00
Applevangelist 0522036b80 Docu 2022-04-16 18:58:43 +02:00
Applevangelist 061469840b FIFO 2022-04-14 15:55:51 +02:00
Applevangelist 6e218ed908 LIFO/FIFO - enforce unique ID 2022-04-14 15:05:49 +02:00
Applevangelist 626b48c3d1 Added LIFO/FIFO:HasUniqueID(UniqueID) 2022-04-14 11:11:18 +02:00
Applevangelist dd957237e2 Nicefy docs 2022-04-14 08:54:42 +02:00
Applevangelist fc9e237dbb UTILS - LiFo/FiFo Stacks 2022-04-14 08:12:02 +02:00
Frank faac265373 Merge pull request #1712 from FlightControl-Master/FF/Ops
Ff/ops
2022-04-13 22:44:52 +02:00
Frank 998935e2a3 Merge branch 'develop' into FF/Ops 2022-04-13 22:40:19 +02:00
Frank 24f8116fce OPS
**ZONE**
- Fixed incorrect fillcolor alpha.

**COORDINATE**
- Fixed incorrect fillcolor alpha.

**AUFTRAG**
- Fixed `CASENHANCED` order of arguments wrong in docs.

**FLEET**
- Improved docs.
- Added ``:SetPathfinding` function

**OPSGROUP**
- Fixed RECON mission behaviour if not random.
- Improved stuck check if engaging.

**LEGION**
- Added weapon type as parameter for selecting cohort assets.

**COHORT**
- Added `:GetMissionRange` function that accounts for long range weapons.
- Added counting of asset ammo.
2022-04-13 22:39:48 +02:00
Applevangelist 3415330871 UTILS - added FiFo 2022-04-13 16:13:02 +02:00
Applevangelist eadeaae6db CTLD Corrected imperial hover message to say ft not m 2022-04-13 15:30:43 +02:00
Penecruz 32bdaf4f24 Update Ops Airboss for develop (#1711)
* Update Airboss.lua

* Revert "Update Airboss.lua"

This reverts commit 61b0f843eb.

* Update Airboss.lua
2022-04-13 09:35:18 +02:00
Applevangelist 7525fe9357 UTILS - corrected door check for AH64 2022-04-12 08:23:37 +02:00
Applevangelist b24f31922f Soundfile - missing backslash 2022-04-10 18:26:27 +02:00
Applevangelist 4c79349b8d MSRS - repair command string for .bat processing 2022-04-10 18:23:20 +02:00
Applevangelist 44f7a27387 AICSAR - missing \ in path 2022-04-10 18:22:31 +02:00
Applevangelist 369425bec1 Some SRS changes 2022-04-10 15:12:51 +02:00
Applevangelist 3dc284335e SoundOutput - Honor self.useSRS to find a path to sound files located inside the miz folder 2022-04-10 14:59:54 +02:00
Applevangelist bfc284994a SRS - port set not honored 2022-04-10 14:59:05 +02:00
Applevangelist 277409a807 Text and Sound: Spelling error 2022-04-10 14:58:47 +02:00
Applevangelist d1f1f14bc3 SRS - add port to docu 2022-04-10 10:18:26 +02:00
Applevangelist 5ee1f5d3af CSAR/AICSAR - added port options for SRS 2022-04-10 09:28:47 +02:00
Frank f4569fb5cc Merge pull request #1710 from FlightControl-Master/FF/Ops
OPS
2022-04-08 22:19:42 +02:00
Frank 4ba0a2dafb OPS
**FLEET v0.0.1**
- New class for naval units corresponding to AIRWING and BRIGADE

**FLOTILLA v0.0.1**
- New class for naval units corresponding to SQUADRON and PLATOON
2022-04-08 22:18:35 +02:00
Applevangelist c2b1c2b1d8 SET - logic correction in :Remove() 2022-04-08 11:26:59 +02:00
Frank 2e119e2efd Merge pull request #1709 from FlightControl-Master/FF/Ops
OPS
2022-04-07 12:39:49 +02:00
Frank 4641918486 OPS
**LEGION**
- Added function `:RelocateCohort()` to relocate cohorts from one legion to another.
2022-04-07 12:11:17 +02:00
Frank 407f6f2b0f Merge pull request #1707 from FlightControl-Master/FF/Ops
OPS
2022-04-04 22:31:33 +02:00
Frank f01d7ecd96 OPS
**AUFTRAG v0.9.1**
- Added new mission type `CARGOTRANSPORT`
2022-04-04 22:30:30 +02:00
Frank e3d987bbdf Update Database.lua
- Static templates saved under first unit name so they can be found.
2022-04-04 16:53:52 +02:00
Applevangelist 89845883d0 Some nil checks to the A2A dispatcher, keeping it from detecting nil units, added locale to Settings and use of it to TextAndSound 2022-04-04 12:57:31 +02:00
Frank 4e7ff94b33 Merge pull request #1706 from FlightControl-Master/FF/Ops
static spawn
2022-04-04 12:16:48 +02:00
Frank 2fb9a1b1d7 static spawn 2022-04-04 12:15:29 +02:00
Applevangelist 5c0ab36662 CTLD - Build object at the first crate location found, not randomly around the helo 2022-04-04 11:29:21 +02:00
Frank fc6dac326d Merge pull request #1705 from FlightControl-Master/FF/Ops
OPS
2022-04-04 00:00:51 +02:00
Frank 426dcff085 OPS
FLIGHTGROUP
- Improved homebase for spawned units
- Enabled helo inAir check due to DCS bug that inAir returns true when spawned at airbase or farp

SET_ZONE
- Added DrawZone() function

ARMYGROUP
- Improved EngageTarget() function

AUFTRAG
- ARMORATTACK is not falling back to GROUNDATTACK
2022-04-03 23:59:43 +02:00
Applevangelist e623f45c04 Update AICSAR.lua (#1704)
Added localization and fitting german (locale "de") texts
2022-04-02 12:49:09 +02:00
Applevangelist 3b9a9cb0fa some code cleanup 2022-04-01 19:37:55 +02:00
Applevangelist c018a86bdb adding missing goshawk variable 2022-04-01 19:37:37 +02:00
Applevangelist 559be38baf Update TextAndSound.lua (#1703)
Slight doc changes
2022-04-01 19:36:00 +02:00
Applevangelist e3e05e5003 Adding TextAndSound (#1702)
Adding TextAndSound localization class
2022-04-01 19:20:35 +02:00
Applevangelist 95649d7d46 Adding localisation class TEXTANDSOUND 2022-04-01 19:17:31 +02:00
Frank 61097de76d Merge pull request #1701 from FlightControl-Master/FF/Ops
OPS
2022-04-01 12:33:31 +02:00
Frank e49fff5028 Update Auftrag.lua 2022-04-01 12:11:28 +02:00
Frank 20ae7945e0 Merge branch 'develop' into FF/Ops 2022-04-01 12:09:33 +02:00
Frank c5a50d23b6 OPS
CHIEF
- Added option to customize reaction on strategic zones

AUFTRAG
- Added new type GROUNDATTACK
2022-04-01 11:17:43 +02:00
Applevangelist ad37e5ca27 AIRBASE, added ["Deir_ez-Zor"] = "Deir ez-Zor", 2022-03-30 12:05:04 +02:00
Frank e8303064b9 Update OpsGroup.lua 2022-03-29 16:32:50 +02:00
Applevangelist f8a577749a OPS - Some changes to ARMORATTACK to update route if target is moving 2022-03-29 12:03:45 +02:00
Applevangelist e113817293 CTLD - docu nicefy 2022-03-29 12:02:35 +02:00
Applevangelist 0d15cdd370 CTLD - corrected error in setting Hercules min and max drop height, added documentation 2022-03-29 08:52:21 +02:00
Applevangelist b5db08eec3 AIRBASE - Add'l AB for the Channels map 2022-03-28 10:13:02 +02:00
Frank c3591c1fae Merge pull request #1699 from FlightControl-Master/FF/Ops
OPS
2022-03-26 22:39:44 +01:00
Frank e1a4d5497a Merge branch 'develop' into FF/Ops 2022-03-26 22:38:20 +01:00
Frank 4e83162adc OPS
CHIEF
- Added `:RemoveStrategicZone()` function
- Added `:SetLimitMission()` function to limit number of total or specific mission types.
- Improved Tactical Overview

OPSZONE
- Improved `Stop()` function
2022-03-26 22:38:03 +01:00
Applevangelist 42c6b8a016 And don't forget Fahrenheit 2022-03-26 14:47:10 +01:00
Applevangelist 48f9d808cf Correcting Celcius to Celsius 2022-03-26 14:42:36 +01:00
Applevangelist 6546c27cf5 OPS - added HOVER mission type 2022-03-25 17:54:02 +01:00
Frank fc0c0f87dc Merge pull request #1697 from FlightControl-Master/FF/Ops
OPS
2022-03-25 12:52:31 +01:00
Frank 9d703c0af6 OPS
- CHIEF: added tactical overview
2022-03-25 12:50:45 +01:00
Frank 24559c475b Merge branch 'develop' into FF/Ops 2022-03-25 11:00:17 +01:00
Frank f92e8a285a OPS
- Added nil check on vec3 for _UndateEngageTarget in ARMYGROUP and NAVYGROUP
2022-03-25 10:27:32 +01:00
Frank 0411120551 OPS
OPSGROUP
- Added damage check for groups that are not alive.
- Added `:ReturnToLegion` function.
- Added `:Teleport` function

LEGION
- Aircraft dont start hot if on Alert5 mission

AUFTRAG
- Added Formation parameter to PATROLZONE (for ground only)

ARMYGROUP
- Set Vee formation for engage group
2022-03-25 09:49:26 +01:00
Applevangelist 5f57d4ddcd docu changes 2022-03-23 07:57:06 +01:00
Applevangelist 4164bbeba8 CSAR/CTLD - added type to script 2022-03-22 10:38:07 +01:00
Frank 14dea99ccd Update Utils.lua
- Removed useless UTILS.GetDate() function
2022-03-22 09:31:16 +01:00
Frank 3ea1881ff5 OPS INTEL v0.3.0
- Added option to detect statics via `INTEL:SetDetectStatics` function.
- Added `INTEL:KnowObject` function to make intel aware of GROUPs or STATICs.
- Improved cluster analysis.
- Changed `NewCluster` event: removed contact as first parameter.
2022-03-20 22:20:09 +01:00
Applevangelist 5192c188f4 AIRBASE - added 10 new AB names in Syria 2022-03-18 09:49:06 +01:00
Applevangelist c1ffa47e9d changed descriptions 2022-03-18 07:59:49 +01:00
Applevangelist 2808a9dcc5 CONTROLLABLE - added SetSpeed() and SetAltitude() from latest release 2022-03-18 07:41:10 +01:00
Applevangelist e1ab6b6c93 CSAR - remove timer check for "open the door" message to make behaviour more realistic 2022-03-14 09:12:06 +01:00
Frank 229868bb20 OPS
AUFTRAG: Trooptransport set pickup radius to 100 meters.
OPSGROUP: enabled pickup radius for trooptransport auftrag
ARMYGOUP: removed GetPathOnRoad as it seems unncessary
2022-03-14 08:32:09 +01:00
Frank 520eb4cd1d OPS
- Improved recovery of retreated groups
2022-03-11 22:36:00 +01:00
Applevangelist 2d0b4d6ae5 SCORING: Corrected calc error in summary scoring functions 2022-03-11 10:19:30 +01:00
Frank 5dae9a197a OPS
- CHIEF: fixed bug in LEGION.RecruitCohortAssets() function call
- COMMANDER: added total weight to LEGION.RecruitCohortAssets() function call
- POSITIONABLE: fixed bug in relFuel calculation for cargo bay size
2022-03-10 10:05:21 +01:00
Frank ff1ebf9775 OPS
- Legion: Improved max number of transport assets.
- OPSGROUP: fixed bugs in speed parameter
2022-03-09 19:07:24 +01:00
Applevangelist e6f388518a Update CTLD.lua (#1693)
minor nil check
2022-03-09 10:28:26 +01:00
Frank 3557706e3a OPS
- Added new AUFTRAG type  CASENHANCED
- Improved capturing of OPSZONES by CHIEF
2022-03-05 14:43:39 +01:00
Applevangelist f3d0d55a2f CTLD - small extra nil check in _GetUnitCargoMass(Unit 2022-03-03 12:34:55 +01:00
Applevangelist b0c2bad1d8 CTLD - small fix for finding crates when using engineers 2022-03-03 11:02:14 +01:00
Applevangelist 53c9ca3b3a SEAD/MANTIS - added Silkworm ASM 2022-03-03 11:02:14 +01:00
Frank e41ba1be45 Troop Transport
- Auftrag TROOPTRANSPORT: troops will wait in a zone and not at the exact position where the carrier lands.
2022-03-02 09:34:18 +01:00
Applevangelist 594febaece CSAR - remove double class 2022-02-21 19:36:13 +01:00
Applevangelist 890dae8ba7 SEAD - adding workaround for AGM_154 which lost target data 2022-02-21 08:35:56 +01:00
Applevangelist 8a3120be39 AUTOLASE - added nil check for CanLase() 2022-02-19 13:26:02 +01:00
Applevangelist 6b4975559d CSAR - added wet feet check if also using csarUsePara (no landing event triggered) 2022-02-18 08:22:57 +01:00
Applevangelist 3326550705 CSAR - added "wet feet" option for a 2nd template to be used over water 2022-02-17 17:41:20 +01:00
Frank 6be0d82fc6 Merge branch 'develop' into FF/Ops 2022-02-16 12:23:03 +01:00
Applevangelist 44ad841d05 CTLD - fix side effects in weight check - fixes #1688 (#1689)
Fixed _FindCratesNearby() to optionally ignore the helo's max load capacity, which prevented CTLD from finding, listing, building crates is weights are used. Fixes #1688
2022-02-16 10:02:44 +01:00
Applevangelist 53f45ace4c CTLD - corrected default weight limits when using CTLD:UnitCapabilities() - was setting loadable weight to zero 2022-02-15 18:07:14 +01:00
Applevangelist 42e9cae876 added back GROUP:GetHighestThreat() 2022-02-15 14:41:45 +01:00
Applevangelist e46922d341 small correction 2022-02-15 07:30:41 +01:00
Applevangelist 21c242ee05 Added CTLD:SetTroopDropZoneRadius(Radius) 2022-02-13 12:07:57 +01:00
Frank 33b7a0cef2 Merge branch 'develop' into FF/Ops 2022-02-08 08:53:03 +01:00
Frank 9cddca1af5 AUFTRAG and WAREHOUSE
- Added check for AUFTRAG that if it is executing and all groups are dead, it's done
- Added check in WAREHOUSE find parking that units need to be alive
2022-02-08 08:52:47 +01:00
Applevangelist 8cdf0d9fce CSAR - CSAR:SpawnCSARAtZone(Zone ...) - Zone can now be a ZONE object as well as a string 2022-02-08 07:49:16 +01:00
Applevangelist a079ac4207 CTLD - allow AFB zones smoke/flare 2022-02-07 12:17:41 +01:00
Applevangelist 099238a2e5 CTLD - Allow option to create sub-category names for crates (normal, repair), added function to create zones from AFB/FARP names directly 2022-02-07 11:54:35 +01:00
Applevangelist 595bc16d92 DETECTION - added 3 missing functions 2022-02-04 08:56:34 +01:00
Applevangelist e9875c8288 small correction 2022-02-04 08:54:22 +01:00
Applevangelist ec600ab672 CTLD - Added Hercules support for crates, troops & vehicles loaded with the help of the ground crew and dropped from the plane. 2022-02-03 09:59:35 +01:00
Applevangelist c3689aee93 AICSAR - added limiter for available helos 2022-02-01 11:47:36 +01:00
Applevangelist 60a728d521 SET - correct error in intersection 2022-02-01 08:03:02 +01:00
Applevangelist 7bd7071ec5 CTLD Docu updates 2022-01-31 11:36:20 +01:00
Applevangelist bb787aa9ca Update Range.lua (#1686)
Target sheet saving abilities as added by @TonyG
2022-01-31 11:27:44 +01:00
Applevangelist d2f629d100 CTLD - added maxweight, load weight checks for crates cargo, template checks 2022-01-31 11:15:24 +01:00
Applevangelist 5d949de0ee Point - fix typos 2022-01-30 09:49:42 +01:00
Applevangelist e21bc8a930 POINT - added option to name and stop smoke/fire 2022-01-30 09:39:03 +01:00
Applevangelist af79f63870 CTLD - small correction for Hercules 2022-01-27 15:56:10 +01:00
Applevangelist 4ff32342e3 AI Dispatchers - add ability to add/remove resources to/from a squad 2022-01-24 09:54:30 +01:00
Applevangelist 98d55faf4e CTLD - added selectable smoke drop color, droppable beacons 2022-01-23 11:37:53 +01:00
Applevangelist bd532ea808 Added Callsigns as per 2.7.9 2022-01-23 11:37:28 +01:00
Applevangelist d4bd57ee70 Autolase - small update on nil check 2022-01-21 10:09:12 +01:00
Applevangelist 90dbfb31a6 DETECTION - corrected call for Vec2 in zone 2022-01-19 07:51:43 +01:00
Applevangelist 55ca34cad3 Added doors check for UH-60L 2022-01-16 17:07:32 +01:00
Applevangelist 36a5e919cd CTLD, CSAR - added support for UH-60L 2022-01-16 11:39:37 +01:00
Applevangelist 3263ba1440 CTLD - make container shape configureable 2022-01-15 11:32:51 +01:00
Tony 9721c19e48 Update Range.lua (#1683)
Addition of self.rangename to results for Rangeboss
2022-01-10 15:10:49 +01:00
Applevangelist de71213eed AICSAR - added SRS and DCS radio capabilities, changed order of messages for initial spawning, documentation 2022-01-06 13:47:47 +01:00
Applevangelist 65abbf9563 AICSAR - added SRS option, made it easy to customize messages 2022-01-04 15:09:47 +01:00
Applevangelist a94098494a Docu updates 2022-01-01 14:57:40 +01:00
Applevangelist ec935356aa Mark visible as deprecated 2021-12-31 17:51:48 +01:00
Applevangelist 6ab419dfad Fix ATC new NTTR AFB names 2021-12-31 17:51:48 +01:00
Applevangelist b1ffcff064 Update Moose.files (#1679) 2021-12-31 15:37:08 +01:00
Applevangelist 4ce09a3845 New Module AI CSAR 2021-12-31 15:36:35 +01:00
Applevangelist 9686e74feb Update Airbase.lua (#1678)
Changed (again) Airport names on the Nevada map
2021-12-30 07:46:14 +01:00
Frank e97e24762d Merge pull request #1676 from FlightControl-Master/Applevangelist-patch-1
Update Range.lua
2021-12-29 15:41:48 +01:00
Applevangelist b3fd0805e8 Update Range.lua 2021-12-29 08:59:45 +01:00
Applevangelist 300092d07d SEAD - fix a rare case when a coordinate of a weapon cannot be found 2021-12-28 08:28:19 +01:00
Applevangelist 56ed3a11d6 Scoring - docu changes 2021-12-28 08:28:19 +01:00
Applevangelist 6938b20ab6 Group - added docu 2021-12-28 08:28:19 +01:00
Frank 77f2cf5089 Merge pull request #1672 from FlightControl-Master/FF/Ops
AIRWING
2021-12-23 19:55:27 +01:00
Frank 19e3b015c5 Merge branch 'develop' into FF/Ops 2021-12-23 19:54:15 +01:00
Frank 2702d0fc2a AIRWING
- Fix for missions not being assigned
2021-12-23 19:54:01 +01:00
Applevangelist 472a4883f0 ZONE: Set down trials for getting a random coordinate on a given land type to 100
Cohort -ensure fallback of mission range
2021-12-22 11:48:42 +01:00
Frank 485e2e18bf Merge pull request #1671 from FlightControl-Master/FF/Ops
OPS
2021-12-21 11:57:09 +01:00
Frank 40c0f69eff OPS
- Airwing added :SetPayloadAmount() and SetAirboss() functions
- AUFTRAG fixed Failure to Failed event name
- CHIEF added statics as targets
- LEGION added check that runway is operational and carrier is not recovering for mission selection
2021-12-21 11:54:55 +01:00
Frank 854a1e5723 Update ArmyGroup.lua
- Fixed speed nil in ofafterUpdateRoute
2021-12-17 15:57:28 +01:00
Applevangelist f4cd28cdb9 fixes 2021-12-17 14:31:06 +01:00
Applevangelist 5bae790dd8 Fix a rare occasion 2021-12-17 14:15:08 +01:00
Frank d1d43c38cd Merge pull request #1668 from FlightControl-Master/FF/Ops
OPS
2021-12-17 13:29:08 +01:00
Frank 7e1552eeb4 Merge branch 'develop' into FF/Ops 2021-12-17 13:27:13 +01:00
Frank 7306bf28e0 OPS
- CHIEF: fixed ground groups deployment
- AUFTRAG: minor fixes
- OPSGROUP: emission option
2021-12-17 13:26:27 +01:00
Applevangelist 07e00a8faf Noise reducing measures 2021-12-15 13:46:33 +01:00
Applevangelist ab93866366 Removing noise 2021-12-14 17:28:16 +01:00
Applevangelist d7801b59e7 OPS - making a couple of modules much less noisy as the logs on a large mission get rather big 2021-12-14 13:40:16 +01:00
Applevangelist ea926f173a CSAR - make beacon length configureable 2021-12-14 09:50:13 +01:00
Applevangelist f6b55da0c6 CSAR - override suppressmessages for menu driven information 2021-12-12 19:48:49 +01:00
Applevangelist ee4e562874 CTLD - corrected landheight of dropped smoke 2021-12-12 19:30:00 +01:00
Applevangelist abfe5ffc45 Typos 2021-12-11 19:41:21 +01:00
Applevangelist 9629b0e1a3 SET - Added Zone Filter for STATIC 2021-12-11 14:24:07 +01:00
Applevangelist 80b03dd194 CTLD Added menu for smoke/flare 2021-12-11 14:13:43 +01:00
Applevangelist 3f92f8d2aa SET - added a couple of zone filters for GROUP, UNIT, CLIENT and PLAYER 2021-12-10 16:02:50 +01:00
Applevangelist 823c94cace BRIGADE - Added function to load platoons back into the field 2021-12-10 12:09:04 +01:00
Frank 421ac6c427 Fixes in AUFTRAG and LEGION
- Object in AUFTRAG:_TargetFromObject(Object) can be nil
- Assets are optimized wrt later mission type for assets on alert5
2021-12-10 10:38:34 +01:00
Applevangelist 72550d6d84 small changes Legion & Auftrag 2021-12-09 17:44:44 +01:00
Applevangelist 72999cc7b0 Update Zone.lua (#1660) 2021-12-09 07:16:29 +01:00
Applevangelist 706cf641b3 Multiple fixes 2021-12-08 19:27:22 +01:00
Applevangelist d42bdb2505 Revert "Ops - Various"
This reverts commit 23ea5d9d06.
2021-12-07 18:13:13 +01:00
Applevangelist 9082054ba9 Revert "legion"
This reverts commit abc69bc838.
2021-12-07 18:10:21 +01:00
Applevangelist abc69bc838 legion 2021-12-07 17:35:56 +01:00
Applevangelist 23ea5d9d06 Ops - Various 2021-12-07 16:09:02 +01:00
Applevangelist 8d009d6366 Some false values seem to be in need of being set explicitly 2021-12-06 15:15:46 +01:00
Applevangelist 8213b51bd6 Update Utils.lua (#1654)
Small bugfix in UTILS.LoadSetOfGroups
2021-12-06 14:56:42 +01:00
Applevangelist a18fc2080d SET - slight change in remove function 2021-12-06 10:26:01 +01:00
Applevangelist 9c0ac0ff57 CHIEF - ArmoredGuard ensure on road 2021-12-04 18:40:14 +01:00
Applevangelist c34dc9f946 CHIEF/AUFTRAG/OPSGROUP Fixed RECON type mission adhereing to paramters adinfinitum and randomly, fixed CAS mission in CHIEF 2021-12-04 16:24:45 +01:00
Applevangelist 1c5c205614 OpsGroup - corrected speed calculation from DCSTask 2021-12-03 16:51:06 +01:00
Applevangelist 897df1b8fa CHIEF - Option to allow ground transport. Set CAS speed to 70% max as Russian Helos are overly slow 2021-12-03 14:27:03 +01:00
Applevangelist 3fb22b7c55 AUFTRAG - correct wrongly corrected speed conversion 2021-12-02 16:07:34 +01:00
Applevangelist 7819a30c57 BRIGADE - Fuel zones landing in the wrong table. Corrected 2021-12-02 12:17:48 +01:00
Applevangelist 37d2c72945 MANTIS - added variable ranges for short, med and long range systems. Altered engage range to 95% and shoradactivation to 25km as defaults
AUFTRAG/CHIEF/OPSGROUP - added Auftrag type ARMOREDGUARD to have an ONGUARD mission for tanks w/o triggering transport by CHIEF
Made classes around CHIEF & AIRBOSS a bit less noisy as it kills my logfile
2021-12-02 10:13:38 +01:00
Applevangelist 5631e2c09f Minor changes 2021-11-29 08:03:58 +01:00
Applevangelist c7ddd6ec35 CSAR - added check smoke/flare distance is valid 2021-11-27 17:27:58 +01:00
Applevangelist 7280ceac32 ARMYGROUP - in tracing, formation flag can be empty 2021-11-26 15:36:46 +01:00
Applevangelist f8b9128d8e CHIEF - Added catch if coalition us given as string 2021-11-26 15:36:09 +01:00
Applevangelist c482f1dccd Corrected typo in Unit.Category.HELICOPTER 2021-11-26 15:35:45 +01:00
Applevangelist 7e306be8aa UTILS - Added functionality to save & load groups and statics information 2021-11-26 15:34:47 +01:00
Frank 035e6913b5 Merge pull request #1643 from FlightControl-Master/Applevangelist-armor-1
CHIEF - Added use of ARMORATTACK
2021-11-24 13:38:25 +01:00
Applevangelist e12f233afc Update Chief.lua 2021-11-24 13:32:39 +01:00
Applevangelist 26c7ff8c18 Update Chief.lua 2021-11-24 13:32:14 +01:00
Frank 5647364293 Merge pull request #1644 from FlightControl-Master/Applevangelist-armor-1-1
OpsGroup - Added support for ARMORATTACK
2021-11-24 13:17:45 +01:00
Frank 06fa585f69 Merge pull request #1642 from FlightControl-Master/Applevangelist-Armor-1
Auftrag - Added type ARMORATTACK
2021-11-24 13:17:13 +01:00
Applevangelist 035eac2f1e OpsGroup - Added support for ARMORATTACK
OpsGroup - Added support for ARMORATTACK
2021-11-24 12:09:07 +01:00
Applevangelist f01889cbf7 CHIEF - Added use of ARMORATTACK 2021-11-24 12:07:03 +01:00
Applevangelist 73025bfd4b Auftrag - Added type ARMORATTACK
Auftrag - Added type ARMORATTACK
2021-11-24 12:06:02 +01:00
Applevangelist aec6dd1246 SEAD/SHORAD - Add AGM-88 player modes handling 2021-11-22 11:37:10 +01:00
Applevangelist ab4411e5bb SEAD - calculate HARM impact point from firing position if no target data is given
SHORAD - ignore HARM AGM-88 is not fired at a specific target
2021-11-21 18:40:04 +01:00
Frank 0ac00efda6 Merge pull request #1641 from FlightControl-Master/FF/Ops
Ff/ops
2021-11-20 22:38:38 +01:00
Frank f32eb8d710 OPS
AUFTRAG
- Added mission task param for RECON, PATROLZONE and TROOPTRANSPORT

FLIGHTGROUP
- Fixed CheckGroupDone if group is engaging and has a paused mission

TARGET
- Added GetThreatLevelMax functions

CHIEF
- Added :AddGciCapZone() function
2021-11-20 22:36:15 +01:00
Frank ec33dfb76c Merge branch 'develop' into FF/Ops 2021-11-20 20:38:40 +01:00
Frank 43dfbac2fa Update Auftrag.lua
- Changed ROE in ESCORT auftrag from OpenFireWeaponFree to OpenFire
2021-11-20 20:38:23 +01:00
Frank 7a483abec2 Merge pull request #1639 from FlightControl-Master/Applevangelist-ArmyGroup-1
Update ArmyGroup.lua
2021-11-20 17:50:36 +01:00
Frank 35e6b6faf4 Merge pull request #1637 from FlightControl-Master/Applevangelist-Chief-1
CHIEF - Updates
2021-11-20 17:49:30 +01:00
Frank 1066b58fb6 Merge pull request #1640 from FlightControl-Master/Applevangelist-OpsZone-2
Update OpsZone.lua
2021-11-20 17:47:43 +01:00
Applevangelist b41b8f251f Update Chief.lua 2021-11-20 17:26:42 +01:00
Applevangelist a1426c3e81 Update OpsZone.lua 2021-11-20 17:12:33 +01:00
Applevangelist aa3967d88f Update ArmyGroup.lua
Added code to obey routing on roads
2021-11-20 17:09:55 +01:00
Applevangelist c610c4cba9 Update Chief.lua
Added some improvements to threat calculation
2021-11-20 17:08:20 +01:00
Applevangelist abb3a2dbd2 CHIEF - Updates
Added alignment to OpsZone Mission table. Added ARTY. Added Tanks for patrol
2021-11-19 16:03:25 +01:00
Frank 1f035301d9 Merge pull request #1636 from IsmaelB83/InboundCallMarshall
Inbound call marshall
2021-11-19 15:48:28 +01:00
Frank ebf7f76d48 Merge pull request #1635 from FlightControl-Master/Applevangelist-OpsZone-1
OpsZone -Mission Table
2021-11-19 15:47:18 +01:00
Ismael 397ab77105 This pull request enhances Airboss class functionality to provide with the
1) Inbound calls both from Players requesting marshal and AI sent to marshal:
"Marshal, [MODEX], marking mom's [BEARING] for [DISTANCE], angels [HEIGHT], state [FUEL_STATE]
2) Commencing call and voiceover (both AI and Players)

For that, two boolean fields have been added to Airboss class to trigger or not extra voice overs:
xtVoiceOvers
xtVoiceOversAI

These fields can be modified trough methods:
AIRBOSS:SetExtraVoiceOvers(true/false)
AIRBOSS:SetExtraVoiceOversAI(true/false)

Note. At the moment both methods initialize to "false" at Airboss:NEW, so in case you want to have this functionality activated, you need to call the methods with (true) when initializing your Airboss class.
The new methods in charge of creating the radio calls are
AIRBOSS:_MarshalAI: for AI flights send to marshal
AIRBOSS:_RequestMarshal: for player flighs requesting marshal from F10 menu

2) AIRBOSS:_CommencingCall(unit, modex), which is called from
AIRBOSS:_ClearForLanding: for AI flights cleared for landing
AIRBOSS:_RequestCommence: for player flights requesting commencing from F10 menu (disregarding if the player call is right or not)

This enhacement of the Airboss class requires 5 new sound files (.ogg) to be included to folder "\Airboss Soundfiles" in your .miz file:
PILOT-Angels.ogg
PILOT-For.ogg
PILOT-MarkingMoms.ogg
PILOT-Marshal.ogg
PILOT-State.ogg
PILOT-Commencing.ogg
2021-11-19 15:31:49 +01:00
Applevangelist f37abc69ea Update OpsZone.lua 2021-11-19 14:29:18 +01:00
Applevangelist ee85b0e057 OpsZone -Mission Table
Added functionality to admin missions attached to an OpsZone (for CHIEF)
2021-11-19 14:20:53 +01:00
Ismael eab28abc86 Subject: Add Player and AI Inbound radio calls to better inmersion in Airboss #16311
This commit enhances Airboss class functionality to provide with the inbound calls both from Players requesting marshal and AI sent to marshal:
- "Marshal, [MODEX], marking mom's [BEARING] for [DISTANCE], angels [HEIGHT], state [FUEL_STATE]

Two new boolean fields have been added to Airboss class to trigger or not the inbound calls:
- inRadioCall
- inRadioCallAI

These fields can be modified trough methods:
- AIRBOSS:SetInboundMessagesPlayer(false)
- AIRBOSS:SetInboundMessagesAI(false)
Note. At the moment both methods initialize to "false" at Airboss:NEW, so in case you want to have this functionality activated, you need to call the methods with (true) when initializing your Airboss class.

This enhacement of the Airboss class requires 5 new sound files (.ogg) to be included to folder "\Airboss Soundfiles" in your .miz file:
- PILOT-Angels.ogg
- PILOT-For.ogg
- PILOT-MarkingMoms.ogg
- PILOT-Marshal.ogg
- PILOT-State.ogg

To get them, please refer to the SOUNDS MOOSE repository or the discord channel. Where they will be available.
2021-11-19 01:11:49 +01:00
Applevangelist 16c5307fc2 COMMANDER - Zone parameter doc not correctly mentioned in Luadocs 2021-11-18 10:58:42 +01:00
Applevangelist 8c8cae1e27 AUFTRAG - wrong speed conversion lines 925/295 corrected to KnotsToKmph 2021-11-18 10:58:13 +01:00
Frank 925c645821 Merge pull request #1633 from FlightControl-Master/FF/Ops
OPS
2021-11-17 17:17:11 +01:00
Frank c1c97a86b7 OPS
- COMMANDER: Added GCICAP zones
- AIRWING: Improved patrol zone counting, fixed bug in NewPatrolPoint
- OPSGROUP: mission speed acknowledged
2021-11-17 17:15:44 +01:00
Applevangelist 1fc1016148 Update Auftrag.lua
Added missionSpeed to Orbit
2021-11-17 16:42:58 +01:00
Frank e73545d296 Merge pull request #1630 from dogjutsu/dogutsu/develop
Fixed some typos of forms of the word 'strategy'.
2021-11-16 22:08:00 +01:00
dogjutsu f2fb7d43d0 Fixed some typos of forms of the word 'strategy'. 2021-11-16 12:45:14 -08:00
Applevangelist 781d421e1c slightly changes message 2021-11-16 15:48:00 +01:00
Applevangelist a3a7464a29 Small fix fox autoshorad parameters 2021-11-16 10:34:42 +01:00
Frank ac936f5650 Merge pull request #1629 from FlightControl-Master/FF/Ops
Scheduler
2021-11-16 10:34:12 +01:00
Frank c0f5dc2dc8 Scheduler
- Fixed bug
2021-11-16 10:33:35 +01:00
Applevangelist 31c113180e MANTIS - Zones - added conflict zones 2021-11-16 09:26:05 +01:00
Applevangelist 239df2deb2 SEAD - Updated TTI calculation for Tomahawk long shots 2021-11-16 09:25:38 +01:00
Applevangelist 31a8c4b0b9 SHORAD - Updates for missile without set target intel 2021-11-15 16:18:21 +01:00
Applevangelist f394bd45c7 SEAD - Updated to handle missiles w/o clear targets 2021-11-15 16:18:21 +01:00
Applevangelist 63999c9ec3 MANTIS - Added Attacker group info on planned/started suppression events 2021-11-15 16:18:21 +01:00
Frank 82c24cee7e Merge pull request #1628 from FlightControl-Master/FF/Ops
scheduler
2021-11-15 10:22:35 +01:00
Frank 5e94b0c009 Update Base.lua 2021-11-15 10:20:34 +01:00
Frank 452ff62134 SCHEDULER 2021-11-15 10:19:21 +01:00
Frank 3df494cacd Merge pull request #1627 from FlightControl-Master/FF/Ops
Ff/ops
2021-11-14 23:31:03 +01:00
Frank d62bb59df7 OPS
- Clean up tracing
2021-11-14 22:12:41 +01:00
Applevangelist b367f9320b CSAR - don't make usePara default. Added coalition check if using the parachute landing event 2021-11-14 13:33:31 +01:00
Applevangelist 4bc3dbbf6c MANTIS - added auto-setup of SHORAD 2021-11-14 13:13:41 +01:00
Applevangelist e7b7e3ac96 Merge pull request #1626 from FlightControl-Master/Applevangelist-unit-2
Wrapper Unit fix missile count
2021-11-14 13:00:35 +01:00
Applevangelist f3c4aea12f Wrapper Unit fix missile count
missile count for SAM and CRUISE types #1624
2021-11-14 12:59:24 +01:00
Frank b9b5938a91 OPS
- Fixed refuel system always true.
2021-11-13 20:08:22 +01:00
Applevangelist e7fdcf0db4 SEAD - Slightly wider escape radius 2021-11-13 19:11:25 +01:00
Applevangelist c1f22aa556 MANTIS - Added support for HighDigitSAM mod, added blindspot management, corrected distinguising between SA-2 and SA-3 2021-11-12 15:27:05 +01:00
Applevangelist 991b4089d6 SHORAD radius clarification 2021-11-12 15:25:25 +01:00
Frank a8132552de OPS
- Fixed bug in egress coord
- Improved barrage mission
- improved pickup at legion
- fixed bug in SetPathfindingOff function
2021-11-11 21:16:48 +01:00
Applevangelist a0323aef19 MANTIS - Some docu updates 2021-11-11 18:34:06 +01:00
Applevangelist a38abc2f7f MANTIS - latest updates 2021-11-11 17:45:25 +01:00
Applevangelist a6beecf510 MANTIS - Added Auto Mode 2021-11-11 17:22:21 +01:00
Applevangelist c5dece0e59 SEAD - make emissions on/off standard 2021-11-11 16:03:52 +01:00
Applevangelist ce935bafc1 Small fix to switch off pattern matching 2021-11-09 09:53:23 +01:00
Applevangelist fd426a96aa File functions 2021-11-09 09:51:31 +01:00
Applevangelist fad8800842 Added Docu 2021-11-09 09:51:05 +01:00
Applevangelist 273a473db1 MANTIS/SEAD make docu Pikes-friendly 2021-11-08 15:21:20 +01:00
Applevangelist a7588e517d SEAD - (re-)added emissions on/off option and ability to link object functions for state changes. 2021-11-08 13:11:58 +01:00
Applevangelist 84eff098eb MANTIS - Added FSM Events for SeadSuppressionPlanned/Start/ENd 2021-11-08 13:11:58 +01:00
Frank f157f3b5d6 OPS
- Fixed mission alt for patrol zone auftrag
2021-11-07 22:32:17 +01:00
Frank 6cd00c60a7 Update OpsGroup.lua
- Fixed waypoint alt for missions
2021-11-07 21:39:38 +01:00
Frank 2ea951db61 Removed WIP classes
- F10MENUE and FLIGHTCONTROL
2021-11-07 19:43:02 +01:00
Frank 9d0bd0aabb Update OpsGroup.lua 2021-11-07 19:39:53 +01:00
Frank 3d88d16b4b Merge branch 'FF/Ops' into FF/OpsDev 2021-11-07 18:24:48 +01:00
Frank 02724dc26d Merge branch 'develop' into FF/Ops 2021-11-07 18:20:27 +01:00
Frank 21a93652cd Update OpsGroup.lua
- Fix for AUFTRAG carried out only after the group has passed all waypoints
2021-11-07 16:08:11 +01:00
Frank fb4caf1a42 OPS
- Improved transport path
2021-11-07 16:03:44 +01:00
Frank 7a2508bf17 OPSTRANSPORT
- Improved pre-defined paths for pickup and transport
2021-11-06 18:10:49 +01:00
Applevangelist eeeab86952 added altered message 2021-11-06 18:07:42 +01:00
Applevangelist a149ff1705 Switch for fratricide and treason (coalition changes) 2021-11-06 15:15:30 +01:00
Applevangelist 2c73c9c815 Merge pull request #1620 from FlightControl-Master/Applevangelist-casevac-1
CSAR additions by Shagrat
2021-11-05 16:31:22 +01:00
Applevangelist f6f29db9f1 CSAR additions by Shagrat
Added functionality for Casevac
2021-11-04 17:23:29 +01:00
Frank c823a68616 OPS
- Fixed several bugs
2021-11-02 21:14:15 +01:00
Applevangelist e7e2184760 Autolase - fixed error when not using a pilotset 2021-11-01 19:46:56 +01:00
Applevangelist 6fe2422bc9 SRS Google addition by rollnthndr 2021-10-31 11:53:53 +01:00
Applevangelist cd62776be6 AIRBOSS additions by Pene 2021-10-31 11:53:24 +01:00
Applevangelist 037357efe9 Merge pull request #1619 from bbirchnz/ctld-crate-leak
fix cleanup of crates on load or build.
2021-10-31 11:31:19 +01:00
Ben Birch 8d3910ea4c fix cleanup of crates on load or build. 2021-10-31 19:37:26 +11:00
Applevangelist 3e5926f706 Speedmax returning 0 not nil 2021-10-30 16:32:59 +02:00
Applevangelist a1d67bf539 Speedmax returning 0 not nil 2021-10-30 16:32:42 +02:00
Applevangelist 3e65457041 doc impro 2021-10-29 18:30:22 +02:00
Applevangelist f70180eb66 SET_BASE - cmpleted GetSetComplement 2021-10-29 10:20:34 +02:00
Applevangelist c0a558e229 Merge pull request #1616 from Zonr0/Zonr0-ExternalToolsFix
Fixes broken external tools
2021-10-28 15:45:02 +02:00
Applevangelist 801069f5ac Update Moose_Create.lua 2021-10-28 15:39:57 +02:00
Frank f9dcac8264 Merge branch 'master' into develop 2021-10-28 10:21:16 +02:00
Frank 902c001aa4 OPS
Improved OPSTRANSPORT
2021-10-28 10:04:01 +02:00
Applevangelist 0cf2a4353d doc build - next try 2021-10-28 09:13:36 +02:00
Applevangelist 13c8cc90f2 doc build fix 2021-10-28 08:41:10 +02:00
Applevangelist db231fafeb Docs build test 2021-10-28 08:12:27 +02:00
Andrew Waugh c3f7deb602 Fixes broken external tools
Several small changes that should hopefully be a nice QoL upgrade for generating the imports and lead to less newbie confusion.

* Adds a lua binary directly to the repository instead of just expecting the user to have installed it via choco. Added binary is 5.4 as that's the lowest 5.x exe that's easily downloaded, and it works fine for what we need.
* Modifies the launch targets to use workspace_loc macros instead of resource_loc macros. Workspace_loc requires the user to have correctly set the name of their project, but that is already stressed in the documentation.  resource_loc was just wrong. (project_loc would cause problems if the user had selected something outside of the moose project before running).
* Modifies launch targets to use the folder structure that the project is actually structured with.
* Adds the include folder and files so Eclipse doesn't explode when they are missing.
* Small modifications to Moose_Create, also includes a path conversion function that in my testing doesn't make a difference eitherway on Windows, but is there for a troubleshooting option.
* Adds courtesy instructions when generating the dynamic include file.
2021-10-27 20:18:10 -07:00
Applevangelist 300e3f2f58 Merge pull request #1615 from FlightControl-Master/Applevangelist-docpatch
Update Task_Cargo_Transport.lua
2021-10-27 13:10:40 +02:00
Applevangelist 513406f0e5 Update Task_Cargo_Transport.lua 2021-10-27 13:09:30 +02:00
Applevangelist 27e21e77f9 Update Task_Cargo_Transport.lua 2021-10-27 11:19:32 +02:00
Applevangelist dadfd803f7 Update Autolase.lua
added docu
2021-10-26 13:58:11 +02:00
Frank 02b0ba2278 OPS
- Improved behaviour of OPSTRANSPORT when cargo or carrier is on mission.
2021-10-25 22:17:56 +02:00
Applevangelist 3e1005aef1 Small correction to silence wall of text when adding tasks to a mission 2021-10-25 16:29:14 +02:00
Applevangelist e2eb13739c Commented out wall of text when joining a unit as a player 2021-10-25 16:28:40 +02:00
Applevangelist c52e30ceae Added smoke color per RECCE 2021-10-25 16:28:11 +02:00
Applevangelist 07754cdf5f Merge pull request #1614 from madmoney99/develop
Forrestal Wire Corrections
2021-10-24 09:14:10 +02:00
madmoney99 c74c475a29 Forrestal Wire Corrections
Tested on MP and SP.  Both were recording incorrect wires on 1/2 and 4 wires regularly with an occasional 3 wire miss.  This tested correct in the Hornet.

TonyG
2021-10-23 16:34:21 -07:00
Applevangelist ad36ab520b Added Bell-47 2021-10-22 17:04:03 +02:00
Applevangelist bc32ff5db9 Added Bell-47 2021-10-22 17:03:57 +02:00
Frank 6009432933 OPS
- NAVYGROUP added engage target
- Barrage improvments
2021-10-22 11:23:29 +02:00
Frank 99eaa37c76 Merge branch 'master' into develop 2021-10-20 19:56:31 +02:00
Frank ed6d5f727a OPS 2021-10-20 19:49:26 +02:00
Frank c6995d6e58 OPS
- Fixed AUFTRAG :Repeat()
- Fixed bug in BRIGADE
- Improved cargo bay calculation in POSITIONABLE (includes rel. fuel)
- Changed carrier event names in OPSGROUP

- New class F10MENU (not sure about it)
2021-10-19 10:19:26 +02:00
Frank cb0f453a8d Merge branch 'FF/Ops' into FF/OpsDev 2021-10-16 13:41:40 +02:00
Frank d9866846ad Merge branch 'FF/MasterDevel' into FF/Ops 2021-10-16 13:40:37 +02:00
Frank de5d9195f3 OPSGROUP
- Cargo bay of element remains after respawn
- Added some docs for CHIEF
2021-10-16 09:32:47 +02:00
Frank fd1fe8562c Merge branch 'develop' into FF/Ops 2021-10-12 22:20:20 +02:00
Frank b1298223aa Merge branch 'master' into develop 2021-10-12 22:18:43 +02:00
Applevangelist c48128d92e CSAR - Added country options for spawned pilots 2021-10-12 08:30:44 +02:00
Frank 0f4d466953 OPS
- Changed mission, legion in MissionAssign functions (LEGION, COMMANDER, CHIEF)
- OPSTRANSPORT: improved TZC selection
- ARMYGROUP needs to
2021-10-11 21:28:35 +02:00
Applevangelist 1b752fcaf6 CTLD - bug fix for open doors 2021-10-11 18:47:39 +02:00
Applevangelist d06db9909c AUTOLASE Small update 2021-10-11 14:11:58 +02:00
Applevangelist 921024035c AUTOLASE - cleanup, added SRS option 2021-10-08 12:33:33 +02:00
Applevangelist 3b1c8c3deb AUTOLASE - added LOS check, maxlasingunits valid per lasing Recce 2021-10-07 18:16:40 +02:00
Applevangelist 69862ab67d CSAR - try to avoid spawning under water 2021-10-07 18:15:50 +02:00
Applevangelist b05c321306 CTLD - added door check for troops 2021-10-07 18:15:13 +02:00
Applevangelist 9b74a58dde UTILS - added door check for Hercules 2021-10-07 18:14:50 +02:00
Applevangelist d112ffaf6a Autolase - better calculation of LoS for lasing, somewhat faster detection 2021-10-07 09:49:06 +02:00
Applevangelist 554f063def INTEL - allow variable update times 2021-10-07 09:46:06 +02:00
Frank f6dce02203 INTEL
- Introduced pcall to getName() of detected objects. Found a problem with an object of ID 5,000,031
2021-10-06 22:03:02 +02:00
Frank 653dfe82fa OPS CHIEF
- Improved target queue for assigning new missions
2021-10-06 13:25:57 +02:00
Frank 5dbf743052 OPS
- Fixed a couple of minor bugs.
- FC added _PlayerAbortInbound function
2021-10-05 23:59:24 +02:00
Applevangelist f7e7e2e41c ZONE_CAPTURE_COALITION - fix an error when monitoring hits but the Event Function delivers SCENERY as a hit UNIT 2021-10-05 19:07:59 +02:00
Applevangelist b28b4db7fd docu fixes 2021-10-05 19:06:49 +02:00
Applevangelist c34f30e4a3 Docu fixes 2021-10-05 19:06:40 +02:00
Applevangelist aa7f11185d Small update 2021-10-05 19:06:30 +02:00
Frank 1790d19809 FC 2021-10-03 23:09:45 +02:00
Frank fa6fbca67b OPS
- Added tanker and CAP zones
2021-10-03 21:33:33 +02:00
Applevangelist cd79c57a27 AUTOLASE - added Cancel FSM to stop, docu changes, option to notify pilots in the set only 2021-10-02 14:45:37 +02:00
Applevangelist 4c3a97e2b2 Autolase! 2021-10-01 17:29:22 +02:00
Applevangelist f126dceeae Merge pull request #1610 from FlightControl-Master/Applevangelist-Autolase-2
Update Moose.files
2021-10-01 17:26:50 +02:00
Applevangelist 414521acc5 Merge pull request #1611 from FlightControl-Master/Applevangelist-autolase-3
Update Modules.lua
2021-10-01 17:26:40 +02:00
Applevangelist 9147422340 Merge pull request #1609 from FlightControl-Master/Applevangelist-Autolase-1
Create Autolase.lua
2021-10-01 17:26:29 +02:00
Applevangelist 920646ea74 Update Modules.lua
added autolase
2021-10-01 17:24:25 +02:00
Applevangelist c57d839927 Update Moose.files
Add Autolase.lua
2021-10-01 17:22:58 +02:00
Applevangelist e7fd5db2c2 Create Autolase.lua
Added Class AUTOLASE
2021-10-01 17:20:17 +02:00
Applevangelist b76486ef5f CSAR - added parameters for hovering rescue 2021-10-01 14:52:25 +02:00
Applevangelist 5c06584676 UTILS - correction door check MI-8 2021-10-01 14:52:00 +02:00
Frank 2ae2ee64be OPS
- Lots of updates and improvements
2021-10-01 12:04:15 +02:00
Applevangelist 17ba35e237 INTEL - also set isship and isground attributes on contacts 2021-10-01 10:44:25 +02:00
Applevangelist 53e98e70aa CTLD: added user-friendly function to inject static cargos: CTLD:InjectStaticFromTemplate(Zone, Template, Mass) 2021-10-01 10:43:49 +02:00
Applevangelist 359e18eb58 RADIO - delete frequency check 2021-09-30 08:07:42 +02:00
Applevangelist 3377459df5 Added option for silent mission addition 2021-09-29 16:57:45 +02:00
Frank 3e30d15405 Merge branch 'FF/Ops' into FF/OpsDev 2021-09-29 09:57:52 +02:00
Frank 2b50cf2243 Merge branch 'develop' into FF/Ops 2021-09-29 09:55:20 +02:00
Frank b72e2b6bf9 Merge branch 'master' into develop 2021-09-29 09:34:37 +02:00
Frank c7a2b34f59 Update Warehouse.lua
- Disabled fuel check.
2021-09-29 08:15:22 +02:00
Frank b48958995a OPS
- Fixed oscillation between UpdateRoute and CheckGroupDone in FLIGHTGROUP
- Improvements regarding capturing zones.
- Reduced log output
2021-09-28 23:26:33 +02:00
Applevangelist 58c496eacd GROUP - GROUP:GetAmmunition() - fix to also return bomb count correctly 2021-09-28 16:52:18 +02:00
Applevangelist 7bd867c9dd SEAD - Docu changes for Intellisense 2021-09-28 16:51:35 +02:00
Frank be0558849c OPS
- Added rearming zones
- Improved rearming
2021-09-27 16:11:03 +02:00
Applevangelist a1c7ec2ac9 Fix "local" error 2021-09-27 15:49:03 +02:00
Applevangelist 8bf073c0c6 Small fix for Airbase Parking Spot Finder 2021-09-26 09:51:02 +02:00
Frank 994689f05a OPS
- Improved transport assignments
2021-09-25 20:18:16 +02:00
Applevangelist 3e10f9f451 bugfix 2021-09-24 18:38:58 +02:00
Frank 972fa9f674 OPS
- Fixed bug in WAREHOUSE isShip
- FLIGHTGROUP added damage and ammo checks that trigger FSM events
- Improved engage detected targets
- Improved OPSZONE
2021-09-24 14:47:36 +02:00
Applevangelist 8e64d8e334 CTLD: Added mass and canCargo Flag on spawned statics. Use .enableslingload = true to use 2021-09-24 11:06:54 +02:00
Applevangelist eccd81d40a SPAWNSTATIC - bigfix on canCargo (not:isCargo) and mass (not transported into template) when spawning 2021-09-24 11:05:42 +02:00
Applevangelist 649136f98f small updates, fixes 2021-09-23 12:43:28 +02:00
Frank d7dae1366d OPS
- Improved OPSTRANSPORT for LEGION assets.
2021-09-22 19:27:33 +02:00
Applevangelist 19e2ebcd03 CTLD - Added statics as cargo (#1601)
.... and the ability to load and save them alongside your buildable crates.
2021-09-22 15:55:10 +02:00
Applevangelist 021c907d16 SET - Added SET_CLIENT:CountAlive() 2021-09-21 07:46:21 +02:00
Applevangelist 8ac3e28fdf CTLD - fix SAVE/LOAD when using no path on calls 2021-09-21 07:46:05 +02:00
Frank c5af279730 OPS
- Fixed some stuff for Egress coordinate
- Fixed some bugs in OPSTRANPORT if disembark carriers are specified
2021-09-20 22:47:51 +02:00
Applevangelist e9377e93f1 Postionable - Added Cargo Seats to VAB Mephisto 2021-09-20 14:20:09 +02:00
Applevangelist 6747c69511 CTLD Ability to fire an event on injection 2021-09-20 14:19:26 +02:00
Frank 9b6cae6c49 Update Commander.lua 2021-09-19 22:45:58 +02:00
Frank 7148bd1d42 OPS Escort
- Refined functions to recruit escort assets.
2021-09-19 22:10:52 +02:00
Frank 73940fffc6 Update Legion.lua
- Fix that assets did not get removed
2021-09-18 18:47:06 +02:00
Frank 09015449cd OPS Recruting
- Removed obsolete recruiting functions from code
2021-09-18 18:23:22 +02:00
Frank 4dfdb99731 OPS
- Recruit assets with new function (LEGION, COMMANDER, CHIEF)
2021-09-18 18:09:41 +02:00
Frank bbbca04066 OPS Legion
- Added new global function to recruit assets.
2021-09-18 00:11:04 +02:00
Frank e755bba608 OPS
- Clean up on "CheckMissionType" and "CheckMissionCapability" functions ==> moved to AUFTRAG as global functions.
2021-09-17 16:59:43 +02:00
Frank 9161cec238 OPS
- Simplified asset selection by using just one routine for LEGION, COMMANDER and CHIEF
2021-09-16 21:30:36 +02:00
Applevangelist dc14b60fcc bug fixing 2021-09-16 15:09:51 +02:00
Applevangelist da625d51f6 Merge pull request #1599 from FlightControl-Master/Applevangelist-CTLD-1
CTLD - Added persistance
2021-09-16 13:44:54 +02:00
Applevangelist ce69055758 CTLD - Added persistance
-- ## 6. Save and load back units - persistance
-- 
-- You can save and later load back units dropped or build to make your mission persistent.
-- For this to work, you need to de-sanitize **io** and **lfs** in your MissionScripting.lua, which is located in your DCS installtion folder under Scripts.
-- There is a risk involved in doing that; if you do not know what that means, this is possibly not for you.
-- 
-- Use the following options to manage your saves:
-- 
--              my_ctld.enableLoadSave = true -- allow auto-saving and loading of files
--              my_ctld.saveinterval = 600 -- save every 10 minutes
--              my_ctld.filename = "missionsave.csv" -- example filename
--              my_ctld.filepath = "C:\\Users\\myname\\Saved Games\\DCS\Missions\\MyMission" -- example path
--  
--  Then use an initial load at the beginning of your mission:
--  
--            my_ctld:__Load(10)
--            
-- **Caveat:**
-- If you use units build by multiple templates, they will effectively double on loading. Dropped crates are not saved. Current stock is not saved.
2021-09-16 13:43:39 +02:00
Frank 589ebd5bca CHIEF
- Improved asset selection
2021-09-16 11:02:49 +02:00
Frank 35b50e1a9d OPSZONE and CHIEF 2021-09-14 23:51:03 +02:00
Frank f038564b1b OPSTRANSPORT
- Added Cancel feature. First steps...
- Fixed a couple of other little bugs.
2021-09-13 16:04:16 +02:00
Frank 1d0eb9806d COMMANDER
- Added OPS transport (untested)
2021-09-13 08:31:00 +02:00
Applevangelist c50a9bd318 CTLD - small bug fix on stock removal 2021-09-12 17:37:21 +02:00
Applevangelist cd9006d29b CTLD - added alternative crate spawn by @mousepilot. Add menu item to list stock.Injected troops will not lead to cargo type duplication. 2021-09-11 15:20:36 +02:00
Applevangelist d3b88f9065 bug fixing 2021-09-11 10:03:32 +02:00
Frank 6a6cb1961d OPS LEGION
- Improved asset selection for transports
2021-09-10 11:37:53 +02:00
Frank 884c51a69a OPSTRANSPORT
- Improved assignment to multiple legions.
2021-09-10 00:32:15 +02:00
Frank 6f126e6cd4 OPSCARGO
- fixes for Legion assignment
2021-09-09 13:35:10 +02:00
Frank b0c2e5409a OPS AUFTRAG
- Added Alert 5 mission
- Added Fuel supply mission
- Added Ammo supply mission
2021-09-08 11:49:27 +02:00
Applevangelist 9516ec3cd2 CSAR: Gardening cleanup 2021-09-07 19:53:05 +02:00
Frank aecb92ccd3 OPSGROUP
- Added EPLRS option
- EPLRS is on if group has datalink capability
2021-09-07 11:17:20 +02:00
Frank bdf13f29f7 OPS
- COMMANDER and LEGION clean up of obsolete stuff for recruiting assets.
2021-09-06 23:40:58 +02:00
Frank 81120abfcb OPS
- LEGION and COMMANDER: Recruit assets for mission
2021-09-06 23:24:26 +02:00
Applevangelist 08a8170990 CTLD - improved crate spawning, added beacons / smoke / flare for ships, added documentation 2021-09-05 18:05:08 +02:00
Frank 316ea910c2 Update Cohort.lua
- Fixed some stuff for combat readiness check
2021-09-05 00:23:12 +02:00
Frank 0b5edfc21f OPSGROUP
- Ad infinitum fixes
- Turn into wind fixes
2021-09-04 23:51:17 +02:00
Applevangelist 76c08095ab CTLD - added country variable for crates 2021-09-03 18:38:51 +02:00
Frank 538864519e OPSGROUP
- Fixes that ARMY and NAVYGROUPS only go to first waypoint
- Fixes for PATROL and RECON missions that waypoints are added at the end
- Some other stuff
- Still need to fix adinfinitum
2021-09-03 18:20:28 +02:00
Applevangelist cd6631049b CSAR - Removed message for dead pilots 2021-09-03 14:16:30 +02:00
Applevangelist 079f8030b7 CTLD - added unit parameter to place crates in correct distance. Refactored location calculation for crates. 2021-09-03 14:16:11 +02:00
Frank ad0b32c0ee OPS
- Found and fixed bugs for ARMY and NAVY groups, which caused only one waypoint to be processed
- Added Duration for AUFTRAG
- Fixed bug in auftrag if no legion was assigned and mission was canceled at opsgroup level
- Trying (again) to include the whole route for ARMY and NAVY when UpdateRoute
- Simpler task function for passing waypoint

STILL a lot to do/check!
2021-09-03 00:05:58 +02:00
Applevangelist 8235b51a14 Bug fixing 2021-09-02 18:04:39 +02:00
Frank 1bd5e7472f OPSTRANSPORT v0.4.2
- Some fixed.
- All tested demo missions look nice
2021-09-02 08:30:54 +02:00
Applevangelist 7433a7144c CTLD Added method to inject troops into the field. 2021-09-01 13:33:43 +02:00
Frank 27632ecdd9 OPSTRANSPORT v0.4.1
- Fixed a couple of bugs
- Lots of other fixes and improvements
2021-09-01 00:07:54 +02:00
Frank 0b1e25b073 OPSTRANSPORT v0.4
- Multiple transport zone combos (TZC)
- Other issues solved.
- Demo miz D-day landing is still not working correctly.
2021-08-30 23:45:40 +02:00
Applevangelist 19a93f0026 MANTIS - allow SEAD padding in Mantis 2021-08-28 13:58:06 +02:00
Applevangelist 3256a6d596 SEAD - added time-back-on padding as variable 2021-08-28 13:57:15 +02:00
Frank 28ddfa5243 OPSTRANSPORT
- Fist working steps towards multiple pickup/deploy zone combos.
2021-08-28 00:17:16 +02:00
Applevangelist 05c560be3b CTLD - added delay after unsuccessful build or repair, relocate after done 2021-08-27 18:51:54 +02:00
Applevangelist 8ddd810fe2 SEAD - Refactor and enable delayed switch-off 2021-08-27 18:50:40 +02:00
Applevangelist f20760bae5 CSAR - Remove some noise 2021-08-27 18:48:18 +02:00
Applevangelist cea7320a9b UNIT/GROUP - added function to get the skill of a unit. SEAD - added functionality to calculate time-2-impact of HARMS and adjust behaviour accordingly 2021-08-27 14:56:50 +02:00
Frank fe6826016c Update Chief.lua 2021-08-27 11:59:34 +02:00
Frank f0167b3e88 OPS
- FSM pseudo function cleanup
- Fixed bug when mission is cancelled
2021-08-27 11:31:12 +02:00
Applevangelist 0edbf7f517 Added Engineering (Infantry) Troops 2021-08-27 09:14:54 +02:00
Frank a8a8dcff3f OPS Chief
- Removed mission queue. Now done via COMMANDER
- MissionCancel is buggy
2021-08-26 23:24:11 +02:00
Frank 1b0ad13529 OPS Commander 2021-08-26 21:24:47 +02:00
Frank 418d6c882c Update OpsGroup.lua 2021-08-25 17:46:00 +02:00
Frank 1e6899c40b OPS 2021-08-25 17:20:17 +02:00
Frank 259b201e65 OPS
Good version solving a few bugs and adding some new stuff.
2021-08-24 23:10:38 +02:00
Applevangelist 8fb113a04e CTLD - 1) added ability to limit stock. 2) Stopping Herc Pilots to try and build on the fly (look at you, Gunterlund! ;) ) 2021-08-24 14:16:11 +02:00
Frank c6ebbc6122 OPS
Strange version buggy
2021-08-23 23:34:15 +02:00
Applevangelist 755903a08e Changed priority to show bom target height in ft, in absence of player settings 2021-08-22 11:57:49 +02:00
Applevangelist 34e4825cd0 Merge pull request #1591 from bbirchnz/develop
CTLD: fix FOB units overwriting last instance, Unit Cargo Mass not working on first load
2021-08-22 08:32:18 +02:00
Ben Birch a68eeae9bd Merge remote-tracking branch 'origin/develop' into develop 2021-08-22 12:54:25 +10:00
Ben Birch e4e31b554e CTLD: fix FOB units overwriting last instance, Unit Cargo Mass not working on first load 2021-08-22 12:53:55 +10:00
Frank eba6e3f5f1 OPS Transport+Legion, Navy 2021-08-22 00:31:51 +02:00
Frank d73ebaca76 OPS
- Lots of stuff
2021-08-21 00:58:28 +02:00
Applevangelist 94167152e5 CTLD - added ability to spawn crates on ships 2021-08-20 12:33:10 +02:00
Applevangelist 830f76e909 Cleanup UTF-8 Mess 2021-08-18 18:00:38 +02:00
Applevangelist 8ae04944fe Fix for SAM pattern matching not working 2021-08-18 14:59:58 +02:00
Applevangelist c55b8d29f7 Fix for degree sign extra char 2021-08-18 11:51:41 +02:00
Applevangelist 30623f7d38 AIRBOSS / ATIS deleted extra char before degree char. Small correction for CSAR landings at Airports 2021-08-18 09:28:34 +02:00
Frank 16964520df OPS
- Lots of stuff to assign missions to multiple legions.
2021-08-18 00:25:18 +02:00
Frank 3050fdb3c3 OPS Zone 2021-08-15 00:28:03 +02:00
Frank 77fc2c5cf1 Update OpsGroup.lua 2021-08-12 11:41:30 +02:00
Frank b21c3ed4e9 OPS Cleanup 2021-08-12 11:07:28 +02:00
Frank 93f4b345c5 OPS Generalization 2021-08-12 00:17:55 +02:00
Frank 88e59a2739 OPS
- Ground ops
2021-08-11 10:40:16 +02:00
Frank 86bb256bf1 OPS
- Added Cohort and Legion classes
- Added Platoon and Brigade classes
2021-08-10 00:40:17 +02:00
Applevangelist 9a05f5bc93 Merge pull request #1589 from FlightControl-Master/Applevangelist-patch-5
CSAR fix for #1588
2021-08-09 09:18:51 +02:00
Applevangelist bce28cf389 CSAR fix for #1588
Fixes #1588
2021-08-09 09:06:15 +02:00
Frank 629c5e7739 AUFTRAG
- Recon Mission
2021-08-06 23:16:48 +02:00
Frank ed402e2f5f OPS Chief 2021-08-06 10:01:23 +02:00
Frank 4a56c7523d Wingcommander 2021-08-05 12:44:43 +02:00
Frank 218d9f48b0 Merge branch 'FF/Ops' into FF/OpsDev 2021-08-05 00:24:23 +02:00
Frank f67cf99477 OPS and SCHEDULER 2021-08-05 00:23:25 +02:00
Applevangelist 2201b2adda Update Utils.lua
Corrected self to BASE
2021-08-04 11:07:47 +02:00
Applevangelist 6b36421bce Merge pull request #1585 from FlightControl-Master/Applevangelist-patch-4
Update CSAR.lua
2021-08-04 08:04:21 +02:00
Frank 8c573c65d4 Update FlightControl.lua 2021-08-03 22:37:27 +02:00
Applevangelist 730dabd9cf Update CSAR.lua 2021-08-03 07:16:42 +02:00
Frank 69175e1b19 FC 2021-08-02 23:34:42 +02:00
Frank a5ad58e516 FC 2021-08-02 21:57:53 +02:00
Frank 82b4631341 Flightcontrol 2021-08-02 18:41:33 +02:00
Frank a1c9c1538d Merge branch 'FF/Ops' into FF/OpsDev 2021-08-02 11:59:32 +02:00
Frank 1a53f58540 OPS 2021-08-02 11:57:45 +02:00
Applevangelist 1b414b840e added AP check on landing/rescue 2021-07-31 15:50:50 +02:00
Applevangelist 642cc0e98f Added self.FARPRescueDistance reduced landing check to one call 2021-07-31 13:05:51 +02:00
Applevangelist 63431bb54b Couple of changes to make finding the distance to nearest pilot more stable 2021-07-30 17:30:32 +02:00
Frank d64de26ded OPS
- many fixes and improvements
2021-07-29 13:43:29 +02:00
Applevangelist 8b45067226 Various patches for AI_CARGO 2021-07-29 12:41:27 +02:00
Applevangelist 061032e3d7 Transition cleanup for AI Helicopter, deleted speed test bc in 20% of cases AI lands shit, which stops the FSM 2021-07-28 18:31:39 +02:00
Applevangelist 82432686aa Fixed display messages to all SAR, added option to suppress messaging 2021-07-27 14:10:10 +02:00
Applevangelist b66d2039be Added function to set speed and height parameters for landing 2021-07-27 14:09:10 +02:00
Applevangelist d245a73d7f Make Destroy() silent for scoring 2021-07-26 09:24:52 +02:00
Applevangelist f0037151e6 CTLD - added factor for troops extraction, making Destroy()s silent for scoring, refined autohoverload messaging 2021-07-26 09:24:35 +02:00
Applevangelist 52d494f573 Merge pull request #1582 from bbirchnz/develop
CTLD: fix troops being lost when crates dropped
2021-07-25 09:06:16 +02:00
Ben Birch 36a2d71731 CTLD: fix troops being lost when crates dropped 2021-07-25 13:46:15 +10:00
Frank 615a220acb Update OpsGroup.lua 2021-07-24 23:56:27 +02:00
Frank c718584755 Update OpsGroup.lua 2021-07-24 23:25:26 +02:00
Applevangelist 4db0ea616d Correct opendoor check to include anyone loaded 2021-07-24 15:53:20 +02:00
Applevangelist 5439e60078 Merge pull request #1580 from bbirchnz/ctld-add-mass
CTLD: Enable mass on cargo
2021-07-24 15:04:49 +02:00
Ben Birch a6880d4569 Add SetUnitInternalCargo to UNIT
Add PerCrateMass to CTLD_CARGO (default = 0kg)
Update unit internal cargo after each load/unload operation.
Add mass to cargo reports
2021-07-24 22:39:26 +10:00
Frank 65e852f341 OPS Transport 2021-07-24 01:06:44 +02:00
Frank 4ffdf9e536 Merge branch 'develop' into FF/Ops 2021-07-23 18:49:35 +02:00
Applevangelist 8f698e3e62 Changed Messaging Structure on Approach 2021-07-23 16:29:56 +02:00
Applevangelist 61481e6e9a CSAR updates to messaging. Detect if far approach note exceeds 8km for smoke/flare request 2021-07-23 11:19:53 +02:00
Applevangelist 49397df90b CTLD - added repair capabilties for VEHICLE and FOB types of CTLD_CARGO 2021-07-22 20:17:40 +02:00
Applevangelist 7b254a08fb Merge pull request #1579 from FlightControl-Master/Applevangelist-inteldlink
Update Intelligence.lua
2021-07-22 11:37:51 +02:00
Applevangelist 5bebbcf5eb Update Intelligence.lua
Added FSM functions and documentation for INTEL_DLINK
2021-07-22 11:36:21 +02:00
Applevangelist 83fd48e2f4 Merge pull request #1578 from madmoney99/develop
Airboss update for wind over deck
2021-07-22 08:03:32 +02:00
madmoney99 f5b25370b0 Change to wind measure for Skipper
Previous value 50m produced an incorrect heading and strength based on the actual wind over deck.
2021-07-21 22:51:29 -07:00
Tony Goodale f68d3209ac Merge branch 'FlightControl-Master:develop' into develop 2021-07-21 22:44:11 -07:00
Applevangelist 2ab7f784c9 Merge pull request #1576 from FlightControl-Master/Applevangelist-CTLD
Update CTLD.lua
2021-07-21 18:47:52 +02:00
Applevangelist 1e8d99a591 Merge pull request #1577 from FlightControl-Master/Applevangelist-INTEL
Update Intelligence.lua
2021-07-21 18:47:40 +02:00
Applevangelist d517cba765 Update Intelligence.lua
no dupe docs
2021-07-21 18:45:57 +02:00
Applevangelist 552eb5b9d8 Update CTLD.lua
Add housekeeping for dropped troops
2021-07-21 18:40:43 +02:00
Applevangelist 684c4ea113 Allow MANTIS to use INTEL_DLINK 2021-07-21 18:22:46 +02:00
Applevangelist 4dfaca610f INTEL - bug fixes, added new datalink class 2021-07-21 18:22:31 +02:00
Applevangelist 8a53998251 MANTIS - make start random async, so detection for multiple MANTIS objects works better
INTEL - added function to alter detection types, typos corrected etc
2021-07-20 18:30:11 +02:00
bbirchnz 6690f70b05 fix CTLD:ActivateZone not processing default correctly and using wrong zone table (#1575) 2021-07-19 07:16:21 +02:00
Applevangelist 96d1d3cb66 Light code cleanup, added docu for troop extract 2021-07-18 14:53:00 +02:00
bbirchnz 09785ef451 - ctld: add troop extract (#1574) 2021-07-18 13:01:45 +02:00
Applevangelist 25e118f3dc Added correct Player Mi-8MT unitname
CSAR - logic change to detect dead pilots, if they are not set to immortal. Added FSM event "KIA"
2021-07-17 15:48:18 +02:00
Frank 78b3e3c60b OPS Respawn 2021-07-15 22:25:02 +02:00
Applevangelist efe41a5e21 CSAR and CTLD - use Frequency generation moved to UTILS
CTLD - added option to drop crates anywhere
MANTIS - added state tracker to call Green/Red state change events only once
UTILS - added Marianas NDBs to Frequency generation
2021-07-15 17:16:30 +02:00
Frank 835041e5f6 OPS 2021-07-14 21:00:34 +02:00
Applevangelist 93a8086ff6 Update Mantis.lua (#1569)
Added state tracker so that Red/Green Events only get triggered when a state actually changes.
2021-07-14 15:37:57 +02:00
Applevangelist 1ac40684de Added option to force description on injected pilots for scripting 2021-07-14 08:39:54 +02:00
Applevangelist 433d1bbf57 MANTIS - Change logic to FSM, added functions
CSAR - advanced options to name injected AI downed pilots
CTLD - added Herc speed check
2021-07-13 17:50:44 +02:00
Applevangelist e33de03522 CSAR - honor settings NM vs KM
CTLD - documentation corrections
UTILS - added functions to generate beacon frequency tables FM,VHF,UHF and valid laser codes for JTACs
2021-07-12 19:17:39 +02:00
Applevangelist 86fedbfaae Updated noise level 2021-07-12 18:16:22 +02:00
Applevangelist c0f4eef896 Slightly changed versions of Mantis, Sead and Shorad as the Emissions On/Off stuff ED introduced doesn't really work well. 2021-07-12 18:10:12 +02:00
Frank a2f3bf3a8c Merge branch 'develop' into FF/Ops 2021-07-12 15:27:24 +02:00
Frank 1b717e4683 AUFTRAG
- Added push time
2021-07-12 15:27:08 +02:00
Applevangelist 52e2ac7174 Added documentation 2021-07-11 18:31:17 +02:00
Applevangelist 3d6b053eb4 Added function to check if a loading door on a heli is open 2021-07-11 18:31:09 +02:00
Frank 268eb1d60d OPS 2021-07-11 18:15:25 +02:00
Applevangelist a69865b8c9 -- -- (added 0.1.8) - allow to set far/near distance for approach and optionally pilot must open doors
--         self.approachdist_far = 5000 -- switch do 10 sec interval approach mode, meters
--         self.approachdist_near = 3000 -- switch to 5 sec interval approach mode, meters
--         self.pilotmustopendoors = false -- switch to true to enable check of open doors
2021-07-10 16:56:35 +02:00
Applevangelist 4a1df3d5cc -- -- (added 0.1.8) - allow to set far/near distance for approach and optionally pilot must open doors
--         self.approachdist_far = 5000 -- switch do 10 sec interval approach mode, meters
--         self.approachdist_near = 3000 -- switch to 5 sec interval approach mode, meters
--         self.pilotmustopendoors = false -- switch to true to enable check of open doors
2021-07-10 16:56:35 +02:00
Frank 6dfd757ea1 OPS 2021-07-08 22:59:29 +02:00
Frank fc1adf3b94 OPS Transport 2021-07-08 12:21:10 +02:00
Frank be2d1d7895 Update OpsTransport.lua 2021-07-07 11:33:51 +02:00
Frank 9e7c360912 Merge branch 'develop' into FF/Ops 2021-07-06 21:57:31 +02:00
Frank 51acd33d19 Merge branch 'master' into develop 2021-07-06 21:57:08 +02:00
Frank af3dbe2f86 Merge branch 'develop' into FF/Ops 2021-07-06 21:56:53 +02:00
Frank 97668e5413 Update FlightGroup.lua
- Fixed flight of airwing is going to tanker even if fuellowrefuel switch is false
2021-07-06 21:56:15 +02:00
Frank 464fde0ed2 OPS
- MSRS
- Callsign
2021-07-06 21:13:50 +02:00
cammel tech 65bd7909e1 Example for CTLD > SCORING added (#1566)
* Example added

Example for the connection to the SCORING Class.

* kleiner Fehler eingeschlichen
2021-07-06 20:26:20 +02:00
Applevangelist 5d3ea57d4d CSAR give scripted spawned pilots a name.
CTLD corrected that generic troops could be spawned only once.
2021-07-06 20:24:35 +02:00
Applevangelist b7bc3cfbcf Spawn crates in a wider radius. Also build, when only one crate is required. 2021-07-05 18:54:45 +02:00
Applevangelist 04ef32420b Merge pull request #1567 from thejuju/develop
Add ATC Ground Mariana Islands support
2021-07-05 14:44:02 +02:00
Julien B a3d8a48b92 Add ATC Ground Mariana Islands support
Added ATC_GROUND_MARIANAISLANDS
Supported optional airbase ZONE_POLYGON boundaries (like initially intented) when there is provided, fallback remain a ZONE from the center of the airfield.
Some airports are bigger than the default radius area and need custom boundaries to work properly on the edge of it.
2021-07-05 13:09:34 +02:00
Applevangelist ef86d1d7cb Merge pull request #1562 from cammeltech/SCORING-reactivate_destroy
Reactivate the :destroy() event on clients with scoring below thresmark
2021-07-04 18:10:45 +02:00
Applevangelist 00b3e9b371 Merge pull request #1564 from justin-lovell/justin-lovell-mark-changed-event
Synchronize Text with Wrapper State
2021-07-04 18:10:35 +02:00
Applevangelist 0d02f56855 Merge pull request #1565 from justin-lovell/updated-debug-msg
Correcting typo for debug message
2021-07-04 18:10:21 +02:00
Applevangelist 48aa841add ATIS - addede rainy presets 1-3
CTLD - avoid "preloading" when pilot leaves/crashes and rejoins
CSAR - added option for autosmokedistance
2021-07-04 18:04:27 +02:00
Applevangelist 4ba52212a9 ATIS - addede rainy presets 1-3
CTLD - avoid "preloading" when pilot leaves/crashes and rejoins
CSAR - added option for autosmokedistance
2021-07-04 18:04:08 +02:00
Justin Lovell a14bca1059 Synchronize Text with Wrapper State
Bug - text is not synchronized with the wrapper state, hence the `GetText()` will be incorrect.

Method `TextChanged` does not exist, resulting `nil` reference errors when the players update markers. Current implementation of `MARKER:OnEventMarkChange(EventData)` is not implemented the same as its siblings of `OnEventMarkRemoved` and `OnEventMarkAdded`. The siblings would move the FSM accordingly -- aligned implementation
2021-07-03 23:30:45 +10:00
Justin Lovell a7e07af24f Correcting typo for debug message
Small PR
2021-07-03 23:24:04 +10:00
Applevangelist e14d655447 Changed default fallback freq to 333.00Khz 2021-07-03 09:30:04 +02:00
Frank 74bdeaf4f7 AIRWING 2021-07-02 23:11:51 +02:00
Applevangelist 9591c62175 corrected autovalue for frequency - thanks to shadowze 2021-07-02 20:22:43 +02:00
Applevangelist 39c46dcab0 Changed frequency logic, some documentation changes 2021-07-02 20:15:12 +02:00
Applevangelist 299e08f53d additional checks to ensure only human players, extra checks in the logic, some logic errors corrected. 2021-07-02 17:52:58 +02:00
wob3155@posteo.de 12555a6ff1 Reactivate the :destroy() event on clients with scoring below thresmark 2021-07-02 08:56:28 +02:00
Frank 1cc012c7d1 Merge branch 'develop' into FF/Ops 2021-07-02 08:53:44 +02:00
Frank 28c6810878 Merge branch 'master' into develop 2021-07-02 08:52:07 +02:00
Frank 1ed36fdff4 Merge branch 'develop' into FF/Ops 2021-07-01 23:56:38 +02:00
Frank 26801cf206 Merge branch 'master' into develop 2021-07-01 23:54:57 +02:00
Frank c80cebb824 WAREHOUSE, AIRWING & SQUADRON
- Added function for hot start to SQUADRON
- Addressed bug #1560
2021-07-01 23:54:24 +02:00
Frank 3c6e8d6d01 OPS
- Transport
- Respawn
2021-07-01 12:29:29 +02:00
Applevangelist 76a53ab154 Added extra checks for Beacon refresh 2021-07-01 09:07:01 +02:00
Frank fa3e387dd1 OPS 2021-06-30 23:23:41 +02:00
Applevangelist dca626bbcb CTLD - added option to suppress messaging, added event for OnAfterTroopsRTB
CSAR - minor bugfix
2021-06-30 17:59:43 +02:00
Applevangelist 3289ad2817 Added basic support for Hercules mod 2021-06-29 17:49:42 +02:00
Applevangelist 5a022a2246 Messages going to SAR flights only 2021-06-29 08:50:46 +02:00
Frank b012c5b2aa OPS Transport
- Improved cargo bay weight calculation.
2021-06-28 13:17:55 +02:00
Frank a861f8d9d4 OPS 2021-06-25 21:13:24 +02:00
Frank 36669c80da OPSTRANSPORT 2021-06-25 13:23:56 +02:00
Applevangelist 2ff128f184 Added Docu for functions 2021-06-25 12:39:02 +02:00
Applevangelist 3b44aba341 Updated frequency test 2021-06-24 08:34:14 +02:00
Frank 978be4e383 OPS Transport 2021-06-23 17:20:51 +02:00
Applevangelist d4cdfcc48c Corrected Mi-8MTV2 Unit Type Name 2021-06-23 14:09:09 +02:00
Applevangelist 5123ab0720 Update CTLD.lua (#1558)
corrected fsm function name headlines in documentation
2021-06-23 09:47:05 +02:00
Applevangelist 5021a1e1f3 Update CTLD.lua 2021-06-22 18:26:44 +02:00
Applevangelist 576281a612 Update CSAR.lua (#1554)
Added options to limit number of downed pilots via Events (mission designers can still "inject" downed pilots):
`self.limitmaxdownedpilots = true
 self.maxdownedpilots = 10`
2021-06-22 18:24:46 +02:00
Applevangelist b84c0aba59 Update Moose.files (#1556) 2021-06-22 18:24:36 +02:00
Applevangelist ee503a378e Update Modules.lua (#1557)
added CTLD
2021-06-22 18:24:24 +02:00
Applevangelist f235037cb9 Create CTLD.lua (#1555)
Player Heli Cargo and Troops Ops :)
2021-06-22 18:24:11 +02:00
Applevangelist 0cd1cd97a6 Update CSAR.lua (#1553) 2021-06-22 13:11:12 +02:00
Frank 74513f1b5c Merge branch 'develop' into FF/Ops 2021-06-22 12:18:45 +02:00
Frank 231c5bfea7 Ops 2021-06-22 12:18:25 +02:00
Frank cfd0e4ba85 Merge branch 'master' into develop 2021-06-19 22:28:30 +02:00
Applevangelist bf33e4ed4f Update CSAR.lua (#1552) 2021-06-18 12:12:54 +02:00
Frank 6290db035d Merge branch 'develop' into FF/Ops 2021-06-15 22:00:14 +02:00
Applevangelist cd1935be1d Update CSAR.lua (#1551) 2021-06-15 15:49:58 +02:00
Applevangelist 64262d6ecc Update CSAR.lua (#1550) 2021-06-15 10:32:52 +02:00
Applevangelist 270c69344f Update CSAR.lua
Updated documentation / clarification. Added feature docu on using SRS
2021-06-15 07:42:45 +02:00
Applevangelist 10a0793af7 Update CSAR.lua
Small updates to reflect correct measurements. Options to SRS TTS.
2021-06-14 19:15:58 +02:00
Applevangelist 1b37af321f Update CSAR.lua
Small updates
2021-06-14 16:21:47 +02:00
Applevangelist 7cde279be1 Update Modules.lua
added CSAR module
2021-06-14 13:20:00 +02:00
Applevangelist 0396741f3d Create CSAR.lua
Initial Release
2021-06-14 13:18:27 +02:00
Applevangelist 117cf8888a Update Globals.lua 2021-06-13 10:39:07 +02:00
Frank 83db7b32e8 Merge branch 'master' into FF/Ops 2021-06-12 22:59:20 +02:00
Frank d496d3d16e Merge branch 'master' into develop 2021-06-12 22:23:10 +02:00
Frank 6b801247ab Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-11 23:41:52 +02:00
Frank 4c6cd31bfc Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-10 23:33:27 +02:00
Frank a8ef096f24 Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-10 23:23:30 +02:00
Applevangelist c8d2a7e833 Added commands for immortal and invisible to Wrapper.Group#GROUP (#1547)
* Added function for message duration (#1542)

... and correct flash status setting

* Update Spawn.lua (#1544)

* Update Spawn.lua

* Update Group.lua (#1546)

Added invisible and immortal commands on GROUP level.
2021-06-10 11:59:50 +02:00
Frank 783391838b Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-10 00:19:02 +02:00
Frank 7c37d8b204 Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-09 13:19:14 +02:00
Applevangelist 65ed8825b0 Update Intelligence.lua
Added functionality to calculate the position of a cluster after x seconds, based on trajectory (average speed and heading) of a cluster
*  INTEL:CalcClusterFuturePosition(cluster,seconds)
Will also draw arrows on the map if `self.clustermarkers` is true and `self.verbose > 1`
Change cluster coordinate updates to better suite cluster movement
2021-06-08 15:59:36 +02:00
Applevangelist af9324dd5f master updates to develop for InitCleanup() and CC Messages (#1545)
* Added function for message duration (#1542)

... and correct flash status setting

* Update Spawn.lua (#1544)

* Update Spawn.lua
2021-06-07 18:26:43 +02:00
Frank 064f727676 Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-05 23:45:15 +02:00
Frank 8025862fb9 Merge branch 'FF/MasterDevel' into FF/Ops 2021-06-01 23:20:59 +02:00
Frank 2544ec5587 Update SRS.lua 2021-05-30 01:44:36 +02:00
Frank 6c823b0137 Merge branch 'FF/MasterDevel' into FF/Ops 2021-05-30 01:36:43 +02:00
Frank 88d44fa654 Merge branch 'develop' into FF/Ops 2021-05-28 23:01:47 +02:00
Frank 8b6f9f9de7 Merge branch 'master' into develop 2021-05-28 23:01:15 +02:00
Applevangelist cb14961dcd Update Zone.lua (#1541)
added function `ZONE_POLYGON_BASE:Boundary()`
2021-05-26 15:54:20 +02:00
Applevangelist dab486ec99 Update Controllable.lua
Typo in `OptionDisperseOnAttack()`
2021-05-26 09:16:26 +02:00
Shadowze 75849fbfb5 Update Positionable.lua
function added to work out if a unit is a submarine
2021-05-25 22:30:16 +01:00
Frank f984ff044b Merge branch 'master' into develop 2021-05-25 21:13:36 +02:00
Frank aaf5f295da Merge branch 'develop' into FF/Ops 2021-05-20 23:27:05 +02:00
Frank 8f612f2017 Merge branch 'master' into develop 2021-05-20 23:25:29 +02:00
Frank a2808163a7 Boom and Probe 2021-05-20 23:23:12 +02:00
Frank e4aa23ce3d Update Point.lua 2021-05-15 00:29:20 +02:00
Frank 1b3cac9424 Merge branch 'FF/MasterDevel' into FF/Ops 2021-05-13 23:38:17 +02:00
Applevangelist e49020b905 Update README.md 2021-05-12 09:19:07 +02:00
Frank d68dcaf69a Merge branch 'develop' into FF/Ops 2021-05-11 14:52:31 +02:00
Frank 856c3578f6 Merge branch 'master' into develop 2021-05-11 11:59:48 +02:00
Tony Goodale 18c6ea39ce Merge pull request #7 from FlightControl-Master/develop
Develop
2021-05-10 15:47:14 -07:00
Frank 1ce46c016c Cargo 2021-05-10 00:14:07 +02:00
Frank 296944c23c Merge branch 'develop' into FF/Ops 2021-05-07 22:57:34 +02:00
Frank 4f772fecdc Merge branch 'master' into develop 2021-05-07 21:56:17 +02:00
Frank cdd22444b9 Merge branch 'master' into develop 2021-05-07 21:49:24 +02:00
Frank 15848bc8c4 Merge branch 'master' into FF/Ops 2021-05-07 17:47:41 +02:00
Applevangelist 9eba6d607c Updated doc images 2021-05-06 09:30:06 +02:00
Applevangelist e9d3c7c2e7 Update MarkerOps_Base.lua 2021-05-05 19:02:46 +02:00
Applevangelist ad16c6d44f Include MarkerOps_Base (#1533)
Include MarkerOps_Base
2021-05-05 11:56:00 +02:00
Applevangelist 2046958bd6 Added MarkerOps_Base.lua 2021-05-05 11:44:35 +02:00
Applevangelist 0046533d53 Added base class for action based on marker additions, changes, deletions and text keywords 2021-05-05 11:44:17 +02:00
Applevangelist ce7e152e13 Updated Shorad and Set 2021-05-04 12:59:21 +02:00
Tony Goodale edcdc057e6 Merge pull request #6 from FlightControl-Master/develop
Develop
2021-05-01 15:40:23 -07:00
Frank cfa851beea Merge branch 'master' into FF/Ops 2021-05-02 00:25:07 +02:00
Frank f5d8efe86e Merge branch 'master' into develop 2021-05-01 22:45:48 +02:00
Applevangelist 7c8e5033ec Merge pull request #1527 from FlightControl-Master/AA-1
Update Sead.lua
2021-05-01 17:29:43 +02:00
Applevangelist 22ec94b374 Merge pull request #1528 from FlightControl-Master/AA-2
Update Shorad.lua
2021-05-01 17:27:22 +02:00
Applevangelist 5cd3a172f1 Merge pull request #1529 from FlightControl-Master/AA-3
Update Mantis.lua
2021-05-01 17:24:33 +02:00
Applevangelist a89a3b38ce Update Mantis.lua
Adjustments for 2.7
2021-05-01 17:21:53 +02:00
Applevangelist 3202702612 Update Shorad.lua
Adjustments for 2.7
2021-05-01 17:20:35 +02:00
Applevangelist 725e32f439 Update Sead.lua
Adjust to Event changes
2021-05-01 17:19:10 +02:00
Applevangelist 7da1905ad3 Update Event.lua (#1525)
Updates for Events 33 and 6 - makes scoring also work again for STATIC targets
2021-05-01 14:22:01 +02:00
Frank 421005a3b6 event backfixed 2021-04-30 11:53:57 +02:00
Applevangelist d5bf28f799 Update AirWing.lua (#1521)
Markpoint honored for direct calls from #OPSGROUP
2021-04-29 18:20:03 +02:00
Frank 990f748e42 Update Database.lua 2021-04-27 09:19:33 +02:00
Applevangelist a466365949 Update Controllable.lua (#1519)
Error line 1463
2021-04-25 20:31:02 +02:00
Frank b12f71c430 Merge branch 'develop' into FF/Ops 2021-04-23 13:38:28 +02:00
Frank 236a69e5dc Merge branch 'master' into develop 2021-04-23 13:29:37 +02:00
Applevangelist 9458243926 Merge pull request #1516 from FlightControl-Master/AA
Update Controllable.lua
2021-04-23 11:00:50 +02:00
Applevangelist 41274e7801 Update Controllable.lua 2021-04-23 10:59:22 +02:00
Applevangelist 0259e41ce8 Create .luacheckrc 2021-04-22 10:10:59 +02:00
Applevangelist e78f9cbd46 Merge pull request #1512 from FlightControl-Master/aa
Update Airboss.lua
2021-04-22 08:53:52 +02:00
Applevangelist 9d6851adec Update Airboss.lua
Escape error 17933
2021-04-22 08:30:19 +02:00
Applevangelist 4668f072af Merge pull request #1511 from FlightControl-Master/AA-1
Update Airboss.lua
2021-04-22 08:21:00 +02:00
Applevangelist a1a414925f Update Airboss.lua 2021-04-22 08:19:56 +02:00
Applevangelist 19eb9dca30 Update Utils.lua 2021-04-20 18:49:54 +02:00
Applevangelist 8464a2ba43 Merge pull request #1507 from FlightControl-Master/Applevangelist-patch-1
Update Airbase.lua
2021-04-20 16:52:28 +02:00
Applevangelist a8549e2b7d Update Airbase.lua 2021-04-20 16:50:00 +02:00
Applevangelist 2531a25c9e Update Group.lua
Add EnableEmissions
2021-04-20 11:36:59 +02:00
Frank 2f7b7eeddd Merge branch 'master' into develop 2021-04-18 14:49:37 +02:00
Frank ab1ec54c03 Merge branch 'master' into develop 2021-04-18 14:34:46 +02:00
Frank a1ca605206 Merge branch 'master' into develop 2021-04-17 23:19:42 +02:00
Frank a7b444dfea Update OpsGroup.lua 2021-04-17 09:29:55 +02:00
Frank 64b35b9cb3 Merge branch 'develop' into FF/Ops 2021-04-16 23:15:30 +02:00
Frank 4a8d52b328 Merge branch 'master' into develop 2021-04-16 23:06:04 +02:00
Pikes 3cbf6fff90 Merge pull request #1490 from Applevangelist/patch-82
Update Event.lua workaround for 2.7
2021-04-16 18:01:25 +01:00
Frank 2693e76483 Update Airboss.lua 2021-04-15 21:13:35 +02:00
Applevangelist b232a5da37 Update Event.lua workaround for 2.7
Same as for Event 31
2021-04-15 13:02:59 +02:00
Frank e50fc00583 Merge branch 'develop' into FF/Ops 2021-04-14 23:44:43 +02:00
Frank 4b8802af37 Merge branch 'master' into develop 2021-04-14 23:42:48 +02:00
Frank ebd69fd10d Merge pull request #1482 from Applevangelist/patch-74
Update FlightGroup.lua
2021-04-12 15:55:50 +02:00
Applevangelist c1a8c08880 Update FlightGroup.lua 2021-04-12 13:02:16 +02:00
Frank 647fb6acbf Merge branch 'develop' into FF/Ops 2021-04-07 20:54:19 +02:00
Frank ede692ea2a Merge branch 'master' into develop 2021-04-07 20:53:27 +02:00
Frank ca44e2762b Update OpsGroup.lua 2021-04-07 20:53:15 +02:00
Frank eda70742eb Merge pull request #1486 from Applevangelist/patch-78
Update AirWing.lua
2021-04-04 22:03:49 +02:00
Frank b81e3e9e6d Merge pull request #1485 from Applevangelist/patch-77
Update Intelligence.lua
2021-04-04 22:03:40 +02:00
Applevangelist e766eaeccc Update AirWing.lua
Avoid loop if mission is governed by an Airwing. Mission cancel will ask airwing to cancel will ask flightgroup to cancel, which doesn't work if the latter is dead. Rare but happens.
2021-04-04 13:11:25 +02:00
Applevangelist bab61271f2 Update Intelligence.lua
Make Markers Coalition specific
2021-04-04 13:07:54 +02:00
Applevangelist b1465d89a6 Update FlightGroup.lua
Added check for velocity for the RTB loop (if group is taxiing). Added OutOfAAMissiles.
2021-04-04 12:49:40 +02:00
Frank 05b1ddf013 Merge pull request #1483 from Applevangelist/patch-75
Update AirWing.lua
2021-04-03 22:25:51 +02:00
Applevangelist 903e8711f7 Update AirWing.lua
Make Patrolpoint Markes Switchable
2021-04-01 13:28:59 +02:00
Applevangelist 31b93fb42c Update FlightGroup.lua
Avoid endless when plane/heli is not airborne by needs to RTB
2021-04-01 13:21:40 +02:00
Frank e16bbfc2b9 Merge branch 'develop' into FF/Ops 2021-03-29 19:55:35 +02:00
Frank 220e004d73 Merge branch 'master' into develop 2021-03-29 19:55:21 +02:00
Frank 3136861b24 Merge branch 'develop' into FF/Ops 2021-03-29 18:02:23 +02:00
Frank dc2693bead Merge branch 'master' into develop 2021-03-29 18:02:00 +02:00
Frank d7da8c4253 Merge branch 'develop' into FF/Ops 2021-03-29 09:55:13 +02:00
Frank c1ff5831ad Merge branch 'master' into develop 2021-03-29 09:53:51 +02:00
Frank ac5646075b Merge pull request #1481 from madmoney99/develop
Airboss CASE III fix for OS/AA
2021-03-29 00:31:46 +02:00
madmoney99 5a1faba796 CASE III fix for OS/AA 2021-03-28 15:25:59 -07:00
Tony Goodale 4ab16cb276 Merge pull request #5 from FlightControl-Master/develop
Merge pull request #1478 from madmoney99/develop
2021-03-28 15:12:27 -07:00
Frank eb1e885c0a Merge branch 'develop' into FF/Ops 2021-03-28 20:33:08 +02:00
Frank 00ff9a11b8 Merge branch 'master' into develop 2021-03-28 20:30:19 +02:00
Frank 8eabc024bf Merge pull request #1479 from madmoney99/develop
Update Airboss.lua
2021-03-23 08:44:14 +01:00
madmoney99 a848af0753 Update Airboss.lua 2021-03-22 19:01:04 -07:00
Frank f4e7a3a314 Merge pull request #1478 from madmoney99/develop
Airboss formating fixes
2021-03-22 22:19:29 +01:00
madmoney99 d83283c709 Update Airboss.lua
formatting fixes
2021-03-22 10:10:33 -07:00
Tony Goodale a35112a6f3 Merge pull request #4 from FlightControl-Master/develop
Merge pull request #1476 from madmoney99/develop
2021-03-22 10:01:53 -07:00
Frank 66c012a30d Merge pull request #1476 from madmoney99/develop
Develop Airboss grading additions
2021-03-22 12:03:58 +01:00
madmoney99 7b92b7853d Grading Additions
Addition of:
- AA - Angled Approach call (advisory)
- Drift Right/Left - DR/DL (advisory)
- Overshoot - OS - graded for start

Updated default SetMPWireCorrection(Dcorr) to 12 from 8.7 based on feedback.

Minor clean up and updates for intro section to include new additions and other changes previously made.

TonyG
2021-03-21 17:40:44 -07:00
madmoney99 6c9f10e6a8 Revert "Grading additions"
This reverts commit 6db2c4465d.
2021-03-21 17:38:06 -07:00
madmoney99 6db2c4465d Grading additions
Addition of:
 - AA - Angled Approach call (advisory)
 - Drift Right/Left - DR/DL (advisory)
 - Overshoot - OS - graded for start

Updated default SetMPWireCorrection(Dcorr) to 12 from 8.7 based on feedback.

Minor clean up and updates for intro section to include new additions and other changes previously made.

TonyG
2021-03-21 17:35:16 -07:00
Tony Goodale c0cc960df5 Merge pull request #3 from FlightControl-Master/develop
Develop
2021-03-21 14:53:53 -07:00
Frank 968240ad44 Merge pull request #1473 from Applevangelist/patch-72
Update Sead.lua
2021-03-14 22:46:16 +01:00
Applevangelist 50f3016711 Update Sead.lua
latest
2021-03-10 11:36:10 +01:00
Frank 56e2b06e9d OPS Cargo 2021-03-07 23:47:29 +01:00
Frank c02f69720a Merge pull request #1471 from Applevangelist/patch-71
Update Controllable.lua
2021-03-04 16:33:56 +01:00
Frank 96df7d1e42 Merge pull request #1470 from Applevangelist/patch-70
Update Intelligence.lua
2021-03-04 16:33:46 +01:00
Applevangelist 1d4caf7588 Update Controllable.lua
2 functions missing though they are in the doc header
2021-03-04 16:15:57 +01:00
Applevangelist b0e3201d3c Update Intelligence.lua
Added Docu
2021-03-04 11:13:30 +01:00
Frank bab097958f Merge branch 'develop' into FF/Ops 2021-03-03 00:03:52 +01:00
Frank f4a3f6d433 OPS 2021-03-03 00:03:39 +01:00
Frank e73ab89a18 Merge pull request #1469 from madmoney99/develop
Develop
2021-03-02 22:46:31 +01:00
madmoney99 187643f6ae Groove time additions
Changes on screen description of groove times to match NATOPs grading
NESA
LIG
Changes unicorn groove time from 16-18secs to 15-18.99 seconds.

No change to grading.  Reference GitHub issues 1445 &1446.
2021-03-02 13:36:54 -08:00
Tony Goodale 3c9bdb2915 Merge pull request #1 from FlightControl-Master/develop
Develop
2021-03-02 13:28:58 -08:00
Frank 5241642447 Merge branch 'master' into develop 2021-03-02 21:19:41 +01:00
Frank 3b2cbea1c4 Update OpsGroup.lua 2021-03-02 21:12:51 +01:00
Frank 80e3da49cb Merge pull request #1468 from Applevangelist/patch-69
Update Intelligence.lua
2021-03-02 15:34:27 +01:00
Applevangelist 1df7a12587 Update Intelligence.lua
Finalized Cluster functions, added bits and bobs
2021-03-02 14:28:37 +01:00
Frank 663a59bd71 Merge branch 'master' into develop 2021-02-28 23:26:48 +01:00
Frank ced859424b Merge branch 'master' into develop 2021-02-27 21:18:11 +01:00
Frank 4a6377c204 Ops Cargo 2021-02-27 21:17:58 +01:00
Frank fd22558207 Merge pull request #1467 from madmoney99/develop
T-45C Goshawk Parameters
2021-02-26 08:00:35 +01:00
madmoney99 a6faadea48 T-45C Goshawk Parameters
Addition of parameters for the VNAO T-45C Goshawk.
2021-02-25 12:52:50 -08:00
Frank 42a26100b7 Merge pull request #1465 from Applevangelist/patch-67
Update Intelligence.lua
2021-02-24 18:02:19 +01:00
Frank e8f4770abe Merge pull request #1464 from Applevangelist/patch-66
Update AirWing.lua
2021-02-24 18:01:44 +01:00
Applevangelist 7751d4ee88 Update Intelligence.lua
Added function to set verbosity
2021-02-24 16:22:13 +01:00
Applevangelist cdd829e7be Update AirWing.lua
Ensure correct type of tanker is going on mission
2021-02-24 16:16:28 +01:00
Frank 16bf3a89b5 Merge pull request #1461 from Applevangelist/patch-63
Update Intelligence.lua
2021-02-21 23:59:37 +01:00
Applevangelist 11cdae098b Update Intelligence.lua
Honor settings for clustermarkers
2021-02-21 19:55:48 +01:00
Frank a63ee3fa8b Merge branch 'develop' into FF/Ops 2021-02-21 11:54:06 +01:00
Frank 5cc023d1fe OPS Cargo 2021-02-21 11:53:52 +01:00
Frank c4084156ac OPS Cargo 2021-02-21 00:19:32 +01:00
Frank 302018feff OPS Cargo 2021-02-20 00:03:45 +01:00
Frank c50f6b72e7 OPS Cargo 2021-02-19 00:11:55 +01:00
Frank c0401447dd OPS Cargo 2021-02-18 00:10:17 +01:00
Frank 43680c2fc3 Merge branch 'master' into develop 2021-02-17 13:16:46 +01:00
Frank 2c92bb9d61 OPS Cargo 2021-02-17 00:29:59 +01:00
Frank dcf1a56756 Update OpsGroup.lua 2021-02-16 00:15:22 +01:00
Frank 5990ab1cc9 OPSTRANSPORT
- New class.
2021-02-15 23:19:35 +01:00
Frank 084499fa0e OPS Wait 2021-02-14 00:19:03 +01:00
Frank 74e84a73dd OPS Cargo 2021-02-13 00:09:25 +01:00
Frank 96b0393f91 OPS Cargo 2021-02-11 23:58:56 +01:00
Frank 0656c33e05 Update OpsGroup.lua 2021-02-10 23:50:37 +01:00
Frank ec1ab49b54 Merge pull request #1447 from Applevangelist/patch-51
Update Auftrag.lua
2021-02-10 21:34:12 +01:00
Applevangelist 1daa2857b2 Update Auftrag.lua
Corrected docu in NewTanker, 1 is actually boom, and 0 probe
2021-02-10 13:19:53 +01:00
Frank 8c55541d0e Update OpsGroup.lua 2021-02-08 16:27:58 +01:00
Frank c5a4776b3a OPS Cargo 2021-02-07 01:24:13 +01:00
Frank 8bb9f0d7c0 OPS Cargo 2021-02-06 09:41:24 +01:00
Frank 7d83c251a8 OPS Cargo 2021-02-03 22:51:18 +01:00
Frank ee3ead9aac OPS Cargo 2021-02-02 23:20:55 +01:00
Frank 54896e0e31 Merge pull request #1444 from rollnthndr/develop
Added a note pointing out that callsigns need to be chosen depending …
2021-02-01 08:06:11 +01:00
Frank 016198e7f2 OPS Cargo 2021-01-31 23:28:04 +01:00
Frank 0933eef4c3 Merge branch 'develop' into FF/Ops 2021-01-31 00:50:14 +01:00
Frank fe55555c67 OPS
- Fixed inAir check for spawned groups
- Reduced SCHEDULER min delay to 0.001 sec (was 0.1 sec)
2021-01-30 23:28:07 +01:00
Frank bcf8973eed OPS 2021-01-30 21:29:29 +01:00
rollnthndr 50d2e42cc3 Added VSCode settings folder and workspace file to the ignore list. 2021-01-29 18:31:19 -07:00
rollnthndr 261d1cbeba Added a note pointing out that callsigns need to be chosen depending on the type of unit that this task is being assigned to. 2021-01-29 18:15:20 -07:00
Frank 242462b9ba OPS Cargo 2021-01-29 00:32:38 +01:00
Frank fd4e478dbf Merge branch 'master' into develop 2021-01-26 12:40:15 +01:00
Frank 6b91e68668 OPS Cargo 2021-01-26 12:39:49 +01:00
Frank 7516d2af56 Merge branch 'master' into develop 2021-01-23 16:47:14 +01:00
Frank c247a98402 OPS cargo 2021-01-23 16:46:44 +01:00
Frank 83bcd55a7a Merge pull request #1439 from FlightControl-Master/wingthor_fixes
Added a table shuffler using Fisher Yeates algorithm in Utilities/Uti…
2021-01-22 23:28:42 +01:00
Wingthor 5a43936e35 Added a table shuffler using Fisher Yeates algorithm in Utilities/Utils.lua 2021-01-22 23:10:22 +01:00
Frank 35b776179e Merge branch 'master' into develop 2021-01-19 16:56:40 +01:00
Frank f4cb6df8d4 Ops
respawn
2021-01-19 16:53:22 +01:00
Frank a259b88f1d Merge branch 'develop' into FF/Ops 2021-01-16 22:57:10 +01:00
Frank 5b4f3d1c98 Merge branch 'master' into develop 2021-01-16 22:56:43 +01:00
Frank c62c21c386 FLIGHTGROUP v0.6.1
- Improved engage targets
2021-01-16 22:56:28 +01:00
Frank 17c56a11bd Merge pull request #1432 from OttoWerkr/develop
Update Scenery.lua
2021-01-15 23:53:37 +01:00
Frank 796561b8b6 Merge pull request #1433 from FlightControl-Master/FF/Ops
OPS
2021-01-15 23:44:46 +01:00
Frank 209b7a64ed Update OpsGroup.lua 2021-01-15 23:42:30 +01:00
Frank 8f56299380 OPS
**AUFTRAG**
- Added PATROLZONE type. Works for all OPSGROUPs (air, ground and sea).

**FLIGHTGROUP**
- Improved EngageTarget
- Added option to automatically engage detected targets.

**TARGET**
- Improved Zone type
2021-01-15 23:29:16 +01:00
OttoWerkr 73b1394ca7 Update Scenery.lua
Added FindByName() to SCENERY Class.
2021-01-15 14:27:43 -05:00
Frank f3a2cf7284 Patrol
- Added `FLIGHTGROUP:SetEngageDetectedOn()`
- AUFTRAG patrol zone.
2021-01-15 00:59:52 +01:00
Frank df79c765f8 Merge branch 'master' into develop 2021-01-12 17:40:40 +01:00
Frank d09737c218 Merge branch 'master' into develop 2021-01-12 13:51:26 +01:00
Frank 6b0c42ae50 Merge branch 'master' into develop 2021-01-12 10:45:11 +01:00
Frank 7363da1b54 Merge branch 'master' into develop 2021-01-09 23:48:42 +01:00
Frank 684f19c060 Merge branch 'master' into develop 2021-01-05 22:59:57 +01:00
Frank d08e4db0eb Merge branch 'master' into develop 2021-01-03 00:24:42 +01:00
Frank f1e7d8bd06 Merge branch 'master' into develop 2021-01-01 10:16:58 +01:00
Frank 1328ac061e Merge branch 'master' into develop 2020-12-31 21:22:59 +01:00
Frank 391f0fc9af Merge branch 'master' into develop 2020-12-29 23:38:44 +01:00
Frank 38cf5be738 Update Airbase.lua 2020-12-29 22:51:10 +01:00
Frank 1bb70b8697 Update Warehouse.lua
- added airbase coalition check when spawning aircraft #1413
2020-12-29 22:28:36 +01:00
Frank 6e35b80daf Update Warehouse.lua
- requests should no longer be processed if warehouse has no airbase
2020-12-29 21:41:15 +01:00
Frank a171c22ce4 Merge branch 'develop' into FF/Ops 2020-12-29 11:23:04 +01:00
Frank f56457bc28 Update Intelligence.lua
- added reject zones
2020-12-29 11:22:47 +01:00
Frank 9708de70c7 Merge branch 'master' into develop 2020-12-27 17:59:57 +01:00
Frank d68589bb70 Merge branch 'master' into develop 2020-12-23 16:10:07 +01:00
Frank 16eb38782a Merge branch 'master' into develop 2020-12-23 10:54:57 +01:00
Frank 2175e9c0d6 Merge branch 'master' into develop 2020-12-22 09:49:08 +01:00
Frank 9abd71f681 Merge branch 'develop' into FF/Ops 2020-12-21 00:13:09 +01:00
Frank d1dc829136 Merge branch 'master' into develop 2020-12-20 23:48:28 +01:00
Frank eda672bdc6 Merge branch 'develop' into FF/Ops 2020-12-19 12:48:12 +01:00
Frank 0e5dbbea79 Merge branch 'master' into develop 2020-12-19 01:18:17 +01:00
Frank f5809ef302 Merge branch 'develop' into FF/Ops 2020-12-18 23:50:59 +01:00
Frank 457ce1ece1 Merge branch 'master' into develop 2020-12-18 13:52:23 +01:00
Frank 9c9841332f Merge branch 'master' into develop 2020-12-17 13:55:38 +01:00
Frank 9470d3a2ef Merge branch 'master' into develop 2020-12-17 12:34:59 +01:00
Frank 8356271f8d Merge branch 'master' into develop 2020-12-17 12:34:04 +01:00
Frank 42a6f3272d Merge branch 'master' into develop 2020-12-16 00:12:38 +01:00
Frank 362b242c41 Merge pull request #1398 from Applevangelist/patch-20
Error in FlightGroup.lua in line 2390 as detected by HRP Zero
2020-12-15 00:36:57 +01:00
Frank 7ace7b49ca Merge branch 'develop' into FF/Ops 2020-12-15 00:14:15 +01:00
Frank 7cd902e924 Merge branch 'master' into develop 2020-12-15 00:11:34 +01:00
Applevangelist e3c14678e2 Error in FlightGroup.lua in line 2390 as detected by HRP Zero
Not searching in Paris, but in pairs :)
2020-12-14 13:37:17 +01:00
Frank bfaca75a7d Merge branch 'master' into develop 2020-12-14 12:37:45 +01:00
Frank 5aecd8c255 Ops
- Performance
2020-12-10 18:53:49 +01:00
Frank cfc0f1a1f7 Merge branch 'master' into develop 2020-12-03 23:18:32 +01:00
Frank edf657c65c Merge branch 'master' into develop 2020-11-30 11:40:34 +01:00
Frank 801d00fa26 Stuff 2020-11-30 11:38:36 +01:00
Frank eeffa31282 Update ChiefOfStaff.lua 2020-11-26 11:47:05 +01:00
Frank 206528a530 Merge branch 'FF/Ops' into FF/OpsDev 2020-11-26 10:56:17 +01:00
Frank 41690fdf7b Merge pull request #1385 from FlightControl-Master/FF/Ops
OPS
2020-11-25 11:34:41 +01:00
Frank 5b83f8e45b OPS 2020-11-25 11:27:07 +01:00
Frank 94863ed8ae Update OpsGroup.lua 2020-11-24 22:00:36 +01:00
Frank e63b99c890 Merge pull request #1379 from Applevangelist/patch-7
Update Controllable.lua
2020-11-22 15:54:03 +01:00
Frank e8542743b4 Merge pull request #1380 from Applevangelist/patch-8
Update Sead.lua
2020-11-22 15:53:14 +01:00
Applevangelist 309e1208c2 Update Sead.lua
Feature Request #1355
2020-11-22 14:17:42 +01:00
Applevangelist 3e0db05664 Update Controllable.lua
Added control to keep within limits of the options
2020-11-22 13:01:26 +01:00
Applevangelist 9573d92cc0 Update Controllable.lua
Add option to control a2a attack ranges for AIR fighter units. See https://wiki.hoggitworld.com/view/DCS_option_missileAttack
2020-11-22 12:07:49 +01:00
Frank 1abc0dcb6a Merge pull request #1378 from FlightControl-Master/FF/Ops
OPS
2020-11-21 21:55:20 +01:00
Frank 770fb3228f OPS
AUFTRAG
- Changed ESCORT engage distance input to NM (not meters)

TARGET
- Fixed bug in count targets
- Improved dead/destroyed management

FLIGHTGROUP
- Only register UNIT/STATIC kills (not SCENERY)

INTEL
- Improved agent set
2020-11-21 21:49:47 +01:00
Frank d6aa251c5e Merge pull request #1377 from Applevangelist/patch-6
Update AI_A2G_Dispatcher.lua
2020-11-20 18:17:25 +01:00
Frank 9305b870d2 Merge pull request #1376 from Applevangelist/patch-5
Update AI_A2A_Dispatcher.lua
2020-11-20 18:17:00 +01:00
Applevangelist 824a98d7a8 Update AI_A2G_Dispatcher.lua
Wrapper for player messages and function to set this on/off
2020-11-20 10:43:39 +01:00
Applevangelist 7a55ba105c Update AI_A2A_Dispatcher.lua
Wrap player messages, added function to switch on/off
2020-11-20 10:34:53 +01:00
Frank 122425338e Merge branch 'master' into develop 2020-11-20 10:18:05 +01:00
Frank 1d7f874a78 Merge pull request #1375 from FlightControl-Master/FF/Ops
OPS
2020-11-19 21:49:02 +01:00
Frank afb63a7331 Update Target.lua
- Fixed escort problem
2020-11-19 19:51:58 +01:00
Frank 0c07a660ee WAREHOUSE
- Added runway destroyed check.
2020-11-17 00:25:37 +01:00
Frank 8ffda53e3d Chief and Wing Commander
- Added back in
2020-11-16 18:11:15 +01:00
Frank 5a30c08ff6 Merge pull request #1369 from FlightControl-Master/FF/Ops
TARGET
2020-11-16 13:33:14 +01:00
Frank 9cac2674c4 Update Target.lua
- Alive checks improved
2020-11-16 13:22:53 +01:00
Frank ec3f43c69f Merge pull request #1367 from FlightControl-Master/FF/Ops
OPS
2020-11-16 00:02:20 +01:00
Frank 270dfab6a2 OPS
less output again
2020-11-15 23:49:25 +01:00
Frank 624b1f5647 Merge branch 'develop' into FF/Ops 2020-11-15 23:34:34 +01:00
Frank 84332a3ebf Update FlightGroup.lua
Fixes bug when flight searches a tanker when fuel is low.
2020-11-15 23:33:43 +01:00
Frank 63ff79ef0b Merge branch 'master' into FF/Ops 2020-11-15 23:00:50 +01:00
Frank 09452444d7 Merge branch 'master' into develop 2020-11-15 23:00:23 +01:00
Frank 75be2fc0ba Update Target.lua 2020-11-15 21:44:08 +01:00
Frank 1e0a0f8dc5 Ops 2020-11-13 23:26:56 +01:00
Frank f3d9b9c5be Ops 2020-11-06 00:29:42 +01:00
Frank cef0e444c9 Ops 2020-11-04 22:48:14 +01:00
Frank bad8dc2220 Merge pull request #1362 from FlightControl-Master/FF/Ops
Ops Enhancements
2020-10-31 22:05:58 +01:00
Frank e05d57d908 Merge branch 'develop' into FF/Ops 2020-10-31 21:22:17 +01:00
Frank 45c153f7a0 Merge branch 'master' into develop 2020-10-31 21:21:47 +01:00
Frank 0948f418cd Ops
- Fixed payload not reduced
2020-10-31 11:57:23 +01:00
Frank d027113b0b Merge branch 'develop' into FF/Ops 2020-10-28 09:48:36 +01:00
Frank ff00c2fb15 Merge branch 'master' into develop 2020-10-28 09:46:34 +01:00
Frank cd5b4ee1be Update AI_Formation.lua
- fixed bug
- set default mode to following
2020-10-28 09:44:33 +01:00
Frank ac337b8459 Ops
- Laser
2020-10-28 09:06:22 +01:00
Frank 567f7cbc29 Update OpsGroup.lua
- Laser
2020-10-27 00:12:59 +01:00
Frank d81ffcf119 Merge branch 'develop' into FF/Ops 2020-10-26 16:16:56 +01:00
Frank 6ed66a70a2 Merge branch 'master' into develop 2020-10-26 16:16:28 +01:00
Frank 9ed3b045f7 Merge branch 'master' into develop 2020-10-26 09:17:41 +01:00
Frank 2d6653c14a Ops
- Laser
2020-10-26 08:01:56 +01:00
Frank ab0e7e735a Merge branch 'develop' into FF/Ops 2020-10-20 23:40:52 +02:00
Frank 3243555d3f Merge branch 'master' into develop 2020-10-20 23:31:30 +02:00
Frank 8696ce0cc1 Ops 2020-10-20 23:04:15 +02:00
Frank 459ff26868 Ops 2020-10-19 23:33:39 +02:00
Frank 277eb2d09f Ops
- Laser
2020-10-18 00:02:48 +02:00
Frank 187093fa5a NavyGroup Update 2020-10-14 00:24:12 +02:00
Frank 6c9ce55759 Navygroup
- Fixed Astar bug
- Turn into wind stop
2020-10-13 00:29:31 +02:00
Frank f9721e501a Merge branch 'FF/Ops' into develop 2020-10-12 00:22:47 +02:00
Frank 23c22651be Update Airboss.lua
- Added USS Harry S. Truman (CVN-75) as SC type.
2020-10-12 00:21:47 +02:00
Frank 2ad81ca499 Ops 2020-10-12 00:09:02 +02:00
Frank 7792381c36 OPS 2020-10-09 17:10:24 +02:00
Frank 591dd128ce Navygroup 2020-10-09 00:15:19 +02:00
Frank ce10390406 ARMYGROUP 2020-10-07 23:26:46 +02:00
Frank bf299e5f8d Merge pull request #1353 from FlightControl-Master/FF/Ops
OPS fixes
2020-10-03 23:29:35 +02:00
Frank 7f98e703f1 Update Airbase.lua
- Fixed bug in the `AIRBASE:GetRunwaydata()` function.
2020-10-03 23:12:17 +02:00
Frank 421d27f640 Update Airboss.lua
- Fix if unit skill is not set in env.mission (DCS bug that should be fixed by ED meanwhile).
2020-10-03 21:43:09 +02:00
Frank fb1e95ab87 Pathfinding 2020-10-03 18:22:23 +02:00
Frank 3737592734 Ops
Fixes
2020-10-01 23:55:39 +02:00
Frank 6445cf01a2 Merge pull request #1350 from FlightControl-Master/FF/Ops
OPS Update
2020-09-20 00:26:10 +02:00
Frank 8e07b93eac Merge branch 'develop' into FF/Ops 2020-09-19 23:57:25 +02:00
Frank 23f6752362 Ops
- rm staff
2020-09-19 23:55:45 +02:00
Frank 19b870c038 Ops
- Less traceing.
2020-09-19 23:52:17 +02:00
Frank ca7f15e622 Ops 2020-09-19 01:15:34 +02:00
Frank d497bb25f3 Ops 2020-09-18 18:07:10 +02:00
Frank 29d694722b Ops
- Quite a few fixes while going through the example missions.
2020-09-16 23:35:13 +02:00
Frank 40ffef035b Ops 2020-09-15 18:11:19 +02:00
Frank a00c198bcc Update Warehouse.lua
- Added born check. Helps with delayed spawning on carriers.
2020-09-15 01:13:11 +02:00
Frank 717842b276 Ops 2020-09-10 00:34:17 +02:00
Frank d5c4c34759 Ops 2020-09-09 00:02:46 +02:00
Frank edb0032118 ops 2020-09-08 18:04:03 +02:00
Frank 123144d06e Ops temp 2020-09-08 00:15:29 +02:00
Frank 38f5d45d5b Merge branch 'master' into FF/Ops 2020-09-07 22:25:28 +02:00
Frank bcaf808b88 Ops little fixes 2020-09-07 22:17:33 +02:00
Frank 7b8db597ef Ops 2020-09-07 00:42:29 +02:00
Frank 18e192b235 Ops 2020-09-06 00:18:20 +02:00
Frank 5ad30277ba Ops 2020-09-05 00:56:44 +02:00
Frank 2e998dc315 Ops 2020-09-04 17:20:40 +02:00
Frank cda1658541 Ops 2020-09-04 00:58:37 +02:00
Frank 8b640912c3 Ops 2020-09-02 22:54:54 +02:00
Frank 81a773b861 Merge branch 'master' into develop 2020-09-02 00:09:15 +02:00
Frank 444cc43971 Ops 2020-09-02 00:05:05 +02:00
Frank eb86d59203 Ops 2020-09-01 11:42:45 +02:00
Frank 5ee35f3fbb Less output 2020-08-31 12:50:50 +02:00
Frank 9a91145f89 Small 2020-08-30 23:44:15 +02:00
Frank 637081ebdd Ops 2020-08-30 22:52:18 +02:00
Frank 7d2746e7be Merge branch 'develop' into FF/Ops 2020-08-30 17:24:57 +02:00
Frank c84a92c787 Merge branch 'master' into develop 2020-08-30 17:15:31 +02:00
Frank b775aaa274 Merge branch 'master' into FF/Ops 2020-08-30 17:05:09 +02:00
Frank a97d7abc24 Range Ops 2020-08-30 17:03:16 +02:00
Frank 7e73db505b Decreased Tracing 2020-08-30 01:38:18 +02:00
Frank a126906776 up 2020-08-29 21:24:15 +02:00
Frank 2d6092c114 TIMER
- Added new TIMER class.
2020-08-29 20:26:20 +02:00
Frank caef309547 Ops
- Airboss optimizations WIP
2020-08-28 13:24:29 +02:00
Frank f9ec21a2b5 Ops 2020-08-26 00:01:52 +02:00
Frank 06600b2a94 Ops 2020-08-25 17:55:53 +02:00
Frank 3f39ec0ae0 Stuff 2020-08-25 01:03:18 +02:00
Frank cfc45cf068 Warehouse marker and spawning update 2020-08-23 01:08:02 +02:00
Frank 45d809a641 Update Profiler.lua 2020-08-22 22:39:54 +02:00
Frank fcfbc5e17c Profiler
- Added lua Profiler.
2020-08-22 21:24:35 +02:00
Frank f30c66424c Radioqueue Profiler 2020-08-22 21:18:12 +02:00
Frank f823fc6ee0 Update AI_Formation.lua
Performance update
2020-08-22 16:31:56 +02:00
Frank aac291c0c6 Performance Optimizations 2020-08-22 00:09:36 +02:00
Frank 61adeeeda3 Delete Astar - Copy.lua 2020-08-20 01:24:28 +02:00
Frank f94a5eed61 Merge branch 'develop' into FF/OpsDev 2020-08-19 23:21:06 +02:00
Frank 0695c48e7a Merge branch 'master' into develop 2020-08-19 23:12:05 +02:00
Frank f4bfcf58fd Ops 2020-08-19 22:32:16 +02:00
Frank dee7307adc Ops 2020-08-19 01:06:28 +02:00
Frank 114032a743 Ops 2020-08-18 18:15:22 +02:00
Frank e9e6a63e6a Ops 2020-08-18 01:35:24 +02:00
Frank 2a4f6020c2 Ops 2020-08-17 01:24:51 +02:00
Frank 3ea8b3737f Update Profiler.lua 2020-08-16 01:18:18 +02:00
Frank ed47b4b3db Ops 2020-08-16 00:35:42 +02:00
Frank adc89feda9 Ops 2020-08-15 00:54:36 +02:00
Frank 32c9a59ff0 Ops 2020-08-14 18:09:13 +02:00
Frank 200c1dac85 Ops 2020-08-14 01:01:45 +02:00
Frank cf65c2af15 Ops 2020-08-13 01:21:02 +02:00
Frank fb6ebc42a5 Ops 2020-08-10 23:45:52 +02:00
Frank c7696c375e Ops 2020-08-10 01:46:03 +02:00
Frank 337e1a837f Ops 2020-08-08 01:10:03 +02:00
Frank 495a9fd3a0 Ops Target
New Class.
2020-08-06 01:43:42 +02:00
Frank e6f7493ddd Ops Fixes 2020-08-05 00:39:48 +02:00
Frank 76e75505e5 Ops 2020-08-04 16:56:45 +02:00
Frank dafbd3f368 Ops & Auftrag 2020-08-04 01:10:53 +02:00
Frank 11ec70441a Ops group 2020-08-03 00:31:10 +02:00
Frank d1a18913f3 Ops 2020-08-02 01:31:47 +02:00
Frank 775b9e9fde Fixed bugs with new option table. 2020-08-01 00:25:12 +02:00
Frank 286e34e057 Profiler 2020-07-31 17:32:24 +02:00
Frank da2aa00442 A*
Further improvements by switching to keys.
2020-07-31 00:09:21 +02:00
Frank ba90176bb1 A*
Further optimized by using DCS API land.isVisible instead of Moose IsLoS function.
2020-07-30 21:40:27 +02:00
Frank cf9248ecc8 A*
- Improved performance by caching cost and valid/invalid neighbours.
2020-07-30 17:41:26 +02:00
Frank 0d42b12658 Enhanced Groups 2020-07-30 01:08:25 +02:00
Frank 2f6d9b640f NAVY 2020-07-29 01:10:13 +02:00
Frank 04923b65b2 Stuff 2020-07-24 01:34:38 +02:00
Frank 2328f9a36b CHIEF 2020-07-23 19:15:26 +02:00
Frank 98971736f8 Astar 2020-07-23 00:24:59 +02:00
Frank ec809085b4 Waypoints 2020-07-22 01:05:24 +02:00
Frank af023c1994 Waypoints 2020-07-21 17:53:59 +02:00
Frank d9b7cc18f3 A* 2020-07-21 01:19:03 +02:00
Frank ce1121a4c2 INTEL
Clusters
2020-07-20 01:20:28 +02:00
Frank 5fa75bf6b9 INTEL
Improved clusters
2020-07-19 18:31:09 +02:00
Frank 5cb1036618 CHIEF
- Added Chief of Staff class.
2020-07-19 01:22:49 +02:00
Frank 9473dc2069 Update Intelligence.lua 2020-07-16 01:04:43 +02:00
Frank 81f5184b43 Added WINCOM;MANDER 2020-07-15 21:48:11 +02:00
Frank b6bc22f991 Squadron Grouping 2020-07-15 00:51:27 +02:00
Frank 56fad29df9 ops 2020-07-14 17:56:18 +02:00
Frank dfeea53cf6 Merge branch 'develop' into FF/Ops 2020-07-14 00:33:29 +02:00
Frank 71e6369960 INTEL class 2020-07-13 22:31:33 +02:00
Frank 0611db78b3 Intel 2020-07-13 18:31:01 +02:00
Frank 8c768cc517 Update Intelligence.lua 2020-07-12 22:20:20 +02:00
Frank b67750d808 Intel 2020-07-12 20:57:37 +02:00
Frank 96f2ad06e2 Update FlightGroup.lua
Fixed TACAN
2020-07-12 19:43:27 +02:00
Frank 5cf4833455 OpsGroup 2020-07-10 14:16:41 +02:00
Frank f578fcfdc7 NAVYGROUP
Improved dead/stop
2020-07-10 11:14:18 +02:00
Frank 9838e1af19 Ops 2020-07-09 00:06:02 +02:00
Frank cee443e28d Ops 2020-07-08 00:18:42 +02:00
Frank 1fe57cab67 bla 2020-07-08 00:12:57 +02:00
Frank 80b22a8444 Ops 2020-07-08 00:07:30 +02:00
Frank 71733babf8 NavyGroup 2020-07-07 22:28:54 +02:00
Frank 9f793d6cf7 OpsGroup 2020-07-07 00:47:42 +02:00
Frank 46e73a108f Ops 2020-07-04 23:16:57 +02:00
Frank b13ddc958b Update Warehouse.lua 2020-07-02 10:48:08 +02:00
Frank ba3954ad3f Update Airboss.lua 2020-07-01 23:56:05 +02:00
Frank f2e417b21f Ops 2020-07-01 23:52:27 +02:00
Frank d93d0afdf3 Ops 2020-06-30 00:33:26 +02:00
Frank 207c9ed62e blanks 2020-06-29 21:08:57 +02:00
Frank e3f4aa3d64 Update FlightGroup.lua 2020-06-29 21:05:26 +02:00
Frank 2392c9dc8e Ops 2020-06-29 20:55:32 +02:00
Frank 682c1f5ef2 Ops 2020-06-27 22:44:50 +02:00
102 changed files with 83467 additions and 1822 deletions
+1
View File
@@ -57,6 +57,7 @@ jobs:
- name: Update apt-get (needed for act docker image)
run: |
sudo rm /etc/apt/sources.list.d/microsoft-prod.list
sudo apt-get -qq update
- name: Install tree
+1 -1
View File
@@ -110,7 +110,7 @@ jobs:
- name: Run LuaSrcDiet
run: |
luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
#########################################################################
# Push to MOOSE_INCLUDE
#########################################################################
+7
View File
@@ -28,6 +28,13 @@ local.properties
.buildpath
#####################
## Visual Studio Code
#####################
*.code-workspace
.vscode/
#################
## Visual Studio
#################
+12 -2
View File
@@ -1,7 +1,17 @@
{
"Lua.workspace.preloadFileSize": 1000,
"Lua.workspace.preloadFileSize": 10000,
"Lua.diagnostics.disable": [
"undefined-doc-name"
"undefined-doc-name",
"duplicate-set-field",
"trailing-space",
"need-check-nil",
"ambiguity-1",
"undefined-doc-param",
"redundant-parameter",
"param-type-mismatch",
"deprecated",
"undefined-global",
"lowercase-global"
],
"Lua.diagnostics.globals": [
"BASE",
+1 -1
View File
@@ -11,7 +11,7 @@
-- @module AI.AI_A2A_Cap
-- @image AI_Combat_Air_Patrol.JPG
--- @type AI_A2A_CAP
-- @type AI_A2A_CAP
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
+4 -2
View File
@@ -13,8 +13,8 @@
--- @type AI_A2A_GCI
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
-- @type AI_A2A_GCI
-- @extends AI.AI_A2A#AI_A2A
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
@@ -39,6 +39,8 @@
--
-- ## 2. AI_A2A_GCI is a FSM
--
-- ![Process](..\Presentations\AI_GCI\Dia2.JPG)
--
-- ### 2.1 AI_A2A_GCI States
--
-- * **None** ( Group ): The process is not started yet.
+2 -2
View File
@@ -10,8 +10,8 @@
-- @image AI_Air_Patrolling.JPG
--- @type AI_A2A_PATROL
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @type AI_A2A_PATROL
-- @extends AI.AI_A2A#AI_A2A
--- Implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} or @{Wrapper.Group}.
--
+3 -4
View File
@@ -11,9 +11,8 @@
-- @module AI.AI_A2G_BAI
-- @image AI_Air_To_Ground_Engage.JPG
--- @type AI_A2G_BAI
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
-- @type AI_A2G_BAI
-- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends.
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
--
@@ -47,7 +46,7 @@ AI_A2G_BAI = {
function AI_A2G_BAI:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air = AI_AIR:New( AIGroup )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
local self = BASE:Inherit( self, AI_Air_Engage )
+3 -4
View File
@@ -11,9 +11,8 @@
-- @module AI.AI_A2G_CAS
-- @image AI_Air_To_Ground_Engage.JPG
--- @type AI_A2G_CAS
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
-- @type AI_A2G_CAS
-- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends.
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
--
@@ -47,7 +46,7 @@ AI_A2G_CAS = {
function AI_A2G_CAS:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air = AI_AIR:New( AIGroup )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
local self = BASE:Inherit( self, AI_Air_Engage )
+2 -3
View File
@@ -13,9 +13,8 @@
--- @type AI_A2G_SEAD
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
-- @type AI_A2G_SEAD
-- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL
--- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders.
+1 -1
View File
@@ -9,7 +9,7 @@
-- @module AI.AI_Air_Patrol
-- @image AI_Air_To_Ground_Patrol.JPG
--- @type AI_AIR_PATROL
-- @type AI_AIR_PATROL
-- @extends AI.AI_Air#AI_AIR
--- The AI_AIR_PATROL class implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group}
+8 -8
View File
@@ -408,7 +408,7 @@ function AI_BAI_ZONE:onafterStart( Controllable, From, Event, To )
self:SetDetectionDeactivated() -- When not engaging, set the detection off.
end
--- @param Wrapper.Controllable#CONTROLLABLE AIControllable
-- @param Wrapper.Controllable#CONTROLLABLE AIControllable
function _NewEngageRoute( AIControllable )
AIControllable:T( "NewEngageRoute" )
@@ -417,7 +417,7 @@ function _NewEngageRoute( AIControllable )
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -429,7 +429,7 @@ function AI_BAI_ZONE:onbeforeEngage( Controllable, From, Event, To )
end
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -478,7 +478,7 @@ function AI_BAI_ZONE:onafterTarget( Controllable, From, Event, To )
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -488,7 +488,7 @@ function AI_BAI_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 )
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -612,7 +612,7 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To,
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -623,7 +623,7 @@ function AI_BAI_ZONE:onafterAccomplish( Controllable, From, Event, To )
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -637,7 +637,7 @@ function AI_BAI_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end
--- @param #AI_BAI_ZONE self
-- @param #AI_BAI_ZONE self
-- @param Core.Event#EVENTDATA EventData
function AI_BAI_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } )
+1 -1
View File
@@ -27,7 +27,7 @@
-- @module AI.AI_Balancer
-- @image AI_Balancing.JPG
--- @type AI_BALANCER
-- @type AI_BALANCER
-- @field Core.Set#SET_CLIENT SetClient
-- @field Core.Spawn#SPAWN SpawnAI
-- @field Wrapper.Group#GROUP Test
+9 -9
View File
@@ -31,7 +31,7 @@
-- @module AI.AI_CAP
-- @image AI_Combat_Air_Patrol.JPG
--- @type AI_CAP_ZONE
-- @type AI_CAP_ZONE
-- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Wrapper.Controllable} patrolling.
-- @field Core.Zone#ZONE_BASE TargetZone The @{Core.Zone} where the patrol needs to be executed.
-- @extends AI.AI_Patrol#AI_PATROL_ZONE
@@ -344,7 +344,7 @@ function AI_CAP_ZONE:onafterStart( Controllable, From, Event, To )
end
--- @param AI.AI_CAP#AI_CAP_ZONE
-- @param AI.AI_CAP#AI_CAP_ZONE
-- @param Wrapper.Group#GROUP EngageGroup
function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
@@ -355,7 +355,7 @@ function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
end
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -367,7 +367,7 @@ function AI_CAP_ZONE:onbeforeEngage( Controllable, From, Event, To )
end
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -395,7 +395,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
end
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -405,7 +405,7 @@ function AI_CAP_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 )
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -505,7 +505,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
end
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -515,7 +515,7 @@ function AI_CAP_ZONE:onafterAccomplish( Controllable, From, Event, To )
self:SetDetectionOff()
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -528,7 +528,7 @@ function AI_CAP_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end
end
--- @param #AI_CAP_ZONE self
-- @param #AI_CAP_ZONE self
-- @param Core.Event#EVENTDATA EventData
function AI_CAP_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } )
+8 -8
View File
@@ -363,7 +363,7 @@ function AI_CAS_ZONE:onafterStart( Controllable, From, Event, To )
self:SetDetectionDeactivated() -- When not engaging, set the detection off.
end
--- @param AI.AI_CAS#AI_CAS_ZONE
-- @param AI.AI_CAS#AI_CAS_ZONE
-- @param Wrapper.Group#GROUP EngageGroup
function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
@@ -375,7 +375,7 @@ function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -387,7 +387,7 @@ function AI_CAS_ZONE:onbeforeEngage( Controllable, From, Event, To )
end
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -420,7 +420,7 @@ function AI_CAS_ZONE:onafterTarget( Controllable, From, Event, To )
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -430,7 +430,7 @@ function AI_CAS_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 )
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -530,7 +530,7 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To,
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -541,7 +541,7 @@ function AI_CAS_ZONE:onafterAccomplish( Controllable, From, Event, To )
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string.
-- @param #string Event The Event string.
@@ -555,7 +555,7 @@ function AI_CAS_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end
--- @param #AI_CAS_ZONE self
-- @param #AI_CAS_ZONE self
-- @param Core.Event#EVENTDATA EventData
function AI_CAS_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } )
+1 -1
View File
@@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_APC
-- @image AI_Cargo_Dispatching_For_APC.JPG
--- @type AI_CARGO_APC
-- @type AI_CARGO_APC
-- @extends AI.AI_Cargo#AI_CARGO
@@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Airplane
-- @image AI_Cargo_Dispatching_For_Airplanes.JPG
--- @type AI_CARGO_AIRPLANE
-- @type AI_CARGO_AIRPLANE
-- @extends Core.Fsm#FSM_CONTROLLABLE
@@ -30,7 +30,7 @@
-- @module AI.AI_Cargo_Dispatcher_APC
-- @image AI_Cargo_Dispatching_For_APC.JPG
--- @type AI_CARGO_DISPATCHER_APC
-- @type AI_CARGO_DISPATCHER_APC
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
@@ -24,7 +24,7 @@
-- @image AI_Cargo_Dispatching_For_Airplanes.JPG
--- @type AI_CARGO_DISPATCHER_AIRPLANE
-- @type AI_CARGO_DISPATCHER_AIRPLANE
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
@@ -25,7 +25,7 @@
-- @module AI.AI_Cargo_Dispatcher_Helicopter
-- @image AI_Cargo_Dispatching_For_Helicopters.JPG
--- @type AI_CARGO_DISPATCHER_HELICOPTER
-- @type AI_CARGO_DISPATCHER_HELICOPTER
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
@@ -23,7 +23,7 @@
-- @module AI.AI_Cargo_Dispatcher_Ship
-- @image AI_Cargo_Dispatcher.JPG
--- @type AI_CARGO_DISPATCHER_SHIP
-- @type AI_CARGO_DISPATCHER_SHIP
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
@@ -160,7 +160,7 @@ AI_CARGO_DISPATCHER_SHIP = {
-- local SetPickupZones = SET_ZONE:New():FilterPrefixes( "Pickup" ):FilterStart()
-- local SetDeployZones = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart()
-- NEED MORE THOUGHT - ShippingLane is part of Warehouse.......
-- local ShippingLane = GROUP:New():FilterPrefixes( "ShippingLane" ):FilterStart()
-- local ShippingLane = SET_GROUP:New():FilterPrefixes( "ShippingLane" ):FilterOnce():GetSetObjects()
--
-- AICargoDispatcherShip = AI_CARGO_DISPATCHER_SHIP:New( SetShip, SetCargoInfantry, SetPickupZones, SetDeployZones, ShippingLane )
-- AICargoDispatcherShip:Start()
@@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Helicopter
-- @image AI_Cargo_Dispatching_For_Helicopters.JPG
--- @type AI_CARGO_HELICOPTER
-- @type AI_CARGO_HELICOPTER
-- @extends Core.Fsm#FSM_CONTROLLABLE
@@ -287,7 +287,7 @@ function AI_CARGO_HELICOPTER:SetLandingSpeedAndHeight(speed, height)
return self
end
--- @param #AI_CARGO_HELICOPTER self
-- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter
-- @param From
-- @param Event
@@ -326,7 +326,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
end
--- @param #AI_CARGO_HELICOPTER self
-- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter
-- @param From
-- @param Event
@@ -409,7 +409,7 @@ function AI_CARGO_HELICOPTER:onafterQueue( Helicopter, From, Event, To, Coordina
end
--- @param #AI_CARGO_HELICOPTER self
-- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter
-- @param From
-- @param Event
+1 -1
View File
@@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Ship
-- @image AI_Cargo_Dispatcher.JPG
--- @type AI_CARGO_SHIP
-- @type AI_CARGO_SHIP
-- @extends AI.AI_Cargo#AI_CARGO
--- Brings a dynamic cargo handling capability for an AI naval group.
@@ -15,7 +15,7 @@
-- @image MOOSE.JPG
--- @type AI_ESCORT_DISPATCHER_REQUEST
-- @type AI_ESCORT_DISPATCHER_REQUEST
-- @extends Core.Fsm#FSM
@@ -33,7 +33,7 @@ AI_ESCORT_DISPATCHER_REQUEST = {
ClassName = "AI_ESCORT_DISPATCHER_REQUEST",
}
--- @field #list
-- @field #list
AI_ESCORT_DISPATCHER_REQUEST.AI_Escorts = {}
@@ -80,7 +80,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:onafterStart( From, Event, To )
end
--- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param Core.Event#EVENTDATA EventData
function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
@@ -97,7 +97,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
end
--- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param Core.Event#EVENTDATA EventData
function AI_ESCORT_DISPATCHER_REQUEST:OnEventBirth( EventData )
@@ -136,12 +136,12 @@
--
-- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint.
-- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission.
--
-- # Developer Note
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated
--
--
-- # Developer Note
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated
--
-- ===
--
-- ### Authors: **FlightControl**
@@ -153,7 +153,7 @@
--- @type AI_ESCORT_REQUEST
-- @type AI_ESCORT_REQUEST
-- @extends AI.AI_Escort#AI_ESCORT
--- AI_ESCORT_REQUEST class
@@ -228,7 +228,7 @@ function AI_ESCORT_REQUEST:New( EscortUnit, EscortSpawn, EscortAirbase, EscortNa
return self
end
--- @param #AI_ESCORT_REQUEST self
-- @param #AI_ESCORT_REQUEST self
function AI_ESCORT_REQUEST:SpawnEscort()
local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot )
@@ -253,7 +253,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
self:_InitEscortMenus( EscortGroup )
self:_InitEscortRoute( EscortGroup )
--- @param #AI_ESCORT self
-- @param #AI_ESCORT self
-- @param Core.Event#EVENTDATA EventData
function EscortGroup:OnEventDeadOrCrash( EventData )
self:F( { "EventDead", EventData } )
@@ -268,7 +268,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
end
--- @param #AI_ESCORT_REQUEST self
-- @param #AI_ESCORT_REQUEST self
-- @param Core.Set#SET_GROUP EscortGroupSet
function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
@@ -290,14 +290,14 @@ function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
end
--- @param #AI_ESCORT_REQUEST self
-- @param #AI_ESCORT_REQUEST self
-- @param Core.Set#SET_GROUP EscortGroupSet
function AI_ESCORT_REQUEST:onafterStop( EscortGroupSet )
self:F()
EscortGroupSet:ForEachGroup(
--- @param Wrapper.Group#GROUP EscortGroup
-- @param Core.Group#GROUP EscortGroup
function( EscortGroup )
EscortGroup:WayPointInitialize()
+16 -16
View File
@@ -34,8 +34,8 @@
-- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
-- @field #number FollowDistance The current follow distance.
-- @field #boolean ReportTargets If true, nearby targets are reported.
-- @field DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
-- @field DCS#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
-- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
-- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
-- @field #number dtFollow Time step between position updates.
@@ -92,12 +92,12 @@
-- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" )
-- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 )
-- LargeFormation:__Start( 1 )
--
-- # Developer Note
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated
--
--
-- # Developer Note
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated
--
-- @field #AI_FORMATION
AI_FORMATION = {
ClassName = "AI_FORMATION",
@@ -117,7 +117,7 @@ AI_FORMATION = {
AI_FORMATION.__Enum = {}
--- @type AI_FORMATION.__Enum.Formation
-- @type AI_FORMATION.__Enum.Formation
-- @field #number None
-- @field #number Line
-- @field #number Trail
@@ -142,7 +142,7 @@ AI_FORMATION.__Enum.Formation = {
Box = 10,
}
--- @type AI_FORMATION.__Enum.Mode
-- @type AI_FORMATION.__Enum.Mode
-- @field #number Mission
-- @field #number Formation
AI_FORMATION.__Enum.Mode = {
@@ -152,13 +152,13 @@ AI_FORMATION.__Enum.Mode = {
Reconnaissance = "R",
}
--- @type AI_FORMATION.__Enum.ReportType
-- @type AI_FORMATION.__Enum.ReportType
-- @field #number All
-- @field #number Airborne
-- @field #number GroundRadar
-- @field #number Ground
AI_FORMATION.__Enum.ReportType = {
Airborne = "*",
All = "*",
Airborne = "A",
GroundRadar = "R",
Ground = "G",
@@ -996,7 +996,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
else
self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup
-- @param Core.Group#GROUP EscortGroup
function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
@@ -1020,7 +1020,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
else
self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup
-- @param Core.Group#GROUP EscortGroup
function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
@@ -1044,7 +1044,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
else
self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup
-- @param Core.Group#GROUP EscortGroup
function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
@@ -1222,7 +1222,7 @@ function AI_FORMATION:FollowMe(FollowGroup, ClientUnit, CT1, CV1, CT2, CV2)
local CVI = {
x = CV2.x + CS * 10 * math.sin(Ca),
y = GH2.y + Inclination, -- + FollowFormation.y,
y = GH2.y,
--y = GH2.y,
z = CV2.z + CS * 10 * math.cos(Ca),
}
@@ -274,7 +274,7 @@ do -- ACT_ACCOUNT_DEADS
--- DCS Events
--- @param #ACT_ACCOUNT_DEADS self
-- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:OnEventHit( EventData )
self:T( { "EventDead", EventData } )
@@ -285,7 +285,7 @@ do -- ACT_ACCOUNT_DEADS
end
end
--- @param #ACT_ACCOUNT_DEADS self
-- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:onfuncEventDead( EventData )
self:T( { "EventDead", EventData } )
@@ -297,7 +297,7 @@ do -- ACT_ACCOUNT_DEADS
--- DCS Events
--- @param #ACT_ACCOUNT_DEADS self
-- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:onfuncEventCrash( EventData )
self:T( { "EventDead", EventData } )
@@ -200,7 +200,7 @@ do -- ACT_ASSIST_SMOKE_TARGETS_ZONE
function ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking( ProcessUnit, From, Event, To )
self.TargetSetUnit:ForEachUnit(
--- @param Wrapper.Unit#UNIT SmokeUnit
-- @param Wrapper.Unit#UNIT SmokeUnit
function( SmokeUnit )
if math.random( 1, ( 100 * self.TargetSetUnit:Count() ) / 4 ) <= 100 then
SCHEDULER:New( self,
+1 -1
View File
@@ -78,7 +78,7 @@ do -- CARGO_CRATE
return self
end
--- @param #CARGO_CRATE self
-- @param #CARGO_CRATE self
-- @param Core.Event#EVENTDATA EventData
function CARGO_CRATE:OnEventCargoDead( EventData )
+1 -1
View File
@@ -598,7 +598,7 @@ do -- CARGO_GROUP
end
--- Get the amount of cargo units in the group.
--- Get the underlying GROUP object from the CARGO_GROUP.
-- @param #CARGO_GROUP self
-- @return #CARGO_GROUP
function CARGO_GROUP:GetGroup( Cargo )
@@ -72,7 +72,7 @@ do -- CARGO_SLINGLOAD
end
--- @param #CARGO_SLINGLOAD self
-- @param #CARGO_SLINGLOAD self
-- @param Core.Event#EVENTDATA EventData
function CARGO_SLINGLOAD:OnEventCargoDead( EventData )
+920
View File
@@ -0,0 +1,920 @@
--- **Core** - Client Menu Management.
--
-- **Main Features:**
--
-- * For complex, non-static menu structures
-- * Lightweigt implementation as alternative to MENU
-- * Separation of menu tree creation from menu on the clients's side
-- * Works with a SET_CLIENT set of clients
-- * Allow manipulation of the shadow tree in various ways
-- * Push to all or only one client
-- * Change entries' menu text
-- * Option to make an entry usable once only across all clients
-- * Auto appends GROUP and CLIENT objects to menu calls
--
-- ===
--
-- ### Author: **applevangelist**
--
-- ===
--
-- @module Core.ClientMenu
-- @image Core_Menu.JPG
-- last change: May 2024
-- TODO
----------------------------------------------------------------------------------------------------------------
--
-- CLIENTMENU
--
----------------------------------------------------------------------------------------------------------------
---
-- @type CLIENTMENU
-- @field #string ClassName Class Name
-- @field #string lid Lid for log entries
-- @field #string version Version string
-- @field #string name Name
-- @field #string groupname Group name
-- @field #table path
-- @field #table parentpath
-- @field #CLIENTMENU Parent
-- @field Wrapper.Client#CLIENT client
-- @field #number GroupID Group ID
-- @field #number ID Entry ID
-- @field Wrapper.Group#GROUP group
-- @field #string UUID Unique ID based on path+name
-- @field #string Function
-- @field #table Functionargs
-- @field #table Children
-- @field #boolean Once
-- @field #boolean Generic
-- @field #boolean debug
-- @field #CLIENTMENUMANAGER Controller
-- @field #active boolean
-- @extends Core.Base#BASE
---
-- @field #CLIENTMENU
CLIENTMENU = {
ClassName = "CLIENTMENUE",
lid = "",
version = "0.1.2",
name = nil,
path = nil,
group = nil,
client = nil,
GroupID = nil,
Children = {},
Once = false,
Generic = false,
debug = false,
Controller = nil,
groupname = nil,
active = false,
}
---
-- @field #CLIENTMENU_ID
CLIENTMENU_ID = 0
--- Create an new CLIENTMENU object.
-- @param #CLIENTMENU self
-- @param Wrapper.Client#CLIENT Client The client for whom this entry is. Leave as nil for a generic entry.
-- @param #string Text Text of the F10 menu entry.
-- @param #CLIENTMENU Parent The parent menu entry.
-- @param #string Function (optional) Function to call when the entry is used.
-- @param ... (optional) Arguments for the Function, comma separated
-- @return #CLIENTMENU self
function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
-- Inherit everything from BASE class.
local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENU
CLIENTMENU_ID = CLIENTMENU_ID + 1
self.ID = CLIENTMENU_ID
if Client then
self.group = Client:GetGroup()
self.client = Client
self.GroupID = self.group:GetID()
self.groupname = self.group:GetName() or "Unknown Groupname"
else
self.Generic = true
end
self.name = Text or "unknown entry"
if Parent then
if Parent:IsInstanceOf("MENU_BASE") then
self.parentpath = Parent.MenuPath
else
self.parentpath = Parent:GetPath()
Parent:AddChild(self)
end
end
self.Parent = Parent
self.Function = Function
self.Functionargs = arg or {}
table.insert(self.Functionargs,self.group)
table.insert(self.Functionargs,self.client)
if self.Functionargs and self.debug then
self:T({"Functionargs",self.Functionargs})
end
if not self.Generic and self.active == false then
if Function ~= nil then
local ErrorHandler = function( errmsg )
env.info( "MOOSE Error in CLIENTMENU COMMAND function: " .. errmsg )
if BASE.Debug ~= nil then
env.info( BASE.Debug.traceback() )
end
return errmsg
end
self.CallHandler = function()
local function MenuFunction()
return self.Function( unpack( self.Functionargs ) )
end
local Status, Result = xpcall( MenuFunction, ErrorHandler)
if self.Once == true then
self:Clear()
end
end
self.path = missionCommands.addCommandForGroup(self.GroupID,Text,self.parentpath, self.CallHandler)
self.active = true
else
self.path = missionCommands.addSubMenuForGroup(self.GroupID,Text,self.parentpath)
self.active = true
end
else
if self.parentpath then
self.path = UTILS.DeepCopy(self.parentpath)
else
self.path = {}
end
self.path[#self.path+1] = Text
end
self.UUID = table.concat(self.path,";")
self:T({self.UUID})
self.Once = false
-- Log id.
self.lid=string.format("CLIENTMENU %s | %s | ", self.ID, self.name)
self:T(self.lid.."Created")
return self
end
--- Create a UUID
-- @param #CLIENTMENU self
-- @param #CLIENTMENU Parent The parent object if any
-- @param #string Text The menu entry text
-- @return #string UUID
function CLIENTMENU:CreateUUID(Parent,Text)
local path = {}
if Parent and Parent.path then
path = Parent.path
end
path[#path+1] = Text
local UUID = table.concat(path,";")
return UUID
end
--- Set the CLIENTMENUMANAGER for this entry.
-- @param #CLIENTMENU self
-- @param #CLIENTMENUMANAGER Controller The controlling object.
-- @return #CLIENTMENU self
function CLIENTMENU:SetController(Controller)
self.Controller = Controller
return self
end
--- The entry will be deleted after being used used - for menu entries with functions only.
-- @param #CLIENTMENU self
-- @return #CLIENTMENU self
function CLIENTMENU:SetOnce()
self:T(self.lid.."SetOnce")
self.Once = true
return self
end
--- Remove the entry from the F10 menu.
-- @param #CLIENTMENU self
-- @return #CLIENTMENU self
function CLIENTMENU:RemoveF10()
self:T(self.lid.."RemoveF10")
if self.GroupID then
--self:I(self.lid.."Removing "..table.concat(self.path,";"))
local function RemoveFunction()
return missionCommands.removeItemForGroup(self.GroupID , self.path )
end
local status, err = pcall(RemoveFunction)
if not status then
self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
end
self.active = false
end
return self
end
--- Get the menu path table.
-- @param #CLIENTMENU self
-- @return #table Path
function CLIENTMENU:GetPath()
self:T(self.lid.."GetPath")
return self.path
end
--- Get the UUID.
-- @param #CLIENTMENU self
-- @return #string UUID
function CLIENTMENU:GetUUID()
self:T(self.lid.."GetUUID")
return self.UUID
end
--- Link a child entry.
-- @param #CLIENTMENU self
-- @param #CLIENTMENU Child The entry to link as a child.
-- @return #CLIENTMENU self
function CLIENTMENU:AddChild(Child)
self:T(self.lid.."AddChild "..Child.ID)
table.insert(self.Children,Child.ID,Child)
return self
end
--- Remove a child entry.
-- @param #CLIENTMENU self
-- @param #CLIENTMENU Child The entry to remove from the children.
-- @return #CLIENTMENU self
function CLIENTMENU:RemoveChild(Child)
self:T(self.lid.."RemoveChild "..Child.ID)
table.remove(self.Children,Child.ID)
return self
end
--- Remove all subentries (children) from this entry.
-- @param #CLIENTMENU self
-- @return #CLIENTMENU self
function CLIENTMENU:RemoveSubEntries()
self:T(self.lid.."RemoveSubEntries")
self:T({self.Children})
for _id,_entry in pairs(self.Children) do
self:T("Removing ".._id)
if _entry then
_entry:RemoveSubEntries()
_entry:RemoveF10()
if _entry.Parent then
_entry.Parent:RemoveChild(self)
end
--if self.Controller then
--self.Controller:_RemoveByID(_entry.ID)
--end
--_entry = nil
end
end
return self
end
--- Remove this entry and all subentries (children) from this entry.
-- @param #CLIENTMENU self
-- @return #CLIENTMENU self
function CLIENTMENU:Clear()
self:T(self.lid.."Clear")
for _id,_entry in pairs(self.Children) do
if _entry then
_entry:RemoveSubEntries()
_entry = nil
end
end
self:RemoveF10()
if self.Parent then
self.Parent:RemoveChild(self)
end
--if self.Controller then
--self.Controller:_RemoveByID(self.ID)
--end
return self
end
-- TODO
----------------------------------------------------------------------------------------------------------------
--
-- CLIENTMENUMANAGER
--
----------------------------------------------------------------------------------------------------------------
--- Class CLIENTMENUMANAGER
-- @type CLIENTMENUMANAGER
-- @field #string ClassName Class Name
-- @field #string lid Lid for log entries
-- @field #string version Version string
-- @field #string name Name
-- @field Core.Set#SET_CLIENT clientset The set of clients this menu manager is for
-- @field #table flattree
-- @field #table rootentries
-- @field #table menutree
-- @field #number entrycount
-- @field #boolean debug
-- @field #table PlayerMenu
-- @field #number Coalition
-- @extends Core.Base#BASE
--- *As a child my family's menu consisted of two choices: take it, or leave it.*
--
-- ===
--
-- ## CLIENTMENU and CLIENTMENUMANAGER
--
-- Manage menu structures for a SET_CLIENT of clients.
--
-- ## Concept
--
-- Separate creation of a menu tree structure from pushing it to each client. Create a shadow "reference" menu structure tree for your client pilot's in a mission.
-- This can then be propagated to all clients. Manipulate the entries in the structure with removing, clearing or changing single entries, create replacement sub-structures
-- for entries etc, push to one or all clients.
--
-- Many functions can either change the tree for one client or for all clients.
--
-- ## Conceptual remarks
--
-- There's a couple of things to fully understand:
--
-- 1) **CLIENTMENUMANAGER** manages a set of entries from **CLIENTMENU**, it's main purpose is to administer the *shadow menu tree*, ie. a menu structure which is not
-- (yet) visible to any client
-- 2) The entries are **CLIENTMENU** objects, which are linked in a tree form. There's two ways to create them:
-- A) in the manager with ":NewEntry()" which initially
-- adds it to the shadow menu **only**
-- B) stand-alone directly as `CLIENTMENU:NewEntry()` - here it depends on whether or not you gave a CLIENT object if the entry is created as generic entry or pushed
-- a **specific** client. **Be aware** though that the entries are not managed by the CLIENTMANAGER before the next step!
-- A generic entry can be added to the manager (and the shadow tree) with `:AddEntry()` - this will also push it to all clients(!) if no client is given, or a specific client only.
-- 3) Pushing only works for alive clients.
-- 4) Live and shadow tree entries are managed via the CLIENTMENUMANAGER object.
-- 5) `Propagate()`refreshes the menu tree for all, or a single client.
--
-- ## Create a base reference tree and send to all clients
--
-- local clientset = SET_CLIENT:New():FilterStart()
--
-- local menumgr = CLIENTMENUMANAGER:New(clientset,"Dayshift")
-- local mymenu = menumgr:NewEntry("Top")
-- local mymenu_lv1a = menumgr:NewEntry("Level 1 a",mymenu)
-- local mymenu_lv1b = menumgr:NewEntry("Level 1 b",mymenu)
-- -- next one is a command menu entry, which can only be used once
-- local mymenu_lv1c = menumgr:NewEntry("Action Level 1 c",mymenu, testfunction, "testtext"):SetOnce()
--
-- local mymenu_lv2a = menumgr:NewEntry("Go here",mymenu_lv1a)
-- local mymenu_lv2b = menumgr:NewEntry("Level 2 ab",mymenu_lv1a)
-- local mymenu_lv2c = menumgr:NewEntry("Level 2 ac",mymenu_lv1a)
--
-- local mymenu_lv2ba = menumgr:NewEntry("Level 2 ba",mymenu_lv1b)
-- local mymenu_lv2bb = menumgr:NewEntry("Level 2 bb",mymenu_lv1b)
-- local mymenu_lv2bc = menumgr:NewEntry("Level 2 bc",mymenu_lv1b)
--
-- local mymenu_lv3a = menumgr:NewEntry("Level 3 aaa",mymenu_lv2a)
-- local mymenu_lv3b = menumgr:NewEntry("Level 3 aab",mymenu_lv2a)
-- local mymenu_lv3c = menumgr:NewEntry("Level 3 aac",mymenu_lv2a)
--
-- menumgr:Propagate() -- propagate **once** to all clients in the SET_CLIENT
--
-- ## Remove a single entry's subtree
--
-- menumgr:RemoveSubEntries(mymenu_lv3a)
--
-- ## Remove a single entry and also it's subtree
--
-- menumgr:DeleteEntry(mymenu_lv3a)
--
-- ## Add a single entry
--
-- local baimenu = menumgr:NewEntry("BAI",mymenu_lv1b)
--
-- menumgr:AddEntry(baimenu)
--
-- ## Add an entry with a function
--
-- local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, Argument1, Argument1)
--
-- Now, the class will **automatically append the call with GROUP and CLIENT objects**, as this is can only be done when pushing the entry to the clients. So, the actual function implementation needs to look like this:
--
-- function TestFunction( Argument1, Argument2, Group, Client)
--
-- **Caveat is**, that you need to ensure your arguments are not **nil** or **false**, as LUA will optimize those away. You would end up having Group and Client in wrong places in the function call. Hence,
-- if you need/ want to send **nil** or **false**, send a place holder instead and ensure your function can handle this, e.g.
--
-- local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, "nil", Argument1)
--
-- ## Change the text of a leaf entry in the menu tree
--
-- menumgr:ChangeEntryTextForAll(mymenu_lv1b,"Attack")
--
-- ## Reset a single clients menu tree
--
-- menumgr:ResetMenu(client)
--
-- ## Reset all and clear the reference tree
--
-- menumgr:ResetMenuComplete()
--
-- ## Set to auto-propagate for CLIENTs joining the SET_CLIENT **after** the script is loaded - handy if you have a single menu tree.
--
-- menumgr:InitAutoPropagation()
--
-- @field #CLIENTMENUMANAGER
CLIENTMENUMANAGER = {
ClassName = "CLIENTMENUMANAGER",
lid = "",
version = "0.1.6",
name = nil,
clientset = nil,
menutree = {},
flattree = {},
playertree = {},
entrycount = 0,
rootentries = {},
debug = true,
PlayerMenu = {},
Coalition = nil,
}
--- Create a new ClientManager instance.
-- @param #CLIENTMENUMANAGER self
-- @param Core.Set#SET_CLIENT ClientSet The set of clients to manage.
-- @param #string Alias The name of this manager.
-- @param #number Coalition (Optional) Coalition of this Manager, defaults to coalition.side.BLUE
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:New(ClientSet, Alias, Coalition)
-- Inherit everything from FSM class.
local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENUMANAGER
self.clientset = ClientSet
self.PlayerMenu = {}
self.name = Alias or "Nightshift"
self.Coalition = Coalition or coalition.side.BLUE
-- Log id.
self.lid=string.format("CLIENTMENUMANAGER %s | %s | ", self.version, self.name)
if self.debug then
self:I(self.lid.."Created")
end
return self
end
--- [Internal] Event handling
-- @param #CLIENTMENUMANAGER self
-- @param Core.Event#EVENTDATA EventData
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:_EventHandler(EventData)
self:T(self.lid.."_EventHandler: "..EventData.id)
--self:I(self.lid.."_EventHandler: "..tostring(EventData.IniPlayerName))
if EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then
self:T(self.lid.."Leave event for player: "..tostring(EventData.IniPlayerName))
local Client = _DATABASE:FindClient( EventData.IniUnitName )
if Client then
self:ResetMenu(Client)
end
elseif (EventData.id == EVENTS.PlayerEnterAircraft) and EventData.IniCoalition == self.Coalition then
if EventData.IniPlayerName and EventData.IniGroup then
if (not self.clientset:IsIncludeObject(_DATABASE:FindClient( EventData.IniUnitName ))) then
self:T(self.lid.."Client not in SET: "..EventData.IniPlayerName)
return self
end
--self:I(self.lid.."Join event for player: "..EventData.IniPlayerName)
local player = _DATABASE:FindClient( EventData.IniUnitName )
self:Propagate(player)
end
elseif EventData.id == EVENTS.PlayerEnterUnit then
-- special for CA slots
local grp = GROUP:FindByName(EventData.IniGroupName)
if grp:IsGround() then
self:T(string.format("Player %s entered GROUND unit %s!",EventData.IniPlayerName,EventData.IniUnitName))
local IsPlayer = EventData.IniDCSUnit:getPlayerName()
if IsPlayer then
local client=_DATABASE.CLIENTS[EventData.IniDCSUnitName] --Wrapper.Client#CLIENT
-- Add client in case it does not exist already.
if not client then
-- Debug info.
self:I(string.format("Player '%s' joined ground unit '%s' of group '%s'", tostring(EventData.IniPlayerName), tostring(EventData.IniDCSUnitName), tostring(EventData.IniDCSGroupName)))
client=_DATABASE:AddClient(EventData.IniDCSUnitName)
-- Add player.
client:AddPlayer(EventData.IniPlayerName)
-- Add player.
if not _DATABASE.PLAYERS[EventData.IniPlayerName] then
_DATABASE:AddPlayer( EventData.IniUnitName, EventData.IniPlayerName )
end
-- Player settings.
local Settings = SETTINGS:Set( EventData.IniPlayerName )
Settings:SetPlayerMenu(EventData.IniUnit)
end
--local player = _DATABASE:FindClient( EventData.IniPlayerName )
self:Propagate(client)
end
end
end
return self
end
--- Set this Client Manager to auto-propagate menus **once** to newly joined players. Useful if you have **one** menu structure only. Does not automatically push follow-up changes to the client(s).
-- @param #CLIENTMENUMANAGER self
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:InitAutoPropagation()
-- Player Events
self:HandleEvent(EVENTS.PlayerLeaveUnit, self._EventHandler)
self:HandleEvent(EVENTS.Ejection, self._EventHandler)
self:HandleEvent(EVENTS.Crash, self._EventHandler)
self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
self:HandleEvent(EVENTS.PlayerEnterAircraft, self._EventHandler)
self:HandleEvent(EVENTS.PlayerEnterUnit, self._EventHandler)
self:SetEventPriority(5)
return self
end
--- Create a new entry in the **generic** structure.
-- @param #CLIENTMENUMANAGER self
-- @param #string Text Text of the F10 menu entry.
-- @param #CLIENTMENU Parent The parent menu entry.
-- @param #string Function (optional) Function to call when the entry is used.
-- @param ... (optional) Arguments for the Function, comma separated.
-- @return #CLIENTMENU Entry
function CLIENTMENUMANAGER:NewEntry(Text,Parent,Function,...)
self:T(self.lid.."NewEntry "..Text or "None")
self.entrycount = self.entrycount + 1
local entry = CLIENTMENU:NewEntry(nil,Text,Parent,Function,unpack(arg))
if not Parent then
self.rootentries[self.entrycount] = entry
end
local depth = #entry.path
if not self.menutree[depth] then self.menutree[depth] = {} end
table.insert(self.menutree[depth],entry.UUID)
self.flattree[entry.UUID] = entry
return entry
end
--- Check matching entry in the generic structure by UUID.
-- @param #CLIENTMENUMANAGER self
-- @param #string UUID UUID of the menu entry.
-- @return #boolean Exists
function CLIENTMENUMANAGER:EntryUUIDExists(UUID)
local exists = self.flattree[UUID] and true or false
return exists
end
--- Find matching entry in the generic structure by UUID.
-- @param #CLIENTMENUMANAGER self
-- @param #string UUID UUID of the menu entry.
-- @return #CLIENTMENU Entry The #CLIENTMENU object found or nil.
function CLIENTMENUMANAGER:FindEntryByUUID(UUID)
self:T(self.lid.."FindEntryByUUID "..UUID or "None")
local entry = nil
for _gid,_entry in pairs(self.flattree) do
local Entry = _entry -- #CLIENTMENU
if Entry and Entry.UUID == UUID then
entry = Entry
end
end
return entry
end
--- Find matching entries by text in the generic structure by UUID.
-- @param #CLIENTMENUMANAGER self
-- @param #string Text Text or partial text of the menu entry to find.
-- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
-- @return #table Table of matching UUIDs of #CLIENTMENU objects
-- @return #table Table of matching #CLIENTMENU objects
-- @return #number Number of matches
function CLIENTMENUMANAGER:FindUUIDsByText(Text,Parent)
self:T(self.lid.."FindUUIDsByText "..Text or "None")
local matches = {}
local entries = {}
local n = 0
for _uuid,_entry in pairs(self.flattree) do
local Entry = _entry -- #CLIENTMENU
if Parent then
if Entry and string.find(Entry.name,Text,1,true) and string.find(Entry.UUID,Parent.UUID,1,true) then
table.insert(matches,_uuid)
table.insert(entries,Entry )
n=n+1
end
else
if Entry and string.find(Entry.name,Text,1,true) then
table.insert(matches,_uuid)
table.insert(entries,Entry )
n=n+1
end
end
end
return matches, entries, n
end
--- Find matching entries in the generic structure by the menu text.
-- @param #CLIENTMENUMANAGER self
-- @param #string Text Text or partial text of the F10 menu entry.
-- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
-- @return #table Table of matching #CLIENTMENU objects.
-- @return #number Number of matches
function CLIENTMENUMANAGER:FindEntriesByText(Text,Parent)
self:T(self.lid.."FindEntriesByText "..Text or "None")
local matches, objects, number = self:FindUUIDsByText(Text, Parent)
return objects, number
end
--- Find matching entries under a parent in the generic structure by UUID.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Parent Find entries under this parent entry.
-- @return #table Table of matching UUIDs of #CLIENTMENU objects
-- @return #table Table of matching #CLIENTMENU objects
-- @return #number Number of matches
function CLIENTMENUMANAGER:FindUUIDsByParent(Parent)
self:T(self.lid.."FindUUIDsByParent")
local matches = {}
local entries = {}
local n = 0
for _uuid,_entry in pairs(self.flattree) do
local Entry = _entry -- #CLIENTMENU
if Parent then
if Entry and string.find(Entry.UUID,Parent.UUID,1,true) then
table.insert(matches,_uuid)
table.insert(entries,Entry )
n=n+1
end
end
end
return matches, entries, n
end
--- Find matching entries in the generic structure under a parent.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Parent Find entries under this parent entry.
-- @return #table Table of matching #CLIENTMENU objects.
-- @return #number Number of matches
function CLIENTMENUMANAGER:FindEntriesByParent(Parent)
self:T(self.lid.."FindEntriesByParent")
local matches, objects, number = self:FindUUIDsByParent(Parent)
return objects, number
end
--- Alter the text of a leaf entry in the generic structure and push to one specific client's F10 menu.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The menu entry.
-- @param #string Text New Text of the F10 menu entry.
-- @param Wrapper.Client#CLIENT Client (optional) The client for whom to alter the entry, if nil done for all clients.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:ChangeEntryText(Entry, Text, Client)
self:T(self.lid.."ChangeEntryText "..Text or "None")
local newentry = CLIENTMENU:NewEntry(nil,Text,Entry.Parent,Entry.Function,unpack(Entry.Functionargs))
self:DeleteF10Entry(Entry,Client)
self:DeleteGenericEntry(Entry)
if not Entry.Parent then
self.rootentries[self.entrycount] = newentry
end
local depth = #newentry.path
if not self.menutree[depth] then self.menutree[depth] = {} end
table.insert(self.menutree[depth],newentry.UUID)
self.flattree[newentry.UUID] = newentry
self:AddEntry(newentry,Client)
return self
end
--- Push the complete menu structure to each of the clients in the set - refresh the menu tree of the clients.
-- @param #CLIENTMENUMANAGER self
-- @param Wrapper.Client#CLIENT Client (optional) If given, propagate only for this client.
-- @return #CLIENTMENU Entry
function CLIENTMENUMANAGER:Propagate(Client)
self:T(self.lid.."Propagate")
--self:I(UTILS.PrintTableToLog(Client,1))
local knownunits = {} -- track so we can ID multi seated
local Set = self.clientset.Set
if Client then
Set = {Client}
end
self:ResetMenu(Client)
for _,_client in pairs(Set) do
local client = _client -- Wrapper.Client#CLIENT
if client and client:IsAlive() then
local playerunit = client:GetName()
--local playergroup = client:GetGroup()
local playername = client:GetPlayerName() or "none"
if not knownunits[playerunit] then
knownunits[playerunit] = true
else
self:I("Player in multi seat unit: "..playername)
break -- multi seat already build
end
if not self.playertree[playername] then
self.playertree[playername] = {}
end
for level,branch in pairs (self.menutree) do
self:T("Building branch:" .. level)
for _,leaf in pairs(branch) do
self:T("Building leaf:" .. leaf)
local entry = self:FindEntryByUUID(leaf)
if entry then
self:T("Found generic entry:" .. entry.UUID)
local parent = nil
if entry.Parent and entry.Parent.UUID then
parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
end
self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
self.playertree[playername][entry.UUID].Once = entry.Once
else
self:T("NO generic entry for:" .. leaf)
end
end
end
end
end
return self
end
--- Push a single previously created entry into the F10 menu structure of all clients.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The entry to add.
-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:AddEntry(Entry,Client)
self:T(self.lid.."AddEntry")
local Set = self.clientset.Set
local knownunits = {}
if Client then
Set = {Client}
end
for _,_client in pairs(Set) do
local client = _client -- Wrapper.Client#CLIENT
if client and client:IsAlive() then
local playername = client:GetPlayerName() or "None"
local unitname = client:GetName()
if not knownunits[unitname] then
knownunits[unitname] = true
else
self:I("Player in multi seat unit: "..playername)
break
end
if Entry then
self:T("Adding generic entry:" .. Entry.UUID)
local parent = nil
if not self.playertree[playername] then
self.playertree[playername] = {}
end
if Entry.Parent and Entry.Parent.UUID then
parent = self.playertree[playername][Entry.Parent.UUID] or self:FindEntryByUUID(Entry.Parent.UUID)
end
self.playertree[playername][Entry.UUID] = CLIENTMENU:NewEntry(client,Entry.name,parent,Entry.Function,unpack(Entry.Functionargs))
self.playertree[playername][Entry.UUID].Once = Entry.Once
else
self:T("NO generic entry given")
end
end
end
return self
end
--- Blank out the menu - remove **all root entries** and all entries below from the client's F10 menus, leaving the generic structure untouched.
-- @param #CLIENTMENUMANAGER self
-- @param Wrapper.Client#CLIENT Client (optional) If given, remove only for this client.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:ResetMenu(Client)
self:T(self.lid.."ResetMenu")
for _,_entry in pairs(self.rootentries) do
--local RootEntry = self.structure.generic[_entry]
if _entry then
self:DeleteF10Entry(_entry,Client)
end
end
return self
end
--- Blank out the menu - remove **all root entries** and all entries below from all clients' F10 menus, and **delete** the generic structure.
-- @param #CLIENTMENUMANAGER self
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:ResetMenuComplete()
self:T(self.lid.."ResetMenuComplete")
for _,_entry in pairs(self.rootentries) do
--local RootEntry = self.structure.generic[_entry]
if _entry then
self:DeleteF10Entry(_entry)
end
end
self.playertree = nil
self.playertree = {}
self.rootentries = nil
self.rootentries = {}
self.menutree = nil
self.menutree = {}
return self
end
--- Remove the entry and all entries below the given entry from the client's F10 menus.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The entry to remove
-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:DeleteF10Entry(Entry,Client)
self:T(self.lid.."DeleteF10Entry")
local Set = self.clientset.Set
if Client then
Set = {Client}
end
for _,_client in pairs(Set) do
if _client and _client:IsAlive() then
local playername = _client:GetPlayerName()
if self.playertree[playername] then
local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
if centry then
--self:I("Match for "..Entry.UUID)
centry:Clear()
end
end
end
end
return self
end
--- Remove the entry and all entries below the given entry from the generic tree.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The entry to remove
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:DeleteGenericEntry(Entry)
self:T(self.lid.."DeleteGenericEntry")
if Entry.Children and #Entry.Children > 0 then
self:RemoveGenericSubEntries(Entry)
end
local depth = #Entry.path
local uuid = Entry.UUID
local tbl = UTILS.DeepCopy(self.menutree)
if tbl[depth] then
for i=depth,#tbl do
--self:I("Level = "..i)
for _id,_uuid in pairs(tbl[i]) do
self:T(_uuid)
if string.find(_uuid,uuid,1,true) or _uuid == uuid then
--self:I("Match for ".._uuid)
self.menutree[i][_id] = nil
self.flattree[_uuid] = nil
end
end
end
end
return self
end
--- Remove all entries below the given entry from the generic tree.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The entry where to start. This entry stays.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:RemoveGenericSubEntries(Entry)
self:T(self.lid.."RemoveGenericSubEntries")
local depth = #Entry.path + 1
local uuid = Entry.UUID
local tbl = UTILS.DeepCopy(self.menutree)
if tbl[depth] then
for i=depth,#tbl do
self:T("Level = "..i)
for _id,_uuid in pairs(tbl[i]) do
self:T(_uuid)
if string.find(_uuid,uuid,1,true) then
self:T("Match for ".._uuid)
self.menutree[i][_id] = nil
self.flattree[_uuid] = nil
end
end
end
end
return self
end
--- Remove all entries below the given entry from the client's F10 menus.
-- @param #CLIENTMENUMANAGER self
-- @param #CLIENTMENU Entry The entry where to start. This entry stays.
-- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. In this case the generic structure will not be touched.
-- @return #CLIENTMENUMANAGER self
function CLIENTMENUMANAGER:RemoveF10SubEntries(Entry,Client)
self:T(self.lid.."RemoveSubEntries")
local Set = self.clientset.Set
if Client then
Set = {Client}
end
for _,_client in pairs(Set) do
if _client and _client:IsAlive() then
local playername = _client:GetPlayerName()
if self.playertree[playername] then
local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
centry:RemoveSubEntries()
end
end
end
return self
end
----------------------------------------------------------------------------------------------------------------
--
-- End ClientMenu
--
----------------------------------------------------------------------------------------------------------------
+3 -3
View File
@@ -79,7 +79,7 @@
do -- FSM
--- @type FSM
-- @type FSM
-- @field #string ClassName Name of the class.
-- @field Core.Scheduler#SCHEDULER CallScheduler Call scheduler.
-- @field #table options Options.
@@ -949,7 +949,7 @@ end
do -- FSM_CONTROLLABLE
--- @type FSM_CONTROLLABLE
-- @type FSM_CONTROLLABLE
-- @field Wrapper.Controllable#CONTROLLABLE Controllable
-- @extends Core.Fsm#FSM
@@ -1082,7 +1082,7 @@ end
do -- FSM_PROCESS
--- @type FSM_PROCESS
-- @type FSM_PROCESS
-- @field Tasking.Task#TASK Task
-- @extends Core.Fsm#FSM_CONTROLLABLE
+4 -4
View File
@@ -24,7 +24,7 @@
do -- Goal
--- @type GOAL
-- @type GOAL
-- @extends Core.Fsm#FSM
--- Models processes that have an objective with a defined achievement. Derived classes implement the ways how the achievements can be realized.
@@ -71,10 +71,10 @@ do -- Goal
ClassName = "GOAL",
}
--- @field #table GOAL.Players
-- @field #table GOAL.Players
GOAL.Players = {}
--- @field #number GOAL.TotalContributions
-- @field #number GOAL.TotalContributions
GOAL.TotalContributions = 0
--- GOAL Constructor.
@@ -145,7 +145,7 @@ do -- Goal
self.TotalContributions = self.TotalContributions + 1
end
--- @param #GOAL self
-- @param #GOAL self
-- @param #number Player contribution.
function GOAL:GetPlayerContribution( PlayerName )
return self.Players[PlayerName] or 0
+2 -1
View File
@@ -15,7 +15,8 @@
-- @module Core.Report
-- @image Core_Report.JPG
--- @type REPORT
---
-- @type REPORT
-- @extends Core.Base#BASE
--- Provides a handy means to create messages and reports.
@@ -1,4 +1,4 @@
--- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
---- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
--
-- ===
--
+137 -98
View File
@@ -1226,7 +1226,7 @@ end
-- @param Core.Point#COORDINATE Coordinate The position to spawn from
-- @return #SPAWN self
function SPAWN:InitPositionCoordinate(Coordinate)
self:T2( { self.SpawnTemplatePrefix, Coordinate:GetVec2()} )
--self:T2( { self.SpawnTemplatePrefix, Coordinate:GetVec2()} )
self:InitPositionVec2(Coordinate:GetVec2())
return self
end
@@ -1236,10 +1236,10 @@ end
-- @param DCS#Vec2 Vec2 The position to spawn from
-- @return #SPAWN self
function SPAWN:InitPositionVec2(Vec2)
self:T2( { self.SpawnTemplatePrefix, Vec2} )
--self:T2( { self.SpawnTemplatePrefix, Vec2} )
self.SpawnInitPosition = Vec2
self.SpawnFromNewPosition = true
self:T2("MaxGroups:"..self.SpawnMaxGroups)
--self:T2("MaxGroups:"..self.SpawnMaxGroups)
for SpawnGroupID = 1, self.SpawnMaxGroups do
self:_SetInitialPosition( SpawnGroupID )
end
@@ -1334,7 +1334,7 @@ function SPAWN:InitCleanUp( SpawnCleanUpInterval )
self.SpawnCleanUpTimeStamps = {}
local SpawnGroup, SpawnCursor = self:GetFirstAliveGroup()
self:T2( { "CleanUp Scheduler:", SpawnGroup } )
--self:T2( { "CleanUp Scheduler:", SpawnGroup } )
self.CleanUpScheduler = SCHEDULER:New( self, self._SpawnCleanUpScheduler, {}, 1, SpawnCleanUpInterval, 0.2 )
return self
@@ -1367,7 +1367,7 @@ function SPAWN:InitArray( SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY )
local SpawnYIndex = 0
for SpawnGroupID = 1, self.SpawnMaxGroups do
self:T2( { SpawnX, SpawnY, SpawnXIndex, SpawnYIndex } )
--self:T2( { SpawnX, SpawnY, SpawnXIndex, SpawnYIndex } )
self.SpawnGroups[SpawnGroupID].Visible = true
self.SpawnGroups[SpawnGroupID].Spawned = false
@@ -1391,7 +1391,7 @@ function SPAWN:InitArray( SpawnAngle, SpawnWidth, SpawnDeltaX, SpawnDeltaY )
self.SpawnGroups[SpawnGroupID].Visible = true
self:HandleEvent( EVENTS.Birth, self._OnBirth )
--self:HandleEvent( EVENTS.Dead, self._OnDeadOrCrash )
self:HandleEvent( EVENTS.Dead, self._OnDeadOrCrash )
self:HandleEvent( EVENTS.Crash, self._OnDeadOrCrash )
self:HandleEvent( EVENTS.RemoveUnit, self._OnDeadOrCrash )
self:HandleEvent( EVENTS.UnitLost, self._OnDeadOrCrash )
@@ -1591,7 +1591,7 @@ end
-- @param #string SpawnIndex The index of the group to be spawned.
-- @return Wrapper.Group#GROUP The group that was spawned. You can use this group for further actions.
function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
--[[
local set = SET_GROUP:New():FilterAlive():FilterPrefixes({self.SpawnTemplatePrefix, self.SpawnAliasPrefix}):FilterOnce()
local aliveunits = 0
set:ForEachGroupAlive(
@@ -1602,12 +1602,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
if aliveunits ~= self.AliveUnits then
self.AliveUnits = aliveunits
self:T2("***** self.AliveUnits accounting failure! Corrected! *****")
--self:T2("***** self.AliveUnits accounting failure! Corrected! *****")
end
set= nil
self:T2( { SpawnTemplatePrefix = self.SpawnTemplatePrefix, SpawnIndex = SpawnIndex, AliveUnits = self.AliveUnits, SpawnMaxGroups = self.SpawnMaxGroups } )
--]]
--self:T2( { SpawnTemplatePrefix = self.SpawnTemplatePrefix, SpawnIndex = SpawnIndex, AliveUnits = self.AliveUnits, SpawnMaxGroups = self.SpawnMaxGroups } )
if self:_GetSpawnIndex( SpawnIndex ) then
@@ -1622,12 +1622,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
local SpawnTemplate = self.SpawnGroups[self.SpawnIndex].SpawnTemplate
local SpawnZone = self.SpawnGroups[self.SpawnIndex].SpawnZone
self:T2( SpawnTemplate.name )
--self:T2( SpawnTemplate.name )
if SpawnTemplate then
local PointVec3 = POINT_VEC3:New( SpawnTemplate.route.points[1].x, SpawnTemplate.route.points[1].alt, SpawnTemplate.route.points[1].y )
self:T2( { "Current point of ", self.SpawnTemplatePrefix, PointVec3 } )
--self:T2( { "Current point of ", self.SpawnTemplatePrefix, PointVec3 } )
-- If RandomizePosition, then Randomize the formation in the zone band, keeping the template.
if self.SpawnRandomizePosition then
@@ -1639,7 +1639,7 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
for UnitID = 1, #SpawnTemplate.units do
SpawnTemplate.units[UnitID].x = SpawnTemplate.units[UnitID].x + (RandomVec2.x - CurrentX)
SpawnTemplate.units[UnitID].y = SpawnTemplate.units[UnitID].y + (RandomVec2.y - CurrentY)
self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
end
end
@@ -1660,13 +1660,13 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
end
end
if (not inZone) then
self:T2("Could not place unit within zone and within radius!")
--self:T2("Could not place unit within zone and within radius!")
RandomVec2 = SpawnZone:GetRandomVec2()
end
end
SpawnTemplate.units[UnitID].x = RandomVec2.x
SpawnTemplate.units[UnitID].y = RandomVec2.y
self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
end
end
@@ -1887,6 +1887,7 @@ end
--- Spawns new groups at varying time intervals.
-- This is useful if you want to have continuity within your missions of certain (AI) groups to be present (alive) within your missions.
-- **WARNING** - Setting a very low SpawnTime heavily impacts your mission performance and CPU time, it is NOT useful to check the alive state of an object every split second! Be reasonable and stay at 15 seconds and above!
-- @param #SPAWN self
-- @param #number SpawnTime The time interval defined in seconds between each new spawn of new groups.
-- @param #number SpawnTimeVariation The variation to be applied on the defined time interval between each new spawn.
@@ -1909,6 +1910,14 @@ function SPAWN:SpawnScheduled( SpawnTime, SpawnTimeVariation, WithDelay )
local SpawnTime = SpawnTime or 60
local SpawnTimeVariation = SpawnTimeVariation or 0.5
-- Noob catch
if SpawnTime < 15 then
self:E("****SPAWN SCHEDULED****\nWARNING - Setting a very low SpawnTime heavily impacts your mission performance and CPU time, it is NOT useful to check the alive state of an object every "..tostring(SpawnTime).." seconds.\nSetting to 15 second intervals.\n*****")
SpawnTime = 15
end
if SpawnTimeVariation > 1 or SpawnTimeVariation < 0 then SpawnTimeVariation = 0.5 end
if SpawnTime ~= nil and SpawnTimeVariation ~= nil then
local InitialDelay = 0
if WithDelay or self.DelayOnOff == true then
@@ -2024,7 +2033,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
-- Get position of airbase.
local PointVec3 = SpawnAirbase:GetCoordinate()
self:T2( PointVec3 )
--self:T2( PointVec3 )
-- Set take off type. Default is hot.
Takeoff = Takeoff or SPAWN.Takeoff.Hot
@@ -2053,7 +2062,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
--self:F( { GroupAlive = GroupAlive } )
-- Debug output
self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
--self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
-- Template group, unit and its attributes.
local TemplateGroup = GROUP:FindByName( self.SpawnTemplatePrefix )
@@ -2102,7 +2111,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
-- Check if we spawn on ground.
local spawnonground = not (Takeoff == SPAWN.Takeoff.Air)
self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
--self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
-- Check where we actually spawn if we spawn on ground.
local spawnonship = false
@@ -2156,7 +2165,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
-- Number of free parking spots at the airbase.
if spawnonship or spawnonfarp or spawnonrunway then
-- These places work procedural and have some kind of build in queue ==> Less effort.
self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
nfree = SpawnAirbase:GetFreeParkingSpotsNumber( termtype, true )
spots = SpawnAirbase:GetFreeParkingSpotsTable( termtype, true )
--[[
@@ -2169,18 +2178,18 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
if ishelo then
if termtype == nil then
-- Helo is spawned. Try exclusive helo spots first.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterOnly, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
if nfree < nunits then
-- Not enough helo ports. Let's try also other terminal types.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterUsable, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
-- No terminal type specified. We try all spots except shelters.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
@@ -2189,23 +2198,23 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
if termtype == nil then
if isbomber or istransport or istanker or isawacs then
-- First we fill the potentially bigger spots.
self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
--self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
if nfree < nunits then
-- Now we try the smaller ones.
self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
--self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenMedOrBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
--self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.FighterAircraft, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
-- Terminal type explicitly given.
self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
--self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
@@ -2215,12 +2224,12 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
-- Debug: Get parking data.
--[[
local parkingdata=SpawnAirbase:GetParkingSpotsTable(termtype)
self:T2(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
--self:T2(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
for _,_spot in pairs(parkingdata) do
self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
--self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
SpawnAirbase:GetName(), _spot.TerminalID, _spot.TerminalType,tostring(_spot.Free),tostring(_spot.TOAC),_spot.TerminalID0,_spot.DistToRwy))
end
self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
--self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
]]
-- Set this to true if not enough spots are available for emergency air start.
@@ -2315,7 +2324,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
SpawnTemplate.parked = true
for UnitID = 1, nunits do
self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
-- Template of the current unit.
local UnitTemplate = SpawnTemplate.units[UnitID]
@@ -2333,7 +2342,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
-- Ships and FARPS seem to have a build in queue.
if spawnonship or spawnonfarp or spawnonrunway then
self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
-- Spawn on ship. We take only the position of the ship.
SpawnTemplate.units[UnitID].x = PointVec3.x -- TX
@@ -2342,7 +2351,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
else
self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
--self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
-- Get coordinates of parking spot.
SpawnTemplate.units[UnitID].x = parkingspots[UnitID].x
@@ -2354,7 +2363,7 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
else
self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
-- Spawn in air as requested initially. Original template orientation is perserved, altitude is already correctly set.
SpawnTemplate.units[UnitID].x = TX
@@ -2371,9 +2380,9 @@ function SPAWN:SpawnAtAirbase( SpawnAirbase, Takeoff, TakeoffAltitude, TerminalT
end
-- Debug output.
self:T2( string.format( "Group %s unit number %d: Parking = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
self:T2( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( string.format( "Group %s unit number %d: Parking = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
--self:T2( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
--self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
end
end
@@ -2451,10 +2460,10 @@ function SPAWN:SpawnAtParkingSpot( Airbase, Spots, Takeoff )
-- Get parking spot data.
local spot = Airbase:GetParkingSpotData( TerminalID )
self:T2( { spot = spot } )
--self:T2( { spot = spot } )
if spot and spot.Free then
self:T2( string.format( "Adding parking spot ID=%d TermType=%d", spot.TerminalID, spot.TerminalType ) )
--self:T2( string.format( "Adding parking spot ID=%d TermType=%d", spot.TerminalID, spot.TerminalType ) )
table.insert( Parkingdata, spot )
end
@@ -2486,7 +2495,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- Get position of airbase.
local PointVec3 = SpawnAirbase:GetCoordinate()
self:T2( PointVec3 )
--self:T2( PointVec3 )
-- Set take off type. Default is hot.
local Takeoff = SPAWN.Takeoff.Cold
@@ -2502,7 +2511,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
local GroupAlive = self:GetGroupFromIndex( SpawnIndex )
-- Debug output
self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
--self:T2( { "Current point of ", self.SpawnTemplatePrefix, SpawnAirbase } )
-- Template group, unit and its attributes.
local TemplateGroup = GROUP:FindByName( self.SpawnTemplatePrefix )
@@ -2546,7 +2555,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- Check if we spawn on ground.
local spawnonground = not (Takeoff == SPAWN.Takeoff.Air)
self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
--self:T2( { spawnonground = spawnonground, TOtype = Takeoff, TOair = Takeoff == SPAWN.Takeoff.Air } )
-- Check where we actually spawn if we spawn on ground.
local spawnonship = false
@@ -2588,7 +2597,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- Number of free parking spots at the airbase.
if spawnonship or spawnonfarp or spawnonrunway then
-- These places work procedural and have some kind of build in queue ==> Less effort.
self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s is spawned on farp/ship/runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
nfree = SpawnAirbase:GetFreeParkingSpotsNumber( termtype, true )
spots = SpawnAirbase:GetFreeParkingSpotsTable( termtype, true )
--[[
@@ -2601,18 +2610,18 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
if ishelo then
if termtype == nil then
-- Helo is spawned. Try exclusive helo spots first.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterOnly ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterOnly, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
if nfree < nunits then
-- Not enough helo ports. Let's try also other terminal types.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.HelicopterUsable ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.HelicopterUsable, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
-- No terminal type specified. We try all spots except shelters.
self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
--self:T2( string.format( "Helo group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), termtype ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
@@ -2624,23 +2633,23 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- TODO: Some attributes are "Helicopters", "Bombers", "Transports", "Battleplanes". Need to check it out.
if isbomber or istransport then
-- First we fill the potentially bigger spots.
self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
--self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenBig ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
if nfree < nunits then
-- Now we try the smaller ones.
self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
--self:T2( string.format( "Transport/bomber group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.OpenMedOrBig ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.OpenMedOrBig, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
--self:T2( string.format( "Fighter group %s is at %s using terminal type %d.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), AIRBASE.TerminalType.FighterAircraft ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, AIRBASE.TerminalType.FighterAircraft, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
else
-- Terminal type explicitly given.
self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
--self:T2( string.format( "Plane group %s is at %s using terminal type %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), tostring( termtype ) ) )
spots = SpawnAirbase:FindFreeParkingSpotForAircraft( TemplateGroup, termtype, scanradius, scanunits, scanstatics, scanscenery, verysafe, nunits, Parkingdata )
nfree = #spots
end
@@ -2650,12 +2659,12 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- Debug: Get parking data.
--[[
local parkingdata=SpawnAirbase:GetParkingSpotsTable(termtype)
self:T2(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
--self:T2(string.format("Parking at %s, terminal type %s:", SpawnAirbase:GetName(), tostring(termtype)))
for _,_spot in pairs(parkingdata) do
self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
--self:T2(string.format("%s, Termin Index = %3d, Term Type = %03d, Free = %5s, TOAC = %5s, Term ID0 = %3d, Dist2Rwy = %4d",
SpawnAirbase:GetName(), _spot.TerminalID, _spot.TerminalType,tostring(_spot.Free),tostring(_spot.TOAC),_spot.TerminalID0,_spot.DistToRwy))
end
self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
--self:T2(string.format("%s at %s: free parking spots = %d - number of units = %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), nfree, nunits))
]]
-- Set this to true if not enough spots are available for emergency air start.
@@ -2733,7 +2742,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
-- Ships and FARPS seem to have a build in queue.
if spawnonship or spawnonfarp or spawnonrunway then
self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s spawning at farp, ship or runway %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
-- Spawn on ship. We take only the position of the ship.
SpawnTemplate.units[UnitID].x = PointVec3.x -- TX
@@ -2742,7 +2751,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
else
self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
--self:T2( string.format( "Group %s spawning at airbase %s on parking spot id %d", self.SpawnTemplatePrefix, SpawnAirbase:GetName(), parkingindex[UnitID] ) )
-- Get coordinates of parking spot.
SpawnTemplate.units[UnitID].x = parkingspots[UnitID].x
@@ -2754,7 +2763,7 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
else
self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
--self:T2( string.format( "Group %s spawning in air at %s.", self.SpawnTemplatePrefix, SpawnAirbase:GetName() ) )
-- Spawn in air as requested initially. Original template orientation is perserved, altitude is already correctly set.
SpawnTemplate.units[UnitID].x = TX
@@ -2771,9 +2780,9 @@ function SPAWN:ParkAircraft( SpawnAirbase, TerminalType, Parkingdata, SpawnIndex
end
-- Debug output.
self:T2( string.format( "Group %s unit number %d: Parking = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
self:T2( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( string.format( "Group %s unit number %d: Parking = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking ) ) )
--self:T2( string.format( "Group %s unit number %d: Parking ID = %s", self.SpawnTemplatePrefix, UnitID, tostring( UnitTemplate.parking_id ) ) )
--self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
end
end
@@ -2871,7 +2880,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
--self:F( { self.SpawnTemplatePrefix, Vec3, SpawnIndex } )
local PointVec3 = POINT_VEC3:NewFromVec3( Vec3 )
self:T2( PointVec3 )
--self:T2( PointVec3 )
if SpawnIndex then
else
@@ -2884,7 +2893,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
if SpawnTemplate then
self:T2( { "Current point of ", self.SpawnTemplatePrefix, Vec3 } )
--self:T2( { "Current point of ", self.SpawnTemplatePrefix, Vec3 } )
local TemplateHeight = SpawnTemplate.route and SpawnTemplate.route.points[1].alt or nil
@@ -2909,7 +2918,7 @@ function SPAWN:SpawnFromVec3( Vec3, SpawnIndex )
if SpawnTemplate.CategoryID ~= Group.Category.SHIP then
SpawnTemplate.units[UnitID].alt = Vec3.y or TemplateHeight
end
self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
--self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
end
SpawnTemplate.route.points[1].x = Vec3.x
SpawnTemplate.route.points[1].y = Vec3.z
@@ -3168,10 +3177,10 @@ function SPAWN:SpawnGroupName( SpawnIndex )
if SpawnIndex then
local SpawnName = string.format( '%s#%03d', SpawnPrefix, SpawnIndex )
self:T2( SpawnName )
--self:T2( SpawnName )
return SpawnName
else
self:T2( SpawnPrefix )
--self:T2( SpawnPrefix )
return SpawnPrefix
end
@@ -3499,7 +3508,7 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
if SpawnInitKeepUnitIFF == false then
UnitPrefix, Rest = string.match( SpawnTemplate.units[UnitID].name, "^([^#]+)#?" ):gsub( "^%s*(.-)%s*$", "%1" )
SpawnTemplate.units[UnitID].name = string.format( '%s#%03d-%02d', UnitPrefix, SpawnIndex, UnitID )
self:T2( { UnitPrefix, Rest } )
--self:T2( { UnitPrefix, Rest } )
--else
--UnitPrefix=SpawnTemplate.units[UnitID].name
end
@@ -3713,7 +3722,7 @@ function SPAWN:_RandomizeRoute( SpawnIndex )
SpawnTemplate.route.points[t].alt = nil
end
self:T2( 'SpawnTemplate.route.points[' .. t .. '].x = ' .. SpawnTemplate.route.points[t].x .. ', SpawnTemplate.route.points[' .. t .. '].y = ' .. SpawnTemplate.route.points[t].y )
--self:T2( 'SpawnTemplate.route.points[' .. t .. '].x = ' .. SpawnTemplate.route.points[t].x .. ', SpawnTemplate.route.points[' .. t .. '].y = ' .. SpawnTemplate.route.points[t].y )
end
end
@@ -3756,15 +3765,15 @@ end
-- @param #number SpawnIndex
-- @return #SPAWN self
function SPAWN:_SetInitialPosition( SpawnIndex )
self:T2( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
--self:T2( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnRandomizeZones } )
if self.SpawnFromNewPosition then
self:T2( "Preparing Spawn at Vec2 ", self.SpawnInitPosition )
--self:T2( "Preparing Spawn at Vec2 ", self.SpawnInitPosition )
local SpawnVec2 = self.SpawnInitPosition
self:T2( { SpawnVec2 = SpawnVec2 } )
--self:T2( { SpawnVec2 = SpawnVec2 } )
local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
@@ -3774,11 +3783,11 @@ function SPAWN:_SetInitialPosition( SpawnIndex )
SpawnTemplate.route.points[1].x = SpawnTemplate.route.points[1].x or 0
SpawnTemplate.route.points[1].y = SpawnTemplate.route.points[1].y or 0
self:T2( { Route = SpawnTemplate.route } )
--self:T2( { Route = SpawnTemplate.route } )
for UnitID = 1, #SpawnTemplate.units do
local UnitTemplate = SpawnTemplate.units[UnitID]
self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
--self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
local SX = UnitTemplate.x
local SY = UnitTemplate.y
local BX = SpawnTemplate.route.points[1].x
@@ -3789,7 +3798,7 @@ function SPAWN:_SetInitialPosition( SpawnIndex )
UnitTemplate.y = TY
-- TODO: Manage altitude based on landheight...
-- SpawnTemplate.units[UnitID].alt = SpawnVec2:
self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
--self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
end
SpawnTemplate.route.points[1].x = SpawnVec2.x
@@ -3812,26 +3821,26 @@ function SPAWN:_RandomizeZones( SpawnIndex )
if self.SpawnRandomizeZones then
local SpawnZone = nil -- Core.Zone#ZONE_BASE
while not SpawnZone do
self:T2( { SpawnZoneTableCount = #self.SpawnZoneTable, self.SpawnZoneTable } )
--self:T2( { SpawnZoneTableCount = #self.SpawnZoneTable, self.SpawnZoneTable } )
local ZoneID = math.random( #self.SpawnZoneTable )
self:T2( ZoneID )
--self:T2( ZoneID )
SpawnZone = self.SpawnZoneTable[ZoneID]:GetZoneMaybe()
end
self:T2( "Preparing Spawn in Zone", SpawnZone:GetName() )
--self:T2( "Preparing Spawn in Zone", SpawnZone:GetName() )
local SpawnVec2 = SpawnZone:GetRandomVec2()
self:T2( { SpawnVec2 = SpawnVec2 } )
--self:T2( { SpawnVec2 = SpawnVec2 } )
local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
self.SpawnGroups[SpawnIndex].SpawnZone = SpawnZone
self:T2( { Route = SpawnTemplate.route } )
--self:T2( { Route = SpawnTemplate.route } )
for UnitID = 1, #SpawnTemplate.units do
local UnitTemplate = SpawnTemplate.units[UnitID]
self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
--self:T2( 'Before Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
local SX = UnitTemplate.x
local SY = UnitTemplate.y
local BX = SpawnTemplate.route.points[1].x
@@ -3842,7 +3851,7 @@ function SPAWN:_RandomizeZones( SpawnIndex )
UnitTemplate.y = TY
-- TODO: Manage altitude based on landheight...
-- SpawnTemplate.units[UnitID].alt = SpawnVec2:
self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
--self:T2( 'After Translation SpawnTemplate.units[' .. UnitID .. '].x = ' .. UnitTemplate.x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. UnitTemplate.y )
end
SpawnTemplate.x = SpawnVec2.x
SpawnTemplate.y = SpawnVec2.y
@@ -3897,11 +3906,11 @@ end
-- @param #number SpawnIndex Spawn index.
-- @return #number self.SpawnIndex
function SPAWN:_GetSpawnIndex( SpawnIndex )
self:T2( { template=self.SpawnTemplatePrefix, SpawnIndex=SpawnIndex, SpawnMaxGroups=self.SpawnMaxGroups, SpawnMaxUnitsAlive=self.SpawnMaxUnitsAlive, AliveUnits=self.AliveUnits, TemplateUnits=#self.SpawnTemplate.units } )
--self:T2( { template=self.SpawnTemplatePrefix, SpawnIndex=SpawnIndex, SpawnMaxGroups=self.SpawnMaxGroups, SpawnMaxUnitsAlive=self.SpawnMaxUnitsAlive, AliveUnits=self.AliveUnits, TemplateUnits=#self.SpawnTemplate.units } )
if (self.SpawnMaxGroups == 0) or (SpawnIndex <= self.SpawnMaxGroups) then
if (self.SpawnMaxUnitsAlive == 0) or (self.AliveUnits + #self.SpawnTemplate.units <= self.SpawnMaxUnitsAlive) or self.UnControlled == true then
self:T2( { SpawnCount = self.SpawnCount, SpawnIndex = SpawnIndex } )
--self:T2( { SpawnCount = self.SpawnCount, SpawnIndex = SpawnIndex } )
if SpawnIndex and SpawnIndex >= self.SpawnCount + 1 then
self.SpawnCount = self.SpawnCount + 1
SpawnIndex = self.SpawnCount
@@ -3932,22 +3941,51 @@ function SPAWN:_OnBirth( EventData )
if SpawnGroup then
local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
self:T2( { "Birth Event:", EventPrefix, self.SpawnTemplatePrefix } )
--self:T2( { "Birth Event:", EventPrefix, self.SpawnTemplatePrefix } )
if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
self.AliveUnits = self.AliveUnits + 1
self:T2( "Alive Units: " .. self.AliveUnits )
--self:T2( "Alive Units: " .. self.AliveUnits )
end
end
end
end
---
-- @param #SPAWN self
-- @return #number count
function SPAWN:_CountAliveUnits()
local count = 0
if self.SpawnAliasPrefix then
if not self.SpawnAliasPrefixEscaped then self.SpawnAliasPrefixEscaped = string.gsub(self.SpawnAliasPrefix,"[%p%s]",".") end
local SpawnAliasPrefix = self.SpawnAliasPrefixEscaped
local agroups = GROUP:FindAllByMatching(SpawnAliasPrefix)
for _,_grp in pairs(agroups) do
local game = self:_GetPrefixFromGroupName(_grp.GroupName)
if game and game == self.SpawnAliasPrefix then
count = count + _grp:CountAliveUnits()
end
end
else
if not self.SpawnTemplatePrefixEscaped then self.SpawnTemplatePrefixEscaped = string.gsub(self.SpawnTemplatePrefix,"[%p%s]",".") end
local SpawnTemplatePrefix = self.SpawnTemplatePrefixEscaped
local groups = GROUP:FindAllByMatching(SpawnTemplatePrefix)
for _,_grp in pairs(groups) do
local game = self:_GetPrefixFromGroupName(_grp.GroupName)
if game and game == self.SpawnTemplatePrefix then
count = count + _grp:CountAliveUnits()
end
end
end
return count
end
---
-- @param #SPAWN self
-- @param Core.Event#EVENTDATA EventData
function SPAWN:_OnDeadOrCrash( EventData )
self:T2( "Dead or crash event ID "..tostring(EventData.id or 0))
self:T2( "Dead or crash event for "..tostring(EventData.IniUnitName or "none") )
--self:T2( "Dead or crash event ID "..tostring(EventData.id or 0))
--self:T2( "Dead or crash event for "..tostring(EventData.IniUnitName or "none") )
--if EventData.id == EVENTS.Dead then return end
@@ -3959,12 +3997,13 @@ function SPAWN:_OnDeadOrCrash( EventData )
local EventPrefix = self:_GetPrefixFromGroupName(unit.GroupName)
if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
self:T2( { "Dead event: " .. EventPrefix } )
self:T2(string.format("EventPrefix = %s | SpawnAliasPrefix = %s | Old AliveUnits = %d",EventPrefix or "",self.SpawnAliasPrefix or "",self.AliveUnits or 0))
--self:T2(string.format("EventPrefix = %s | SpawnAliasPrefix = %s | Old AliveUnits = %d",EventPrefix or "",self.SpawnAliasPrefix or "",self.AliveUnits or 0))
if EventPrefix == self.SpawnTemplatePrefix or ( self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix ) and self.AliveUnits > 0 then
self.AliveUnits = self.AliveUnits - 1
--self:I( { "Dead event: " .. EventPrefix } )
--self.AliveUnits = self.AliveUnits - 1
self.AliveUnits = self:_CountAliveUnits()
--self:I( "New Alive Units: " .. self.AliveUnits )
end
self:T2( "New Alive Units: " .. self.AliveUnits )
end
end
end
@@ -3980,9 +4019,9 @@ function SPAWN:_OnTakeOff( EventData )
if SpawnGroup then
local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
self:T2( { "TakeOff event: " .. EventPrefix } )
--self:T2( { "TakeOff event: " .. EventPrefix } )
if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
self:T2( "self.Landed = false" )
--self:T2( "self.Landed = false" )
SpawnGroup:SetState( SpawnGroup, "Spawn_Landed", false )
end
end
@@ -4000,13 +4039,13 @@ function SPAWN:_OnLand( EventData )
if SpawnGroup then
local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
self:T2( { "Land event: " .. EventPrefix } )
--self:T2( { "Land event: " .. EventPrefix } )
if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
-- TODO: Check if this is the last unit of the group that lands.
SpawnGroup:SetState( SpawnGroup, "Spawn_Landed", true )
if self.RepeatOnLanding then
local SpawnGroupIndex = self:GetSpawnIndexFromGroup( SpawnGroup )
self:T2( { "Landed:", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
--self:T2( { "Landed:", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
-- self:ReSpawn( SpawnGroupIndex )
-- Delay respawn by three seconds due to DCS 2.5.4.26368 OB bug https://github.com/FlightControl-Master/MOOSE/issues/1076
-- Bug was initially only for engine shutdown event but after ED "fixed" it, it now happens on landing events.
@@ -4029,13 +4068,13 @@ function SPAWN:_OnEngineShutDown( EventData )
if SpawnGroup then
local EventPrefix = self:_GetPrefixFromGroup( SpawnGroup )
if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
self:T2( { "EngineShutdown event: " .. EventPrefix } )
--self:T2( { "EngineShutdown event: " .. EventPrefix } )
if EventPrefix == self.SpawnTemplatePrefix or (self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix) then
-- todo: test if on the runway
local Landed = SpawnGroup:GetState( SpawnGroup, "Spawn_Landed" )
if Landed and self.RepeatOnEngineShutDown then
local SpawnGroupIndex = self:GetSpawnIndexFromGroup( SpawnGroup )
self:T2( { "EngineShutDown: ", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
--self:T2( { "EngineShutDown: ", "ReSpawn:", SpawnGroup:GetName(), SpawnGroupIndex } )
-- self:ReSpawn( SpawnGroupIndex )
-- Delay respawn by three seconds due to DCS 2.5.4 OB bug https://github.com/FlightControl-Master/MOOSE/issues/1076
SCHEDULER:New( nil, self.ReSpawn, { self, SpawnGroupIndex }, 3 )
@@ -4064,7 +4103,7 @@ function SPAWN:_SpawnCleanUpScheduler()
--self:F( { "CleanUp Scheduler:", self.SpawnTemplatePrefix } )
local SpawnGroup, SpawnCursor = self:GetFirstAliveGroup()
self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
--self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
local IsHelo = false
@@ -4081,7 +4120,7 @@ function SPAWN:_SpawnCleanUpScheduler()
self.SpawnCleanUpTimeStamps[SpawnUnitName] = self.SpawnCleanUpTimeStamps[SpawnUnitName] or {}
local Stamp = self.SpawnCleanUpTimeStamps[SpawnUnitName]
self:T2( { SpawnUnitName, Stamp } )
--self:T2( { SpawnUnitName, Stamp } )
if Stamp.Vec2 then
if (SpawnUnit:InAir() == false and SpawnUnit:GetVelocityKMH() < 1) or IsHelo then
@@ -4089,7 +4128,7 @@ function SPAWN:_SpawnCleanUpScheduler()
if (Stamp.Vec2.x == NewVec2.x and Stamp.Vec2.y == NewVec2.y) or (SpawnUnit:GetLife() <= 1) then
-- If the plane is not moving or dead , and is on the ground, assign it with a timestamp...
if Stamp.Time + self.SpawnCleanUpInterval < timer.getTime() then
self:T2( { "CleanUp Scheduler:", "ReSpawning:", SpawnGroup:GetName() } )
--self:T2( { "CleanUp Scheduler:", "ReSpawning:", SpawnGroup:GetName() } )
--self:ReSpawn( SpawnCursor )
SCHEDULER:New( nil, self.ReSpawn, { self, SpawnCursor }, 3 )
Stamp.Vec2 = nil
@@ -4118,7 +4157,7 @@ function SPAWN:_SpawnCleanUpScheduler()
SpawnGroup, SpawnCursor = self:GetNextAliveGroup( SpawnCursor )
self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
--self:T2( { "CleanUp Scheduler:", SpawnGroup, SpawnCursor } )
end
+1 -1
View File
@@ -18,7 +18,7 @@
do -- UserFlag
--- @type USERFLAG
-- @type USERFLAG
-- @field #string ClassName Name of the class
-- @field #string UserFlagName Name of the flag.
-- @extends Core.Base#BASE
+2 -2
View File
@@ -20,7 +20,7 @@
do -- Velocity
--- @type VELOCITY
-- @type VELOCITY
-- @extends Core.Base#BASE
@@ -127,7 +127,7 @@ end
do -- VELOCITY_POSITIONABLE
--- @type VELOCITY_POSITIONABLE
-- @type VELOCITY_POSITIONABLE
-- @extends Core.Base#BASE
+89 -89
View File
@@ -144,7 +144,7 @@ ZONE_BASE = {
-- @return #ZONE_BASE self
function ZONE_BASE:New( ZoneName )
local self = BASE:Inherit( self, FSM:New() )
self:F( ZoneName )
--self:F( ZoneName )
self.ZoneName = ZoneName
@@ -157,7 +157,7 @@ end
-- @param #ZONE_BASE self
-- @return #string The name of the zone.
function ZONE_BASE:GetName()
self:F2()
--self:F2()
return self.ZoneName
end
@@ -167,7 +167,7 @@ end
-- @param #string ZoneName The name of the zone.
-- @return #ZONE_BASE
function ZONE_BASE:SetName( ZoneName )
self:F2()
--self:F2()
self.ZoneName = ZoneName
end
@@ -177,7 +177,7 @@ end
-- @param DCS#Vec2 Vec2 The Vec2 to test.
-- @return #boolean true if the Vec2 is within the zone.
function ZONE_BASE:IsVec2InZone( Vec2 )
self:F2( Vec2 )
--self:F2( Vec2 )
return false
end
@@ -232,13 +232,13 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return Core.Point#POINT_VEC2 The PointVec2 of the zone.
function ZONE_BASE:GetPointVec2()
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
local Vec2 = self:GetVec2()
local PointVec2 = POINT_VEC2:NewFromVec2( Vec2 )
self:T2( { PointVec2 } )
--self:T2( { PointVec2 } )
return PointVec2
end
@@ -248,7 +248,7 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return DCS#Vec3 The Vec3 of the zone.
function ZONE_BASE:GetVec3( Height )
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
Height = Height or 0
@@ -256,7 +256,7 @@ function ZONE_BASE:GetVec3( Height )
local Vec3 = { x = Vec2.x, y = Height and Height or land.getHeight( self:GetVec2() ), z = Vec2.y }
self:T2( { Vec3 } )
--self:T2( { Vec3 } )
return Vec3
end
@@ -266,13 +266,13 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return Core.Point#POINT_VEC3 The PointVec3 of the zone.
function ZONE_BASE:GetPointVec3( Height )
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
local Vec3 = self:GetVec3( Height )
local PointVec3 = POINT_VEC3:NewFromVec3( Vec3 )
self:T2( { PointVec3 } )
--self:T2( { PointVec3 } )
return PointVec3
end
@@ -282,7 +282,7 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return Core.Point#COORDINATE The Coordinate of the zone.
function ZONE_BASE:GetCoordinate( Height ) --R2.1
self:F2(self.ZoneName)
--self:F2(self.ZoneName)
local Vec3 = self:GetVec3( Height )
@@ -363,7 +363,7 @@ end
--- Bound the zone boundaries with a tires.
-- @param #ZONE_BASE self
function ZONE_BASE:BoundZone()
self:F2()
--self:F2()
end
--- Set draw coalition of zone.
@@ -510,7 +510,7 @@ end
-- @param #ZONE_BASE self
-- @param Utilities.Utils#SMOKECOLOR SmokeColor The smoke color.
function ZONE_BASE:SmokeZone( SmokeColor )
self:F2( SmokeColor )
--self:F2( SmokeColor )
end
@@ -519,7 +519,7 @@ end
-- @param #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability.
-- @return #ZONE_BASE self
function ZONE_BASE:SetZoneProbability( ZoneProbability )
self:F( { self:GetName(), ZoneProbability = ZoneProbability } )
--self:F( { self:GetName(), ZoneProbability = ZoneProbability } )
self.ZoneProbability = ZoneProbability or 1
return self
@@ -529,7 +529,7 @@ end
-- @param #ZONE_BASE self
-- @return #number A value between 0 and 1. 0 = 0% and 1 = 100% probability.
function ZONE_BASE:GetZoneProbability()
self:F2()
--self:F2()
return self.ZoneProbability
end
@@ -560,7 +560,7 @@ end
-- -- The result should be that Zone1 would be more probable selected than Zone2.
--
function ZONE_BASE:GetZoneMaybe()
self:F2()
--self:F2()
local Randomization = math.random()
if Randomization <= self.ZoneProbability then
@@ -791,7 +791,7 @@ function ZONE_RADIUS:New( ZoneName, Vec2, Radius, DoNotRegisterZone )
-- Inherit ZONE_BASE.
local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) ) -- #ZONE_RADIUS
self:F( { ZoneName, Vec2, Radius } )
--self:F( { ZoneName, Vec2, Radius } )
self.Radius = Radius
self.Vec2 = Vec2
@@ -947,7 +947,7 @@ end
-- @param #number AddOffSet (optional) The angle to be added for the smoking start position.
-- @return #ZONE_RADIUS self
function ZONE_RADIUS:SmokeZone( SmokeColor, Points, AddHeight, AngleOffset )
self:F2( SmokeColor )
--self:F2( SmokeColor )
local Point = {}
local Vec2 = self:GetVec2()
@@ -978,7 +978,7 @@ end
-- @param #number AddHeight (optional) The height to be added for the smoke.
-- @return #ZONE_RADIUS self
function ZONE_RADIUS:FlareZone( FlareColor, Points, Azimuth, AddHeight )
self:F2( { FlareColor, Azimuth } )
--self:F2( { FlareColor, Azimuth } )
local Point = {}
local Vec2 = self:GetVec2()
@@ -1004,9 +1004,9 @@ end
-- @param #ZONE_RADIUS self
-- @return DCS#Distance The radius of the zone.
function ZONE_RADIUS:GetRadius()
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
self:T2( { self.Radius } )
--self:T2( { self.Radius } )
return self.Radius
end
@@ -1016,10 +1016,10 @@ end
-- @param DCS#Distance Radius The radius of the zone.
-- @return DCS#Distance The radius of the zone.
function ZONE_RADIUS:SetRadius( Radius )
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
self.Radius = Radius
self:T2( { self.Radius } )
--self:T2( { self.Radius } )
return self.Radius
end
@@ -1028,9 +1028,9 @@ end
-- @param #ZONE_RADIUS self
-- @return DCS#Vec2 The location of the zone.
function ZONE_RADIUS:GetVec2()
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
self:T2( { self.Vec2 } )
--self:T2( { self.Vec2 } )
return self.Vec2
end
@@ -1040,11 +1040,11 @@ end
-- @param DCS#Vec2 Vec2 The new location of the zone.
-- @return DCS#Vec2 The new location of the zone.
function ZONE_RADIUS:SetVec2( Vec2 )
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
self.Vec2 = Vec2
self:T2( { self.Vec2 } )
--self:T2( { self.Vec2 } )
return self.Vec2
end
@@ -1054,14 +1054,14 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return DCS#Vec3 The point of the zone.
function ZONE_RADIUS:GetVec3( Height )
self:F2( { self.ZoneName, Height } )
--self:F2( { self.ZoneName, Height } )
Height = Height or 0
local Vec2 = self:GetVec2()
local Vec3 = { x = Vec2.x, y = land.getHeight( self:GetVec2() ) + Height, z = Vec2.y }
self:T2( { Vec3 } )
--self:T2( { Vec3 } )
return Vec3
end
@@ -1138,7 +1138,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
self.ScanData.Units[ZoneObject] = ZoneObject
self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
--self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
end
end
@@ -1149,7 +1149,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( tostring(SceneryName), ZoneObject)
table.insert(self.ScanData.SceneryTable,self.ScanData.Scenery[SceneryType][SceneryName] )
self:T( { SCENERY = self.ScanData.Scenery[SceneryType][SceneryName] } )
--self:T( { SCENERY = self.ScanData.Scenery[SceneryType][SceneryName] } )
end
end
@@ -1409,7 +1409,7 @@ function ZONE_RADIUS:SearchZone( EvaluateFunction, ObjectCategories )
local ZoneCoord = self:GetCoordinate()
local ZoneRadius = self:GetRadius()
self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
--self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
local SphereSearch = {
id = world.VolumeType.SPHERE,
@@ -1436,7 +1436,7 @@ end
-- @param DCS#Vec2 Vec2 The location to test.
-- @return #boolean true if the location is within the zone.
function ZONE_RADIUS:IsVec2InZone( Vec2 )
self:F2( Vec2 )
--self:F2( Vec2 )
if not Vec2 then return false end
@@ -1456,7 +1456,7 @@ end
-- @param DCS#Vec3 Vec3 The point to test.
-- @return #boolean true if the point is within the zone.
function ZONE_RADIUS:IsVec3InZone( Vec3 )
self:F2( Vec3 )
--self:F2( Vec3 )
if not Vec3 then return false end
local InZone = self:IsVec2InZone( { x = Vec3.x, y = Vec3.z } )
@@ -1521,11 +1521,11 @@ end
-- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
-- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
function ZONE_RADIUS:GetRandomPointVec2( inner, outer )
self:F( self.ZoneName, inner, outer )
--self:F( self.ZoneName, inner, outer )
local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2( inner, outer ) )
self:T3( { PointVec2 } )
--self:T3( { PointVec2 } )
return PointVec2
end
@@ -1536,11 +1536,11 @@ end
-- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
-- @return DCS#Vec3 The random location within the zone.
function ZONE_RADIUS:GetRandomVec3( inner, outer )
self:F( self.ZoneName, inner, outer )
--self:F( self.ZoneName, inner, outer )
local Vec2 = self:GetRandomVec2( inner, outer )
self:T3( { x = Vec2.x, y = self.y, z = Vec2.y } )
--self:T3( { x = Vec2.x, y = self.y, z = Vec2.y } )
return { x = Vec2.x, y = self.y, z = Vec2.y }
end
@@ -1552,11 +1552,11 @@ end
-- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
-- @return Core.Point#POINT_VEC3 The @{Core.Point#POINT_VEC3} object reflecting the random 3D location within the zone.
function ZONE_RADIUS:GetRandomPointVec3( inner, outer )
self:F( self.ZoneName, inner, outer )
--self:F( self.ZoneName, inner, outer )
local PointVec3 = POINT_VEC3:NewFromVec2( self:GetRandomVec2( inner, outer ) )
self:T3( { PointVec3 } )
--self:T3( { PointVec3 } )
return PointVec3
end
@@ -1685,7 +1685,7 @@ function ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(inner,outer,distance,ma
T1=timer.getTime()
self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %.3f",tostring(found),iterations,T1-T0))
--self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %.3f",tostring(found),iterations,T1-T0))
if found then return rcoord else return nil end
@@ -1754,7 +1754,7 @@ function ZONE:New( ZoneName )
-- Create a new ZONE_RADIUS.
local self=BASE:Inherit( self, ZONE_RADIUS:New(ZoneName, {x=Zone.point.x, y=Zone.point.z}, Zone.radius, true))
self:F(ZoneName)
--self:F(ZoneName)
-- Color of zone.
self.Color={1, 0, 0, 0.15}
@@ -1824,7 +1824,7 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
self.relative_to_unit = Offset.relative_to_unit or false
end
self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )
--self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )
self.ZoneUNIT = ZoneUNIT
self.LastVec2 = ZoneUNIT:GetVec2()
@@ -1840,7 +1840,7 @@ end
-- @param #ZONE_UNIT self
-- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Unit#UNIT}location and the offset, if any.
function ZONE_UNIT:GetVec2()
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
local ZoneVec2 = self.ZoneUNIT:GetVec2()
if ZoneVec2 then
@@ -1873,7 +1873,7 @@ function ZONE_UNIT:GetVec2()
return self.LastVec2
end
self:T2( { ZoneVec2 } )
--self:T2( { ZoneVec2 } )
return nil
end
@@ -1882,7 +1882,7 @@ end
-- @param #ZONE_UNIT self
-- @return DCS#Vec2 The random location within the zone.
function ZONE_UNIT:GetRandomVec2()
self:F( self.ZoneName )
--self:F( self.ZoneName )
local RandomVec2 = {}
--local Vec2 = self.ZoneUNIT:GetVec2() -- FF: This does not take care of the new offset feature!
@@ -1896,7 +1896,7 @@ function ZONE_UNIT:GetRandomVec2()
RandomVec2.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius();
RandomVec2.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius();
self:T( { RandomVec2 } )
--self:T( { RandomVec2 } )
return RandomVec2
end
@@ -1906,7 +1906,7 @@ end
-- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
-- @return DCS#Vec3 The point of the zone.
function ZONE_UNIT:GetVec3( Height )
self:F2( self.ZoneName )
--self:F2( self.ZoneName )
Height = Height or 0
@@ -1914,7 +1914,7 @@ function ZONE_UNIT:GetVec3( Height )
local Vec3 = { x = Vec2.x, y = land.getHeight( self:GetVec2() ) + Height, z = Vec2.y }
self:T2( { Vec3 } )
--self:T2( { Vec3 } )
return Vec3
end
@@ -1940,7 +1940,7 @@ ZONE_GROUP = {
-- @return #ZONE_GROUP self
function ZONE_GROUP:New( ZoneName, ZoneGROUP, Radius )
local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetVec2(), Radius, true ) )
self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } )
--self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } )
self._.ZoneGROUP = ZoneGROUP
self._.ZoneVec2Cache = self._.ZoneGROUP:GetVec2()
@@ -1956,7 +1956,7 @@ end
-- @param #ZONE_GROUP self
-- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Group} location.
function ZONE_GROUP:GetVec2()
self:F( self.ZoneName )
--self:F( self.ZoneName )
local ZoneVec2 = nil
@@ -1967,7 +1967,7 @@ function ZONE_GROUP:GetVec2()
ZoneVec2 = self._.ZoneVec2Cache
end
self:T( { ZoneVec2 } )
--self:T( { ZoneVec2 } )
return ZoneVec2
end
@@ -1976,7 +1976,7 @@ end
-- @param #ZONE_GROUP self
-- @return DCS#Vec2 The random location of the zone based on the @{Wrapper.Group} location.
function ZONE_GROUP:GetRandomVec2()
self:F( self.ZoneName )
--self:F( self.ZoneName )
local Point = {}
local Vec2 = self._.ZoneGROUP:GetVec2()
@@ -1985,7 +1985,7 @@ function ZONE_GROUP:GetRandomVec2()
Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius();
Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius();
self:T( { Point } )
--self:T( { Point } )
return Point
end
@@ -1996,11 +1996,11 @@ end
-- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
-- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
function ZONE_GROUP:GetRandomPointVec2( inner, outer )
self:F( self.ZoneName, inner, outer )
--self:F( self.ZoneName, inner, outer )
local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
self:T3( { PointVec2 } )
--self:T3( { PointVec2 } )
return PointVec2
end
@@ -2183,7 +2183,7 @@ function ZONE_POLYGON_BASE:New( ZoneName, PointsArray )
-- Inherit ZONE_BASE.
local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) )
self:F( { ZoneName, PointsArray } )
--self:F( { ZoneName, PointsArray } )
if PointsArray then
@@ -2351,7 +2351,7 @@ end
-- @param #ZONE_POLYGON_BASE self
-- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Group} location.
function ZONE_POLYGON_BASE:GetVec2()
self:F( self.ZoneName )
--self:F( self.ZoneName )
local Bounds = self:GetBoundingSquare()
@@ -2434,9 +2434,9 @@ end
-- @param #ZONE_POLYGON_BASE self
-- @return #ZONE_POLYGON_BASE self
function ZONE_POLYGON_BASE:Flush()
self:F2()
--self:F2()
self:F( { Polygon = self.ZoneName, Coordinates = self._.Polygon } )
--self:F( { Polygon = self.ZoneName, Coordinates = self._.Polygon } )
return self
end
@@ -2455,7 +2455,7 @@ function ZONE_POLYGON_BASE:BoundZone( UnBound )
j = #self._.Polygon
while i <= #self._.Polygon do
self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
--self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2707,7 +2707,7 @@ end
-- @param #number Segments (Optional) Number of segments within boundary line. Default 10.
-- @return #ZONE_POLYGON_BASE self
function ZONE_POLYGON_BASE:SmokeZone( SmokeColor, Segments )
self:F2( SmokeColor )
--self:F2( SmokeColor )
Segments=Segments or 10
@@ -2715,7 +2715,7 @@ function ZONE_POLYGON_BASE:SmokeZone( SmokeColor, Segments )
local j=#self._.Polygon
while i <= #self._.Polygon do
self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
--self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2740,7 +2740,7 @@ end
-- @param #number AddHeight (optional) The height to be added for the smoke.
-- @return #ZONE_POLYGON_BASE self
function ZONE_POLYGON_BASE:FlareZone( FlareColor, Segments, Azimuth, AddHeight )
self:F2(FlareColor)
--self:F2(FlareColor)
Segments=Segments or 10
@@ -2750,7 +2750,7 @@ function ZONE_POLYGON_BASE:FlareZone( FlareColor, Segments, Azimuth, AddHeight )
local j=#self._.Polygon
while i <= #self._.Polygon do
self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
--self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2773,7 +2773,7 @@ end
-- @param DCS#Vec2 Vec2 The location to test.
-- @return #boolean true if the location is within the zone.
function ZONE_POLYGON_BASE:IsVec2InZone( Vec2 )
self:F2( Vec2 )
--self:F2( Vec2 )
if not Vec2 then return false end
local Next
local Prev
@@ -2783,18 +2783,18 @@ function ZONE_POLYGON_BASE:IsVec2InZone( Vec2 )
Prev = #self._.Polygon
while Next <= #self._.Polygon do
self:T( { Next, Prev, self._.Polygon[Next], self._.Polygon[Prev] } )
--self:T( { Next, Prev, self._.Polygon[Next], self._.Polygon[Prev] } )
if ( ( ( self._.Polygon[Next].y > Vec2.y ) ~= ( self._.Polygon[Prev].y > Vec2.y ) ) and
( Vec2.x < ( self._.Polygon[Prev].x - self._.Polygon[Next].x ) * ( Vec2.y - self._.Polygon[Next].y ) / ( self._.Polygon[Prev].y - self._.Polygon[Next].y ) + self._.Polygon[Next].x )
) then
InPolygon = not InPolygon
end
self:T2( { InPolygon = InPolygon } )
--self:T2( { InPolygon = InPolygon } )
Prev = Next
Next = Next + 1
end
self:T( { InPolygon = InPolygon } )
--self:T( { InPolygon = InPolygon } )
return InPolygon
end
@@ -2803,7 +2803,7 @@ end
-- @param DCS#Vec3 Vec3 The point to test.
-- @return #boolean true if the point is within the zone.
function ZONE_POLYGON_BASE:IsVec3InZone( Vec3 )
self:F2( Vec3 )
--self:F2( Vec3 )
if not Vec3 then return false end
@@ -2838,11 +2838,11 @@ end
-- @param #ZONE_POLYGON_BASE self
-- @return @{Core.Point#POINT_VEC2}
function ZONE_POLYGON_BASE:GetRandomPointVec2()
self:F2()
--self:F2()
local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
self:T2( PointVec2 )
--self:T2( PointVec2 )
return PointVec2
end
@@ -2851,11 +2851,11 @@ end
-- @param #ZONE_POLYGON_BASE self
-- @return @{Core.Point#POINT_VEC3}
function ZONE_POLYGON_BASE:GetRandomPointVec3()
self:F2()
--self:F2()
local PointVec3 = POINT_VEC3:NewFromVec2( self:GetRandomVec2() )
self:T2( PointVec3 )
--self:T2( PointVec3 )
return PointVec3
end
@@ -2865,11 +2865,11 @@ end
-- @param #ZONE_POLYGON_BASE self
-- @return Core.Point#COORDINATE
function ZONE_POLYGON_BASE:GetRandomCoordinate()
self:F2()
--self:F2()
local Coordinate = COORDINATE:NewFromVec2( self:GetRandomVec2() )
self:T2( Coordinate )
--self:T2( Coordinate )
return Coordinate
end
@@ -2886,7 +2886,7 @@ function ZONE_POLYGON_BASE:GetBoundingSquare()
local y2 = self._.Polygon[1].y
for i = 2, #self._.Polygon do
self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
--self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
x1 = ( x1 > self._.Polygon[i].x ) and self._.Polygon[i].x or x1
x2 = ( x2 < self._.Polygon[i].x ) and self._.Polygon[i].x or x2
y1 = ( y1 > self._.Polygon[i].y ) and self._.Polygon[i].y or y1
@@ -2909,7 +2909,7 @@ function ZONE_POLYGON_BASE:GetBoundingVec2()
local y2 = self._.Polygon[1].y
for i = 2, #self._.Polygon do
self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
--self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
x1 = ( x1 > self._.Polygon[i].x ) and self._.Polygon[i].x or x1
x2 = ( x2 < self._.Polygon[i].x ) and self._.Polygon[i].x or x2
y1 = ( y1 > self._.Polygon[i].y ) and self._.Polygon[i].y or y1
@@ -2948,7 +2948,7 @@ function ZONE_POLYGON_BASE:Boundary(Coalition, Color, Radius, Alpha, Segments, C
Limit = #self._.Polygon
end
while i <= #self._.Polygon do
self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
--self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
if j ~= Limit then
local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -3019,7 +3019,7 @@ function ZONE_POLYGON:New( ZoneName, ZoneGroup )
local GroupPoints = ZoneGroup:GetTaskRoute()
local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( ZoneName, GroupPoints ) )
self:F( { ZoneName, ZoneGroup, self._.Polygon } )
--self:F( { ZoneName, ZoneGroup, self._.Polygon } )
-- Zone objects are added to the _DATABASE and SET_ZONE objects.
_EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3035,7 +3035,7 @@ end
function ZONE_POLYGON:NewFromPointsArray( ZoneName, PointsArray )
local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( ZoneName, PointsArray ) )
self:F( { ZoneName, self._.Polygon } )
--self:F( { ZoneName, self._.Polygon } )
-- Zone objects are added to the _DATABASE and SET_ZONE objects.
_EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3055,7 +3055,7 @@ function ZONE_POLYGON:NewFromGroupName( GroupName )
local GroupPoints = ZoneGroup:GetTaskRoute()
local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( GroupName, GroupPoints ) )
self:F( { GroupName, ZoneGroup, self._.Polygon } )
--self:F( { GroupName, ZoneGroup, self._.Polygon } )
-- Zone objects are added to the _DATABASE and SET_ZONE objects.
_EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3221,7 +3221,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
self.ScanData.Units[ZoneObject] = ZoneObject
self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
--self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
end
end
@@ -3232,7 +3232,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( SceneryName, ZoneObject )
table.insert(self.ScanData.SceneryTable,self.ScanData.Scenery[SceneryType][SceneryName])
self:T( { SCENERY = self.ScanData.Scenery[SceneryType][SceneryName] } )
--self:T( { SCENERY = self.ScanData.Scenery[SceneryType][SceneryName] } )
end
end
@@ -3573,7 +3573,7 @@ do -- ZONE_ELASTIC
function ZONE_ELASTIC:Update(Delay, Draw)
-- Debug info.
self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
--self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
-- Copy all points.
local points=UTILS.DeepCopy(self.points or {})
@@ -3987,7 +3987,7 @@ do -- ZONE_AIRBASE
-- @param #ZONE_AIRBASE self
-- @return DCS#Vec2 The location of the zone based on the AIRBASE location.
function ZONE_AIRBASE:GetVec2()
self:F( self.ZoneName )
--self:F( self.ZoneName )
local ZoneVec2 = nil
@@ -3998,7 +3998,7 @@ do -- ZONE_AIRBASE
ZoneVec2 = self._.ZoneVec2Cache
end
self:T( { ZoneVec2 } )
--self:T( { ZoneVec2 } )
return ZoneVec2
end
@@ -4009,11 +4009,11 @@ do -- ZONE_AIRBASE
-- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
-- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
function ZONE_AIRBASE:GetRandomPointVec2( inner, outer )
self:F( self.ZoneName, inner, outer )
--self:F( self.ZoneName, inner, outer )
local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
self:T3( { PointVec2 } )
--self:T3( { PointVec2 } )
return PointVec2
end
@@ -2,7 +2,8 @@
-- @module Core.Zone_Detection
-- @image MOOSE.JPG
--- @type ZONE_DETECTION
---
-- @type ZONE_DETECTION
-- @field DCS#Vec2 Vec2 The current location of the zone.
-- @field DCS#Distance Radius The radius of the zone.
-- @extends #ZONE_BASE
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,806 @@
--- **Functional** -- Send a truck to supply artillery groups.
--
-- ===
--
-- **AMMOTRUCK** - Send a truck to supply artillery groups.
--
-- ===
--
-- ## Missions:
--
-- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/AmmoTruck)
--
-- ===
--
-- ### Author : **applevangelist**
--
-- @module Functional.AmmoTruck
-- @image Artillery.JPG
--
-- Last update: July 2023
-------------------------------------------------------------------------
--- **AMMOTRUCK** class, extends Core.Fsm#FSM
-- @type AMMOTRUCK
-- @field #string ClassName Class Name
-- @field #string lid Lid for log entries
-- @field #string version Version string
-- @field #string alias Alias name
-- @field #boolean debug Debug flag
-- @field #table trucklist List of (alive) #AMMOTRUCK.data trucks
-- @field #table targetlist List of (alive) #AMMOTRUCK.data artillery
-- @field #number coalition Coalition this is for
-- @field Core.Set#SET_GROUP truckset SET of trucks
-- @field Core.Set#SET_GROUP targetset SET of artillery
-- @field #table remunitionqueue List of (alive) #AMMOTRUCK.data artillery to be reloaded
-- @field #table waitingtargets List of (alive) #AMMOTRUCK.data artillery waiting
-- @field #number ammothreshold Threshold (min) ammo before sending a truck
-- @field #number remunidist Max distance trucks will go
-- @field #number monitor Monitor interval in seconds
-- @field #number unloadtime Unload time in seconds
-- @field #number waitingtime Max waiting time in seconds
-- @field #boolean routeonroad Route truck on road if true (default)
-- @field #number reloads Number of reloads a single truck can do before he must return home
-- @extends Core.Fsm#FSM
--- *Amateurs talk about tactics, but professionals study logistics.* - General Robert H Barrow, USMC
--
-- Simple Class to re-arm your artillery with trucks.
--
-- #AMMOTRUCK
--
-- * Controls a SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition.
--
-- ## 1 The AMMOTRUCK concept
--
-- A SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition. They will be based on a
-- homebase and drive from there to the artillery groups and then back home.
-- Trucks are the **only known in-game mechanic** to re-arm artillery and other units in DCS. Working units are e.g.: M-939 (blue), Ural-375 and ZIL-135 (both red).
--
-- ## 2 Set-up
--
-- Define a set of trucks and a set of artillery:
--
-- local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
-- local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
--
-- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:
--
-- local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone")
--
-- ## 2 Options and their default values
--
-- ammotruck.ammothreshold = 5 -- send a truck when down to this many rounds
-- ammotruck.remunidist = 20000 -- 20km - send trucks max this far from home
-- ammotruck.unloadtime = 600 -- 10 minutes - min time to unload ammunition
-- ammotruck.waitingtime = 1800 -- 30 mintes - wait max this long until remunition is done
-- ammotruck.monitor = -60 -- 1 minute - AMMOTRUCK checks run every one minute
-- ammotruck.routeonroad = true -- Trucks will **try** to drive on roads
-- ammotruck.usearmygroup = false -- If true, will make use of ARMYGROUP in the background (if used in DEV branch)
-- ammotruck.reloads = 5 -- Maxn re-arms a truck can do before he needs to go home and restock. Set to -1 for unlimited
--
-- ## 3 FSM Events to shape mission
--
-- Truck has been sent off:
--
-- function ammotruck:OnAfterRouteTruck(From, Event, To, Truckdata, Aridata)
-- ...
-- end
--
-- Truck has arrived:
--
-- function ammotruck:OnAfterTruckArrived(From, Event, To, Truckdata)
-- ...
-- end
--
-- Truck is unloading:
--
-- function ammotruck:OnAfterTruckUnloading(From, Event, To, Truckdata)
-- ...
-- end
--
-- Truck is returning home:
--
-- function ammotruck:OnAfterTruckReturning(From, Event, To, Truckdata)
-- ...
-- end
--
-- Truck is arrived at home:
--
-- function ammotruck:OnAfterTruckHome(From, Event, To, Truckdata)
-- ...
-- end
--
-- @field #AMMOTRUCK
AMMOTRUCK = {
ClassName = "AMMOTRUCK",
lid = "",
version = "0.0.12",
alias = "",
debug = false,
trucklist = {},
targetlist = {},
coalition = nil,
truckset = nil,
targetset = nil,
remunitionqueue = {},
waitingtargets = {},
ammothreshold = 5,
remunidist = 20000,
monitor = -60,
unloadtime = 600,
waitingtime = 1800,
routeonroad = true,
reloads = 5,
}
---
-- @type AMMOTRUCK.State
AMMOTRUCK.State = {
IDLE = "idle",
DRIVING = "driving",
ARRIVED = "arrived",
UNLOADING = "unloading",
RETURNING = "returning",
WAITING = "waiting",
RELOADING = "reloading",
OUTOFAMMO = "outofammo",
REQUESTED = "requested",
}
---
--@type AMMOTRUCK.data
--@field Wrapper.Group#GROUP group
--@field #string name
--@field #AMMOTRUCK.State statusquo
--@field #number timestamp
--@field #number ammo
--@field Core.Point#COORDINATE coordinate
--@field #string targetname
--@field Wrapper.Group#GROUP targetgroup
--@field Core.Point#COORDINATE targetcoordinate
--@field #number reloads
---
-- @param #AMMOTRUCK self
-- @param Core.Set#SET_GROUP Truckset Set of truck groups
-- @param Core.Set#SET_GROUP Targetset Set of artillery groups
-- @param #number Coalition Coalition
-- @param #string Alias Alias Name
-- @param Core.Zone#ZONE Homezone Home, return zone for trucks
-- @return #AMMOTRUCK self
-- @usage
-- Define a set of trucks and a set of artillery:
-- local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
-- local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
--
-- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:
-- local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone")
function AMMOTRUCK:New(Truckset,Targetset,Coalition,Alias,Homezone)
-- Inherit everything from BASE class.
local self=BASE:Inherit(self, FSM:New()) -- #AMMOTRUCK
self.truckset = Truckset -- Core.Set#SET_GROUP
self.targetset = Targetset -- Core.Set#SET_GROUP
self.coalition = Coalition -- #number
self.alias = Alias -- #string
self.debug = false
self.remunitionqueue = {}
self.trucklist = {}
self.targetlist = {}
self.ammothreshold = 5
self.remunidist = 20000
self.homezone = Homezone -- Core.Zone#ZONE
self.waitingtime = 1800
self.usearmygroup = false
self.hasarmygroup = false
-- Log id.
self.lid=string.format("AMMOTRUCK %s | %s | ", self.version, self.alias)
self:SetStartState("Stopped")
self:AddTransition("Stopped", "Start", "Running")
self:AddTransition("*", "Monitor", "*")
self:AddTransition("*", "RouteTruck", "*")
self:AddTransition("*", "TruckArrived", "*")
self:AddTransition("*", "TruckUnloading", "*")
self:AddTransition("*", "TruckReturning", "*")
self:AddTransition("*", "TruckHome", "*")
self:AddTransition("*", "Stop", "Stopped")
self:__Start(math.random(5,10))
self:I(self.lid .. "Started")
------------------------
--- Pseudo Functions ---
------------------------
--- Triggers the FSM event "Stop". Stops the AMMOTRUCK and all its event handlers.
-- @function [parent=#AMMOTRUCK] Stop
-- @param #AMMOTRUCK self
--- Triggers the FSM event "Stop" after a delay. Stops the AMMOTRUCK and all its event handlers.
-- @function [parent=#AMMOTRUCK] __Stop
-- @param #AMMOTRUCK self
-- @param #number delay Delay in seconds.
--- On after "RouteTruck" event.
-- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
-- @param #AMMOTRUCK self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param #AMMOTRUCK.data Truck
-- @param #AMMOTRUCK.data Artillery
--- On after "TruckUnloading" event.
-- @function [parent=#AMMOTRUCK] OnAfterTruckUnloading
-- @param #AMMOTRUCK self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param #AMMOTRUCK.data Truck
--- On after "TruckReturning" event.
-- @function [parent=#AMMOTRUCK] OnAfterTruckReturning
-- @param #AMMOTRUCK self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param #AMMOTRUCK.data Truck
--- On after "RouteTruck" event.
-- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
-- @param #AMMOTRUCK self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param #AMMOTRUCK.data Truck
--- On after "TruckHome" event.
-- @function [parent=#AMMOTRUCK] OnAfterTruckHome
-- @param #AMMOTRUCK self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param #AMMOTRUCK.data Truck
return self
end
---
-- @param #AMMOTRUCK self
-- @param #table dataset table of #AMMOTRUCK.data entries
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckDrivingTrucks(dataset)
self:T(self.lid .. " CheckDrivingTrucks")
local data = dataset
for _,_data in pairs (data) do
local truck = _data -- #AMMOTRUCK.data
-- see if we arrived at destination
local coord = truck.group:GetCoordinate()
local tgtcoord = truck.targetcoordinate
local dist = coord:Get2DDistance(tgtcoord)
if dist <= 150 then
-- arrived
truck.statusquo = AMMOTRUCK.State.ARRIVED
truck.timestamp = timer.getAbsTime()
truck.coordinate = coord
self:__TruckArrived(1,truck)
end
-- still driving?
local Tnow = timer.getAbsTime()
if Tnow - truck.timestamp > 30 then
local group = truck.group
if self.usearmygroup then
group = truck.group:GetGroup()
end
local currspeed = group:GetVelocityKMH()
if truck.lastspeed then
if truck.lastspeed == 0 and currspeed == 0 then
self:T(truck.group:GetName().." Is not moving!")
-- try and move it
truck.timestamp = timer.getAbsTime()
if self.routeonroad then
group:RouteGroundOnRoad(truck.targetcoordinate,30,2,"Vee")
else
group:RouteGroundTo(truck.targetcoordinate,30,"Vee",2)
end
end
truck.lastspeed = currspeed
else
truck.lastspeed = currspeed
truck.timestamp = timer.getAbsTime()
end
self:I({truck=truck.group:GetName(),currspeed=currspeed,lastspeed=truck.lastspeed})
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param Wrapper.Group#GROUP Group
-- @return #AMMOTRUCK self
function AMMOTRUCK:GetAmmoStatus(Group)
local ammotot, shells, rockets, bombs, missiles, narti = Group:GetAmmunition()
return rockets+missiles+narti
end
---
-- @param #AMMOTRUCK self
-- @param #table dataset table of #AMMOTRUCK.data entries
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckWaitingTargets(dataset)
self:T(self.lid .. " CheckWaitingTargets")
local data = dataset
for _,_data in pairs (data) do
local truck = _data -- #AMMOTRUCK.data
-- see how long we're waiting - maybe ammo truck is dead?
local Tnow = timer.getAbsTime()
local Tdiff = Tnow - truck.timestamp
if Tdiff > self.waitingtime then
local hasammo = self:GetAmmoStatus(truck.group)
if hasammo <= self.ammothreshold then
truck.statusquo = AMMOTRUCK.State.OUTOFAMMO
else
truck.statusquo = AMMOTRUCK.State.IDLE
end
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #table dataset table of #AMMOTRUCK.data entries
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckReturningTrucks(dataset)
self:T(self.lid .. " CheckReturningTrucks")
local data = dataset
local tgtcoord = self.homezone:GetCoordinate()
local radius = self.homezone:GetRadius()
for _,_data in pairs (data) do
local truck = _data -- #AMMOTRUCK.data
-- see if we arrived at destination
local coord = truck.group:GetCoordinate()
local dist = coord:Get2DDistance(tgtcoord)
self:T({name=truck.name,radius=radius,distance=dist})
if dist <= radius then
-- arrived
truck.statusquo = AMMOTRUCK.State.IDLE
truck.timestamp = timer.getAbsTime()
truck.coordinate = coord
truck.reloads = self.reloads or 5
self:__TruckHome(1,truck)
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string name Artillery group name to find
-- @return #AMMOTRUCK.data Data
function AMMOTRUCK:FindTarget(name)
self:T(self.lid .. " FindTarget")
local data = nil
local dataset = self.targetlist
for _,_entry in pairs(dataset) do
local entry = _entry -- #AMMOTRUCK.data
if entry.name == name then
data = entry
break
end
end
return data
end
---
-- @param #AMMOTRUCK self
-- @param #string name Truck group name to find
-- @return #AMMOTRUCK.data Data
function AMMOTRUCK:FindTruck(name)
self:T(self.lid .. " FindTruck")
local data = nil
local dataset = self.trucklist
for _,_entry in pairs(dataset) do
local entry = _entry -- #AMMOTRUCK.data
if entry.name == name then
data = entry
break
end
end
return data
end
---
-- @param #AMMOTRUCK self
-- @param #table dataset table of #AMMOTRUCK.data entries
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckArrivedTrucks(dataset)
self:T(self.lid .. " CheckArrivedTrucks")
local data = dataset
for _,_data in pairs (data) do
-- set to unloading
local truck = _data -- #AMMOTRUCK.data
truck.statusquo = AMMOTRUCK.State.UNLOADING
truck.timestamp = timer.getAbsTime()
self:__TruckUnloading(2,truck)
-- set target to reloading
local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
if aridata then
aridata.statusquo = AMMOTRUCK.State.RELOADING
aridata.timestamp = timer.getAbsTime()
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #table dataset table of #AMMOTRUCK.data entries
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckUnloadingTrucks(dataset)
self:T(self.lid .. " CheckUnloadingTrucks")
local data = dataset
for _,_data in pairs (data) do
-- check timestamp
local truck = _data -- #AMMOTRUCK.data
local Tnow = timer.getAbsTime()
local Tpassed = Tnow - truck.timestamp
local hasammo = self:GetAmmoStatus(truck.targetgroup)
if Tpassed > self.unloadtime and hasammo > self.ammothreshold then
truck.statusquo = AMMOTRUCK.State.RETURNING
truck.timestamp = timer.getAbsTime()
self:__TruckReturning(2,truck)
-- set target to reloaded
local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
if aridata then
aridata.statusquo = AMMOTRUCK.State.IDLE
aridata.timestamp = timer.getAbsTime()
end
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckTargetsAlive()
self:T(self.lid .. " CheckTargetsAlive")
local arilist = self.targetlist
for _,_ari in pairs(arilist) do
local ari = _ari -- #AMMOTRUCK.data
if ari.group and ari.group:IsAlive() then
-- everything fine
else
-- ari dead
self.targetlist[ari.name] = nil
end
end
-- new arrivals?
local aritable = self.targetset:GetSetObjects() --#table
for _,_ari in pairs(aritable) do
local ari = _ari -- Wrapper.Group#GROUP
if ari and ari:IsAlive() and not self.targetlist[ari:GetName()] then
local name = ari:GetName()
local newari = {} -- #AMMOTRUCK.data
newari.name = name
newari.group = ari
newari.statusquo = AMMOTRUCK.State.IDLE
newari.timestamp = timer.getAbsTime()
newari.coordinate = ari:GetCoordinate()
local hasammo = self:GetAmmoStatus(ari)
--newari.ammo = ari:GetAmmunition()
newari.ammo = hasammo
self.targetlist[name] = newari
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @return #AMMOTRUCK self
function AMMOTRUCK:CheckTrucksAlive()
self:T(self.lid .. " CheckTrucksAlive")
local trucklist = self.trucklist
for _,_truck in pairs(trucklist) do
local truck = _truck -- #AMMOTRUCK.data
if truck.group and truck.group:IsAlive() then
-- everything fine
else
-- truck dead
local tgtname = truck.targetname
local targetdata = self:FindTarget(tgtname) -- #AMMOTRUCK.data
if targetdata then
if targetdata.statusquo ~= AMMOTRUCK.State.IDLE then
targetdata.statusquo = AMMOTRUCK.State.IDLE
end
end
self.trucklist[truck.name] = nil
end
end
-- new arrivals?
local trucktable = self.truckset:GetSetObjects() --#table
for _,_truck in pairs(trucktable) do
local truck = _truck -- Wrapper.Group#GROUP
if truck and truck:IsAlive() and not self.trucklist[truck:GetName()] then
local name = truck:GetName()
local newtruck = {} -- #AMMOTRUCK.data
newtruck.name = name
newtruck.group = truck
if self.hasarmygroup then
-- is (not) already ARMYGROUP?
if truck.ClassName and truck.ClassName == "GROUP" then
local trucker = ARMYGROUP:New(truck)
trucker:Activate()
newtruck.group = trucker
end
end
newtruck.statusquo = AMMOTRUCK.State.IDLE
newtruck.timestamp = timer.getAbsTime()
newtruck.coordinate = truck:GetCoordinate()
newtruck.reloads = self.reloads or 5
self.trucklist[name] = newtruck
end
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterStart(From, Event, To)
self:T({From, Event, To})
if ARMYGROUP and self.usearmygroup then
self.hasarmygroup = true
else
self.hasarmygroup = false
end
if self.debug then
BASE:TraceOn()
BASE:TraceClass("AMMOTRUCK")
end
self:CheckTargetsAlive()
self:CheckTrucksAlive()
self:__Monitor(-30)
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterMonitor(From, Event, To)
self:T({From, Event, To})
self:CheckTargetsAlive()
self:CheckTrucksAlive()
-- update ammo state
local remunition = false
local remunitionqueue = {}
local waitingtargets = {}
for _,_ari in pairs(self.targetlist) do
local data = _ari -- #AMMOTRUCK.data
if data.group and data.group:IsAlive() then
data.ammo = self:GetAmmoStatus(data.group)
data.timestamp = timer.getAbsTime()
local text = string.format("Ari %s | Ammo %d | State %s",data.name,data.ammo,data.statusquo)
self:T(text)
if data.ammo <= self.ammothreshold and (data.statusquo == AMMOTRUCK.State.IDLE or data.statusquo == AMMOTRUCK.State.OUTOFAMMO) then
-- add to remu queue
data.statusquo = AMMOTRUCK.State.OUTOFAMMO
remunitionqueue[#remunitionqueue+1] = data
remunition = true
elseif data.statusquo == AMMOTRUCK.State.WAITING then
waitingtargets[#waitingtargets+1] = data
end
else
self.targetlist[data.name] = nil
end
end
-- sort trucks in buckets
local idletrucks = {}
local drivingtrucks = {}
local unloadingtrucks = {}
local arrivedtrucks = {}
local returningtrucks = {}
local found = false
for _,_truckdata in pairs(self.trucklist) do
local data = _truckdata -- #AMMOTRUCK.data
if data.group and data.group:IsAlive() then
-- check state
local text = string.format("Truck %s | State %s",data.name,data.statusquo)
self:T(text)
if data.statusquo == AMMOTRUCK.State.IDLE then
idletrucks[#idletrucks+1] = data
found = true
elseif data.statusquo == AMMOTRUCK.State.DRIVING then
drivingtrucks[#drivingtrucks+1] = data
elseif data.statusquo == AMMOTRUCK.State.ARRIVED then
arrivedtrucks[#arrivedtrucks+1] = data
elseif data.statusquo == AMMOTRUCK.State.UNLOADING then
unloadingtrucks[#unloadingtrucks+1] = data
elseif data.statusquo == AMMOTRUCK.State.RETURNING then
returningtrucks[#returningtrucks+1] = data
if data.reloads > 0 or data.reloads == -1 then
idletrucks[#idletrucks+1] = data
found = true
end
end
else
self.truckset[data.name] = nil
end
end
-- see if we can/need route one
local n=0
if found and remunition then
-- match
--local match = false
for _,_truckdata in pairs(idletrucks) do
local truckdata = _truckdata -- #AMMOTRUCK.data
local truckcoord = truckdata.group:GetCoordinate() -- Core.Point#COORDINATE
for _,_aridata in pairs(remunitionqueue) do
local aridata = _aridata -- #AMMOTRUCK.data
local aricoord = aridata.coordinate
local distance = truckcoord:Get2DDistance(aricoord)
if distance <= self.remunidist and aridata.statusquo == AMMOTRUCK.State.OUTOFAMMO and n <= #idletrucks then
n = n + 1
aridata.statusquo = AMMOTRUCK.State.REQUESTED
self:__RouteTruck(n*5,truckdata,aridata)
break
end
end
end
end
-- check driving trucks
if #drivingtrucks > 0 then
self:CheckDrivingTrucks(drivingtrucks)
end
-- check arrived trucks
if #arrivedtrucks > 0 then
self:CheckArrivedTrucks(arrivedtrucks)
end
-- check unloading trucks
if #unloadingtrucks > 0 then
self:CheckUnloadingTrucks(unloadingtrucks)
end
-- check returningtrucks trucks
if #returningtrucks > 0 then
self:CheckReturningTrucks(returningtrucks)
end
-- check waiting targets
if #waitingtargets > 0 then
self:CheckWaitingTargets(waitingtargets)
end
self:__Monitor(self.monitor)
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @param #AMMOTRUCK.data Truckdata
-- @param #AMMOTRUCK.data Aridata
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterRouteTruck(From, Event, To, Truckdata, Aridata)
self:T({From, Event, To, Truckdata.name, Aridata.name})
local truckdata = Truckdata -- #AMMOTRUCK.data
local aridata = Aridata -- #AMMOTRUCK.data
local tgtgrp = aridata.group
local tgtzone = ZONE_GROUP:New(aridata.name,tgtgrp,30)
local tgtcoord = tgtzone:GetRandomCoordinate(15)
if self.hasarmygroup then
local mission = AUFTRAG:NewONGUARD(tgtcoord)
local oldmission = truckdata.group:GetMissionCurrent()
if oldmission then oldmission:Cancel() end
mission:SetTime(5)
mission:SetTeleport(false)
truckdata.group:AddMission(mission)
elseif self.routeonroad then
truckdata.group:RouteGroundOnRoad(tgtcoord,30)
else
truckdata.group:RouteGroundTo(tgtcoord,30)
end
truckdata.statusquo = AMMOTRUCK.State.DRIVING
truckdata.targetgroup = tgtgrp
truckdata.targetname = aridata.name
truckdata.targetcoordinate = tgtcoord
aridata.statusquo = AMMOTRUCK.State.WAITING
aridata.timestamp = timer.getAbsTime()
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @param #AMMOTRUCK.data Truckdata
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterTruckUnloading(From, Event, To, Truckdata)
local m = MESSAGE:New("Truck "..Truckdata.name.." unloading!",15,"AmmoTruck"):ToCoalitionIf(self.coalition,self.debug)
local truck = Truckdata -- Functional.AmmoTruck#AMMOTRUCK.data
local coord = truck.group:GetCoordinate()
local heading = truck.group:GetHeading()
heading = heading < 180 and (360-heading) or (heading - 180)
local cid = self.coalition == coalition.side.BLUE and country.id.USA or country.id.RUSSIA
cid = self.coalition == coalition.side.NEUTRAL and country.id.UN_PEACEKEEPERS or cid
local ammo = {}
for i=1,5 do
ammo[i] = SPAWNSTATIC:NewFromType("ammo_cargo","Cargos",cid)
:InitCoordinate(coord:Translate((15+((i-1)*4)),heading))
:Spawn(0,"AmmoCrate-"..math.random(1,10000))
end
local function destroyammo(ammo)
for _,_crate in pairs(ammo) do
_crate:Destroy(false)
end
end
local scheduler = SCHEDULER:New(nil,destroyammo,{ammo},self.waitingtime)
-- one reload less
if truck.reloads ~= -1 then
truck.reloads = truck.reloads - 1
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @param #AMMOTRUCK.data Truck
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterTruckReturning(From, Event, To, Truck)
self:T({From, Event, To, Truck.name})
-- route home
local truckdata = Truck -- #AMMOTRUCK.data
local tgtzone = self.homezone
local tgtcoord = tgtzone:GetRandomCoordinate()
if self.hasarmygroup then
local mission = AUFTRAG:NewONGUARD(tgtcoord)
local oldmission = truckdata.group:GetMissionCurrent()
if oldmission then oldmission:Cancel() end
mission:SetTime(5)
mission:SetTeleport(false)
truckdata.group:AddMission(mission)
elseif self.routeonroad then
truckdata.group:RouteGroundOnRoad(tgtcoord,30,1,"Cone")
else
truckdata.group:RouteGroundTo(tgtcoord,30,"Cone",1)
end
return self
end
---
-- @param #AMMOTRUCK self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #AMMOTRUCK self
function AMMOTRUCK:onafterStop(From, Event, To)
self:T({From, Event, To})
return self
end
@@ -2301,12 +2301,12 @@ function ARTY:OnEventShot(EventData)
self.Nukes=self.Nukes-1
end
-- Decrease available illuminatin shells because we just fired one.
-- Decrease available illumination shells because we just fired one.
if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then
self.Nillu=self.Nillu-1
end
-- Decrease available illuminatin shells because we just fired one.
-- Decrease available smoke shells because we just fired one.
if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then
self.Nsmoke=self.Nsmoke-1
end
@@ -3717,51 +3717,6 @@ function ARTY:_NuclearBlast(_coord)
ignite(_fires)
end
--[[
local ZoneNuke=ZONE_RADIUS:New("Nukezone", _coord:GetVec2(), 2000)
-- Scan for Scenery objects.
ZoneNuke:Scan(Object.Category.SCENERY)
-- Array with all possible hideouts, i.e. scenery objects in the vicinity of the group.
local scenery={}
for SceneryTypeName, SceneryData in pairs(ZoneNuke:GetScannedScenery()) do
for SceneryName, SceneryObject in pairs(SceneryData) do
local SceneryObject = SceneryObject -- Wrapper.Scenery#SCENERY
-- Position of the scenery object.
local spos=SceneryObject:GetCoordinate()
-- Distance from group to impact point.
local distance= spos:Get2DDistance(_coord)
-- Place markers on every possible scenery object.
if self.Debug then
local MarkerID=spos:MarkToAll(string.format("%s scenery object %s", self.Controllable:GetName(), SceneryObject:GetTypeName()))
local text=string.format("%s scenery: %s, Coord %s", self.Controllable:GetName(), SceneryObject:GetTypeName(), SceneryObject:GetCoordinate():ToStringLLDMS())
self:T2(SUPPRESSION.id..text)
end
-- Add to table.
table.insert(scenery, {object=SceneryObject, distance=distance})
--SceneryObject:Destroy()
end
end
-- Sort scenery wrt to distance from impact point.
-- local _sort = function(a,b) return a.distance < b.distance end
-- table.sort(scenery,_sort)
-- for _,object in pairs(scenery) do
-- local sobject=object -- Wrapper.Scenery#SCENERY
-- sobject:Destroy()
-- end
]]
end
--- Route group to a certain point.
File diff suppressed because it is too large Load Diff
@@ -52,11 +52,13 @@
-- @module Functional.CleanUp
-- @image CleanUp_Airbases.JPG
--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
---
-- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
-- @field #map<#string,Wrapper.Airbase#AIRBASE> Airbases Map of Airbases.
-- @extends Core.Base#BASE
--- @type CLEANUP_AIRBASE
---
-- @type CLEANUP_AIRBASE
-- @extends #CLEANUP_AIRBASE.__
--- Keeps airbases clean, and tries to guarantee continuous airbase operations, even under combat.
@@ -93,7 +95,7 @@ CLEANUP_AIRBASE = {
-- @field #CLEANUP_AIRBASE.__
CLEANUP_AIRBASE.__ = {}
--- @field #CLEANUP_AIRBASE.__.Airbases
-- @field #CLEANUP_AIRBASE.__.Airbases
CLEANUP_AIRBASE.__.Airbases = {}
--- Creates the main object which is handling the cleaning of the debris within the given Zone Names.
@@ -240,7 +242,8 @@ function CLEANUP_AIRBASE.__:DestroyMissile( MissileObject )
end
end
--- @param #CLEANUP_AIRBASE self
---
-- @param #CLEANUP_AIRBASE self
-- @param Core.Event#EVENTDATA EventData
function CLEANUP_AIRBASE.__:OnEventBirth( EventData )
self:F( { EventData } )
@@ -4,7 +4,7 @@
do -- DETECTION_ZONES
--- @type DETECTION_ZONES
-- @type DETECTION_ZONES
-- @field DCS#Distance DetectionZoneRange The range till which targets are grouped upon the first detected target.
-- @field #DETECTION_BASE.DetectedItems DetectedItems A list of areas containing the set of @{Wrapper.Unit}s, @{Core.Zone}s, the center @{Wrapper.Unit} within the zone, and ID of each area that was detected within a DetectionZoneRange.
-- @extends Functional.Detection#DETECTION_BASE
@@ -68,7 +68,7 @@ do -- DETECTION_ZONES
return self
end
--- @param #DETECTION_ZONES self
-- @param #DETECTION_ZONES self
-- @param #number The amount of alive recce.
function DETECTION_ZONES:CountAliveRecce()
@@ -76,7 +76,7 @@ do -- DETECTION_ZONES
end
--- @param #DETECTION_ZONES self
-- @param #DETECTION_ZONES self
function DETECTION_ZONES:ForEachAliveRecce( IteratorFunction, ... )
self:F2( arg )
@@ -352,7 +352,7 @@ do -- DETECTION_ZONES
--DetectedSet:Flush( self )
DetectedSet:ForEachUnit(
--- @param Wrapper.Unit#UNIT DetectedUnit
-- @param Wrapper.Unit#UNIT DetectedUnit
function( DetectedUnit )
if DetectedUnit:IsAlive() then
--self:T( "Detected Set #" .. DetectedItem.ID .. ":" .. DetectedUnit:GetName() )
@@ -380,7 +380,7 @@ do -- DETECTION_ZONES
end
--- @param #DETECTION_ZONES self
-- @param #DETECTION_ZONES self
-- @param #string From The From State string.
-- @param #string Event The Event string.
-- @param #string To The To State string.
+1 -1
View File
@@ -141,7 +141,7 @@ FOX = {
explosiondist = 200,
explosiondist2 = 500,
bigmissilemass = 50,
destroy = nil,
--destroy = nil,
dt50 = 5,
dt10 = 1,
dt05 = 0.5,
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,591 @@
--- **Functional** - TIRESIAS - manages AI behaviour.
--
-- ===
--
-- The @{#TIRESIAS} class is working in the back to keep your large-scale ground units in check.
--
-- ## Features:
--
-- * Designed to keep CPU and Network usage lower on missions with a lot of ground units.
-- * Does not affect ships to keep the Navy guys happy.
-- * Does not affect OpsGroup type groups.
-- * Distinguishes between SAM groups, AAA groups and other ground groups.
-- * Exceptions can be defined to keep certain actions going.
-- * Works coalition-independent in the back
-- * Easy setup.
--
-- ===
--
-- ## Missions:
--
-- ### [TIRESIAS](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master)
--
-- ===
--
-- ### Author : **applevangelist **
--
-- @module Functional.Tiresias
-- @image Functional.Tiresias.jpg
--
-- Last Update: Dec 2023
-------------------------------------------------------------------------
--- **TIRESIAS** class, extends Core.Base#BASE
-- @type TIRESIAS
-- @field #string ClassName
-- @field #booelan debug
-- @field #string version
-- @field #number Interval
-- @field Core.Set#SET_GROUP GroundSet
-- @field #number Coalition
-- @field Core.Set#SET_GROUP VehicleSet
-- @field Core.Set#SET_GROUP AAASet
-- @field Core.Set#SET_GROUP SAMSet
-- @field Core.Set#SET_GROUP ExceptionSet
-- @field Core.Set#SET_OPSGROUP OpsGroupSet
-- @field #number AAARange
-- @field #number HeloSwitchRange
-- @field #number PlaneSwitchRange
-- @field Core.Set#SET_GROUP FlightSet
-- @field #boolean SwitchAAA
-- @extends Core.Fsm#FSM
---
-- @type TIRESIAS.Data
-- @field #string type
-- @field #number range
-- @field #boolean invisible
-- @field #boolean AIOff
-- @field #boolean exception
--- *Tiresias, Greek demi-god and shapeshifter, blinded by the Gods, works as oracle for you.* (Wiki)
--
-- ===
--
-- ## TIRESIAS Concept
--
-- * Designed to keep CPU and Network usage lower on missions with a lot of ground units.
-- * Does not affect ships to keep the Navy guys happy.
-- * Does not affect OpsGroup type groups.
-- * Distinguishes between SAM groups, AAA groups and other ground groups.
-- * Exceptions can be defined in SET_GROUP objects to keep certain actions going.
-- * Works coalition-independent in the back
-- * Easy setup.
--
-- ## Setup
--
-- Setup is a one-liner:
--
-- local blinder = TIRESIAS:New()
--
-- Optionally you can set up exceptions, e.g. for convoys driving around
--
-- local exceptionset = SET_GROUP:New():FilterCoalitions("red"):FilterPrefixes("Convoy"):FilterStart()
-- local blinder = TIRESIAS:New()
-- blinder:AddExceptionSet(exceptionset)
--
-- Options
--
-- -- Setup different radius for activation around helo and airplane groups (applies to AI and humans)
-- blinder:SetActivationRanges(10,25) -- defaults are 10, and 25
--
-- -- Setup engagement ranges for AAA (non-advanced SAM units like Flaks etc) and if you want them to be AIOff
-- blinder:SetAAARanges(60,true) -- defaults are 60, and true
--
-- @field #TIRESIAS
TIRESIAS = {
ClassName = "TIRESIAS",
debug = false,
version = "0.0.5",
Interval = 20,
GroundSet = nil,
VehicleSet = nil,
AAASet = nil,
SAMSet = nil,
ExceptionSet = nil,
AAARange = 60, -- 60%
HeloSwitchRange = 10, -- NM
PlaneSwitchRange = 25, -- NM
SwitchAAA = true,
}
--- [USER] Create a new Tiresias object and start it up.
-- @param #TIRESIAS self
-- @return #TIRESIAS self
function TIRESIAS:New()
-- Inherit everything from FSM class.
local self = BASE:Inherit(self, FSM:New()) -- #TIRESIAS
--- FSM Functions ---
-- Start State.
self:SetStartState("Stopped")
-- Add FSM transitions.
-- From State --> Event --> To State
self:AddTransition("Stopped", "Start", "Running") -- Start FSM.
self:AddTransition("*", "Status", "*") -- TIRESIAS status update.
self:AddTransition("*", "Stop", "Stopped") -- Stop FSM.
self.ExceptionSet = SET_GROUP:New():Clear(false)
self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler)
self.lid = string.format("TIRESIAS %s | ",self.version)
self:I(self.lid.."Managing ground groups!")
--- Triggers the FSM event "Stop". Stops TIRESIAS and all its event handlers.
-- @function [parent=#TIRESIAS] Stop
-- @param #TIRESIAS self
--- Triggers the FSM event "Stop" after a delay. Stops TIRESIAS and all its event handlers.
-- @function [parent=#TIRESIAS] __Stop
-- @param #TIRESIAS self
-- @param #number delay Delay in seconds.
--- Triggers the FSM event "Start". Starts TIRESIAS and all its event handlers. Note - `:New()` already starts the instance.
-- @function [parent=#TIRESIAS] Start
-- @param #TIRESIAS self
--- Triggers the FSM event "Start" after a delay. Starts TIRESIAS and all its event handlers. Note - `:New()` already starts the instance.
-- @function [parent=#TIRESIAS] __Start
-- @param #TIRESIAS self
-- @param #number delay Delay in seconds.
self:__Start(1)
return self
end
-------------------------------------------------------------------------------------------------------------
--
-- Helper Functions
--
-------------------------------------------------------------------------------------------------------------
---[USER] Set activation radius for Helos and Planes in Nautical Miles.
-- @param #TIRESIAS self
-- @param #number HeloMiles Radius around a Helicopter in which AI ground units will be activated. Defaults to 10NM.
-- @param #number PlaneMiles Radius around an Airplane in which AI ground units will be activated. Defaults to 25NM.
-- @return #TIRESIAS self
function TIRESIAS:SetActivationRanges(HeloMiles,PlaneMiles)
self.HeloSwitchRange = HeloMiles or 10
self.PlaneSwitchRange = PlaneMiles or 25
return self
end
---[USER] Set AAA Ranges - AAA equals non-SAM systems which qualify as AAA in DCS world.
-- @param #TIRESIAS self
-- @param #number FiringRange The engagement range that AAA units will be set to. Can be 0 to 100 (percent). Defaults to 60.
-- @param #boolean SwitchAAA Decide if these system will have their AI switched off, too. Defaults to true.
-- @return #TIRESIAS self
function TIRESIAS:SetAAARanges(FiringRange,SwitchAAA)
self.AAARange = FiringRange or 60
self.SwitchAAA = (SwitchAAA == false) and false or true
return self
end
--- [USER] Add a SET_GROUP of GROUP objects as exceptions. Can be done multiple times. Does **not** work work for GROUP objects spawned into the SET after start, i.e. the groups need to exist in the game already.
-- @param #TIRESIAS self
-- @param Core.Set#SET_GROUP Set to add to the exception list.
-- @return #TIRESIAS self
function TIRESIAS:AddExceptionSet(Set)
self:T(self.lid.."AddExceptionSet")
local exceptions = self.ExceptionSet
Set:ForEachGroupAlive(
function(grp)
if not grp.Tiresias then
grp.Tiresias = { -- #TIRESIAS.Data
type = "Exception",
exception = true,
}
exceptions:AddGroup(grp,true)
end
BASE:T("TIRESIAS: Added exception group: "..grp:GetName())
end
)
return self
end
--- [INTERNAL] Filter Function
-- @param Wrapper.Group#GROUP Group
-- @return #boolean isin
function TIRESIAS._FilterNotAAA(Group)
local grp = Group -- Wrapper.Group#GROUP
local isaaa = grp:IsAAA()
if isaaa == true and grp:IsGround() and not grp:IsShip() then
return false -- remove from SET
else
return true -- keep in SET
end
end
--- [INTERNAL] Filter Function
-- @param Wrapper.Group#GROUP Group
-- @return #boolean isin
function TIRESIAS._FilterNotSAM(Group)
local grp = Group -- Wrapper.Group#GROUP
local issam = grp:IsSAM()
if issam == true and grp:IsGround() and not grp:IsShip() then
return false -- remove from SET
else
return true -- keep in SET
end
end
--- [INTERNAL] Filter Function
-- @param Wrapper.Group#GROUP Group
-- @return #boolean isin
function TIRESIAS._FilterAAA(Group)
local grp = Group -- Wrapper.Group#GROUP
local isaaa = grp:IsAAA()
if isaaa == true and grp:IsGround() and not grp:IsShip() then
return true -- remove from SET
else
return false -- keep in SET
end
end
--- [INTERNAL] Filter Function
-- @param Wrapper.Group#GROUP Group
-- @return #boolean isin
function TIRESIAS._FilterSAM(Group)
local grp = Group -- Wrapper.Group#GROUP
local issam = grp:IsSAM()
if issam == true and grp:IsGround() and not grp:IsShip() then
return true -- remove from SET
else
return false -- keep in SET
end
end
--- [INTERNAL] Init Groups
-- @param #TIRESIAS self
-- @return #TIRESIAS self
function TIRESIAS:_InitGroups()
self:T(self.lid.."_InitGroups")
-- Set all groups invisible/motionless
local EngageRange = self.AAARange
local SwitchAAA = self.SwitchAAA
--- AAA
self.AAASet:ForEachGroupAlive(
function(grp)
if not grp.Tiresias then
grp:OptionEngageRange(EngageRange)
grp:SetCommandInvisible(true)
if SwitchAAA then
grp:SetAIOff()
grp:EnableEmission(false)
end
grp.Tiresias = { -- #TIRESIAS.Data
type = "AAA",
invisible = true,
range = EngageRange,
exception = false,
AIOff = SwitchAAA,
}
end
if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias.invisible and grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true)
grp.Tiresias.invisible = true
if SwitchAAA then
grp:SetAIOff()
grp:EnableEmission(false)
grp.Tiresias.AIOff = true
end
end
end
--BASE:I(string.format("Init/Switch off AAA %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
end
)
--- Vehicles
self.VehicleSet:ForEachGroupAlive(
function(grp)
if not grp.Tiresias then
grp:SetAIOff()
grp:SetCommandInvisible(true)
grp.Tiresias = { -- #TIRESIAS.Data
type = "Vehicle",
invisible = true,
AIOff = true,
exception = false,
}
end
if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true)
grp:SetAIOff()
grp.Tiresias.invisible = true
end
end
--BASE:I(string.format("Init/Switch off Vehicle %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
end
)
--- SAM
self.SAMSet:ForEachGroupAlive(
function(grp)
if not grp.Tiresias then
grp:SetCommandInvisible(true)
grp.Tiresias = { -- #TIRESIAS.Data
type = "SAM",
invisible = true,
exception = false,
}
end
if grp.Tiresias and (not grp.Tiresias.exception == true) then
if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
grp:SetCommandInvisible(true)
grp.Tiresias.invisible = true
end
end
--BASE:I(string.format("Init/Switch off SAM %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
end
)
return self
end
--- [INTERNAL] Event handler function
-- @param #TIRESIAS self
-- @param Core.Event#EVENTDATA EventData
-- @return #TIRESIAS self
function TIRESIAS:_EventHandler(EventData)
self:T(string.format("%s Event = %d",self.lid, EventData.id))
local event = EventData -- Core.Event#EVENTDATA
if event.id == EVENTS.PlayerEnterAircraft or event.id == EVENTS.PlayerEnterUnit then
--local _coalition = event.IniCoalition
--if _coalition ~= self.Coalition then
-- return --ignore!
--end
local unitname = event.IniUnitName or "none"
local _unit = event.IniUnit
local _group = event.IniGroup
if _group and _group:IsAlive() then
local radius = self.PlaneSwitchRange
if _group:IsHelicopter() then
radius = self.HeloSwitchRange
end
self:_SwitchOnGroups(_group,radius)
end
end
return self
end
--- [INTERNAL] Switch Groups Behaviour
-- @param #TIRESIAS self
-- @param Wrapper.Group#GROUP group
-- @param #number radius Radius in NM
-- @return #TIRESIAS self
function TIRESIAS:_SwitchOnGroups(group,radius)
self:T(self.lid.."_SwitchOnGroups "..group:GetName().." Radius "..radius.." NM")
local zone = ZONE_GROUP:New("Zone-"..group:GetName(),group,UTILS.NMToMeters(radius))
local ground = SET_GROUP:New():FilterCategoryGround():FilterZones({zone}):FilterOnce()
local count = ground:CountAlive()
if self.debug then
local text = string.format("There are %d groups around this plane or helo!",count)
self:I(text)
end
local SwitchAAA = self.SwitchAAA
if ground:CountAlive() > 0 then
ground:ForEachGroupAlive(
function(grp)
local name = grp:GetName()
if grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
if grp.Tiresias.invisible == true then
grp:SetCommandInvisible(false)
grp.Tiresias.invisible = false
end
if grp.Tiresias.type == "Vehicle" and grp.Tiresias.AIOff and grp.Tiresias.AIOff == true then
grp:SetAIOn()
grp.Tiresias.AIOff = false
end
if SwitchAAA and grp.Tiresias.type == "AAA" and grp.Tiresias.AIOff and grp.Tiresias.AIOff == true then
grp:SetAIOn()
grp:EnableEmission(true)
grp.Tiresias.AIOff = false
end
--BASE:I(string.format("TIRESIAS - Switch on %s %s (Exception %s)",tostring(grp.Tiresias.type),grp:GetName(),tostring(grp.Tiresias.exception)))
else
BASE:T("TIRESIAS - This group "..tostring(name).. " has not been initialized or is an exception!")
end
end
)
end
return self
end
-------------------------------------------------------------------------------------------------------------
--
-- FSM Functions
--
-------------------------------------------------------------------------------------------------------------
--- [INTERNAL] FSM Function
-- @param #TIRESIAS self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #TIRESIAS self
function TIRESIAS:onafterStart(From, Event, To)
self:T({From, Event, To})
local VehicleSet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterNotAAA):FilterFunction(TIRESIAS._FilterNotSAM):FilterStart()
local AAASet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterAAA):FilterStart()
local SAMSet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterSAM):FilterStart()
local OpsGroupSet = SET_OPSGROUP:New():FilterActive(true):FilterStart()
self.FlightSet = SET_GROUP:New():FilterCategories({"plane","helicopter"}):FilterStart()
local EngageRange = self.AAARange
local ExceptionSet = self.ExceptionSet
if self.ExceptionSet then
function ExceptionSet:OnAfterAdded(From,Event,To,ObjectName,Object)
BASE:I("TIRESIAS: EXCEPTION Object Added: "..Object:GetName())
if Object and Object:IsAlive() then
Object.Tiresias = { -- #TIRESIAS.Data
type = "Exception",
exception = true,
}
Object:SetAIOn()
Object:SetCommandInvisible(false)
Object:EnableEmission(true)
end
end
local OGS = OpsGroupSet:GetAliveSet()
for _,_OG in pairs(OGS or {}) do
local OG = _OG -- Ops.OpsGroup#OPSGROUP
local grp = OG:GetGroup()
ExceptionSet:AddGroup(grp,true)
end
function OpsGroupSet:OnAfterAdded(From,Event,To,ObjectName,Object)
local grp = Object:GetGroup()
ExceptionSet:AddGroup(grp,true)
end
end
function VehicleSet:OnAfterAdded(From,Event,To,ObjectName,Object)
BASE:I("TIRESIAS: VEHCILE Object Added: "..Object:GetName())
if Object and Object:IsAlive() then
Object:SetAIOff()
Object:SetCommandInvisible(true)
Object.Tiresias = { -- #TIRESIAS.Data
type = "Vehicle",
invisible = true,
AIOff = true,
exception = false,
}
end
end
local SwitchAAA = self.SwitchAAA
function AAASet:OnAfterAdded(From,Event,To,ObjectName,Object)
if Object and Object:IsAlive() then
BASE:I("TIRESIAS: AAA Object Added: "..Object:GetName())
Object:OptionEngageRange(EngageRange)
Object:SetCommandInvisible(true)
if SwitchAAA then
Object:SetAIOff()
Object:EnableEmission(false)
end
Object.Tiresias = { -- #TIRESIAS.Data
type = "AAA",
invisible = true,
range = EngageRange,
exception = false,
AIOff = SwitchAAA,
}
end
end
function SAMSet:OnAfterAdded(From,Event,To,ObjectName,Object)
if Object and Object:IsAlive() then
BASE:I("TIRESIAS: SAM Object Added: "..Object:GetName())
Object:SetCommandInvisible(true)
Object.Tiresias = { -- #TIRESIAS.Data
type = "SAM",
invisible = true,
exception = false,
}
end
end
self.VehicleSet = VehicleSet
self.AAASet = AAASet
self.SAMSet = SAMSet
self.OpsGroupSet = OpsGroupSet
self:_InitGroups()
self:__Status(1)
return self
end
--- [INTERNAL] FSM Function
-- @param #TIRESIAS self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #TIRESIAS self
function TIRESIAS:onbeforeStatus(From, Event, To)
self:T({From, Event, To})
if self:GetState() == "Stopped" then
return false
end
return self
end
--- [INTERNAL] FSM Function
-- @param #TIRESIAS self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #TIRESIAS self
function TIRESIAS:onafterStatus(From, Event, To)
self:T({From, Event, To})
if self.debug then
local count = self.VehicleSet:CountAlive()
local AAAcount = self.AAASet:CountAlive()
local SAMcount = self.SAMSet:CountAlive()
local text = string.format("Overall: %d | Vehicles: %d | AAA: %d | SAM: %d",count+AAAcount+SAMcount,count,AAAcount,SAMcount)
self:I(text)
end
self:_InitGroups()
if self.FlightSet:CountAlive() > 0 then
local Set = self.FlightSet:GetAliveSet()
for _,_plane in pairs(Set) do
local plane = _plane -- Wrapper.Group#GROUP
local radius = self.PlaneSwitchRange
if plane:IsHelicopter() then
radius = self.HeloSwitchRange
end
self:_SwitchOnGroups(_plane,radius)
end
end
if self:GetState() ~= "Stopped" then
self:__Status(self.Interval)
end
return self
end
--- [INTERNAL] FSM Function
-- @param #TIRESIAS self
-- @param #string From
-- @param #string Event
-- @param #string To
-- @return #TIRESIAS self
function TIRESIAS:onafterStop(From, Event, To)
self:T({From, Event, To})
self:UnHandleEvent(EVENTS.PlayerEnterAircraft)
return self
end
-------------------------------------------------------------------------------------------------------------
--
-- End
--
-------------------------------------------------------------------------------------------------------------
@@ -48,7 +48,7 @@
do -- ZONE_CAPTURE_COALITION
--- @type ZONE_CAPTURE_COALITION
-- @type ZONE_CAPTURE_COALITION
-- @field #string ClassName Name of the class.
-- @field #number MarkBlue ID of blue F10 mark.
-- @field #number MarkRed ID of red F10 mark.
@@ -161,7 +161,7 @@ do -- ZONE_CAPTURE_COALITION
-- The mission designer can use these values to alter the logic.
-- For example:
--
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= "Empty" then
-- -- Display a message
@@ -172,7 +172,7 @@ do -- ZONE_CAPTURE_COALITION
--
-- ## Example Event Handler.
--
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= To then
-- local Coalition = self:GetCoalition()
@@ -273,7 +273,7 @@ do -- ZONE_CAPTURE_COALITION
-- Depending on the zone ownership, different messages are sent.
-- Note the methods `ZoneCaptureCoalition:GetZoneName()`.
--
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= To then
-- local Coalition = self:GetCoalition()
@@ -294,7 +294,7 @@ do -- ZONE_CAPTURE_COALITION
-- Next is the Event Handler when the **Empty** state transition is triggered.
-- Now we smoke the ZoneCaptureCoalition with a green color, using `self:Smoke( SMOKECOLOR.Green )`.
--
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterEmpty()
-- self:Smoke( SMOKECOLOR.Green )
-- US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCaptureCoalition:GetZoneName() ), MESSAGE.Type.Information )
@@ -304,7 +304,7 @@ do -- ZONE_CAPTURE_COALITION
-- The next Event Handlers speak for itself.
-- When the zone is Attacked, we smoke the zone white and send some messages to each coalition.
--
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterAttacked()
-- ZoneCaptureCoalition:Smoke( SMOKECOLOR.White )
-- local Coalition = self:GetCoalition()
@@ -321,7 +321,7 @@ do -- ZONE_CAPTURE_COALITION
-- When the zone is Captured, we send some victory or loss messages to the correct coalition.
-- And we add some score.
--
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterCaptured()
-- local Coalition = self:GetCoalition()
-- self:E({Coalition = Coalition})
@@ -641,7 +641,7 @@ do -- ZONE_CAPTURE_COALITION
--
-- @usage
-- -- For example, one could stop the monitoring when the zone was captured!
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterCaptured()
-- local Coalition = self:GetCoalition()
-- self:E({Coalition = Coalition})
@@ -17,7 +17,7 @@
do -- Zone
--- @type ZONE_GOAL
-- @type ZONE_GOAL
-- @field #string ClassName Name of the class.
-- @field Core.Goal#GOAL Goal The goal object.
-- @field #number SmokeTime Time stamp in seconds when the last smoke of the zone was triggered.
@@ -178,7 +178,7 @@ do -- Zone
end
--- @param #ZONE_GOAL self
-- @param #ZONE_GOAL self
-- @param Core.Event#EVENTDATA EventData Event data table.
function ZONE_GOAL:__Destroyed( EventData )
self:F( { "EventDead", EventData } )
@@ -21,7 +21,7 @@
do -- ZoneGoal
--- @type ZONE_GOAL_CARGO
-- @type ZONE_GOAL_CARGO
-- @extends Functional.ZoneGoal#ZONE_GOAL
@@ -55,7 +55,7 @@ do -- ZoneGoal
ClassName = "ZONE_GOAL_CARGO",
}
--- @field #table ZONE_GOAL_CARGO.States
-- @field #table ZONE_GOAL_CARGO.States
ZONE_GOAL_CARGO.States = {}
--- ZONE_GOAL_CARGO Constructor.
@@ -1,4 +1,4 @@
--- **Functional** - Base class that models processes to achieve goals involving a Zone for a Coalition.
--- **Functional (WIP)** - Base class modeling processes to achieve goals involving coalition zones.
--
-- ===
--
@@ -16,7 +16,7 @@
do -- ZoneGoal
--- @type ZONE_GOAL_COALITION
-- @type ZONE_GOAL_COALITION
-- @field #string ClassName Name of the Class.
-- @field #number Coalition The current coalition ID of the zone owner.
-- @field #number PreviousCoalition The previous owner of the zone.
@@ -48,7 +48,7 @@ do -- ZoneGoal
ObjectCategories = nil,
}
--- @field #table ZONE_GOAL_COALITION.States
-- @field #table ZONE_GOAL_COALITION.States
ZONE_GOAL_COALITION.States = {}
--- ZONE_GOAL_COALITION Constructor.
+34 -2
View File
@@ -2,7 +2,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
--__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' )
@@ -33,6 +33,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spot.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/MarkerOps_Base.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/TextAndSound.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Pathline.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ClientMenu.lua')
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' )
@@ -78,7 +79,13 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Warehouse.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Fox.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Mantis.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Shorad.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AICSAR.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AmmoTruck.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua')
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )
@@ -86,6 +93,31 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RescueHelo.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ATIS.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CTLD.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CSAR.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/AirWing.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ArmyGroup.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Auftrag.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Awacs.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Brigade.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Chief.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Cohort.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Commander.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Fleet.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightControl.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightGroup.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Flotilla.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Intelligence.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Legion.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/NavyGroup.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Operation.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsGroup.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsTransport.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsZone.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Platoon.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerTask.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerRecce.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Squadron.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Target.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/EasyGCICAP.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Balancer.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air.lua' )
+181
View File
@@ -0,0 +1,181 @@
__Moose.Include( 'Utilities\\Enums.lua' )
__Moose.Include( 'Utilities\\Utils.lua' )
__Moose.Include( 'Utilities\\Profiler.lua' )
--__Moose.Include( 'Utilities\\STTS.lua' )
__Moose.Include( 'Utilities\\FiFo.lua' )
__Moose.Include( 'Utilities\\Socket.lua' )
__Moose.Include( 'Core\\Base.lua' )
__Moose.Include( 'Core\\Beacon.lua' )
__Moose.Include( 'Core\\UserFlag.lua' )
__Moose.Include( 'Core\\Report.lua' )
__Moose.Include( 'Core\\Scheduler.lua' )
__Moose.Include( 'Core\\ScheduleDispatcher.lua' )
__Moose.Include( 'Core\\Event.lua' )
__Moose.Include( 'Core\\Settings.lua' )
__Moose.Include( 'Core\\Menu.lua' )
__Moose.Include( 'Core\\Zone.lua' )
__Moose.Include( 'Core\\Velocity.lua' )
__Moose.Include( 'Core\\Database.lua' )
__Moose.Include( 'Core\\Set.lua' )
__Moose.Include( 'Core\\Point.lua' )
__Moose.Include( 'Core\\Pathline.lua' )
__Moose.Include( 'Core\\Message.lua' )
__Moose.Include( 'Core\\Fsm.lua' )
__Moose.Include( 'Core\\Spawn.lua' )
__Moose.Include( 'Core\\SpawnStatic.lua' )
__Moose.Include( 'Core\\Timer.lua' )
__Moose.Include( 'Core\\Goal.lua' )
__Moose.Include( 'Core\\Spot.lua' )
__Moose.Include( 'Core\\Astar.lua' )
__Moose.Include( 'Core\\MarkerOps_Base.lua' )
__Moose.Include( 'Core\\TextAndSound.lua' )
__Moose.Include( 'Core\\Condition.lua' )
__Moose.Include( 'Core\\ClientMenu.lua' )
__Moose.Include( 'Wrapper\\Object.lua' )
__Moose.Include( 'Wrapper\\Identifiable.lua' )
__Moose.Include( 'Wrapper\\Positionable.lua' )
__Moose.Include( 'Wrapper\\Controllable.lua' )
__Moose.Include( 'Wrapper\\Group.lua' )
__Moose.Include( 'Wrapper\\Unit.lua' )
__Moose.Include( 'Wrapper\\Client.lua' )
__Moose.Include( 'Wrapper\\Static.lua' )
__Moose.Include( 'Wrapper\\Airbase.lua' )
__Moose.Include( 'Wrapper\\Scenery.lua' )
__Moose.Include( 'Wrapper\\Marker.lua' )
__Moose.Include( 'Wrapper\\Net.lua' )
__Moose.Include( 'Wrapper\\Weapon.lua' )
__Moose.Include( 'Wrapper\\Storage.lua' )
__Moose.Include( 'Wrapper\\DynamicCargo.lua' )
__Moose.Include( 'Cargo\\Cargo.lua' )
__Moose.Include( 'Cargo\\CargoUnit.lua' )
__Moose.Include( 'Cargo\\CargoSlingload.lua' )
__Moose.Include( 'Cargo\\CargoCrate.lua' )
__Moose.Include( 'Cargo\\CargoGroup.lua' )
__Moose.Include( 'Functional\\Scoring.lua' )
__Moose.Include( 'Functional\\CleanUp.lua' )
__Moose.Include( 'Functional\\Movement.lua' )
__Moose.Include( 'Functional\\Sead.lua' )
__Moose.Include( 'Functional\\Escort.lua' )
__Moose.Include( 'Functional\\MissileTrainer.lua' )
__Moose.Include( 'Functional\\ATC_Ground.lua' )
__Moose.Include( 'Functional\\Detection.lua' )
__Moose.Include( 'Functional\\DetectionZones.lua' )
__Moose.Include( 'Functional\\Designate.lua' )
__Moose.Include( 'Functional\\RAT.lua' )
__Moose.Include( 'Functional\\Range.lua' )
__Moose.Include( 'Functional\\ZoneGoal.lua' )
__Moose.Include( 'Functional\\ZoneGoalCoalition.lua' )
__Moose.Include( 'Functional\\ZoneCaptureCoalition.lua' )
__Moose.Include( 'Functional\\Artillery.lua' )
__Moose.Include( 'Functional\\Suppression.lua' )
__Moose.Include( 'Functional\\PseudoATC.lua' )
__Moose.Include( 'Functional\\Warehouse.lua' )
__Moose.Include( 'Functional\\Fox.lua' )
__Moose.Include( 'Functional\\Mantis.lua' )
__Moose.Include( 'Functional\\Shorad.lua' )
__Moose.Include( 'Functional\\Autolase.lua' )
__Moose.Include( 'Functional\\AICSAR.lua' )
__Moose.Include( 'Functional\\AmmoTruck.lua' )
__Moose.Include( 'Functional\\Tiresias.lua' )
__Moose.Include( 'Functional\\Stratego.lua' )
__Moose.Include( 'Functional\\ClientWatch.lua' )
__Moose.Include( 'Ops\\Airboss.lua' )
__Moose.Include( 'Ops\\RecoveryTanker.lua' )
__Moose.Include( 'Ops\\RescueHelo.lua' )
__Moose.Include( 'Ops\\ATIS.lua' )
__Moose.Include( 'Ops\\Auftrag.lua' )
__Moose.Include( 'Ops\\Target.lua' )
__Moose.Include( 'Ops\\OpsGroup.lua' )
__Moose.Include( 'Ops\\FlightGroup.lua' )
__Moose.Include( 'Ops\\NavyGroup.lua' )
__Moose.Include( 'Ops\\ArmyGroup.lua' )
__Moose.Include( 'Ops\\Cohort.lua' )
__Moose.Include( 'Ops\\Squadron.lua' )
__Moose.Include( 'Ops\\Platoon.lua' )
__Moose.Include( 'Ops\\Legion.lua' )
__Moose.Include( 'Ops\\AirWing.lua' )
__Moose.Include( 'Ops\\Brigade.lua' )
__Moose.Include( 'Ops\\Intelligence.lua' )
__Moose.Include( 'Ops\\Commander.lua' )
__Moose.Include( 'Ops\\OpsTransport.lua' )
__Moose.Include( 'Ops\\CSAR.lua' )
__Moose.Include( 'Ops\\CTLD.lua' )
__Moose.Include( 'Ops\\OpsZone.lua' )
__Moose.Include( 'Ops\\Chief.lua' )
__Moose.Include( 'Ops\\Flotilla.lua' )
__Moose.Include( 'Ops\\Fleet.lua' )
__Moose.Include( 'Ops\\Awacs.lua' )
__Moose.Include( 'Ops\\PlayerTask.lua' )
__Moose.Include( 'Ops\\Operation.lua' )
__Moose.Include( 'Ops\\FlightControl.lua' )
__Moose.Include( 'Ops\\PlayerRecce.lua' )
__Moose.Include( 'Ops\\EasyGCICAP.lua' )
__Moose.Include( 'Ops\\EasyA2G.lua' )
__Moose.Include( 'AI\\AI_Balancer.lua' )
__Moose.Include( 'AI\\AI_Air.lua' )
__Moose.Include( 'AI\\AI_Air_Patrol.lua' )
__Moose.Include( 'AI\\AI_Air_Engage.lua' )
__Moose.Include( 'AI\\AI_A2A_Patrol.lua' )
__Moose.Include( 'AI\\AI_A2A_Cap.lua' )
__Moose.Include( 'AI\\AI_A2A_Gci.lua' )
__Moose.Include( 'AI\\AI_A2A_Dispatcher.lua' )
__Moose.Include( 'AI\\AI_A2G_BAI.lua' )
__Moose.Include( 'AI\\AI_A2G_CAS.lua' )
__Moose.Include( 'AI\\AI_A2G_SEAD.lua' )
__Moose.Include( 'AI\\AI_A2G_Dispatcher.lua' )
__Moose.Include( 'AI\\AI_Patrol.lua' )
__Moose.Include( 'AI\\AI_Cap.lua' )
__Moose.Include( 'AI\\AI_Cas.lua' )
__Moose.Include( 'AI\\AI_Bai.lua' )
__Moose.Include( 'AI\\AI_Formation.lua' )
__Moose.Include( 'AI\\AI_Escort.lua' )
__Moose.Include( 'AI\\AI_Escort_Request.lua' )
__Moose.Include( 'AI\\AI_Escort_Dispatcher.lua' )
__Moose.Include( 'AI\\AI_Escort_Dispatcher_Request.lua' )
__Moose.Include( 'AI\\AI_Cargo.lua' )
__Moose.Include( 'AI\\AI_Cargo_APC.lua' )
__Moose.Include( 'AI\\AI_Cargo_Helicopter.lua' )
__Moose.Include( 'AI\\AI_Cargo_Airplane.lua' )
__Moose.Include( 'AI\\AI_Cargo_Ship.lua' )
__Moose.Include( 'AI\\AI_Cargo_Dispatcher.lua' )
__Moose.Include( 'AI\\AI_Cargo_Dispatcher_APC.lua' )
__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Helicopter.lua' )
__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Airplane.lua' )
__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Ship.lua' )
__Moose.Include( 'Actions\\Act_Assign.lua' )
__Moose.Include( 'Actions\\Act_Route.lua' )
__Moose.Include( 'Actions\\Act_Account.lua' )
__Moose.Include( 'Actions\\Act_Assist.lua' )
__Moose.Include( 'Sound\\UserSound.lua' )
__Moose.Include( 'Sound\\SoundOutput.lua' )
__Moose.Include( 'Sound\\Radio.lua' )
__Moose.Include( 'Sound\\RadioQueue.lua' )
__Moose.Include( 'Sound\\RadioSpeech.lua' )
__Moose.Include( 'Sound\\SRS.lua' )
__Moose.Include( 'Tasking\\CommandCenter.lua' )
__Moose.Include( 'Tasking\\Mission.lua' )
__Moose.Include( 'Tasking\\Task.lua' )
__Moose.Include( 'Tasking\\TaskInfo.lua' )
__Moose.Include( 'Tasking\\Task_Manager.lua' )
__Moose.Include( 'Tasking\\DetectionManager.lua' )
__Moose.Include( 'Tasking\\Task_A2G_Dispatcher.lua' )
__Moose.Include( 'Tasking\\Task_A2G.lua' )
__Moose.Include( 'Tasking\\Task_A2A_Dispatcher.lua' )
__Moose.Include( 'Tasking\\Task_A2A.lua' )
__Moose.Include( 'Tasking\\Task_Cargo.lua' )
__Moose.Include( 'Tasking\\Task_Cargo_Transport.lua' )
__Moose.Include( 'Tasking\\Task_Cargo_CSAR.lua' )
__Moose.Include( 'Tasking\\Task_Cargo_Dispatcher.lua' )
__Moose.Include( 'Tasking\\Task_Capture_Zone.lua' )
__Moose.Include( 'Tasking\\Task_Capture_Dispatcher.lua' )
__Moose.Include( 'Globals.lua' )
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -3088,7 +3088,8 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
self.SRS:SetVolume(Volume or 1)
--self.SRS:SetModulations(Modulations)
if GoogleCreds then
self.SRS:SetGoogle(GoogleCreds)
self.SRS:SetProviderOptionsGoogle(GoogleCreds,GoogleCreds)
self.SRS:SetProvider(MSRS.Provider.GOOGLE)
end
if Voice then
self.SRS:SetVoice(Voice)
@@ -3622,6 +3623,7 @@ function AIRBOSS:onafterStart( From, Event, To )
self:HandleEvent( EVENTS.PlayerLeaveUnit, self._PlayerLeft )
self:HandleEvent( EVENTS.MissionEnd )
self:HandleEvent( EVENTS.RemoveUnit )
self:HandleEvent( EVENTS.UnitLost, self.OnEventRemoveUnit )
-- self.StatusScheduler=SCHEDULER:New(self)
-- self.StatusScheduler:Schedule(self, self._Status, {}, 1, 0.5)
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+624
View File
@@ -0,0 +1,624 @@
--- **Ops** - Brigade Warehouse.
--
-- **Main Features:**
--
-- * Manage platoons
-- * Carry out ARTY and PATROLZONE missions (AUFTRAG)
-- * Define rearming zones
--
-- ===
--
-- ## Example Missions:
--
-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Brigade).
--
-- ===
--
-- ### Author: **funkyfranky**
--
-- ===
-- @module Ops.Brigade
-- @image OPS_Brigade_.png
--- BRIGADE class.
-- @type BRIGADE
-- @field #string ClassName Name of the class.
-- @field #number verbose Verbosity of output.
-- @field #table rearmingZones Rearming zones. Each element is of type `#BRIGADE.SupplyZone`.
-- @field #table refuellingZones Refuelling zones. Each element is of type `#BRIGADE.SupplyZone`.
-- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
-- @extends Ops.Legion#LEGION
--- *I am not afraid of an Army of lions lead by a sheep; I am afraid of sheep lead by a lion* -- Alexander the Great
--
-- ===
--
-- # The BRIGADE Concept
--
-- A BRIGADE consists of one or multiple PLATOONs. These platoons "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
--
--
-- @field #BRIGADE
BRIGADE = {
ClassName = "BRIGADE",
verbose = 0,
rearmingZones = {},
refuellingZones = {},
}
--- Supply Zone.
-- @type BRIGADE.SupplyZone
-- @field Core.Zone#ZONE zone The zone.
-- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
-- @field #boolean markerOn If `true`, marker is on.
-- @field Wrapper.Marker#MARKER marker F10 marker.
--- BRIGADE class version.
-- @field #string version
BRIGADE.version="0.1.1"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- ToDo list
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Spawn when hosting warehouse is a ship or oil rig or gas platform.
-- TODO: Rearming zones.
-- TODO: Retreat zones.
-- DONE: Add weapon range.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a new BRIGADE class object.
-- @param #BRIGADE self
-- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
-- @param #string BrigadeName Name of the brigade.
-- @return #BRIGADE self
function BRIGADE:New(WarehouseName, BrigadeName)
-- Inherit everything from LEGION class.
local self=BASE:Inherit(self, LEGION:New(WarehouseName, BrigadeName)) -- #BRIGADE
-- Nil check.
if not self then
BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
return nil
end
-- Set some string id for output to DCS.log file.
self.lid=string.format("BRIGADE %s | ", self.alias)
-- Defaults
self:SetRetreatZones()
-- Turn ship into NAVYGROUP.
if self:IsShip() then
local wh=self.warehouse --Wrapper.Unit#UNIT
local group=wh:GetGroup()
self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
end
-- Add FSM transitions.
-- From State --> Event --> To State
self:AddTransition("*", "ArmyOnMission", "*") -- An ARMYGROUP was send on a Mission (AUFTRAG).
------------------------
--- Pseudo Functions ---
------------------------
--- Triggers the FSM event "Start". Starts the BRIGADE. Initializes parameters and starts event handlers.
-- @function [parent=#BRIGADE] Start
-- @param #BRIGADE self
--- Triggers the FSM event "Start" after a delay. Starts the BRIGADE. Initializes parameters and starts event handlers.
-- @function [parent=#BRIGADE] __Start
-- @param #BRIGADE self
-- @param #number delay Delay in seconds.
--- Triggers the FSM event "Stop". Stops the BRIGADE and all its event handlers.
-- @param #BRIGADE self
--- Triggers the FSM event "Stop" after a delay. Stops the BRIGADE and all its event handlers.
-- @function [parent=#BRIGADE] __Stop
-- @param #BRIGADE self
-- @param #number delay Delay in seconds.
--- Triggers the FSM event "ArmyOnMission".
-- @function [parent=#BRIGADE] ArmyOnMission
-- @param #BRIGADE self
-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
--- Triggers the FSM event "ArmyOnMission" after a delay.
-- @function [parent=#BRIGADE] __ArmyOnMission
-- @param #BRIGADE self
-- @param #number delay Delay in seconds.
-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
--- On after "ArmyOnMission" event.
-- @function [parent=#BRIGADE] OnAfterArmyOnMission
-- @param #BRIGADE self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- User Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Add a platoon to the brigade.
-- @param #BRIGADE self
-- @param Ops.Platoon#PLATOON Platoon The platoon object.
-- @return #BRIGADE self
function BRIGADE:AddPlatoon(Platoon)
-- Add platoon to brigade.
table.insert(self.cohorts, Platoon)
-- Add assets to platoon.
self:AddAssetToPlatoon(Platoon, Platoon.Ngroups)
-- Set brigade of platoon.
Platoon:SetBrigade(self)
-- Start platoon.
if Platoon:IsStopped() then
Platoon:Start()
end
return self
end
--- Add asset group(s) to platoon.
-- @param #BRIGADE self
-- @param Ops.Platoon#PLATOON Platoon The platoon object.
-- @param #number Nassets Number of asset groups to add.
-- @return #BRIGADE self
function BRIGADE:AddAssetToPlatoon(Platoon, Nassets)
if Platoon then
-- Get the template group of the platoon.
local Group=GROUP:FindByName(Platoon.templatename)
if Group then
-- Debug text.
local text=string.format("Adding asset %s to platoon %s", Group:GetName(), Platoon.name)
self:T(self.lid..text)
-- Add assets to airwing warehouse.
self:AddAsset(Group, Nassets, nil, nil, nil, nil, Platoon.skill, Platoon.livery, Platoon.name)
else
self:E(self.lid.."ERROR: Group does not exist!")
end
else
self:E(self.lid.."ERROR: Platoon does not exit!")
end
return self
end
--- Define a set of retreat zones.
-- @param #BRIGADE self
-- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
-- @return #BRIGADE self
function BRIGADE:SetRetreatZones(RetreatZoneSet)
self.retreatZones=RetreatZoneSet or SET_ZONE:New()
return self
end
--- Add a retreat zone.
-- @param #BRIGADE self
-- @param Core.Zone#ZONE RetreatZone Retreat zone.
-- @return #BRIGADE self
function BRIGADE:AddRetreatZone(RetreatZone)
self.retreatZones:AddZone(RetreatZone)
return self
end
--- Get retreat zones.
-- @param #BRIGADE self
-- @return Core.Set#SET_ZONE Set of retreat zones.
function BRIGADE:GetRetreatZones()
return self.retreatZones
end
--- Add a rearming zone.
-- @param #BRIGADE self
-- @param Core.Zone#ZONE RearmingZone Rearming zone.
-- @return #BRIGADE.SupplyZone The rearming zone data.
function BRIGADE:AddRearmingZone(RearmingZone)
local rearmingzone={} --#BRIGADE.SupplyZone
rearmingzone.zone=RearmingZone
rearmingzone.mission=nil
rearmingzone.marker=MARKER:New(rearmingzone.zone:GetCoordinate(), "Rearming Zone"):ToCoalition(self:GetCoalition())
table.insert(self.rearmingZones, rearmingzone)
return rearmingzone
end
--- Add a refuelling zone.
-- @param #BRIGADE self
-- @param Core.Zone#ZONE RefuellingZone Refuelling zone.
-- @return #BRIGADE.SupplyZone The refuelling zone data.
function BRIGADE:AddRefuellingZone(RefuellingZone)
local supplyzone={} --#BRIGADE.SupplyZone
supplyzone.zone=RefuellingZone
supplyzone.mission=nil
supplyzone.marker=MARKER:New(supplyzone.zone:GetCoordinate(), "Refuelling Zone"):ToCoalition(self:GetCoalition())
table.insert(self.refuellingZones, supplyzone)
return supplyzone
end
--- Get platoon by name.
-- @param #BRIGADE self
-- @param #string PlatoonName Name of the platoon.
-- @return Ops.Platoon#PLATOON The Platoon object.
function BRIGADE:GetPlatoon(PlatoonName)
local platoon=self:_GetCohort(PlatoonName)
return platoon
end
--- Get platoon of an asset.
-- @param #BRIGADE self
-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
-- @return Ops.Platoon#PLATOON The platoon object.
function BRIGADE:GetPlatoonOfAsset(Asset)
local platoon=self:GetPlatoon(Asset.squadname)
return platoon
end
--- Remove asset from platoon.
-- @param #BRIGADE self
-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
function BRIGADE:RemoveAssetFromPlatoon(Asset)
local platoon=self:GetPlatoonOfAsset(Asset)
if platoon then
platoon:DelAsset(Asset)
end
end
--- [ GROUND ] Function to load back an asset in the field that has been filed before.
-- @param #BRIGADE self
-- @param #string Templatename e.g."1 PzDv LogRg I\_AID-976" - that's the alias (name) of an platoon spawned as `"platoon - alias"_AID-"asset-ID"`
-- @param Core.Point#COORDINATE Position where to spawn the platoon
-- @return #BRIGADE self
-- @usage
-- Prerequisites:
-- Save the assets spawned by BRIGADE/CHIEF regularly (~every 5 mins) into a file, e.g. like this:
--
-- local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
-- local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename
-- local BlueSaveOps = SET_OPSGROUP:New():FilterCoalitions("blue"):FilterCategoryGround():FilterOnce()
-- UTILS.SaveSetOfOpsGroups(BlueSaveOps,Path,BlueOpsFilename)
--
-- where Path and Filename are strings, as chosen by you.
-- You can then load back the assets at the start of your next mission run. Be aware that it takes a couple of seconds for the
-- platoon data to arrive in brigade, so make this an action after ~20 seconds, e.g. like so:
--
-- function LoadBackAssets()
-- local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
-- local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename
-- if UTILS.CheckFileExists(Path,BlueOpsFilename) then
-- local loadback = UTILS.LoadSetOfOpsGroups(Path,BlueOpsFilename,false)
-- for _,_platoondata in pairs (loadback) do
-- local groupname = _platoondata.groupname -- #string
-- local coordinate = _platoondata.coordinate -- Core.Point#COORDINATE
-- Your_Brigade:LoadBackAssetInPosition(groupname,coordinate)
-- end
-- end
-- end
--
-- local AssetLoader = TIMER:New(LoadBackAssets)
-- AssetLoader:Start(20)
--
-- The assets loaded back into the mission will be considered for AUFTRAG type missions from CHIEF and BRIGADE.
function BRIGADE:LoadBackAssetInPosition(Templatename,Position)
self:T(self.lid .. "LoadBackAssetInPosition: " .. tostring(Templatename))
-- get Platoon alias from Templatename
local nametbl = UTILS.Split(Templatename,"_")
local name = nametbl[1]
self:T(string.format("*** Target Platoon = %s ***",name))
-- find a matching asset table from BRIGADE
local cohorts = self.cohorts or {}
local thisasset = nil --Functional.Warehouse#WAREHOUSE.Assetitem
local found = false
for _,_cohort in pairs(cohorts) do
local asset = _cohort:GetName()
self:T(string.format("*** Looking at Platoon = %s ***",asset))
if asset == name then
self:T("**** Found Platoon ****")
local cohassets = _cohort.assets or {}
for _,_zug in pairs (cohassets) do
local zug = _zug -- Functional.Warehouse#WAREHOUSE.Assetitem
if zug.assignment == name and zug.requested == false then
self:T("**** Found Asset ****")
found = true
thisasset = zug --Functional.Warehouse#WAREHOUSE.Assetitem
break
end
end
end
end
if found then
-- prep asset
thisasset.rid = thisasset.uid
thisasset.requested = false
thisasset.score=100
thisasset.missionTask="CAS"
thisasset.spawned = true
local template = thisasset.templatename
local alias = thisasset.spawngroupname
-- Spawn group
local spawnasset = SPAWN:NewWithAlias(template,alias)
:InitDelayOff()
:SpawnFromCoordinate(Position)
-- build a new self request
local request = {} --Functional.Warehouse#WAREHOUSE.Pendingitem
request.assignment = name
request.warehouse = self
request.assets = {thisasset}
request.ntransporthome = 0
request.ndelivered = 0
request.ntransport = 0
request.cargoattribute = thisasset.attribute
request.category = thisasset.category
request.cargoassets = {thisasset}
request.assetdesc = WAREHOUSE.Descriptor.ASSETLIST
request.cargocategory = thisasset.category
request.toself = true
request.transporttype = WAREHOUSE.TransportType.SELFPROPELLED
request.assetproblem = {}
request.born = true
request.prio = 50
request.uid = thisasset.uid
request.airbase = nil
request.timestamp = timer.getAbsTime()
request.assetdescval = {thisasset}
request.nasset = 1
request.cargogroupset = SET_GROUP:New()
request.cargogroupset:AddGroup(spawnasset)
request.iscargo = true
-- Call Brigade self
self:__AssetSpawned(2, spawnasset, thisasset, request)
end
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- FSM Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start BRIGADE FSM.
-- @param #BRIGADE self
function BRIGADE:onafterStart(From, Event, To)
-- Start parent Warehouse.
self:GetParent(self, BRIGADE).onafterStart(self, From, Event, To)
-- Info.
self:I(self.lid..string.format("Starting BRIGADE v%s", BRIGADE.version))
end
--- Update status.
-- @param #BRIGADE self
function BRIGADE:onafterStatus(From, Event, To)
-- Status of parent Warehouse.
self:GetParent(self).onafterStatus(self, From, Event, To)
-- FSM state.
local fsmstate=self:GetState()
----------------
-- Transport ---
----------------
self:CheckTransportQueue()
--------------
-- Mission ---
--------------
-- Check if any missions should be cancelled.
self:CheckMissionQueue()
---------------------
-- Rearming Zones ---
---------------------
for _,_rearmingzone in pairs(self.rearmingZones) do
local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
if (not rearmingzone.mission) or rearmingzone.mission:IsOver() then
rearmingzone.mission=AUFTRAG:NewAMMOSUPPLY(rearmingzone.zone)
self:AddMission(rearmingzone.mission)
end
end
-----------------------
-- Refuelling Zones ---
-----------------------
-- Check refuelling zones.
for _,_supplyzone in pairs(self.refuellingZones) do
local supplyzone=_supplyzone --#BRIGADE.SupplyZone
-- Check if mission is nil or over.
if (not supplyzone.mission) or supplyzone.mission:IsOver() then
supplyzone.mission=AUFTRAG:NewFUELSUPPLY(supplyzone.zone)
self:AddMission(supplyzone.mission)
end
end
-----------
-- Info ---
-----------
-- Display tactival overview.
self:_TacticalOverview()
-- General info:
if self.verbose>=1 then
-- Count missions not over yet.
local Nmissions=self:CountMissionsInQueue()
-- Asset count.
local Npq, Np, Nq=self:CountAssetsOnMission()
-- Asset string.
local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
-- Output.
local text=string.format("%s: Missions=%d, Platoons=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
self:I(self.lid..text)
end
------------------
-- Mission Info --
------------------
if self.verbose>=2 then
local text=string.format("Missions Total=%d:", #self.missionqueue)
for i,_mission in pairs(self.missionqueue) do
local mission=_mission --Ops.Auftrag#AUFTRAG
local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
end
self:I(self.lid..text)
end
--------------------
-- Transport Info --
--------------------
if self.verbose>=2 then
local text=string.format("Transports Total=%d:", #self.transportqueue)
for i,_transport in pairs(self.transportqueue) do
local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
end
self:I(self.lid..text)
end
-------------------
-- Platoon Info --
-------------------
if self.verbose>=3 then
local text="Platoons:"
for i,_platoon in pairs(self.cohorts) do
local platoon=_platoon --Ops.Platoon#PLATOON
local callsign=platoon.callsignName and UTILS.GetCallsignName(platoon.callsignName) or "N/A"
local modex=platoon.modex and platoon.modex or -1
local skill=platoon.skill and tostring(platoon.skill) or "N/A"
-- Platoon text.
text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", platoon.name, platoon:GetState(), platoon.aircrafttype, platoon:CountAssets(true), #platoon.assets, callsign, modex, skill)
end
self:I(self.lid..text)
end
-------------------
-- Rearming Info --
-------------------
if self.verbose>=4 then
local text="Rearming Zones:"
for i,_rearmingzone in pairs(self.rearmingZones) do
local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
-- Info text.
text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", rearmingzone.zone:GetName(), rearmingzone.mission:GetState(), rearmingzone.mission:CountOpsGroups())
end
self:I(self.lid..text)
end
---------------------
-- Refuelling Info --
---------------------
if self.verbose>=4 then
local text="Refuelling Zones:"
for i,_refuellingzone in pairs(self.refuellingZones) do
local refuellingzone=_refuellingzone --#BRIGADE.SupplyZone
-- Info text.
text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", refuellingzone.zone:GetName(), refuellingzone.mission:GetState(), refuellingzone.mission:CountOpsGroups())
end
self:I(self.lid..text)
end
----------------
-- Asset Info --
----------------
if self.verbose>=5 then
local text="Assets in stock:"
for i,_asset in pairs(self.stock) do
local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
-- Info text.
text=text..string.format("\n* %s: spawned=%s", asset.spawngroupname, tostring(asset.spawned))
end
self:I(self.lid..text)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- FSM Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- On after "ArmyOnMission".
-- @param #BRIGADE self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
function BRIGADE:onafterArmyOnMission(From, Event, To, ArmyGroup, Mission)
-- Debug info.
self:T(self.lid..string.format("Group %s on %s mission %s", ArmyGroup:GetName(), Mission:GetType(), Mission:GetName()))
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+428
View File
@@ -0,0 +1,428 @@
--- **Ops** - Fleet Warehouse.
--
-- **Main Features:**
--
-- * Manage flotillas
-- * Carry out ARTY and PATROLZONE missions (AUFTRAG)
--
-- ===
--
-- ## Example Missions:
--
-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Fleet).
--
-- ===
--
-- ### Author: **funkyfranky**
--
-- ===
-- @module Ops.Fleet
-- @image OPS_Fleet.png
--- FLEET class.
-- @type FLEET
-- @field #string ClassName Name of the class.
-- @field #number verbose Verbosity of output.
-- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
-- @field #boolean pathfinding Set pathfinding on for all spawned navy groups.
-- @extends Ops.Legion#LEGION
--- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
--
-- ===
--
-- # The FLEET Concept
--
-- A FLEET consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
--
-- # Basic Setup
--
-- A new `FLEET` object can be created with the @{#FLEET.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
-- and `FleetName` is the name you want to give the fleet. This must be *unique*!
--
-- myFleet=FLEET:New("myWarehouseName", "1st Fleet")
-- myFleet:SetPortZone(ZonePort1stFleet)
-- myFleet:Start()
--
-- A fleet needs a *port zone*, which is set via the @{#FLEET.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
--
-- Finally, the fleet needs to be started using the @{#FLEET.Start}() function. If the fleet is not started, it will not process any requests.
--
-- ## Adding Flotillas
--
-- Flotillas can be added via the @{#FLEET.AddFlotilla}(`Flotilla`) function. See @{Ops.Flotilla#FLOTILLA} for how to create a flotilla.
--
-- myFleet:AddFlotilla(FlotillaTiconderoga)
-- myFleet:AddFlotilla(FlotillaPerry)
--
--
--
-- @field #FLEET
FLEET = {
ClassName = "FLEET",
verbose = 0,
pathfinding = false,
}
--- Supply Zone.
-- @type FLEET.SupplyZone
-- @field Core.Zone#ZONE zone The zone.
-- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
-- @field #boolean markerOn If `true`, marker is on.
-- @field Wrapper.Marker#MARKER marker F10 marker.
--- FLEET class version.
-- @field #string version
FLEET.version="0.0.1"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- ToDo list
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Add routes?
-- DONE: Add weapon range.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a new FLEET class object.
-- @param #FLEET self
-- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
-- @param #string FleetName Name of the fleet.
-- @return #FLEET self
function FLEET:New(WarehouseName, FleetName)
-- Inherit everything from LEGION class.
local self=BASE:Inherit(self, LEGION:New(WarehouseName, FleetName)) -- #FLEET
-- Nil check.
if not self then
BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
return nil
end
-- Set some string id for output to DCS.log file.
self.lid=string.format("FLEET %s | ", self.alias)
-- Defaults
self:SetRetreatZones()
-- Turn ship into NAVYGROUP.
if self:IsShip() then
local wh=self.warehouse --Wrapper.Unit#UNIT
local group=wh:GetGroup()
self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
end
-- Add FSM transitions.
-- From State --> Event --> To State
self:AddTransition("*", "NavyOnMission", "*") -- An NAVYGROUP was send on a Mission (AUFTRAG).
------------------------
--- Pseudo Functions ---
------------------------
--- Triggers the FSM event "Start". Starts the FLEET. Initializes parameters and starts event handlers.
-- @function [parent=#FLEET] Start
-- @param #FLEET self
--- Triggers the FSM event "Start" after a delay. Starts the FLEET. Initializes parameters and starts event handlers.
-- @function [parent=#FLEET] __Start
-- @param #FLEET self
-- @param #number delay Delay in seconds.
--- Triggers the FSM event "Stop". Stops the FLEET and all its event handlers.
-- @param #FLEET self
--- Triggers the FSM event "Stop" after a delay. Stops the FLEET and all its event handlers.
-- @function [parent=#FLEET] __Stop
-- @param #FLEET self
-- @param #number delay Delay in seconds.
--- Triggers the FSM event "NavyOnMission".
-- @function [parent=#FLEET] NavyOnMission
-- @param #FLEET self
-- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
--- Triggers the FSM event "NavyOnMission" after a delay.
-- @function [parent=#FLEET] __NavyOnMission
-- @param #FLEET self
-- @param #number delay Delay in seconds.
-- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
--- On after "NavyOnMission" event.
-- @function [parent=#FLEET] OnAfterNavyOnMission
-- @param #FLEET self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param Ops.NavyGroup#NAVYGROUP NavyGroup The NAVYGROUP on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The mission.
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- User Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Add a flotilla to the fleet.
-- @param #FLEET self
-- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
-- @return #FLEET self
function FLEET:AddFlotilla(Flotilla)
-- Add flotilla to fleet.
table.insert(self.cohorts, Flotilla)
-- Add assets to flotilla.
self:AddAssetToFlotilla(Flotilla, Flotilla.Ngroups)
-- Set fleet of flotilla.
Flotilla:SetFleet(self)
-- Start flotilla.
if Flotilla:IsStopped() then
Flotilla:Start()
end
return self
end
--- Add asset group(s) to flotilla.
-- @param #FLEET self
-- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
-- @param #number Nassets Number of asset groups to add.
-- @return #FLEET self
function FLEET:AddAssetToFlotilla(Flotilla, Nassets)
if Flotilla then
-- Get the template group of the flotilla.
local Group=GROUP:FindByName(Flotilla.templatename)
if Group then
-- Debug text.
local text=string.format("Adding asset %s to flotilla %s", Group:GetName(), Flotilla.name)
self:T(self.lid..text)
-- Add assets to airwing warehouse.
self:AddAsset(Group, Nassets, nil, nil, nil, nil, Flotilla.skill, Flotilla.livery, Flotilla.name)
else
self:E(self.lid.."ERROR: Group does not exist!")
end
else
self:E(self.lid.."ERROR: Flotilla does not exit!")
end
return self
end
--- Set pathfinding for all spawned naval groups.
-- @param #FLEET self
-- @param #boolean Switch If `true`, pathfinding is used.
-- @return #FLEET self
function FLEET:SetPathfinding(Switch)
self.pathfinding=Switch
return self
end
--- Define a set of retreat zones.
-- @param #FLEET self
-- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
-- @return #FLEET self
function FLEET:SetRetreatZones(RetreatZoneSet)
self.retreatZones=RetreatZoneSet or SET_ZONE:New()
return self
end
--- Add a retreat zone.
-- @param #FLEET self
-- @param Core.Zone#ZONE RetreatZone Retreat zone.
-- @return #FLEET self
function FLEET:AddRetreatZone(RetreatZone)
self.retreatZones:AddZone(RetreatZone)
return self
end
--- Get retreat zones.
-- @param #FLEET self
-- @return Core.Set#SET_ZONE Set of retreat zones.
function FLEET:GetRetreatZones()
return self.retreatZones
end
--- Get flotilla by name.
-- @param #FLEET self
-- @param #string FlotillaName Name of the flotilla.
-- @return Ops.Flotilla#FLOTILLA The Flotilla object.
function FLEET:GetFlotilla(FlotillaName)
local flotilla=self:_GetCohort(FlotillaName)
return flotilla
end
--- Get flotilla of an asset.
-- @param #FLEET self
-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
-- @return Ops.Flotilla#FLOTILLA The flotilla object.
function FLEET:GetFlotillaOfAsset(Asset)
local flotilla=self:GetFlotilla(Asset.squadname)
return flotilla
end
--- Remove asset from flotilla.
-- @param #FLEET self
-- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
function FLEET:RemoveAssetFromFlotilla(Asset)
local flotilla=self:GetFlotillaOfAsset(Asset)
if flotilla then
flotilla:DelAsset(Asset)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- FSM Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start FLEET FSM.
-- @param #FLEET self
function FLEET:onafterStart(From, Event, To)
-- Start parent Warehouse.
self:GetParent(self, FLEET).onafterStart(self, From, Event, To)
-- Info.
self:I(self.lid..string.format("Starting FLEET v%s", FLEET.version))
end
--- Update status.
-- @param #FLEET self
function FLEET:onafterStatus(From, Event, To)
-- Status of parent Warehouse.
self:GetParent(self).onafterStatus(self, From, Event, To)
-- FSM state.
local fsmstate=self:GetState()
----------------
-- Transport ---
----------------
self:CheckTransportQueue()
--------------
-- Mission ---
--------------
-- Check if any missions should be cancelled.
self:CheckMissionQueue()
-----------
-- Info ---
-----------
-- Display tactival overview.
self:_TacticalOverview()
-- General info:
if self.verbose>=1 then
-- Count missions not over yet.
local Nmissions=self:CountMissionsInQueue()
-- Asset count.
local Npq, Np, Nq=self:CountAssetsOnMission()
-- Asset string.
local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
-- Output.
local text=string.format("%s: Missions=%d, Flotillas=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
self:I(self.lid..text)
end
------------------
-- Mission Info --
------------------
if self.verbose>=2 then
local text=string.format("Missions Total=%d:", #self.missionqueue)
for i,_mission in pairs(self.missionqueue) do
local mission=_mission --Ops.Auftrag#AUFTRAG
local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
end
self:I(self.lid..text)
end
--------------------
-- Transport Info --
--------------------
if self.verbose>=2 then
local text=string.format("Transports Total=%d:", #self.transportqueue)
for i,_transport in pairs(self.transportqueue) do
local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
end
self:I(self.lid..text)
end
-------------------
-- Flotilla Info --
-------------------
if self.verbose>=3 then
local text="Flotillas:"
for i,_flotilla in pairs(self.cohorts) do
local flotilla=_flotilla --Ops.Flotilla#FLOTILLA
local callsign=flotilla.callsignName and UTILS.GetCallsignName(flotilla.callsignName) or "N/A"
local modex=flotilla.modex and flotilla.modex or -1
local skill=flotilla.skill and tostring(flotilla.skill) or "N/A"
-- Flotilla text.
text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", flotilla.name, flotilla:GetState(), flotilla.aircrafttype, flotilla:CountAssets(true), #flotilla.assets, callsign, modex, skill)
end
self:I(self.lid..text)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- FSM Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- On after "NavyOnMission".
-- @param #FLEET self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
-- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
-- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
function FLEET:onafterNavyOnMission(From, Event, To, NavyGroup, Mission)
-- Debug info.
self:T(self.lid..string.format("Group %s on %s mission %s", NavyGroup:GetName(), Mission:GetType(), Mission:GetName()))
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+175
View File
@@ -0,0 +1,175 @@
--- **Ops** - Flotilla is a small naval group belonging to a fleet.
--
-- **Main Features:**
--
-- * Set parameters like livery, skill valid for all flotilla members.
-- * Define mission types, this flotilla can perform (see Ops.Auftrag#AUFTRAG).
-- * Pause/unpause flotilla operations.
--
-- ===
--
-- ### Author: **funkyfranky**
--
-- ===
-- @module Ops.Flotilla
-- @image OPS_Flotilla.png
--- FLOTILLA class.
-- @type FLOTILLA
-- @field #string ClassName Name of the class.
-- @field #number verbose Verbosity level.
-- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
-- @extends Ops.Cohort#COHORT
--- *No captain can do very wrong if he places his ship alongside that of an enemy.* -- Horation Nelson
--
-- ===
--
-- # The FLOTILLA Concept
--
-- A FLOTILLA is an essential part of a FLEET.
--
--
--
-- @field #FLOTILLA
FLOTILLA = {
ClassName = "FLOTILLA",
verbose = 0,
weaponData = {},
}
--- FLOTILLA class version.
-- @field #string version
FLOTILLA.version="0.1.0"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: A lot.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a new FLOTILLA object and start the FSM.
-- @param #FLOTILLA self
-- @param #string TemplateGroupName Name of the template group.
-- @param #number Ngroups Number of asset groups of this flotilla. Default 3.
-- @param #string FlotillaName Name of the flotilla. Must be **unique**!
-- @return #FLOTILLA self
function FLOTILLA:New(TemplateGroupName, Ngroups, FlotillaName)
-- Inherit everything from COHORT class.
local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, FlotillaName)) -- #FLOTILLA
-- All flotillas get mission type Nothing.
self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
-- Is naval.
self.isNaval=true
-- Get initial ammo.
self.ammo=self:_CheckAmmo()
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- User functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Flotilla specific user functions.
--- Set fleet of this flotilla.
-- @param #FLOTILLA self
-- @param Ops.Fleet#FLEET Fleet The fleet.
-- @return #FLOTILLA self
function FLOTILLA:SetFleet(Fleet)
self.legion=Fleet
return self
end
--- Get fleet of this flotilla.
-- @param #FLOTILLA self
-- @return Ops.Fleet#FLEET The fleet.
function FLOTILLA:GetFleet()
return self.legion
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Start & Status
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
-- @param #FLOTILLA self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function FLOTILLA:onafterStart(From, Event, To)
-- Short info.
local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
self:I(self.lid..text)
-- Start the status monitoring.
self:__Status(-1)
end
--- On after "Status" event.
-- @param #FLOTILLA self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function FLOTILLA:onafterStatus(From, Event, To)
if self.verbose>=1 then
-- FSM state.
local fsmstate=self:GetState()
local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
local skill=self.skill and tostring(self.skill) or "N/A"
local NassetsTot=#self.assets
local NassetsInS=self:CountAssets(true)
local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0
if self.legion then
NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
end
-- Short info.
local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]",
fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
self:T(self.lid..text)
-- Weapon data info.
if self.verbose>=3 and self.weaponData then
local text="Weapon Data:"
for bit,_weapondata in pairs(self.weaponData) do
local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
end
self:I(self.lid..text)
end
-- Check if group has detected any units.
self:_CheckAssetStatus()
end
if not self:IsStopped() then
self:__Status(-60)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Misc Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+175
View File
@@ -0,0 +1,175 @@
--- **Ops** - Brigade Platoon.
--
-- **Main Features:**
--
-- * Set parameters like livery, skill valid for all platoon members.
-- * Define modex and callsigns.
-- * Define mission types, this platoon can perform (see Ops.Auftrag#AUFTRAG).
-- * Pause/unpause platoon operations.
--
-- ===
--
-- ### Author: **funkyfranky**
-- @module Ops.Platoon
-- @image OPS_Platoon.png
--- PLATOON class.
-- @type PLATOON
-- @field #string ClassName Name of the class.
-- @field #number verbose Verbosity level.
-- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
-- @extends Ops.Cohort#COHORT
--- *Some cool cohort quote* -- Known Author
--
-- ===
--
-- # The PLATOON Concept
--
-- A PLATOON is essential part of an BRIGADE.
--
--
--
-- @field #PLATOON
PLATOON = {
ClassName = "PLATOON",
verbose = 0,
weaponData = {},
}
--- PLATOON class version.
-- @field #string version
PLATOON.version="0.1.0"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: A lot.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a new PLATOON object and start the FSM.
-- @param #PLATOON self
-- @param #string TemplateGroupName Name of the template group.
-- @param #number Ngroups Number of asset groups of this platoon. Default 3.
-- @param #string PlatoonName Name of the platoon. Must be **unique**!
-- @return #PLATOON self
function PLATOON:New(TemplateGroupName, Ngroups, PlatoonName)
-- Inherit everything from COHORT class.
local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, PlatoonName)) -- #PLATOON
-- All platoons get mission type Nothing.
self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
-- Is ground.
self.isGround=true
-- Get ammo.
self.ammo=self:_CheckAmmo()
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- User functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Platoon specific user functions.
--- Set brigade of this platoon.
-- @param #PLATOON self
-- @param Ops.Brigade#BRIGADE Brigade The brigade.
-- @return #PLATOON self
function PLATOON:SetBrigade(Brigade)
self.legion=Brigade
return self
end
--- Get brigade of this platoon.
-- @param #PLATOON self
-- @return Ops.Brigade#BRIGADE The brigade.
function PLATOON:GetBrigade()
return self.legion
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Start & Status
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--[[
--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
-- @param #PLATOON self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function PLATOON:onafterStart(From, Event, To)
-- Short info.
local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
self:I(self.lid..text)
-- Start the status monitoring.
self:__Status(-1)
end
]]
--- On after "Status" event.
-- @param #PLATOON self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function PLATOON:onafterStatus(From, Event, To)
if self.verbose>=1 then
-- FSM state.
local fsmstate=self:GetState()
local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
local skill=self.skill and tostring(self.skill) or "N/A"
local NassetsTot=#self.assets
local NassetsInS=self:CountAssets(true)
local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0
if self.legion then
NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
end
-- Short info.
local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]",
fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
self:T(self.lid..text)
-- Weapon data info.
if self.verbose>=3 and self.weaponData then
local text="Weapon Data:"
for bit,_weapondata in pairs(self.weaponData) do
local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
end
self:I(self.lid..text)
end
-- Check if group has detected any units.
self:_CheckAssetStatus()
end
if not self:IsStopped() then
self:__Status(-60)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Misc Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Misc functions.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+324
View File
@@ -0,0 +1,324 @@
--- **Ops** - Airwing Squadron.
--
-- **Main Features:**
--
-- * Set parameters like livery, skill valid for all squadron members.
-- * Define modex and callsigns.
-- * Define mission types, this squadron can perform (see Ops.Auftrag#AUFTRAG).
-- * Pause/unpause squadron operations.
--
-- ===
--
-- ### Author: **funkyfranky**
-- @module Ops.Squadron
-- @image OPS_Squadron.png
--- SQUADRON class.
-- @type SQUADRON
-- @field #string ClassName Name of the class.
-- @field #number verbose Verbosity level.
-- @field #string lid Class id string for output to DCS log file.
-- @field #string name Name of the squadron.
-- @field #string templatename Name of the template group.
-- @field #string aircrafttype Type of the airframe the squadron is using.
-- @field Wrapper.Group#GROUP templategroup Template group.
-- @field #number ngrouping User defined number of units in the asset group.
-- @field #table assets Squadron assets.
-- @field #table missiontypes Capabilities (mission types and performances) of the squadron.
-- @field #number fuellow Low fuel threshold.
-- @field #boolean fuellowRefuel If `true`, flight tries to refuel at the nearest tanker.
-- @field #number maintenancetime Time in seconds needed for maintenance of a returned flight.
-- @field #number repairtime Time in seconds for each
-- @field #string livery Livery of the squadron.
-- @field #number skill Skill of squadron members.
-- @field #number modex Modex.
-- @field #number modexcounter Counter to incease modex number for assets.
-- @field #string callsignName Callsign name.
-- @field #number callsigncounter Counter to increase callsign names for new assets.
-- @field #number Ngroups Number of asset flight groups this squadron has.
-- @field #number engageRange Mission range in meters.
-- @field #string attribute Generalized attribute of the squadron template group.
-- @field #number tankerSystem For tanker squads, the refuel system used (boom=0 or probpe=1). Default nil.
-- @field #number refuelSystem For refuelable squads, the refuel system used (boom=0 or probe=1). Default nil.
-- @field #table tacanChannel List of TACAN channels available to the squadron.
-- @field #number radioFreq Radio frequency in MHz the squad uses.
-- @field #number radioModu Radio modulation the squad uses.
-- @field #string takeoffType Take of type.
-- @field #table parkingIDs Parking IDs for this squadron.
-- @field #boolean despawnAfterLanding Aircraft are despawned after landing.
-- @field #boolean despawnAfterHolding Aircraft are despawned after holding.
-- @extends Ops.Cohort#COHORT
--- *It is unbelievable what a squadron of twelve aircraft did to tip the balance* -- Adolf Galland
--
-- ===
--
-- # The SQUADRON Concept
--
-- A SQUADRON is essential part of an @{Ops.Airwing#AIRWING} and consists of **one** type of aircraft.
--
--
--
-- @field #SQUADRON
SQUADRON = {
ClassName = "SQUADRON",
verbose = 0,
modex = nil,
modexcounter = 0,
callsignName = nil,
callsigncounter= 11,
tankerSystem = nil,
refuelSystem = nil,
}
--- SQUADRON class version.
-- @field #string version
SQUADRON.version="0.8.1"
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- DONE: Parking spots for squadrons?
-- DONE: Engage radius.
-- DONE: Modex.
-- DONE: Call signs.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a new SQUADRON object and start the FSM.
-- @param #SQUADRON self
-- @param #string TemplateGroupName Name of the template group.
-- @param #number Ngroups Number of asset groups of this squadron. Default 3.
-- @param #string SquadronName Name of the squadron, e.g. "VFA-37". Must be **unique**!
-- @return #SQUADRON self
function SQUADRON:New(TemplateGroupName, Ngroups, SquadronName)
-- Inherit everything from FSM class.
local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, SquadronName)) -- #SQUADRON
-- Everyone can ORBIT.
self:AddMissionCapability(AUFTRAG.Type.ORBIT)
-- Is air.
self.isAir=true
-- Refueling system.
self.refuelSystem=select(2, self.templategroup:GetUnit(1):IsRefuelable())
self.tankerSystem=select(2, self.templategroup:GetUnit(1):IsTanker())
------------------------
--- Pseudo Functions ---
------------------------
-- See COHORT class
return self
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- User functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Set number of units in groups.
-- @param #SQUADRON self
-- @param #number nunits Number of units. Must be >=1 and <=4. Default 2.
-- @return #SQUADRON self
function SQUADRON:SetGrouping(nunits)
self.ngrouping=nunits or 2
if self.ngrouping<1 then self.ngrouping=1 end
if self.ngrouping>4 then self.ngrouping=4 end
return self
end
--- Set valid parking spot IDs. Assets of this squad are only allowed to be spawned at these parking spots. **Note** that the IDs are different from the ones displayed in the mission editor!
-- @param #SQUADRON self
-- @param #table ParkingIDs Table of parking ID numbers or a single `#number`.
-- @return #SQUADRON self
function SQUADRON:SetParkingIDs(ParkingIDs)
if type(ParkingIDs)~="table" then
ParkingIDs={ParkingIDs}
end
self.parkingIDs=ParkingIDs
return self
end
--- Set takeoff type. All assets of this squadron will be spawned with cold (default) or hot engines.
-- Spawning on runways is not supported.
-- @param #SQUADRON self
-- @param #string TakeoffType Take off type: "Cold" (default) or "Hot" with engines on or "Air" for spawning in air.
-- @return #SQUADRON self
function SQUADRON:SetTakeoffType(TakeoffType)
TakeoffType=TakeoffType or "Cold"
if TakeoffType:lower()=="hot" then
self.takeoffType=COORDINATE.WaypointType.TakeOffParkingHot
elseif TakeoffType:lower()=="cold" then
self.takeoffType=COORDINATE.WaypointType.TakeOffParking
elseif TakeoffType:lower()=="air" then
self.takeoffType=COORDINATE.WaypointType.TurningPoint
else
self.takeoffType=COORDINATE.WaypointType.TakeOffParking
end
return self
end
--- Set takeoff type cold (default). All assets of this squadron will be spawned with engines off (cold).
-- @param #SQUADRON self
-- @return #SQUADRON self
function SQUADRON:SetTakeoffCold()
self:SetTakeoffType("Cold")
return self
end
--- Set takeoff type hot. All assets of this squadron will be spawned with engines on (hot).
-- @param #SQUADRON self
-- @return #SQUADRON self
function SQUADRON:SetTakeoffHot()
self:SetTakeoffType("Hot")
return self
end
--- Set takeoff type air. All assets of this squadron will be spawned in air above the airbase.
-- @param #SQUADRON self
-- @return #SQUADRON self
function SQUADRON:SetTakeoffAir()
self:SetTakeoffType("Air")
return self
end
--- Set despawn after landing. Aircraft will be despawned after the landing event.
-- Can help to avoid DCS AI taxiing issues.
-- @param #SQUADRON self
-- @param #boolean Switch If `true` (default), activate despawn after landing.
-- @return #SQUADRON self
function SQUADRON:SetDespawnAfterLanding(Switch)
if Switch then
self.despawnAfterLanding=Switch
else
self.despawnAfterLanding=true
end
return self
end
--- Set despawn after holding. Aircraft will be despawned when they arrive at their holding position at the airbase.
-- Can help to avoid DCS AI taxiing issues.
-- @param #SQUADRON self
-- @param #boolean Switch If `true` (default), activate despawn after holding.
-- @return #SQUADRON self
function SQUADRON:SetDespawnAfterHolding(Switch)
if Switch then
self.despawnAfterHolding=Switch
else
self.despawnAfterHolding=true
end
return self
end
--- Set low fuel threshold.
-- @param #SQUADRON self
-- @param #number LowFuel Low fuel threshold in percent. Default 25.
-- @return #SQUADRON self
function SQUADRON:SetFuelLowThreshold(LowFuel)
self.fuellow=LowFuel or 25
return self
end
--- Set if low fuel threshold is reached, flight tries to refuel at the neares tanker.
-- @param #SQUADRON self
-- @param #boolean switch If true or nil, flight goes for refuelling. If false, turn this off.
-- @return #SQUADRON self
function SQUADRON:SetFuelLowRefuel(switch)
if switch==false then
self.fuellowRefuel=false
else
self.fuellowRefuel=true
end
return self
end
--- Set airwing.
-- @param #SQUADRON self
-- @param Ops.Airwing#AIRWING Airwing The airwing.
-- @return #SQUADRON self
function SQUADRON:SetAirwing(Airwing)
self.legion=Airwing
return self
end
--- Get airwing.
-- @param #SQUADRON self
-- @return Ops.Airwing#AIRWING The airwing.
function SQUADRON:GetAirwing(Airwing)
return self.legion
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Start & Status
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
-- @param #SQUADRON self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function SQUADRON:onafterStart(From, Event, To)
-- Short info.
local text=string.format("Starting SQUADRON", self.name)
self:T(self.lid..text)
-- Start the status monitoring.
self:__Status(-1)
end
--- On after "Status" event.
-- @param #SQUADRON self
-- @param #string From From state.
-- @param #string Event Event.
-- @param #string To To state.
function SQUADRON:onafterStatus(From, Event, To)
if self.verbose>=1 then
-- FSM state.
local fsmstate=self:GetState()
local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
local modex=self.modex and self.modex or -1
local skill=self.skill and tostring(self.skill) or "N/A"
local NassetsTot=#self.assets
local NassetsInS=self:CountAssets(true)
local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0
if self.legion then
NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
end
-- Short info.
local text=string.format("%s [Type=%s, Call=%s, Modex=%d, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]",
fsmstate, self.aircrafttype, callsign, modex, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
self:I(self.lid..text)
-- Check if group has detected any units.
self:_CheckAssetStatus()
end
if not self:IsStopped() then
self:__Status(-60)
end
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Misc Functions
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
File diff suppressed because it is too large Load Diff
@@ -181,7 +181,8 @@ COMMANDCENTER = {
}
--- @type COMMANDCENTER.AutoAssignMethods
---
-- @type COMMANDCENTER.AutoAssignMethods
COMMANDCENTER.AutoAssignMethods = {
["Random"] = 1,
["Distance"] = 2,
@@ -210,7 +211,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
self:SetMessageDuration(10)
self:HandleEvent( EVENTS.Birth,
--- @param #COMMANDCENTER self
-- @param #COMMANDCENTER self
-- @param Core.Event#EVENTDATA EventData
function( self, EventData )
if EventData.IniObjectCategory == 1 then
@@ -241,7 +242,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- -- - Assign the PlayerUnit to the Task if required.
-- -- - Send a message to the other players in the group that this player has joined.
-- self:HandleEvent( EVENTS.PlayerEnterUnit,
-- --- @param #COMMANDCENTER self
-- -- @param #COMMANDCENTER self
-- -- @param Core.Event#EVENTDATA EventData
-- function( self, EventData )
-- local PlayerUnit = EventData.IniUnit
@@ -258,7 +259,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.MissionEnd,
--- @param #TASK self
-- @param #TASK self
-- @param Core.Event#EVENTDATA EventData
function( self, EventData )
local PlayerUnit = EventData.IniUnit
@@ -273,7 +274,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.PlayerLeaveUnit,
--- @param #TASK self
-- @param #TASK self
-- @param Core.Event#EVENTDATA EventData
function( self, EventData )
local PlayerUnit = EventData.IniUnit
@@ -290,7 +291,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.Crash,
--- @param #TASK self
-- @param #TASK self
-- @param Core.Event#EVENTDATA EventData
function( self, EventData )
local PlayerUnit = EventData.IniUnit
@@ -48,7 +48,7 @@
do -- DETECTION MANAGER
--- @type DETECTION_MANAGER
-- @type DETECTION_MANAGER
-- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to.
-- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects.
-- @field Tasking.CommandCenter#COMMANDCENTER CC The command center that is used to communicate with the players.
@@ -62,7 +62,7 @@ do -- DETECTION MANAGER
Detection = nil,
}
--- @field Tasking.CommandCenter#COMMANDCENTER
-- @field Tasking.CommandCenter#COMMANDCENTER
DETECTION_MANAGER.CC = nil
--- FAC constructor.
+8 -7
View File
@@ -19,7 +19,8 @@
-- @module Tasking.Mission
-- @image Task_Mission.JPG
--- @type MISSION
---
-- @type MISSION
-- @field #MISSION.Clients _Clients
-- @field Core.Menu#MENU_COALITION MissionMenu
-- @field #string MissionBriefing
@@ -790,7 +791,7 @@ function MISSION:HasGroup( TaskGroup )
return Has
end
--- @param #MISSION self
-- @param #MISSION self
-- @return #number
function MISSION:GetTasksRemaining()
-- Determine how many tasks are remaining.
@@ -805,7 +806,7 @@ function MISSION:GetTasksRemaining()
return TasksRemaining
end
--- @param #MISSION self
-- @param #MISSION self
-- @return #number
function MISSION:GetTaskTypes()
-- Determine how many tasks are remaining.
@@ -865,7 +866,7 @@ end
---- - <xx> Aborted Tasks (xp)
---- - <xx> Failed Tasks (xp)
----
---- @param #MISSION self
-- @param #MISSION self
---- @return #string
--function MISSION:ReportSummary()
--
@@ -1175,7 +1176,7 @@ end
--- @param #MISSION self
-- @param #MISSION self
-- @param #string TaskStatus The status
-- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
@@ -1186,7 +1187,7 @@ function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
end
--- @param #MISSION self
-- @param #MISSION self
-- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportPlayersPerTask( ReportGroup )
@@ -1195,7 +1196,7 @@ function MISSION:MenuReportPlayersPerTask( ReportGroup )
self:GetCommandCenter():MessageTypeToGroup( Report, ReportGroup, MESSAGE.Type.Overview )
end
--- @param #MISSION self
-- @param #MISSION self
-- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportPlayersProgress( ReportGroup )
+6 -5
View File
@@ -220,7 +220,8 @@
-- @module Tasking.Task
-- @image MOOSE.JPG
--- @type TASK
---
-- @type TASK
-- @field Core.Scheduler#SCHEDULER TaskScheduler
-- @field Tasking.Mission#MISSION Mission
-- @field Core.Set#SET_GROUP SetGroup The Set of Groups assigned to the Task
@@ -726,7 +727,7 @@ function TASK:AddGroups( GroupSet )
GroupSet = GroupSet or SET_GROUP:New()
self.SetGroup:ForEachGroup(
--- @param Wrapper.Group#GROUP GroupSet
-- @param Wrapper.Group#GROUP GroupSet
function( GroupItem )
GroupSet:Add( GroupItem:GetName(), GroupItem)
end
@@ -819,7 +820,7 @@ end
do -- Group Assignment
--- @param #TASK self
-- @param #TASK self
-- @param Actions.Act_Assign#ACT_ASSIGN AcceptClass
function TASK:SetAssignMethod( AcceptClass )
@@ -1199,7 +1200,7 @@ function TASK:RemoveAssignedMenuForGroup( TaskGroup )
end
--- @param #TASK self
-- @param #TASK self
-- @param Wrapper.Group#GROUP TaskGroup
function TASK:MenuAssignToGroup( TaskGroup )
@@ -1208,7 +1209,7 @@ function TASK:MenuAssignToGroup( TaskGroup )
self:AssignToGroup( TaskGroup )
end
--- @param #TASK self
-- @param #TASK self
-- @param Wrapper.Group#GROUP TaskGroup
function TASK:MenuMarkToGroup( TaskGroup )
self:F()
+5 -3
View File
@@ -11,7 +11,8 @@
-- @module Tasking.TaskInfo
-- @image MOOSE.JPG
--- @type TASKINFO
---
-- @type TASKINFO
-- @extends Core.Base#BASE
---
@@ -29,7 +30,8 @@ TASKINFO = {
ClassName = "TASKINFO",
}
--- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report.
---
-- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report.
--
-- - "M" for Markings on the Map (F10).
-- - "S" for Summary Reports.
@@ -279,7 +281,7 @@ function TASKINFO:AddCargoSet( SetCargo, Order, Detail, Keep )
local CargoReport = REPORT:New()
CargoReport:Add( "" )
SetCargo:ForEachCargo(
--- @param Cargo.Cargo#CARGO Cargo
-- @param Cargo.Cargo#CARGO Cargo
function( Cargo )
CargoReport:Add( string.format( ' - %s (%s) %s - status %s ', Cargo:GetName(), Cargo:GetType(), Cargo:GetTransportationMethod(), Cargo:GetCurrentState() ) )
end
+12 -12
View File
@@ -173,19 +173,19 @@ do -- TASK_A2A
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Core.Set#SET_UNIT TargetSetUnit The set of targets.
function TASK_A2A:SetTargetSetUnit( TargetSetUnit )
self.TargetSetUnit = TargetSetUnit
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
function TASK_A2A:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Core.Point#COORDINATE RendezVousCoordinate The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
-- @param #number RendezVousRange The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
-- @param Wrapper.Unit#UNIT TaskUnit
@@ -198,7 +198,7 @@ do -- TASK_A2A
ActRouteRendezVous:SetRange( RendezVousRange )
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Point#COORDINATE The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
-- @return #number The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
@@ -210,7 +210,7 @@ do -- TASK_A2A
return ActRouteRendezVous:GetCoordinate(), ActRouteRendezVous:GetRange()
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Core.Zone#ZONE_BASE RendezVousZone The Zone object where the RendezVous is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetRendezVousZone( RendezVousZone, TaskUnit )
@@ -221,7 +221,7 @@ do -- TASK_A2A
ActRouteRendezVous:SetZone( RendezVousZone )
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the RendezVous is located on the map.
function TASK_A2A:GetRendezVousZone( TaskUnit )
@@ -232,7 +232,7 @@ do -- TASK_A2A
return ActRouteRendezVous:GetZone()
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Core.Point#COORDINATE TargetCoordinate The Coordinate object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit )
@@ -243,7 +243,7 @@ do -- TASK_A2A
ActRouteTarget:SetCoordinate( TargetCoordinate )
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Point#COORDINATE The Coordinate object where the Target is located on the map.
function TASK_A2A:GetTargetCoordinate( TaskUnit )
@@ -254,7 +254,7 @@ do -- TASK_A2A
return ActRouteTarget:GetCoordinate()
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetTargetZone( TargetZone, Altitude, Heading, TaskUnit )
@@ -265,7 +265,7 @@ do -- TASK_A2A
ActRouteTarget:SetZone( TargetZone, Altitude, Heading )
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_A2A:GetTargetZone( TaskUnit )
@@ -309,7 +309,7 @@ do -- TASK_A2A
self:__Goal( -10 )
end
--- @param #TASK_A2A self
-- @param #TASK_A2A self
function TASK_A2A:UpdateTaskInfo( DetectedItem )
if self:IsStatePlanned() or self:IsStateAssigned() then
@@ -501,7 +501,7 @@ do -- TASK_A2A_SWEEP
return self
end
--- @param #TASK_A2A_SWEEP self
-- @param #TASK_A2A_SWEEP self
function TASK_A2A_SWEEP:onafterGoal( TaskUnit, From, Event, To )
local TargetSetUnit = self.TargetSetUnit -- Core.Set#SET_UNIT
@@ -148,7 +148,7 @@ do -- TASK_A2A_DISPATCHER
--
-- TaskDispatcher = TASK_A2A_DISPATCHER:New( ... )
--
-- --- @param #TaskDispatcher self
-- -- @param #TaskDispatcher self
-- -- @param #string From Contains the name of the state from where the Event was triggered.
-- -- @param #string Event Contains the name of the event that was triggered. In this case Assign.
-- -- @param #string To Contains the name of the state that will be transitioned to.
+25 -25
View File
@@ -409,7 +409,7 @@
do -- TASK_CARGO
--- @type TASK_CARGO
-- @type TASK_CARGO
-- @extends Tasking.Task#TASK
--- Model tasks for players to transport Cargo.
@@ -620,7 +620,7 @@ do -- TASK_CARGO
Fsm:AddTransition( "Rejected", "Reject", "Aborted" )
Fsm:AddTransition( "Failed", "Fail", "Failed" )
---- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param #TASK_CARGO Task
function Fsm:OnAfterAssigned( TaskUnit, Task )
@@ -643,7 +643,7 @@ do -- TASK_CARGO
Task.SetCargo:ForEachCargo(
--- @param Cargo.Cargo#CARGO Cargo
-- @param Cargo.Cargo#CARGO Cargo
function( Cargo )
if Cargo:IsAlive() then
@@ -837,7 +837,7 @@ do -- TASK_CARGO
--#Wrapper.Unit#UNIT
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
-- @param From
@@ -857,7 +857,7 @@ do -- TASK_CARGO
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterArriveAtPickup( TaskUnit, Task )
@@ -873,7 +873,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterCancelRouteToPickup( TaskUnit, Task )
@@ -884,7 +884,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
function Fsm:onafterRouteToDeploy( TaskUnit, Task, From, Event, To, DeployZone )
self:F( { TaskUnit = TaskUnit, Task = Task and Task:GetClassNameAndID() } )
@@ -896,7 +896,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterArriveAtDeploy( TaskUnit, Task )
@@ -911,7 +911,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterCancelRouteToDeploy( TaskUnit, Task )
@@ -923,7 +923,7 @@ do -- TASK_CARGO
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLand( TaskUnit, Task, From, Event, To, Action )
@@ -958,7 +958,7 @@ do -- TASK_CARGO
end
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLanded( TaskUnit, Task, From, Event, To, Action )
@@ -991,7 +991,7 @@ do -- TASK_CARGO
end
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterPrepareBoarding( TaskUnit, Task, From, Event, To, Cargo )
@@ -1003,7 +1003,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterBoard( TaskUnit, Task, From, Event, To, Cargo )
@@ -1031,7 +1031,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterBoarded( TaskUnit, Task, From, Event, To, Cargo )
@@ -1046,7 +1046,7 @@ do -- TASK_CARGO
end
--- @param #FSM_PROCESS self
-- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLoad( TaskUnit, Task, From, Event, To, Cargo )
@@ -1195,26 +1195,26 @@ do -- TASK_CARGO
return self.SmokeColor
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
function TASK_CARGO:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @return Core.Set#SET_CARGO The Cargo Set.
function TASK_CARGO:GetCargoSet()
return self.SetCargo
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @return #list<Core.Zone#ZONE_BASE> The Deployment Zones.
function TASK_CARGO:GetDeployZones()
return self.DeployZones
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param AI.AI_Cargo#AI_CARGO Cargo The cargo.
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO
@@ -1237,7 +1237,7 @@ do -- TASK_CARGO
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO
@@ -1258,7 +1258,7 @@ do -- TASK_CARGO
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO
@@ -1269,7 +1269,7 @@ do -- TASK_CARGO
return self
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO
@@ -1280,7 +1280,7 @@ do -- TASK_CARGO
return self
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param #list<Core.Zone#ZONE> DeployZones
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO
@@ -1295,7 +1295,7 @@ do -- TASK_CARGO
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_CARGO:GetTargetZone( TaskUnit )
@@ -1364,7 +1364,7 @@ do -- TASK_CARGO
return self.GoalTotal
end
--- @param #TASK_CARGO self
-- @param #TASK_CARGO self
function TASK_CARGO:UpdateTaskInfo()
if self:IsStatePlanned() or self:IsStateAssigned() then
@@ -69,7 +69,7 @@ do -- TASK_CAPTURE_DISPATCHER
-- @extends Tasking.Task_Manager#TASK_MANAGER
-- @field TASK_CAPTURE_DISPATCHER.ZONE ZONE
--- @type TASK_CAPTURE_DISPATCHER.CSAR
-- @type TASK_CAPTURE_DISPATCHER.CSAR
-- @field Wrapper.Unit#UNIT PilotUnit
-- @field Tasking.Task#TASK Task
@@ -119,7 +119,7 @@ do -- TASK_ZONE_GOAL
end
--- @param #TASK_ZONE_GOAL self
-- @param #TASK_ZONE_GOAL self
-- @param Functional.ZoneGoal#ZONE_GOAL ZoneGoal The ZoneGoal Engine.
function TASK_ZONE_GOAL:SetProtect( ZoneGoal )
@@ -128,13 +128,13 @@ do -- TASK_ZONE_GOAL
--- @param #TASK_ZONE_GOAL self
-- @param #TASK_ZONE_GOAL self
function TASK_ZONE_GOAL:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.ZoneGoal:GetZoneName() .. " )"
end
--- @param #TASK_ZONE_GOAL self
-- @param #TASK_ZONE_GOAL self
-- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit
function TASK_ZONE_GOAL:SetTargetZone( TargetZone, TaskUnit )
@@ -146,7 +146,7 @@ do -- TASK_ZONE_GOAL
end
--- @param #TASK_ZONE_GOAL self
-- @param #TASK_ZONE_GOAL self
-- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_ZONE_GOAL:GetTargetZone( TaskUnit )
@@ -286,7 +286,7 @@ do -- TASK_CAPTURE_ZONE
end
--- @param #TASK_CAPTURE_ZONE self
-- @param #TASK_CAPTURE_ZONE self
-- @param Wrapper.Unit#UNIT TaskUnit
function TASK_CAPTURE_ZONE:OnAfterGoal( From, Event, To, PlayerUnit, PlayerName )
@@ -72,8 +72,8 @@
do -- TASK_CARGO_CSAR
--- @type TASK_CARGO_CSAR
-- @extends Tasking.Task_CARGO#TASK_CARGO
-- @type TASK_CARGO_CSAR
-- @extends Tasking.Task_Cargo#TASK_CARGO
--- Orchestrates the task for players to execute CSAR for downed pilots.
--
@@ -77,7 +77,7 @@ do -- TASK_CARGO_DISPATCHER
-- @field TASK_CARGO_DISPATCHER.CSAR CSAR
-- @field Core.Set#SET_ZONE SetZonesCSAR
--- @type TASK_CARGO_DISPATCHER.CSAR
-- @type TASK_CARGO_DISPATCHER.CSAR
-- @field Wrapper.Unit#UNIT PilotUnit
-- @field Tasking.Task#TASK Task
@@ -285,7 +285,7 @@ do -- TASK_CARGO_TRANSPORT
local CargoReport = REPORT:New( "Transport Cargo. The following cargo needs to be transported including initial positions:")
SetCargo:ForEachCargo(
--- @param Core.Cargo#CARGO Cargo
-- @param Core.Cargo#CARGO Cargo
function( Cargo )
local CargoType = Cargo:GetType()
local CargoName = Cargo:GetName()
@@ -348,7 +348,7 @@ do -- TASK_CARGO_TRANSPORT
return CargoDeployed
end
--- @param #TASK_CARGO_TRANSPORT self
-- @param #TASK_CARGO_TRANSPORT self
function TASK_CARGO_TRANSPORT:onafterGoal( TaskUnit, From, Event, To )
local CargoSet = self.CargoSet
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Dynamic}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup/Moose_Create.lua&quot; &quot;D&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Dynamic}&quot; 1"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
</launchConfiguration>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Static}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Moose_Framework/lua54/lua54.exe}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${workspace_loc:/Moose_Framework/Moose Development/Moose}&quot; &quot;${workspace_loc:/Moose_Framework/Moose Setup}&quot;&#13;&#10;&quot;${workspace_loc:/Moose_Framework/MOOSE_INCLUDE\Moose_Include_Static}&quot; 1"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Moose_Framework}"/>
</launchConfiguration>
+35 -69
View File
@@ -2,7 +2,6 @@ Utilities/Enums.lua
Utilities/Utils.lua
Utilities/Enums.lua
Utilities/Profiler.lua
Utilities/Templates.lua
Utilities/STTS.lua
Utilities/FiFo.lua
Utilities/Socket.lua
@@ -17,23 +16,22 @@ Core/Event.lua
Core/Settings.lua
Core/Menu.lua
Core/Zone.lua
Core/Zone_Detection.lua
Core/Database.lua
Core/Set.lua
Core/Point.lua
Core/Velocity.lua
Core/Message.lua
Core/Fsm.lua
Core/Spawn.lua
Core/SpawnStatic.lua
Core/Timer.lua
Core/Goal.lua
Core/Spot.lua
Core/MarkerOps_Base.lua
Core/Astar.lua
Core/Condition.lua
Core/TextAndSound.lua
Core/Pathline.lua
Core/ClientMenu.lua
Core/Astar.lua
Core/MarkerOps_Base.lua
Wrapper/Object.lua
Wrapper/Identifiable.lua
@@ -51,26 +49,17 @@ Wrapper/Net.lua
Wrapper/Storage.lua
Wrapper/DynamicCargo.lua
Cargo/Cargo.lua
Cargo/CargoUnit.lua
Cargo/CargoSlingload.lua
Cargo/CargoCrate.lua
Cargo/CargoGroup.lua
Functional/Scoring.lua
Functional/CleanUp.lua
Functional/Movement.lua
Functional/Sead.lua
Functional/Escort.lua
Functional/MissileTrainer.lua
Functional/ATC_Ground.lua
Functional/Detection.lua
Functional/DetectionZones.lua
Functional/Designate.lua
Functional/RAT.lua
Functional/Range.lua
Functional/ZoneGoal.lua
Functional/ZoneGoalCoalition.lua
Functional/ZoneCaptureCoalition.lua
Functional/Artillery.lua
Functional/Suppression.lua
@@ -79,51 +68,45 @@ Functional/Warehouse.lua
Functional/Fox.lua
Functional/Mantis.lua
Functional/Shorad.lua
Functional/Autolase.lua
Functional/AICSAR.lua
Functional/AmmoTruck.lua
Functional/ZoneGoalCargo.lua
Functional/Tiresias.lua
Functional/Stratego.lua
Functional/ClientWatch.lua
Ops/Airboss.lua
Ops/RecoveryTanker.lua
Ops/RescueHelo.lua
Ops/ATIS.lua
Ops/CTLD.lua
Ops/Auftrag.lua
Ops/OpsGroup.lua
Ops/FlightGroup.lua
Ops/NavyGroup.lua
Ops/Cohort.lua
Ops/Squadron.lua
Ops/Platoon.lua
Ops/Flotilla.lua
Ops/Legion.lua
Ops/AirWing.lua
Ops/Brigade.lua
Ops/Fleet.lua
Ops/Intelligence.lua
Ops/Commander.lua
Ops/Chief.lua
Ops/CSAR.lua
AI/AI_Balancer.lua
AI/AI_Air.lua
AI/AI_Air_Patrol.lua
AI/AI_Air_Engage.lua
AI/AI_A2A_Patrol.lua
AI/AI_A2A_Cap.lua
AI/AI_A2A_Gci.lua
AI/AI_A2A_Dispatcher.lua
AI/AI_A2G_BAI.lua
AI/AI_A2G_CAS.lua
AI/AI_A2G_SEAD.lua
AI/AI_A2G_Dispatcher.lua
AI/AI_Patrol.lua
AI/AI_CAP.lua
AI/AI_CAS.lua
AI/AI_BAI.lua
AI/AI_Formation.lua
AI/AI_Escort.lua
AI/AI_Escort_Request.lua
AI/AI_Escort_Dispatcher.lua
AI/AI_Escort_Dispatcher_Request.lua
AI/AI_Cargo.lua
AI/AI_Cargo_APC.lua
AI/AI_Cargo_Helicopter.lua
AI/AI_Cargo_Airplane.lua
AI/AI_Cargo_Ship.lua
AI/AI_Cargo_Dispatcher.lua
AI/AI_Cargo_Dispatcher_APC.lua
AI/AI_Cargo_Dispatcher_Helicopter.lua
AI/AI_Cargo_Dispatcher_Airplane.lua
AI/AI_Cargo_Dispatcher_Ship.lua
Actions/Act_Assign.lua
Actions/Act_Route.lua
Actions/Act_Account.lua
Actions/Act_Assist.lua
Ops/CTLD.lua
Ops/Awacs.lua
Ops/Operation.lua
Ops/FlightControl.lua
Ops/PlayerTask.lua
Ops/PlayerRecce.lua
Ops/EasyGCICAP.lua
Ops/OpsZone.lua
Ops/ArmyGroup.lua
Ops/OpsTransport.lua
Ops/Target.lua
Sound/UserSound.lua
Sound/SoundOutput.lua
@@ -132,21 +115,4 @@ Sound/RadioQueue.lua
Sound/RadioSpeech.lua
Sound/SRS.lua
Tasking/CommandCenter.lua
Tasking/Mission.lua
Tasking/Task.lua
Tasking/TaskInfo.lua
Tasking/Task_Manager.lua
Tasking/DetectionManager.lua
Tasking/Task_A2G_Dispatcher.lua
Tasking/Task_A2G.lua
Tasking/Task_A2A_Dispatcher.lua
Tasking/Task_A2A.lua
Tasking/Task_CARGO.lua
Tasking/Task_Cargo_Transport.lua
Tasking/Task_Cargo_CSAR.lua
Tasking/Task_Cargo_Dispatcher.lua
Tasking/Task_Capture_Zone.lua
Tasking/Task_Capture_Dispatcher.lua
Globals.lua
+1 -1
View File
@@ -1,4 +1,4 @@
-- This routine is called from the LDT environment to create the Moose.lua file stub for use in .miz files.
--- This routine is called from the LDT environment to create the Moose.lua file stub for use in .miz files.
local MooseDynamicStatic = arg[1]
local MooseCommitHash = arg[2]

Some files were not shown because too many files have changed in this diff Show More