From e70b1ae0ec5e79964da06cf93ea5fe9b87f260c0 Mon Sep 17 00:00:00 2001 From: Repligator <33times@gmail.com> Date: Mon, 4 Nov 2024 06:31:02 -0500 Subject: [PATCH] WIP --- megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf | 3 ++- megamek/src/megamek/common/Mek.java | 3 ++- megamek/src/megamek/common/MiscType.java | 1 + megamek/src/megamek/common/actions/WeaponAttackAction.java | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf b/megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf index 3174dc2c191..9591817c90a 100644 --- a/megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf +++ b/megamek/data/mekfiles/meks/3075/Grigori C-GRG-O Invictus.mtf @@ -16,6 +16,7 @@ quirk:imp_com quirk:imp_sensors quirk:bad_rep_clan quirk:bad_rep_is +quirk:animalistic Mass:60 @@ -126,7 +127,7 @@ Cockpit Sensors Light PPC (omnipod) Light PPC (omnipod) --Empty- +Neural Interface -Empty- -Empty- -Empty- diff --git a/megamek/src/megamek/common/Mek.java b/megamek/src/megamek/common/Mek.java index 2bc8fc6b00b..7e525fe268e 100644 --- a/megamek/src/megamek/common/Mek.java +++ b/megamek/src/megamek/common/Mek.java @@ -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"); } diff --git a/megamek/src/megamek/common/MiscType.java b/megamek/src/megamek/common/MiscType.java index 339a26231d8..d5c18e6755d 100644 --- a/megamek/src/megamek/common/MiscType.java +++ b/megamek/src/megamek/common/MiscType.java @@ -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; diff --git a/megamek/src/megamek/common/actions/WeaponAttackAction.java b/megamek/src/megamek/common/actions/WeaponAttackAction.java index ca42769604b..2cff6fc5ceb 100644 --- a/megamek/src/megamek/common/actions/WeaponAttackAction.java +++ b/megamek/src/megamek/common/actions/WeaponAttackAction.java @@ -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")); }