From 66770868f3879e4d9d396f0152c5d9ecb729a8f4 Mon Sep 17 00:00:00 2001 From: tacigar Date: Fri, 30 Dec 2016 09:46:25 +0900 Subject: [PATCH] Update the directory structure --- {blend => maidroid/blend}/maidroid.blend | Bin {scripts => maidroid/script}/colors.sh | 0 {scripts => maidroid/script}/genEggTextures.sh | 2 +- {scripts => maidroid/script}/genMaidroidTextures.sh | 2 +- .../script}/img/maidroid_egg_pattern.png | Bin .../script}/img/maidroid_empty_egg.png | Bin {scripts => maidroid/script}/img/maidroid_hair.png | Bin {scripts => maidroid/script}/img/maidroid_type1.png | Bin {scripts => maidroid/script}/img/maidroid_type2.png | Bin {scripts => maidroid/script}/img/maidroid_type3.png | Bin {xcf => maidroid/xcf}/maidroid_egg_pattern.xcf | Bin {xcf => maidroid/xcf}/maidroid_empty_egg.xcf | Bin {xcf => maidroid/xcf}/maidroid_hair.xcf | Bin {xcf => maidroid/xcf}/maidroid_type1.xcf | Bin {xcf => maidroid/xcf}/maidroid_type2.xcf | Bin {xcf => maidroid/xcf}/maidroid_type3.xcf | Bin {xcf => maidroid_core/xcf}/maidroid_core_basic.xcf | Bin {xcf => maidroid_core/xcf}/maidroid_core_empty.xcf | Bin .../xcf}/maidroid_core_farming.xcf | Bin .../xcf}/maidroid_tool_core_right.xcf | Bin .../xcf}/maidroid_tool_core_top.xcf | Bin .../xcf}/maidroid_tool_core_writer_bottom.xcf | Bin .../xcf}/maidroid_tool_core_writer_front.xcf | Bin .../xcf}/maidroid_tool_core_writer_front_active.xcf | Bin .../xcf}/maidroid_tool_core_writer_right.xcf | Bin .../xcf}/maidroid_tool_core_writer_top.xcf | Bin .../xcf}/maidroid_tool_egg_writer_bottom.xcf | Bin .../xcf}/maidroid_tool_egg_writer_front.xcf | Bin .../xcf}/maidroid_tool_egg_writer_front_active.xcf | Bin .../xcf}/maidroid_tool_egg_writer_right.xcf | Bin .../xcf}/maidroid_tool_egg_writer_top.xcf | Bin .../xcf}/maidroid_tool_gui_arrow.xcf | Bin .../xcf}/maidroid_tool_gui_arrow_filled.xcf | Bin .../xcf}/maidroid_tool_gui_meter.xcf | Bin .../xcf}/maidroid_tool_gui_meter_filled.xcf | Bin .../xcf}/maidroid_tool_nametag.xcf | Bin 36 files changed, 2 insertions(+), 2 deletions(-) rename {blend => maidroid/blend}/maidroid.blend (100%) rename {scripts => maidroid/script}/colors.sh (100%) rename {scripts => maidroid/script}/genEggTextures.sh (81%) rename {scripts => maidroid/script}/genMaidroidTextures.sh (84%) rename {scripts => maidroid/script}/img/maidroid_egg_pattern.png (100%) rename {scripts => maidroid/script}/img/maidroid_empty_egg.png (100%) rename {scripts => maidroid/script}/img/maidroid_hair.png (100%) rename {scripts => maidroid/script}/img/maidroid_type1.png (100%) rename {scripts => maidroid/script}/img/maidroid_type2.png (100%) rename {scripts => maidroid/script}/img/maidroid_type3.png (100%) rename {xcf => maidroid/xcf}/maidroid_egg_pattern.xcf (100%) rename {xcf => maidroid/xcf}/maidroid_empty_egg.xcf (100%) rename {xcf => maidroid/xcf}/maidroid_hair.xcf (100%) rename {xcf => maidroid/xcf}/maidroid_type1.xcf (100%) rename {xcf => maidroid/xcf}/maidroid_type2.xcf (100%) rename {xcf => maidroid/xcf}/maidroid_type3.xcf (100%) rename {xcf => maidroid_core/xcf}/maidroid_core_basic.xcf (100%) rename {xcf => maidroid_core/xcf}/maidroid_core_empty.xcf (100%) rename {xcf => maidroid_core/xcf}/maidroid_core_farming.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_right.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_top.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_writer_bottom.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_writer_front.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_writer_front_active.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_writer_right.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_core_writer_top.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_egg_writer_bottom.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_egg_writer_front.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_egg_writer_front_active.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_egg_writer_right.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_egg_writer_top.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_gui_arrow.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_gui_arrow_filled.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_gui_meter.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_gui_meter_filled.xcf (100%) rename {xcf => maidroid_tool/xcf}/maidroid_tool_nametag.xcf (100%) diff --git a/blend/maidroid.blend b/maidroid/blend/maidroid.blend similarity index 100% rename from blend/maidroid.blend rename to maidroid/blend/maidroid.blend diff --git a/scripts/colors.sh b/maidroid/script/colors.sh similarity index 100% rename from scripts/colors.sh rename to maidroid/script/colors.sh diff --git a/scripts/genEggTextures.sh b/maidroid/script/genEggTextures.sh similarity index 81% rename from scripts/genEggTextures.sh rename to maidroid/script/genEggTextures.sh index 29883fa..bd9f8a8 100644 --- a/scripts/genEggTextures.sh +++ b/maidroid/script/genEggTextures.sh @@ -3,7 +3,7 @@ . ./colors.sh for ((i=1; i<16; i++)); do - output="../maidroid/textures/maidroid_maidroid_mk${i}_egg.png" + output="../textures/maidroid_maidroid_mk${i}_egg.png" color=${arr[i]} convert +level-colors $color,White img/maidroid_egg_pattern.png img/maidroid_egg_pattern_tmp.png composite img/maidroid_egg_pattern_tmp.png img/maidroid_empty_egg.png $output diff --git a/scripts/genMaidroidTextures.sh b/maidroid/script/genMaidroidTextures.sh similarity index 84% rename from scripts/genMaidroidTextures.sh rename to maidroid/script/genMaidroidTextures.sh index ae323d8..2586c35 100644 --- a/scripts/genMaidroidTextures.sh +++ b/maidroid/script/genMaidroidTextures.sh @@ -6,7 +6,7 @@ for ((i=1; i<16; i++)); do type=$(($i % 3 + 1)) maidroid_type="img/maidroid_type${type}.png" - output="../maidroid/models/maidroid_maidroid_mk${i}.png" + output="../models/maidroid_maidroid_mk${i}.png" color=${arr[i]} convert +level-colors $color,White img/maidroid_hair.png img/maidroid_hair_tmp.png composite img/maidroid_hair_tmp.png $maidroid_type $output diff --git a/scripts/img/maidroid_egg_pattern.png b/maidroid/script/img/maidroid_egg_pattern.png similarity index 100% rename from scripts/img/maidroid_egg_pattern.png rename to maidroid/script/img/maidroid_egg_pattern.png diff --git a/scripts/img/maidroid_empty_egg.png b/maidroid/script/img/maidroid_empty_egg.png similarity index 100% rename from scripts/img/maidroid_empty_egg.png rename to maidroid/script/img/maidroid_empty_egg.png diff --git a/scripts/img/maidroid_hair.png b/maidroid/script/img/maidroid_hair.png similarity index 100% rename from scripts/img/maidroid_hair.png rename to maidroid/script/img/maidroid_hair.png diff --git a/scripts/img/maidroid_type1.png b/maidroid/script/img/maidroid_type1.png similarity index 100% rename from scripts/img/maidroid_type1.png rename to maidroid/script/img/maidroid_type1.png diff --git a/scripts/img/maidroid_type2.png b/maidroid/script/img/maidroid_type2.png similarity index 100% rename from scripts/img/maidroid_type2.png rename to maidroid/script/img/maidroid_type2.png diff --git a/scripts/img/maidroid_type3.png b/maidroid/script/img/maidroid_type3.png similarity index 100% rename from scripts/img/maidroid_type3.png rename to maidroid/script/img/maidroid_type3.png diff --git a/xcf/maidroid_egg_pattern.xcf b/maidroid/xcf/maidroid_egg_pattern.xcf similarity index 100% rename from xcf/maidroid_egg_pattern.xcf rename to maidroid/xcf/maidroid_egg_pattern.xcf diff --git a/xcf/maidroid_empty_egg.xcf b/maidroid/xcf/maidroid_empty_egg.xcf similarity index 100% rename from xcf/maidroid_empty_egg.xcf rename to maidroid/xcf/maidroid_empty_egg.xcf diff --git a/xcf/maidroid_hair.xcf b/maidroid/xcf/maidroid_hair.xcf similarity index 100% rename from xcf/maidroid_hair.xcf rename to maidroid/xcf/maidroid_hair.xcf diff --git a/xcf/maidroid_type1.xcf b/maidroid/xcf/maidroid_type1.xcf similarity index 100% rename from xcf/maidroid_type1.xcf rename to maidroid/xcf/maidroid_type1.xcf diff --git a/xcf/maidroid_type2.xcf b/maidroid/xcf/maidroid_type2.xcf similarity index 100% rename from xcf/maidroid_type2.xcf rename to maidroid/xcf/maidroid_type2.xcf diff --git a/xcf/maidroid_type3.xcf b/maidroid/xcf/maidroid_type3.xcf similarity index 100% rename from xcf/maidroid_type3.xcf rename to maidroid/xcf/maidroid_type3.xcf diff --git a/xcf/maidroid_core_basic.xcf b/maidroid_core/xcf/maidroid_core_basic.xcf similarity index 100% rename from xcf/maidroid_core_basic.xcf rename to maidroid_core/xcf/maidroid_core_basic.xcf diff --git a/xcf/maidroid_core_empty.xcf b/maidroid_core/xcf/maidroid_core_empty.xcf similarity index 100% rename from xcf/maidroid_core_empty.xcf rename to maidroid_core/xcf/maidroid_core_empty.xcf diff --git a/xcf/maidroid_core_farming.xcf b/maidroid_core/xcf/maidroid_core_farming.xcf similarity index 100% rename from xcf/maidroid_core_farming.xcf rename to maidroid_core/xcf/maidroid_core_farming.xcf diff --git a/xcf/maidroid_tool_core_right.xcf b/maidroid_tool/xcf/maidroid_tool_core_right.xcf similarity index 100% rename from xcf/maidroid_tool_core_right.xcf rename to maidroid_tool/xcf/maidroid_tool_core_right.xcf diff --git a/xcf/maidroid_tool_core_top.xcf b/maidroid_tool/xcf/maidroid_tool_core_top.xcf similarity index 100% rename from xcf/maidroid_tool_core_top.xcf rename to maidroid_tool/xcf/maidroid_tool_core_top.xcf diff --git a/xcf/maidroid_tool_core_writer_bottom.xcf b/maidroid_tool/xcf/maidroid_tool_core_writer_bottom.xcf similarity index 100% rename from xcf/maidroid_tool_core_writer_bottom.xcf rename to maidroid_tool/xcf/maidroid_tool_core_writer_bottom.xcf diff --git a/xcf/maidroid_tool_core_writer_front.xcf b/maidroid_tool/xcf/maidroid_tool_core_writer_front.xcf similarity index 100% rename from xcf/maidroid_tool_core_writer_front.xcf rename to maidroid_tool/xcf/maidroid_tool_core_writer_front.xcf diff --git a/xcf/maidroid_tool_core_writer_front_active.xcf b/maidroid_tool/xcf/maidroid_tool_core_writer_front_active.xcf similarity index 100% rename from xcf/maidroid_tool_core_writer_front_active.xcf rename to maidroid_tool/xcf/maidroid_tool_core_writer_front_active.xcf diff --git a/xcf/maidroid_tool_core_writer_right.xcf b/maidroid_tool/xcf/maidroid_tool_core_writer_right.xcf similarity index 100% rename from xcf/maidroid_tool_core_writer_right.xcf rename to maidroid_tool/xcf/maidroid_tool_core_writer_right.xcf diff --git a/xcf/maidroid_tool_core_writer_top.xcf b/maidroid_tool/xcf/maidroid_tool_core_writer_top.xcf similarity index 100% rename from xcf/maidroid_tool_core_writer_top.xcf rename to maidroid_tool/xcf/maidroid_tool_core_writer_top.xcf diff --git a/xcf/maidroid_tool_egg_writer_bottom.xcf b/maidroid_tool/xcf/maidroid_tool_egg_writer_bottom.xcf similarity index 100% rename from xcf/maidroid_tool_egg_writer_bottom.xcf rename to maidroid_tool/xcf/maidroid_tool_egg_writer_bottom.xcf diff --git a/xcf/maidroid_tool_egg_writer_front.xcf b/maidroid_tool/xcf/maidroid_tool_egg_writer_front.xcf similarity index 100% rename from xcf/maidroid_tool_egg_writer_front.xcf rename to maidroid_tool/xcf/maidroid_tool_egg_writer_front.xcf diff --git a/xcf/maidroid_tool_egg_writer_front_active.xcf b/maidroid_tool/xcf/maidroid_tool_egg_writer_front_active.xcf similarity index 100% rename from xcf/maidroid_tool_egg_writer_front_active.xcf rename to maidroid_tool/xcf/maidroid_tool_egg_writer_front_active.xcf diff --git a/xcf/maidroid_tool_egg_writer_right.xcf b/maidroid_tool/xcf/maidroid_tool_egg_writer_right.xcf similarity index 100% rename from xcf/maidroid_tool_egg_writer_right.xcf rename to maidroid_tool/xcf/maidroid_tool_egg_writer_right.xcf diff --git a/xcf/maidroid_tool_egg_writer_top.xcf b/maidroid_tool/xcf/maidroid_tool_egg_writer_top.xcf similarity index 100% rename from xcf/maidroid_tool_egg_writer_top.xcf rename to maidroid_tool/xcf/maidroid_tool_egg_writer_top.xcf diff --git a/xcf/maidroid_tool_gui_arrow.xcf b/maidroid_tool/xcf/maidroid_tool_gui_arrow.xcf similarity index 100% rename from xcf/maidroid_tool_gui_arrow.xcf rename to maidroid_tool/xcf/maidroid_tool_gui_arrow.xcf diff --git a/xcf/maidroid_tool_gui_arrow_filled.xcf b/maidroid_tool/xcf/maidroid_tool_gui_arrow_filled.xcf similarity index 100% rename from xcf/maidroid_tool_gui_arrow_filled.xcf rename to maidroid_tool/xcf/maidroid_tool_gui_arrow_filled.xcf diff --git a/xcf/maidroid_tool_gui_meter.xcf b/maidroid_tool/xcf/maidroid_tool_gui_meter.xcf similarity index 100% rename from xcf/maidroid_tool_gui_meter.xcf rename to maidroid_tool/xcf/maidroid_tool_gui_meter.xcf diff --git a/xcf/maidroid_tool_gui_meter_filled.xcf b/maidroid_tool/xcf/maidroid_tool_gui_meter_filled.xcf similarity index 100% rename from xcf/maidroid_tool_gui_meter_filled.xcf rename to maidroid_tool/xcf/maidroid_tool_gui_meter_filled.xcf diff --git a/xcf/maidroid_tool_nametag.xcf b/maidroid_tool/xcf/maidroid_tool_nametag.xcf similarity index 100% rename from xcf/maidroid_tool_nametag.xcf rename to maidroid_tool/xcf/maidroid_tool_nametag.xcf