From fff3395cadb413d93f7e939f79b0680bf59874fc Mon Sep 17 00:00:00 2001 From: TWLTriston Date: Mon, 20 Nov 2017 11:17:21 -0500 Subject: [PATCH 1/5] Logistics slots save/reset during force toggle event --- custom_commands.lua | 96 +++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/custom_commands.lua b/custom_commands.lua index 6210407c..fe299d1b 100644 --- a/custom_commands.lua +++ b/custom_commands.lua @@ -329,53 +329,73 @@ end global.old_force = {} global.force_toggle_init = true local function forcetoggle(cmd) - if not game.player or not (game.player.admin or is_mod(game.player.name)) then - cant_run(cmd.name) - return - end + if not game.player or not (game.player.admin or is_mod(game.player.name)) then + cant_run(cmd.name) + return + end - if global.force_toggle_init then - game.forces.enemy.research_all_technologies() --avoids losing logstics slot configuration - global.force_toggle_init = false - end + if global.force_toggle_init then + game.forces.enemy.research_all_technologies() --avoids losing logstics slot configuration + global.force_toggle_init = false + end - if game.player.force.name == "enemy" then - local old_force = global.old_force[game.player.name] - if not old_force then - game.player.force = "player" - game.player.print("Your are now on the player force.") - else - if game.forces[old_force] then - game.player.force = old_force + -- save the logistics slots + local slots = {} + local slot_counts = game.player.character.request_slot_count + if game.player.character.request_slot_count > 0 then + for i = 1, slot_counts do + slot = game.player.character.get_request_slot(i) + if slot ~= nil then + table.insert(slots, slot) + end + end + end + + if game.player.force.name == "enemy" then + local old_force = global.old_force[game.player.name] + if not old_force then + game.player.force = "player" + game.player.print("You're are now on the player force.") else - game.player.force = "player" + if game.forces[old_force] then + game.player.force = old_force + else + game.player.force = "player" + end end - end - else + else --Put roboports into inventory - inv = game.player.get_inventory(defines.inventory.player_armor) - if inv[1].valid_for_read + inv = game.player.get_inventory(defines.inventory.player_armor) + if inv[1].valid_for_read then - local name = inv[1].name - if name:match("power") or name:match("modular") then - local equips = inv[1].grid.equipment - for _,equip in pairs(equips) do - if equip.name == "personal-roboport-equipment" - or equip.name == "personal-roboport-mk2-equipment" - or equip.name == "personal-laser-defense-equipment" then - if game.player.insert{name = equip.name} == 0 then - game.player.surface.spill_item_stack(game.player.position, {name = equip.name}) + local name = inv[1].name + if name:match("power") or name:match("modular") then + local equips = inv[1].grid.equipment + for _,equip in pairs(equips) do + if equip.name == "personal-roboport-equipment" + or equip.name == "personal-roboport-mk2-equipment" + or equip.name == "personal-laser-defense-equipment" then + if game.player.insert{name = equip.name} == 0 then + game.player.surface.spill_item_stack(game.player.position, {name = equip.name}) + end + inv[1].grid.take(equip) + end end - inv[1].grid.take(equip) - end - end + end end - end - global.old_force[game.player.name] = game.player.force.name - game.player.force = "enemy" - end - game.player.print("You are now on the " .. game.player.force.name .. " force.") + global.old_force[game.player.name] = game.player.force.name + game.player.force = "enemy" + end + game.player.print("You are now on the " .. game.player.force.name .. " force.") + + -- Attempt to rebuild the request slots + slot_counts = game.player.character.request_slot_count + if game.player.character.request_slot_count > 0 then + for _,slot in ipairs(slots) do + game.player.character.set_request_slot(slot, _) + end + end end local function get_group() From f3647face56c3d9c056ee75477d0d0d4f1fdb60c Mon Sep 17 00:00:00 2001 From: TWLTriston Date: Mon, 20 Nov 2017 11:17:30 -0500 Subject: [PATCH 2/5] Leave the forests alone! --- locale/gen_combined/grilledham_map_gen/map_gen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/gen_combined/grilledham_map_gen/map_gen.lua b/locale/gen_combined/grilledham_map_gen/map_gen.lua index 70e94017..c76b20c7 100644 --- a/locale/gen_combined/grilledham_map_gen/map_gen.lua +++ b/locale/gen_combined/grilledham_map_gen/map_gen.lua @@ -104,7 +104,7 @@ function run_combined_module(event) e.destroy() end for _, e in pairs(surface.find_entities_filtered{area=area, type="tree"}) do - e.destroy() + -- e.destroy() -- Leaving the trees/forests end for _, e in pairs(surface.find_entities_filtered{area=area, type="simple-entity"}) do e.destroy() From d5b2516535d1f44d49fd7a882564928b71a603ed Mon Sep 17 00:00:00 2001 From: TWLTriston Date: Mon, 20 Nov 2017 11:17:42 -0500 Subject: [PATCH 3/5] Adjusting fish market costs and rewards -- added chain saw mode --- fish_market.lua | 75 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 59 insertions(+), 16 deletions(-) diff --git a/fish_market.lua b/fish_market.lua index ad94abff..86234ed7 100644 --- a/fish_market.lua +++ b/fish_market.lua @@ -59,6 +59,7 @@ function spawn_market(cmd) market.add_market_item{price={{"raw-fish", 10}}, offer={type="give-item", item="discharge-defense-remote"}} market.add_market_item{price={{"raw-fish", 30}}, offer={type="give-item", item="small-plane"}} + market.add_market_item{price={{"raw-fish", 10}}, offer={type="give-item", item="wood"}} market.add_market_item{price={{"raw-fish", 1}}, offer={type="give-item", item="rail", count=2}} market.add_market_item{price={{"raw-fish", 2}}, offer={type="give-item", item="rail-signal"}} market.add_market_item{price={{"raw-fish", 2}}, offer={type="give-item", item="rail-chain-signal"}} @@ -85,7 +86,7 @@ function spawn_market(cmd) market.add_market_item{price={{"raw-fish", 100}}, offer={type="give-item", item="loader"}} market.add_market_item{price={{"raw-fish", 175}}, offer={type="give-item", item="fast-loader"}} market.add_market_item{price={{"raw-fish", 250}}, offer={type="give-item", item="express-loader"}} - market.add_market_item{price={{"raw-fish", 1000}}, offer={type="give-item", item="belt-immunity-equipment"}} + market.add_market_item{price={{"raw-fish", 500}}, offer={type="give-item", item="belt-immunity-equipment"}} market.add_market_item{price={{"raw-fish", 100}}, offer={type="give-item", item="night-vision-equipment"}} market.add_market_item{price={{"raw-fish", 200}}, offer={type="give-item", item="modular-armor"}} market.add_market_item{price={{"raw-fish", 500}}, offer={type="give-item", item="power-armor"}} @@ -94,7 +95,7 @@ function spawn_market(cmd) market.add_market_item{price={{"raw-fish", 50}}, offer={type="give-item", item="solar-panel-equipment", count=1}} market.add_market_item{price={{"raw-fish", 50}}, offer={type="give-item", item="battery-equipment", count=1}} market.add_market_item{price={{"raw-fish", 750}}, offer={type="give-item", item="battery-mk2-equipment", count=1}} - market.add_market_item{price={{"raw-fish", 2000}}, offer={type="give-item", item="fusion-reactor-equipment", count=1}} + market.add_market_item{price={{"raw-fish", 1000}}, offer={type="give-item", item="fusion-reactor-equipment", count=1}} market.add_market_item{price={{"raw-fish", 100}}, offer={type="give-item", item="exoskeleton-equipment"}} end @@ -189,7 +190,7 @@ local function fish_drop_entity_died(event) give_fish_cause = true end if event.entity.type == "unit" then - fish_amount = 1 + fish_amount = 3 fish_chance = 1 give_fish_unit = true end @@ -200,11 +201,11 @@ local function fish_drop_entity_died(event) end if event.entity.type == "turret" then if ( event.entity.name == "small-worm-turret" ) then - fish_amount = 10 + fish_amount = 5 elseif ( event.entity.name == "medium-worm-turret" ) then - fish_amount = 20 + fish_amount = 10 elseif ( event.entity.name == "big-worm-turret" ) then - fish_amount = 30 + fish_amount = 15 end fish_chance = 100 @@ -293,6 +294,36 @@ local function boost_player_runningspeed(player) end end +local function reset_player_miningspeed(player) + player.character_mining_speed_modifier = global.character_mining_speed_modifier[player.index].pre_mining_boost_modifier + global.player_mining_boost_records[player.index] = nil +end + +local function boost_player_miningspeed(player) + if global.player_mining_boost_records == nil then global.player_mining_boost_records = {} end + + if global.player_mining_boost_records[player.index] == nil then + global.player_mining_boost_records[player.index] = { + start_tick = game.tick, + pre_mining_boost_modifier = player.character_mining_speed_modifier, + boost_lvl = 0 + } + end + local boost_msg = { + [1] = "%s is going on a tree harvest!", + [2] = "In search of a sharper axe, %s got a lv.2 mining boost!", + [3] = "Wood fiend, %s, has picked up a massive chain saw and is awarded a lv.3 mining boost!", + [4] = "Better learn to control that saw, %s, chopped off their legs. Oops." + } + global.player_mining_boost_records[player.index].boost_lvl = 1 + global.player_mining_boost_records[player.index].boost_lvl + player.character_mining_speed_modifier = 1 + player.character_mining_speed_modifier + game.print(string.format(boost_msg[global.player_mining_boost_records[player.index].boost_lvl], player.name)) + if global.player_mining_boost_records[player.index].boost_lvl >= 4 then + reset_player_miningspeed(player) + player.character.die() + end +end + local function market_item_purchased(event) local player = game.players[event.player_index] @@ -303,11 +334,16 @@ local function market_item_purchased(event) fish_cost = market_item.price[1].amount * event.count global.fish_market_fish_spent[event.player_index] = global.fish_market_fish_spent[event.player_index] + fish_cost - if event.offer_index == 1 then -- exoskeleton-equipment + if event.offer_index == 1 then -- exoskeleton-equipment player.get_inventory(defines.inventory.player_main).remove({name="exoskeleton-equipment", count=event.count}) boost_player_runningspeed(player) end + if event.offer_index == 3 then -- exoskeleton-equipment + player.get_inventory(defines.inventory.player_main).remove({name="wood", count=event.count}) + boost_player_miningspeed(player) + end + if event.offer_index == 2 then player.get_inventory(defines.inventory.player_main).remove({name="small-plane", count=event.count}) local chance = 4 @@ -362,14 +398,21 @@ if not global.pet_command_rotation then global.pet_command_rotation = 1 end function fish_market_on_180_ticks() if game.tick % 900 == 0 then - if global.player_speed_boost_records then - for k,v in pairs(global.player_speed_boost_records) do - if game.tick - v.start_tick > 3000 then - reset_player_runningspeed(game.players[k]) - end - end - end - end + if global.player_speed_boost_records then + for k,v in pairs(global.player_speed_boost_records) do + if game.tick - v.start_tick > 3000 then + reset_player_runningspeed(game.players[k]) + end + end + end + if global.player_mining_boost_records then + for k,v in pairs(global.player_mining_boost_records) do + if game.tick - v.start_tick > 6000 then + reset_player_miningspeed(game.players[k]) + end + end + end + end if global.player_pets then for _, pets in pairs(global.player_pets) do @@ -427,7 +470,7 @@ function fish_built_entity (event) end function fish_player_crafted_item(event) - local x = math.random(1,5) + local x = math.random(1,50) if x == 1 then fish_earned(event, 1) end From aa3e5fcef55ee3189cedb54da849784f41cc0c08 Mon Sep 17 00:00:00 2001 From: TWLTriston Date: Mon, 20 Nov 2017 11:29:01 -0500 Subject: [PATCH 4/5] Moved all map gen data into the _locale folder to keep save files managable --- .../gen_combined/grilledham_map_gen/data/GoT.lua | 0 .../gen_combined/grilledham_map_gen/data/UK.lua | 0 .../gen_combined/grilledham_map_gen/data/antfarm.lua | 0 .../gen_combined/grilledham_map_gen/data/biome_test.lua | 0 .../gen_combined/grilledham_map_gen/data/broken_web.lua | 0 .../gen_combined/grilledham_map_gen/data/cage.lua | 0 .../gen_combined/grilledham_map_gen/data/color_mona_lisa.lua | 0 .../gen_combined/grilledham_map_gen/data/creation_of_adam.lua | 0 .../gen_combined/grilledham_map_gen/data/creation_of_adam2.lua | 0 .../gen_combined/grilledham_map_gen/data/crosses.lua | 0 .../gen_combined/grilledham_map_gen/data/crosses2.lua | 0 .../gen_combined/grilledham_map_gen/data/crosses3.lua | 0 .../gen_combined/grilledham_map_gen/data/cubes.lua | 0 .../gen_combined/grilledham_map_gen/data/darthplagueis.lua | 0 .../gen_combined/grilledham_map_gen/data/dickbutt.lua | 0 .../gen_combined/grilledham_map_gen/data/dickbutt2.lua | 0 .../gen_combined/grilledham_map_gen/data/gears.lua | 0 .../gen_combined/grilledham_map_gen/data/goat.lua | 0 .../gen_combined/grilledham_map_gen/data/hexes.lua | 0 .../gen_combined/grilledham_map_gen/data/lines.lua | 0 .../gen_combined/grilledham_map_gen/data/manhattan.lua | 0 .../gen_combined/grilledham_map_gen/data/maori.lua | 0 .../gen_combined/grilledham_map_gen/data/mics_stuff.lua | 0 .../gen_combined/grilledham_map_gen/data/mona_lisa.lua | 0 .../gen_combined/grilledham_map_gen/data/poop_emoji.lua | 0 .../gen_combined/grilledham_map_gen/data/test.lua | 0 .../gen_combined/grilledham_map_gen/data/void_gears.lua | 0 .../gen_combined/grilledham_map_gen/presets/GoT.lua | 0 .../gen_combined/grilledham_map_gen/presets/UK.lua | 0 .../gen_combined/grilledham_map_gen/presets/antfarm.lua | 0 .../gen_combined/grilledham_map_gen/presets/biome_test.lua | 0 .../gen_combined/grilledham_map_gen/presets/cage.lua | 0 .../gen_combined/grilledham_map_gen/presets/connected_dots.lua | 0 .../grilledham_map_gen/presets/creation_of_adam.lua | 0 .../gen_combined/grilledham_map_gen/presets/goat.lua | 0 .../gen_combined/grilledham_map_gen/presets/manhattan.lua | 0 .../gen_combined/grilledham_map_gen/presets/maori.lua | 0 .../gen_combined/grilledham_map_gen/presets/mobius_strip.lua | 0 .../gen_combined/grilledham_map_gen/presets/mona_lisa.lua | 0 .../gen_shape/gen_islands_data}/broken_web_data.lua | 0 .../gen_shape/gen_islands_data}/cage_data.lua | 0 .../gen_shape/gen_islands_data}/creation_of_adam_data.lua | 0 .../gen_shape/gen_islands_data}/crosses2_data.lua | 0 .../gen_shape/gen_islands_data}/crosses3_data.lua | 0 .../gen_shape/gen_islands_data}/crosses_data.lua | 0 .../gen_shape/gen_islands_data}/cubes_data.lua | 0 .../gen_shape/gen_islands_data}/darthplagueis_data.lua | 0 .../gen_shape/gen_islands_data}/dickbutt2_data.lua | 0 .../gen_shape/gen_islands_data}/dickbutt_data.lua | 0 .../gen_shape/gen_islands_data}/gears_data.lua | 0 .../gen_shape/gen_islands_data}/goat_data.lua | 0 .../gen_shape/gen_islands_data}/hexes_data.lua | 0 .../gen_shape/gen_islands_data}/lines_data.lua | 0 .../gen_shape/gen_islands_data}/maori_data.lua | 0 .../gen_shape/gen_islands_data}/mics_stuff_data.lua | 0 .../gen_shape/gen_islands_data}/mona_lisa_data.lua | 0 .../gen_shape/gen_islands_data}/poop_emoji_data.lua | 0 .../gen_shape/gen_islands_data}/test_data.lua | 0 .../gen_shape/gen_islands_data}/void_gears_data.lua | 0 locale/gen_combined/grilledham_map_gen/data/readme.lua | 1 + locale/gen_combined/grilledham_map_gen/presets/readme.lua | 0 locale/gen_shape/grid_islands_data/readme.lua | 1 + map_layout.lua | 3 +++ 63 files changed, 5 insertions(+) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/GoT.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/UK.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/antfarm.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/biome_test.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/broken_web.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/cage.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/color_mona_lisa.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/creation_of_adam.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/creation_of_adam2.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/crosses.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/crosses2.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/crosses3.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/cubes.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/darthplagueis.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/dickbutt.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/dickbutt2.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/gears.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/goat.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/hexes.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/lines.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/manhattan.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/maori.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/mics_stuff.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/mona_lisa.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/poop_emoji.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/test.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/data/void_gears.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/GoT.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/UK.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/antfarm.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/biome_test.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/cage.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/connected_dots.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/creation_of_adam.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/goat.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/manhattan.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/maori.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/mobius_strip.lua (100%) rename {locale => _locale}/gen_combined/grilledham_map_gen/presets/mona_lisa.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/broken_web_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/cage_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/creation_of_adam_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/crosses2_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/crosses3_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/crosses_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/cubes_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/darthplagueis_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/dickbutt2_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/dickbutt_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/gears_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/goat_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/hexes_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/lines_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/maori_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/mics_stuff_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/mona_lisa_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/poop_emoji_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/test_data.lua (100%) rename {locale/gen_shape/grid_islands_data => _locale/gen_shape/gen_islands_data}/void_gears_data.lua (100%) create mode 100644 locale/gen_combined/grilledham_map_gen/data/readme.lua create mode 100644 locale/gen_combined/grilledham_map_gen/presets/readme.lua create mode 100644 locale/gen_shape/grid_islands_data/readme.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/GoT.lua b/_locale/gen_combined/grilledham_map_gen/data/GoT.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/GoT.lua rename to _locale/gen_combined/grilledham_map_gen/data/GoT.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/UK.lua b/_locale/gen_combined/grilledham_map_gen/data/UK.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/UK.lua rename to _locale/gen_combined/grilledham_map_gen/data/UK.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/antfarm.lua b/_locale/gen_combined/grilledham_map_gen/data/antfarm.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/antfarm.lua rename to _locale/gen_combined/grilledham_map_gen/data/antfarm.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/biome_test.lua b/_locale/gen_combined/grilledham_map_gen/data/biome_test.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/biome_test.lua rename to _locale/gen_combined/grilledham_map_gen/data/biome_test.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/broken_web.lua b/_locale/gen_combined/grilledham_map_gen/data/broken_web.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/broken_web.lua rename to _locale/gen_combined/grilledham_map_gen/data/broken_web.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/cage.lua b/_locale/gen_combined/grilledham_map_gen/data/cage.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/cage.lua rename to _locale/gen_combined/grilledham_map_gen/data/cage.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/color_mona_lisa.lua b/_locale/gen_combined/grilledham_map_gen/data/color_mona_lisa.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/color_mona_lisa.lua rename to _locale/gen_combined/grilledham_map_gen/data/color_mona_lisa.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/creation_of_adam.lua b/_locale/gen_combined/grilledham_map_gen/data/creation_of_adam.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/creation_of_adam.lua rename to _locale/gen_combined/grilledham_map_gen/data/creation_of_adam.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/creation_of_adam2.lua b/_locale/gen_combined/grilledham_map_gen/data/creation_of_adam2.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/creation_of_adam2.lua rename to _locale/gen_combined/grilledham_map_gen/data/creation_of_adam2.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/crosses.lua b/_locale/gen_combined/grilledham_map_gen/data/crosses.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/crosses.lua rename to _locale/gen_combined/grilledham_map_gen/data/crosses.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/crosses2.lua b/_locale/gen_combined/grilledham_map_gen/data/crosses2.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/crosses2.lua rename to _locale/gen_combined/grilledham_map_gen/data/crosses2.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/crosses3.lua b/_locale/gen_combined/grilledham_map_gen/data/crosses3.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/crosses3.lua rename to _locale/gen_combined/grilledham_map_gen/data/crosses3.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/cubes.lua b/_locale/gen_combined/grilledham_map_gen/data/cubes.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/cubes.lua rename to _locale/gen_combined/grilledham_map_gen/data/cubes.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/darthplagueis.lua b/_locale/gen_combined/grilledham_map_gen/data/darthplagueis.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/darthplagueis.lua rename to _locale/gen_combined/grilledham_map_gen/data/darthplagueis.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/dickbutt.lua b/_locale/gen_combined/grilledham_map_gen/data/dickbutt.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/dickbutt.lua rename to _locale/gen_combined/grilledham_map_gen/data/dickbutt.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/dickbutt2.lua b/_locale/gen_combined/grilledham_map_gen/data/dickbutt2.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/dickbutt2.lua rename to _locale/gen_combined/grilledham_map_gen/data/dickbutt2.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/gears.lua b/_locale/gen_combined/grilledham_map_gen/data/gears.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/gears.lua rename to _locale/gen_combined/grilledham_map_gen/data/gears.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/goat.lua b/_locale/gen_combined/grilledham_map_gen/data/goat.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/goat.lua rename to _locale/gen_combined/grilledham_map_gen/data/goat.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/hexes.lua b/_locale/gen_combined/grilledham_map_gen/data/hexes.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/hexes.lua rename to _locale/gen_combined/grilledham_map_gen/data/hexes.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/lines.lua b/_locale/gen_combined/grilledham_map_gen/data/lines.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/lines.lua rename to _locale/gen_combined/grilledham_map_gen/data/lines.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/manhattan.lua b/_locale/gen_combined/grilledham_map_gen/data/manhattan.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/manhattan.lua rename to _locale/gen_combined/grilledham_map_gen/data/manhattan.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/maori.lua b/_locale/gen_combined/grilledham_map_gen/data/maori.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/maori.lua rename to _locale/gen_combined/grilledham_map_gen/data/maori.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/mics_stuff.lua b/_locale/gen_combined/grilledham_map_gen/data/mics_stuff.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/mics_stuff.lua rename to _locale/gen_combined/grilledham_map_gen/data/mics_stuff.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/mona_lisa.lua b/_locale/gen_combined/grilledham_map_gen/data/mona_lisa.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/mona_lisa.lua rename to _locale/gen_combined/grilledham_map_gen/data/mona_lisa.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/poop_emoji.lua b/_locale/gen_combined/grilledham_map_gen/data/poop_emoji.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/poop_emoji.lua rename to _locale/gen_combined/grilledham_map_gen/data/poop_emoji.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/test.lua b/_locale/gen_combined/grilledham_map_gen/data/test.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/test.lua rename to _locale/gen_combined/grilledham_map_gen/data/test.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/void_gears.lua b/_locale/gen_combined/grilledham_map_gen/data/void_gears.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/data/void_gears.lua rename to _locale/gen_combined/grilledham_map_gen/data/void_gears.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/GoT.lua b/_locale/gen_combined/grilledham_map_gen/presets/GoT.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/GoT.lua rename to _locale/gen_combined/grilledham_map_gen/presets/GoT.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/UK.lua b/_locale/gen_combined/grilledham_map_gen/presets/UK.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/UK.lua rename to _locale/gen_combined/grilledham_map_gen/presets/UK.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/antfarm.lua b/_locale/gen_combined/grilledham_map_gen/presets/antfarm.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/antfarm.lua rename to _locale/gen_combined/grilledham_map_gen/presets/antfarm.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/biome_test.lua b/_locale/gen_combined/grilledham_map_gen/presets/biome_test.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/biome_test.lua rename to _locale/gen_combined/grilledham_map_gen/presets/biome_test.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/cage.lua b/_locale/gen_combined/grilledham_map_gen/presets/cage.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/cage.lua rename to _locale/gen_combined/grilledham_map_gen/presets/cage.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/connected_dots.lua b/_locale/gen_combined/grilledham_map_gen/presets/connected_dots.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/connected_dots.lua rename to _locale/gen_combined/grilledham_map_gen/presets/connected_dots.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/creation_of_adam.lua b/_locale/gen_combined/grilledham_map_gen/presets/creation_of_adam.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/creation_of_adam.lua rename to _locale/gen_combined/grilledham_map_gen/presets/creation_of_adam.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/goat.lua b/_locale/gen_combined/grilledham_map_gen/presets/goat.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/goat.lua rename to _locale/gen_combined/grilledham_map_gen/presets/goat.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/manhattan.lua b/_locale/gen_combined/grilledham_map_gen/presets/manhattan.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/manhattan.lua rename to _locale/gen_combined/grilledham_map_gen/presets/manhattan.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/maori.lua b/_locale/gen_combined/grilledham_map_gen/presets/maori.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/maori.lua rename to _locale/gen_combined/grilledham_map_gen/presets/maori.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/mobius_strip.lua b/_locale/gen_combined/grilledham_map_gen/presets/mobius_strip.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/mobius_strip.lua rename to _locale/gen_combined/grilledham_map_gen/presets/mobius_strip.lua diff --git a/locale/gen_combined/grilledham_map_gen/presets/mona_lisa.lua b/_locale/gen_combined/grilledham_map_gen/presets/mona_lisa.lua similarity index 100% rename from locale/gen_combined/grilledham_map_gen/presets/mona_lisa.lua rename to _locale/gen_combined/grilledham_map_gen/presets/mona_lisa.lua diff --git a/locale/gen_shape/grid_islands_data/broken_web_data.lua b/_locale/gen_shape/gen_islands_data/broken_web_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/broken_web_data.lua rename to _locale/gen_shape/gen_islands_data/broken_web_data.lua diff --git a/locale/gen_shape/grid_islands_data/cage_data.lua b/_locale/gen_shape/gen_islands_data/cage_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/cage_data.lua rename to _locale/gen_shape/gen_islands_data/cage_data.lua diff --git a/locale/gen_shape/grid_islands_data/creation_of_adam_data.lua b/_locale/gen_shape/gen_islands_data/creation_of_adam_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/creation_of_adam_data.lua rename to _locale/gen_shape/gen_islands_data/creation_of_adam_data.lua diff --git a/locale/gen_shape/grid_islands_data/crosses2_data.lua b/_locale/gen_shape/gen_islands_data/crosses2_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/crosses2_data.lua rename to _locale/gen_shape/gen_islands_data/crosses2_data.lua diff --git a/locale/gen_shape/grid_islands_data/crosses3_data.lua b/_locale/gen_shape/gen_islands_data/crosses3_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/crosses3_data.lua rename to _locale/gen_shape/gen_islands_data/crosses3_data.lua diff --git a/locale/gen_shape/grid_islands_data/crosses_data.lua b/_locale/gen_shape/gen_islands_data/crosses_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/crosses_data.lua rename to _locale/gen_shape/gen_islands_data/crosses_data.lua diff --git a/locale/gen_shape/grid_islands_data/cubes_data.lua b/_locale/gen_shape/gen_islands_data/cubes_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/cubes_data.lua rename to _locale/gen_shape/gen_islands_data/cubes_data.lua diff --git a/locale/gen_shape/grid_islands_data/darthplagueis_data.lua b/_locale/gen_shape/gen_islands_data/darthplagueis_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/darthplagueis_data.lua rename to _locale/gen_shape/gen_islands_data/darthplagueis_data.lua diff --git a/locale/gen_shape/grid_islands_data/dickbutt2_data.lua b/_locale/gen_shape/gen_islands_data/dickbutt2_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/dickbutt2_data.lua rename to _locale/gen_shape/gen_islands_data/dickbutt2_data.lua diff --git a/locale/gen_shape/grid_islands_data/dickbutt_data.lua b/_locale/gen_shape/gen_islands_data/dickbutt_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/dickbutt_data.lua rename to _locale/gen_shape/gen_islands_data/dickbutt_data.lua diff --git a/locale/gen_shape/grid_islands_data/gears_data.lua b/_locale/gen_shape/gen_islands_data/gears_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/gears_data.lua rename to _locale/gen_shape/gen_islands_data/gears_data.lua diff --git a/locale/gen_shape/grid_islands_data/goat_data.lua b/_locale/gen_shape/gen_islands_data/goat_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/goat_data.lua rename to _locale/gen_shape/gen_islands_data/goat_data.lua diff --git a/locale/gen_shape/grid_islands_data/hexes_data.lua b/_locale/gen_shape/gen_islands_data/hexes_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/hexes_data.lua rename to _locale/gen_shape/gen_islands_data/hexes_data.lua diff --git a/locale/gen_shape/grid_islands_data/lines_data.lua b/_locale/gen_shape/gen_islands_data/lines_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/lines_data.lua rename to _locale/gen_shape/gen_islands_data/lines_data.lua diff --git a/locale/gen_shape/grid_islands_data/maori_data.lua b/_locale/gen_shape/gen_islands_data/maori_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/maori_data.lua rename to _locale/gen_shape/gen_islands_data/maori_data.lua diff --git a/locale/gen_shape/grid_islands_data/mics_stuff_data.lua b/_locale/gen_shape/gen_islands_data/mics_stuff_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/mics_stuff_data.lua rename to _locale/gen_shape/gen_islands_data/mics_stuff_data.lua diff --git a/locale/gen_shape/grid_islands_data/mona_lisa_data.lua b/_locale/gen_shape/gen_islands_data/mona_lisa_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/mona_lisa_data.lua rename to _locale/gen_shape/gen_islands_data/mona_lisa_data.lua diff --git a/locale/gen_shape/grid_islands_data/poop_emoji_data.lua b/_locale/gen_shape/gen_islands_data/poop_emoji_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/poop_emoji_data.lua rename to _locale/gen_shape/gen_islands_data/poop_emoji_data.lua diff --git a/locale/gen_shape/grid_islands_data/test_data.lua b/_locale/gen_shape/gen_islands_data/test_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/test_data.lua rename to _locale/gen_shape/gen_islands_data/test_data.lua diff --git a/locale/gen_shape/grid_islands_data/void_gears_data.lua b/_locale/gen_shape/gen_islands_data/void_gears_data.lua similarity index 100% rename from locale/gen_shape/grid_islands_data/void_gears_data.lua rename to _locale/gen_shape/gen_islands_data/void_gears_data.lua diff --git a/locale/gen_combined/grilledham_map_gen/data/readme.lua b/locale/gen_combined/grilledham_map_gen/data/readme.lua new file mode 100644 index 00000000..56f96841 --- /dev/null +++ b/locale/gen_combined/grilledham_map_gen/data/readme.lua @@ -0,0 +1 @@ +-- This folder should remain blank in the repo, copy the specific file you need from the _locale folder diff --git a/locale/gen_combined/grilledham_map_gen/presets/readme.lua b/locale/gen_combined/grilledham_map_gen/presets/readme.lua new file mode 100644 index 00000000..e69de29b diff --git a/locale/gen_shape/grid_islands_data/readme.lua b/locale/gen_shape/grid_islands_data/readme.lua new file mode 100644 index 00000000..56f96841 --- /dev/null +++ b/locale/gen_shape/grid_islands_data/readme.lua @@ -0,0 +1 @@ +-- This folder should remain blank in the repo, copy the specific file you need from the _locale folder diff --git a/map_layout.lua b/map_layout.lua index fece6f47..b3c502da 100644 --- a/map_layout.lua +++ b/map_layout.lua @@ -15,6 +15,9 @@ in this file and your run_*type*_module(event) function will be called. --require "locale.gen_combined.UK" --grilledham's map gen +-- Need to copy the file you want from the _locale folder to this one for it to be included +-- only get what you need, otherwise the save file is too big! + --MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.mobius_strip" --MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.antfarm" --MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.creation_of_adam" From fda06bb6dc9fb2df155ecd345973388cacc2f34a Mon Sep 17 00:00:00 2001 From: TWLTriston Date: Wed, 22 Nov 2017 17:55:51 -0500 Subject: [PATCH 5/5] Fish market bug fix and RSO tweaks from current map --- fish_market.lua | 2 +- locale/gen_ores/rso/rso_resource_config.lua | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fish_market.lua b/fish_market.lua index 86234ed7..014701e9 100644 --- a/fish_market.lua +++ b/fish_market.lua @@ -295,7 +295,7 @@ local function boost_player_runningspeed(player) end local function reset_player_miningspeed(player) - player.character_mining_speed_modifier = global.character_mining_speed_modifier[player.index].pre_mining_boost_modifier + player.character_mining_speed_modifier = 1 global.player_mining_boost_records[player.index] = nil end diff --git a/locale/gen_ores/rso/rso_resource_config.lua b/locale/gen_ores/rso/rso_resource_config.lua index 8480845d..13ec669e 100644 --- a/locale/gen_ores/rso/rso_resource_config.lua +++ b/locale/gen_ores/rso/rso_resource_config.lua @@ -7,7 +7,7 @@ local function fillVanillaConfig() -- general spawn params allotment=100, -- how common resource is spawns_per_region={min=1, max=2}, --number of chunks - richness=18000, -- resource_ore has only one richness value - resource-liquid has min/max + richness=12000, -- resource_ore has only one richness value - resource-liquid has min/max size={min=20, max=50}, -- rough radius of area, too high value can produce square shaped areas min_amount=500, @@ -31,7 +31,7 @@ local function fillVanillaConfig() allotment=100, spawns_per_region={min=1, max=2}, - richness=16000, + richness=11000, size={min=20, max=50}, min_amount=500, @@ -53,7 +53,7 @@ local function fillVanillaConfig() spawns_per_region={min=1, max=1}, size={min=15, max=25}, - richness=13000, + richness=8000, min_amount=500, starting={richness=6000, size=20, probability=1}, @@ -71,7 +71,7 @@ local function fillVanillaConfig() allotment=60, spawns_per_region={min=1, max=1}, - richness=11000, + richness=5000, size={min=15, max=20}, min_amount=250, @@ -90,7 +90,7 @@ local function fillVanillaConfig() allotment=40, spawns_per_region={min=1, max=1}, - richness=6000, + richness=4000, size={min=10, max=15}, min_amount=500, @@ -99,10 +99,10 @@ local function fillVanillaConfig() config["crude-oil"] = { type="resource-liquid", - minimum_amount=240000, + minimum_amount=200000, allotment=70, - spawns_per_region={min=1, max=2}, - richness={min=240000, max=400000}, -- richness per resource spawn + spawns_per_region={min=1, max=1}, + richness={min=200000, max=300000}, -- richness per resource spawn size={min=5, max=20}, starting={richness=400000, size=3, probability=1},