diff --git a/Bio_Industries_2/control.lua b/Bio_Industries_2/control.lua index 5c967f0..10e9a26 100644 --- a/Bio_Industries_2/control.lua +++ b/Bio_Industries_2/control.lua @@ -20,10 +20,6 @@ require("control_tree") require("control_arboretum") ----************** Used for Testing ----- ---require ("Test_Spawn") ----************* - local function Create_dummy_force() -- Create dummy force for musk floor if electric grid overlay should NOT be shown in map view diff --git a/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-E.png new file mode 100644 index 0000000..5be2a22 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-E.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-S.png new file mode 100644 index 0000000..d85618b Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-S.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-W.png new file mode 100644 index 0000000..4857a0d Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/assembling-machine-3-pipe-W.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_light.png b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_light.png new file mode 100644 index 0000000..c3109ec Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_light.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_trees.png b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_trees.png new file mode 100644 index 0000000..47f7a54 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_anim_trees.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_shadow.png b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_shadow.png new file mode 100644 index 0000000..139b8f4 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png b/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png deleted file mode 100644 index ef39292..0000000 Binary files a/Bio_Industries_2/graphics/entities/biogarden/bio_garden_x.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-E.png b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-E.png new file mode 100644 index 0000000..fb37d17 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-E.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-S.png b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-S.png new file mode 100644 index 0000000..1c4090b Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-S.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-W.png b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-W.png new file mode 100644 index 0000000..d84143f Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr-assembling-machine-3-pipe-W.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_light.png b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_light.png new file mode 100644 index 0000000..afb0011 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_light.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_trees.png b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_trees.png new file mode 100644 index 0000000..dac23e6 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_anim_trees.png differ diff --git a/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_shadow.png b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_shadow.png new file mode 100644 index 0000000..f5ec862 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/biogarden/hr_bio_garden_shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png b/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png deleted file mode 100644 index 765f841..0000000 Binary files a/Bio_Industries_2/graphics/entities/cokery/cokery-idle.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery_anim.png b/Bio_Industries_2/graphics/entities/cokery/cokery_anim.png new file mode 100644 index 0000000..6af3c6b Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/cokery_anim.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery_idle.png b/Bio_Industries_2/graphics/entities/cokery/cokery_idle.png new file mode 100644 index 0000000..924fd81 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/cokery_idle.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery_shadow.png b/Bio_Industries_2/graphics/entities/cokery/cokery_shadow.png new file mode 100644 index 0000000..143db48 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/cokery_shadow.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png b/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png deleted file mode 100644 index baf2200..0000000 Binary files a/Bio_Industries_2/graphics/entities/cokery/cokery_sheet.png and /dev/null differ diff --git a/Bio_Industries_2/graphics/entities/cokery/hr_cokery_anim.png b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_anim.png new file mode 100644 index 0000000..42c4caa Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_anim.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/hr_cokery_idle.png b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_idle.png new file mode 100644 index 0000000..c998e23 Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_idle.png differ diff --git a/Bio_Industries_2/graphics/entities/cokery/hr_cokery_shadow.png b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_shadow.png new file mode 100644 index 0000000..374995e Binary files /dev/null and b/Bio_Industries_2/graphics/entities/cokery/hr_cokery_shadow.png differ diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua index 1003a95..7a65148 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua @@ -336,16 +336,32 @@ data:extend({ allowed_effects = { "consumption", "speed", "pollution" }, graphics_set = { animation = { - filename = "__Bio_Industries_2__/graphics/entities/cokery/cokery_sheet.png", - frame_count = 28, - line_length = 7, - width = 256, - height = 256, - scale = 0.5, - shift = { 0.5, -0.5 }, - animation_speed = 0.1 - }, - }, + + filename = "__Bio_Industries_2__/graphics/entities/cokery/hr_cokery_anim.png", + priority="high", + width = 256, + height = 256, + frame_count = 16, + line_length = 8, + shift = { 0.5, -0.5 }, + animation_speed = 0.1, + scale = 0.5, + + }, + + shadow = + { + filename = "__Bio_Industries_2__/graphics/entities/biogarden/hr_cokery_shadow.png", + frame_count = 1, + direction_count = 1, + width = 334, + height = 126, + scale = 0.5, + draw_as_shadow = true, + shift = { 1.5, -0.5 }, + }, + + }, crafting_categories = { "biofarm-mod-smelting" }, energy_source = { type = "electric", diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua index fa16456..95ffca0 100644 --- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua +++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua @@ -38,15 +38,31 @@ data:extend({ fluid_boxes_off_when_no_fluid_recipe = true, graphics_set = { animation = { - filename = "__Bio_Industries_2__/graphics/entities/biogarden/bio_garden_x.png", - width = 160, - height = 160, - frame_count = 12, - line_length = 4, + + + filename = "__Bio_Industries_2__/graphics/entities/biogarden/hr_bio_garden_anim_trees.png", + width = 256, + height = 320, + frame_count = 20, + line_length = 5, animation_speed = 0.025, - shift = { 0.45, 0 } - }, - }, + scale = 0.5, + shift = { 0, -0.5 } + + }, + shadow = + { + filename = "__Bio_Industries_2__/graphics/entities/biogarden/hr_bio_garden_shadow.png", + frame_count = 1, + direction_count = 1, + width = 384, + height = 320, + draw_as_shadow = true, + scale = 0.5, + shift = { 0.5, -0.5 } + }, + + }, open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 }, close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, working_sound = {