From 02449b7b622de11268fd0fe337e164f72b29f9f9 Mon Sep 17 00:00:00 2001
From: grilledham <jrdgillham@gmail.com>
Date: Thu, 2 Aug 2018 13:51:42 +0100
Subject: [PATCH] updates

---
 map_gen/presets/crash_site.lua                | 62 ++++++++++++++-----
 .../presets/crash_site/entity_died_events.lua | 17 +++++
 .../outpost_data/big_ammo_factory.lua         | 35 ++++++++---
 .../outpost_data/big_science_factory.lua      | 10 +--
 .../outpost_data/big_weapon_factory.lua       | 39 ++++++------
 .../outpost_data/medium_ammo_factory.lua      |  8 +--
 .../outpost_data/medium_gear_factory.lua      |  6 +-
 .../outpost_data/medium_weapon_factory.lua    | 27 ++++----
 .../outpost_data/small_ammo_factory.lua       |  4 +-
 .../outpost_data/small_gear_factory.lua       |  6 --
 .../outpost_data/small_weapon_factory.lua     | 20 +++---
 resources/regulars.lua                        | 17 ++++-
 12 files changed, 164 insertions(+), 87 deletions(-)

diff --git a/map_gen/presets/crash_site.lua b/map_gen/presets/crash_site.lua
index 05a6bf21..c040addc 100644
--- a/map_gen/presets/crash_site.lua
+++ b/map_gen/presets/crash_site.lua
@@ -8,8 +8,8 @@ local Random = require 'map_gen.shared.random'
 local OutpostBuilder = require 'map_gen.presets.crash_site.outpost_builder'
 local Perlin = require 'map_gen.shared.perlin_noise'
 
-local outpost_seed = 20000
-local ore_seed = 14000
+local outpost_seed = 28000
+local ore_seed = 27000
 local enemy_seed = 420420
 
 local outpost_random = Random.new(outpost_seed, outpost_seed * 2)
@@ -60,14 +60,11 @@ local big_chemical_factory = require 'map_gen.presets.crash_site.outpost_data.bi
 local medium_power_factory = require 'map_gen.presets.crash_site.outpost_data.medium_power_factory'
 local big_power_factory = require 'map_gen.presets.crash_site.outpost_data.big_power_factory' ]]
 local stage1 = {
-    small_iron_plate_factory,
     small_iron_plate_factory,
     small_copper_plate_factory,
     small_stone_factory,
     small_gear_factory,
     small_circuit_factory,
-    small_ammo_factory,
-    small_weapon_factory,
     small_science_factory,
     small_oil_refinery,
     small_chemical_factory
@@ -79,8 +76,10 @@ local stage2 = {
     medium_stone_factory,
     medium_gear_factory,
     medium_circuit_factory,
-    medium_ammo_factory,
-    medium_weapon_factory,
+    small_ammo_factory,
+    small_ammo_factory,
+    small_weapon_factory,
+    small_science_factory,
     medium_science_factory,
     medium_oil_refinery,
     medium_chemical_factory
@@ -92,7 +91,25 @@ local stage3 = {
     big_stone_factory,
     big_gear_factory,
     big_circuit_factory,
+    medium_ammo_factory,
+    medium_ammo_factory,
+    medium_weapon_factory,
+    medium_science_factory,
+    big_science_factory,
+    big_oil_refinery,
+    big_chemical_factory
+}
+
+local stage4 = {
+    big_iron_plate_factory,
+    big_copper_plate_factory,
+    big_gear_factory,
+    big_circuit_factory,
     big_ammo_factory,
+    big_ammo_factory,
+    big_ammo_factory,
+    big_weapon_factory,
+    big_weapon_factory,
     big_weapon_factory,
     big_science_factory,
     big_oil_refinery,
@@ -132,6 +149,7 @@ end
 local stage1_iter = itertor_builder(stage1, outpost_random)
 local stage2_iter = itertor_builder(stage2, outpost_random)
 local stage3_iter = itertor_builder(stage3, outpost_random)
+local stage4_iter = itertor_builder(stage4, outpost_random)
 
 local thin_walls = require 'map_gen.presets.crash_site.outpost_data.thin_walls'
 
@@ -224,13 +242,13 @@ pattern[5][5] = start_outpost
 
 local outpost_offset = 59
 local grid_block_size = 190
-local grid_number_of_blocks = 10
+local grid_number_of_blocks = 9
 
 local half_total_size = grid_block_size * 0.5 * 8
 
-for r = 4, 7 do
+for r = 4, 6 do
     local row = pattern[r]
-    for c = 4, 7 do
+    for c = 4, 6 do
         if not row[c] then
             local template = stage1_iter()
             local shape = outpost_builder:do_outpost(template)
@@ -244,9 +262,9 @@ for r = 4, 7 do
     end
 end
 
-for r = 3, 8 do
+for r = 3, 7 do
     local row = pattern[r]
-    for c = 3, 8 do
+    for c = 3, 7 do
         if not row[c] then
             local template = stage2_iter()
             local shape = outpost_builder:do_outpost(template)
@@ -260,11 +278,27 @@ for r = 3, 8 do
     end
 end
 
+for r = 2, 8 do
+    local row = pattern[r]
+    for c = 2, 8 do
+        if not row[c] then
+            local template = stage3_iter()
+            local shape = outpost_builder:do_outpost(template)
+
+            local x = outpost_random:next_int(-outpost_offset, outpost_offset)
+            local y = outpost_random:next_int(-outpost_offset, outpost_offset)
+            shape = b.translate(shape, x, y)
+
+            row[c] = shape
+        end
+    end
+end
+
 for r = 1, grid_number_of_blocks do
     local row = pattern[r]
     for c = 1, grid_number_of_blocks do
         if not row[c] then
-            local template = stage3_iter()
+            local template = stage4_iter()
             local shape = outpost_builder:do_outpost(template)
 
             local x = outpost_random:next_int(-outpost_offset, outpost_offset)
@@ -471,7 +505,7 @@ spawn_shape = b.change_tile(spawn_shape, false, 'stone-path')
 
 map = b.choose(b.rectangle(16, 16), spawn_shape, map)
 
-local bounds = b.rectangle(grid_block_size * (grid_number_of_blocks - 1))
+local bounds = b.rectangle(grid_block_size * grid_number_of_blocks)
 map = b.choose(bounds, map, b.empty_shape)
 
 --return outpost_builder:do_outpost(small_power_factory)
diff --git a/map_gen/presets/crash_site/entity_died_events.lua b/map_gen/presets/crash_site/entity_died_events.lua
index 685ec445..8392fbbd 100644
--- a/map_gen/presets/crash_site/entity_died_events.lua
+++ b/map_gen/presets/crash_site/entity_died_events.lua
@@ -56,6 +56,13 @@ local spitters = {
     'behemoth-spitter'
 }
 
+local turret_evolution_factor = {
+    ['gun-turret'] = 0.002,
+    ['laser-turret'] = 0.004,
+    ['flamethrower-turret'] = 0.003,
+    ['artillery-turret'] = 0.008
+}
+
 local spawn_worm =
     Token.register(
     function(data)
@@ -147,5 +154,15 @@ Event.add(
                 )
             end
         end
+
+        local factor = turret_evolution_factor[name]
+        if factor then
+            local force = entity.force
+            if force.name == 'enemy' then
+                local old = force.evolution_factor
+                local new = old + (1 - old) * factor
+                force.evolution_factor = math.min(new, 1)
+            end
+        end
     end
 )
diff --git a/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua b/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua
index a4e99e8a..3c133f0e 100644
--- a/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/big_ammo_factory.lua
@@ -4,7 +4,8 @@ local Token = require 'utils.global_token'
 local loot = {
     {weight = 10},
     {stack = {name = 'coin', count = 500, distance_factor = 1 / 8}, weight = 5},
-    {stack = {name = 'uranium-rounds-magazine', count = 2000, distance_factor = 1}, weight = 5},
+    {stack = {name = 'piercing-rounds-magazine', count = 100, distance_factor = 1}, weight = 5},
+    {stack = {name = 'uranium-rounds-magazine', count = 500, distance_factor = 1}, weight = 5},
     {stack = {name = 'cluster-grenade', count = 200, distance_factor = 1 / 8}, weight = 2},
     {stack = {name = 'explosive-cannon-shell', count = 200, distance_factor = 1 / 8}, weight = 5},
     {stack = {name = 'explosive-uranium-cannon-shell', count = 200, distance_factor = 1 / 8}, weight = 2}
@@ -22,12 +23,20 @@ local loot_callback =
 local factory = {
     callback = ob.magic_item_crafting_callback,
     data = {
-        recipe = 'uranium-rounds-magazine',
-        output = {min_rate = 2 / 60, distance_factor = 2 / 60 / 512, item = 'uranium-rounds-magazine'}
+        recipe = 'piercing-rounds-magazine',
+        output = {min_rate = 1.5 / 60, distance_factor = 1.5 / 60 / 512, item = 'piercing-rounds-magazine'}
     }
 }
 
 local factory_b = {
+    callback = ob.magic_item_crafting_callback,
+    data = {
+        recipe = 'uranium-rounds-magazine',
+        output = {min_rate = 1 / 60, distance_factor = 1 / 60 / 512, item = 'uranium-rounds-magazine'}
+    }
+}
+
+local factory_c = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'explosive-uranium-cannon-shell',
@@ -94,15 +103,15 @@ local market = {
         },
         {
             name = 'vehicle-machine-gun',
-            price = 1000
+            price = 2000
         },
         {
             name = 'tank-cannon',
-            price = 500
+            price = 1000
         },
         {
             name = 'artillery-wagon-cannon',
-            price = 2000
+            price = 4000
         }
     }
 }
@@ -116,7 +125,7 @@ local level3 =
     {
         factory = factory,
         fallback = level2,
-        max_count = 6
+        max_count = 4
     }
 )
 local level3b =
@@ -125,6 +134,15 @@ local level3b =
     {
         factory = factory_b,
         fallback = level3,
+        max_count = 4
+    }
+)
+local level3c =
+    ob.extend_1_way(
+    base_factory[2],
+    {
+        factory = factory_b,
+        fallback = level3b,
         max_count = 2
     }
 )
@@ -149,7 +167,7 @@ return {
         blocks = 11,
         variance = 3,
         min_step = 2,
-        max_level = 5
+        max_level = 4
     },
     walls = {
         require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets',
@@ -159,7 +177,6 @@ return {
     bases = {
         {require 'map_gen.presets.crash_site.outpost_data.laser_block'},
         {level2},
-        {level4},
         {artillery}
     }
 }
diff --git a/map_gen/presets/crash_site/outpost_data/big_science_factory.lua b/map_gen/presets/crash_site/outpost_data/big_science_factory.lua
index a3d44c1b..25eba92b 100644
--- a/map_gen/presets/crash_site/outpost_data/big_science_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/big_science_factory.lua
@@ -25,7 +25,7 @@ local factory = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'production-science-pack',
-        output = {min_rate = 0.25 / 60, distance_factor = 0.25 / 60 / 512, item = 'production-science-pack'}
+        output = {min_rate = 0.125 / 60, distance_factor = 0.125 / 60 / 512, item = 'production-science-pack'}
     }
 }
 
@@ -33,7 +33,7 @@ local factory_b = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'high-tech-science-pack',
-        output = {min_rate = 0.25 / 60, distance_factor = 0.25 / 60 / 512, item = 'high-tech-science-pack'}
+        output = {min_rate = 0.125 / 60, distance_factor = 0.125 / 60 / 512, item = 'high-tech-science-pack'}
     }
 }
 
@@ -87,7 +87,8 @@ local level3 =
     base_factory[2],
     {
         factory = factory,
-        fallback = level2
+        fallback = level2,
+        max_count = 3
     }
 )
 local level3b =
@@ -95,7 +96,8 @@ local level3b =
     base_factory[2],
     {
         factory = factory_b,
-        fallback = level2
+        fallback = level2,
+        max_count = 3
     }
 )
 local level4 =
diff --git a/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua b/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua
index ae5ab628..2a7ce311 100644
--- a/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/big_weapon_factory.lua
@@ -2,19 +2,19 @@ local ob = require 'map_gen.presets.crash_site.outpost_builder'
 local Token = require 'utils.global_token'
 
 local loot = {
-    {weight = 3},
+    {weight = 5},
     {stack = {name = 'coin', count = 500, distance_factor = 1 / 8}, weight = 3},
-    {stack = {name = 'raw-fish', count = 1000, distance_factor = 1}, weight = 1},
-    {stack = {name = 'explosive-rocket', count = 1000, distance_factor = 1}, weight = 1},
-    {stack = {name = 'laser-turret', count = 500, distance_factor = 1 / 8}, weight = 1},
-    {stack = {name = 'cluster-grenade', count = 1000, distance_factor = 1}, weight = 1},
-    {stack = {name = 'destroyer-capsule', count = 250, distance_factor = 1 / 8}, weight = 1},
-    {stack = {name = 'power-armor-mk2', count = 5, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'fusion-reactor-equipment', count = 25, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'battery-mk2-equipment', count = 25, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'energy-shield-mk2-equipment', count = 10, distance_factor = 1 / 64}, weight = 1},
-    {stack = {name = 'exoskeleton-equipment', count = 10, distance_factor = 1 / 64}, weight = 1},
-    {stack = {name = 'personal-laser-defense-equipment', count = 10, distance_factor = 1 / 64}, weight = 1}
+    {stack = {name = 'raw-fish', count = 250, distance_factor = 1}, weight = 1},
+    {stack = {name = 'explosive-rocket', count = 500, distance_factor = 1}, weight = 1},
+    {stack = {name = 'laser-turret', count = 50, distance_factor = 1 / 8}, weight = 1},
+    {stack = {name = 'cluster-grenade', count = 250, distance_factor = 1}, weight = 1},
+    {stack = {name = 'destroyer-capsule', count = 50, distance_factor = 1 / 8}, weight = 1},
+    {stack = {name = 'power-armor-mk2', count = 5, distance_factor = 1 / 256}, weight = 1},
+    {stack = {name = 'fusion-reactor-equipment', count = 5, distance_factor = 1 / 256}, weight = 1},
+    {stack = {name = 'battery-mk2-equipment', count = 5, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'energy-shield-mk2-equipment', count = 5, distance_factor = 1 / 64}, weight = 1},
+    {stack = {name = 'exoskeleton-equipment', count = 5, distance_factor = 1 / 64}, weight = 1},
+    {stack = {name = 'personal-laser-defense-equipment', count = 5, distance_factor = 1 / 64}, weight = 1}
 }
 
 local weights = ob.prepare_weighted_loot(loot)
@@ -30,7 +30,7 @@ local factory = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'destroyer-capsule',
-        output = {min_rate = 0.5 / 60, distance_factor = 0.5 / 60 / 512, item = 'destroyer-capsule'}
+        output = {min_rate = 0.05 / 60, distance_factor = 0.05 / 60 / 512, item = 'destroyer-capsule'}
     }
 }
 
@@ -38,7 +38,7 @@ local factory_b = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'laser-turret',
-        output = {min_rate = 0.2 / 60, distance_factor = 0.2 / 60 / 512, item = 'laser-turret'}
+        output = {min_rate = 0.05 / 60, distance_factor = 0.05 / 60 / 512, item = 'laser-turret'}
     }
 }
 
@@ -189,15 +189,15 @@ local market = {
         },
         {
             name = 'vehicle-machine-gun',
-            price = 1000
+            price = 2000
         },
         {
             name = 'tank-cannon',
-            price = 500
+            price = 1000
         },
         {
             name = 'artillery-wagon-cannon',
-            price = 2000
+            price = 4000
         },
         {
             name = 'gun-turret',
@@ -220,7 +220,7 @@ local market = {
     }
 }
 
-local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory'
+local base_factory = require 'map_gen.presets.crash_site.outpost_data.big_factory'
 
 local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}})
 local level3 =
@@ -262,7 +262,7 @@ return {
         blocks = 11,
         variance = 3,
         min_step = 2,
-        max_level = 5
+        max_level = 4
     },
     walls = {
         require 'map_gen.presets.crash_site.outpost_data.heavy_gun_turrets',
@@ -272,7 +272,6 @@ return {
     bases = {
         {require 'map_gen.presets.crash_site.outpost_data.laser_block'},
         {level2},
-        {level4},
         {artillery}
     }
 }
diff --git a/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua b/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua
index a2046f16..77274b79 100644
--- a/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/medium_ammo_factory.lua
@@ -5,7 +5,7 @@ local loot = {
     {weight = 10},
     {stack = {name = 'coin', count = 150, distance_factor = 1 / 8}, weight = 5},
     {stack = {name = 'piercing-rounds-magazine', count = 500, distance_factor = 1}, weight = 5},
-    {stack = {name = 'uranium-rounds-magazine', count = 250, distance_factor = 1 / 2}, weight = 5},
+    {stack = {name = 'uranium-rounds-magazine', count = 100, distance_factor = 1 / 2}, weight = 5},
     {stack = {name = 'grenade', count = 200, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'land-mine', count = 400, distance_factor = 1}, weight = 1},
     {stack = {name = 'cannon-shell', count = 200, distance_factor = 1 / 32}, weight = 2},
@@ -26,7 +26,7 @@ local factory = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'piercing-rounds-magazine',
-        output = {min_rate = 1.5 / 60, distance_factor = 1.5 / 60 / 512, item = 'piercing-rounds-magazine'}
+        output = {min_rate = 1 / 60, distance_factor = 1 / 60 / 512, item = 'piercing-rounds-magazine'}
     }
 }
 
@@ -42,7 +42,7 @@ local factory_c = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'uranium-rounds-magazine',
-        output = {min_rate = 1 / 2 / 60, distance_factor = 1 / 2 / 60 / 512, item = 'uranium-rounds-magazine'}
+        output = {min_rate = 1 / 4 / 60, distance_factor = 1 / 4 / 60 / 512, item = 'uranium-rounds-magazine'}
     }
 }
 
@@ -127,7 +127,7 @@ local level3c =
     {
         factory = factory_c,
         fallback = level3,
-        max_count = 2
+        max_count = 1
     }
 )
 local level4 =
diff --git a/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua b/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua
index 437000cc..b2b1e4a8 100644
--- a/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/medium_gear_factory.lua
@@ -90,9 +90,9 @@ local market = {
         },
         {
             name = 'tank',
-            price = 250,
-            distance_factor = 125 / 512,
-            min_price = 25
+            price = 500,
+            distance_factor = 250 / 512,
+            min_price = 50
         },
         {
             name = 'locomotive',
diff --git a/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua b/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua
index ec2c2493..0f841cb1 100644
--- a/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/medium_weapon_factory.lua
@@ -9,18 +9,17 @@ local loot = {
     {stack = {name = 'flamethrower-ammo', count = 250, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'rocket', count = 200, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'explosive-rocket', count = 200, distance_factor = 1 / 8}, weight = 1},
-    {stack = {name = 'gun-turret', count = 250, distance_factor = 1 / 16}, weight = 1},
-    {stack = {name = 'flamethrower-turret', count = 250, distance_factor = 1 / 16}, weight = 1},
-    {stack = {name = 'cluster-grenade', count = 100, distance_factor = 1 / 32}, weight = 1},
-    {stack = {name = 'power-armor', count = 5, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'solar-panel-equipment', count = 25, distance_factor = 1 / 32}, weight = 1},
-    {stack = {name = 'fusion-reactor-equipment', count = 5, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'gun-turret', count = 50, distance_factor = 1 / 16}, weight = 1},
+    {stack = {name = 'flamethrower-turret', count = 25, distance_factor = 1 / 16}, weight = 1},
+    {stack = {name = 'cluster-grenade', count = 50, distance_factor = 1 / 32}, weight = 1},
+    {stack = {name = 'power-armor', count = 3, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'solar-panel-equipment', count = 25, distance_factor = 1 / 32}, weight = 1},    
     {stack = {name = 'battery-equipment', count = 25, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'battery-mk2-equipment', count = 5, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'energy-shield-equipment', count = 50, distance_factor = 1 / 64}, weight = 1},
-    {stack = {name = 'energy-shield-mk2-equipment', count = 10, distance_factor = 1 / 64}, weight = 1},
-    {stack = {name = 'exoskeleton-equipment', count = 10, distance_factor = 1 / 64}, weight = 1},
-    {stack = {name = 'night-vision-equipment', count = 5, distance_factor = 1 / 64}, weight = 1}
+    {stack = {name = 'battery-mk2-equipment', count = 1, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'energy-shield-equipment', count = 10, distance_factor = 1 / 64}, weight = 1},
+    {stack = {name = 'energy-shield-mk2-equipment', count = 3, distance_factor = 1 / 64}, weight = 1},
+    {stack = {name = 'exoskeleton-equipment', count = 3, distance_factor = 1 / 64}, weight = 1},
+    {stack = {name = 'night-vision-equipment', count = 2, distance_factor = 1 / 64}, weight = 1}
 }
 
 local weights = ob.prepare_weighted_loot(loot)
@@ -44,7 +43,7 @@ local factory_b = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'cluster-grenade',
-        output = {min_rate = 0.2 / 60, distance_factor = 0.2 / 60 / 512, item = 'cluster-grenade'}
+        output = {min_rate = 0.1 / 60, distance_factor = 0.1 / 60 / 512, item = 'cluster-grenade'}
     }
 }
 
@@ -52,7 +51,7 @@ local factory_c = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'flamethrower-turret',
-        output = {min_rate = 0.2 / 60, distance_factor = 0.2 / 60 / 512, item = 'flamethrower-turret'}
+        output = {min_rate = 0.04 / 60, distance_factor = 0.04 / 60 / 512, item = 'flamethrower-turret'}
     }
 }
 
@@ -198,7 +197,7 @@ local market = {
     }
 }
 
-local base_factory = require 'map_gen.presets.crash_site.outpost_data.small_factory'
+local base_factory = require 'map_gen.presets.crash_site.outpost_data.medium_factory'
 
 local level2 = ob.extend_1_way(base_factory[1], {loot = {callback = loot_callback}})
 local level3 =
diff --git a/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua b/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua
index fe5c7edb..e80308c3 100644
--- a/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/small_ammo_factory.lua
@@ -5,7 +5,7 @@ local loot = {
     {weight = 10},
     {stack = {name = 'coin', count = 100, distance_factor = 1 / 8}, weight = 5},
     {stack = {name = 'firearm-magazine', count = 500, distance_factor = 1}, weight = 5},
-    {stack = {name = 'piercing-rounds-magazine', count = 250, distance_factor = 1 / 2}, weight = 5},
+    {stack = {name = 'piercing-rounds-magazine', count = 150, distance_factor = 1 / 2}, weight = 5},
     {stack = {name = 'shotgun-shell', count = 200, distance_factor = 1 / 4}, weight = 1},
     {stack = {name = 'grenade', count = 100, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'land-mine', count = 400, distance_factor = 1}, weight = 1},
@@ -35,7 +35,7 @@ local factory_b = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'piercing-rounds-magazine',
-        output = {min_rate = 1 / 2 / 60, distance_factor = 1 / 2 / 60 / 512, item = 'piercing-rounds-magazine'}
+        output = {min_rate = 1 / 3 / 60, distance_factor = 1 / 3 / 60 / 512, item = 'piercing-rounds-magazine'}
     }
 }
 
diff --git a/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua b/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua
index 6d8233f5..5982671d 100644
--- a/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/small_gear_factory.lua
@@ -78,12 +78,6 @@ local market = {
             distance_factor = 25 / 512,
             min_price = 40
         },
-        {
-            name = 'tank',
-            price = 500,
-            distance_factor = 250 / 512,
-            min_price = 250
-        },
         {
             name = 'rail',
             price = 1,
diff --git a/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua b/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua
index 6866e32e..26be5643 100644
--- a/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua
+++ b/map_gen/presets/crash_site/outpost_data/small_weapon_factory.lua
@@ -5,21 +5,21 @@ local loot = {
     {weight = 5},
     {stack = {name = 'coin', count = 100, distance_factor = 1 / 8}, weight = 3},
     {stack = {name = 'raw-fish', count = 50, distance_factor = 1 / 16}, weight = 1},
-    {stack = {name = 'combat-shotgun', count = 5, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'combat-shotgun', count = 3, distance_factor = 1 / 128}, weight = 1},
     {stack = {name = 'shotgun-shell', count = 200, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'piercing-shotgun-shell', count = 50, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'flamethrower', count = 5, distance_factor = 1 / 128}, weight = 1},
     {stack = {name = 'flamethrower-ammo', count = 50, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'rocket-launcher', count = 5, distance_factor = 1 / 128}, weight = 1},
     {stack = {name = 'rocket', count = 50, distance_factor = 1 / 8}, weight = 1},
-    {stack = {name = 'gun-turret', count = 50, distance_factor = 1 / 16}, weight = 1},
-    {stack = {name = 'flamethrower-turret', count = 50, distance_factor = 1 / 16}, weight = 1},
+    {stack = {name = 'gun-turret', count = 25, distance_factor = 1 / 16}, weight = 1},
+    {stack = {name = 'flamethrower-turret', count = 15, distance_factor = 1 / 16}, weight = 1},
     {stack = {name = 'grenade', count = 100, distance_factor = 1 / 8}, weight = 1},
     {stack = {name = 'cluster-grenade', count = 10, distance_factor = 1 / 32}, weight = 1},
-    {stack = {name = 'modular-armor', count = 5, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'solar-panel-equipment', count = 25, distance_factor = 1 / 32}, weight = 1},
-    {stack = {name = 'battery-equipment', count = 5, distance_factor = 1 / 128}, weight = 1},
-    {stack = {name = 'energy-shield-equipment', count = 10, distance_factor = 1 / 64}, weight = 1}
+    {stack = {name = 'modular-armor', count = 3, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'solar-panel-equipment', count = 12, distance_factor = 1 / 32}, weight = 1},
+    {stack = {name = 'battery-equipment', count = 4, distance_factor = 1 / 128}, weight = 1},
+    {stack = {name = 'energy-shield-equipment', count = 6, distance_factor = 1 / 64}, weight = 1}
 }
 
 local weights = ob.prepare_weighted_loot(loot)
@@ -35,7 +35,7 @@ local factory = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'piercing-shotgun-shell',
-        output = {min_rate = 0.5 / 60, distance_factor = 0.5 / 60 / 512, item = 'piercing-shotgun-shell'}
+        output = {min_rate = 0.25 / 60, distance_factor = 0.25 / 60 / 512, item = 'piercing-shotgun-shell'}
     }
 }
 
@@ -51,7 +51,7 @@ local factory_c = {
     callback = ob.magic_item_crafting_callback,
     data = {
         recipe = 'gun-turret',
-        output = {min_rate = 0.2 / 60, distance_factor = 0.2 / 60 / 512, item = 'gun-turret'}
+        output = {min_rate = 0.1 / 60, distance_factor = 0.1 / 60 / 512, item = 'gun-turret'}
     }
 }
 
@@ -184,7 +184,7 @@ local level3c =
     {
         factory = factory_c,
         fallback = level3b,
-        max_count = 4
+        max_count = 2
     }
 )
 local level4 =
diff --git a/resources/regulars.lua b/resources/regulars.lua
index 14f9d4a3..35b96b38 100644
--- a/resources/regulars.lua
+++ b/resources/regulars.lua
@@ -541,5 +541,20 @@ return {
     ['Askiph'] = true,
     ['undefinable'] = true,
     ['snapboogie'] = true,
-    ['Wesoly1234'] = true
+    ['Wesoly1234'] = true,
+    ['benzoni'] = true,
+    ['Verlioka'] = true,
+    ['Ran_Mw'] = true,
+    ['SPARKZ102'] = true,
+    ['slowcrazy54'] = true,
+    ['adam1285'] = true,
+    ['Breadnought'] = true,
+    ['Bluev0'] = true,
+    ['LeCobalt'] = true,
+    ['Lavacreeper2000'] = true,
+    ['manowscar1990'] = true,
+    ['Cytrox'] = true,
+    ['arty714'] = true,
+    ['DrkgoonXV'] = true,
+    ['Roxmuhr'] = true
 }