0.7.4 sync

changelog.txt

@@ -1,4 +1,102 @@
 
+---------------------------------------------------------------------------------------------------
+Version: 0.7.4
+Date: 17.08.2019
+  Changes:
+    - Added more mod remote commands
+    - Added tile overrides to disable certain tiles unless otherwise enabled.
+
+---------------------------------------------------------------------------------------------------
+Version: 0.7.3
+Date: 17.08.2019
+  Changes:
+    - migration issues
+
+---------------------------------------------------------------------------------------------------
+Version: 0.7.2
+Date: 17.08.2019
+  Changes:
+    - More bug fix
+
+---------------------------------------------------------------------------------------------------
+Version: 0.7.1
+Date: 17.08.2019
+  Changes:
+    - Progress on mod compatability Alien Biomes
+
+---------------------------------------------------------------------------------------------------
+Version: 0.7.0
+Date: 17.08.2019
+  Changes:
+    - Fixed gui not updating on autowarp settings changes
+    - Added a fix to make spawn area resources spawn further away from the platform as it gets bigger (this apparently did nothing)
+
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.9
+Date: 17.08.2019
+  Changes:
+    - Mod setting for %chance of landing on selected planet
+    - Added Warp Portal item
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.8
+Date: 17.08.2019
+  Changes:
+    - Fixed a bug with the warp charge timer
+    - Fixed a bug with the planets gui dropdown
+    - Fixed missing ocean planet description
+    - Planets API tweaks
+    - Fixed player corpse between warps
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.7
+Date: 15.08.2019
+  Changes:
+    - Added fix for dropped items being lost on warp
+    - More 0.6.5 typos
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.6
+Date: 15.08.2019
+  Changes:
+    - Added missing multiplier for original map settings starting_area and water
+    - 0.6.5 typo
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.5
+Date: 15.08.2019
+  Changes:
+    - Fixed a big with picking up warp heatpipes
+    - Fixed a bug with the early boiler room water setting not working when starting a new map with it enabled (migration for this is done too)
+    - Fixed a bug with modded ores not appearing on any planets
+    - Added checks to ensure resource specific planets are not spawned if a mod is added that removes base game resources.
+    - Fixed interactions with Factorissimo2
+    - More progress on Alien Biomes compatability (trees and such should spawn now). It should only spawn nauvis-like planets currently.
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.4
+Date: 12.08.2019
+  Changes:
+    - Fixed typos in 0.6.3
+
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.3
+Date: 12.08.2019
+  Changes:
+    - Temporarily disabled loader mod detection
+    - Re-wrote the planet generator with improved mod compatability and improved api
+    - Tweaked a bunch of planet generation settings
+    - Added Uncharted planet
+
+---------------------------------------------------------------------------------------------------
+Version: 0.6.2
+Date: 12.08.2019
+  Changes:
+    - Added mod compatability: Mods that introduce new/faster loaders will replace the existing platform loaders at logistics level 4. Exception: miniloaders
+    - Prep for mod compatible planet generator update
+
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.1
 Date: 11.08.2019

data-updates.lua

@@ -1,3 +1,11 @@
+--[[
+
+Add research for mod loaders
+
+]]
+
+
+
 --[[
 
 Add emissions to all entities
@@ -80,3 +88,4 @@ for u,n in pairs(entTbl)do
 end
 --error(s)
 
+

data.lua

@@ -6,6 +6,8 @@ require("data_warptorio-logistics-pipe")
 require("data_warptorio-warpstation")
 require("data_warpnuke")
 require("data_warptorio-warploader")
+require("data_warptorio-townportal")
+--require("data_nauvis_preset")
 
 local function istable(t) return type(t)=="table" end
 local function rgb(r,g,b,a) a=a or 255 return {r=r/255,g=g/255,b=b/255,a=a/255} end
@@ -387,7 +389,7 @@ local t={type="technology",upgrade=true,icon_size=128,icons={
 	{icon="__base__/graphics/technology/nuclear-power.png",tint={r=0.3,g=0.3,b=1,a=1},priority="low"},
 	{icon="__base__/graphics/technology/atomic-bomb.png",tint={r=0.7,g=0.7,b=1,a=1},scale=0.5,shift={32,32},priority="high"}
 }, }
-ExtendTech(t,{name="warptorio-reactor-6",unit={count=100,time=90}, prerequisites={"warptorio-reactor-5","uranium-processing","robotics"}}, {red=5,black=5}) -- reactor module
+ExtendTech(t,{name="warptorio-reactor-6",unit={count=100,time=90}, effects={{recipe="warptorio-townportal",type="unlock-recipe"}},prerequisites={"warptorio-reactor-5","uranium-processing","robotics"}}, {red=5,black=5}) -- reactor module
 
 local t={type="technology",upgrade=true,icon_size=128,icons={
 	{icon="__base__/graphics/technology/nuclear-power.png",tint={r=0.3,g=0.3,b=1,a=1},priority="low"},

data_warptorio-heatpipe.lua

@@ -1325,7 +1325,7 @@ data:extend{
       max_health = 200,
       minable = {
         mining_time = 0.1,
-        result = "heat-pipe"
+        result = "warptorio-heatpipe"
       },
       minimum_glow_temperature = 350,
       name = "warptorio-heatpipe",

data_warptorio-townportal.lua

@@ -0,0 +1,47 @@
+local rtint={r=0.4,g=0.4,b=1,a=1}
+
+local rsc=1.5
+
+data:extend{
+
+{
+      capsule_action = {
+	attack_parameters={type="stream",range=0,cooldown=10,ammo_category="capsule",
+		ammo_type={action={action_deliver={target_effects={damage={amount=-10,type="physical"},type="damage"},type="instant"},type="direct"},category="capsule",target_type="position"},
+	},
+        type = "use-on-self",
+	uses_stack=true,
+      },
+      icons = {{icon="__warptorio2__/graphics/technology/earth.png",scale=1}},
+      icon_size = 128,
+      name = "warptorio-townportal",
+      order = "zz",
+      stack_size = 5,
+      subgroup = "capsule",
+      type = "capsule"
+},
+
+
+{
+      enabled = false,
+      ingredients = {
+        {
+          "advanced-circuit",
+          10
+        },
+        {
+          "grenade",
+          10
+        },
+        {
+          "radar",
+          10
+        },
+      },
+      name = "warptorio-townportal",
+      result = "warptorio-townportal",
+      type = "recipe"
+},
+
+
+}

data_warptorio-warploader.lua

@@ -9,7 +9,7 @@ data:extend{
 	},
 
 	{ name="warptorio-warploader", type="recipe",category="crafting-with-fluid",enabled=false,energy_required=2,
-		ingredients={ {"iron-gear-wheel",400},{"express-underground-belt",50},{amount=200,name="lubricant",type="fluid"} },
+		ingredients={ {"iron-gear-wheel",400},{"express-underground-belt",50},{"express-transport-belt",100},{"express-splitter",50},{amount=200,name="lubricant",type="fluid"} },
 		result="warptorio-warploader",result_count=1,
 	},
 

info.json

@@ -1,6 +1,6 @@
 {
 	"name": "warptorio2",
-	"version": "0.6.1",
+	"version": "0.7.4",
 	"title": "Warptorio",
 	"author": "Nonoce and PyroFire",
 	"dependencies": ["base >= 0.17","! NewGamePlus","! Space Exploration"],

settings.lua

@@ -23,7 +23,9 @@ data:extend(
 	allowed_values={"logistic-chest-requester","logistic-chest-buffer"},
 	},
 
-
+	{type="int-setting",name="warptorio_warpchance",order="aab3a",
+	setting_type="runtime-global",default_value=30,
+	minimum_value=1,maximum_value=100},
 
 	{type="bool-setting",name="warptorio_autowarp_always",order="aaba",
 	setting_type="runtime-global",default_value=false,},
@@ -130,10 +132,22 @@ data:extend(
 	setting_type="runtime-global",default_value=2,
 	minimum_value=1,maximum_value=30},
 
-	{type="int-setting",name="warptorio_planet_normal",order="ea",
-	setting_type="startup",default_value=23,
+
+
+	--[[ used in nauvis preset -- unused -- {type="int-setting",name="warptorio_nauvis_override",order="e1aa",
+	setting_type="startup",default_value=12,
+	minimum_value=1},]]
+
+
+	{type="int-setting",name="warptorio_planet_normal",order="eaa",
+	setting_type="startup",default_value=12,
+	minimum_value=1},
+
+	{type="int-setting",name="warptorio_planet_uncharted",order="eab",
+	setting_type="startup",default_value=12,
 	minimum_value=1},
 
+
 	{type="int-setting",name="warptorio_planet_average",order="eb",
 	setting_type="startup",default_value=17,
 	minimum_value=0},
@@ -178,5 +192,8 @@ data:extend(
 	setting_type="startup",default_value=4,
 	minimum_value=0},
 
+	--[[ {type="int-setting",name="warptorio_planet_void",order="em",
+	setting_type="startup",default_value=1,
+	minimum_value=0}, ]]
 
 })