Mods:

Fix Bugs 6.3: Elevator func not checking for invalid resources (seen an error in an unrelated log file). Stopped Tourist Gurus from happening (https://www.reddit.com/r/SurvivingMars/comments/1f178q0/how/) Remove Unwanted Colonists 2.4: Fixed stuck pods. Underground Cheats 0.4: Added mod option to pin rockets. [email protected]
ChoGGi · Sep 2, 2024 · 403d74b · 403d74b
1 parent 0905b1c
commit 403d74b
Show file tree

Hide file tree

Showing 34 changed files with 146 additions and 76 deletions.
diff --git a/Mods ChoGGi/Add Rivals/items.lua b/Mods ChoGGi/Add Rivals/items.lua
@@ -1,6 +1,6 @@
 -- See LICENSE for terms
 
-local properties = {
+local mod_options = {
 	PlaceObj("ModItemOptionToggle", {
 		"name", "EnableMod",
 		"DisplayName", T(302535920011303, "<color ChoGGi_yellow>Enable Mod</color>"),
@@ -35,14 +35,14 @@ You might need to re-apply mod options after starting a couple new games.]]),
 	}),
 }
 
-local c = #properties
+local c = #mod_options
 
 local rivals = Presets.DumbAIDef.MissionSponsors
 for i = 1, #rivals do
 	local rival = rivals[i]
 	if rival.id ~= "none" and rival.id ~= "random" then
 		c = c + 1
-		properties[c] = PlaceObj("ModItemOptionToggle", {
+		mod_options[c] = PlaceObj("ModItemOptionToggle", {
 			"name", rival.id,
 			"DisplayName", T(rival.display_name),
 			"Help", T(rival.description .. "<newline> If turned on this will be used as a rival instead of random (this will override Rival Amount)."),
@@ -51,4 +51,4 @@ for i = 1, #rivals do
 	end
 end
 
-return properties
+return mod_options
diff --git a/Mods ChoGGi/All Sponsor Buildings/items.lua b/Mods ChoGGi/All Sponsor Buildings/items.lua
@@ -21,7 +21,7 @@ local PlaceObj = PlaceObj
 local table = table
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 -- shown ame of tech
 local techs = {

diff --git a/Mods ChoGGi/Allow BB Buildings/items.lua b/Mods ChoGGi/Allow BB Buildings/items.lua
@@ -11,7 +11,7 @@ local mod_options = {
 		"DefaultValue", true,
 	}),
 }
-local c = 1
+local c = #mod_options
 
 local BuildingTemplates = BuildingTemplates
 for id, item in pairs(BuildingTemplates) do

diff --git a/Mods ChoGGi/Autonomous Factories/items.lua b/Mods ChoGGi/Autonomous Factories/items.lua
@@ -16,7 +16,7 @@ local mod_options = {
 		"StepSize", 10,
 	}),
 }
-local c = 1
+local c = #mod_options
 
 local g_Classes = g_Classes
 local BuildingTemplates = BuildingTemplates

diff --git a/Mods ChoGGi/Block Pets/items.lua b/Mods ChoGGi/Block Pets/items.lua
@@ -30,7 +30,7 @@ local mod_options = {
 		"MaxValue", 200,
 	}),
 }
-local c = 2
+local c = #mod_options
 
 local Animals = Animals
 for id, def in pairs(Animals) do

diff --git a/Mods ChoGGi/Bottomless Storage/items.lua b/Mods ChoGGi/Bottomless Storage/items.lua
@@ -5,7 +5,7 @@ local T = T
 local table = table
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 local resources = table.icopy(UniversalStorageDepot.storable_resources)
 

diff --git a/Mods ChoGGi/Change Lightmodel/items.lua b/Mods ChoGGi/Change Lightmodel/items.lua
@@ -4,7 +4,7 @@ local PlaceObj = PlaceObj
 local T = T
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 local lightmodels = {
 	"Terraformed",

diff --git a/Mods ChoGGi/Colonist Next Age/items.lua b/Mods ChoGGi/Colonist Next Age/items.lua
@@ -43,7 +43,7 @@ Set this and min to 0 to revert all colonist death ages to game default random v
 	}),
 }
 
-local c = 4
+local c = #mod_options
 
 local Colonist = Colonist
 local ColonistAgeGroups = const.ColonistAgeGroups

diff --git a/Mods ChoGGi/Constant Disasters/items.lua b/Mods ChoGGi/Constant Disasters/items.lua
@@ -1,7 +1,7 @@
 -- See LICENSE for terms
 
 local properties = {}
-local c = 0
+local c = #mod_options
 local disasters = {
 	ColdWaves = T(4148, "Cold Waves"),
 	DustStorms = T(4144, "Dust Storms"),

diff --git a/Mods ChoGGi/Custom Resource Icon Toggle/items.lua b/Mods ChoGGi/Custom Resource Icon Toggle/items.lua
@@ -5,7 +5,7 @@ local PlaceObj = PlaceObj
 local T = T
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 -- skip instead of add for mod added ones
 local skips = {

diff --git a/Mods ChoGGi/Disable Disasters/items.lua b/Mods ChoGGi/Disable Disasters/items.lua
@@ -1,7 +1,7 @@
 -- See LICENSE for terms
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 local table = table
 
 local disasters = {

diff --git a/Mods ChoGGi/Fix Bugs/Code/Script.lua b/Mods ChoGGi/Fix Bugs/Code/Script.lua
@@ -125,38 +125,6 @@ function OnMsg.SectorScanned()
 end
 --
 function OnMsg.ClassesPostprocess()
-
-	-- Cargo presets are missing images for some buildings/all resources
-	local articles = Presets.EncyclopediaArticle.Resources
-	local lookup_res = {
-		PreciousMinerals = articles.ExoticMinerals.image,
-		Concrete = articles.Concrete.image,
-		Electronics = articles.Electronics.image,
-		Food = articles.Food.image,
-		Fuel = articles.Fuel.image,
-		MachineParts = articles["Mechanical Parts"].image,
-		Metals = articles.Metals.image,
-		Polymers = articles.Polymers.image,
-		PreciousMetals = articles["Rare Metals"].image,
-		Seeds = articles.Seeds.image,
-		-- Close enough
-		WasteRock = "UI/Messages/Tutorials/Tutorial1/Tutorial1_WasteRockConcreteDepot.tga",
-	}
-
-	local BuildingTemplates = BuildingTemplates
-	local CargoPreset = CargoPreset
-	for id, cargo in pairs(CargoPreset) do
-		if not cargo.icon then
-
-			if lookup_res[id] then
-				cargo.icon = lookup_res[id]
-			elseif BuildingTemplates[id] then
-				cargo.icon = BuildingTemplates[id].encyclopedia_image
-			end
-
-		end
-	end
-
 	-- Fix Colonist Daily Interest Loop
 	-- last checked 1011030 Colonist:EnterBuilding()
 	local ChoOrig_Colonist_EnterBuilding = Colonist.EnterBuilding
@@ -194,7 +162,44 @@ do -- CityStart/LoadGame
 		local ResupplyItemDefinitions = ResupplyItemDefinitions
 		local bt = BuildingTemplates
 		local main_realm = GetRealmByID(MainMapID)
-    local objs
+    local objs
+
+		--
+		-- I'm going out on a limb and saying tourist gurus are a bug.
+		TraitPresets.Guru.incompatible.Tourist = true
+		TraitPresets.Tourist.incompatible.Guru = true
+
+		--
+		-- Cargo presets are missing images for some buildings/all resources
+		local articles = Presets.EncyclopediaArticle.Resources
+		local lookup_res = {
+			PreciousMinerals = articles.ExoticMinerals.image,
+			Concrete = articles.Concrete.image,
+			Electronics = articles.Electronics.image,
+			Food = articles.Food.image,
+			Fuel = articles.Fuel.image,
+			MachineParts = articles["Mechanical Parts"].image,
+			Metals = articles.Metals.image,
+			Polymers = articles.Polymers.image,
+			PreciousMetals = articles["Rare Metals"].image,
+			Seeds = articles.Seeds.image,
+			-- Close enough
+			WasteRock = "UI/Messages/Tutorials/Tutorial1/Tutorial1_WasteRockConcreteDepot.tga",
+		}
+
+		local BuildingTemplates = BuildingTemplates
+		local CargoPreset = CargoPreset
+		for id, cargo in pairs(CargoPreset) do
+			if not cargo.icon then
+
+				if lookup_res[id] then
+					cargo.icon = lookup_res[id]
+				elseif BuildingTemplates[id] then
+					cargo.icon = BuildingTemplates[id].encyclopedia_image
+				end
+
+			end
+		end
 
 		--
 		-- See OnMsg.TechResearched below for more info about GeneForging
@@ -1194,6 +1199,34 @@ end
 --
 --
 --
+--
+
+--
+-- Why it doesn't check if the cargo resource exists is anyones guess.
+-- Seen an error in a log file, no idea what it's from though.
+local ChoOrig_Elevator_DeliverResource = Elevator.DeliverResource
+function Elevator:DeliverResource(resource, ...)
+	if not mod_EnableMod then
+		return ChoOrig_Elevator_DeliverResource(self, resource, ...)
+	end
+
+	-- This is from the func, it can't hurt to have it happen, and it might hurt not to.
+	-- last checked lua rev 1011166
+  if not self.other.cargo[resource] then
+    self.other.cargo[resource] = {
+      class = resource,
+      requested = 0,
+      amount = 0
+    }
+  end
+
+	if not self.cargo[resource] then
+		return
+	end
+
+	return ChoOrig_Elevator_DeliverResource(self, resource, ...)
+end
+
 --
 -- No flying drones underground
 if g_AvailableDlc.gagarin then

diff --git a/Mods ChoGGi/Fix Bugs/MoreInfo.md b/Mods ChoGGi/Fix Bugs/MoreInfo.md
@@ -16,6 +16,7 @@ Problem updating supply grid.
 Colonists on an expedition now show proper status when selected from command centre (instead of just unknown).
 Added missing images for certain Cargo listings.
 Gale crater name doesn't show up for 4S138E, 5S138E.
+Stopped Tourist Gurus from happening.
 
 Storybits:
 Gene Forging storybit tech doesn't increase rare traits chance.
@@ -28,7 +29,8 @@ Marsgate blank transportation panel in CCC after a certain point in mystery.
 St. Elmo's Fire: Stop meteoroids from destroying sinkholes.
 The Philosopher's Stone Mystery doesn't update sector scanned count when paused.
 
-B&B:
+B&B
+Elevator func not checking for invalid resources.
 Colonists showing up on wrong map in infobar (also negative counts in infobar).
 No flying drones underground (they tend to get stuck in walls/etc).
 No Planetary Anomaly Breakthroughs when B&B is installed.

diff --git a/Mods ChoGGi/Fix Bugs/changes.txt b/Mods ChoGGi/Fix Bugs/changes.txt
@@ -1,7 +1,10 @@
+v6.3
+Elevator func not checking for invalid resources (seen an error in an unrelated log file).
+Stopped Tourist Gurus from happening (https://www.reddit.com/r/SurvivingMars/comments/1f178q0/how/)
+
 v6.2
 Added my Pins Missing Some Status Icons mod.
 
-
 v6.1
 Added missing images for Cargo listings.
 Gale crater name doesn't show up for 4S138E, 5S138E (thanks a_pompous_fool).

diff --git a/Mods ChoGGi/Fix Bugs/metadata.lua b/Mods ChoGGi/Fix Bugs/metadata.lua
@@ -4,9 +4,9 @@ return PlaceObj("ModDef", {
 	"steam_id", "2721921772",
 	"pops_any_uuid", "3aff9cde-7dc1-4ad8-b38d-31a7568185ff",
 	"lua_revision", 1007000, -- Picard
-	"version", 62,
+	"version", 63,
 	"version_major", 6,
-	"version_minor", 2,
+	"version_minor", 3,
 	"image", "Preview.jpg",
 	"author", "ChoGGi",
 	"code", {

diff --git a/Mods ChoGGi/Fix Bugs/todo.txt b/Mods ChoGGi/Fix Bugs/todo.txt
@@ -1,7 +1,3 @@
-https://www.reddit.com/r/SurvivingMars/comments/1f178q0/how/
- tourist gurus seem like a bug
-
-
 condition = function(self)
   return not IsGameRuleActive("NoPicard")
 end,

diff --git a/Mods ChoGGi/Game Rule Apocalypse Run/items.lua b/Mods ChoGGi/Game Rule Apocalypse Run/items.lua
@@ -44,7 +44,7 @@ local bits = {
 }
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 local table = table
 local PlaceObj = PlaceObj

diff --git a/Mods ChoGGi/Notification Disable/items.lua b/Mods ChoGGi/Notification Disable/items.lua
@@ -5,7 +5,8 @@ local T = T
 
 -- build sorted list of all notifications
 local mod_options = {}
-local c = 0
+local c = #mod_options
+
 local OnScreenNotificationPresets = OnScreenNotificationPresets
 for id, item in pairs(OnScreenNotificationPresets) do
 	local priority

diff --git a/Mods ChoGGi/Notification Pause/items.lua b/Mods ChoGGi/Notification Pause/items.lua
@@ -6,7 +6,8 @@ local T = T
 
 -- build sorted list of all notifications
 local mod_options = {}
-local c = 0
+local c = #mod_options
+
 local OnScreenNotificationPresets = OnScreenNotificationPresets
 for id, item in pairs(OnScreenNotificationPresets) do
 	local priority

diff --git a/Mods ChoGGi/POI Spawn Rate/items.lua b/Mods ChoGGi/POI Spawn Rate/items.lua
@@ -4,7 +4,7 @@ local table = table
 local T = T
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 local POIPresets = POIPresets
 for id, poi in pairs(POIPresets) do

diff --git a/Mods ChoGGi/Photo Filter Toggle/items.lua b/Mods ChoGGi/Photo Filter Toggle/items.lua
@@ -4,7 +4,7 @@ local table = table
 local T = T
 
 local mod_options = {}
-local c = 0
+local c = #mod_options
 
 -- add filters
 local PhotoFilterPresetMap = PhotoFilterPresetMap

diff --git a/Mods ChoGGi/Play All Mysteries/items.lua b/Mods ChoGGi/Play All Mysteries/items.lua
@@ -48,7 +48,7 @@ You will lose all progress in current mystery and it may cause unexpected issues
 		"MaxValue", 100,
 	}),
 }
-local c = 6
+local c = #mod_options
 
 local mysteries = ClassDescendantsList("MysteryBase")
 local g_Classes = g_Classes

diff --git a/Mods ChoGGi/Remove Unwanted Colonists/Code/Script.lua b/Mods ChoGGi/Remove Unwanted Colonists/Code/Script.lua
@@ -388,6 +388,7 @@ DefineClass.MurderPod = {
 	leave_height = 1000 * guim,
 	hover_height = 30 * guim,
 	hover_height_orig = 30 * guim,
+--~ 	min_hover_height = 10 * guim,
 	arrival_time = 10000,
 	min_pos_radius = 250 * guim,
 	max_pos_radius = 750 * guim,
@@ -468,9 +469,11 @@ function MurderPod:Leave(leave_height)
 		self.min_pos_radius,
 		self.city
 	)
-	local map = GetGameMap(self)
---~ 	leave_height = (map.terrain:GetHeight(current_pos) + leave_height) * 2
-	leave_height = (map.realm:SnapToTerrain(current_pos) + leave_height) * 2
+
+	leave_height = (
+		GetGameMap(self).realm:SnapToTerrain(current_pos):z() + leave_height
+	) * 2
+
 	self.hover_height = leave_height / 4
 
 	self.fx_actor_class = "SupplyRocket"

diff --git a/Mods ChoGGi/Remove Unwanted Colonists/changes.txt b/Mods ChoGGi/Remove Unwanted Colonists/changes.txt
@@ -1,3 +1,6 @@
+v2.4
+Fixed stuck pods.
+
 v2.3
 Fix so you can remove colonists from open-air passages and still be able to demo them.
 

diff --git a/Mods ChoGGi/Remove Unwanted Colonists/items.lua b/Mods ChoGGi/Remove Unwanted Colonists/items.lua
@@ -27,7 +27,7 @@ local mod_options = {
 	}),
 }
 
-local c = 4
+local c = #mod_options
 
 local table = table
 local T = T

diff --git a/Mods ChoGGi/Remove Unwanted Colonists/metadata.lua b/Mods ChoGGi/Remove Unwanted Colonists/metadata.lua
@@ -12,9 +12,9 @@ return PlaceObj("ModDef", {
 	"steam_id", "1594867237",
 	"pops_any_uuid", "fb8fc954-40d2-4818-b84f-157903c4ed36",
 	"lua_revision", 1007000, -- Picard
-	"version", 23,
+	"version", 24,
 	"version_major", 2,
-	"version_minor", 3,
+	"version_minor", 4,
 	"image", "Preview.jpg",
 	"author", "ChoGGi",
 	"code", {