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.

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

DNI quirkification Test/Proof of Concept/WIP/Draft #6175

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ quirk:imp_com
quirk:imp_sensors
quirk:bad_rep_clan
quirk:bad_rep_is
quirk:animalistic


Mass:60
Expand Down Expand Up @@ -126,7 +127,7 @@ Cockpit
Sensors
Light PPC (omnipod)
Light PPC (omnipod)
-Empty-
Neural Interface
-Empty-
-Empty-
-Empty-
Expand Down
3 changes: 2 additions & 1 deletion megamek/src/megamek/common/Mek.java
Original file line number Diff line number Diff line change
Expand Up @@ -3301,7 +3301,8 @@ public PilotingRollData addEntityBonuses(PilotingRollData roll) {

// VDNI bonus?
if (hasAbility(OptionsConstants.MD_VDNI)
&& !hasAbility(OptionsConstants.MD_BVDNI)) {
&& !hasAbility(OptionsConstants.MD_BVDNI)
&& hasQuirk("animalistic")) {
roll.addModifier(-1, "VDNI");
}

Expand Down
1 change: 1 addition & 0 deletions megamek/src/megamek/common/MiscType.java
Original file line number Diff line number Diff line change
Expand Up @@ -4283,6 +4283,7 @@ public static MiscType createBattleMekNeuralInterfaceUnit() {

misc.name = "Direct Neural Interface Cockpit Modification";
misc.setInternalName("BABattleMechNIU");
misc.setInternalName("Neural Interface");
misc.tonnage = 0.0;
misc.criticals = 0;
misc.cost = 500000;
Expand Down
5 changes: 3 additions & 2 deletions megamek/src/megamek/common/actions/WeaponAttackAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -4150,8 +4150,9 @@ private static ToHitData compileCrewToHitMods(Game game, Entity ae, Entity te, T
// Manei Domini Upgrades

// VDNI
if (ae.hasAbility(OptionsConstants.MD_VDNI)
|| ae.hasAbility(OptionsConstants.MD_BVDNI)) {
if (ae.hasAbility(OptionsConstants.MD_VDNI) && ae.hasQuirk("animalistic")
|| ae.hasAbility(OptionsConstants.MD_BVDNI)
&& ae.hasQuirk("animalistic")){
toHit.addModifier(-1, Messages.getString("WeaponAttackAction.Vdni"));
}

Expand Down