Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
Kiplacon authored Aug 21, 2022
1 parent 56c2b4d commit 0f669f7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 3 deletions.
7 changes: 6 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 1.0.6
Date: 8/18/2022
Bugfixes:
- Fixed a crash when attempting to use the Jetpack mod while ziplining. Reported by Preceti2
---------------------------------------------------------------------------------------------------
Version: 1.0.5
Date: 8/16/2022
Changes:
- Train Bounce Pad and Train Directed Bounce Pad now bounce items and players farther than normal ones
- Train Bounce Pad and Train Directed Bounce Pad now bounce items and players farther than normal ones
Bugfixes:
- Fixed a crash when ziplining that might happen when pathing to a pole that no longer exists. Fix by obfuscatedgenerated on Github
---------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion data-final-fixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ for Category, ThingsTable in pairs(data.raw) do
MakeCarriageSprites(ThingData)
end

if (Category == "character" and not string.find(ThingID, "RTGhost")) then
if (Category == "character" and (not string.find(ThingID, "RTGhost")) and (not string.find(ThingID, "-jetpack"))) then
local casper = table.deepcopy(ThingData)
casper.name = casper.name.."RTGhost"
casper.collision_mask = {}
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RenaiTransportation",
"version": "1.0.5",
"version": "1.0.6",
"title": "Renai Transportation",
"author": "Kiplacon",
"factorio_version": "1.1",
Expand Down
3 changes: 3 additions & 0 deletions script/MiscFunctions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ function SwapToGhost(player)
end
---------- swap control -----------------
player.set_controller{type=defines.controllers.character, character=NEWHOST}
if (remote.interfaces.jetpack and remote.interfaces.jetpack.block_jetpack) then
remote.call("jetpack", "block_jetpack", {character=NEWHOST})
end
zhonyas.set_driver(OG)
zhonyas.force = "enemy"
zhonyas.destructible = false
Expand Down
4 changes: 4 additions & 0 deletions script/event/interact.lua
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ local function interact(event1) -- has .name = event ID number, .tick = tick num
elseif (player.character
and player.character.driving == false
and (not string.find(player.character.name, "RTGhost"))
and (not string.find(player.character.name, "-jetpack"))
and global.AllPlayers[event1.player_index].jumping == nil
and global.AllPlayers[event1.player_index].LetMeGuideYou == nil
and ThingHovering.type == "electric-pole"
Expand Down Expand Up @@ -313,6 +314,9 @@ local function interact(event1) -- has .name = event ID number, .tick = tick num
player.print({"zipline-stuff.range"})
end

elseif (player.character and player.character.driving == false and global.AllPlayers[event1.player_index].LetMeGuideYou == nil and ThingHovering.type == "electric-pole" and string.find(player.character.name, "-jetpack")) then
player.print({"zipline-stuff.range"})

elseif (player.character and player.character.driving == false and global.AllPlayers[event1.player_index].LetMeGuideYou == nil and ThingHovering.type == "electric-pole" and #ThingHovering.neighbours == 0) then
player.print({"zipline-stuff.NotConnected"})

Expand Down

0 comments on commit 0f669f7

Please sign in to comment.