1
0
mirror of https://github.com/tacigar/maidroid.git synced 2024-11-05 09:40:34 +01:00

Merge pull request #81 from tacigar/tacigar/maidroid_imgs

Add maidroids.
Close #75
This commit is contained in:
tacigar 2016-12-20 21:36:22 +09:00 committed by GitHub
commit e1713a331b
66 changed files with 84 additions and 26 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 971 B

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

View File

@ -0,0 +1,30 @@
#/bin/bash
declare -a arr=()
arr[1]='gray92'
arr[2]='gray68'
arr[3]='gray36'
arr[4]='gray17'
arr[5]='blue'
arr[6]='cyan'
arr[7]='green'
arr[8]='DarkGreen'
arr[9]='yellow'
arr[10]='orange'
arr[11]='brown'
arr[12]='red'
arr[13]='pink'
arr[14]='magenta'
arr[15]='violet'
for ((i=1; i<16; i++)); do
type=$(($i % 3 + 1))
maidroid_type="maidroid_type${type}.png"
output="../maidroid_maidroid_mk${i}.png"
color=${arr[i]}
convert +level-colors $color,White maidroid_hair.png maidroid_hair_tmp.png
composite maidroid_hair_tmp.png $maidroid_type $output
rm maidroid_hair_tmp.png
done

Binary file not shown.

After

Width:  |  Height:  |  Size: 1008 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1015 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1008 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 963 B

Binary file not shown.

View File

@ -8,28 +8,15 @@ maidroid.register_egg("maidroid:empty_egg", {
inventory_image = "maidroid_empty_egg.png",
})
maidroid.register_maidroid("maidroid:maidroid_mk1", {
hp_max = 10,
weight = 20,
mesh = "maidroid.b3d",
textures = {"maidroid_mk1.png"},
egg_image = "maidroid_maidroid_mk1_egg.png",
})
--[[
maidroid.register_maidroid("maidroid:maidroid_mk2", {
hp_max = 10,
weight = 20,
mesh = "maidroid.b3d",
textures = {"maidroid_mk2.png"},
egg_image = "maidroid_mk2_egg.png",
})
maidroid.register_maidroid("maidroid:maidroid_mk3", {
hp_max = 10,
weight = 20,
mesh = "maidroid.b3d",
textures = {"maidroid_mk3.png"},
egg_image = "maidroid_mk3_egg.png",
})
]]--
for i = 1, 15 do
local product_name = "maidroid:maidroid_mk" .. tostring(i)
local texture_name = "maidroid_maidroid_mk" .. tostring(i) .. ".png"
local egg_img_name = "maidroid_maidroid_mk" .. tostring(i) .. "_egg.png"
maidroid.register_maidroid(product_name, {
hp_max = 10,
weight = 20,
mesh = "maidroid.b3d",
textures = {texture_name},
egg_image = egg_img_name,
})
end

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

View File

@ -0,0 +1,27 @@
#/bin/bash
declare -a arr=()
arr[1]='gray92'
arr[2]='gray68'
arr[3]='gray36'
arr[4]='gray17'
arr[5]='blue'
arr[6]='cyan'
arr[7]='green'
arr[8]='DarkGreen'
arr[9]='yellow'
arr[10]='orange'
arr[11]='brown'
arr[12]='red'
arr[13]='pink'
arr[14]='magenta'
arr[15]='violet'
for ((i=1; i<16; i++)); do
output="../maidroid_maidroid_mk${i}_egg.png"
color=${arr[i]}
convert +level-colors $color,White egg_pattern.png egg_pattern_tmp.png
composite egg_pattern_tmp.png egg.png $output
rm egg_pattern_tmp.png
done

View File

@ -6,7 +6,21 @@
do -- register egg writer
local dye_item_map = {
["dye:red"] = "maidroid:maidroid_mk1_egg",
["dye:white"] = "maidroid:maidroid_mk1_egg",
["dye:grey"] = "maidroid:maidroid_mk2_egg",
["dye:dark_grey"] = "maidroid:maidroid_mk3_egg",
["dye:black"] = "maidroid:maidroid_mk4_egg",
["dye:blue"] = "maidroid:maidroid_mk5_egg",
["dye:cyan"] = "maidroid:maidroid_mk6_egg",
["dye:green"] = "maidroid:maidroid_mk7_egg",
["dye:dark_green"] = "maidroid:maidroid_mk8_egg",
["dye:yellow"] = "maidroid:maidroid_mk9_egg",
["dye:orange"] = "maidroid:maidroid_mk10_egg",
["dye:brown"] = "maidroid:maidroid_mk11_egg",
["dye:red"] = "maidroid:maidroid_mk12_egg",
["dye:pink"] = "maidroid:maidroid_mk13_egg",
["dye:magenta"] = "maidroid:maidroid_mk14_egg",
["dye:violet"] = "maidroid:maidroid_mk15_egg",
}
local formspec = { -- want to change.