Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few options to have certain output closer to MML's output #319

Merged
merged 2 commits into from
Dec 26, 2023
Merged

A few options to have certain output closer to MML's output #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af51ba0
Add option to apply weight multiplier to ammo costs ala MML
lbmaian Nov 27, 2023
8f2139f
Add option to halve heat of streaks ala MML
lbmaian Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion saw/src/main/java/saw/gui/dlgPrefs.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="2" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>

Expand Down Expand Up @@ -525,6 +525,16 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JCheckBox" name="chkHeatStreaks">
<Properties>
<Property name="text" type="java.lang.String" value="Streaks have 50% fire rate (ala MML)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel19">
<Properties>
<Property name="text" type="java.lang.String" value="Non-BV Heat Calculations:"/>
Expand All @@ -537,6 +547,38 @@
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel15">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Cost Options">
<Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
<EtchetBorder/>
</Border>
</TitledBorder>
</Border>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Component class="javax.swing.JCheckBox" name="chkCostAmmoMult">
<Properties>
<Property name="text" type="java.lang.String" value="Apply weight mult to ammo (ala MML)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel13">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
Expand Down
37 changes: 36 additions & 1 deletion saw/src/main/java/saw/gui/dlgPrefs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ private void SetState() {
chkHeatAllMP.setEnabled( true );
}
chkHeatUAC.setSelected( Prefs.getBoolean( "HeatACFullRate", false ) );
chkHeatStreaks.setSelected( Prefs.getBoolean( "HeatStreaksHalfRate", false ) );
chkCostAmmoMult.setSelected( Prefs.getBoolean( "CostAmmoMult", false ) );
chkAutoAddECM.setSelected( Prefs.getBoolean( "AutoAddECM", true ) );

chkMaxNotInt.setSelected( Prefs.getBoolean( "UseMaxArmorInstead", false ) );
Expand Down Expand Up @@ -155,6 +157,8 @@ private void SaveState() {
Prefs.putBoolean( "HeatExcludeJumpMP", chkHeatJumpMP.isSelected() );
Prefs.putBoolean( "HeatExcludeAllMP", chkHeatAllMP.isSelected() );
Prefs.putBoolean( "HeatACFullRate", chkHeatUAC.isSelected() );
Prefs.putBoolean( "HeatStreaksHalfRate", chkHeatStreaks.isSelected() );
Prefs.putBoolean( "CostAmmoMult", chkCostAmmoMult.isSelected() );
Prefs.putBoolean( "UseMaxArmorInstead", chkMaxNotInt.isSelected() );
Prefs.putBoolean( "ArmorUseCustomPercent", chkCustomPercents.isSelected() );
Prefs.putBoolean( "ArmorMaxHead", rdoArmorMaxHead.isSelected() );
Expand Down Expand Up @@ -219,6 +223,8 @@ private void SetDefaults() {
Prefs.putBoolean( "HeatExcludeJumpMP", false );
Prefs.putBoolean( "HeatExcludeAllMP", false );
Prefs.putBoolean( "HeatACFullRate", false );
Prefs.putBoolean( "HeatStreaksHalfRate", false );
Prefs.putBoolean( "CostAmmoMult", false );
Prefs.putBoolean( "UseMaxArmorInstead", false );
Prefs.putBoolean( "ArmorUseCustomPercent", false );
Prefs.putBoolean( "ArmorMaxHead", true );
Expand Down Expand Up @@ -297,7 +303,10 @@ private void initComponents() {
chkHeatJumpMP = new javax.swing.JCheckBox();
chkHeatAllMP = new javax.swing.JCheckBox();
chkHeatUAC = new javax.swing.JCheckBox();
chkHeatStreaks = new javax.swing.JCheckBox();
jLabel19 = new javax.swing.JLabel();
jPanel15 = new javax.swing.JPanel();
chkCostAmmoMult = new javax.swing.JCheckBox();
jPanel13 = new javax.swing.JPanel();
chkAutoAddECM = new javax.swing.JCheckBox();
jPanel4 = new javax.swing.JPanel();
Expand Down Expand Up @@ -666,6 +675,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
jPanel8.add(chkHeatUAC, gridBagConstraints);

chkHeatStreaks.setText("Streaks have 50% fire rate (ala MML)");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 8;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
jPanel8.add(chkHeatStreaks, gridBagConstraints);

jLabel19.setText("Non-BV Heat Calculations:");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
Expand All @@ -674,10 +691,25 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
gridBagConstraints.gridheight = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
pnlConstruction.add(jPanel8, gridBagConstraints);

jPanel15.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Cost Options"));
jPanel15.setLayout(new java.awt.GridBagLayout());

chkCostAmmoMult.setText("Apply weight mult to ammo (ala MML)");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0);
jPanel15.add(chkCostAmmoMult, gridBagConstraints);

gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 2;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
pnlConstruction.add(jPanel15, gridBagConstraints);

jPanel13.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Usability Options"));
jPanel13.setLayout(new javax.swing.BoxLayout(jPanel13, javax.swing.BoxLayout.LINE_AXIS));

Expand Down Expand Up @@ -1667,13 +1699,15 @@ private void btnDefaultImagePathActionPerformed(java.awt.event.ActionEvent evt)
private javax.swing.JButton btnSetDefaults;
private javax.swing.JButton btnTXTPath;
private javax.swing.JCheckBox chkAutoAddECM;
private javax.swing.JCheckBox chkCostAmmoMult;
private javax.swing.JCheckBox chkCustomPercents;
private javax.swing.JCheckBox chkGroupAmmoAtBottom;
private javax.swing.JCheckBox chkHeatAllMP;
private javax.swing.JCheckBox chkHeatEquip;
private javax.swing.JCheckBox chkHeatJumpMP;
private javax.swing.JCheckBox chkHeatOSWeapons;
private javax.swing.JCheckBox chkHeatRearWeapons;
private javax.swing.JCheckBox chkHeatStreaks;
private javax.swing.JCheckBox chkHeatSystems;
private javax.swing.JCheckBox chkHeatUAC;
private javax.swing.JCheckBox chkLoadLastMech;
Expand Down Expand Up @@ -1705,6 +1739,7 @@ private void btnDefaultImagePathActionPerformed(java.awt.event.ActionEvent evt)
private javax.swing.JPanel jPanel12;
private javax.swing.JPanel jPanel13;
private javax.swing.JPanel jPanel14;
private javax.swing.JPanel jPanel15;
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel4;
Expand Down
44 changes: 43 additions & 1 deletion ssw/src/main/java/ssw/gui/dlgPrefs.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="2" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>

Expand Down Expand Up @@ -525,6 +525,16 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JCheckBox" name="chkHeatStreaks">
<Properties>
<Property name="text" type="java.lang.String" value="Streaks have 50% fire rate (ala MML)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="8" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel19">
<Properties>
<Property name="text" type="java.lang.String" value="Non-BV Heat Calculations:"/>
Expand All @@ -537,6 +547,38 @@
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel15">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="Cost Options">
<Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
<EtchetBorder/>
</Border>
</TitledBorder>
</Border>
</Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="11" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
<Component class="javax.swing.JCheckBox" name="chkCostAmmoMult">
<Properties>
<Property name="text" type="java.lang.String" value="Apply weight mult to ammo (ala MML)"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="0" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel13">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
Expand Down
Loading
Loading