diff --git a/maidroid/models/maidroid_maidroid_mk1.png b/maidroid/models/maidroid_maidroid_mk1.png new file mode 100644 index 0000000..a4ba961 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk1.png differ diff --git a/maidroid/models/maidroid_maidroid_mk10.png b/maidroid/models/maidroid_maidroid_mk10.png new file mode 100644 index 0000000..fbef43c Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk10.png differ diff --git a/maidroid/models/maidroid_maidroid_mk11.png b/maidroid/models/maidroid_maidroid_mk11.png new file mode 100644 index 0000000..5fbed13 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk11.png differ diff --git a/maidroid/models/maidroid_maidroid_mk12.png b/maidroid/models/maidroid_maidroid_mk12.png new file mode 100644 index 0000000..e9a4901 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk12.png differ diff --git a/maidroid/models/maidroid_maidroid_mk13.png b/maidroid/models/maidroid_maidroid_mk13.png new file mode 100644 index 0000000..55af516 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk13.png differ diff --git a/maidroid/models/maidroid_maidroid_mk14.png b/maidroid/models/maidroid_maidroid_mk14.png new file mode 100644 index 0000000..8d0c192 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk14.png differ diff --git a/maidroid/models/maidroid_maidroid_mk15.png b/maidroid/models/maidroid_maidroid_mk15.png new file mode 100644 index 0000000..6f45578 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk15.png differ diff --git a/maidroid/models/maidroid_maidroid_mk2.png b/maidroid/models/maidroid_maidroid_mk2.png new file mode 100644 index 0000000..c683b2e Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk2.png differ diff --git a/maidroid/models/maidroid_maidroid_mk3.png b/maidroid/models/maidroid_maidroid_mk3.png new file mode 100644 index 0000000..052f5cf Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk3.png differ diff --git a/maidroid/models/maidroid_maidroid_mk4.png b/maidroid/models/maidroid_maidroid_mk4.png new file mode 100644 index 0000000..383959c Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk4.png differ diff --git a/maidroid/models/maidroid_maidroid_mk5.png b/maidroid/models/maidroid_maidroid_mk5.png new file mode 100644 index 0000000..29d9d3d Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk5.png differ diff --git a/maidroid/models/maidroid_maidroid_mk6.png b/maidroid/models/maidroid_maidroid_mk6.png new file mode 100644 index 0000000..423aec8 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk6.png differ diff --git a/maidroid/models/maidroid_maidroid_mk7.png b/maidroid/models/maidroid_maidroid_mk7.png new file mode 100644 index 0000000..b3e2d2b Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk7.png differ diff --git a/maidroid/models/maidroid_maidroid_mk8.png b/maidroid/models/maidroid_maidroid_mk8.png new file mode 100644 index 0000000..84a2784 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk8.png differ diff --git a/maidroid/models/maidroid_maidroid_mk9.png b/maidroid/models/maidroid_maidroid_mk9.png new file mode 100644 index 0000000..ac781b5 Binary files /dev/null and b/maidroid/models/maidroid_maidroid_mk9.png differ diff --git a/maidroid/models/maidroid_mk1.png b/maidroid/models/maidroid_mk1.png index d9c5f77..ba4147a 100644 Binary files a/maidroid/models/maidroid_mk1.png and b/maidroid/models/maidroid_mk1.png differ diff --git a/maidroid/models/maidroid_mk10.png b/maidroid/models/maidroid_mk10.png new file mode 100644 index 0000000..0bc25b2 Binary files /dev/null and b/maidroid/models/maidroid_mk10.png differ diff --git a/maidroid/models/maidroid_mk11.png b/maidroid/models/maidroid_mk11.png new file mode 100644 index 0000000..9204cd7 Binary files /dev/null and b/maidroid/models/maidroid_mk11.png differ diff --git a/maidroid/models/maidroid_mk12.png b/maidroid/models/maidroid_mk12.png new file mode 100644 index 0000000..000fdde Binary files /dev/null and b/maidroid/models/maidroid_mk12.png differ diff --git a/maidroid/models/maidroid_mk13.png b/maidroid/models/maidroid_mk13.png new file mode 100644 index 0000000..7046d22 Binary files /dev/null and b/maidroid/models/maidroid_mk13.png differ diff --git a/maidroid/models/maidroid_mk14.png b/maidroid/models/maidroid_mk14.png new file mode 100644 index 0000000..e67dcfe Binary files /dev/null and b/maidroid/models/maidroid_mk14.png differ diff --git a/maidroid/models/maidroid_mk15.png b/maidroid/models/maidroid_mk15.png new file mode 100644 index 0000000..cec82be Binary files /dev/null and b/maidroid/models/maidroid_mk15.png differ diff --git a/maidroid/models/maidroid_mk2.png b/maidroid/models/maidroid_mk2.png index 97690e1..2e9c8a5 100644 Binary files a/maidroid/models/maidroid_mk2.png and b/maidroid/models/maidroid_mk2.png differ diff --git a/maidroid/models/maidroid_mk3.png b/maidroid/models/maidroid_mk3.png index 5436d06..e1a75e0 100644 Binary files a/maidroid/models/maidroid_mk3.png and b/maidroid/models/maidroid_mk3.png differ diff --git a/maidroid/models/maidroid_mk4.png b/maidroid/models/maidroid_mk4.png new file mode 100644 index 0000000..375d87d Binary files /dev/null and b/maidroid/models/maidroid_mk4.png differ diff --git a/maidroid/models/maidroid_mk5.png b/maidroid/models/maidroid_mk5.png new file mode 100644 index 0000000..73507b4 Binary files /dev/null and b/maidroid/models/maidroid_mk5.png differ diff --git a/maidroid/models/maidroid_mk6.png b/maidroid/models/maidroid_mk6.png new file mode 100644 index 0000000..74f3959 Binary files /dev/null and b/maidroid/models/maidroid_mk6.png differ diff --git a/maidroid/models/maidroid_mk7.png b/maidroid/models/maidroid_mk7.png new file mode 100644 index 0000000..9956981 Binary files /dev/null and b/maidroid/models/maidroid_mk7.png differ diff --git a/maidroid/models/maidroid_mk8.png b/maidroid/models/maidroid_mk8.png new file mode 100644 index 0000000..910ae95 Binary files /dev/null and b/maidroid/models/maidroid_mk8.png differ diff --git a/maidroid/models/maidroid_mk9.png b/maidroid/models/maidroid_mk9.png new file mode 100644 index 0000000..7e2288e Binary files /dev/null and b/maidroid/models/maidroid_mk9.png differ diff --git a/maidroid/models/scripts/generate_maidroid.sh b/maidroid/models/scripts/generate_maidroid.sh new file mode 100644 index 0000000..1a0f38d --- /dev/null +++ b/maidroid/models/scripts/generate_maidroid.sh @@ -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 diff --git a/maidroid/models/scripts/maidroid.png b/maidroid/models/scripts/maidroid.png new file mode 100644 index 0000000..9c20ef7 Binary files /dev/null and b/maidroid/models/scripts/maidroid.png differ diff --git a/maidroid/models/scripts/maidroid.xcf b/maidroid/models/scripts/maidroid.xcf new file mode 100644 index 0000000..7308862 Binary files /dev/null and b/maidroid/models/scripts/maidroid.xcf differ diff --git a/maidroid/models/scripts/maidroid_hair.png b/maidroid/models/scripts/maidroid_hair.png new file mode 100644 index 0000000..35a7d3a Binary files /dev/null and b/maidroid/models/scripts/maidroid_hair.png differ diff --git a/maidroid/models/scripts/maidroid_hair.xcf b/maidroid/models/scripts/maidroid_hair.xcf new file mode 100644 index 0000000..7358fe3 Binary files /dev/null and b/maidroid/models/scripts/maidroid_hair.xcf differ diff --git a/maidroid/models/scripts/maidroid_type1.png b/maidroid/models/scripts/maidroid_type1.png new file mode 100644 index 0000000..3b6493b Binary files /dev/null and b/maidroid/models/scripts/maidroid_type1.png differ diff --git a/maidroid/models/scripts/maidroid_type1.xcf b/maidroid/models/scripts/maidroid_type1.xcf new file mode 100644 index 0000000..803b302 Binary files /dev/null and b/maidroid/models/scripts/maidroid_type1.xcf differ diff --git a/maidroid/models/scripts/maidroid_type2.png b/maidroid/models/scripts/maidroid_type2.png new file mode 100644 index 0000000..06043bc Binary files /dev/null and b/maidroid/models/scripts/maidroid_type2.png differ diff --git a/maidroid/models/scripts/maidroid_type2.xcf b/maidroid/models/scripts/maidroid_type2.xcf new file mode 100644 index 0000000..7308862 Binary files /dev/null and b/maidroid/models/scripts/maidroid_type2.xcf differ diff --git a/maidroid/models/scripts/maidroid_type3.png b/maidroid/models/scripts/maidroid_type3.png new file mode 100644 index 0000000..9953104 Binary files /dev/null and b/maidroid/models/scripts/maidroid_type3.png differ diff --git a/maidroid/models/scripts/maidroid_type3.xcf b/maidroid/models/scripts/maidroid_type3.xcf new file mode 100644 index 0000000..a29a19a Binary files /dev/null and b/maidroid/models/scripts/maidroid_type3.xcf differ diff --git a/maidroid/register.lua b/maidroid/register.lua index 11f84c0..e459516 100644 --- a/maidroid/register.lua +++ b/maidroid/register.lua @@ -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 diff --git a/maidroid/textures/maidroid_maidroid_mk10_egg.png b/maidroid/textures/maidroid_maidroid_mk10_egg.png new file mode 100644 index 0000000..1478210 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk10_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk11_egg.png b/maidroid/textures/maidroid_maidroid_mk11_egg.png new file mode 100644 index 0000000..7b85454 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk11_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk12_egg.png b/maidroid/textures/maidroid_maidroid_mk12_egg.png new file mode 100644 index 0000000..9148a5c Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk12_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk13_egg.png b/maidroid/textures/maidroid_maidroid_mk13_egg.png new file mode 100644 index 0000000..91587f8 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk13_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk14_egg.png b/maidroid/textures/maidroid_maidroid_mk14_egg.png new file mode 100644 index 0000000..fcb06da Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk14_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk15_egg.png b/maidroid/textures/maidroid_maidroid_mk15_egg.png new file mode 100644 index 0000000..fd45c9f Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk15_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk1_egg.png b/maidroid/textures/maidroid_maidroid_mk1_egg.png index cb97f9a..d41675a 100644 Binary files a/maidroid/textures/maidroid_maidroid_mk1_egg.png and b/maidroid/textures/maidroid_maidroid_mk1_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk1_egg.xcf b/maidroid/textures/maidroid_maidroid_mk1_egg.xcf deleted file mode 100644 index 82237fa..0000000 Binary files a/maidroid/textures/maidroid_maidroid_mk1_egg.xcf and /dev/null differ diff --git a/maidroid/textures/maidroid_maidroid_mk2_egg.png b/maidroid/textures/maidroid_maidroid_mk2_egg.png new file mode 100644 index 0000000..b4034b8 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk2_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk3_egg.png b/maidroid/textures/maidroid_maidroid_mk3_egg.png new file mode 100644 index 0000000..5dff225 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk3_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk4_egg.png b/maidroid/textures/maidroid_maidroid_mk4_egg.png new file mode 100644 index 0000000..f27af8b Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk4_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk5_egg.png b/maidroid/textures/maidroid_maidroid_mk5_egg.png new file mode 100644 index 0000000..b196488 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk5_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk6_egg.png b/maidroid/textures/maidroid_maidroid_mk6_egg.png new file mode 100644 index 0000000..2981038 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk6_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk7_egg.png b/maidroid/textures/maidroid_maidroid_mk7_egg.png new file mode 100644 index 0000000..6026b60 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk7_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk8_egg.png b/maidroid/textures/maidroid_maidroid_mk8_egg.png new file mode 100644 index 0000000..168d290 Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk8_egg.png differ diff --git a/maidroid/textures/maidroid_maidroid_mk9_egg.png b/maidroid/textures/maidroid_maidroid_mk9_egg.png new file mode 100644 index 0000000..c560e0a Binary files /dev/null and b/maidroid/textures/maidroid_maidroid_mk9_egg.png differ diff --git a/maidroid/textures/maidroid_mk1_spawner.png b/maidroid/textures/maidroid_mk1_spawner.png deleted file mode 100644 index c9a3203..0000000 Binary files a/maidroid/textures/maidroid_mk1_spawner.png and /dev/null differ diff --git a/maidroid/textures/maidroid_mk2_spawner.png b/maidroid/textures/maidroid_mk2_spawner.png deleted file mode 100644 index 5fe2166..0000000 Binary files a/maidroid/textures/maidroid_mk2_spawner.png and /dev/null differ diff --git a/maidroid/textures/maidroid_mk3_spawner.png b/maidroid/textures/maidroid_mk3_spawner.png deleted file mode 100644 index 66a73bf..0000000 Binary files a/maidroid/textures/maidroid_mk3_spawner.png and /dev/null differ diff --git a/maidroid/textures/scripts/egg.png b/maidroid/textures/scripts/egg.png new file mode 100644 index 0000000..1307019 Binary files /dev/null and b/maidroid/textures/scripts/egg.png differ diff --git a/maidroid/textures/scripts/egg_pattern.png b/maidroid/textures/scripts/egg_pattern.png new file mode 100644 index 0000000..3c340f9 Binary files /dev/null and b/maidroid/textures/scripts/egg_pattern.png differ diff --git a/maidroid/textures/scripts/egg_pattern.xcf b/maidroid/textures/scripts/egg_pattern.xcf new file mode 100644 index 0000000..dba4506 Binary files /dev/null and b/maidroid/textures/scripts/egg_pattern.xcf differ diff --git a/maidroid/textures/scripts/generate_egg.sh b/maidroid/textures/scripts/generate_egg.sh new file mode 100644 index 0000000..342566e --- /dev/null +++ b/maidroid/textures/scripts/generate_egg.sh @@ -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 diff --git a/maidroid_tool/egg_writer.lua b/maidroid_tool/egg_writer.lua index e0a9097..22aa353 100644 --- a/maidroid_tool/egg_writer.lua +++ b/maidroid_tool/egg_writer.lua @@ -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.