From 05e2e5dfd648e3ceb6c69b4525ac3985bd25fbcb Mon Sep 17 00:00:00 2001 From: xolatile Date: Mon, 10 Jun 2024 07:31:21 -0400 Subject: [PATCH] Moved some folders related to world data... --- game/{world/terrain => biome}/ash.png | Bin game/{world/terrain => biome}/grass.png | Bin game/{world/terrain => biome}/rough.png | Bin game/{world/terrain => biome}/sand.png | Bin game/{world/terrain => biome}/snow.png | Bin game/{world/terrain => biome}/swamp.png | Bin game/{world => }/landmark/asters.png | Bin game/{world => }/landmark/birch_tree.png | Bin game/{world => }/landmark/daffodils.png | Bin game/{world => }/landmark/dead_tree.png | Bin game/{world => }/landmark/fir_tree.png | Bin game/{world => }/landmark/grave.png | Bin game/{world => }/landmark/humble_grave.png | Bin game/{world => }/landmark/hyacinths.png | Bin game/{world => }/landmark/mossy_rock.png | Bin game/{world => }/landmark/mossy_rune_stone.png | Bin game/{world => }/landmark/oak_tree.png | Bin game/{world => }/landmark/old_willow_tree.png | Bin game/{world => }/landmark/orchids.png | Bin game/{world => }/landmark/palm_tree.png | Bin game/{world => }/landmark/pine_forest.png | Bin game/{world => }/landmark/pine_tree.png | Bin game/{world => }/landmark/reeds.png | Bin game/{world => }/landmark/rock.png | Bin game/{world => }/landmark/royal_grave.png | Bin game/{world => }/landmark/rune_stone.png | Bin game/{world => }/landmark/snowed_pine_forest.png | Bin game/{world => }/landmark/snowed_pine_tree.png | Bin game/{world => }/landmark/snowed_rock.png | Bin game/{world => }/landmark/snowed_rune_stone.png | Bin game/{world => }/landmark/spiky_rock.png | Bin game/{world => }/landmark/wooden_arrow_sign.png | Bin game/{world => }/landmark/wooden_sign.png | Bin game/{world => }/landmark/wooden_wide_sign.png | Bin game/{world => }/location/apple_tree.png | Bin game/{world => }/location/banana_tree.png | Bin game/{world => }/location/cherry_tree.png | Bin game/{world => }/location/huge_ancient_urn.png | Bin game/{world => }/location/lemon_tree.png | Bin game/{world => }/location/old_dwarven_grave.png | Bin game/{world => }/location/orange_tree.png | Bin game/{world => }/location/peach_tree.png | Bin game/{world => }/location/pear_tree.png | Bin game/{world => }/location/plum_tree.png | Bin game/{world => }/location/well_of_agility.png | Bin game/{world => }/location/well_of_knowledge.png | Bin game/{world => }/location/well_of_strength.png | Bin source/world.adb | 18 +++++++----------- 48 files changed, 7 insertions(+), 11 deletions(-) rename game/{world/terrain => biome}/ash.png (100%) rename game/{world/terrain => biome}/grass.png (100%) rename game/{world/terrain => biome}/rough.png (100%) rename game/{world/terrain => biome}/sand.png (100%) rename game/{world/terrain => biome}/snow.png (100%) rename game/{world/terrain => biome}/swamp.png (100%) rename game/{world => }/landmark/asters.png (100%) rename game/{world => }/landmark/birch_tree.png (100%) rename game/{world => }/landmark/daffodils.png (100%) rename game/{world => }/landmark/dead_tree.png (100%) rename game/{world => }/landmark/fir_tree.png (100%) rename game/{world => }/landmark/grave.png (100%) rename game/{world => }/landmark/humble_grave.png (100%) rename game/{world => }/landmark/hyacinths.png (100%) rename game/{world => }/landmark/mossy_rock.png (100%) rename game/{world => }/landmark/mossy_rune_stone.png (100%) rename game/{world => }/landmark/oak_tree.png (100%) rename game/{world => }/landmark/old_willow_tree.png (100%) rename game/{world => }/landmark/orchids.png (100%) rename game/{world => }/landmark/palm_tree.png (100%) rename game/{world => }/landmark/pine_forest.png (100%) rename game/{world => }/landmark/pine_tree.png (100%) rename game/{world => }/landmark/reeds.png (100%) rename game/{world => }/landmark/rock.png (100%) rename game/{world => }/landmark/royal_grave.png (100%) rename game/{world => }/landmark/rune_stone.png (100%) rename game/{world => }/landmark/snowed_pine_forest.png (100%) rename game/{world => }/landmark/snowed_pine_tree.png (100%) rename game/{world => }/landmark/snowed_rock.png (100%) rename game/{world => }/landmark/snowed_rune_stone.png (100%) rename game/{world => }/landmark/spiky_rock.png (100%) rename game/{world => }/landmark/wooden_arrow_sign.png (100%) rename game/{world => }/landmark/wooden_sign.png (100%) rename game/{world => }/landmark/wooden_wide_sign.png (100%) rename game/{world => }/location/apple_tree.png (100%) rename game/{world => }/location/banana_tree.png (100%) rename game/{world => }/location/cherry_tree.png (100%) rename game/{world => }/location/huge_ancient_urn.png (100%) rename game/{world => }/location/lemon_tree.png (100%) rename game/{world => }/location/old_dwarven_grave.png (100%) rename game/{world => }/location/orange_tree.png (100%) rename game/{world => }/location/peach_tree.png (100%) rename game/{world => }/location/pear_tree.png (100%) rename game/{world => }/location/plum_tree.png (100%) rename game/{world => }/location/well_of_agility.png (100%) rename game/{world => }/location/well_of_knowledge.png (100%) rename game/{world => }/location/well_of_strength.png (100%) diff --git a/game/world/terrain/ash.png b/game/biome/ash.png similarity index 100% rename from game/world/terrain/ash.png rename to game/biome/ash.png diff --git a/game/world/terrain/grass.png b/game/biome/grass.png similarity index 100% rename from game/world/terrain/grass.png rename to game/biome/grass.png diff --git a/game/world/terrain/rough.png b/game/biome/rough.png similarity index 100% rename from game/world/terrain/rough.png rename to game/biome/rough.png diff --git a/game/world/terrain/sand.png b/game/biome/sand.png similarity index 100% rename from game/world/terrain/sand.png rename to game/biome/sand.png diff --git a/game/world/terrain/snow.png b/game/biome/snow.png similarity index 100% rename from game/world/terrain/snow.png rename to game/biome/snow.png diff --git a/game/world/terrain/swamp.png b/game/biome/swamp.png similarity index 100% rename from game/world/terrain/swamp.png rename to game/biome/swamp.png diff --git a/game/world/landmark/asters.png b/game/landmark/asters.png similarity index 100% rename from game/world/landmark/asters.png rename to game/landmark/asters.png diff --git a/game/world/landmark/birch_tree.png b/game/landmark/birch_tree.png similarity index 100% rename from game/world/landmark/birch_tree.png rename to game/landmark/birch_tree.png diff --git a/game/world/landmark/daffodils.png b/game/landmark/daffodils.png similarity index 100% rename from game/world/landmark/daffodils.png rename to game/landmark/daffodils.png diff --git a/game/world/landmark/dead_tree.png b/game/landmark/dead_tree.png similarity index 100% rename from game/world/landmark/dead_tree.png rename to game/landmark/dead_tree.png diff --git a/game/world/landmark/fir_tree.png b/game/landmark/fir_tree.png similarity index 100% rename from game/world/landmark/fir_tree.png rename to game/landmark/fir_tree.png diff --git a/game/world/landmark/grave.png b/game/landmark/grave.png similarity index 100% rename from game/world/landmark/grave.png rename to game/landmark/grave.png diff --git a/game/world/landmark/humble_grave.png b/game/landmark/humble_grave.png similarity index 100% rename from game/world/landmark/humble_grave.png rename to game/landmark/humble_grave.png diff --git a/game/world/landmark/hyacinths.png b/game/landmark/hyacinths.png similarity index 100% rename from game/world/landmark/hyacinths.png rename to game/landmark/hyacinths.png diff --git a/game/world/landmark/mossy_rock.png b/game/landmark/mossy_rock.png similarity index 100% rename from game/world/landmark/mossy_rock.png rename to game/landmark/mossy_rock.png diff --git a/game/world/landmark/mossy_rune_stone.png b/game/landmark/mossy_rune_stone.png similarity index 100% rename from game/world/landmark/mossy_rune_stone.png rename to game/landmark/mossy_rune_stone.png diff --git a/game/world/landmark/oak_tree.png b/game/landmark/oak_tree.png similarity index 100% rename from game/world/landmark/oak_tree.png rename to game/landmark/oak_tree.png diff --git a/game/world/landmark/old_willow_tree.png b/game/landmark/old_willow_tree.png similarity index 100% rename from game/world/landmark/old_willow_tree.png rename to game/landmark/old_willow_tree.png diff --git a/game/world/landmark/orchids.png b/game/landmark/orchids.png similarity index 100% rename from game/world/landmark/orchids.png rename to game/landmark/orchids.png diff --git a/game/world/landmark/palm_tree.png b/game/landmark/palm_tree.png similarity index 100% rename from game/world/landmark/palm_tree.png rename to game/landmark/palm_tree.png diff --git a/game/world/landmark/pine_forest.png b/game/landmark/pine_forest.png similarity index 100% rename from game/world/landmark/pine_forest.png rename to game/landmark/pine_forest.png diff --git a/game/world/landmark/pine_tree.png b/game/landmark/pine_tree.png similarity index 100% rename from game/world/landmark/pine_tree.png rename to game/landmark/pine_tree.png diff --git a/game/world/landmark/reeds.png b/game/landmark/reeds.png similarity index 100% rename from game/world/landmark/reeds.png rename to game/landmark/reeds.png diff --git a/game/world/landmark/rock.png b/game/landmark/rock.png similarity index 100% rename from game/world/landmark/rock.png rename to game/landmark/rock.png diff --git a/game/world/landmark/royal_grave.png b/game/landmark/royal_grave.png similarity index 100% rename from game/world/landmark/royal_grave.png rename to game/landmark/royal_grave.png diff --git a/game/world/landmark/rune_stone.png b/game/landmark/rune_stone.png similarity index 100% rename from game/world/landmark/rune_stone.png rename to game/landmark/rune_stone.png diff --git a/game/world/landmark/snowed_pine_forest.png b/game/landmark/snowed_pine_forest.png similarity index 100% rename from game/world/landmark/snowed_pine_forest.png rename to game/landmark/snowed_pine_forest.png diff --git a/game/world/landmark/snowed_pine_tree.png b/game/landmark/snowed_pine_tree.png similarity index 100% rename from game/world/landmark/snowed_pine_tree.png rename to game/landmark/snowed_pine_tree.png diff --git a/game/world/landmark/snowed_rock.png b/game/landmark/snowed_rock.png similarity index 100% rename from game/world/landmark/snowed_rock.png rename to game/landmark/snowed_rock.png diff --git a/game/world/landmark/snowed_rune_stone.png b/game/landmark/snowed_rune_stone.png similarity index 100% rename from game/world/landmark/snowed_rune_stone.png rename to game/landmark/snowed_rune_stone.png diff --git a/game/world/landmark/spiky_rock.png b/game/landmark/spiky_rock.png similarity index 100% rename from game/world/landmark/spiky_rock.png rename to game/landmark/spiky_rock.png diff --git a/game/world/landmark/wooden_arrow_sign.png b/game/landmark/wooden_arrow_sign.png similarity index 100% rename from game/world/landmark/wooden_arrow_sign.png rename to game/landmark/wooden_arrow_sign.png diff --git a/game/world/landmark/wooden_sign.png b/game/landmark/wooden_sign.png similarity index 100% rename from game/world/landmark/wooden_sign.png rename to game/landmark/wooden_sign.png diff --git a/game/world/landmark/wooden_wide_sign.png b/game/landmark/wooden_wide_sign.png similarity index 100% rename from game/world/landmark/wooden_wide_sign.png rename to game/landmark/wooden_wide_sign.png diff --git a/game/world/location/apple_tree.png b/game/location/apple_tree.png similarity index 100% rename from game/world/location/apple_tree.png rename to game/location/apple_tree.png diff --git a/game/world/location/banana_tree.png b/game/location/banana_tree.png similarity index 100% rename from game/world/location/banana_tree.png rename to game/location/banana_tree.png diff --git a/game/world/location/cherry_tree.png b/game/location/cherry_tree.png similarity index 100% rename from game/world/location/cherry_tree.png rename to game/location/cherry_tree.png diff --git a/game/world/location/huge_ancient_urn.png b/game/location/huge_ancient_urn.png similarity index 100% rename from game/world/location/huge_ancient_urn.png rename to game/location/huge_ancient_urn.png diff --git a/game/world/location/lemon_tree.png b/game/location/lemon_tree.png similarity index 100% rename from game/world/location/lemon_tree.png rename to game/location/lemon_tree.png diff --git a/game/world/location/old_dwarven_grave.png b/game/location/old_dwarven_grave.png similarity index 100% rename from game/world/location/old_dwarven_grave.png rename to game/location/old_dwarven_grave.png diff --git a/game/world/location/orange_tree.png b/game/location/orange_tree.png similarity index 100% rename from game/world/location/orange_tree.png rename to game/location/orange_tree.png diff --git a/game/world/location/peach_tree.png b/game/location/peach_tree.png similarity index 100% rename from game/world/location/peach_tree.png rename to game/location/peach_tree.png diff --git a/game/world/location/pear_tree.png b/game/location/pear_tree.png similarity index 100% rename from game/world/location/pear_tree.png rename to game/location/pear_tree.png diff --git a/game/world/location/plum_tree.png b/game/location/plum_tree.png similarity index 100% rename from game/world/location/plum_tree.png rename to game/location/plum_tree.png diff --git a/game/world/location/well_of_agility.png b/game/location/well_of_agility.png similarity index 100% rename from game/world/location/well_of_agility.png rename to game/location/well_of_agility.png diff --git a/game/world/location/well_of_knowledge.png b/game/location/well_of_knowledge.png similarity index 100% rename from game/world/location/well_of_knowledge.png rename to game/location/well_of_knowledge.png diff --git a/game/world/location/well_of_strength.png b/game/location/well_of_strength.png similarity index 100% rename from game/world/location/well_of_strength.png rename to game/location/well_of_strength.png diff --git a/source/world.adb b/source/world.adb index f5a0fdf..5e6f731 100644 --- a/source/world.adb +++ b/source/world.adb @@ -72,7 +72,7 @@ package body world is core.echo (core.comment, "Configuring world components..."); -- for index in biome.enumeration loop - biome.tiles (index) := core.import_sprite (core.folder & "/game/world/terrain/" & core.lowercase (index'image) & ".png", 4, 1); + biome.tiles (index) := core.import_sprite (core.folder & "/game/biome/" & core.lowercase (index'image) & ".png", 4, 1); end loop; -- dark := core.import_sprite (core.folder & "/game/world/dark.png", 1, 1); @@ -95,13 +95,13 @@ package body world is arrow_lower_right := core.import_sprite (core.folder & "/game/world/arrow/lower_right.png", 1, 1); -- for index in landmark.enumeration loop - landmark.game (index) := core.import_sprite (file_path => core.folder & "/game/world/landmark/" & core.lowercase (index'image) & ".png", + landmark.game (index) := core.import_sprite (file_path => core.folder & "/game/landmark/" & core.lowercase (index'image) & ".png", frames => landmark.description (index).frames, states => 1); end loop; -- for index in location.enumeration loop - location.game (index) := core.import_sprite (file_path => core.folder & "/game/world/location/" & core.lowercase (index'image) & ".png", + location.game (index) := core.import_sprite (file_path => core.folder & "/game/location/" & core.lowercase (index'image) & ".png", frames => location.description (index).frames, states => 2); end loop; @@ -213,15 +213,11 @@ package body world is map.landmarks (this) := data; -- if landmark.description (map.landmarks (this).index).clip then - declare reach_x : constant natural := landmark.game (map.landmarks (this).index).width / core.base; - reach_y : constant natural := landmark.game (map.landmarks (this).index).height / core.base; - begin - for x in 0 .. reach_x - 1 loop - for y in 0 .. reach_y - 1 loop - map.clips (map.landmarks (this).x + x, map.landmarks (this).y + y) := true; - end loop; + for x in 0 .. landmark.game (map.landmarks (this).index).width / core.base - 1 loop + for y in 0 .. landmark.game (map.landmarks (this).index).height / core.base - 1 loop + map.clips (map.landmarks (this).x + x, map.landmarks (this).y + y) := true; end loop; - end; + end loop; end if; end insert_landmark;