forked from cacklingfiend/lignumis
		
	Replace util.copy with table.deepcopy
This commit is contained in:
		
							parent
							
								
									d50fdf0fc8
								
							
						
					
					
						commit
						c1fb162122
					
				
					 12 changed files with 25 additions and 25 deletions
				
			
		|  | @ -62,7 +62,7 @@ script.on_event(e.on_player_created, function(event) | ||||||
|         local debris_items = { ["lumber"] = 8 } |         local debris_items = { ["lumber"] = 8 } | ||||||
| 
 | 
 | ||||||
|         surface.daytime = 0.7 |         surface.daytime = 0.7 | ||||||
|         crash_site.create_crash_site(surface, { -5, -6 }, ship_items, debris_items, util.copy(storage.crashed_ship_parts)) |         crash_site.create_crash_site(surface, { -5, -6 }, ship_items, debris_items, table.deepcopy(storage.crashed_ship_parts)) | ||||||
|         util.remove_safe(player, storage.crashed_ship_items) |         util.remove_safe(player, storage.crashed_ship_items) | ||||||
|         util.remove_safe(player, storage.crashed_debris_items) |         util.remove_safe(player, storage.crashed_debris_items) | ||||||
|         player.get_main_inventory().sort_and_merge() |         player.get_main_inventory().sort_and_merge() | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| local item_tints = require("__base__.prototypes.item-tints") | local item_tints = require("__base__.prototypes.item-tints") | ||||||
| 
 | 
 | ||||||
| local function robot(color) | local function robot(color) | ||||||
|     local result = util.copy(data.raw["construction-robot"]["construction-robot"]) |     local result = table.deepcopy(data.raw["construction-robot"]["construction-robot"]) | ||||||
|     result.name = "basic-construction-robot-" .. color |     result.name = "basic-construction-robot-" .. color | ||||||
|     result.icon = "__lignumis__/graphics/icons/basic-construction-robot-" .. color .. ".png" |     result.icon = "__lignumis__/graphics/icons/basic-construction-robot-" .. color .. ".png" | ||||||
|     result.minable.result = "basic-construction-robot-" .. color |     result.minable.result = "basic-construction-robot-" .. color | ||||||
|  | @ -115,7 +115,7 @@ local function generator_recipe(color, ingredients) | ||||||
| end | end | ||||||
| 
 | 
 | ||||||
| local function roboport(color) | local function roboport(color) | ||||||
|     local result = util.copy(data.raw["roboport-equipment"]["personal-roboport-equipment"]) |     local result = table.deepcopy(data.raw["roboport-equipment"]["personal-roboport-equipment"]) | ||||||
|     result.name = "basic-personal-roboport-equipment-" .. color |     result.name = "basic-personal-roboport-equipment-" .. color | ||||||
|     result.take_result = "basic-personal-roboport-equipment-" .. color |     result.take_result = "basic-personal-roboport-equipment-" .. color | ||||||
|     result.sprite.filename = "__lignumis__/graphics/equipment/basic-personal-roboport-equipment-" .. color .. ".png" |     result.sprite.filename = "__lignumis__/graphics/equipment/basic-personal-roboport-equipment-" .. color .. ".png" | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local agricultural_tower = util.copy(data.raw["agricultural-tower"]["agricultural-tower"]) | local agricultural_tower = table.deepcopy(data.raw["agricultural-tower"]["agricultural-tower"]) | ||||||
| agricultural_tower.name = "burner-agricultural-tower" | agricultural_tower.name = "burner-agricultural-tower" | ||||||
| agricultural_tower.minable.result = "burner-agricultural-tower" | agricultural_tower.minable.result = "burner-agricultural-tower" | ||||||
| agricultural_tower.next_upgrade = "agricultural-tower" | agricultural_tower.next_upgrade = "agricultural-tower" | ||||||
|  | @ -43,7 +43,7 @@ crane.speed = { | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| local remnants = util.copy(data.raw["corpse"]["agricultural-tower-remnants"]) | local remnants = table.deepcopy(data.raw["corpse"]["agricultural-tower-remnants"]) | ||||||
| remnants.name = "burner-agricultural-tower-remnants" | remnants.name = "burner-agricultural-tower-remnants" | ||||||
| remnants.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" | remnants.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" | ||||||
| remnants.animation.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-remnants.png" | remnants.animation.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-remnants.png" | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local assembling_machine = util.copy(data.raw["assembling-machine"]["assembling-machine-1"]) | local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"]) | ||||||
| assembling_machine.name = "burner-assembling-machine" | assembling_machine.name = "burner-assembling-machine" | ||||||
| assembling_machine.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" | assembling_machine.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" | ||||||
| assembling_machine.minable.result = "burner-assembling-machine" | assembling_machine.minable.result = "burner-assembling-machine" | ||||||
|  | @ -36,7 +36,7 @@ assembling_machine.energy_source = { | ||||||
| } | } | ||||||
| assembling_machine.energy_usage = "75kW" | assembling_machine.energy_usage = "75kW" | ||||||
| 
 | 
 | ||||||
| local remnants = util.copy(data.raw["corpse"]["assembling-machine-1-remnants"]) | local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"]) | ||||||
| remnants.name = "burner-assembling-machine-remnants" | remnants.name = "burner-assembling-machine-remnants" | ||||||
| remnants.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" | remnants.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png" | ||||||
| remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png" | remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png" | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local long_handed_inserter = util.copy(data.raw["inserter"]["long-handed-inserter"]) | local long_handed_inserter = table.deepcopy(data.raw["inserter"]["long-handed-inserter"]) | ||||||
| long_handed_inserter.name = "burner-long-handed-inserter" | long_handed_inserter.name = "burner-long-handed-inserter" | ||||||
| long_handed_inserter.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" | long_handed_inserter.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" | ||||||
| long_handed_inserter.minable.result = "burner-long-handed-inserter" | long_handed_inserter.minable.result = "burner-long-handed-inserter" | ||||||
|  | @ -32,7 +32,7 @@ long_handed_inserter.energy_source = { | ||||||
| long_handed_inserter.extension_speed = 0.035 | long_handed_inserter.extension_speed = 0.035 | ||||||
| long_handed_inserter.rotation_speed = 0.014 | long_handed_inserter.rotation_speed = 0.014 | ||||||
| 
 | 
 | ||||||
| local remnants = util.copy(data.raw["corpse"]["long-handed-inserter-remnants"]) | local remnants = table.deepcopy(data.raw["corpse"]["long-handed-inserter-remnants"]) | ||||||
| remnants.name = "burner-long-handed-inserter-remnants" | remnants.name = "burner-long-handed-inserter-remnants" | ||||||
| remnants.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" | remnants.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png" | ||||||
| remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" | remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png" | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local furnace = util.copy(data.raw.furnace["stone-furnace"]) | local furnace = table.deepcopy(data.raw.furnace["stone-furnace"]) | ||||||
| furnace.name = "desiccation-furnace" | furnace.name = "desiccation-furnace" | ||||||
| furnace.fluid_boxes = { | furnace.fluid_boxes = { | ||||||
|     { |     { | ||||||
|  |  | ||||||
|  | @ -36,7 +36,7 @@ function make_rotated_animation_variations_from_sheet(variation_count, sheet) -- | ||||||
|     return result |     return result | ||||||
| end | end | ||||||
| 
 | 
 | ||||||
| local pipe = util.copy(data.raw.pipe["pipe"]) | local pipe = table.deepcopy(data.raw.pipe["pipe"]) | ||||||
| pipe.name = "gold-pipe" | pipe.name = "gold-pipe" | ||||||
| pipe.icon = "__lignumis__/graphics/icons/gold-pipe.png" | pipe.icon = "__lignumis__/graphics/icons/gold-pipe.png" | ||||||
| pipe.corpse = "gold-pipe-remnants" | pipe.corpse = "gold-pipe-remnants" | ||||||
|  | @ -120,7 +120,7 @@ local pipe_remnants = { | ||||||
|     }) |     }) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| local pipe_to_ground = util.copy(data.raw["pipe-to-ground"]["pipe-to-ground"]) | local pipe_to_ground = table.deepcopy(data.raw["pipe-to-ground"]["pipe-to-ground"]) | ||||||
| pipe_to_ground.name = "gold-pipe-to-ground" | pipe_to_ground.name = "gold-pipe-to-ground" | ||||||
| pipe_to_ground.icon = "__lignumis__/graphics/icons/gold-pipe-to-ground.png" | pipe_to_ground.icon = "__lignumis__/graphics/icons/gold-pipe-to-ground.png" | ||||||
| pipe_to_ground.corpse = "gold-pipe-to-ground-remnants" | pipe_to_ground.corpse = "gold-pipe-to-ground-remnants" | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") | local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local stromatolite = util.copy(data.raw["simple-entity"]["copper-stromatolite"]) | local stromatolite = table.deepcopy(data.raw["simple-entity"]["copper-stromatolite"]) | ||||||
| stromatolite.name = "gold-stromatolite" | stromatolite.name = "gold-stromatolite" | ||||||
| stromatolite.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" | stromatolite.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" | ||||||
| stromatolite.autoplace = { | stromatolite.autoplace = { | ||||||
|  | @ -8,7 +8,7 @@ stromatolite.autoplace = { | ||||||
|     "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/8, output_scale = 1/3}", |     "basis_noise{x = x, y = y, seed0 = map_seed, seed1 = 2000000, input_scale = 1/8, output_scale = 1/3}", | ||||||
|     tile_restriction = { "natural-gold-soil" } |     tile_restriction = { "natural-gold-soil" } | ||||||
| } | } | ||||||
| stromatolite.collision_mask = util.copy(data.raw["plant"]["tree-plant"].collision_mask) | stromatolite.collision_mask = table.deepcopy(data.raw["plant"]["tree-plant"].collision_mask) | ||||||
| stromatolite.mining_time = 2 | stromatolite.mining_time = 2 | ||||||
| stromatolite.minable.results = { | stromatolite.minable.results = { | ||||||
|     { type = "item", name = "gold-ore",               amount_min = 1, amount_max = 7 }, |     { type = "item", name = "gold-ore",               amount_min = 1, amount_max = 7 }, | ||||||
|  | @ -132,7 +132,7 @@ stromatolite.pictures = { | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| local plant = util.copy(data.raw["plant"]["tree-plant"]) | local plant = table.deepcopy(data.raw["plant"]["tree-plant"]) | ||||||
| plant.name = "gold-stromatolite-plant" | plant.name = "gold-stromatolite-plant" | ||||||
| plant.localised_name = { "entity-name.gold-stromatolite-plant" } | plant.localised_name = { "entity-name.gold-stromatolite-plant" } | ||||||
| plant.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" | plant.icon = "__lignumis__/graphics/icons/gold-stromatolite.png" | ||||||
|  | @ -156,7 +156,7 @@ plant.variation_weights = nil | ||||||
| plant.collision_box = { { -0.5, -0.5 }, { 0.5, 0.5 } } | plant.collision_box = { { -0.5, -0.5 }, { 0.5, 0.5 } } | ||||||
| plant.selection_box = { { -0.7, -0.7 }, { 0.7, 0.7 } } | plant.selection_box = { { -0.7, -0.7 }, { 0.7, 0.7 } } | ||||||
| plant.remains_when_mined = nil | plant.remains_when_mined = nil | ||||||
| plant.pictures = util.copy(stromatolite.pictures) | plant.pictures = table.deepcopy(stromatolite.pictures) | ||||||
| plant.autoplace = { | plant.autoplace = { | ||||||
|     probability_expression = "0", |     probability_expression = "0", | ||||||
|     tile_restriction = { "natural-gold-soil" } |     tile_restriction = { "natural-gold-soil" } | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local assembling_machine = util.copy(data.raw["assembling-machine"]["assembling-machine-2"]) | local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"]) | ||||||
| assembling_machine.name = "steam-assembling-machine" | assembling_machine.name = "steam-assembling-machine" | ||||||
| assembling_machine.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" | assembling_machine.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" | ||||||
| assembling_machine.minable.result = "steam-assembling-machine" | assembling_machine.minable.result = "steam-assembling-machine" | ||||||
|  | @ -8,7 +8,7 @@ assembling_machine.next_upgrade = "assembling-machine-1" | ||||||
| assembling_machine.module_slots = nil | assembling_machine.module_slots = nil | ||||||
| assembling_machine.corpses = "steam-assembling-machine-remnants" | assembling_machine.corpses = "steam-assembling-machine-remnants" | ||||||
| assembling_machine.resistances = nil | assembling_machine.resistances = nil | ||||||
| assembling_machine.graphics_set = util.copy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set) | assembling_machine.graphics_set = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set) | ||||||
| assembling_machine.graphics_set.animation.layers[1].filename = | assembling_machine.graphics_set.animation.layers[1].filename = | ||||||
| "__lignumis__/graphics/entity/steam-assembling-machine.png" | "__lignumis__/graphics/entity/steam-assembling-machine.png" | ||||||
| assembling_machine.crafting_categories = { | assembling_machine.crafting_categories = { | ||||||
|  | @ -40,7 +40,7 @@ assembling_machine.energy_source = { | ||||||
|     } |     } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| local remnants = util.copy(data.raw["corpse"]["assembling-machine-1-remnants"]) | local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"]) | ||||||
| remnants.name = "steam-assembling-machine-remnants" | remnants.name = "steam-assembling-machine-remnants" | ||||||
| remnants.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" | remnants.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" | ||||||
| remnants.animation[1].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png" | remnants.animation[1].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png" | ||||||
|  |  | ||||||
|  | @ -13,7 +13,7 @@ data:extend({ | ||||||
|         dying_explosion = "lab-explosion", |         dying_explosion = "lab-explosion", | ||||||
|         collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, |         collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, | ||||||
|         selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, |         selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, | ||||||
|         damaged_trigger_effect = util.copy(data.raw.lab["lab"].damaged_trigger_effect), |         damaged_trigger_effect = table.deepcopy(data.raw.lab["lab"].damaged_trigger_effect), | ||||||
|         on_animation = { |         on_animation = { | ||||||
|             layers = { |             layers = { | ||||||
|                 { |                 { | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| local item_sounds = require("__base__.prototypes.item_sounds") | local item_sounds = require("__base__.prototypes.item_sounds") | ||||||
| 
 | 
 | ||||||
| local silo = util.copy(data.raw["rocket-silo"]["rocket-silo"]) | local silo = table.deepcopy(data.raw["rocket-silo"]["rocket-silo"]) | ||||||
| silo.name = "provisional-rocket-silo" | silo.name = "provisional-rocket-silo" | ||||||
| silo.module_slots = 0 | silo.module_slots = 0 | ||||||
| silo.allowed_effects = { "consumption", "pollution" } | silo.allowed_effects = { "consumption", "pollution" } | ||||||
|  | @ -45,13 +45,13 @@ silo.launch_to_space_platforms = false | ||||||
| silo.rocket_parts_storage_cap = 50 | silo.rocket_parts_storage_cap = 50 | ||||||
| silo.to_be_inserted_to_rocket_inventory_size = 1 | silo.to_be_inserted_to_rocket_inventory_size = 1 | ||||||
| 
 | 
 | ||||||
| local silo_item = util.copy(data.raw["item"]["rocket-silo"]) | local silo_item = table.deepcopy(data.raw["item"]["rocket-silo"]) | ||||||
| silo_item.name = "provisional-rocket-silo" | silo_item.name = "provisional-rocket-silo" | ||||||
| silo_item.order = "0[provisional-rocket-silo]" | silo_item.order = "0[provisional-rocket-silo]" | ||||||
| silo_item.place_result = "provisional-rocket-silo" | silo_item.place_result = "provisional-rocket-silo" | ||||||
| silo_item.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" | silo_item.icon = "__lignumis__/graphics/icons/provisional-rocket-silo.png" | ||||||
| 
 | 
 | ||||||
| local silo_recipe = util.copy(data.raw["recipe"]["rocket-silo"]) | local silo_recipe = table.deepcopy(data.raw["recipe"]["rocket-silo"]) | ||||||
| silo_recipe.name = "provisional-rocket-silo" | silo_recipe.name = "provisional-rocket-silo" | ||||||
| silo_recipe.results[1].name = "provisional-rocket-silo" | silo_recipe.results[1].name = "provisional-rocket-silo" | ||||||
| silo_recipe.ingredients = { | silo_recipe.ingredients = { | ||||||
|  | @ -62,7 +62,7 @@ silo_recipe.ingredients = { | ||||||
|     { type = "item", name = "gold-cable",        amount = 100 } |     { type = "item", name = "gold-cable",        amount = 100 } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| local rocket = util.copy(data.raw["rocket-silo-rocket"]["rocket-silo-rocket"]) | local rocket = table.deepcopy(data.raw["rocket-silo-rocket"]["rocket-silo-rocket"]) | ||||||
| rocket.name = "provisional-rocket" | rocket.name = "provisional-rocket" | ||||||
| rocket.rising_speed = 1 / (14 * 60) | rocket.rising_speed = 1 / (14 * 60) | ||||||
| rocket.engine_starting_speed = 1 / (11 * 60) | rocket.engine_starting_speed = 1 / (11 * 60) | ||||||
|  |  | ||||||
|  | @ -28,7 +28,7 @@ local function travel_to_nauvis() | ||||||
|     local crashed_ship_parts = remote.call("freeplay", "get_ship_parts") |     local crashed_ship_parts = remote.call("freeplay", "get_ship_parts") | ||||||
| 
 | 
 | ||||||
|     nauvis.daytime = 0.7 |     nauvis.daytime = 0.7 | ||||||
|     crash_site.create_crash_site(nauvis, { -5, -6 }, ship_items, debris_items, util.copy(crashed_ship_parts)) |     crash_site.create_crash_site(nauvis, { -5, -6 }, ship_items, debris_items, table.deepcopy(crashed_ship_parts)) | ||||||
| end | end | ||||||
| 
 | 
 | ||||||
| script.on_event(e.on_rocket_launched, function(event) | script.on_event(e.on_rocket_launched, function(event) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Simon Brodtmann
						Simon Brodtmann