Merge pull request #28 from Panda291/main

randomizer bugfixes and improvements

Author: Panda291

Lawrence/mods/randomizer/LocationSyncing.lua

@@ -73,8 +73,8 @@ local locationToActionMap = {
     [53] = function (universe, player) universe.replacedMobys:GetMoby('Magneboots'):Disable() player:SetLevelFlags(1, 10, 1, {0xff}) player:SetLevelFlags(2, 10, 35, {2}) player:SetLevelFlags(1, 10, 1, {0xff}) end, -- magneboots
     [54] = function (universe, player) universe.replacedMobys:GetMoby('NanotechVendor'):Progress() player:SetLevelFlags(2, 10, 31, {1}) player:SetLevelFlags(2, 10, 87, {2}) player:SetLevelFlags(1, 10, 0, {0xff}) end, -- premium nanotech
     [55] = function (universe, player) universe.replacedMobys:GetMoby('NanotechVendor'):Disable() end, -- ultra nanotech
-    [56] = function (universe, player) player:SetAddressValue(Player.offset.goldBolts + 10 * 4 + 0, 1, 1) end, -- clank gold bolt
-    [57] = function (universe, player) player:SetAddressValue(Player.offset.goldBolts + 10 * 4 + 1, 1, 1) end, -- visibomb gold bolt
+    [56] = function (universe, player) player:SetAddressValue(Player.offset.goldBolts + 10 * 4 + 1, 1, 1) end, -- clank gold bolt
+    [57] = function (universe, player) player:SetAddressValue(Player.offset.goldBolts + 10 * 4 + 0, 1, 1) end, -- visibomb gold bolt
 
     -- Pokitaru
     [58] = function (universe, player) universe:RemoveVendorItem(0x19) end, -- decoy glove

Lawrence/mods/randomizer/RandoPlayer.lua

@@ -49,7 +49,7 @@ function RandoPlayer:Start()
         self:AddLabel(self.GhostRatchetLabel)
     end
 
-    self.TeleportToShipLabel = Label:new("Select: Teleport to ship", 250, 340, 0xC0FFA888, {GameState.Menu})
+    self.TeleportToShipLabel = Label:new("\x13: Teleport to ship", 250, 340, 0xC0FFA888, {GameState.Menu})
     self:AddLabel(self.TeleportToShipLabel)
 
     self.lobby.universe:AddEntity(self)
@@ -91,7 +91,7 @@ function RandoPlayer:OnGameStateChanged(state)
 end
 
 function RandoPlayer:OnControllerInputTapped(input)
-    if self.gameState == 3 and input & 0x8 ~= 0 and self.lobby.options.cheats.value then
+    if self.gameState == 3 and input & 0x8 ~= 0 and self.lobby.options.cheats.value then -- R1
         self:SetGhostRatchet(200)
     end
 
@@ -100,7 +100,7 @@ function RandoPlayer:OnControllerInputTapped(input)
         self.lobby.universe.replacedMobys:Triangle(self)
     end
 
-    if self.gameState == 3 and input & 0x100 ~= 0  then -- select
+    if self.gameState == 3 and input & 0x80 ~= 0  then -- square
         self:TeleportToShip()
     end
 end
@@ -129,10 +129,6 @@ end
 function RandoPlayer:MonitoredAddressChanged(address, oldValue, newValue)
     print("Address " .. address .. " changed from " .. oldValue .. " to " .. newValue)
 
-    if address == Player.offset.has_raritanium then
-        print("has_raritanium changed from " .. tostring(oldValue) .. " to " .. tostring(newValue))
-    end
-
     if address == Player.offset.goldBolts + 16 * 4 + 1 and newValue == 1 and not self.hasCollectedKaleboGrindrailBolt then
         self:OnCollectedGoldBolt(16, 1)
         self.hasCollectedKaleboGrindrailBolt = true
@@ -222,7 +218,9 @@ function RandoPlayer:TeleportToShip()
     elseif level == "Rilgar" then
         self:SetPosition(338.32, 110.8, 62.7)
     elseif level == "BlargStation" then
-        self:SetPosition(247.950, 148.68, 138.3)
+        if self.oClass == 0 then -- if not clank
+            self:SetPosition(247.950, 148.68, 138.3)
+        end
     elseif level == "Umbris" then
         self:SetPosition(264.55, 72.13, 45.77)
     elseif level == "Batalia" then

Lawrence/mods/randomizer/RandoUniverse.lua

@@ -58,9 +58,7 @@ function RandoUniverse:Connect()
     end
 
     local uuid = "5"
-
-    print(string.format("host: %s, slot: %s, password: %s", tostring(self.host), tostring(self.lobby.slot), tostring(self.lobby.ap_password)))
-
+    
     self.ap_client = APClient(self, game_name, items_handling, uuid, self.host, self.lobby.slot, self.lobby.ap_password)
     self.ap_client_initialized = true
 end