Merge pull request #8 from aonkeeper4/reskinnable-nonreturnkevins

Reskinnable non-return kevins

Author: bigkahuna443

Code/Entities/NonReturnCrushBlock.cs

@@ -682,7 +682,7 @@ private IEnumerator AttackSequence()
             }, Alarm.AlarmMode.Oneshot);
             this.crushDir = Vector2.Zero;
             this.TurnOffImages();
-            this.face.Play("hurt", false, false);
+            yield return this.face.PlayRoutine("hurt", false);
             this.face.Play("idle", false, false);
             yield break;
         }

Loenn/entities/nonReturnKevin.lua

@@ -1,6 +1,7 @@
 local drawableNPatch = require("structs.drawable_nine_patch")
 local drawableRectangle = require("structs.drawable_rectangle")
 local drawableSprite = require("structs.drawable_sprite")
+local utils = require("utils")
 
 local axisOptions = {
     Both = "both",
@@ -12,11 +13,14 @@ local nonReturnKevin = {}
 
 nonReturnKevin.name = "CherryHelper/NonReturnKevin"
 nonReturnKevin.depth = 0
-nonReturnKevin.minimumSize = {24, 24}
+nonReturnKevin.minimumSize = { 24, 24 }
 nonReturnKevin.fieldInformation = {
     axes = {
         options = axisOptions,
         editable = false
+    },
+    fillColor = {
+        fieldType = "color",
     }
 }
 nonReturnKevin.placements = {}
@@ -47,70 +51,77 @@ for _, axis in pairs(axisOptions) do
     })
 end
 
-local frameTextures = {
-    none = "objects/crushblock/block00",
-    horizontal = "objects/crushblock/block01",
-    vertical = "objects/crushblock/block02",
-    both = "objects/crushblock/block03"
-}
+for _, axis in pairs(axisOptions) do
+    table.insert(nonReturnKevin.placements, {
+        name = "reskinnable" .. axis,
+        data = {
+            width = 24,
+            height = 24,
+            axes = axis,
+            altTexture = true,
+            spriteDirectory = "objects/noReturnKevin",
+            fillColor = "242262",
+            chillout = false
+        }
+    })
+end
 
-local altFrameTextures = {
-    none = "objects/noReturnKevin/block00",
-    horizontal = "objects/noReturnKevin/block01",
-    vertical = "objects/noReturnKevin/block02",
-    both = "objects/noReturnKevin/block03"
+local frameTextures = {
+    none = "/block00",
+    horizontal = "/block01",
+    vertical = "/block02",
+    both = "/block03"
 }
 
 local nPatchOptions = {
     mode = "border",
     borderMode = "repeat"
 }
 
-local kevinColor = {98 / 255, 34 / 255, 43 / 255}
-local smallFaceTexture = "objects/crushblock/idle_face"
-local giantFaceTexture = "objects/crushblock/giant_block00"
+local function isempty(s)
+    return s == nil or s == ""
+end
 
-local altKevinColor = {36 / 255, 34 / 255, 98 / 255}
-local altSmallFaceTexture = "objects/noReturnKevin/idle_face"
-local altGiantFaceTexture = "objects/noReturnKevin/giant_block00"
+local function getBlockStyle(entity)
+    local entitySpriteDir = entity.altTexture
+        and (isempty(entity.spriteDirectory) and "objects/noReturnKevin" or entity.spriteDirectory)
+        or "objects/crushblock"
+    local frameTexture = entitySpriteDir .. frameTextures[entity.axes or "both"]
+    local smallFaceTexture = entitySpriteDir .. "/idle_face"
+    local giantFaceTexture = entitySpriteDir .. "/giant_block00"
+    local fillColor = entity.altTexture
+        and (isempty(entity.fillColor) and { 36 / 255, 34 / 255, 98 / 255 } or utils.getColor(entity.fillColor))
+        or { 98 / 255, 34 / 255, 43 / 255 }
+
+    return {
+        spriteDir = entitySpriteDir,
+        frameTexture = frameTexture,
+        smallFaceTexture = smallFaceTexture,
+        giantFaceTexture = giantFaceTexture,
+        fillColor = fillColor
+    }
+end
 
 function nonReturnKevin.sprite(room, entity)
-    local altTexture = entity.altTexture or false
+    local blockStyle = getBlockStyle(entity)
 
     local x, y = entity.x or 0, entity.y or 0
     local width, height = entity.width or 24, entity.height or 24
 
-    local axes = entity.axes or "both"
     local chillout = entity.chillout
-
     local giant = height >= 48 and width >= 48 and chillout
 
-    local faceTexture = giant and giantFaceTexture or smallFaceTexture
-    if altTexture then
-        faceTexture = giant and altGiantFaceTexture or altSmallFaceTexture
-    end
-
-    local frameTexture = frameTextures[axes] or frameTextures["both"]
-    if altTexture then
-        frameTexture = altFrameTextures[axes] or altFrameTextures["both"]
-    end
-
-    local ninePatch = drawableNPatch.fromTexture(frameTexture, nPatchOptions, x, y, width, height)
-
-    local rectangle = drawableRectangle.fromRectangle("fill", x + 2, y + 2, width - 4, height - 4, kevinColor)
-    if altTexture then
-        rectangle = drawableRectangle.fromRectangle("fill", x + 2, y + 2, width - 4, height - 4, altKevinColor)
-    end
+    local ninePatch = drawableNPatch.fromTexture(blockStyle.frameTexture, nPatchOptions, x, y, width, height)
+    local rectangle = drawableRectangle.fromRectangle("fill", x + 2, y + 2, width - 4, height - 4, blockStyle.fillColor)
 
+    local faceTexture = giant and blockStyle.giantFaceTexture or blockStyle.smallFaceTexture
     local faceSprite = drawableSprite.fromTexture(faceTexture, entity)
     faceSprite:addPosition(math.floor(width / 2), math.floor(height / 2))
 
     local sprites = ninePatch:getDrawableSprite()
-
     table.insert(sprites, 1, rectangle:getDrawableSprite())
     table.insert(sprites, 2, faceSprite)
-
     return sprites
 end
 
-return nonReturnKevin
+return nonReturnKevin

Loenn/lang/en_gb.lang

@@ -12,6 +12,11 @@ entities.CherryHelper/NonReturnKevin.placements.name.horizontal=Non Return Kevin
 entities.CherryHelper/NonReturnKevin.placements.name.altboth=Non Return Kevin (Alt Texture) (Both)
 entities.CherryHelper/NonReturnKevin.placements.name.altvertical=Non Return Kevin (Alt Texture) (Vertical)
 entities.CherryHelper/NonReturnKevin.placements.name.althorizontal=Non Return Kevin (Alt Texture) (Horizontal)
+entities.CherryHelper/NonReturnKevin.placements.name.reskinnableboth=Non Return Kevin (Reskinnable) (Both)
+entities.CherryHelper/NonReturnKevin.placements.name.reskinnablevertical=Non Return Kevin (Reskinnable) (Vertical)
+entities.CherryHelper/NonReturnKevin.placements.name.reskinnablehorizontal=Non Return Kevin (Reskinnable) (Horizontal)
+entities.CherryHelper/NonReturnKevin.attributes.description.spriteDirectory=Directory custom sprites will be taken from. Custom sprites must be formatted in the same way as vanilla kevins. This option does nothing if the "Alt Texture" field is unchecked.
+entities.CherryHelper/NonReturnKevin.attributes.description.fillColor=Fill color of the kevin. This option does nothing if the "Alt Texture" field is unchecked.
 
 entities.CherryHelper/UI_NRCB.placements.name.both=Uninterruptible Non Return Kevin (Both)
 entities.CherryHelper/UI_NRCB.placements.name.vertical=Uninterruptible Non Return Kevin (Vertical)