Merge branch 'fixSF_Marine' into 'pregmod-master'

fixSF_Marine

See merge request pregmodfan/fc-pregmod!10622

src/Mods/SpecialForce/upgrades/SpecialForceUpgradeFunctions.js

@@ -66,9 +66,10 @@ App.SF.upgrades = (function() {
 
 		if (completeView === 'all' || T1) { // Launch Bay
 			array.push('Satellite');
-			if (V.terrain !== "oceanic" && V.terrain !== "marine") {
+			if (V.terrain !== "oceanic") {
 				array.push('GiantRobot', 'MissileSilo');
-			} else if (V.terrain === "oceanic" || V.terrain === "marine") { // Naval Yard
+			}
+			if (V.terrain === "oceanic" || V.terrain === "marine") { // Naval Yard
 				array.push('AircraftCarrier', 'Sub', 'HAT');
 			}
 		}
@@ -86,9 +87,8 @@ App.SF.upgrades = (function() {
 		if (!T1) {
 			if (['Armoury', 'Firebase', 'Drugs', 'Drones', 'AV', 'TV', 'AA', 'TA'].includes(input)) {
 				return 5;
-			} else {
-				return 0;
 			}
+			return 0;
 		} else {
 			if (!['SpacePlane', 'GunS', 'Satellite', 'GiantRobot', 'MissileSilo', 'AircraftCarrier', 'Sub', 'HAT'].includes(input)) {
 				return 10;