@jtff/miztemplate-lib 3.4.4 → 3.4.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 (3) hide show
  1. package/lua/src/130-airboss.lua +17 -17
  2. package/lua/src/172-cap_zone_war.lua +36 -12
  3. package/package.json +1 -1
package/lua/src/130-airboss.lua CHANGED
@@ -388,7 +388,7 @@ function cleanDeckLayout(objAirboss)
388
388
  spawnDeckLayout_Zone(objAirboss, "Finger", fingerLayout)
389
389
  local junkyardLayout = {
390
390
  {
391
- ["livery_id"] = "VF-41 AJ100 1990 by Reflected",
391
+ ["livery_id"] = "VF-41 AJ100 1989 by Reflected",
392
392
  ["category"] = "Planes",
393
393
  ["offsets"] =
394
394
  {
@@ -625,7 +625,7 @@ function flexDeck7SpawnLayout(objAirboss)
625
625
  spawnDeckLayout_Zone(objAirboss, "Point", pointLayout)
626
626
  local cat1Layout = {
627
627
  {
628
- ["livery_id"] = "VFA-143 Line Alternate",
628
+ ["livery_id"] = "VFA-31 Line NH",
629
629
  ["category"] = "Planes",
630
630
  ["offsets"] =
631
631
  {
@@ -636,7 +636,7 @@ function flexDeck7SpawnLayout(objAirboss)
636
636
  ["type"] = "FA-18C_hornet",
637
637
  },
638
638
  {
639
- ["livery_id"] = "VFA-143 Line Alternate",
639
+ ["livery_id"] = "VFA-31 Line NH",
640
640
  ["category"] = "Planes",
641
641
  ["offsets"] =
642
642
  {
@@ -647,7 +647,7 @@ function flexDeck7SpawnLayout(objAirboss)
647
647
  ["type"] = "FA-18C_hornet",
648
648
  },
649
649
  {
650
- ["livery_id"] = "VFA-143 Line Alternate",
650
+ ["livery_id"] = "VFA-31 Line NH",
651
651
  ["category"] = "Planes",
652
652
  ["offsets"] =
653
653
  {
@@ -658,7 +658,7 @@ function flexDeck7SpawnLayout(objAirboss)
658
658
  ["type"] = "FA-18C_hornet",
659
659
  },
660
660
  {
661
- ["livery_id"] = "VFA-143 Line Alternate",
661
+ ["livery_id"] = "VFA-31 Line NH",
662
662
  ["category"] = "Planes",
663
663
  ["offsets"] =
664
664
  {
@@ -669,7 +669,7 @@ function flexDeck7SpawnLayout(objAirboss)
669
669
  ["type"] = "FA-18C_hornet",
670
670
  },
671
671
  {
672
- ["livery_id"] = "VFA-143 Line Alternate",
672
+ ["livery_id"] = "VFA-31 CAG",
673
673
  ["category"] = "Planes",
674
674
  ["offsets"] =
675
675
  {
@@ -694,7 +694,7 @@ function flexDeck7SpawnLayout(objAirboss)
694
694
  spawnDeckLayout_Zone(objAirboss, "Cat1", cat1Layout)
695
695
  local patioLayout = {
696
696
  {
697
- ["livery_id"] = "VF-41 AJ102 1981 by Reflected",
697
+ ["livery_id"] = "VF-41 AJ102 1981 base Reflected",
698
698
  ["category"] = "Planes",
699
699
  ["offsets"] =
700
700
  {
@@ -716,7 +716,7 @@ function flexDeck7SpawnLayout(objAirboss)
716
716
  ["type"] = "F-14B",
717
717
  },
718
718
  {
719
- ["livery_id"] = "VF-41 AJ107 1981 by Reflected",
719
+ ["livery_id"] = "VF-41 AJ107 1981 base Reflected",
720
720
  ["category"] = "Planes",
721
721
  ["offsets"] =
722
722
  {
@@ -837,7 +837,7 @@ function launchDeck7SpawnLayout(objAirboss)
837
837
  flexDeck7SpawnLayout(objAirboss)
838
838
  local sternLayout = {
839
839
  {
840
- ["livery_id"] = "VF-31 Tomcatters AJ100",
840
+ ["livery_id"] = "VF-41 AJ101 1981 base Reflected",
841
841
  ["category"] = "Planes",
842
842
  ["offsets"] =
843
843
  {
@@ -859,7 +859,7 @@ function launchDeck7SpawnLayout(objAirboss)
859
859
  ["type"] = "F-14B",
860
860
  },
861
861
  {
862
- ["livery_id"] = "VF-31 Tomcatters AJ110",
862
+ ["livery_id"] = "VF-41 AJ103 1981 base Reflected",
863
863
  ["category"] = "Planes",
864
864
  ["offsets"] =
865
865
  {
@@ -870,7 +870,7 @@ function launchDeck7SpawnLayout(objAirboss)
870
870
  ["type"] = "F-14B",
871
871
  },
872
872
  {
873
- ["livery_id"] = "VF-31 Tomcatters AJ101",
873
+ ["livery_id"] = "VF-41 AJ106 1981 base Reflected",
874
874
  ["category"] = "Planes",
875
875
  ["offsets"] =
876
876
  {
@@ -881,7 +881,7 @@ function launchDeck7SpawnLayout(objAirboss)
881
881
  ["type"] = "F-14B",
882
882
  },
883
883
  {
884
- ["livery_id"] = "VF-31 Tomcatters AJ106",
884
+ ["livery_id"] = "VF-41 AJ110 1981 base Reflected",
885
885
  ["category"] = "Planes",
886
886
  ["offsets"] =
887
887
  {
@@ -999,7 +999,7 @@ function launchDeck1SpawnLayout(objAirboss)
999
999
  spawnDeckLayout_Zone(objAirboss, "Elev3", elev3Layout)
1000
1000
  local sternLayout = {
1001
1001
  {
1002
- ["livery_id"] = "VF-31 Tomcatters AJ111",
1002
+ ["livery_id"] = "VF-41 AJ111 1981 base Reflected",
1003
1003
  ["category"] = "Planes",
1004
1004
  ["offsets"] =
1005
1005
  {
@@ -1010,7 +1010,7 @@ function launchDeck1SpawnLayout(objAirboss)
1010
1010
  ["type"] = "F-14B",
1011
1011
  },
1012
1012
  {
1013
- ["livery_id"] = "VF-31 Tomcatters AJ107",
1013
+ ["livery_id"] = "VF-41 AJ112 1981 base Reflected",
1014
1014
  ["category"] = "Planes",
1015
1015
  ["offsets"] =
1016
1016
  {
@@ -1021,7 +1021,7 @@ function launchDeck1SpawnLayout(objAirboss)
1021
1021
  ["type"] = "F-14B",
1022
1022
  },
1023
1023
  {
1024
- ["livery_id"] = "VF-31 Tomcatters AJ105",
1024
+ ["livery_id"] = "VF-41 AJ104 1981 base Reflected",
1025
1025
  ["category"] = "Planes",
1026
1026
  ["offsets"] =
1027
1027
  {
@@ -1032,7 +1032,7 @@ function launchDeck1SpawnLayout(objAirboss)
1032
1032
  ["type"] = "F-14B",
1033
1033
  },
1034
1034
  {
1035
- ["livery_id"] = "VF-31 Tomcatters AJ112",
1035
+ ["livery_id"] = "VF-31 Tomcatters AJ100",
1036
1036
  ["category"] = "Planes",
1037
1037
  ["offsets"] =
1038
1038
  {
@@ -1043,7 +1043,7 @@ function launchDeck1SpawnLayout(objAirboss)
1043
1043
  ["type"] = "F-14B",
1044
1044
  },
1045
1045
  {
1046
- ["livery_id"] = "VF-31 Tomcatters AJ112",
1046
+ ["livery_id"] = "VF-31 Tomcatters AJ101",
1047
1047
  ["category"] = "Planes",
1048
1048
  ["offsets"] =
1049
1049
  {
package/lua/src/172-cap_zone_war.lua CHANGED
@@ -6,6 +6,7 @@ function toggleDebugCapWarZone(objCapWarZone)
6
6
  end
7
7
 
8
8
  function wipeCapWarZone(objCapWarZone)
9
+ jtff_log.info(string.format("%s Zone Stopping...", objCapWarZone.customconfig.name),"CAP_WAR_ZONE")
9
10
  objCapWarZone.objDispatcher:SetTacticalDisplay(false)
10
11
  objCapWarZone.objDispatcher:Stop()
11
12
  objCapWarZone.objDispatcher = nil
@@ -21,6 +22,7 @@ function wipeCapWarZone(objCapWarZone)
21
22
  end
22
23
 
23
24
  function startCapWarZone(objCapWarZone)
25
+ jtff_log.info(string.format("%s Zone Starting...", objCapWarZone.customconfig.name),"CAP_WAR_ZONE")
24
26
  objCapWarZone.objEWRNetwork = SET_GROUP:New()
25
27
  objCapWarZone.objEWRNetwork:FilterPrefixes(objCapWarZone.customconfig.ewrPrefixes)
26
28
  objCapWarZone.objEWRNetwork:FilterStart()
@@ -41,34 +43,37 @@ function startCapWarZone(objCapWarZone)
41
43
  45*60
42
44
  )
43
45
  for indexbase, capbaseconfig in ipairs(objCapWarZone.customconfig.CAPBases) do
46
+ jtff_log.info(string.format("Activating all Squadrons stationed at %s...", capbaseconfig.baseName),"CAP_WAR_ZONE")
44
47
  for indexcapsqn, capsqnconfig in ipairs(capbaseconfig.patrolSquadrons) do
48
+ local CAPSquadronName = "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn
45
49
  if capsqnconfig.enable then
50
+ jtff_log.info(string.format("Activating CAP Squadron %s (based on %s) at %s...", CAPSquadronName, capsqnconfig.groupName, capbaseconfig.baseName),"CAP_WAR_ZONE")
46
51
  if AIRBASE:FindByName(capbaseconfig.baseName) then
47
52
  --baseName is Airbase
48
53
  objCapWarZone.objDispatcher:SetSquadron(
49
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
54
+ CAPSquadronName,
50
55
  capbaseconfig.baseName,
51
56
  capsqnconfig.groupName,
52
57
  capsqnconfig.groupNumber * capsqnconfig.groupForce
53
58
  )
54
59
  objCapWarZone.objDispatcher:SetSquadronGrouping(
55
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
60
+ CAPSquadronName,
56
61
  capsqnconfig.groupForce
57
62
  )
58
63
  else
59
64
  --baseName is not an Airbase --> Airstart
60
65
  objCapWarZone.objDispatcher:SetSquadron(
61
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
66
+ CAPSquadronName,
62
67
  capbaseconfig.baseName,
63
68
  capsqnconfig.groupName,
64
69
  capsqnconfig.groupNumber * capsqnconfig.groupForce
65
70
  )
66
71
  objCapWarZone.objDispatcher:SetSquadronGrouping(
67
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
72
+ CAPSquadronName,
68
73
  capsqnconfig.groupForce
69
74
  )
70
75
  objCapWarZone.objDispatcher:SetSquadronTakeoffInAir(
71
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
76
+ CAPSquadronName,
72
77
  UTILS.FeetToMeters(20000)
73
78
  )
74
79
  end
@@ -95,8 +100,9 @@ function startCapWarZone(objCapWarZone)
95
100
  CapZone = objCapWarZone.objZone
96
101
  end
97
102
  end
103
+ jtff_log.info(string.format("Assigned Squadron %s to %s patrol Zone...", CAPSquadronName, CapZone.GetName()),"CAP_WAR_ZONE")
98
104
  objCapWarZone.objDispatcher:SetSquadronCap(
99
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
105
+ CAPSquadronName,
100
106
  CapZone,
101
107
  UTILS.FeetToMeters(objCapWarZone.customconfig.capParameters.patrolFloor) or UTILS.FeetToMeters(20000),
102
108
  UTILS.FeetToMeters(objCapWarZone.customconfig.capParameters.patrolCeiling) or UTILS.FeetToMeters(50000),
@@ -106,8 +112,9 @@ function startCapWarZone(objCapWarZone)
106
112
  UTILS.KnotsToKmph(objCapWarZone.customconfig.capParameters.maxEngageSpeed) or UTILS.KnotsToKmph(2000),
107
113
  "BARO"
108
114
  )
115
+ jtff_log.info(string.format("start CAP Squadron %s (%s)...", CAPSquadronName, capsqnconfig.groupName),"CAP_WAR_ZONE")
109
116
  objCapWarZone.objDispatcher:SetSquadronCapInterval(
110
- "CAP-"..capbaseconfig.baseName.."-"..indexcapsqn,
117
+ CAPSquadronName,
111
118
  capsqnconfig.patrolInAirNumber,
112
119
  8*60,
113
120
  13*60,
@@ -117,23 +124,40 @@ function startCapWarZone(objCapWarZone)
117
124
  end
118
125
  for indexinterceptsqn, interceptsqnconfig in ipairs(capbaseconfig.interceptSquadrons) do
119
126
  if interceptsqnconfig.enable then
127
+ local interceptSquadronName = "GCI-"..capbaseconfig.baseName.."-"..indexinterceptsqn
128
+ jtff_log.info(string.format("Activating GCI Squadron %s (based on %s) at %s...", interceptSquadronName, interceptsqnconfig.groupName, capbaseconfig.baseName),"CAP_WAR_ZONE")
120
129
  if AIRBASE:FindByName(capbaseconfig.baseName) then
121
130
  --baseName is Airbase
122
131
  objCapWarZone.objDispatcher:SetSquadron(
123
- "GCI-"..capbaseconfig.baseName.."-"..indexinterceptsqn,
132
+ interceptSquadronName,
124
133
  capbaseconfig.baseName,
125
134
  interceptsqnconfig.groupName,
126
- interceptsqnconfig.groupNumber
135
+ interceptsqnconfig.groupNumber * interceptsqnconfig.groupForce
127
136
  )
128
137
  objCapWarZone.objDispatcher:SetSquadronGrouping(
129
- "GCI-"..capbaseconfig.baseName.."-"..indexinterceptsqn,
138
+ interceptSquadronName,
130
139
  interceptsqnconfig.groupForce
131
140
  )
132
141
  else
133
142
  --baseName is not an Airbase --> Airstart
143
+ objCapWarZone.objDispatcher:SetSquadron(
144
+ interceptSquadronName,
145
+ capbaseconfig.baseName,
146
+ interceptsqnconfig.groupName,
147
+ interceptsqnconfig.groupNumber * interceptsqnconfig.groupForce
148
+ )
149
+ objCapWarZone.objDispatcher:SetSquadronGrouping(
150
+ interceptSquadronName,
151
+ interceptsqnconfig.groupForce
152
+ )
153
+ objCapWarZone.objDispatcher:SetSquadronTakeoffInAir(
154
+ interceptSquadronName,
155
+ UTILS.FeetToMeters(20000)
156
+ )
134
157
  end
158
+ jtff_log.info(string.format("Assigned Squadron %s to GCI mission...", interceptSquadronName),"CAP_WAR_ZONE")
135
159
  objCapWarZone.objDispatcher:SetSquadronGci(
136
- "GCI-"..capbaseconfig.baseName.."-"..indexinterceptsqn,
160
+ interceptSquadronName,
137
161
  UTILS.KnotsToKmph(objCapWarZone.customconfig.capParameters.minEngageSpeed) or UTILS.KnotsToKmph(200),
138
162
  UTILS.KnotsToKmph(objCapWarZone.customconfig.capParameters.maxEngageSpeed) or UTILS.KnotsToKmph(5000)
139
163
  )
@@ -162,7 +186,7 @@ MenuCoalitionCAPWarZone = MENU_MISSION:New("CAP War Zones", nil)
162
186
  for index, capwarzoneconfig in ipairs(WarCAPConfig) do
163
187
  if capwarzoneconfig.enable == true and #(capwarzoneconfig.ewrPrefixes) > 0 then
164
188
  compteur = compteur + 1
165
- env.info('creation CAP WarZone : '.. capwarzoneconfig.name..'...')
189
+ jtff_log.info(string.format("%s Zone creation...", capwarzoneconfig.name),"CAP_WAR_ZONE")
166
190
  objCapWarZone = {}
167
191
  if capwarzoneconfig.borderZoneGroupName then
168
192
  objCapWarZone.objZone = ZONE_POLYGON:New( capwarzoneconfig.borderZoneGroupName, GROUP:FindByName( capwarzoneconfig.borderZoneGroupName ) )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jtff/miztemplate-lib",
3
- "version": "3.4.4",
3
+ "version": "3.4.6",
4
4
  "description": "JTFF mission template library",
5
5
  "main": "index.js",
6
6
  "files": [