internal restructure + French translations

.vscode/settings.json

@@ -84,6 +84,13 @@
         "gui_1_openGui",
         "gui_1_closeGUI",
         "frameflow3",
-        "serpent"
+        "serpent",
+        "add_biter_die_animation",
+        "make_unit_melee_ammo_type",
+        "biterattackanimation",
+        "biterrunanimation"
+    ],
+    "Lua.diagnostics.disable": [
+        "undefined-field"
     ]
 }

DyComPa/data/automated-edits/intermediates.lua

@@ -13,6 +13,41 @@ local Change = {
 	{Old = "inserter", New = "basic-inserter"},
 	{Old = "storage-tank", New = "storage-tank-1"},
 	{Old = "plastic-bar", New = "polycarbonate"},
+	{Old = "transport-belt", New = "transport-belt-1"},
+	{Old = "fast-transport-belt", New = "transport-belt-2"},
+	{Old = "express-transport-belt", New = "transport-belt-3"},
+	{Old = "underground-belt", New = "underground-belt-1"},
+	{Old = "fast-underground-belt", New = "underground-belt-2"},
+	{Old = "express-underground-belt", New = "underground-belt-3"},
+	{Old = "loader", New = "loader-1"},
+	{Old = "fast-loader", New = "loader-2"},
+	{Old = "express-loader", New = "loader-3"},
+	{Old = "splitter", New = "splitter-1"},
+	{Old = "fast-splitter", New = "splitter-2"},
+	{Old = "express-splitter", New = "splitter-3"},
+	{Old = "assembling-machine-1", New = "basic-assembler"},
+	{Old = "assembling-machine-2", New = "advanced-assembler"},
+	{Old = "assembling-machine-3", New = "nano-assembler"},
+	{Old = "boiler", New = "basic-boiler"},
+	{Old = "burner-mining-drill", New = "basic-burner-drill"},
+	{Old = "electric-mining-drill", New = "basic-electric-drill"},
+	{Old = "small-electric-pole", New = "basic-power-pole"},
+	{Old = "steam-engine", New = "basic-steam-engine"},
+	{Old = "radar", New = "radar-1"},
+	{Old = "lab", New = "lab-1"},
+	{Old = "pumpjack", New = "oil-extractor"},
+	{Old = "rocket-silo", New = "rocket-silo-1"},
+	{Old = "medium-electric-pole", New = "advanced-power-pole"},
+	{Old = "big-electric-pole", New = "basic-power-relay"},
+	{Old = "heat-pipe", New = "heat-pipe-fission"},
+	{Old = "nuclear-reactor", New = "reactor-fission"},
+	{Old = "car", New = "car-1"},
+	{Old = "cargo-wagon", New = "cargo-wagon-1"},
+	{Old = "fluid-wagon", New = "fluid-wagon-1"},
+	{Old = "locomotive", New = "locomotive-1"},
+	{Old = "construction-robot", New = "construction-robot-1"},
+	{Old = "logistic-robot", New = "logistic-robot-1"},
+	{Old = "roboport", New = "roboport-1"},
 	--{Old = "raw", New = "raw"},
 
 }

DyComPa/data/entity/rocks.lua

@@ -79,6 +79,12 @@ for k,v in pairs(data.raw["simple-entity"]) do
 		if v.loot then
 			v.loot = Rock_Loot_Results
 		end
+		if v.resistances then
+			local insert = {type = "exotic-energy", decrease = 0, percent = 100,}
+			table.insert(v.resistances, insert)
+		else
+			v.resistances = {{type = "exotic-energy", decrease = 0, percent = 100,}}
+		end
 	end
 end
 
@@ -96,5 +102,11 @@ for k,v in pairs(data.raw["simple-entity"]) do
 		if v.loot then
 			v.loot = Meteor_Loot_Results
 		end
+		if v.resistances then
+			local insert = {type = "exotic-energy", decrease = 0, percent = 100,}
+			table.insert(v.resistances, insert)
+		else
+			v.resistances = {{type = "exotic-energy", decrease = 0, percent = 100,}}
+		end
 	end
 end

DyComPa/data/entity/trees.lua

@@ -27,6 +27,12 @@ for k,v in pairs(data.raw.tree) do
 		{item = "exotic-partical", amount_min = 1, amount_max = 1, probability = 0.001},
 	}
 	v.localised_description = {"looped-name.tree"}
+	if v.resistances then
+		local insert = {type = "exotic-energy", decrease = 0, percent = 100,}
+		table.insert(v.resistances, insert)
+	else
+		v.resistances = {{type = "exotic-energy", decrease = 0, percent = 100,}}
+	end
 end
 
   -- wetland

DyComPa/data/entity/units.lua

@@ -29,4 +29,32 @@ for k,v in pairs(Tree_Loot_Table) do
 		}
 		table.insert(z.loot, loottable)
 	end
+	for _,z in pairs(data.raw["unit-spawner"]) do
+		if not z.loot then z.loot = {} end
+		loottable = {
+			item = v.Name,
+			probability = v.Chance,
+			count_min = 1,
+			count_max = v.Max_Count,
+		}
+		table.insert(z.loot, loottable)
+	end
+end
+
+for k,v in pairs(data.raw.unit) do
+	if v.resistances then
+		local insert = {type = "exotic-energy", decrease = 0, percent = 100,}
+		table.insert(v.resistances, insert)
+	else
+		v.resistances = {{type = "exotic-energy", decrease = 0, percent = 100,}}
+	end
+end
+
+for k,v in pairs(data.raw["unit-spawner"]) do
+	if v.resistances then
+		local insert = {type = "exotic-energy", decrease = 0, percent = 100,}
+		table.insert(v.resistances, insert)
+	else
+		v.resistances = {{type = "exotic-energy", decrease = 0, percent = 100,}}
+	end
 end

DyComPa/data/items/base.lua

@@ -25,7 +25,6 @@ data.raw.item["constant-combinator"].hidden = false
 data.raw.item["power-switch"].hidden = false
 data.raw.item["programmable-speaker"].hidden = false
 
-
 data.raw.item["red-wire"].subgroup = DyDs.."material-2"
 data.raw.item["green-wire"].subgroup = DyDs.."material-2"
 
@@ -94,7 +93,6 @@ data.raw.item["chemical-plant"].order = "3"
 data.raw.item["oil-refinery"].subgroup = DyDs.."oil-machines"
 data.raw.item["oil-refinery"].order = "2"
 
-
 data.raw.item["equipment-bot-chip-trees"].subgroup = DyDs.."equipment-qol"
 data.raw.item["equipment-bot-chip-nanointerface"].subgroup = DyDs.."equipment-qol"
 data.raw.item["equipment-bot-chip-launcher"].subgroup = DyDs.."equipment-defense"
@@ -103,14 +101,12 @@ data.raw.item["equipment-bot-chip-feeder"].subgroup = DyDs.."equipment-qol"
 data.raw.item["roboport-interface"].subgroup = DyDs.."equipment-qol"
 
 -- Capsules --
-
 data.raw.capsule["discharge-defense-remote"].subgroup = DyDs.."equipment-defense"
 data.raw.capsule["raw-fish"].subgroup = DyDs.."material-1"
 if data.raw.capsule["raw-fish"] and data.raw.capsule["raw-fish"].capsule_action and data.raw.capsule["raw-fish"].capsule_action.attack_parameters and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action.action_delivery and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action.action_delivery.target_effects and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action.action_delivery.target_effects[1] and data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action.action_delivery.target_effects[1].damage.amount then
 	data.raw.capsule["raw-fish"].capsule_action.attack_parameters.ammo_type.action.action_delivery.target_effects[1].damage.amount = 25
 end
 
-
 -- Nanobots --
 data.raw.ammo["ammo-nano-constructors"].magazine_size = 100000000000000000000000000000000
 data.raw.ammo["ammo-nano-constructors"].localised_name = {"DyDs-story.coica-1"}

DyComPa/data/tech/added-recipes.lua

@@ -285,6 +285,8 @@ local Recipes = {
 	["sulfur"] = {"intermediates-5"},
 	["sulfuric-acid"] = {"intermediates-5"},
 	["battery"] = {"intermediates-5"},
+	["cliff-explosives-1"] = {"intermediates-5"},
+	["explosives"] = {"intermediates-5"},
 	["obsidian"] = {"intermediates-5"},
 	["refined-concrete-powder"] = {"intermediates-5"},
 	["refined-concrete"] = {"intermediates-5"},

DyWorld-Dynamics/changelog.txt

@@ -1,9 +1,11 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.100
-Date: ??. 07. 2021
+Date: 30. 07. 2021
   Major Features:
     - Added in side objectives scripts for act 3,4 and 5
-    - Added in 270 tiered side objectives (random amounts are selected each different game)
+    - Added in 400 tiered side objectives (random amounts are selected each different game)
+    - Added in 10 new spawner
+    - Added in 50 new units
   Minor Features:
     - Added all remaining recipes for science packs
     - Added new GUI special for SMN (Space Mining Network)
@@ -17,6 +19,7 @@ Date: ??. 07. 2021
     - Updated some locales
     - Optimized Mining Network Script
     - Change requirement of fish research
+    - Changed spawning thresholds of enemies
   Story:
     - Story messages have been removed until revised and rewritten version comes out
     - Story messages script is now fully automated. This allows other mods to add story messages
@@ -25,12 +28,9 @@ Date: ??. 07. 2021
     - Rewrote Story scripts completely. This runs faster, allows more flexible things to happen
     - Rewrote Story Startup script. It now works of a preset database, that allows edits from other mods
     - Fixed story removed after migration
-  Survival:
-    - 
+    - Added first part of the story for Act 3
   Translations:
     - German Translation added (made by Maxi_der_ZockerYT). Still WIP
-  Other Mods:
-    - 
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.99
 Date: 20. 07. 2021

DyWorld-Dynamics/data/core/essentials/categories.lua

@@ -21,6 +21,7 @@ local Damage_Table = {
 	"nuclear", "poison", "acid", "fire", "water", 
 	"plasma", "laser", "chemical", "physical", "explosion", 
 	"impact", "sonic", "ballistic", "teleport", "radiation",
+	"exotic-energy",
 }
 
 local Recipe_Categories = {

DyWorld-Dynamics/data/core/recipes/centrifuge.lua

@@ -331,4 +331,26 @@ data:extend({
 	  enabled = false,
     },
   },
+  {
+    type = "recipe",
+    name = "cliff-explosives-1",
+	category = "centrifuging",
+	main_product = "cliff-explosives",
+    normal =
+    {
+      ingredients =
+      {
+        {type = "item", name = "charcoal", amount = 10},
+        {type = "item", name = "sulfur", amount = 1},
+        {type = "fluid", name = "light-oil", amount = 10},
+      },
+      results = 
+      {
+        {type = "item", name = "cliff-explosives", amount = 1},
+      },
+	  energy_required = 2.5,
+	  main_product = "cliff-explosives",
+	  enabled = false,
+    },
+  },
 })

DyWorld-Dynamics/data/core/templates/resistances.lua

@@ -29,4 +29,6 @@ function Resist_Tier_1(Mult)
 	  Resist("physical", 0, Round_Resist_Percent((5 * Mult), 2)),
 	}
 	return p
-end
+end
+
+

DyWorld-Dynamics/data/prefix-data.lua

@@ -133,17 +133,32 @@ Dy_Focals = {
 	},
 }
 
+local function Round(num, numDecimalPlaces)
+	local mult = 10^(numDecimalPlaces or 0)
+	return math.floor(num * mult + 0.5) / mult
+end
+
+function DySetDiffAmmo(Var)
+	if Dy_Sett.Difficulty == "Easy" then
+		return Round((Var * 1.5), 2)
+	elseif Dy_Sett.Difficulty == "Normal" then
+		return Var
+	elseif Dy_Sett.Difficulty == "Hard" then
+		return Round((Var * 0.75), 2)
+	end
+end
+
 Dy_Ammo_Mods = {
-	{Name = "bronze", Mod = 0.35, Tier = 1},
-	{Name = "tin", Mod = 0.3, Tier = 1, Dmg_T = "acid", Dmg_A = 2.5},
-	{Name = "copper", Mod = 0.75, Tier = 1},
-	{Name = "iron", Mod = 1, Tier = 2, Dmg_T = "acid", Dmg_A = 5},
-	{Name = "steel", Mod = 1.5, Tier = 2},
-	{Name = "titanium", Mod = 1.75, Tier = 3},
-	{Name = "aluminium", Mod = 1.25, Tier = 2},
-	{Name = "lead", Mod = 0.25, Tier = 3, Dmg_T = "acid", Dmg_A = 15},
-	{Name = "gold", Mod = 1.65, Tier = 3},
-	{Name = "silver", Mod = 1.45, Tier = 3},
+	{Name = "bronze", Mod = DySetDiffAmmo(0.55), Tier = 1},
+	{Name = "tin", Mod = DySetDiffAmmo(0.5), Tier = 1, Dmg_T = "acid", Dmg_A = 2.5},
+	{Name = "copper", Mod = DySetDiffAmmo(0.95), Tier = 1},
+	{Name = "iron", Mod = DySetDiffAmmo(1.2), Tier = 2, Dmg_T = "acid", Dmg_A = 5},
+	{Name = "steel", Mod = DySetDiffAmmo(1.7), Tier = 2},
+	{Name = "titanium", Mod = DySetDiffAmmo(1.95), Tier = 3},
+	{Name = "aluminium", Mod = DySetDiffAmmo(1.45), Tier = 2},
+	{Name = "lead", Mod = DySetDiffAmmo(0.45), Tier = 3, Dmg_T = "acid", Dmg_A = 15},
+	{Name = "gold", Mod = DySetDiffAmmo(1.85), Tier = 3},
+	{Name = "silver", Mod = DySetDiffAmmo(1.65), Tier = 3},
 }
 
 Dy_Exclude_Recipes = {

DyWorld-Dynamics/data/warfare/ammo/artillery-shell-atomic.lua

@@ -95,15 +95,7 @@ data:extend(
           },
           {
             type = "damage",
-            damage = {amount = 25000, type = "nuclear"}
-          },
-          {
-            type = "damage",
-            damage = {amount = 5000, type = "explosion"}
-          },
-          {
-            type = "damage",
-            damage = {amount = 10000, type = "sonic"}
+            damage = {amount = 50000, type = "exotic-energy"}
           },
           {
             type = "create-entity",
@@ -193,23 +185,15 @@ data:extend(
       },
       {
         type = "area",
-        radius = 5,
+        radius = 10,
         action_delivery =
         {
           type = "instant",
           target_effects =
 		  {
 			{
 		      type = "damage",
-			  damage = {amount = 100, type = "explosion"}
-			},
-			{
-		      type = "damage",
-			  damage = {amount = 100, type = "impact"}
-			},
-			{
-		      type = "damage",
-			  damage = {amount = 200, type = "sonic"}
+			  damage = {amount = 1000, type = "exotic-energy"}
 			},
 		  }
         }
@@ -255,28 +239,15 @@ data:extend(
       },
       {
         type = "area",
-        radius = 15,
+        radius = 25,
         action_delivery =
         {
           type = "instant",
           target_effects =
 		  {
 			{
 		      type = "damage",
-			  damage = {amount = 500, type = "explosion"}
-			},
-			{
-		      type = "damage",
-			  damage = {amount = 500, type = "impact"}
-			},
-			{
-		      type = "damage",
-			  damage = {amount = 2000, type = "nuclear"}
-			},
-			{
-			  type = "destroy-cliffs",
-			  radius = 15,
-			  explosion = "explosion"
+			  damage = {amount = 5000, type = "exotic-energy"}
 			},
 		  }
         }

DyWorld-Dynamics/data/warfare/data.lua

@@ -8,6 +8,9 @@ require(DyDs_data_warfare.. "ammo.beam")
 require(DyDs_data_warfare.. "armor.basic")
 require(DyDs_data_warfare.. "armor.advanced")
 
+-- Enemies --
+require(DyDs_data_warfare.. "enemies.setup")
+
 -- Gun --
 require(DyDs_data_warfare.. "gun.pistol")
 require(DyDs_data_warfare.. "gun.smg")