games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-11 14:49:24 +02:00
Code Issues Releases Activity

junkyard update

Browse Source
This commit is contained in:
MewMew 2019-03-09 17:29:52 +01:00
parent 5987cb1df7
commit b032c61956
6 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
antigrief.lua
View File

@ -221,6 +221,7 @@ local function on_gui_opened(event)
if event.entity.name ~= "character-corpse" then return end
local player = game.players[event.player_index]
local corpse_owner = game.players[event.entity.character_corpse_player_index]
if not corpse_owner then return end
if corpse_owner.force.name ~= player.force.name then return end
if player.name ~= corpse_owner.name then
game.print(player.name .. " is looting " .. corpse_owner.name .. "´s body.", { r=0.85, g=0.85, b=0.85})
@ -232,6 +233,7 @@ local function on_pre_player_mined_item(event)
if event.entity.name ~= "character-corpse" then return end
local player = game.players[event.player_index]
local corpse_owner = game.players[event.entity.character_corpse_player_index]
if not corpse_owner then return end
if corpse_owner.force.name ~= player.force.name then return end
if player.name ~= corpse_owner.name then
game.print(player.name .. " has looted " .. corpse_owner.name .. "´s body.", { r=0.85, g=0.85, b=0.85})

37
functions/tick_tack_trap.lua
View File

@ -1,14 +1,14 @@
-- timer traps -- by mewmew
local tick_tacks = {"*tick*", "*tick*", "*tak*", "*tack*", "*tik*"}
local tick_tacks = {"*tick*", "*tick*", "*tack*", "*tak*", "*tik*", "*tok*"}
local kaboom_weights = {
{name = "grenade", chance = 5},
{name = "grenade", chance = 6},
{name = "cluster-grenade", chance = 1},
{name = "destroyer-capsule", chance = 4},
{name = "defender-capsule", chance = 6},
{name = "distractor-capsule", chance = 5},
{name = "poison-capsule", chance = 5},
{name = "destroyer-capsule", chance = 3},
{name = "defender-capsule", chance = 5},
{name = "distractor-capsule", chance = 4},
{name = "poison-capsule", chance = 4},
{name = "explosive-uranium-cannon-projectile", chance = 1},
{name = "explosive-cannon-projectile", chance = 3},
}
@ -25,20 +25,31 @@ local function create_flying_text(surface, position, text)
name = "flying-text",
position = position,
text = text,
color = {r=0.8, g=0.8, b=0.8}
color = {r=0.75, g=0.75, b=0.75}
})
if text == "..." then return end
surface.play_sound({path="utility/armor_insert", position=position, volume_modifier=0.5})
surface.play_sound({path="utility/armor_insert", position=position, volume_modifier=0.75})
end
local function create_kaboom(surface, position, name)
local target = position
if name == "defender-capsule" or name == "destroyer-capsule" or name == "distractor-capsule" then
surface.create_entity({
name = "flying-text",
position = position,
text = "(((Sentries Engaging Target)))",
color = {r=0.8, g=0.0, b=0.0}
})
local nearest_player_unit = surface.find_nearest_enemy({position = position, max_distance=128, force="enemy"})
if nearest_player_unit then target = nearest_player_unit.position end
end
surface.create_entity({
name = name,
position = position,
force = enemy,
target = position,
speed = 0.5
})
force = "enemy",
target = target,
speed = 0.001
})
end
local function tick_tack_trap(surface, position)
@ -46,7 +57,7 @@ local function tick_tack_trap(surface, position)
if not position then return end
if not position.x then return end
if not position.y then return end
local tick_tack_count = math.random(4, 7)
local tick_tack_count = math.random(5, 9)
for t = 60, tick_tack_count * 60, 60 do
if not global.on_tick_schedule[game.tick + t] then global.on_tick_schedule[game.tick + t] = {} end

2
functions/unearthing_biters.lua
View File

@ -41,7 +41,7 @@ local function spawn_biter(surface, position, evolution_index)
local raffle = biter_table[evolution_index]
local biter_name = raffle[math.random(1,#raffle)]
local p = surface.find_non_colliding_position(biter_name, position, 10, 0.5)
if not p then p = {x = position.x, y = position.y} end
if not p then return end
surface.create_entity({name = biter_name, position = p, force = "enemy"})
end

59
maps/junkyard.lua
View File

@ -3,10 +3,11 @@
require "maps.modules.dynamic_landfill"
require "maps.modules.satellite_score"
require "maps.modules.mineable_wreckage_yields_scrap"
require "maps.modules.rocks_heal_over_time"
require "maps.modules.spawners_contain_biters"
require "maps.modules.biters_yield_coins"
require "maps.modules.fluids_are_explosive"
require "maps.modules.explosives_are_explosive"
--require "maps.modules.explosives_are_explosive"
require "maps.modules.dangerous_nights"
require "maps.junkyard_map_intro"
@ -67,7 +68,9 @@ local entity_replacements = {
local wrecks = {"big-ship-wreck-1", "big-ship-wreck-2", "big-ship-wreck-3"}
local scrap_buildings = {"nuclear-reactor", "centrifuge", "chemical-plant", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "beacon", "oil-refinery", "arithmetic-combinator", "constant-combinator", "decider-combinator", "programmable-speaker", "steam-turbine", "steam-engine"}
local scrap_buildings = {
"nuclear-reactor", "centrifuge", "beacon", "chemical-plant", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "oil-refinery", "arithmetic-combinator", "constant-combinator", "decider-combinator", "programmable-speaker", "steam-turbine", "steam-engine", "chemical-plant", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "oil-refinery", "arithmetic-combinator", "constant-combinator", "decider-combinator", "programmable-speaker", "steam-turbine", "steam-engine"
}
local function shuffle(tbl)
local size = #tbl
@ -125,7 +128,7 @@ local function create_shipwreck(surface, position)
{{name = "medium-electric-pole", count = math_random(4,8)}, weight = 3, evolution_min = 0.2, evolution_max = 1},
{{name = "wooden-chest", count = math_random(16,24)}, weight = 3, evolution_min = 0.0, evolution_max = 0.2},
{{name = "iron-chest", count = math_random(4,8)}, weight = 3, evolution_min = 0.1, evolution_max = 0.4},
{{name = "steel-chest", count = math_random(2,4)}, weight = 3, evolution_min = 0.3, evolution_max = 1},
{{name = "steel-chest", count = math_random(4,8)}, weight = 3, evolution_min = 0.3, evolution_max = 1},
{{name = "small-lamp", count = math_random(8,16)}, weight = 3, evolution_min = 0.1, evolution_max = 0.3},
{{name = "rail", count = math_random(50,75)}, weight = 3, evolution_min = 0.1, evolution_max = 0.6},
{{name = "assembling-machine-1", count = math_random(1,2)}, weight = 3, evolution_min = 0.0, evolution_max = 0.3},
@ -181,7 +184,7 @@ local function create_shipwreck(surface, position)
if distance_to_center < 1 then
distance_to_center = 0.1
else
distance_to_center = distance_to_center / 5000
distance_to_center = distance_to_center / 2500
end
if distance_to_center > 1 then distance_to_center = 1 end
@ -192,7 +195,7 @@ local function create_shipwreck(surface, position)
end
end
end
local e = surface.create_entity{name = wrecks[math_random(1,#wrecks)], position = position, force = "player"}
local e = surface.create_entity{name = wrecks[math_random(1,#wrecks)], position = position, force = "scrap"}
for x = 1, math_random(2,3), 1 do
local loot = raffle[math_random(1,#raffle)]
e.insert(loot)
@ -241,21 +244,25 @@ end
local function place_random_scrap_entity(surface, position)
local r = math.random(1, 100)
if r < 10 then
if r < 15 then
local e = surface.create_entity({name = scrap_buildings[math.random(1, #scrap_buildings)], position = position, force = "scrap"})
if e.name == "nuclear-reactor" then
create_entity_chain(surface, {name = "heat-pipe", position = position, force = "player"}, math_random(32,128), 25)
create_entity_chain(surface, {name = "heat-pipe", position = position, force = "player"}, math_random(32,64), 25)
end
if e.name == "chemical-plant" or e.name == "steam-engine" or e.name == "steam-engine" then
if e.name == "chemical-plant" or e.name == "steam-turbine" or e.name == "steam-engine" or e.name == "oil-refinery" then
create_entity_chain(surface, {name = "pipe", position = position, force = "player"}, math_random(16,32), 25)
end
return
end
if r < 40 then
local e = surface.create_entity({name = "substation", position = position, force = "scrap"})
if r < 25 then
surface.create_entity({name = "substation", position = position, force = "scrap"})
return
end
if r < 80 then
if r < 70 then
surface.create_entity({name = "medium-electric-pole", position = position, force = "scrap"})
return
end
if r < 90 then
local e = surface.create_entity({name = "gun-turret", position = position, force = "scrap_defense"})
e.insert({name = "firearm-magazine", count = math.random(8, 128)})
return
@ -270,12 +277,13 @@ local function place_random_scrap_entity(surface, position)
end
local function create_inner_content(surface, pos, noise)
if math_random(1, 98304) == 1 then secret_shop(pos, surface) return end
if math_random(1, 51200) == 1 then
if math_random(1, 102400) == 1 then secret_shop(pos, surface) return end
if math_random(1, 102400) == 1 then
if noise < 0.2 or noise > -0.2 then
create_tile_chain(surface, {name = "concrete", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "concrete", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "concrete", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "stone-path", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "stone-path", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "stone-path", position = pos}, math_random(16, 48), 50)
create_tile_chain(surface, {name = "stone-path", position = pos}, math_random(16, 48), 50)
create_entity_chain(surface, {name = "laser-turret", position = pos, force = "scrap_defense"}, 1, 25)
create_entity_chain(surface, {name = "accumulator", position = pos, force = "scrap_defense"}, math_random(2, 4), 1)
create_entity_chain(surface, {name = "substation", position = pos, force = "scrap_defense"}, math_random(6, 8), 1)
@ -283,19 +291,13 @@ local function create_inner_content(surface, pos, noise)
end
return
end
if math_random(1, 102400) == 1 then
if noise < 0.1 or noise > -0.1 then
create_tile_chain(surface, {name = "stone-path", position = pos}, math_random(96, 160), 85)
end
return
end
end
local function process_entity(e)
if not e.valid then return end
if entity_replacements[e.name] then
if e.type == "tree" then
if math_random(1,2) == 1 then
if math_random(1,3) == 1 then
e.surface.create_entity({name = entity_replacements[e.name], position = e.position})
end
else
@ -358,7 +360,10 @@ local function on_chunk_generated(event)
if global.spawn_generated then return end
if left_top.x < 96 then return end
map_functions.draw_rainbow_patch({x = 0, y = 0}, surface, 14, 1500)
map_functions.draw_rainbow_patch({x = 0, y = 0}, surface, 12, 3000)
local p = surface.find_non_colliding_position("character-corpse", {2,-2}, 32, 2)
local e = surface.create_entity({name = "character-corpse", position = p})
e.minable = false
for _, e in pairs (surface.find_entities_filtered({area = {{-50, -50},{50, 50}}})) do
local distance_to_center = math.sqrt(e.position.x^2 + e.position.y^2)
if e.valid then
@ -439,17 +444,17 @@ local function on_player_mined_entity(event)
if entity.force.name ~= "scrap" then return end
local positions = {}
local r = math.ceil(entity.prototype.max_health / 40)
local r = math.ceil(entity.prototype.max_health / 32)
for x = r * -1, r, 1 do
for y = r * -1, r, 1 do
positions[#positions + 1] = {x = entity.position.x + x, y = entity.position.y + y}
end
end
positions = shuffle(positions)
for i = 1, math.ceil(entity.prototype.max_health / 40), 1 do
for i = 1, math.ceil(entity.prototype.max_health / 32), 1 do
if not positions[i] then return end
if math_random(1,3) == 1 then
unearthing_biters(entity.surface, entity.position, math_random(4,8))
unearthing_biters(entity.surface, positions[i], math_random(4,8))
else
unearthing_worm(entity.surface, positions[i])
end

8
maps/junkyard_map_intro.lua
View File

@ -9,17 +9,19 @@ local info = [[
i have most likely already left this doomed place, or... well..
I am stranded on this foreign world since months and i have given up on fixing my ships transceiver.
Yes, things are not looking too good, i must admit.
Things aren't looking too good, i must admit.
The rust and devastation tells a story of an advanced civilization,
which seems to have evacuated their home long time ago.
Any natural resources are rare and the ones worth while are too hard for me to reach.
Luckily, the wrecks yield all kinds of useful scraps, but also various dangers.
Almost lost half a leg just some days ago while digging out a crate.
Almost lost half a leg some days ago while digging out a crate.
The wildlife is extremely aggressive, especially at the time of night.
Most of these insect appearing like creatures seem to live underground.
Stay near your light sources!!
Stay near your light sources, if you want to have a chance of surviving here!!
I must make a move now, hopefully will find those missing parts.
###Log End###
]]

5
maps/modules/rocks_heal_over_time.lua
View File

@ -1,11 +1,12 @@
-- rocks heal over time -- by mewmew
-- rocks and wreckage heal over time -- by mewmew
local event = require 'utils.event'
local healing_amount = {
["rock-big"] = 4,
["sand-rock-big"] = 4,
["rock-huge"] = 16
["rock-huge"] = 16,
["mineable-wreckage"] = 4
}
local function heal_rocks()