From 1eb7663b03d4ba5c350c770bb5ab9c70e26ea4d4 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:48:18 -0400 Subject: [PATCH] Rename the new butterfly to a separate "Single Butterfly" (single_butterfly). --- .../mods/codermobs/codermobs/LICENSE | 6 +++--- .../mods/codermobs/codermobs/butterfly.lua | 11 +++++------ ...butterfly.b3d => codermobs_single_butterfly.b3d} | Bin ...tterfly1.png => codermobs_single_butterfly1.png} | Bin ...tterfly2.png => codermobs_single_butterfly2.png} | Bin ...tterfly3.png => codermobs_single_butterfly3.png} | Bin ...tterfly4.png => codermobs_single_butterfly4.png} | Bin ...y_inv.png => codermobs_single_butterfly_inv.png} | Bin 8 files changed, 8 insertions(+), 9 deletions(-) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/models/{codermobs_butterfly.b3d => codermobs_single_butterfly.b3d} (100%) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/{codermobs_butterfly1.png => codermobs_single_butterfly1.png} (100%) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/{codermobs_butterfly2.png => codermobs_single_butterfly2.png} (100%) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/{codermobs_butterfly3.png => codermobs_single_butterfly3.png} (100%) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/{codermobs_butterfly4.png => codermobs_single_butterfly4.png} (100%) rename Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/{codermobs_butterfly_inv.png => codermobs_single_butterfly_inv.png} (100%) diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/LICENSE b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/LICENSE index f40fddf..df62be3 100644 --- a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/LICENSE +++ b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/LICENSE @@ -196,18 +196,18 @@ Birds the original models. Poikilos derived new models from them and created new textures. -Butterfly (planes, x file) +Butterfly (made of planes with colorized overlays) ----------------------------- -(unused) (c) 2012 to 2019 and CC BY-SA 3.0: AspireMint. -Butterfly (redone voxel art b3d file) +Butterfly V (redone voxel art) ----------------------------- (c) 2022 and CC BY-SA 4.0: Poikilos Butterfly (voxel art) textures ----------------------------- unknown +- please submit author info to Poikilos or OldCoder Realistic Milk Bucket ----------------------------- diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/butterfly.lua b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/butterfly.lua index 6c09a11..07526e2 100644 --- a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/butterfly.lua +++ b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/butterfly.lua @@ -2,8 +2,8 @@ -- =================================================================== -local lcname = "butterfly" -local ucname = "Butterfly" +local lcname = "single_butterfly" +local ucname = "Single Butterfly" local msname = "codermobs_" .. lcname local obj_name = "codermobs:" .. lcname @@ -34,7 +34,7 @@ mobs_param = { } , add_egg = true , - egg_image = "codermobs_butterfly_inv.png" , + egg_image = msname .. "_inv.png" , } -- =================================================================== @@ -58,7 +58,7 @@ mobs_param.core_param = { hp_min = 1, hp_max = 2, armor = 100, - collisionbox = {-.5, -0.3, -.5, .5, 0.3, .5}, + collisionbox = {-.25, -0.15, -.25, .25, 0.15, .25}, visual = "mesh", mesh = msname .. ".b3d" , textures = mob_skins, @@ -71,8 +71,7 @@ mobs_param.core_param = { light_damage = 0, fall_damage = 0, view_range = 10, - blood_texture = "lott_spider_blood.png", - + blood_texture = "", animation = { -- speed_normal = 22, diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/models/codermobs_butterfly.b3d b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/models/codermobs_single_butterfly.b3d similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/models/codermobs_butterfly.b3d rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/models/codermobs_single_butterfly.b3d diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly1.png b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly1.png similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly1.png rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly1.png diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly2.png b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly2.png similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly2.png rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly2.png diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly3.png b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly3.png similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly3.png rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly3.png diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly4.png b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly4.png similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly4.png rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly4.png diff --git a/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly_inv.png b/Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly_inv.png similarity index 100% rename from Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_butterfly_inv.png rename to Bucket_Game-branches/butterfly_rearrange_patch-vs-220422-002/mods/codermobs/codermobs/textures/codermobs_single_butterfly_inv.png