Merge pull request #3562 from Kherae/master

small fixes
sayterdarkwynd · May 14, 2024 · 3f9d6d3 · 3f9d6d3
2 parents 49a5de5 + 1b82e36
commit 3f9d6d3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/quests/scripts/main.lua b/quests/scripts/main.lua
@@ -21,6 +21,11 @@ function init()
 			end
 		end
 	end
+	local shipParams=config.getParameter("upgradeShip")
+	if shipParams and shipParams.shipLevel and (player.shipUpgrades().shipLevel==0) then
+		storage.questStarted=false
+		storage.queueFailShip=true
+	end
 end
 
 function buildConditions()
@@ -81,6 +86,12 @@ end
 
 function questStart()
 	storage.questStarted=true
+	local shipParams=config.getParameter("upgradeShip")
+	if shipParams and shipParams.shipLevel and (player.shipUpgrades().shipLevel==0) then
+		storage.questStarted=false
+		storage.queueFailShip=true
+		return
+	end
 	for _, condition in pairs(self.conditions) do
 		if condition.onQuestStart then condition:onQuestStart() end
 	end
@@ -116,6 +127,10 @@ function update(dt)
 			quest.setFailureText("Due to code changes from an exploit fix you need to pick up the quest again. Sorry for the inconvenience. -Kherae")
 			storage.queueFail=false
 			quest.fail()
+		elseif storage.queueFailShip then
+			quest.setFailureText("BYOS is not permitted to use ship licenses.")
+			storage.queueFail=false
+			quest.fail()
 		end
 		return
 	end

diff --git a/scripts/kheAA/transferUtil.lua b/scripts/kheAA/transferUtil.lua
@@ -271,7 +271,7 @@ function transferUtil.findNearest(source,sourcePos,targetList)
 end
 
 function transferUtil.checkUpstreamContainers()
-	return (transferUtil.vars.upstreamCount or 0)>0
+	return ((transferUtil.vars and transferUtil.vars.upstreamCount) or 0)>0
 end
 
 function transferUtil.hasUpstreamContainers()

diff --git a/tech/items/fuwallcling.item b/tech/items/fuwallcling.item
@@ -3,7 +3,7 @@
   "rarity" : "uncommon",
   "price" : 100,
   "category" : "Tech",
-  "inventoryIcon" : "/tech/magnetgrip.png",
+  "inventoryIcon" : "/tech/magnetgrip2.png",
   "description" : "Latch onto walls for 8s.",
   "shortdescription" : "^#77acc3;Magnet Grip I^reset;",
 //  "learnBlueprintsOnPickup" : [ "fuwalljump_tech" ],

diff --git a/tech/items/fuwallcling2.item b/tech/items/fuwallcling2.item
@@ -3,7 +3,7 @@
   "rarity" : "legendary",
   "price" : 1200,
   "category" : "Tech",
-  "inventoryIcon" : "/tech/magnetgrip2.png",
+  "inventoryIcon" : "/tech/magnetgrip3.png",
   "description" : "Grip better, get buffs!",
   "shortdescription" : "^#77acc3;Magnet Grip II^reset;",
   "consumeOnPickup" : true,