Skip to content

Commit

Permalink
Merge pull request #4863 from IllianiCBT/spa_clanTechKnowledge
Browse files Browse the repository at this point in the history 
Removed TN Modifier for IS Techs working on Clan Tech, Removed Clan Tech Knowledge SPA and Effects
  • Loading branch information
@HammerGS
HammerGS authored Sep 25, 2024
2 parents c49e96f + fd201e6 commit d05d2cf
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 63 deletions.
15 changes: 0 additions & 15 deletions MekHQ/data/universe/defaultspa.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,21 +459,6 @@
</ability>

<!-- Tech SPA -->
<ability>
<lookupName>clan_tech_knowledge</lookupName>
<displayName>Clan Tech Knowledge (Unofficial)</displayName>
<desc>Can work on clan equipment without penalty</desc>
<xpCost>4</xpCost>
<weight>2</weight>
<skillPrereq>
<skill>Tech/Mek</skill>
<skill>Tech/Mechanic</skill>
<skill>Tech/Aero</skill>
<skill>Tech/BA</skill>
<skill>Tech/Vessel</skill>
</skillPrereq>
<miscPrereq>clanperson:false</miscPrereq>
</ability>
<ability>
<lookupName>tech_weapon_specialist</lookupName>
<displayName>Tech Specialist, Weapon (Unofficial)</displayName>
Expand Down
46 changes: 10 additions & 36 deletions MekHQ/src/mekhq/campaign/parts/Part.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,8 @@
*/
package mekhq.campaign.parts;

import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.StringJoiner;
import java.util.UUID;

import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import megamek.Version;
import megamek.common.Entity;
import megamek.common.EquipmentType;
import megamek.common.ITechnology;
import megamek.common.SimpleTechLevel;
import megamek.common.Tank;
import megamek.common.TargetRoll;
import megamek.common.TechAdvancement;
import megamek.common.WeaponType;
import megamek.common.*;
import megamek.common.annotations.Nullable;
import megamek.common.options.OptionsConstants;
import megamek.logging.MMLogger;
Expand All @@ -62,6 +41,13 @@
import mekhq.campaign.work.WorkTime;
import mekhq.utilities.MHQXMLUtility;
import mekhq.utilities.ReportingUtilities;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import java.io.PrintWriter;
import java.util.*;

/**
* Parts do the lions share of the work of repairing, salvaging, reloading,
Expand Down Expand Up @@ -283,10 +269,12 @@ public String getName() {
*
* @return the part's actual value
*/
@Override
public Money getActualValue() {
return adjustCostsForCampaignOptions(getStickerPrice());
}

@Override
public boolean isPriceAdjustedForAmount() {
return false;
}
Expand Down Expand Up @@ -893,13 +881,6 @@ public TargetRoll getAllMods(final @Nullable Person tech) {
}

if (tech != null) {
if ((isClanTechBase()
|| ((this instanceof MekLocation) && (getUnit() != null) && getUnit().getEntity().isClan()))
&& (!tech.isClanPersonnel()
&& !tech.getOptions().booleanOption(PersonnelOptions.TECH_CLAN_TECH_KNOWLEDGE))) {
mods.addModifier(2, "Clan tech");
}

if (tech.getOptions().booleanOption(PersonnelOptions.TECH_WEAPON_SPECIALIST)
&& ((IPartWork.findCorrectRepairType(this) == PartRepairType.WEAPON)
|| (IPartWork.findCorrectMRMSType(this) == PartRepairType.PHYSICAL_WEAPON))) {
Expand Down Expand Up @@ -949,13 +930,6 @@ public TargetRoll getAllModsForMaintenance() {
}

if (getUnit().getTech() != null) {
if ((isClanTechBase() || ((this instanceof MekLocation) && getUnit().getEntity().isClan()))
&& (!getUnit().getTech().isClanPersonnel()
&& !getUnit().getTech().getOptions()
.booleanOption(PersonnelOptions.TECH_CLAN_TECH_KNOWLEDGE))) {
mods.addModifier(2, "Clan tech");
}

if (getUnit().getTech().getOptions().booleanOption(PersonnelOptions.TECH_WEAPON_SPECIALIST)
&& ((IPartWork.findCorrectRepairType(this) == PartRepairType.WEAPON)
|| (IPartWork.findCorrectMRMSType(this) == PartRepairType.PHYSICAL_WEAPON))) {
Expand Down
16 changes: 4 additions & 12 deletions MekHQ/src/mekhq/campaign/personnel/PersonnelOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,15 @@
*/
package mekhq.campaign.personnel;

import megamek.common.annotations.Nullable;
import megamek.common.options.*;
import megamek.logging.MMLogger;

import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
import java.util.Vector;

import megamek.common.annotations.Nullable;
import megamek.common.options.AbstractOptionsInfo;
import megamek.common.options.IBasicOptionGroup;
import megamek.common.options.IOption;
import megamek.common.options.IOptionGroup;
import megamek.common.options.IOptionInfo;
import megamek.common.options.OptionsConstants;
import megamek.common.options.PilotOptions;
import megamek.logging.MMLogger;

/**
* An extension of PilotOptions that adds MekHQ-specific SPAs and edge triggers
* for support and command
Expand All @@ -45,7 +39,6 @@ public class PersonnelOptions extends PilotOptions {
public static final String EDGE_REPAIR_FAILED_REFIT = "edge_when_fail_refit_check";
public static final String EDGE_ADMIN_ACQUIRE_FAIL = "edge_when_admin_acquire_fail";

public static final String TECH_CLAN_TECH_KNOWLEDGE = "clan_tech_knowledge";
public static final String TECH_WEAPON_SPECIALIST = "tech_weapon_specialist";
public static final String TECH_ARMOR_SPECIALIST = "tech_armor_specialist";
public static final String TECH_INTERNAL_SPECIALIST = "tech_internal_specialist";
Expand Down Expand Up @@ -89,7 +82,6 @@ public void initialize() {
}

// Add MekHQ-specific options
addOption(l3a, TECH_CLAN_TECH_KNOWLEDGE, false);
addOption(l3a, TECH_WEAPON_SPECIALIST, false);
addOption(l3a, TECH_ARMOR_SPECIALIST, false);
addOption(l3a, TECH_INTERNAL_SPECIALIST, false);
Expand Down

0 comments on commit d05d2cf

Please sign in to comment.