games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-10-30 23:47:41 +02:00
Code Issues Releases Activity

fixes

Browse Source
This commit is contained in:
MewMew
2019-10-24 08:01:39 +02:00
parent 0c5561f599
commit d65725a10c
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
comfy_panel/main.lua
View File

@@ -10,6 +10,12 @@ draw_map_scores would be a function with the player and the frame as arguments
comfy_panel_tabs = {}
function comfy_panel_clear_left_gui(player)
for _, child in pairs(player.gui.left.children) do
child.destroy()
end
end
function comfy_panel_get_active_frame(player)
if not player.gui.left.comfy_panel then return false end
if not player.gui.left.comfy_panel.tabbed_pane.selected_tab_index then return player.gui.left.comfy_panel.tabbed_pane.tabs[1].content end
@@ -31,7 +37,7 @@ local function top_button(player)
end
local function main_frame(player)
if player.gui.left.comfy_panel then player.gui.left.comfy_panel.destroy() end
comfy_panel_clear_left_gui(player)
local frame = player.gui.left.add({type = "frame", name = "comfy_panel"})
frame.style.margin = 6
@@ -44,6 +50,7 @@ local function main_frame(player)
local tab = tabbed_pane.add({type = "tab", caption = name})
local frame = tabbed_pane.add({type = "frame", name = name, direction = "vertical"})
frame.style.minimal_height = 480
frame.style.maximal_height = 480
frame.style.minimal_width = 800
frame.style.maximal_width = 800
tabbed_pane.add_tab(tab, frame)
@@ -52,6 +59,7 @@ local function main_frame(player)
local tab = tabbed_pane.add({type = "tab", caption = name})
local frame = tabbed_pane.add({type = "frame", name = name, direction = "vertical"})
frame.style.minimal_height = 480
frame.style.maximal_height = 480
frame.style.minimal_width = 800
frame.style.maximal_width = 800
tabbed_pane.add_tab(tab, frame)

3
maps/mountain_fortress_v2/main.lua
View File

@@ -2,6 +2,7 @@
--require "modules.flashlight_toggle_button"
--require "modules.biter_noms_you"
require "modules.rpg"
require "modules.biter_health_booster"
require "modules.wave_defense.main"
require "functions.soft_reset"
@@ -35,8 +36,6 @@ map_info.text = table.concat({
map_info.main_caption_color = {r = 150, g = 150, b = 0}
map_info.sub_caption_color = {r = 0, g = 150, b = 0}
require "modules.rpg"
require "maps.mountain_fortress_v2.market"
require "maps.mountain_fortress_v2.treasure"
require "maps.mountain_fortress_v2.terrain"

9
modules/rpg.lua
View File

@@ -167,12 +167,16 @@ local function draw_gui(player, forced)
if not forced then
if global.rpg[player.index].gui_refresh_delay > game.tick then return end
end
comfy_panel_clear_left_gui(player)
if player.gui.left.rpg then player.gui.left.rpg.destroy() end
if not player.character then return end
local frame = player.gui.left.add({type = "frame", name = "rpg", direction = "vertical"})
frame.style.maximal_width = 425
frame.style.minimal_width = 425
frame.style.margin = 6
add_separator(frame, 400)
@@ -611,8 +615,7 @@ local function on_entity_damaged(event)
event.entity.health = event.entity.health - damage
if event.entity.health <= 0 then
event.entity.die(event.entity.force.name, event.cause)
end
--event.entity.damage(damage, event.cause.force, "physical")
end
end
local function on_player_repaired_entity(event)
@@ -699,8 +702,8 @@ end
local event = require 'utils.event'
event.on_init(on_init)
event.add(defines.events.on_entity_damaged, on_entity_damaged)
event.add(defines.events.on_built_entity, on_built_entity)
event.add(defines.events.on_entity_damaged, on_entity_damaged)
event.add(defines.events.on_entity_died, on_entity_died)
event.add(defines.events.on_gui_click, on_gui_click)
event.add(defines.events.on_player_changed_position, on_player_changed_position)