@jtff/miztemplate-lib 3.10.4 → 3.10.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lua/lib/Moose_.lua +57478 -17910
  2. package/lua/src/110-set_clients.lua +57 -57
  3. package/lua/src/120-tankers.lua +208 -209
  4. package/lua/src/130-airboss.lua +907 -562
  5. package/lua/src/150-awacs.lua +202 -203
  6. package/lua/src/176-random_air_traffic.lua +29 -27
  7. package/package.json +1 -1
  8. package/scripts/inject-scripts.js +0 -7
  9. package/lua/lib/Hercules_Cargo.lua +0 -686
package/lua/src/120-tankers.lua CHANGED
@@ -37,41 +37,41 @@ for index, tankerconfig in ipairs(TankersConfig) do
37
37
  self.escortGroupObject = spawnRecoveryTankerEscort(self.escortSpawnObject,self.customconfig)
38
38
  if self.customconfig.missionmaxduration then
39
39
  self.escortGroupObject:ScheduleOnce(self.customconfig.missionmaxduration*60,
40
- function(SpawnGroup, airBaseName)
41
- --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
42
- SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
43
- end,
44
- self.escortGroupObject,
45
- self.customconfig.baseUnit
40
+ function(SpawnGroup, airBaseName)
41
+ --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
42
+ SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
43
+ end,
44
+ self.escortGroupObject,
45
+ self.customconfig.baseUnit
46
46
  )
47
47
  --trigger.action.outText('Tanker-escort configured to RTB in : '..(self.customconfig.missionmaxduration)..' minutes max...', 45)
48
48
  end
49
49
  end
50
50
  if self.customconfig.missionmaxduration then
51
51
  (self.tanker):ScheduleOnce(self.customconfig.missionmaxduration*60,
52
- function(tankerObject, airBaseName)
53
- --trigger.action.outText('RTB schedule trigger Tanker group : '..(tankerObject.tanker.GroupName)..' airbase'..(tankerObject.customconfig.baseUnit)..'...', 45)
54
- tankerObject:RTB(AIRBASE:FindByName(tankerObject.customconfig.baseUnit))
55
- end,
56
- self
52
+ function(tankerObject, airBaseName)
53
+ --trigger.action.outText('RTB schedule trigger Tanker group : '..(tankerObject.tanker.GroupName)..' airbase'..(tankerObject.customconfig.baseUnit)..'...', 45)
54
+ tankerObject:RTB(AIRBASE:FindByName(tankerObject.customconfig.baseUnit))
55
+ end,
56
+ self
57
57
  )
58
58
  --trigger.action.outText('Tanker configured to RTB in : '..(self.customconfig.missionmaxduration)..' minutes max...', 45)
59
59
  end
60
60
  if (self.customconfig.benefit_coalition == coalition.side.RED) then
61
61
  self.menureset = MENU_COALITION_COMMAND:New(
62
- coalition.side.RED,
63
- "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
64
- MenuCoalitionTankerRed,
65
- resetRecoveryTanker,
66
- self
62
+ coalition.side.RED,
63
+ "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
64
+ MenuCoalitionTankerRed,
65
+ resetRecoveryTanker,
66
+ self
67
67
  )
68
68
  else
69
69
  self.menureset = MENU_COALITION_COMMAND:New(
70
- coalition.side.BLUE,
71
- "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
72
- MenuCoalitionTankerBlue,
73
- resetRecoveryTanker,
74
- self
70
+ coalition.side.BLUE,
71
+ "Reset Tanker "..self.customconfig.callsign.alias..'-'..self.customconfig.callsign.number..'-1',
72
+ MenuCoalitionTankerBlue,
73
+ resetRecoveryTanker,
74
+ self
75
75
  )
76
76
  end
77
77
  end
@@ -100,11 +100,11 @@ for index, tankerconfig in ipairs(TankersConfig) do
100
100
  jtff_log.info('Respawning escort Group '..self.escortGroupObject.GroupName,"TANKER")
101
101
  self.escortGroupObject = self.escortSpawnObject
102
102
  :SpawnAtAirbase(
103
- AIRBASE:FindByName(self.customconfig.baseUnit),
104
- SPAWN.Takeoff.Cold,
105
- self.customconfig.altitude,
106
- nil,
107
- true
103
+ AIRBASE:FindByName(self.customconfig.baseUnit),
104
+ SPAWN.Takeoff.Cold,
105
+ self.customconfig.altitude,
106
+ nil,
107
+ true
108
108
  )
109
109
  end
110
110
  end
@@ -118,7 +118,7 @@ end
118
118
  -- ** OnDemand Tankers **
119
119
  -- *********************************************************
120
120
  function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAnchorCoord, askedOrbitHeading, askedOrbitLeg)
121
- local TankerGroup = nil
121
+ local TankerGroup
122
122
  if (OnDemandTankersConfig) then
123
123
  for index, OnDemandTanker in ipairs(OnDemandTankersConfig) do
124
124
  if ((OnDemandTanker.type == type) and (OnDemandTanker.enable)) then
@@ -187,15 +187,15 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
187
187
 
188
188
  local is_tanker_spawned = false
189
189
  jtff_log.debug(string.format('Looking for a Group corresponding to template %s', string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)),"TANKER")
190
- for index, current_group in ipairs(aliveTankersGroupList) do
190
+ for currrent_index, current_group in ipairs(aliveTankersGroupList) do
191
191
  if (
192
- (not(is_tanker_spawned)) and
193
- (string.find(
194
- current_group.GroupName,
195
- string.format("%s-%s",OnDemandTanker.groupName, OnDemandTanker.type),
196
- 1,
197
- true
198
- ) ~= nil)
192
+ (not(is_tanker_spawned)) and
193
+ (string.find(
194
+ current_group.GroupName,
195
+ string.format("%s-%s",OnDemandTanker.groupName, OnDemandTanker.type),
196
+ 1,
197
+ true
198
+ ) ~= nil)
199
199
  ) then
200
200
  jtff_log.debug(string.format('Found %s corresponding to template %s', current_group.GroupName, string.format("%s-%s", OnDemandTanker.groupName, OnDemandTanker.type)),"TANKER")
201
201
  is_tanker_spawned = true
@@ -203,7 +203,7 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
203
203
  end
204
204
  end
205
205
 
206
- local RTBAirbase = nil
206
+ local RTBAirbase
207
207
  local TankerRoute = {}
208
208
  if (OnDemandTanker.baseUnit) then
209
209
  RTBAirbase = AIRBASE:FindByName(OnDemandTanker.baseUnit)
@@ -214,71 +214,71 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
214
214
  jtff_log.debug(string.format('OnDemandTanker already in air : rerouting %s', OnDemandTanker.groupName),"TANKER")
215
215
  TankerGroup:ClearTasks()
216
216
  table.insert(
217
- TankerRoute,
218
- askedAnchorCoord
219
- :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
220
- :WaypointAirTurningPoint(
221
- nil,
222
- UTILS.KnotsToKmph(OnDemandTanker.speed),
223
- {
217
+ TankerRoute,
218
+ askedAnchorCoord
219
+ :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
220
+ :WaypointAirTurningPoint(
221
+ nil,
222
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
223
+ {
224
+ {
225
+ id = 'Tanker',
226
+ params = {
227
+ }
228
+ },
229
+ {
230
+ id = 'ControlledTask',
231
+ params = {
232
+ task =
224
233
  {
225
- id = 'Tanker',
234
+ id = 'Orbit',
226
235
  params = {
236
+ pattern = AI.Task.OrbitPattern.RACE_TRACK,
237
+ speed = UTILS.KnotsToMps(OnDemandTanker.speed),
238
+ altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
227
239
  }
228
240
  },
229
- {
230
- id = 'ControlledTask',
231
- params = {
232
- task =
233
- {
234
- id = 'Orbit',
235
- params = {
236
- pattern = AI.Task.OrbitPattern.RACE_TRACK,
237
- speed = UTILS.KnotsToMps(OnDemandTanker.speed),
238
- altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
239
- }
240
- },
241
- stopCondition = {
242
- duration = askedDuration * 60
243
- }
244
- },
245
- },
241
+ stopCondition = {
242
+ duration = askedDuration * 60
243
+ }
246
244
  },
247
- "Refuel Start"
248
- )
245
+ },
246
+ },
247
+ "Refuel Start"
248
+ )
249
249
  )
250
250
  table.insert(
251
- TankerRoute,
252
- askedAnchorCoord
253
- :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
254
- :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
255
- :WaypointAirTurningPoint(
256
- nil,
257
- UTILS.KnotsToKmph(OnDemandTanker.speed),
258
- {
259
- {
260
- id = 'Tanker',
261
- params = {
262
- }
263
- },
264
- },
265
- "Orbit End"
266
- )
251
+ TankerRoute,
252
+ askedAnchorCoord
253
+ :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
254
+ :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
255
+ :WaypointAirTurningPoint(
256
+ nil,
257
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
258
+ {
259
+ {
260
+ id = 'Tanker',
261
+ params = {
262
+ }
263
+ },
264
+ },
265
+ "Orbit End"
266
+ )
267
267
  )
268
268
  table.insert(
269
- TankerRoute,
269
+ TankerRoute,
270
+ RTBAirbase
271
+ :GetCoordinate()
272
+ :WaypointAirLanding(
273
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
270
274
  RTBAirbase
271
- :GetCoordinate()
272
- :WaypointAirLanding(
273
- UTILS.KnotsToKmph(OnDemandTanker.speed),
274
- RTBAirbase
275
- )
275
+ )
276
276
  )
277
277
  else
278
278
  jtff_log.info(string.format('OnDemandTanker Spawning %s', OnDemandTanker.groupName),"TANKER")
279
279
  local SpawnTanker = SPAWN:NewWithAlias(
280
- OnDemandTanker.groupName,
281
- string.format("%s-%s",OnDemandTanker.groupName,OnDemandTanker.type)
280
+ OnDemandTanker.groupName,
281
+ string.format("%s-%s",OnDemandTanker.groupName,OnDemandTanker.type)
282
282
  )
283
283
  if (OnDemandTanker.freq) then
284
284
  SpawnTanker:InitRadioFrequency(OnDemandTanker.freq)
@@ -289,92 +289,92 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
289
289
  end
290
290
  if (OnDemandTanker.baseUnit) then
291
291
  TankerGroup = SpawnTanker:SpawnAtAirbase(
292
- AIRBASE:FindByName(OnDemandTanker.baseUnit),
293
- SPAWN.Takeoff.Hot,
294
- nil,
295
- OnDemandTanker.terminalType,
296
- true
292
+ AIRBASE:FindByName(OnDemandTanker.baseUnit),
293
+ SPAWN.Takeoff.Hot,
294
+ nil,
295
+ OnDemandTanker.terminalType,
296
+ true
297
297
  )
298
298
  table.insert(TankerRoute,
299
- AIRBASE
300
- :FindByName(OnDemandTanker.baseUnit)
301
- :GetCoordinate()
302
- :WaypointAirTakeOffParkingHot()
299
+ AIRBASE
300
+ :FindByName(OnDemandTanker.baseUnit)
301
+ :GetCoordinate()
302
+ :WaypointAirTakeOffParkingHot()
303
303
  )
304
304
  else
305
305
  TankerGroup = SpawnTanker:SpawnFromCoordinate(
306
- askedAnchorCoord
307
- :GetRandomCoordinateInRadius(
308
- UTILS.NMToMeters(30),
309
- UTILS.NMToMeters(20)
310
- )
311
- :SetAltitude(
312
- UTILS.FeetToMeters(OnDemandTanker.altitude)
313
- )
306
+ askedAnchorCoord
307
+ :GetRandomCoordinateInRadius(
308
+ UTILS.NMToMeters(30),
309
+ UTILS.NMToMeters(20)
310
+ )
311
+ :SetAltitude(
312
+ UTILS.FeetToMeters(OnDemandTanker.altitude)
313
+ )
314
314
  )
315
315
  end
316
316
  TankerGroup.customconfig = OnDemandTanker
317
317
  TankerGroup.spawnAbsTime = timer.getAbsTime()
318
318
  TankerGroup.missionmaxduration = askedDuration
319
319
  table.insert(TankerRoute,
320
- askedAnchorCoord
321
- :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
322
- :WaypointAirTurningPoint(
323
- nil,
324
- UTILS.KnotsToKmph(OnDemandTanker.speed),
325
- {
320
+ askedAnchorCoord
321
+ :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
322
+ :WaypointAirTurningPoint(
323
+ nil,
324
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
325
+ {
326
+ {
327
+ id = 'Tanker',
328
+ params = {
329
+ }
330
+ },
331
+ {
332
+ id = 'ControlledTask',
333
+ params = {
334
+ task =
326
335
  {
327
- id = 'Tanker',
336
+ id = 'Orbit',
328
337
  params = {
338
+ pattern = AI.Task.OrbitPattern.RACE_TRACK,
339
+ speed = UTILS.KnotsToMps(OnDemandTanker.speed),
340
+ altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
329
341
  }
330
342
  },
331
- {
332
- id = 'ControlledTask',
333
- params = {
334
- task =
335
- {
336
- id = 'Orbit',
337
- params = {
338
- pattern = AI.Task.OrbitPattern.RACE_TRACK,
339
- speed = UTILS.KnotsToMps(OnDemandTanker.speed),
340
- altitude = UTILS.FeetToMeters(OnDemandTanker.altitude)
341
- }
342
- },
343
- stopCondition = {
344
- duration = askedDuration * 60
345
- }
346
- },
347
- },
343
+ stopCondition = {
344
+ duration = askedDuration * 60
345
+ }
348
346
  },
349
- "Refuel Start"
350
- )
347
+ },
348
+ },
349
+ "Refuel Start"
350
+ )
351
351
  )
352
352
  table.insert(TankerRoute,
353
- askedAnchorCoord
354
- :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
355
- :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
356
- :WaypointAirTurningPoint(
357
- nil,
358
- UTILS.KnotsToKmph(OnDemandTanker.speed),
359
- {
360
- {
361
- id = 'Tanker',
362
- params = {
363
- }
364
- }
365
- },
366
- "Orbit End"
367
- )
353
+ askedAnchorCoord
354
+ :Translate(UTILS.NMToMeters(OnDemandTanker.orbit.length), OnDemandTanker.orbit.heading, true, false)
355
+ :SetAltitude(UTILS.FeetToMeters(OnDemandTanker.altitude))
356
+ :WaypointAirTurningPoint(
357
+ nil,
358
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
359
+ {
360
+ {
361
+ id = 'Tanker',
362
+ params = {
363
+ }
364
+ }
365
+ },
366
+ "Orbit End"
367
+ )
368
368
  )
369
369
  table.insert(TankerRoute,
370
- RTBAirbase
371
- :GetCoordinate()
372
- :WaypointAirLanding(
373
- UTILS.KnotsToKmph(OnDemandTanker.speed),
374
- RTBAirbase,
375
- {},
376
- 'RTB'
377
- )
370
+ RTBAirbase
371
+ :GetCoordinate()
372
+ :WaypointAirLanding(
373
+ UTILS.KnotsToKmph(OnDemandTanker.speed),
374
+ RTBAirbase,
375
+ {},
376
+ 'RTB'
377
+ )
378
378
  )
379
379
  end
380
380
  TankerGroup:Route(TankerRoute)
@@ -396,12 +396,12 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
396
396
  TankerGroup.escortGroupObject = spawnRecoveryTankerEscort(TankerGroup.escortSpawnObject,OnDemandTanker)
397
397
  if OnDemandTanker.missionmaxduration then
398
398
  TankerGroup.escortGroupObject:ScheduleOnce(OnDemandTanker.missionmaxduration*60,
399
- function(SpawnGroup, airBaseName)
400
- --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
401
- SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
402
- end,
403
- TankerGroup.escortGroupObject,
404
- OnDemandTanker.baseUnit
399
+ function(SpawnGroup, airBaseName)
400
+ --trigger.action.outText('RTB schedule trigger Tanker-escort group : '..(SpawnGroup.GroupName)..' airbase'..(airBaseName)..'...', 45)
401
+ SpawnGroup:RouteRTB(AIRBASE:FindByName(airBaseName))
402
+ end,
403
+ TankerGroup.escortGroupObject,
404
+ OnDemandTanker.baseUnit
405
405
  )
406
406
  --trigger.action.outText('Tanker-escort configured to RTB in : '..(OnDemandTanker.missionmaxduration)..' minutes max...', 45)
407
407
  end
@@ -411,36 +411,36 @@ function triggerOnDemandTanker(type, askedDuration, askedFL, askedSpeed, askedAn
411
411
  end
412
412
  if(OnDemandTanker.tacan) then
413
413
  map_marker[TankerGroup:GetName()] = askedAnchorCoord:MarkToCoalition(
414
- string.format(
415
- 'OnDemand Tanker %s - TCN %i\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
416
- OnDemandTanker.type,
417
- OnDemandTanker.tacan.channel,
418
- UTILS.Round(OnDemandTanker.altitude / 100 , 0),
419
- OnDemandTanker.speed,
420
- OnDemandTanker.freq,
421
- askedDuration,
422
- OnDemandTanker.orbit.heading,
423
- OnDemandTanker.orbit.length
424
- ),
425
- OnDemandTanker.benefit_coalition,
426
- true,
427
- 'OnDemand Tanker %s is Activated'
414
+ string.format(
415
+ 'OnDemand Tanker %s - TCN %i\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
416
+ OnDemandTanker.type,
417
+ OnDemandTanker.tacan.channel,
418
+ UTILS.Round(OnDemandTanker.altitude / 100 , 0),
419
+ OnDemandTanker.speed,
420
+ OnDemandTanker.freq,
421
+ askedDuration,
422
+ OnDemandTanker.orbit.heading,
423
+ OnDemandTanker.orbit.length
424
+ ),
425
+ OnDemandTanker.benefit_coalition,
426
+ true,
427
+ 'OnDemand Tanker %s is Activated'
428
428
  )
429
429
  else
430
430
  map_marker[TankerGroup:GetName()] = askedAnchorCoord:MarkToCoalition(
431
- string.format(
432
- 'OnDemand Tanker %s\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
433
- OnDemandTanker.type,
434
- UTILS.Round(OnDemandTanker.altitude / 100 , 0),
435
- OnDemandTanker.speed,
436
- OnDemandTanker.freq,
437
- askedDuration,
438
- OnDemandTanker.orbit.heading,
439
- OnDemandTanker.orbit.length
440
- ),
441
- OnDemandTanker.benefit_coalition,
442
- true,
443
- 'OnDemand Tanker %s is Activated'
431
+ string.format(
432
+ 'OnDemand Tanker %s\nFL %i at %i knots\nFreq %.2f MHz\nOn station for %i minutes\nRacetrack : %i ° for %i nm',
433
+ OnDemandTanker.type,
434
+ UTILS.Round(OnDemandTanker.altitude / 100 , 0),
435
+ OnDemandTanker.speed,
436
+ OnDemandTanker.freq,
437
+ askedDuration,
438
+ OnDemandTanker.orbit.heading,
439
+ OnDemandTanker.orbit.length
440
+ ),
441
+ OnDemandTanker.benefit_coalition,
442
+ true,
443
+ 'OnDemand Tanker %s is Activated'
444
444
  )
445
445
  end
446
446
  TankerGroup:HandleEvent(EVENTS.Land)
@@ -499,23 +499,22 @@ function TankerMarkHandler:onEvent(event)
499
499
  --trigger.action.outText(" ", 0, true)
500
500
  elseif (event.id == 27 and string.find(event.text, CmdSymbol)) then
501
501
  --if (event.coalition == RestrToCoal or RestrToCoal == nil) then
502
- local full = nil
503
- local remString = nil
504
- local cmd = nil
505
- local param1 = nil
506
- local param1Start = nil
507
- local param2 = nil
508
- local param2Start = nil
509
- local param3 = nil
510
- local param3Start = nil
511
- local param4 = nil
512
- local param4Start = nil
513
- local param5 = nil
514
- local param5Start = nil
515
- local param6 = nil
516
- local param6Start = nil
502
+ local full
503
+ local remString
504
+ local cmd
505
+ local param1
506
+ local param1Start
507
+ local param2
508
+ local param2Start
509
+ local param3
510
+ local param3Start
511
+ local param4
512
+ local param4Start
513
+ local param5
514
+ local param5Start
515
+ local param6
516
+ local param6Start
517
517
  local mcoord = COORDINATE:New(event.pos.x, event.pos.y, event.pos.z)
518
- local mvec3 = event.pos
519
518
 
520
519
  full = string.sub(event.text, 2)
521
520
 
@@ -579,13 +578,13 @@ function TankerMarkHandler:onEvent(event)
579
578
  trigger.action.outText("DEBUG: On Demand Tanker Started!", 10)
580
579
  end
581
580
  tankersOnDemandArray[#tankersOnDemandArray+1] = triggerOnDemandTanker(
582
- param1,
583
- tonumber(param2),
584
- tonumber(param3),
585
- tonumber(param4),
586
- mcoord,
587
- tonumber(param5),
588
- tonumber(param6)
581
+ param1,
582
+ tonumber(param2),
583
+ tonumber(param3),
584
+ tonumber(param4),
585
+ mcoord,
586
+ tonumber(param5),
587
+ tonumber(param6)
589
588
  )
590
589
  end
591
590
  --end