From f999fe8658e3a161bcd03dee5889af67aa55f6b1 Mon Sep 17 00:00:00 2001 From: phkb Date: Wed, 12 Aug 2020 15:56:55 +1000 Subject: [PATCH] Ensure any equipment incompatibility refs are enforced (#362) Regardless of the order of loading --- Resources/Scripts/oolite-equipment-control.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Scripts/oolite-equipment-control.js b/Resources/Scripts/oolite-equipment-control.js index dbbe0d0b..06e4bbea 100644 --- a/Resources/Scripts/oolite-equipment-control.js +++ b/Resources/Scripts/oolite-equipment-control.js @@ -156,6 +156,14 @@ this.equipmentAdded = function(equip) } } } + var eq_dict = this.$equipmentEnabled; + var eqIncompatible; + for (eqKey in eq_dict) { + eqIncompatible = EquipmentInfo.infoForKey(eqKey).incompatibleEquipment; + if (eqIncompatible && eqIncompatible.indexOf(equip) >= 0) { + player.ship.removeEquipment(eqKey); + } + } this.$equipmentEnabled[equip] = 1; };