-uh-60L troop capacity set to 11
-bugfix: AI enemy planes/helicopters attacked invisible FARPS
-generator now produces error log
-syria scenario farp support units invulnerable
-all russia/usa objects now swap sides for defense mode, including carriers and farps
-forces templates can include air units with customization for loadout, livery, and skill
-carrier and farp parking for enemy helicopters
-parking now supports multiple airports per side
-improved AI flight orbits (now onside and perpendicular to closest enemy airport)
-enemy transport helicopters!
-apcs spawn infantry now disables conflict zones as infinite pickup zones (adds a bit of realism)
-bug fix: add zone triggers can be added in wrong order
This commit is contained in:
spencer-ki
2022-02-17 20:03:18 -08:00
parent 7356f90eab
commit ad11fd7937
20 changed files with 1006 additions and 364 deletions

View File

@@ -112,10 +112,10 @@ padding: 4px;</string>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Provide close air support for our convoys as we take back Las Vegas from the enemy!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt;&quot;&gt;Provide close air support for our convoys as we take back Las Vegas from the enemy!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
<widget class="QComboBox" name="blueforces_comboBox">
@@ -131,12 +131,12 @@ p, li { white-space: pre-wrap; }
<string>Tip: You can create your own custom ground forces groups to be automatically generated.</string>
</property>
</widget>
<widget class="QLabel" name="scenario_label_2">
<widget class="QLabel" name="blue_forces_label">
<property name="geometry">
<rect>
<x>690</x>
<y>180</y>
<width>141</width>
<width>241</width>
<height>31</height>
</rect>
</property>
@@ -149,12 +149,12 @@ p, li { white-space: pre-wrap; }
<string>Friendly Forces:</string>
</property>
</widget>
<widget class="QLabel" name="scenario_label_3">
<widget class="QLabel" name="red_forces_label">
<property name="geometry">
<rect>
<x>60</x>
<y>180</y>
<width>141</width>
<width>261</width>
<height>31</height>
</rect>
</property>
@@ -184,7 +184,7 @@ p, li { white-space: pre-wrap; }
<property name="geometry">
<rect>
<x>-40</x>
<y>440</y>
<y>490</y>
<width>801</width>
<height>371</height>
</rect>
@@ -432,8 +432,8 @@ p, li { white-space: pre-wrap; }
<widget class="QCheckBox" name="apcs_spawn_checkBox">
<property name="geometry">
<rect>
<x>470</x>
<y>400</y>
<x>450</x>
<y>420</y>
<width>251</width>
<height>31</height>
</rect>
@@ -444,7 +444,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="statusTip">
<string>Friendly/enemy APCs will drop infantry when reaching a new conflict zone.</string>
<string>Friendly/enemy APCs will drop infantry when reaching a new conflict zone. Disables infinite troop pickups from conflict zones (you must pick up existing troops).</string>
</property>
<property name="text">
<string>APCs Spawn Infantry</string>
@@ -453,9 +453,9 @@ p, li { white-space: pre-wrap; }
<widget class="QSpinBox" name="inf_spawn_spinBox">
<property name="geometry">
<rect>
<x>680</x>
<y>360</y>
<width>71</width>
<x>670</x>
<y>340</y>
<width>51</width>
<height>31</height>
</rect>
</property>
@@ -517,10 +517,10 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>470</x>
<y>360</y>
<width>191</width>
<height>31</height>
<x>450</x>
<y>340</y>
<width>211</width>
<height>21</height>
</rect>
</property>
<property name="font">
@@ -528,8 +528,11 @@ p, li { white-space: pre-wrap; }
<pointsize>10</pointsize>
</font>
</property>
<property name="statusTip">
<string>This value is multiplied by the number of spawn zones in the mission template.</string>
</property>
<property name="text">
<string>Infantry Groups per zone:</string>
<string>Infantry Spawns per zone:</string>
</property>
</widget>
<widget class="QComboBox" name="slot_template_comboBox">
@@ -563,24 +566,6 @@ p, li { white-space: pre-wrap; }
<string>Player Slots</string>
</property>
</widget>
<widget class="QLabel" name="scenario_label_6">
<property name="geometry">
<rect>
<x>470</x>
<y>320</y>
<width>141</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Infantry Spawns:</string>
</property>
</widget>
<widget class="QCheckBox" name="force_offroad_checkBox">
<property name="geometry">
<rect>
@@ -667,6 +652,9 @@ p, li { white-space: pre-wrap; }
<pointsize>11</pointsize>
</font>
</property>
<property name="statusTip">
<string>Approximate number of enemy attack helicopter group spawns.</string>
</property>
<property name="text">
<string>Enemy Attack Helicopters</string>
</property>
@@ -685,6 +673,9 @@ p, li { white-space: pre-wrap; }
<pointsize>11</pointsize>
</font>
</property>
<property name="statusTip">
<string>Approximate number of enemy attack plane group spawns.</string>
</property>
<property name="text">
<string>Enemy Attack Planes</string>
</property>
@@ -740,8 +731,8 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="scenario_label_9">
<property name="geometry">
<rect>
<x>740</x>
<y>490</y>
<x>810</x>
<y>450</y>
<width>171</width>
<height>31</height>
</rect>
@@ -758,15 +749,15 @@ p, li { white-space: pre-wrap; }
<widget class="QCheckBox" name="inf_spawn_voiceovers_checkBox">
<property name="geometry">
<rect>
<x>470</x>
<y>430</y>
<x>810</x>
<y>720</y>
<width>251</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>9</pointsize>
</font>
</property>
<property name="statusTip">
@@ -870,14 +861,110 @@ p, li { white-space: pre-wrap; }
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="scenario_label_10">
<property name="geometry">
<rect>
<x>140</x>
<y>410</y>
<width>241</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="statusTip">
<string>Approximate number of enemy transport helicopter spawns.</string>
</property>
<property name="text">
<string>Enemy Transport Helicopters</string>
</property>
</widget>
<widget class="QSpinBox" name="e_transport_helos_spinBox">
<property name="geometry">
<rect>
<x>70</x>
<y>410</y>
<width>51</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="statusTip">
<string>Approximate number of enemy transport helicopter spawns.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>8</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>450</x>
<y>380</y>
<width>191</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="statusTip">
<string>The number of troop drops per transport helicopter flight.</string>
</property>
<property name="text">
<string>Transport Drop Points:</string>
</property>
</widget>
<widget class="QSpinBox" name="troop_drop_spinBox">
<property name="geometry">
<rect>
<x>670</x>
<y>380</y>
<width>51</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="statusTip">
<string>The number of troop drops per transport helicopter flight.</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
<zorder>background_label</zorder>
<zorder>scenario_comboBox</zorder>
<zorder>scenario_label</zorder>
<zorder>generateButton</zorder>
<zorder>description_textBrowser</zorder>
<zorder>blueforces_comboBox</zorder>
<zorder>scenario_label_2</zorder>
<zorder>scenario_label_3</zorder>
<zorder>blue_forces_label</zorder>
<zorder>red_forces_label</zorder>
<zorder>redforces_comboBox</zorder>
<zorder>scenario_hint_label</zorder>
<zorder>forces_hint_label</zorder>
@@ -896,7 +983,6 @@ p, li { white-space: pre-wrap; }
<zorder>label</zorder>
<zorder>slot_template_comboBox</zorder>
<zorder>label_2</zorder>
<zorder>scenario_label_6</zorder>
<zorder>force_offroad_checkBox</zorder>
<zorder>defense_checkBox</zorder>
<zorder>e_attack_helos_spinBox</zorder>
@@ -910,6 +996,10 @@ p, li { white-space: pre-wrap; }
<zorder>farp_gunits</zorder>
<zorder>farp_always</zorder>
<zorder>version_label</zorder>
<zorder>scenario_label_10</zorder>
<zorder>e_transport_helos_spinBox</zorder>
<zorder>label_3</zorder>
<zorder>troop_drop_spinBox</zorder>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
@@ -946,6 +1036,11 @@ p, li { white-space: pre-wrap; }
<string>_redforcesSelected</string>
</property>
</action>
<action name="action_defensiveModeChanged">
<property name="text">
<string>_defensiveModeChanged</string>
</property>
</action>
</widget>
<resources/>
<connections>
@@ -960,8 +1055,8 @@ p, li { white-space: pre-wrap; }
<y>591</y>
</hint>
<hint type="destinationlabel">
<x>589</x>
<y>409</y>
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
@@ -981,6 +1076,22 @@ p, li { white-space: pre-wrap; }
</hint>
</hints>
</connection>
<connection>
<sender>defense_checkBox</sender>
<signal>stateChanged(int)</signal>
<receiver>action_defensiveModeChanged</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel">
<x>150</x>
<y>131</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
<buttongroups>
<buttongroup name="farp_buttonGroup"/>