forked from OpenWF/SpaceNinjaServer
		
	fix(webui): blacklist modular weapons from add missing (#1425)
Reviewed-on: OpenWF/SpaceNinjaServer#1425 Co-authored-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Co-committed-by: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									2b451a19e6
								
							
						
					
					
						commit
						158310bda2
					
				@ -157,6 +157,15 @@ function setLanguage(lang) {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const webUiModularWeapons = [
 | 
				
			||||||
 | 
					    "/Lotus/Weapons/Sentients/OperatorAmplifiers/OperatorAmpWeapon",
 | 
				
			||||||
 | 
					    "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon",
 | 
				
			||||||
 | 
					    "/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimary",
 | 
				
			||||||
 | 
					    "/Lotus/Weapons/SolarisUnited/Secondary/LotusModularSecondary",
 | 
				
			||||||
 | 
					    "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit",
 | 
				
			||||||
 | 
					    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit"
 | 
				
			||||||
 | 
					];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
let uniqueLevelCaps = {};
 | 
					let uniqueLevelCaps = {};
 | 
				
			||||||
function fetchItemList() {
 | 
					function fetchItemList() {
 | 
				
			||||||
    window.itemListPromise = new Promise(resolve => {
 | 
					    window.itemListPromise = new Promise(resolve => {
 | 
				
			||||||
@ -824,7 +833,9 @@ function addMissingEquipment(categories) {
 | 
				
			|||||||
                    "#" + category + "-list [data-item-type='" + elm.getAttribute("data-key") + "']"
 | 
					                    "#" + category + "-list [data-item-type='" + elm.getAttribute("data-key") + "']"
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
            ) {
 | 
					            ) {
 | 
				
			||||||
                requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount: 1 });
 | 
					                if (!webUiModularWeapons.includes(elm.getAttribute("data-key"))) {
 | 
				
			||||||
 | 
					                    requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount: 1 });
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
@ -1413,31 +1424,15 @@ function toast(text) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function handleModularSelection(category) {
 | 
					function handleModularSelection(category) {
 | 
				
			||||||
    const modularWeapons = [
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/Sentients/OperatorAmplifiers/OperatorAmpWeapon",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimary",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/SolarisUnited/Secondary/LotusModularSecondary",
 | 
					 | 
				
			||||||
        "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit",
 | 
					 | 
				
			||||||
        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit"
 | 
					 | 
				
			||||||
    ];
 | 
					 | 
				
			||||||
    const itemType = getKey(document.getElementById("acquire-type-" + category));
 | 
					    const itemType = getKey(document.getElementById("acquire-type-" + category));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (modularWeapons.includes(itemType)) {
 | 
					    if (webUiModularWeapons.includes(itemType)) {
 | 
				
			||||||
        doAcquireModularEquipment(category, itemType);
 | 
					        doAcquireModularEquipment(category, itemType);
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        doAcquireEquipment(category);
 | 
					        doAcquireEquipment(category);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    const modularWeapons = [
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/Sentients/OperatorAmplifiers/OperatorAmpWeapon",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimary",
 | 
					 | 
				
			||||||
        "/Lotus/Weapons/SolarisUnited/Secondary/LotusModularSecondary",
 | 
					 | 
				
			||||||
        "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit",
 | 
					 | 
				
			||||||
        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit"
 | 
					 | 
				
			||||||
    ];
 | 
					 | 
				
			||||||
    const supportedModularInventoryCategory = ["OperatorAmps", "Melee", "LongGuns", "Pistols", "MoaPets"];
 | 
					    const supportedModularInventoryCategory = ["OperatorAmps", "Melee", "LongGuns", "Pistols", "MoaPets"];
 | 
				
			||||||
    supportedModularInventoryCategory.forEach(inventoryCategory => {
 | 
					    supportedModularInventoryCategory.forEach(inventoryCategory => {
 | 
				
			||||||
        document.getElementById("acquire-type-" + inventoryCategory).addEventListener("input", function () {
 | 
					        document.getElementById("acquire-type-" + inventoryCategory).addEventListener("input", function () {
 | 
				
			||||||
@ -1448,7 +1443,7 @@ function handleModularSelection(category) {
 | 
				
			|||||||
                    : null;
 | 
					                    : null;
 | 
				
			||||||
            const key = getKey(this);
 | 
					            const key = getKey(this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (modularWeapons.includes(key)) {
 | 
					            if (webUiModularWeapons.includes(key)) {
 | 
				
			||||||
                if (key === "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit" && modularFieldsZanuka) {
 | 
					                if (key === "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit" && modularFieldsZanuka) {
 | 
				
			||||||
                    modularFields.style.display = "none";
 | 
					                    modularFields.style.display = "none";
 | 
				
			||||||
                    modularFieldsZanuka.style.display = "";
 | 
					                    modularFieldsZanuka.style.display = "";
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user