aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/warp-net-id' of https://github.com/bbassie/scenario into feature/warp-net-id

Browse Source
This commit is contained in:
bbassie
2021-01-24 20:13:59 +01:00
parent b84dad66d5 ca8d03304c
commit 2fc598f287
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/dev-deploy.yml vendored
View File

@@ -18,10 +18,10 @@ jobs:
fetch-depth: 0
- name: Install Lua
uses: leafo/gh-actions-lua@v5
uses: leafo/gh-actions-lua@v8.0.0
- name: Install LuaRocks
uses: leafo/gh-actions-luarocks@v2
uses: leafo/gh-actions-luarocks@v4
- name: Install LDoc
run: luarocks install ldoc 1.4.4-1

4
.github/workflows/pr-checker.yml vendored
View File

@@ -28,10 +28,10 @@ jobs:
fetch-depth: 0
- name: Install Lua
uses: leafo/gh-actions-lua@v5
uses: leafo/gh-actions-lua@v8.0.0
- name: Install LuaRocks
uses: leafo/gh-actions-luarocks@v2
uses: leafo/gh-actions-luarocks@v4
- name: Install LDoc
run: luarocks install ldoc 1.4.4-1

5
modules/gui/warp-list.lua
View File

@@ -94,8 +94,7 @@ Gui.element{
local water_tiles = surface.find_tiles_filtered{ collision_mask = "water-tile", radius = config.standard_proximity_radius + 1, position = position }
if #water_tiles > 0 then
player_return({'expcore-commands.command-fail', {'warp-list.too-close-to-water', config.standard_proximity_radius + 1}}, 'orange_red', player)
local play_sound = 'utility/wire_pickup'
if game.player then game.player.play_sound{path=play_sound} end
if game.player then game.player.play_sound{ path = 'utility/wire_pickup' } end
for _, tile in pairs(water_tiles) do
rendering.draw_sprite{
sprite = 'utility/rail_path_not_possible',
@@ -867,4 +866,4 @@ local function maintain_tag(event)
end
Event.add(defines.events.on_chart_tag_modified, maintain_tag)
Event.add(defines.events.on_chart_tag_removed, maintain_tag)
Event.add(defines.events.on_chart_tag_removed, maintain_tag)