Merge pull request #317 from lbmaian/fixes

More misc fixes
Solaris-Skunk-Werks · Dec 20, 2023 · 42b54d2 · 42b54d2
2 parents 427ca7c + 2d77059
commit 42b54d2
Show file tree

Hide file tree

Showing 23 changed files with 507 additions and 896 deletions.
diff --git a/Data/Equipment/equipment.json b/Data/Equipment/equipment.json
@@ -606,7 +606,7 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": false,
+    "RequiresFusion": false,
     "RequiresNuclear": false,
     "RequiresPowerAmps": true,
     "Availability": {
@@ -703,7 +703,7 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": false,
+    "RequiresFusion": false,
     "RequiresNuclear": false,
     "RequiresPowerAmps": true,
     "Availability": {
@@ -800,9 +800,8 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": false,
+    "RequiresFusion": false,
     "RequiresNuclear": false,
-    "RequiresPowerAmps": true,
     "Availability": {
       "IS_SL": "E",
       "IS_SW": "F",
@@ -898,9 +897,8 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": false,
+    "RequiresFusion": false,
     "RequiresNuclear": false,
-    "RequiresPowerAmps": true,
     "Availability": {
       "IS_SL": "F",
       "IS_SW": "X",
@@ -1533,9 +1531,9 @@
     "Exclusions": [
       "C3 Computer (Master)",
       "C3 Computer (Slave)",
-	  "C3 Boosted Computer (Master)",
-	  "C3 Boosted Computer (Slave)",
-	  "C3 Emergency Master",
+      "C3 Boosted Computer (Master)",
+      "C3 Boosted Computer (Slave)",
+      "C3 Emergency Master",
       "Null Signature System",
       "Void Signature System"
     ]
@@ -2448,7 +2446,7 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": true,
+    "RequiresFusion": true,
     "RequiresNuclear": false,
     "RequiresPowerAmps": true,
     "Availability": {
@@ -3361,7 +3359,7 @@
     },
     "BattleForceAbilities": [
       "WAT",
-	  "ECM"
+      "ECM"
     ]
   },
   "Bridgelayer, Light": {
@@ -6331,7 +6329,7 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresFusion": true,
+    "RequiresFusion": true,
     "RequiresNuclear": false,
     "RequiresPowerAmps": true,
     "Availability": {
@@ -6383,9 +6381,9 @@
     },
     "BattleForceAbilities": [
       "NOVA",
-	  "PRB",
-	  "RCN",
-	  "ECM"
+      "PRB",
+      "RCN",
+      "ECM"
     ]
   },
   "Centurion Weapon System": {
@@ -6431,6 +6429,7 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
+    "RequiresPowerAmps": true,
     "Availability": {
       "IS_SL": "F",
       "IS_SW": "F",
@@ -7277,7 +7276,6 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresPowerAmps": true,
     "Availability": {
       "IS_SL": "X",
       "IS_SW": "X",
@@ -7328,7 +7326,7 @@
     "BattleForceAbilities": [
       "DJ"
     ],
-	"Exclusions": [
+    "Exclusions": [
       "RISC Viral Jammer (Homing)"
     ]
   },
@@ -7375,7 +7373,6 @@
     "Explosive": false,
     "VariableSize": false,
     "RequiresQuad": false,
-	"RequiresPowerAmps": true,
     "Availability": {
       "IS_SL": "X",
       "IS_SW": "X",
@@ -7426,7 +7423,7 @@
     "BattleForceAbilities": [
       "HJ"
     ],
-	"Exclusions": [
+    "Exclusions": [
       "RISC Viral Jammer (Decoy)"
     ]
   },

diff --git a/Data/Equipment/physicals.json b/Data/Equipment/physicals.json
@@ -38,7 +38,7 @@
     "Alloc_Legs": false,
     "CanSplit": false,
     "PowerAmps": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Availability": {
       "IS_SL": "X",
       "IS_SW": "F",
@@ -122,7 +122,7 @@
     "ReplacesHand": false,
     "RequiresLowerArm": true,
     "ReplacesLowerArm": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Alloc_HD": false,
     "Alloc_CT": false,
     "Alloc_Torso": false,
@@ -213,7 +213,7 @@
     "ReplacesHand": false,
     "RequiresLowerArm": true,
     "ReplacesLowerArm": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Alloc_HD": false,
     "Alloc_CT": false,
     "Alloc_Torso": false,
@@ -395,7 +395,7 @@
     "ReplacesHand": true,
     "RequiresLowerArm": true,
     "ReplacesLowerArm": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Alloc_HD": false,
     "Alloc_CT": false,
     "Alloc_Torso": false,
@@ -576,7 +576,7 @@
     "ReplacesHand": false,
     "RequiresLowerArm": true,
     "ReplacesLowerArm": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Alloc_HD": false,
     "Alloc_CT": false,
     "Alloc_Torso": false,
@@ -674,7 +674,7 @@
     "Alloc_Legs": false,
     "CanSplit": false,
     "PowerAmps": false,
-	"TripleStrengthMyomerAffectsBV": true,
+    "TripleStrengthMyomerAffectsBV": true,
     "Availability": {
       "IS_SL": "X",
       "IS_SW": "X",

diff --git a/saw/build.gradle b/saw/build.gradle
@@ -22,8 +22,9 @@ jar {
             'Main-Class' : 'saw.Main',
             'Class-Path' : configurations.runtimeClasspath.files
                     .findAll { it.name.endsWith(".jar") }.collect { "lib/${it.name}" }.join(' '),
+            'SplashScreen-Image' : 'saw/images/splash.png'
     )
-    jar.archiveName = "SAW.jar"
+    archiveName = "SAW.jar"
 }
 
 task deleteAssets {

diff --git a/saw/src/main/java/saw/gui/frmVee.form b/saw/src/main/java/saw/gui/frmVee.form
@@ -1147,6 +1147,8 @@
                                       <Component id="cmbTurret" min="-2" max="-2" attributes="0"/>
                                       <EmptySpace max="-2" attributes="0"/>
                                       <Component id="spnTurretTonnage" max="32767" attributes="0"/>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="spnRearTurretTonnage" max="32767" attributes="0"/>
                                   </Group>
                                   <Group type="102" alignment="0" attributes="0">
                                       <Component id="jLabel9" min="-2" max="-2" attributes="0"/>
@@ -1214,6 +1216,7 @@
                               <Component id="jLabel32" alignment="3" min="-2" max="-2" attributes="0"/>
                               <Component id="cmbTurret" alignment="3" min="-2" max="-2" attributes="0"/>
                               <Component id="spnTurretTonnage" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="spnRearTurretTonnage" alignment="3" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
@@ -1393,11 +1396,34 @@
                       <SpinnerModel initial="0.0" maximum="50.0" minimum="0.0" numberType="java.lang.Double" stepSize="0.5" type="number"/>
                     </Property>
                     <Property name="enabled" type="boolean" value="false"/>
+                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[45, 20]"/>
+                    </Property>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[45, 20]"/>
+                    </Property>
                   </Properties>
                   <Events>
                     <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="spnTurretTonnageStateChanged"/>
                   </Events>
                 </Component>
+                <Component class="javax.swing.JSpinner" name="spnRearTurretTonnage">
+                  <Properties>
+                    <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
+                      <SpinnerModel initial="0.0" maximum="50.0" minimum="0.0" numberType="java.lang.Double" stepSize="0.5" type="number"/>
+                    </Property>
+                    <Property name="enabled" type="boolean" value="false"/>
+                    <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[45, 20]"/>
+                    </Property>
+                    <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                      <Dimension value="[45, 20]"/>
+                    </Property>
+                  </Properties>
+                  <Events>
+                    <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="spnRearTurretTonnageStateChanged"/>
+                  </Events>
+                </Component>
               </SubComponents>
             </Container>
             <Container class="javax.swing.JPanel" name="pnlMovement">
@@ -1424,50 +1450,41 @@
                           <Group type="103" groupAlignment="0" attributes="0">
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="jLabel10" min="-2" max="-2" attributes="0"/>
-                                  <EmptySpace min="2" pref="2" max="2" attributes="0"/>
+                                  <EmptySpace min="5" pref="5" max="5" attributes="0"/>
                                   <Component id="spnCruiseMP" min="-2" max="-2" attributes="0"/>
                               </Group>
-                              <Group type="102" attributes="0">
-                                  <EmptySpace min="5" pref="5" max="-2" attributes="0"/>
-                                  <Group type="103" groupAlignment="0" attributes="0">
-                                      <Group type="102" alignment="0" attributes="0">
-                                          <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
-                                          <EmptySpace type="separate" max="-2" attributes="0"/>
-                                          <Component id="lblFlankMP" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                      <Group type="102" alignment="0" attributes="0">
-                                          <Component id="jLabel13" min="-2" max="-2" attributes="0"/>
-                                          <EmptySpace min="2" pref="2" max="2" attributes="0"/>
-                                          <Component id="spnJumpMP" min="-2" max="-2" attributes="0"/>
-                                      </Group>
-                                  </Group>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace min="18" pref="18" max="18" attributes="0"/>
+                                  <Component id="lblFlankMP" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace min="20" pref="20" max="20" attributes="0"/>
+                                  <Component id="lblMoveSummary" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <Group type="102" alignment="0" attributes="0">
+                                  <Component id="jLabel13" min="-2" max="-2" attributes="0"/>
+                                  <EmptySpace min="10" pref="10" max="10" attributes="0"/>
+                                  <Component id="spnJumpMP" min="-2" max="-2" attributes="0"/>
                               </Group>
                           </Group>
-                          <EmptySpace pref="129" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                 </DimensionLayout>
                 <DimensionLayout dim="1">
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="0" attributes="0">
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" alignment="0" attributes="0">
-                                  <EmptySpace min="3" pref="3" max="3" attributes="0"/>
-                                  <Component id="jLabel10" min="-2" max="-2" attributes="0"/>
-                              </Group>
+                              <Component id="jLabel10" min="-2" max="-2" attributes="0"/>
                               <Component id="spnCruiseMP" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace min="2" pref="2" max="2" attributes="0"/>
+                          <EmptySpace min="5" pref="5" max="5" attributes="0"/>
                           <Group type="103" groupAlignment="3" attributes="0">
                               <Component id="jLabel11" alignment="3" min="-2" max="-2" attributes="0"/>
                               <Component id="lblFlankMP" alignment="3" min="-2" max="-2" attributes="0"/>
+                              <Component id="lblMoveSummary" min="-2" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace min="2" pref="2" max="2" attributes="0"/>
+                          <EmptySpace min="8" pref="8" max="8" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Group type="102" alignment="0" attributes="0">
-                                  <EmptySpace min="3" pref="3" max="3" attributes="0"/>
-                                  <Component id="jLabel13" min="-2" max="-2" attributes="0"/>
-                              </Group>
+                              <Component id="jLabel13" min="-2" max="-2" attributes="0"/>
                               <Component id="spnJumpMP" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="32767" attributes="0"/>
@@ -1508,6 +1525,11 @@
                     <Property name="text" type="java.lang.String" value="2"/>
                   </Properties>
                 </Component>
+                <Component class="javax.swing.JLabel" name="lblMoveSummary">
+                  <Properties>
+                    <Property name="text" type="java.lang.String" value="W/R: 12/20"/>
+                  </Properties>
+                </Component>
                 <Component class="javax.swing.JLabel" name="jLabel13">
                   <Properties>
                     <Property name="text" type="java.lang.String" value="Jump MP:"/>
@@ -1706,6 +1728,9 @@
                     <Property name="text" type="java.lang.String" value="VTOL Jet Booster"/>
                     <Property name="enabled" type="boolean" value="false"/>
                   </Properties>
+                  <Events>
+                    <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkJetBoosterActionPerformed"/>
+                  </Events>
                 </Component>
                 <Component class="javax.swing.JCheckBox" name="chkSupercharger">
                   <Properties>
@@ -4329,10 +4354,10 @@
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
               <SubComponents>
-                <Container class="javax.swing.JScrollPane" name="jScrollPane23">
+                <Container class="javax.swing.JScrollPane" name="scrSelectedEquip">
                   <Properties>
-                    <Property name="horizontalScrollBarPolicy" type="int" value="31"/>
-                    <Property name="verticalScrollBarPolicy" type="int" value="22"/>
+                    <Property name="horizontalScrollBarPolicy" type="int" value="30"/>
+                    <Property name="verticalScrollBarPolicy" type="int" value="20"/>
                   </Properties>
                   <AuxValues>
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
@@ -5598,7 +5623,7 @@
                         </Container>
                         <Component class="javax.swing.JButton" name="btnAddQuirk">
                           <Properties>
-                            <Property name="text" type="java.lang.String" value="Add Quirk"/>
+                            <Property name="text" type="java.lang.String" value="Manage Quirk"/>
                           </Properties>
                           <Events>
                             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddQuirkActionPerformed"/>