diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 2f99c1f..9c81d4a 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -150,7 +150,6 @@ wood-logistics=Slow but automatic transportation of goods. tree-seeding=[entity=burner-agricultural-tower] allows planting seeds into seedable soil. Planted seeds grow into trees that can be harvested.\n[entity=tree-plant] can grow on grass and dirt. [entity=gold-stromatolite] can grow on [tile=natural-gold-soil]. active-noise-cancelling=Helps handling noise. quality-assembler=High-end assembler to craft only the finest quality machines using a special resource only found on Lignumis. -automation-science-pack=Leave Lignumis to enable advanced technology research. [modifier-description] basic-gun-turret-attack-bonus=Basic gun turret damage: +__1__ @@ -186,6 +185,5 @@ quality-catalyst=Quality catalyst [lignumis] start-new-game=Lignumis is meant to be played in a fresh game as it extends the early game before Nauvis. provisional-rocket-silo-button=Escape to Nauvis -provisional-rocket-silo-button-tooltip-inventory=Your personal inventory must be empty! -provisional-rocket-silo-button-tooltip-nauvis=You don't know yet where to go! +provisional-rocket-silo-button-tooltip=Your personal inventory must be empty! provisional-rocket-silo-description=Fill the rocket inventory and launch the rocket to escape to Nauvis.\nBe sure to take material to jumpstart your iron, copper and wood production. diff --git a/lignumis/prototypes/content/technology.lua b/lignumis/prototypes/content/technology.lua index 49b5258..d875637 100644 --- a/lignumis/prototypes/content/technology.lua +++ b/lignumis/prototypes/content/technology.lua @@ -134,9 +134,13 @@ if not mods["planet-picker"] then } }, prerequisites = { "planet-discovery-nauvis" }, - research_trigger = { - type = "mine-entity", - entity = "iron-ore" + unit = { + count = 50, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 15 } }, { @@ -156,9 +160,13 @@ if not mods["planet-picker"] then } }, prerequisites = { "planet-discovery-nauvis" }, - research_trigger = { - type = "mine-entity", - entity = "copper-ore" + unit = { + count = 50, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 15 } } }) diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index a815fd4..d3c89f2 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -145,20 +145,40 @@ end if not mods["planet-picker"] then local automation_science_pack_technology = data.raw.technology["automation-science-pack"] - automation_science_pack_technology.enabled = false - automation_science_pack_technology.visible_when_disabled = true + automation_science_pack_technology.prerequisites = { "planet-discovery-nauvis" } automation_science_pack_technology.research_trigger = nil automation_science_pack_technology.unit = { - count = 1, - ingredients = {}, - time = 1 + count = 100, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 30 } local electronics_technology = data.raw.technology["electronics"] electronics_technology.prerequisites = { "copper-processing" } + electronics_technology.research_trigger = nil + electronics_technology.unit = { + count = 50, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 15 + } local steam_power_technology = data.raw.technology["steam-power"] steam_power_technology.prerequisites = { "iron-processing" } + steam_power_technology.research_trigger = nil + steam_power_technology.unit = { + count = 50, + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 15 + } local automation_technology = data.raw.technology["automation"] automation_technology.ignore_tech_cost_multiplier = false @@ -197,7 +217,7 @@ if not mods["planet-picker"] then } local robots_speed_technology_3 = data.raw.technology["worker-robots-speed-3"] - robots_speed_technology_3.prerequisites = { "robotics", "chemical-science-pack" } + robots_speed_technology_3.prerequisites = { "worker-robots-speed-2", "chemical-science-pack" } robots_speed_technology_3.unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { "chemical-science-pack", 1 } }, @@ -240,7 +260,7 @@ if not mods["planet-picker"] then weapon_speed_technology_2.unit.ingredients = table.deepcopy(physical_damage_technology_2.unit.ingredients) local physical_damage_technology_3 = data.raw.technology["physical-projectile-damage-3"] - physical_damage_technology_3.prerequisites = { "military-2", "logistic-science-pack" } + physical_damage_technology_3.prerequisites = { "physical-projectile-damage-2", "logistic-science-pack" } physical_damage_technology_3.unit.ingredients = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } } table.insert(physical_damage_technology_3.effects, { type = "turret-attack", @@ -249,7 +269,7 @@ if not mods["planet-picker"] then }) local weapon_speed_technology_3 = data.raw.technology["weapon-shooting-speed-3"] - weapon_speed_technology_3.prerequisites = { "military-2", "logistic-science-pack" } + weapon_speed_technology_3.prerequisites = { "weapon-shooting-speed-2", "logistic-science-pack" } weapon_speed_technology_3.unit.ingredients = table.deepcopy(physical_damage_technology_3.unit.ingredients) local physical_damage_technology_4 = data.raw.technology["physical-projectile-damage-4"] diff --git a/lignumis/scripts/init.lua b/lignumis/scripts/init.lua index 344edce..7f49ab6 100644 --- a/lignumis/scripts/init.lua +++ b/lignumis/scripts/init.lua @@ -91,14 +91,6 @@ Init.events[defines.events.on_player_changed_surface] = function(event) if player and player.surface.name == "nauvis" then storage.nauvis_visited = true end - - if player and player.surface.name ~= "lignumis" and player.force then - local automation = player.force.technologies["automation-science-pack"] - if not automation.researched then - automation.enabled = true - automation.researched = true - end - end end diff --git a/lignumis/scripts/wooden-rocket-silo.lua b/lignumis/scripts/wooden-rocket-silo.lua index 0693d13..1d0f6bd 100644 --- a/lignumis/scripts/wooden-rocket-silo.lua +++ b/lignumis/scripts/wooden-rocket-silo.lua @@ -15,16 +15,11 @@ local function build_gui(player, rocket_silo) local launch_button = { type = "button", name = "provisional-rocket-silo-launch-button", caption = { "lignumis.provisional-rocket-silo-button" } } local inventory = player.get_main_inventory() - local is_inventory_empty = inventory.is_empty() - local is_nauvis_researched = player.force.technologies["planet-discovery-nauvis"].researched - launch_button.enabled = is_inventory_empty and is_nauvis_researched - if not is_inventory_empty then - launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip-inventory" } - elseif not is_nauvis_researched then - launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip-nauvis" } + launch_button.enabled = inventory.is_empty() + if not launch_button.enabled then + launch_button.tooltip = { "lignumis.provisional-rocket-silo-button-tooltip" } end - storage.rocket_silo_guis = storage.rocket_silo_guis or {} storage.rocket_silo_guis[player.index] = { fake_silo = rocket_silo,