diff --git a/source/world.adb b/source/world.adb index 4e74040..5b306cb 100644 --- a/source/world.adb +++ b/source/world.adb @@ -81,7 +81,7 @@ package body world is end loop; -- for index in 1 .. landmark_limit loop - map.landmarks (index).index := core.random (0, 9); + map.landmarks (index).index := core.random (0, landmark_count - 1); map.landmarks (index).x := core.random (6, map.width - 6); map.landmarks (index).y := core.random (6, map.height - 6); -- diff --git a/source/world.ads b/source/world.ads index db2a72d..b718f57 100644 --- a/source/world.ads +++ b/source/world.ads @@ -16,7 +16,9 @@ package world is type landmark_index is ( dead_tree, mossy_rock, palm_tree, pine_tree, pine_forest, reeds, - rock, snowed_pine_tree, snowed_rock, spiky_rock + rock, snowed_pine_tree, snowed_rock, spiky_rock, wooden_sign, wooden_arrow_sign, + rune_stone, snowed_rune_stone, mossy_rune_stone, snowed_pine_forest, hyacinths, orchids, + asters, daffodils ); type landmark_trait is record @@ -56,18 +58,29 @@ package world is landmarks : array (landmark_index) of core.sprite; landmark_limit : constant integer := 120; + landmark_count : constant natural := landmark_index'pos (landmark_index'last) + 1; trait : constant array (landmark_index) of landmark_trait := ( - dead_tree => (ash, true, 1), - mossy_rock => (swamp, true, 1), - palm_tree => (sand, true, 4), - pine_tree => (grass, true, 4), - pine_forest => (grass, true, 4), - reeds => (swamp, false, 4), - rock => (sand, true, 1), - snowed_pine_tree => (snow, true, 4), - snowed_rock => (snow, true, 1), - spiky_rock => (ash, true, 1) + dead_tree => (ash, true, 1), + mossy_rock => (swamp, true, 1), + palm_tree => (sand, true, 4), + pine_tree => (grass, true, 4), + pine_forest => (grass, true, 4), + reeds => (swamp, false, 4), + rock => (sand, true, 1), + snowed_pine_tree => (snow, true, 4), + snowed_rock => (snow, true, 1), + spiky_rock => (ash, true, 1), + wooden_sign => (grass, false, 1), + wooden_arrow_sign => (grass, false, 1), + rune_stone => (grass, true, 4), + snowed_rune_stone => (snow, true, 1), + mossy_rune_stone => (swamp, true, 4), + snowed_pine_forest => (snow, true, 4), + hyacinths => (grass, false, 1), + orchids => (grass, false, 1), + asters => (grass, false, 1), + daffodils => (grass, false, 1) ); map : information; diff --git a/sprite/world/landmark/asters.png b/sprite/world/landmark/asters.png new file mode 100644 index 0000000..291186d Binary files /dev/null and b/sprite/world/landmark/asters.png differ diff --git a/sprite/world/landmark/daffodils.png b/sprite/world/landmark/daffodils.png new file mode 100644 index 0000000..ba6728e Binary files /dev/null and b/sprite/world/landmark/daffodils.png differ diff --git a/sprite/world/landmark/hyacinths.png b/sprite/world/landmark/hyacinths.png new file mode 100644 index 0000000..9e00f8d Binary files /dev/null and b/sprite/world/landmark/hyacinths.png differ diff --git a/sprite/world/landmark/mossy_rune_stone.png b/sprite/world/landmark/mossy_rune_stone.png new file mode 100644 index 0000000..939c090 Binary files /dev/null and b/sprite/world/landmark/mossy_rune_stone.png differ diff --git a/sprite/world/landmark/orchids.png b/sprite/world/landmark/orchids.png new file mode 100644 index 0000000..93d6cc6 Binary files /dev/null and b/sprite/world/landmark/orchids.png differ diff --git a/sprite/world/landmark/rune_stone.png b/sprite/world/landmark/rune_stone.png new file mode 100644 index 0000000..efa331e Binary files /dev/null and b/sprite/world/landmark/rune_stone.png differ diff --git a/sprite/world/landmark/snowed_pine_forest.png b/sprite/world/landmark/snowed_pine_forest.png new file mode 100644 index 0000000..99746ed Binary files /dev/null and b/sprite/world/landmark/snowed_pine_forest.png differ diff --git a/sprite/world/landmark/snowed_rune_stone.png b/sprite/world/landmark/snowed_rune_stone.png new file mode 100644 index 0000000..4d4d687 Binary files /dev/null and b/sprite/world/landmark/snowed_rune_stone.png differ diff --git a/sprite/world/landmark/wooden_arrow_sign.png b/sprite/world/landmark/wooden_arrow_sign.png new file mode 100644 index 0000000..19ef979 Binary files /dev/null and b/sprite/world/landmark/wooden_arrow_sign.png differ diff --git a/sprite/world/landmark/wooden_sign.png b/sprite/world/landmark/wooden_sign.png new file mode 100644 index 0000000..1cca4a2 Binary files /dev/null and b/sprite/world/landmark/wooden_sign.png differ