From 95ebb4a2397b5ce4702e15ba6ba9d4c1647c86f6 Mon Sep 17 00:00:00 2001 From: Matthew Heguy Date: Tue, 26 Feb 2019 14:25:19 -0500 Subject: [PATCH] Sciences --- map_gen/maps/christmas_tree_of_terror.lua | 6 +++--- map_gen/maps/crash_site.lua | 6 +++--- .../outpost_data/big_science_factory.lua | 12 ++++++------ .../outpost_data/medium_science_factory.lua | 16 ++++++++-------- .../outpost_data/mini_t1_science_factory.lua | 12 ++++++------ .../outpost_data/mini_t2_science_factory.lua | 6 +++--- .../outpost_data/small_science_factory.lua | 16 ++++++++-------- map_gen/maps/diggy/config.lua | 6 +++--- map_gen/maps/triangle_of_death.lua | 6 +++--- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/map_gen/maps/christmas_tree_of_terror.lua b/map_gen/maps/christmas_tree_of_terror.lua index e2f9355b..eb85dd55 100644 --- a/map_gen/maps/christmas_tree_of_terror.lua +++ b/map_gen/maps/christmas_tree_of_terror.lua @@ -218,8 +218,8 @@ local item_pool = { {name = 'land-mine', count = 100, weight = 250}, {name = 'shotgun-shell', count = 200, weight = 1250}, {name = 'piercing-rounds-magazine', count = 200, weight = 833.3333}, - {name = 'science-pack-1', count = 200, weight = 100}, - {name = 'science-pack-2', count = 200, weight = 100}, + {name = 'automation-science-pack', count = 200, weight = 100}, + {name = 'logistic-science-pack', count = 200, weight = 100}, {name = 'grenade', count = 100, weight = 500}, {name = 'defender-capsule', count = 50, weight = 500}, {name = 'railgun-dart', count = 100, weight = 500}, @@ -233,7 +233,7 @@ local item_pool = { {name = 'railgun', count = 1, weight = 100}, {name = 'flamethrower-ammo', count = 50, weight = 100}, {name = 'military-science-pack', count = 200, weight = 100}, - {name = 'science-pack-3', count = 200, weight = 100}, + {name = 'chemical-science-pack', count = 200, weight = 100}, {name = 'explosive-rocket', count = 100, weight = 100}, {name = 'explosive-cannon-shell', count = 100, weight = 100}, {name = 'cluster-grenade', count = 100, weight = 100}, diff --git a/map_gen/maps/crash_site.lua b/map_gen/maps/crash_site.lua index 49f88296..c7159e39 100644 --- a/map_gen/maps/crash_site.lua +++ b/map_gen/maps/crash_site.lua @@ -707,10 +707,10 @@ local function init() {name = 'coal', price = 1.25}, {name = 'raw-fish', price = 4}, {name = 'firearm-magazine', price = 5}, - {name = 'science-pack-1', price = 10}, - {name = 'science-pack-2', price = 25}, + {name = 'automation-science-pack', price = 10}, + {name = 'logistic-science-pack', price = 25}, {name = 'military-science-pack', price = 50}, - {name = 'science-pack-3', price = 75}, + {name = 'chemical-science-pack', price = 75}, {name = 'production-science-pack', price = 100}, {name = 'high-tech-science-pack', price = 125}, { diff --git a/map_gen/maps/crash_site/outpost_data/big_science_factory.lua b/map_gen/maps/crash_site/outpost_data/big_science_factory.lua index 99a32c89..1b433224 100644 --- a/map_gen/maps/crash_site/outpost_data/big_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/big_science_factory.lua @@ -4,10 +4,10 @@ local Token = require 'utils.token' local loot = { {weight = 10}, {stack = {name = 'coin', count = 250, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-1', count = 200, distance_factor = 1 / 10}, weight = 2}, - {stack = {name = 'science-pack-2', count = 100, distance_factor = 1 / 10}, weight = 2}, + {stack = {name = 'automation-science-pack', count = 200, distance_factor = 1 / 10}, weight = 2}, + {stack = {name = 'logistic-science-pack', count = 100, distance_factor = 1 / 10}, weight = 2}, {stack = {name = 'military-science-pack', count = 75, distance_factor = 1 / 10}, weight = 3}, - {stack = {name = 'science-pack-3', count = 75, distance_factor = 1 / 10}, weight = 3}, + {stack = {name = 'chemical-science-pack', count = 75, distance_factor = 1 / 10}, weight = 3}, {stack = {name = 'production-science-pack', count = 50, distance_factor = 1 / 10}, weight = 5}, {stack = {name = 'high-tech-science-pack', count = 50, distance_factor = 1 / 10}, weight = 5} } @@ -45,13 +45,13 @@ local market = { upgrade_base_cost = 500, upgrade_cost_base = 2, { - name = 'science-pack-1', + name = 'automation-science-pack', price = 10, distance_factor = 5 / 512, min_price = 1 }, { - name = 'science-pack-2', + name = 'logistic-science-pack', price = 20, distance_factor = 10 / 512, min_price = 2 @@ -63,7 +63,7 @@ local market = { min_price = 4 }, { - name = 'science-pack-3', + name = 'chemical-science-pack', price = 60, distance_factor = 30 / 512, min_price = 4 diff --git a/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua b/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua index 19fb7426..01d08072 100644 --- a/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/medium_science_factory.lua @@ -4,10 +4,10 @@ local Token = require 'utils.token' local loot = { {weight = 10}, {stack = {name = 'coin', count = 75, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-1', count = 100, distance_factor = 1 / 10}, weight = 5}, - {stack = {name = 'science-pack-2', count = 50, distance_factor = 1 / 10}, weight = 5}, + {stack = {name = 'automation-science-pack', count = 100, distance_factor = 1 / 10}, weight = 5}, + {stack = {name = 'logistic-science-pack', count = 50, distance_factor = 1 / 10}, weight = 5}, {stack = {name = 'military-science-pack', count = 25, distance_factor = 1 / 10}, weight = 5}, - {stack = {name = 'science-pack-3', count = 25, distance_factor = 1 / 10}, weight = 5} + {stack = {name = 'chemical-science-pack', count = 25, distance_factor = 1 / 10}, weight = 5} } local weights = ob.prepare_weighted_loot(loot) @@ -30,8 +30,8 @@ local factory = { local factory_b = { callback = ob.magic_item_crafting_callback, data = { - recipe = 'science-pack-3', - output = {min_rate = 0.125 / 60, distance_factor = 0.125 / 60 / 512, item = 'science-pack-3'} + recipe = 'chemical-science-pack', + output = {min_rate = 0.125 / 60, distance_factor = 0.125 / 60 / 512, item = 'chemical-science-pack'} } } @@ -43,13 +43,13 @@ local market = { upgrade_base_cost = 500, upgrade_cost_base = 2, { - name = 'science-pack-1', + name = 'automation-science-pack', price = 10, distance_factor = 5 / 512, min_price = 1 }, { - name = 'science-pack-2', + name = 'logistic-science-pack', price = 20, distance_factor = 10 / 512, min_price = 2 @@ -61,7 +61,7 @@ local market = { min_price = 4 }, { - name = 'science-pack-3', + name = 'chemical-science-pack', price = 60, distance_factor = 30 / 512, min_price = 6 diff --git a/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua index 387ba127..c6f21c80 100644 --- a/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t1_science_factory.lua @@ -4,8 +4,8 @@ local Token = require 'utils.token' local loot = { {weight = 10}, {stack = {name = 'coin', count = 50, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-1', count = 37, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-2', count = 25, distance_factor = 1 / 20}, weight = 5} + {stack = {name = 'automation-science-pack', count = 37, distance_factor = 1 / 20}, weight = 5}, + {stack = {name = 'logistic-science-pack', count = 25, distance_factor = 1 / 20}, weight = 5} } local weights = ob.prepare_weighted_loot(loot) @@ -20,15 +20,15 @@ local loot_callback = local factory_loot = { { stack = { - recipe = 'science-pack-1', - output = {item = 'science-pack-1', min_rate = 1 / 5 / 60, distance_factor = 1 / 5 / 60 / 512} + recipe = 'automation-science-pack', + output = {item = 'automation-science-pack', min_rate = 1 / 5 / 60, distance_factor = 1 / 5 / 60 / 512} }, weight = 5 }, { stack = { - recipe = 'science-pack-2', - output = {item = 'science-pack-2', min_rate = 1 / 6 / 60, distance_factor = 1 / 6 / 60 / 512} + recipe = 'logistic-science-pack', + output = {item = 'logistic-science-pack', min_rate = 1 / 6 / 60, distance_factor = 1 / 6 / 60 / 512} }, weight = 5 } diff --git a/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua b/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua index 42d36a2e..b88f429c 100644 --- a/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/mini_t2_science_factory.lua @@ -5,7 +5,7 @@ local loot = { {weight = 10}, {stack = {name = 'coin', count = 75, distance_factor = 1 / 20}, weight = 5}, {stack = {name = 'military-science-pack', count = 12, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-3', count = 12, distance_factor = 1 / 20}, weight = 5} + {stack = {name = 'chemical-science-pack', count = 12, distance_factor = 1 / 20}, weight = 5} } local weights = ob.prepare_weighted_loot(loot) @@ -27,8 +27,8 @@ local factory_loot = { }, { stack = { - recipe = 'science-pack-3', - output = {item = 'science-pack-3', min_rate = 1 / 12 / 60, distance_factor = 1 / 12 / 60 / 512} + recipe = 'chemical-science-pack', + output = {item = 'chemical-science-pack', min_rate = 1 / 12 / 60, distance_factor = 1 / 12 / 60 / 512} }, weight = 5 } diff --git a/map_gen/maps/crash_site/outpost_data/small_science_factory.lua b/map_gen/maps/crash_site/outpost_data/small_science_factory.lua index 4bb587b0..04bee7fe 100644 --- a/map_gen/maps/crash_site/outpost_data/small_science_factory.lua +++ b/map_gen/maps/crash_site/outpost_data/small_science_factory.lua @@ -4,8 +4,8 @@ local Token = require 'utils.token' local loot = { {weight = 10}, {stack = {name = 'coin', count = 50, distance_factor = 1 / 20}, weight = 5}, - {stack = {name = 'science-pack-1', count = 50, distance_factor = 1 / 10}, weight = 5}, - {stack = {name = 'science-pack-2', count = 25, distance_factor = 1 / 10}, weight = 5} + {stack = {name = 'automation-science-pack', count = 50, distance_factor = 1 / 10}, weight = 5}, + {stack = {name = 'logistic-science-pack', count = 25, distance_factor = 1 / 10}, weight = 5} } local weights = ob.prepare_weighted_loot(loot) @@ -20,16 +20,16 @@ local loot_callback = local factory = { callback = ob.magic_item_crafting_callback, data = { - recipe = 'science-pack-1', - output = {min_rate = 0.175 / 60, distance_factor = 0.175 / 60 / 512, item = 'science-pack-1'} + recipe = 'automation-science-pack', + output = {min_rate = 0.175 / 60, distance_factor = 0.175 / 60 / 512, item = 'automation-science-pack'} } } local factory_b = { callback = ob.magic_item_crafting_callback, data = { - recipe = 'science-pack-2', - output = {min_rate = 0.175 / 60, distance_factor = 0.175 / 60 / 512, item = 'science-pack-2'} + recipe = 'logistic-science-pack', + output = {min_rate = 0.175 / 60, distance_factor = 0.175 / 60 / 512, item = 'logistic-science-pack'} } } @@ -41,13 +41,13 @@ local market = { upgrade_base_cost = 350, upgrade_cost_base = 2, { - name = 'science-pack-1', + name = 'automation-science-pack', price = 10, distance_factor = 5 / 512, min_price = 1 }, { - name = 'science-pack-2', + name = 'logistic-science-pack', price = 20, distance_factor = 10 / 512, min_price = 2 diff --git a/map_gen/maps/diggy/config.lua b/map_gen/maps/diggy/config.lua index 1cfb3804..40c1fc32 100644 --- a/map_gen/maps/diggy/config.lua +++ b/map_gen/maps/diggy/config.lua @@ -368,9 +368,9 @@ local Config = { ['rock-big'] = 5, ['rock-huge'] = 10, ['rocket_launch'] = 0.01, -- XP reward in percentage of total experience when a rocket launches (Diggy default: 0.01 which equals 1%) - ['science-pack-1'] = 4, - ['science-pack-2'] = 8, - ['science-pack-3'] = 15, + ['automation-science-pack'] = 4, + ['logistic-science-pack'] = 8, + ['chemical-science-pack'] = 15, ['military-science-pack'] = 12, ['production-science-pack'] = 25, ['high-tech-science-pack'] = 50, diff --git a/map_gen/maps/triangle_of_death.lua b/map_gen/maps/triangle_of_death.lua index b422c34d..7a902dc0 100644 --- a/map_gen/maps/triangle_of_death.lua +++ b/map_gen/maps/triangle_of_death.lua @@ -201,8 +201,8 @@ local item_pool = { {name = 'land-mine', count = 100, weight = 250}, {name = 'shotgun-shell', count = 200, weight = 1250}, {name = 'piercing-rounds-magazine', count = 200, weight = 833.3333}, - {name = 'science-pack-1', count = 200, weight = 100}, - {name = 'science-pack-2', count = 200, weight = 100}, + {name = 'automation-science-pack', count = 200, weight = 100}, + {name = 'logistic-science-pack', count = 200, weight = 100}, {name = 'grenade', count = 100, weight = 500}, {name = 'defender-capsule', count = 50, weight = 500}, {name = 'railgun-dart', count = 100, weight = 500}, @@ -216,7 +216,7 @@ local item_pool = { {name = 'railgun', count = 1, weight = 100}, {name = 'flamethrower-ammo', count = 50, weight = 100}, {name = 'military-science-pack', count = 200, weight = 100}, - {name = 'science-pack-3', count = 200, weight = 100}, + {name = 'chemical-science-pack', count = 200, weight = 100}, {name = 'explosive-rocket', count = 100, weight = 100}, {name = 'explosive-cannon-shell', count = 100, weight = 100}, {name = 'cluster-grenade', count = 100, weight = 100},