Merge pull request #5856 from impaktor/some-tweaks

Fix Military Drive 2 not for sale & tweaks

data/modules/Debug/DebugRPG.lua

@@ -7,7 +7,6 @@ local ui = require 'pigui'
 local debugView = require 'pigui.views.debug'
 local Commodities = require 'Commodities'
 local amount = 1000
-local selected = 0
 
 local Legal = require "Legal"
 local utils = require "utils"
@@ -16,7 +15,7 @@ local l = Lang.GetResource("ui-core")
 
 -- build list of all crime types:
 local crime_types = {}
-for k, v in pairs(Legal.CrimeType) do
+for k, _ in pairs(Legal.CrimeType) do
 	table.insert(crime_types, k)
 end
 
@@ -41,7 +40,7 @@ end
 
 debugView.registerTab("RPG-debug-view", function()
 	if Game.player == nil then return end
-    if not ui.beginTabItem("RPG") then return end
+	if not ui.beginTabItem("RPG") then return end
 		ui.text("State: " .. Game.player:GetFlightState())
 
 		-- Reputation
@@ -70,7 +69,6 @@ debugView.registerTab("RPG-debug-view", function()
 		end
 		ui.separator()
 
-		local rows = 10
 		if ui.collapsingHeader("Crime", {}) then
 
 			ui.text("ADD CRIMINAL CHARGES:")

data/modules/Scoop/Scoop.lua

@@ -93,14 +93,15 @@ local spoiled_food = CommodityType.RegisterCommodity("spoiled_food", {
 	purchasable = false
 })
 
-local unknown = CommodityType.RegisterCommodity("unknown", {
-	l10n_key = "UNKNOWN",
-	l10n_resource = "module-scoop",
-	price = -5,
-	icon_name = "Default",
-	mass = 1,
-	purchasable = false
-})
+-- -- Unclear what player should do with "Unknown" cargo -> disable for now
+-- local unknown = CommodityType.RegisterCommodity("unknown", {
+--	l10n_key = "UNKNOWN",
+--	l10n_resource = "module-scoop",
+--	price = -5,
+--	icon_name = "Default",
+--	mass = 1,
+--	purchasable = false
+-- })
 
 local rescue_capsules = {
 	rescue_capsule
@@ -115,7 +116,7 @@ local weapons = {
 local waste = {
 	toxic_waste,
 	spoiled_food,
-	unknown,
+	-- unknown,
 	Commodities.radioactives,
 	Commodities.rubbish
 }

data/pigui/libs/ship-equipment.lua

@@ -118,7 +118,7 @@ local hasTech = function (station, e)
 
 	if type(equip_tech_level) == "string" then
 		if equip_tech_level == "MILITARY" then
-			return station.techLevel == 11
+			equip_tech_level = 11
 		else
 			error("Unknown tech level:\t"..equip_tech_level)
 		end