punkmaker 0.3.0 → 0.3.2

data/lib/punkmaker/zombie.rb

@@ -6,21 +6,61 @@ module Zombie    ## make it a class - why? why not?
   BASE_M = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/zombie-male.png" )
   BASE_F = Image.read( "#{Pixelart::Module::Punkmaker.root}/config/zombie-female.png" )
         
-  def self.make( color,
+  def self.make( color=nil,
+                  shine: true,
                    gender: 'm'  )
-      color_map = derive_color_map( color )
-  
-      punk = nil
+    base =   gender == 'm' ? BASE_M : BASE_F
+
+    ## note: make a copy of base 
+    punk = Image.new( base.width, base.height )  
+    punk.compose!( base )
+    
+    if color    
+      color_map = derive_color_map( color )  
+      punk = punk.change_colors( color_map )
+    end
+
+    if shine
+      shine_color =    color ? derive_shine( color ) : 0x9bbc88ff
       if gender == 'm'
-          punk = BASE_M.change_colors( color_map )
-      else
-          punk = BASE_F.change_colors( color_map )
+        punk[9,7] = shine_color
+        punk[8,8] = shine_color
+      else 
+        punk[9,9] = shine_color
       end
-      punk
+     end   
+
+    punk
   end
+
+
+  def self.derive_shine( color )
+## was before - reuse - why? why not?
+## todo/check - check "formula" used in skintones script for humans!!!
+##  lighter = Color.from_hsl(
+##    (h+1)%360,   # todo/check: make lighter by -1 on hue? or +1????
+##   [1.0,s+0.10].min,
+##   [1.0,l+0.25].min)
+
+    color = Color.from_hex( color )  if color.is_a?( String )
+  
+    hsv  = Color.to_hsv( color )
+    # pp hsv
+
+    h, s, v = hsv
+    h = h % 360   # make always positive (might be -50 or such)
+    ## pp [h,s,v]
+
+    ## add extra saturation if v(alue) / brightness is max 1.0 - why? why not?
+    sdiff = v >= 0.99 ? 0.25 : 0.15
+
+    lighter =  Color.from_hsv( h, [0.0, s-sdiff].max, [v+0.1,1.0].min )  
+    lighter
+  end
+
   
   def self.derive_color_map( color )
-    color = Color.parse( color )  if color.is_a?( String )
+    color = Color.from_hex( color )  if color.is_a?( String )
 
 #    2 pixels #9bbc88 / rgb(155 188 136) - hsl( 98°  28%  64%)  - lighter
 #  125 pixels #7da269 / rgb(125 162 105) - hsl( 99°  23%  52%) - base  (use as base)
@@ -40,17 +80,10 @@ module Zombie    ## make it a class - why? why not?
     [0.0,s-0.05].max,
     [0.0,l-0.12].max)
 
-  ## todo/check - check "formula" used in skintones script for humans!!!
-  lighter = Color.from_hsl(
-     (h+1)%360,   # todo/check: make lighter by -1 on hue? or +1????
-     [1.0,s+0.10].min,
-     [1.0,l+0.25].min)
-
 
   color_map = {
       '#7da269' =>  base,
       '#5e7253' => darker,
-      '#9bbc88' => lighter
   }
 
   color_map

data/lib/punkmaker.rb

@@ -4,6 +4,10 @@ require 'spritesheet'
 
 require_relative 'punkmaker/version'  ## let version always go first
 
+## support - move to ???
+require_relative 'punkmaker/colors'   ## ColorBundle (color by name lookup and mroe)
+require_relative 'punkmaker/skintone'
+
 ## more base / archetypes
 require_relative 'punkmaker/human'
 require_relative 'punkmaker/alien'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punkmaker
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -102,6 +102,10 @@ files:
 - config/robot-male.png
 - config/skeleton-female.png
 - config/skeleton-male.png
+- config/skintone/color_me_human.csv
+- config/skintone/dr_ellis_monk.csv
+- config/skintone/punks_not_dead.csv
+- config/skintone/ye_olde_punks.csv
 - config/vampire-female.png
 - config/vampire-male.png
 - config/zombie-female.png
@@ -109,6 +113,7 @@ files:
 - lib/punkmaker.rb
 - lib/punkmaker/alien.rb
 - lib/punkmaker/ape.rb
+- lib/punkmaker/colors.rb
 - lib/punkmaker/demon.rb
 - lib/punkmaker/hair.rb
 - lib/punkmaker/human.rb
@@ -116,6 +121,7 @@ files:
 - lib/punkmaker/orc.rb
 - lib/punkmaker/robot.rb
 - lib/punkmaker/skeleton.rb
+- lib/punkmaker/skintone.rb
 - lib/punkmaker/vampire.rb
 - lib/punkmaker/version.rb
 - lib/punkmaker/zombie.rb