diff --git a/assets/slike/endless_forest/tree_ent_stylea.png b/assets/slike/endless_forest/tree_ent_stylea.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/dragon_fire_stylea.png b/assets/slike/mythical_highlands/dragon_fire_stylea.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/dragon_fire_styleb.png b/assets/slike/mythical_highlands/dragon_fire_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/dragon_ice_styleb.png b/assets/slike/mythical_highlands/dragon_ice_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/griffin_styleb.png b/assets/slike/mythical_highlands/griffin_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/pegasus_styleb.png b/assets/slike/mythical_highlands/pegasus_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/phoenix_styleb.png b/assets/slike/mythical_highlands/phoenix_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/unicorn_stylea.png b/assets/slike/mythical_highlands/unicorn_stylea.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/unicorn_styleb.png b/assets/slike/mythical_highlands/unicorn_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/yeti_stylea.png b/assets/slike/mythical_highlands/yeti_stylea.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/mythical_highlands/yeti_styleb.png b/assets/slike/mythical_highlands/yeti_styleb.png new file mode 100644 index 000000000..e69de29bb diff --git a/assets/slike/hladno/mec_lesen_stylea.png b/assets/slike/orozje/hladno/mec_lesen_stylea.png similarity index 100% rename from assets/slike/hladno/mec_lesen_stylea.png rename to assets/slike/orozje/hladno/mec_lesen_stylea.png diff --git a/assets/slike/hladno/mec_lesen_styleb.png b/assets/slike/orozje/hladno/mec_lesen_styleb.png similarity index 100% rename from assets/slike/hladno/mec_lesen_styleb.png rename to assets/slike/orozje/hladno/mec_lesen_styleb.png diff --git a/assets/slike/hladno/mec_zelezen_stylea.png b/assets/slike/orozje/hladno/mec_zelezen_stylea.png similarity index 100% rename from assets/slike/hladno/mec_zelezen_stylea.png rename to assets/slike/orozje/hladno/mec_zelezen_stylea.png diff --git a/assets/slike/hladno/mec_zelezen_styleb.png b/assets/slike/orozje/hladno/mec_zelezen_styleb.png similarity index 100% rename from assets/slike/hladno/mec_zelezen_styleb.png rename to assets/slike/orozje/hladno/mec_zelezen_styleb.png diff --git a/assets/slike/hladno/sekira_borna_stylea.png b/assets/slike/orozje/hladno/sekira_borna_stylea.png similarity index 100% rename from assets/slike/hladno/sekira_borna_stylea.png rename to assets/slike/orozje/hladno/sekira_borna_stylea.png diff --git a/assets/slike/hladno/sekira_borna_styleb.png b/assets/slike/orozje/hladno/sekira_borna_styleb.png similarity index 100% rename from assets/slike/hladno/sekira_borna_styleb.png rename to assets/slike/orozje/hladno/sekira_borna_styleb.png diff --git a/assets/slike/strelno/lok_preprost_styleb.png b/assets/slike/orozje/strelno/lok_preprost_styleb.png similarity index 100% rename from assets/slike/strelno/lok_preprost_styleb.png rename to assets/slike/orozje/strelno/lok_preprost_styleb.png diff --git a/assets/slike/drevesa/dead_tree_styleA_1024x1024.png b/assets/slike/rastline/drevesa/dead_tree_styleA_1024x1024.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleA_1024x1024.png rename to assets/slike/rastline/drevesa/dead_tree_styleA_1024x1024.png diff --git a/assets/slike/drevesa/dead_tree_styleA_preview_256x256.png b/assets/slike/rastline/drevesa/dead_tree_styleA_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleA_preview_256x256.png rename to assets/slike/rastline/drevesa/dead_tree_styleA_preview_256x256.png diff --git a/assets/slike/drevesa/dead_tree_styleA_sprite_32x64.png b/assets/slike/rastline/drevesa/dead_tree_styleA_sprite_32x64.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleA_sprite_32x64.png rename to assets/slike/rastline/drevesa/dead_tree_styleA_sprite_32x64.png diff --git a/assets/slike/drevesa/dead_tree_styleB_1024x1024.png b/assets/slike/rastline/drevesa/dead_tree_styleB_1024x1024.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleB_1024x1024.png rename to assets/slike/rastline/drevesa/dead_tree_styleB_1024x1024.png diff --git a/assets/slike/drevesa/dead_tree_styleB_preview_256x256.png b/assets/slike/rastline/drevesa/dead_tree_styleB_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleB_preview_256x256.png rename to assets/slike/rastline/drevesa/dead_tree_styleB_preview_256x256.png diff --git a/assets/slike/drevesa/dead_tree_styleB_sprite_32x64.png b/assets/slike/rastline/drevesa/dead_tree_styleB_sprite_32x64.png similarity index 100% rename from assets/slike/drevesa/dead_tree_styleB_sprite_32x64.png rename to assets/slike/rastline/drevesa/dead_tree_styleB_sprite_32x64.png diff --git a/assets/slike/drevesa/oak_tree_stylea.png b/assets/slike/rastline/drevesa/oak_tree_stylea.png similarity index 100% rename from assets/slike/drevesa/oak_tree_stylea.png rename to assets/slike/rastline/drevesa/oak_tree_stylea.png diff --git a/assets/slike/drevesa/oak_tree_styleb.png b/assets/slike/rastline/drevesa/oak_tree_styleb.png similarity index 100% rename from assets/slike/drevesa/oak_tree_styleb.png rename to assets/slike/rastline/drevesa/oak_tree_styleb.png diff --git a/assets/slike/drevesa/tree_cherry_1024x1024.png b/assets/slike/rastline/drevesa/tree_cherry_1024x1024.png similarity index 100% rename from assets/slike/drevesa/tree_cherry_1024x1024.png rename to assets/slike/rastline/drevesa/tree_cherry_1024x1024.png diff --git a/assets/slike/drevesa/tree_cherry_preview_256x256.png b/assets/slike/rastline/drevesa/tree_cherry_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/tree_cherry_preview_256x256.png rename to assets/slike/rastline/drevesa/tree_cherry_preview_256x256.png diff --git a/assets/slike/drevesa/tree_dead_1024x1024.png b/assets/slike/rastline/drevesa/tree_dead_1024x1024.png similarity index 100% rename from assets/slike/drevesa/tree_dead_1024x1024.png rename to assets/slike/rastline/drevesa/tree_dead_1024x1024.png diff --git a/assets/slike/drevesa/tree_dead_preview_256x256.png b/assets/slike/rastline/drevesa/tree_dead_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/tree_dead_preview_256x256.png rename to assets/slike/rastline/drevesa/tree_dead_preview_256x256.png diff --git a/assets/slike/drevesa/tree_oak_1024x1024.png b/assets/slike/rastline/drevesa/tree_oak_1024x1024.png similarity index 100% rename from assets/slike/drevesa/tree_oak_1024x1024.png rename to assets/slike/rastline/drevesa/tree_oak_1024x1024.png diff --git a/assets/slike/drevesa/tree_oak_preview_256x256.png b/assets/slike/rastline/drevesa/tree_oak_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/tree_oak_preview_256x256.png rename to assets/slike/rastline/drevesa/tree_oak_preview_256x256.png diff --git a/assets/slike/drevesa/tree_pine_1024x1024.png b/assets/slike/rastline/drevesa/tree_pine_1024x1024.png similarity index 100% rename from assets/slike/drevesa/tree_pine_1024x1024.png rename to assets/slike/rastline/drevesa/tree_pine_1024x1024.png diff --git a/assets/slike/drevesa/tree_pine_preview_256x256.png b/assets/slike/rastline/drevesa/tree_pine_preview_256x256.png similarity index 100% rename from assets/slike/drevesa/tree_pine_preview_256x256.png rename to assets/slike/rastline/drevesa/tree_pine_preview_256x256.png diff --git a/scripts/cleanup_structure.py b/scripts/cleanup_structure.py new file mode 100644 index 000000000..da64d2462 --- /dev/null +++ b/scripts/cleanup_structure.py @@ -0,0 +1,134 @@ +#!/usr/bin/env python3 +""" +Clean up assets/slike/ - move everything to proper locations +""" + +import shutil +from pathlib import Path + +REPO = Path("/Users/davidkotnik/repos/novafarma") +SLIKE = REPO / "assets/slike" + +# Anomalous zones (should be in root, but visible) +ANOMALOUS = [ + "amazonas", "arctic_zone", "atlantis", "bamboo_forest", + "catacombs", "chernobyl", "crystal_caves", "deep_ocean", + "dinozavri", "egyptian_desert", "endless_forest", "floating_islands", + "loch_ness", "mushroom_forest", "mythical_highlands", "shadow_realm", + "volcanic_zone", "wasteland" +] + +# Numbered biomes (should be in biomi/) +NUMBERED_BIOMES = [ + "01_dolina_farm", "02_temni_gozd", "03_zapusceno_mesto", + "04_zapuscena_tovarna", "05_nuklearna_cona", "06_podzemni_kompleks", + "07_ledena_divjina", "08_vulkanska_oblast", "09_gost_gozd" +] + +print("="*70) +print("๐Ÿงน CLEANUP - Moving items to proper folders") +print("="*70) + +# Check if biomi/ exists, check content +biomi_folder = SLIKE / "biomi" +if biomi_folder.exists(): + print(f"\nโœ… biomi/ exists") + numbered = list(biomi_folder.glob("*/")) + print(f" Contains: {len(numbered)} folders") + for f in numbered: + print(f" - {f.name}") + +# Move old hladno/strelno into orozje/ +hladno = SLIKE / "hladno" +strelno = SLIKE / "strelno" +orozje = SLIKE / "orozje" + +if hladno.exists(): + print(f"\n๐Ÿ“ฆ Moving hladno/ โ†’ orozje/hladno/") + dest = orozje / "hladno" + if not dest.exists(): + shutil.move(str(hladno), str(dest)) + print(f" โœ… Moved") + else: + print(f" โš ๏ธ Destination exists, merging...") + for item in hladno.glob("*"): + if not (dest / item.name).exists(): + shutil.move(str(item), str(dest / item.name)) + hladno.rmdir() + print(f" โœ… Merged & removed") + +if strelno.exists(): + print(f"\n๐Ÿ“ฆ Moving strelno/ โ†’ orozje/strelno/") + dest = orozje / "strelno" + if not dest.exists(): + shutil.move(str(strelno), str(dest)) + print(f" โœ… Moved") + else: + print(f" โš ๏ธ Destination exists, merging...") + for item in strelno.glob("*"): + if not (dest / item.name).exists(): + shutil.move(str(item), str(dest / item.name)) + strelno.rmdir() + print(f" โœ… Merged & removed") + +# Move drevesa/ into rastline/ +drevesa = SLIKE / "drevesa" +rastline = SLIKE / "rastline" + +if drevesa.exists(): + print(f"\n๐Ÿ“ฆ Moving drevesa/ โ†’ rastline/drevesa/") + dest = rastline / "drevesa" + if not dest.exists(): + shutil.move(str(drevesa), str(dest)) + print(f" โœ… Moved") + else: + print(f" โš ๏ธ Destination exists, merging...") + for item in drevesa.glob("*"): + if not (dest / item.name).exists(): + shutil.move(str(item), str(dest / item.name)) + drevesa.rmdir() + print(f" โœ… Merged & removed") + +# Check biomes/ (old folder) +biomes_old = SLIKE / "biomes" +if biomes_old.exists(): + print(f"\n๐Ÿ“ฆ Old biomes/ folder found") + content = list(biomes_old.glob("*")) + if len(content) > 0: + print(f" Moving content to biomi/...") + for item in content: + dest = biomi_folder / item.name + if not dest.exists(): + shutil.move(str(item), str(dest)) + print(f" โœ… {item.name}") + + # Remove if empty + if len(list(biomes_old.glob("*"))) == 0: + biomes_old.rmdir() + print(f" โœ… Removed empty biomes/") + +print("\n" + "="*70) +print("โœ… CLEANUP COMPLETE!") +print("="*70) + +# Final structure +print("\n๐Ÿ“‚ FINAL STRUCTURE:") +print(f"\nMain folders (should be visible in assets/slike/):") +print(f" โœ… liki/ - characters") +print(f" โœ… predmeti/ - items") +print(f" โœ… orozje/ - weapons") +print(f" โœ… rastline/ - plants") +print(f" โœ… efekti/ - effects") +print(f" โœ… sovrazniki/ - enemies") +print(f" โœ… biomi/ - numbered biomes") +print(f" โœ… zgradbe/ - buildings") +print(f" โœ… ui/ - UI elements") +print(f" โœ… cutscenes/ - cutscenes") + +print(f"\nAnomalous zones (18 folders):") +for zone in ANOMALOUS: + zone_path = SLIKE / zone + status = "โœ…" if zone_path.exists() else "โŒ" + print(f" {status} {zone}/") + +print(f"\nFolder count: {len(list(SLIKE.glob('*/')))} total")