games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-19 21:10:19 +02:00
Code Issues Releases Activity

Entity: remove filter-inserter

Browse Source
This commit is contained in:
Gerkiz 2024-09-25 20:46:14 +02:00
parent b361d16c5d
commit a9531bda0f
21 changed files with 374 additions and 335 deletions

1
maps/cave_choppy/main.lua

@ -451,7 +451,6 @@ local function treasure_chest(position, distance_to_center)
evolution_max = 0.4
},
{ { name = 'fast-inserter', count = math.random(8, 16) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math.random(8, 16) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{
{ name = 'bulk-inserter', count = math.random(4, 8) },
weight = 1,

1
maps/cave_miner.lua

@ -293,7 +293,6 @@ local function treasure_chest(position, distance_to_center)
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 24) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

1
maps/expanse/price_raffle.lua

@ -29,7 +29,6 @@ local item_worths = {
['inserter'] = 8,
['long-handed-inserter'] = 16,
['fast-inserter'] = 32,
['filter-inserter'] = 40,
['stack-inserter'] = 128,
['bulk-inserter'] = 160,
['small-electric-pole'] = 4,

1
maps/hedge_maze.lua

@ -60,7 +60,6 @@ local function create_shipwreck(surface, position)
{ { name = 'inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(2, 4) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(2, 4) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

1
maps/junkyard.lua

@ -150,7 +150,6 @@ local function create_shipwreck(surface, position)
{ { name = 'inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(2, 4) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(2, 4) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

1
maps/junkyard_pvp/treasure.lua

@ -82,7 +82,6 @@ function Public.treasure_chest(surface, position, container_name)
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.0, d_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.0, d_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.1, d_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, d_min = 0.2, d_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, d_min = 0.4, d_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, d_min = 0.3, d_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 24) }, weight = 3, d_min = 0.0, d_max = 0.3 },

4
maps/labyrinth.lua

@ -767,7 +767,6 @@ local function treasure_chest(position, surface)
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 32) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },
@ -1221,13 +1220,12 @@ local function on_player_joined_game(event)
create_labyrinth_difficulty_gui(player)
end
local inserter_list = { 'inserter', 'long-handed-inserter', 'burner-inserter', 'fast-inserter', 'filter-inserter', 'bulk-inserter', 'stack-inserter' }
local inserter_list = { 'inserter', 'long-handed-inserter', 'burner-inserter', 'fast-inserter', 'bulk-inserter', 'stack-inserter' }
local inserters = {
['inserter'] = true,
['long-handed-inserter'] = true,
['burner-inserter'] = true,
['fast-inserter'] = true,
['filter-inserter'] = true,
['bulk-inserter'] = true,
['stack-inserter'] = true
}

1
maps/mountain_fortress_v2/treasure.lua

@ -126,7 +126,6 @@ function Public.treasure_chest_old(surface, position, container_name)
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.0, d_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.0, d_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, d_min = 0.1, d_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, d_min = 0.2, d_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, d_min = 0.4, d_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, d_min = 0.3, d_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 24) }, weight = 3, d_min = 0.0, d_max = 0.3 },

1
maps/nightfall.lua

@ -113,7 +113,6 @@ local function spawn_shipwreck(surface, position)
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 32) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

2
maps/planet_prison/config.lua

@ -745,7 +745,7 @@ Public.merchant_offer = {
},
offer = {
type = 'unlock-recipe',
recipe = 'filter-inserter'
recipe = 'bulk-inserter'
}
},
{

1
maps/scrap_towny_ffa/building.lua

@ -17,7 +17,6 @@ local neutral_whitelist = {
['express-loader'] = true,
['fast-inserter'] = true,
['fast-loader'] = true,
['filter-inserter'] = true,
['inserter'] = true,
['iron-chest'] = true,
['loader'] = true,

3
maps/scrap_towny_ffa/market.lua

@ -275,7 +275,7 @@ local function is_loader(entity)
end
local function is_filtered_inserter(entity)
return entity.name == 'filter-inserter' or entity.name == 'bulk-inserter'
return entity.name == 'fast-inserter' or entity.name == 'bulk-inserter'
end
local function max_stack_size(entity)
@ -308,7 +308,6 @@ local function get_connected_entities(market)
'inserter',
'long-handed-inserter',
'fast-inserter',
'filter-inserter',
'stack-inserter',
'bulk-inserter',
'loader',

1
maps/spiral_troopers.lua

@ -82,7 +82,6 @@ local function treasure_chest(position, surface)
{ { name = 'inserter', count = math_random(16, 32) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(16, 32) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(16, 32) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(16, 32) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

1
maps/stone_maze/global_functions.lua

@ -151,7 +151,6 @@ function get_loot_item_stack()
{ { name = 'inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'long-handed-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.0, evolution_max = 0.4 },
{ { name = 'fast-inserter', count = math_random(8, 16) }, weight = 3, evolution_min = 0.1, evolution_max = 1 },
{ { name = 'filter-inserter', count = math_random(8, 16) }, weight = 1, evolution_min = 0.2, evolution_max = 1 },
{ { name = 'bulk-inserter', count = math_random(4, 8) }, weight = 1, evolution_min = 0.4, evolution_max = 1 },
{ { name = 'stack-inserter', count = math_random(4, 8) }, weight = 3, evolution_min = 0.3, evolution_max = 1 },
{ { name = 'small-electric-pole', count = math_random(16, 32) }, weight = 3, evolution_min = 0.0, evolution_max = 0.3 },

1
modules/mobs_drop_loot.lua

@ -25,7 +25,6 @@ local item_worths = {
['inserter'] = 4,
['long-handed-inserter'] = 8,
['fast-inserter'] = 16,
['filter-inserter'] = 32,
['stack-inserter'] = 128,
['bulk-inserter'] = 160,
['small-electric-pole'] = 2,

85
modules/rpg/functions.lua

@ -340,7 +340,8 @@ function Public.suicidal_comfylatron(pos, surface)
name = 'compi-speech-bubble',
position = e.position,
source = e,
text = text
text = text,
lifetime = 30
}
)
local nearest_player_unit = surface.find_nearest_enemy({ position = e.position, max_distance = 512, force = 'player' })
@ -362,10 +363,11 @@ function Public.suicidal_comfylatron(pos, surface)
e.surface.create_entity({ name = 'medium-explosion', position = e.position })
e.surface.create_entity(
{
name = 'flying-text',
name = 'compi-speech-bubble',
position = e.position,
text = 'DeSyyNC - no target found!',
color = {r = 150, g = 0, b = 0}
source = e,
lifetime = 30
}
)
e.die()
@ -915,14 +917,30 @@ end
function Public.level_up_effects(player)
local position = { x = player.position.x - 0.75, y = player.position.y - 1 }
player.surface.create_entity({name = 'flying-text', position = position, text = '+LVL ', color = level_up_floating_text_color})
player.create_local_flying_text(
{
position = position,
text = '+LVL',
color = level_up_floating_text_color,
time_to_live = 300,
speed = 100
}
)
local b = 0.75
for _ = 1, 5, 1 do
local p = {
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
player.surface.create_entity({name = 'flying-text', position = p, text = '✚', color = {255, random(0, 100), 0}})
player.create_local_flying_text(
{
position = p,
text = '✚',
color = { 255, random(0, 100), 0 },
time_to_live = 300,
speed = 100
}
)
end
player.play_sound { path = 'utility/achievement_unlocked', volume_modifier = 0.50 }
end
@ -936,7 +954,15 @@ function Public.cast_spell(player, failed)
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
player.surface.create_entity({name = 'flying-text', position = p, text = '✔️', color = {255, random(0, 100), 0}})
player.create_local_flying_text(
{
position = p,
text = '✔️',
color = { 255, random(0, 100), 0 },
time_to_live = 300,
speed = 100
}
)
end
player.play_sound { path = 'utility/scenario_message', volume_modifier = 1 }
else
@ -945,7 +971,15 @@ function Public.cast_spell(player, failed)
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
player.surface.create_entity({name = 'flying-text', position = p, text = '✖', color = {255, random(0, 100), 0}})
player.create_local_flying_text(
{
position = p,
text = '✖',
color = { 255, random(0, 100), 0 },
time_to_live = 300,
speed = 100
}
)
end
player.play_sound { path = 'utility/cannot_build', volume_modifier = 1 }
end
@ -953,14 +987,30 @@ end
function Public.xp_effects(player)
local position = { x = player.position.x - 0.75, y = player.position.y - 1 }
player.surface.create_entity({name = 'flying-text', position = position, text = '+XP', color = level_up_floating_text_color})
player.create_local_flying_text(
{
position = position,
text = '+XP',
color = level_up_floating_text_color,
time_to_live = 300,
speed = 100
}
)
local b = 0.75
for _ = 1, 5, 1 do
local p = {
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
player.surface.create_entity({name = 'flying-text', position = p, text = '✚', color = {255, random(0, 100), 0}})
player.create_local_flying_text(
{
position = p,
text = '✚',
color = { 255, random(0, 100), 0 },
time_to_live = 300,
speed = 100
}
)
end
player.play_sound { path = 'utility/achievement_unlocked', volume_modifier = 0.50 }
end
@ -973,7 +1023,15 @@ function Public.boost_effects(player)
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
player.surface.create_entity({name = 'flying-text', position = p, text = '♻️', color = {random(0, 100), random(0, 100), 0}})
player.create_local_flying_text(
{
position = p,
text = '♻️',
color = { random(0, 100), random(0, 100), 0 },
time_to_live = 300,
speed = 100
}
)
end
end
@ -1137,12 +1195,13 @@ function Public.get_heal_modifier_from_using_fish(player)
else
color = { b = 0.1, r = 1, g = 0, a = 0.8 }
end
player.surface.create_entity(
player.create_local_flying_text(
{
name = 'flying-text',
position = { position.x, position.y + 0.6 },
text = '+' .. rng,
color = color
color = color,
time_to_live = 300,
speed = 100
}
)
char.health = char.health + rng

7
modules/rpg/main.lua

@ -503,10 +503,11 @@ local function on_entity_damaged(event)
damage = damage * random(250, 350) * 0.01
cause.surface.create_entity(
{
name = 'flying-text',
name = 'compi-speech-bubble',
position = entity.position,
text = '‼' .. floor(damage),
color = {255, 0, 0}
source = entity,
lifetime = 30
}
)
cause.surface.create_entity({ name = 'blood-explosion-huge', position = entity.position })
@ -858,7 +859,7 @@ local function floaty_hearts(entity, c)
(position.x + 0.4) + (b * -1 + random(0, b * 20) * 0.1),
position.y + (b * -1 + random(0, b * 20) * 0.1)
}
entity.surface.create_entity({name = 'flying-text', position = p, text = '♥', color = {random(150, 255), 0, 255}})
entity.surface.create_entity({ name = 'compi-speech-bubble', position = p, text = '♥', source = entity, lifetime = 30 })
end
end

1
utils/functions/basic_markets.lua

@ -99,7 +99,6 @@ market.logistic = {
['inserter'] = { value = 8, rarity = 1 },
['long-handed-inserter'] = { value = 12, rarity = 2 },
['fast-inserter'] = { value = 16, rarity = 4 },
['filter-inserter'] = { value = 24, rarity = 5 },
['stack-inserter'] = { value = 96, rarity = 6 },
['bulk-inserter'] = { value = 128, rarity = 7 },
['small-electric-pole'] = { value = 2, rarity = 1 },

2
utils/functions/loot_raffle.lua

@ -31,7 +31,6 @@ local item_worths = {
['inserter'] = 4,
['long-handed-inserter'] = 8,
['fast-inserter'] = 16,
['filter-inserter'] = 32,
['stack-inserter'] = 128,
['bulk-inserter'] = 160,
['small-electric-pole'] = 2,
@ -238,7 +237,6 @@ local tech_tier_list = {
'assembling-machine-1',
'long-handed-inserter',
'fast-inserter',
'filter-inserter',
'underground-belt',
'splitter',
'loader',

3
utils/player_list_vars.lua

@ -74,9 +74,6 @@ Public.ranks = {
'item/radar',
'item/radar',
'item/radar',
'item/filter-inserter',
'item/filter-inserter',
'item/filter-inserter',
'item/defender-capsule',
'item/defender-capsule',
'item/defender-capsule',