From 6f614dad468b4fa6ad55ae0a0f5036844fa087e0 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Tue, 7 Apr 2020 12:28:43 +0300 Subject: Implimented undergrond layer (and going to it). Changed naming convention for icons. Added textures for undergrund (U_rock and U_roche) and a texture for hole on land. Changed structure damage system (damages according to tool class and returns that many dropped item). Tiny bug fixes. --- Mundus/Data/SuperLayers/LI.cs | 2 + Mundus/Data/SuperLayers/Mobs/LMI.cs | 1 + Mundus/Data/SuperLayers/Underground.cs | 54 +++++++++++++++ Mundus/Icons/Land/Ground/L_grass.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Ground/L_hole.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Ground/L_water.png | Bin 0 -> 3297 bytes Mundus/Icons/Land/Ground/grass.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Ground/water.png | Bin 3297 -> 0 bytes Mundus/Icons/Land/Items/boulder.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Items/tree.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Materials/L_rock.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Materials/L_stick.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Materials/land_rock.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Materials/stick.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Structures/L_boulder.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Structures/L_tree.png | Bin 0 -> 4339 bytes Mundus/Icons/Project files/L_boulder.xcf | Bin 0 -> 5824 bytes Mundus/Icons/Project files/L_grass.xcf | Bin 0 -> 6403 bytes Mundus/Icons/Project files/L_hole.xcf | Bin 0 -> 4089 bytes Mundus/Icons/Project files/L_rock.xcf | Bin 0 -> 2952 bytes Mundus/Icons/Project files/L_rock_try.xcf | Bin 0 -> 4061 bytes Mundus/Icons/Project files/L_stick.xcf | Bin 0 -> 1887 bytes Mundus/Icons/Project files/L_tree.xcf | Bin 0 -> 6062 bytes Mundus/Icons/Project files/L_water.xcf | Bin 0 -> 665 bytes Mundus/Icons/Project files/U_roche.xcf | Bin 0 -> 10257 bytes Mundus/Icons/Project files/U_rock.xcf | Bin 0 -> 10242 bytes Mundus/Icons/Project files/boulder.xcf | Bin 5824 -> 0 bytes Mundus/Icons/Project files/grass.xcf | Bin 6410 -> 0 bytes Mundus/Icons/Project files/land_rock.xcf | Bin 2952 -> 0 bytes Mundus/Icons/Project files/rock_try.xcf | Bin 4061 -> 0 bytes Mundus/Icons/Project files/stick.xcf | Bin 1887 -> 0 bytes Mundus/Icons/Project files/tree.xcf | Bin 6062 -> 0 bytes Mundus/Icons/Project files/water.xcf | Bin 665 -> 0 bytes Mundus/Icons/Underground/Ground/U_roche.png | Bin 0 -> 4339 bytes Mundus/Icons/Underground/Structures/U_rock.png | Bin 0 -> 4339 bytes Mundus/Mundus.csproj | 23 ++++--- Mundus/Service/GameGenerator.cs | 4 +- Mundus/Service/Mobs/IMob.cs | 3 +- Mundus/Service/Mobs/LandMobs/Player.cs | 7 ++ Mundus/Service/Mobs/MobMovement.cs | 14 ++-- Mundus/Service/Mobs/MobTerraforming.cs | 19 ++++-- .../Generators/LandSuperLayerGenerator.cs | 62 +++++++++++++++++ .../Generators/UndergroundSuperLayerGenerator.cs | 54 +++++++++++++++ Mundus/Service/SuperLayers/GroundPresets.cs | 8 ++- Mundus/Service/SuperLayers/ImageController.cs | 17 ++--- Mundus/Service/SuperLayers/LandPresets.cs | 15 ---- .../Service/SuperLayers/LandSuperLayerGenerator.cs | 62 ----------------- Mundus/Service/SuperLayers/StructurePresets.cs | 19 ++++++ Mundus/Service/Tiles/GroundTile.cs | 2 +- .../Service/Tiles/ItemPresets/MaterialPresets.cs | 4 +- Mundus/Service/Tiles/Items/Structure.cs | 8 +-- Mundus/Views/Windows/SmallGameWindow.cs | 5 +- Mundus/gtk-gui/generated.cs | 76 +++++++++++---------- Mundus/gtk-gui/gui.stetic | 40 +++++++---- 54 files changed, 327 insertions(+), 172 deletions(-) create mode 100644 Mundus/Data/SuperLayers/Underground.cs create mode 100644 Mundus/Icons/Land/Ground/L_grass.png create mode 100644 Mundus/Icons/Land/Ground/L_hole.png create mode 100644 Mundus/Icons/Land/Ground/L_water.png delete mode 100644 Mundus/Icons/Land/Ground/grass.png delete mode 100644 Mundus/Icons/Land/Ground/water.png delete mode 100644 Mundus/Icons/Land/Items/boulder.png delete mode 100644 Mundus/Icons/Land/Items/tree.png create mode 100644 Mundus/Icons/Land/Materials/L_rock.png create mode 100644 Mundus/Icons/Land/Materials/L_stick.png delete mode 100644 Mundus/Icons/Land/Materials/land_rock.png delete mode 100644 Mundus/Icons/Land/Materials/stick.png create mode 100644 Mundus/Icons/Land/Structures/L_boulder.png create mode 100644 Mundus/Icons/Land/Structures/L_tree.png create mode 100644 Mundus/Icons/Project files/L_boulder.xcf create mode 100644 Mundus/Icons/Project files/L_grass.xcf create mode 100644 Mundus/Icons/Project files/L_hole.xcf create mode 100644 Mundus/Icons/Project files/L_rock.xcf create mode 100644 Mundus/Icons/Project files/L_rock_try.xcf create mode 100644 Mundus/Icons/Project files/L_stick.xcf create mode 100644 Mundus/Icons/Project files/L_tree.xcf create mode 100644 Mundus/Icons/Project files/L_water.xcf create mode 100644 Mundus/Icons/Project files/U_roche.xcf create mode 100644 Mundus/Icons/Project files/U_rock.xcf delete mode 100644 Mundus/Icons/Project files/boulder.xcf delete mode 100644 Mundus/Icons/Project files/grass.xcf delete mode 100644 Mundus/Icons/Project files/land_rock.xcf delete mode 100644 Mundus/Icons/Project files/rock_try.xcf delete mode 100644 Mundus/Icons/Project files/stick.xcf delete mode 100644 Mundus/Icons/Project files/tree.xcf delete mode 100644 Mundus/Icons/Project files/water.xcf create mode 100644 Mundus/Icons/Underground/Ground/U_roche.png create mode 100644 Mundus/Icons/Underground/Structures/U_rock.png create mode 100644 Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs create mode 100644 Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs delete mode 100644 Mundus/Service/SuperLayers/LandPresets.cs delete mode 100644 Mundus/Service/SuperLayers/LandSuperLayerGenerator.cs create mode 100644 Mundus/Service/SuperLayers/StructurePresets.cs diff --git a/Mundus/Data/SuperLayers/LI.cs b/Mundus/Data/SuperLayers/LI.cs index 9f43ee3..7f3a063 100644 --- a/Mundus/Data/SuperLayers/LI.cs +++ b/Mundus/Data/SuperLayers/LI.cs @@ -2,9 +2,11 @@ public static class LI { //stands for Layer Instances //add other layers public static Land Land { get; private set; } + public static Underground Underground { get; private set;} public static void CreateInstances() { Land = new Land(); + Underground = new Underground(); } } } diff --git a/Mundus/Data/SuperLayers/Mobs/LMI.cs b/Mundus/Data/SuperLayers/Mobs/LMI.cs index 4a173d9..ce4bb66 100644 --- a/Mundus/Data/SuperLayers/Mobs/LMI.cs +++ b/Mundus/Data/SuperLayers/Mobs/LMI.cs @@ -13,6 +13,7 @@ namespace Mundus.Data.Superlayers.Mobs { Player.Inventory.SetNewSizes(screenInvSize); Player.Inventory.AppendToHotbar(ToolPresets.GetAWoodenAxe()); Player.Inventory.AppendToHotbar(ToolPresets.GetAWoodenPickaxe()); + Player.Inventory.AppendToHotbar(ToolPresets.GetAWoodenShovel()); } } } diff --git a/Mundus/Data/SuperLayers/Underground.cs b/Mundus/Data/SuperLayers/Underground.cs new file mode 100644 index 0000000..1d98c2d --- /dev/null +++ b/Mundus/Data/SuperLayers/Underground.cs @@ -0,0 +1,54 @@ +using System; +using Mundus.Service.Tiles; +using Mundus.Service.Tiles.Items; + +namespace Mundus.Data.SuperLayers { + public class Underground : ISuperLayer { + private static MobTile[,] mobLayer; + private static Structure[,] structureLayer; + private static GroundTile[,] groundLayer; + + public Underground() + { } + + public MobTile GetMobLayerTile(int yPos, int xPos) { + return mobLayer[yPos, xPos]; + } + public Structure GetStructureLayerTile(int yPos, int xPos) { + return structureLayer[yPos, xPos]; + } + public GroundTile GetGroundLayerTile(int yPos, int xPos) { + return groundLayer[yPos, xPos]; + } + + public void SetMobLayer(MobTile[,] mobTiles) { + mobLayer = mobTiles; + } + public void SetMobAtPosition(MobTile tile, int yPos, int xPos) { + mobLayer[yPos, xPos] = tile; + } + public void RemoveMobFromPosition(int yPos, int xPos) { + mobLayer[yPos, xPos] = null; + } + + public void SetStructureLayer(Structure[,] itemTiles) { + structureLayer = itemTiles; + } + public void SetStructureAtPosition(Structure tile, int yPos, int xPos) { + structureLayer[yPos, xPos] = tile; + } + public void RemoveStructureFromPosition(int yPos, int xPos) { + structureLayer[yPos, xPos] = null; + } + + public void SetGroundLayer(GroundTile[,] groundTiles) { + groundLayer = groundTiles; + } + public void SetGroundAtPosition(GroundTile tile, int yPos, int xPos) { + groundLayer[yPos, xPos] = tile; + } + public void RemoveGroundFromPosition(int yPos, int xPos) { + groundLayer[yPos, xPos] = null; + } + } +} diff --git a/Mundus/Icons/Land/Ground/L_grass.png b/Mundus/Icons/Land/Ground/L_grass.png new file mode 100644 index 0000000..06c38dd Binary files /dev/null and b/Mundus/Icons/Land/Ground/L_grass.png differ diff --git a/Mundus/Icons/Land/Ground/L_hole.png b/Mundus/Icons/Land/Ground/L_hole.png new file mode 100644 index 0000000..f914050 Binary files /dev/null and b/Mundus/Icons/Land/Ground/L_hole.png differ diff --git a/Mundus/Icons/Land/Ground/L_water.png b/Mundus/Icons/Land/Ground/L_water.png new file mode 100644 index 0000000..08ede4a Binary files /dev/null and b/Mundus/Icons/Land/Ground/L_water.png differ diff --git a/Mundus/Icons/Land/Ground/grass.png b/Mundus/Icons/Land/Ground/grass.png deleted file mode 100644 index 06c38dd..0000000 Binary files a/Mundus/Icons/Land/Ground/grass.png and /dev/null differ diff --git a/Mundus/Icons/Land/Ground/water.png b/Mundus/Icons/Land/Ground/water.png deleted file mode 100644 index 08ede4a..0000000 Binary files a/Mundus/Icons/Land/Ground/water.png and /dev/null differ diff --git a/Mundus/Icons/Land/Items/boulder.png b/Mundus/Icons/Land/Items/boulder.png deleted file mode 100644 index a5db10a..0000000 Binary files a/Mundus/Icons/Land/Items/boulder.png and /dev/null differ diff --git a/Mundus/Icons/Land/Items/tree.png b/Mundus/Icons/Land/Items/tree.png deleted file mode 100644 index fcfcadd..0000000 Binary files a/Mundus/Icons/Land/Items/tree.png and /dev/null differ diff --git a/Mundus/Icons/Land/Materials/L_rock.png b/Mundus/Icons/Land/Materials/L_rock.png new file mode 100644 index 0000000..835c242 Binary files /dev/null and b/Mundus/Icons/Land/Materials/L_rock.png differ diff --git a/Mundus/Icons/Land/Materials/L_stick.png b/Mundus/Icons/Land/Materials/L_stick.png new file mode 100644 index 0000000..288a5ce Binary files /dev/null and b/Mundus/Icons/Land/Materials/L_stick.png differ diff --git a/Mundus/Icons/Land/Materials/land_rock.png b/Mundus/Icons/Land/Materials/land_rock.png deleted file mode 100644 index 835c242..0000000 Binary files a/Mundus/Icons/Land/Materials/land_rock.png and /dev/null differ diff --git a/Mundus/Icons/Land/Materials/stick.png b/Mundus/Icons/Land/Materials/stick.png deleted file mode 100644 index 288a5ce..0000000 Binary files a/Mundus/Icons/Land/Materials/stick.png and /dev/null differ diff --git a/Mundus/Icons/Land/Structures/L_boulder.png b/Mundus/Icons/Land/Structures/L_boulder.png new file mode 100644 index 0000000..a5db10a Binary files /dev/null and b/Mundus/Icons/Land/Structures/L_boulder.png differ diff --git a/Mundus/Icons/Land/Structures/L_tree.png b/Mundus/Icons/Land/Structures/L_tree.png new file mode 100644 index 0000000..fcfcadd Binary files /dev/null and b/Mundus/Icons/Land/Structures/L_tree.png differ diff --git a/Mundus/Icons/Project files/L_boulder.xcf b/Mundus/Icons/Project files/L_boulder.xcf new file mode 100644 index 0000000..a53ac41 Binary files /dev/null and b/Mundus/Icons/Project files/L_boulder.xcf differ diff --git a/Mundus/Icons/Project files/L_grass.xcf b/Mundus/Icons/Project files/L_grass.xcf new file mode 100644 index 0000000..73db095 Binary files /dev/null and b/Mundus/Icons/Project files/L_grass.xcf differ diff --git a/Mundus/Icons/Project files/L_hole.xcf b/Mundus/Icons/Project files/L_hole.xcf new file mode 100644 index 0000000..3661dda Binary files /dev/null and b/Mundus/Icons/Project files/L_hole.xcf differ diff --git a/Mundus/Icons/Project files/L_rock.xcf b/Mundus/Icons/Project files/L_rock.xcf new file mode 100644 index 0000000..71f3815 Binary files /dev/null and b/Mundus/Icons/Project files/L_rock.xcf differ diff --git a/Mundus/Icons/Project files/L_rock_try.xcf b/Mundus/Icons/Project files/L_rock_try.xcf new file mode 100644 index 0000000..aaa97ca Binary files /dev/null and b/Mundus/Icons/Project files/L_rock_try.xcf differ diff --git a/Mundus/Icons/Project files/L_stick.xcf b/Mundus/Icons/Project files/L_stick.xcf new file mode 100644 index 0000000..b4b56ff Binary files /dev/null and b/Mundus/Icons/Project files/L_stick.xcf differ diff --git a/Mundus/Icons/Project files/L_tree.xcf b/Mundus/Icons/Project files/L_tree.xcf new file mode 100644 index 0000000..4afac9e Binary files /dev/null and b/Mundus/Icons/Project files/L_tree.xcf differ diff --git a/Mundus/Icons/Project files/L_water.xcf b/Mundus/Icons/Project files/L_water.xcf new file mode 100644 index 0000000..bcbcad3 Binary files /dev/null and b/Mundus/Icons/Project files/L_water.xcf differ diff --git a/Mundus/Icons/Project files/U_roche.xcf b/Mundus/Icons/Project files/U_roche.xcf new file mode 100644 index 0000000..0f97a9c Binary files /dev/null and b/Mundus/Icons/Project files/U_roche.xcf differ diff --git a/Mundus/Icons/Project files/U_rock.xcf b/Mundus/Icons/Project files/U_rock.xcf new file mode 100644 index 0000000..35b7bf6 Binary files /dev/null and b/Mundus/Icons/Project files/U_rock.xcf differ diff --git a/Mundus/Icons/Project files/boulder.xcf b/Mundus/Icons/Project files/boulder.xcf deleted file mode 100644 index a53ac41..0000000 Binary files a/Mundus/Icons/Project files/boulder.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/grass.xcf b/Mundus/Icons/Project files/grass.xcf deleted file mode 100644 index 3070dfb..0000000 Binary files a/Mundus/Icons/Project files/grass.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/land_rock.xcf b/Mundus/Icons/Project files/land_rock.xcf deleted file mode 100644 index 71f3815..0000000 Binary files a/Mundus/Icons/Project files/land_rock.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/rock_try.xcf b/Mundus/Icons/Project files/rock_try.xcf deleted file mode 100644 index aaa97ca..0000000 Binary files a/Mundus/Icons/Project files/rock_try.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/stick.xcf b/Mundus/Icons/Project files/stick.xcf deleted file mode 100644 index b4b56ff..0000000 Binary files a/Mundus/Icons/Project files/stick.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/tree.xcf b/Mundus/Icons/Project files/tree.xcf deleted file mode 100644 index 4afac9e..0000000 Binary files a/Mundus/Icons/Project files/tree.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/water.xcf b/Mundus/Icons/Project files/water.xcf deleted file mode 100644 index bcbcad3..0000000 Binary files a/Mundus/Icons/Project files/water.xcf and /dev/null differ diff --git a/Mundus/Icons/Underground/Ground/U_roche.png b/Mundus/Icons/Underground/Ground/U_roche.png new file mode 100644 index 0000000..aff1fdc Binary files /dev/null and b/Mundus/Icons/Underground/Ground/U_roche.png differ diff --git a/Mundus/Icons/Underground/Structures/U_rock.png b/Mundus/Icons/Underground/Structures/U_rock.png new file mode 100644 index 0000000..da76bf8 Binary files /dev/null and b/Mundus/Icons/Underground/Structures/U_rock.png differ diff --git a/Mundus/Mundus.csproj b/Mundus/Mundus.csproj index fb024df..8a335fc 100644 --- a/Mundus/Mundus.csproj +++ b/Mundus/Mundus.csproj @@ -52,11 +52,7 @@ gui.stetic - - - - @@ -65,8 +61,6 @@ - - @@ -74,6 +68,14 @@ + + + + + + + + @@ -108,7 +110,6 @@ - @@ -128,7 +129,7 @@ - + @@ -136,6 +137,9 @@ + + + @@ -146,7 +150,6 @@ - @@ -158,6 +161,8 @@ + + \ No newline at end of file diff --git a/Mundus/Service/GameGenerator.cs b/Mundus/Service/GameGenerator.cs index 3538a27..7e9313a 100644 --- a/Mundus/Service/GameGenerator.cs +++ b/Mundus/Service/GameGenerator.cs @@ -2,8 +2,7 @@ using Mundus.Data; using Mundus.Data.Superlayers.Mobs; using Mundus.Data.Windows; -using Mundus.Service.SuperLayers; -using Mundus.Views.Windows; +using Mundus.Service.SuperLayers.Generators; namespace Mundus.Service { public static class GameGenerator { @@ -17,6 +16,7 @@ namespace Mundus.Service { //Add the other layers LandSuperLayerGenerator.GenerateAllLayers( MapSizes.CurrSize ); + UndergroundSuperLayerGenerator.GenerateAllLayers(MapSizes.CurrSize); } public static void GameWindowInventorySetup(string size) { diff --git a/Mundus/Service/Mobs/IMob.cs b/Mundus/Service/Mobs/IMob.cs index 9af9cb5..df60892 100644 --- a/Mundus/Service/Mobs/IMob.cs +++ b/Mundus/Service/Mobs/IMob.cs @@ -4,7 +4,8 @@ using Mundus.Service.Tiles; namespace Mundus.Service.Mobs { public interface IMob { MobTile Tile { get; } - ISuperLayer CurrSuperLayer { get; set; } + ISuperLayer CurrSuperLayer { get; set; } + ISuperLayer GetLayerUndearneathCurr(); int XPos { get; set; } int YPos { get; set; } int Health { get; set; } diff --git a/Mundus/Service/Mobs/LandMobs/Player.cs b/Mundus/Service/Mobs/LandMobs/Player.cs index 280a12f..57913a6 100644 --- a/Mundus/Service/Mobs/LandMobs/Player.cs +++ b/Mundus/Service/Mobs/LandMobs/Player.cs @@ -17,6 +17,13 @@ namespace Mundus.Service.Mobs.LandMobs { this.Tile = tile; this.Inventory = new Inventory(inventorySize); this.Health = health; + } + + public ISuperLayer GetLayerUndearneathCurr() { + if (CurrSuperLayer == LI.Land) { + return LI.Underground; + } + return null; } } } diff --git a/Mundus/Service/Mobs/MobMovement.cs b/Mundus/Service/Mobs/MobMovement.cs index b043677..e97ead6 100644 --- a/Mundus/Service/Mobs/MobMovement.cs +++ b/Mundus/Service/Mobs/MobMovement.cs @@ -15,18 +15,20 @@ namespace Mundus.Service.Mobs { public static void ChangePosition(IMob mob, int yPos, int xPos) { if (Walkable(mob, yPos, xPos)) { - mob.CurrSuperLayer.RemoveMobFromPosition( mob.YPos, mob.XPos ); + mob.CurrSuperLayer.RemoveMobFromPosition(mob.YPos, mob.XPos); + + if (mob.CurrSuperLayer.GetGroundLayerTile(yPos, xPos) == null) { + mob.CurrSuperLayer = mob.GetLayerUndearneathCurr(); + } + mob.YPos = yPos; mob.XPos = xPos; - mob.CurrSuperLayer.SetMobAtPosition( mob.Tile, yPos, xPos ); + mob.CurrSuperLayer.SetMobAtPosition(mob.Tile, yPos, xPos); } } private static bool Walkable(IMob mob, int yPos, int xPos) { - //Mobs can only walk on free ground (no structure on top) or walkable structures - if (mob.CurrSuperLayer.GetGroundLayerTile(yPos, xPos) == null) { - return false; - } + //Mobs can only walk on free ground (no structure on top) or walkable structures return (mob.CurrSuperLayer.GetStructureLayerTile(yPos, xPos) == null || mob.CurrSuperLayer.GetStructureLayerTile(yPos, xPos).IsWalkable) || mob.CurrSuperLayer.GetMobLayerTile(yPos, xPos) != null; diff --git a/Mundus/Service/Mobs/MobTerraforming.cs b/Mundus/Service/Mobs/MobTerraforming.cs index 485c047..9ddf087 100644 --- a/Mundus/Service/Mobs/MobTerraforming.cs +++ b/Mundus/Service/Mobs/MobTerraforming.cs @@ -19,7 +19,12 @@ namespace Mundus.Service.Mobs { if (selGround.ReqShovelClass <= selTool.Class) { LMI.Player.CurrSuperLayer.SetGroundAtPosition(null, mapYPos, mapXPos); - if (LMI.Player.Inventory.Items.Contains(null)) { + ISuperLayer under = LMI.Player.GetLayerUndearneathCurr(); + if (under != null) { + under.RemoveStructureFromPosition(mapYPos, mapXPos); + } + + if (LMI.Player.Inventory.Items.Contains(null) && selGround.DroppedMaterial != null) { LMI.Player.Inventory.AppendToItems(new Material(selGround.DroppedMaterial)); } } @@ -27,12 +32,16 @@ namespace Mundus.Service.Mobs { else if (LMI.Player.CurrSuperLayer.GetStructureLayerTile(mapYPos, mapXPos) != null) { var selStructure = LMI.Player.CurrSuperLayer.GetStructureLayerTile(mapYPos, mapXPos); - if (selStructure.ReqToolType == selTool.Type && selStructure.ReqToolClass <= selTool.Class) { - if (LMI.Player.Inventory.Items.Contains(null)) { - LMI.Player.Inventory.AppendToItems(new Material(selStructure.DroppedMaterial)); + if (selStructure.ReqToolType == selTool.Type && selStructure.ReqToolClass <= selTool.Class) { + int damagePoints = 1 + (selTool.Class - selStructure.ReqToolClass); + + if (selStructure.DroppedMaterial != null) { + for (int i = 0; (i < damagePoints && i < selStructure.Health) && LMI.Player.Inventory.Items.Contains(null); i++) { + LMI.Player.Inventory.AppendToItems(new Material(selStructure.DroppedMaterial)); + } } - if (!selStructure.Damage()) { + if (!selStructure.Damage(damagePoints)) { LMI.Player.CurrSuperLayer.SetStructureAtPosition(null, mapYPos, mapXPos); } } diff --git a/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs new file mode 100644 index 0000000..b414f9b --- /dev/null +++ b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs @@ -0,0 +1,62 @@ +using System; +using Mundus.Data.Superlayers.Mobs; +using Mundus.Data.SuperLayers; +using Mundus.Data.Tiles; +using Mundus.Service.Tiles; +using Mundus.Service.Tiles.Items; + +namespace Mundus.Service.SuperLayers.Generators { + public static class LandSuperLayerGenerator { + private static Random rnd; + + public static void GenerateAllLayers(int size) { + LI.Land.SetMobLayer(GenerateMobLayer(size)); + LI.Land.SetGroundLayer(GenerateGroundLayer(size)); + LI.Land.SetStructureLayer(GenerateStructureLayer(size)); + } + + private static MobTile[,] GenerateMobLayer(int size) { + MobTile[,] tiles = new MobTile[size, size]; + + for (int col = 0; col < size; col++) { + for (int row = 0; row < size; row++) { + if (col == size / 2 && row == size / 2) { + LMI.Player.YPos = row; + LMI.Player.XPos = col; + LMI.Player.CurrSuperLayer = LI.Land; + tiles[col, row] = LMI.Player.Tile; + } + } + } + return tiles; + } + + private static GroundTile[,] GenerateGroundLayer(int size) { + rnd = new Random(); + GroundTile[,] tiles = new GroundTile[size, size]; + + for(int col = 0; col < size; col++) { + for(int row = 0; row < size; row++) { + tiles[col, row] = GroundPresets.GetALGrass(); + } + } + return tiles; + } + + private static Structure[,] GenerateStructureLayer(int size) { + Structure[,] tiles = new Structure[size, size]; + + for (int col = 0; col < size; col++) { + for (int row = 0; row < size; row++) { + if (rnd.Next( 0, 50 ) == 1) { + tiles[col, row] = StructurePresets.GetALBoulder(); + } + if (rnd.Next(0, 10) == 1) { + tiles[col, row] = StructurePresets.GetALTree(); + } + } + } + return tiles; + } + } +} diff --git a/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs new file mode 100644 index 0000000..0e77336 --- /dev/null +++ b/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs @@ -0,0 +1,54 @@ +using System; +using Mundus.Data.Superlayers.Mobs; +using Mundus.Data.SuperLayers; +using Mundus.Service.Tiles; +using Mundus.Service.Tiles.Items; + +namespace Mundus.Service.SuperLayers.Generators { + public static class UndergroundSuperLayerGenerator { + private static Random rnd; + + public static void GenerateAllLayers(int size) { + LI.Underground.SetMobLayer(GenerateMobLayer(size)); + LI.Underground.SetGroundLayer(GenerateGroundLayer(size)); + LI.Underground.SetStructureLayer(GenerateStructureLayer(size)); + } + + private static MobTile[,] GenerateMobLayer(int size) { + MobTile[,] tiles = new MobTile[size, size]; + + for (int col = 0; col < size; col++) { + for (int row = 0; row < size; row++) { + + } + } + return tiles; + } + + private static GroundTile[,] GenerateGroundLayer(int size) { + rnd = new Random(); + GroundTile[,] tiles = new GroundTile[size, size]; + + for (int col = 0; col < size; col++) { + for (int row = 0; row < size; row++) { + tiles[col, row] = GroundPresets.GetAURoche(); + } + } + return tiles; + } + + private static Structure[,] GenerateStructureLayer(int size) { + Structure[,] tiles = new Structure[size, size]; + + for (int col = 0; col < size; col++) { + for (int row = 0; row < size; row++) { + tiles[col, row] = StructurePresets.GetAURock(); + if (rnd.Next(0, 10) == 1) { + tiles[col, row] = null; + } + } + } + return tiles; + } + } +} diff --git a/Mundus/Service/SuperLayers/GroundPresets.cs b/Mundus/Service/SuperLayers/GroundPresets.cs index bfdcf51..6feb1c6 100644 --- a/Mundus/Service/SuperLayers/GroundPresets.cs +++ b/Mundus/Service/SuperLayers/GroundPresets.cs @@ -8,8 +8,12 @@ namespace Mundus.Service.SuperLayers { /// Returns a new instance of the grass ground tile /// /// New instance of the grass ground tile - public static GroundTile GetAGrass() { - return new GroundTile("grass", 1, MaterialPresets.GetALandRock()); + public static GroundTile GetALGrass() { + return new GroundTile("L_grass", 1); + } + + public static GroundTile GetAURoche() { + return new GroundTile("U_roche", 10); } } } diff --git a/Mundus/Service/SuperLayers/ImageController.cs b/Mundus/Service/SuperLayers/ImageController.cs index 022c61c..941affe 100644 --- a/Mundus/Service/SuperLayers/ImageController.cs +++ b/Mundus/Service/SuperLayers/ImageController.cs @@ -13,28 +13,23 @@ namespace Mundus.Service.SuperLayers { //Layer 0 is GroundLayer, 1 is ItemLayer and 2 is Moblayer if (layer == 0) { - if (superLayer.GetGroundLayerTile( row, col ) == null) { - img = new Image( "blank", IconSize.Dnd ); - } - else { - img = new Image( superLayer.GetGroundLayerTile( row, col ).stock_id, IconSize.Dnd ); - } + img = new Image(GetGroundImage(row, col).Stock, IconSize.Dnd); } else if (layer == 1 && superLayer.GetStructureLayerTile( row, col ) != null) { - img = new Image( superLayer.GetStructureLayerTile( row, col ).stock_id, IconSize.Dnd ); + img = new Image(GetStructureImage(row, col).Stock, IconSize.Dnd ); } else if (layer == 2 && superLayer.GetMobLayerTile( row, col ) != null) { - img = new Image( superLayer.GetMobLayerTile( row, col ).stock_id, IconSize.Dnd ); + img = new Image(superLayer.GetMobLayerTile( row, col ).stock_id, IconSize.Dnd); } return img; } - //Return a tile if it exists, otherwise return the "blank" icon + public static Image GetGroundImage(int row, int col) { ISuperLayer superLayer = LMI.Player.CurrSuperLayer; - Image img = new Image("blank", IconSize.Dnd); + Image img = new Image("L_hole", IconSize.Dnd); if (row >= 0 && col >= 0 && col < MapSizes.CurrSize && row < MapSizes.CurrSize && superLayer.GetGroundLayerTile( row, col ) != null) { @@ -44,7 +39,7 @@ namespace Mundus.Service.SuperLayers { } //Return a tile if it exists, otherwise return the "blank" icon - public static Image GetItemImage(int row, int col) { + public static Image GetStructureImage(int row, int col) { ISuperLayer superLayer = LMI.Player.CurrSuperLayer; Image img = new Image( "blank", IconSize.Dnd ); diff --git a/Mundus/Service/SuperLayers/LandPresets.cs b/Mundus/Service/SuperLayers/LandPresets.cs deleted file mode 100644 index 2357711..0000000 --- a/Mundus/Service/SuperLayers/LandPresets.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Mundus.Data.Tiles; -using Mundus.Service.Tiles.ItemPresets; -using Mundus.Service.Tiles.Items; - -namespace Mundus.Service.SuperLayers { - public static class LandPresets { - public static Structure GetABoulder() { - return new Structure("boulder", 10, ToolTypes.Pickaxe, 1, false, MaterialPresets.GetALandRock()); - } - - public static Structure GetATree() { - return new Structure("tree", 5, ToolTypes.Axe, 1, false, MaterialPresets.GetAStick()); - } - } -} diff --git a/Mundus/Service/SuperLayers/LandSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/LandSuperLayerGenerator.cs deleted file mode 100644 index fca20af..0000000 --- a/Mundus/Service/SuperLayers/LandSuperLayerGenerator.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using Mundus.Data.Superlayers.Mobs; -using Mundus.Data.SuperLayers; -using Mundus.Data.Tiles; -using Mundus.Service.Tiles; -using Mundus.Service.Tiles.Items; - -namespace Mundus.Service.SuperLayers { - public static class LandSuperLayerGenerator { - private static Random rnd; - - public static void GenerateAllLayers(int size) { - LI.Land.SetMobLayer(GenerateMobLayer(size)); - LI.Land.SetGroundLayer(GenerateGroundLayer(size)); - LI.Land.SetStructureLayer(GenerateStructureLayer(size)); - } - - private static MobTile[,] GenerateMobLayer(int size) { - MobTile[,] tiles = new MobTile[size, size]; - - for (int col = 0; col < size; col++) { - for (int row = 0; row < size; row++) { - if (col == size / 2 && row == size / 2) { - LMI.Player.YPos = row; - LMI.Player.XPos = col; - LMI.Player.CurrSuperLayer = LI.Land; - tiles[col, row] = LMI.Player.Tile; - } - } - } - return tiles; - } - - private static GroundTile[,] GenerateGroundLayer(int size) { - rnd = new Random(); - GroundTile[,] tiles = new GroundTile[size, size]; - - for(int col = 0; col < size; col++) { - for(int row = 0; row < size; row++) { - tiles[col, row] = GroundPresets.GetAGrass(); - } - } - return tiles; - } - - private static Structure[,] GenerateStructureLayer(int size) { - Structure[,] tiles = new Structure[size, size]; - - for (int col = 0; col < size; col++) { - for (int row = 0; row < size; row++) { - if (rnd.Next( 0, 50 ) == 1) { - tiles[col, row] = LandPresets.GetABoulder(); - } - if (rnd.Next(0, 10) == 1) { - tiles[col, row] = LandPresets.GetATree(); - } - } - } - return tiles; - } - } -} diff --git a/Mundus/Service/SuperLayers/StructurePresets.cs b/Mundus/Service/SuperLayers/StructurePresets.cs new file mode 100644 index 0000000..a1219d4 --- /dev/null +++ b/Mundus/Service/SuperLayers/StructurePresets.cs @@ -0,0 +1,19 @@ +using Mundus.Data.Tiles; +using Mundus.Service.Tiles.ItemPresets; +using Mundus.Service.Tiles.Items; + +namespace Mundus.Service.SuperLayers { + public static class StructurePresets { + public static Structure GetALBoulder() { + return new Structure("L_boulder", 7, ToolTypes.Pickaxe, 1, false, MaterialPresets.GetALandRock()); + } + + public static Structure GetALTree() { + return new Structure("L_tree", 5, ToolTypes.Axe, 1, false, MaterialPresets.GetAStick()); + } + + public static Structure GetAURock() { + return new Structure("U_rock", 10, ToolTypes.Pickaxe, 2); + } + } +} diff --git a/Mundus/Service/Tiles/GroundTile.cs b/Mundus/Service/Tiles/GroundTile.cs index 6e89781..20f484e 100644 --- a/Mundus/Service/Tiles/GroundTile.cs +++ b/Mundus/Service/Tiles/GroundTile.cs @@ -8,7 +8,7 @@ namespace Mundus.Service.Tiles { public int ReqShovelClass { get; private set; } public Material DroppedMaterial { get; private set; } - public GroundTile(string stock_id, int reqShovelClass, Material droppedMaterial) { + public GroundTile(string stock_id, int reqShovelClass, Material droppedMaterial = null) { this.stock_id = stock_id; this.ReqShovelClass = reqShovelClass; this.DroppedMaterial = droppedMaterial; diff --git a/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs b/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs index 655ba8c..6211e98 100644 --- a/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs +++ b/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs @@ -4,11 +4,11 @@ using Mundus.Service.Tiles.Items; namespace Mundus.Service.Tiles.ItemPresets { public static class MaterialPresets { public static Material GetALandRock() { - return new Material("land_rock"); + return new Material("L_rock"); } public static Material GetAStick() { - return new Material("stick"); + return new Material("L_stick"); } } } diff --git a/Mundus/Service/Tiles/Items/Structure.cs b/Mundus/Service/Tiles/Items/Structure.cs index 75ed3c8..e6e784c 100644 --- a/Mundus/Service/Tiles/Items/Structure.cs +++ b/Mundus/Service/Tiles/Items/Structure.cs @@ -3,7 +3,7 @@ public int ReqToolType { get; private set; } public int ReqToolClass { get; private set; } public Material DroppedMaterial { get; private set; } - public byte Health { get; private set; } + public int Health { get; private set; } public bool IsWalkable { get; private set; } @@ -12,7 +12,7 @@ new Material(structure.DroppedMaterial.stock_id)) { } - public Structure(string stock_id, byte health, int reqToolType, int reqToolClass, bool isWalkable = false, Material droppedMaterial = null) : base(stock_id) { + public Structure(string stock_id, int health, int reqToolType, int reqToolClass, bool isWalkable = false, Material droppedMaterial = null) : base(stock_id) { this.Health = health; this.ReqToolType = reqToolType; this.ReqToolClass = reqToolClass; @@ -24,8 +24,8 @@ /// Removes 1 health from structure /// /// If the structure can still be damaged - public bool Damage() { - this.Health--; + public bool Damage(int damagePoints) { + this.Health -= damagePoints; return this.Health > 0; } diff --git a/Mundus/Views/Windows/SmallGameWindow.cs b/Mundus/Views/Windows/SmallGameWindow.cs index 1afe00f..230bffb 100644 --- a/Mundus/Views/Windows/SmallGameWindow.cs +++ b/Mundus/Views/Windows/SmallGameWindow.cs @@ -237,6 +237,9 @@ namespace Mundus.Views.Windows { } } + /// + /// Prints the lung capacity, health, hotbar items and event log + /// public void PrintMainMenu() { //Print lungs @@ -308,7 +311,7 @@ namespace Mundus.Views.Windows { //Prints the "Item layer" in map menu for (int row = Calculate.CalculateStartY(Size), maxY = Calculate.CalculateMaxY(Size), img = 1; row <= maxY; row++) { for (int col = Calculate.CalculateStartX(Size), maxX = Calculate.CalculateMaxX(Size); col <= maxX; col++, img++) { - string sName = ImageController.GetItemImage(row, col).Stock; + string sName = ImageController.GetStructureImage(row, col).Stock; switch (img) { case 1: imgI1.SetFromStock( sName, IconSize.Dnd ); break; diff --git a/Mundus/gtk-gui/generated.cs b/Mundus/gtk-gui/generated.cs index 886588a..11c091f 100644 --- a/Mundus/gtk-gui/generated.cs +++ b/Mundus/gtk-gui/generated.cs @@ -12,10 +12,10 @@ namespace Stetic { Stetic.Gui.initialized = true; global::Gtk.IconFactory w1 = new global::Gtk.IconFactory(); - global::Gtk.IconSet w2 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Ground.grass.png")); - w1.Add("grass", w2); - global::Gtk.IconSet w3 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Items.boulder.png")); - w1.Add("boulder", w3); + global::Gtk.IconSet w2 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Ground.L_grass.png")); + w1.Add("L_grass", w2); + global::Gtk.IconSet w3 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Structures.L_boulder.png")); + w1.Add("L_boulder", w3); global::Gtk.IconSet w4 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.player.png")); w1.Add("player", w4); global::Gtk.IconSet w5 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.blank.png")); @@ -24,38 +24,42 @@ namespace Stetic w1.Add("blank_hand", w6); global::Gtk.IconSet w7 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.blank_gear.png")); w1.Add("blank_gear", w7); - global::Gtk.IconSet w8 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Materials.land_rock.png")); - w1.Add("land_rock", w8); - global::Gtk.IconSet w9 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Items.tree.png")); - w1.Add("tree", w9); - global::Gtk.IconSet w10 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Ground.water.png")); - w1.Add("water", w10); - global::Gtk.IconSet w11 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.empty.png")); - w1.Add("empty", w11); - global::Gtk.IconSet w12 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.4-4.png")); - w1.Add("hearth_4-4", w12); - global::Gtk.IconSet w13 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.3-4.png")); - w1.Add("hearth_3-4", w13); - global::Gtk.IconSet w14 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.2-4.png")); - w1.Add("hearth_2-4", w14); - global::Gtk.IconSet w15 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.1-4.png")); - w1.Add("hearth_1-4", w15); - global::Gtk.IconSet w16 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Materials.stick.png")); - w1.Add("stick", w16); - global::Gtk.IconSet w17 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_pickaxe.png")); - w1.Add("stone_pickaxe", w17); - global::Gtk.IconSet w18 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_axe.png")); - w1.Add("stone_axe", w18); - global::Gtk.IconSet w19 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.blank_multiplication.png")); - w1.Add("blank_multiplication", w19); - global::Gtk.IconSet w20 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_axe.png")); - w1.Add("wooden_axe", w20); - global::Gtk.IconSet w21 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_pickaxe.png")); - w1.Add("wooden_pickaxe", w21); - global::Gtk.IconSet w22 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_shovel.png")); - w1.Add("wooden_shovel", w22); - global::Gtk.IconSet w23 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_shovel.png")); - w1.Add("stone_shovel", w23); + global::Gtk.IconSet w8 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Materials.L_rock.png")); + w1.Add("L_rock", w8); + global::Gtk.IconSet w9 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Structures.L_tree.png")); + w1.Add("L_tree", w9); + global::Gtk.IconSet w10 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.empty.png")); + w1.Add("empty", w10); + global::Gtk.IconSet w11 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.4-4.png")); + w1.Add("hearth_4-4", w11); + global::Gtk.IconSet w12 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.3-4.png")); + w1.Add("hearth_3-4", w12); + global::Gtk.IconSet w13 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.2-4.png")); + w1.Add("hearth_2-4", w13); + global::Gtk.IconSet w14 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Hearth.1-4.png")); + w1.Add("hearth_1-4", w14); + global::Gtk.IconSet w15 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Materials.L_stick.png")); + w1.Add("L_stick", w15); + global::Gtk.IconSet w16 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_pickaxe.png")); + w1.Add("stone_pickaxe", w16); + global::Gtk.IconSet w17 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_axe.png")); + w1.Add("stone_axe", w17); + global::Gtk.IconSet w18 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Blanks.blank_multiplication.png")); + w1.Add("blank_multiplication", w18); + global::Gtk.IconSet w19 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_axe.png")); + w1.Add("wooden_axe", w19); + global::Gtk.IconSet w20 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_pickaxe.png")); + w1.Add("wooden_pickaxe", w20); + global::Gtk.IconSet w21 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.wooden_shovel.png")); + w1.Add("wooden_shovel", w21); + global::Gtk.IconSet w22 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.stone_shovel.png")); + w1.Add("stone_shovel", w22); + global::Gtk.IconSet w23 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Underground.Structures.U_rock.png")); + w1.Add("U_rock", w23); + global::Gtk.IconSet w24 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Underground.Ground.U_roche.png")); + w1.Add("U_roche", w24); + global::Gtk.IconSet w25 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Ground.L_hole.png")); + w1.Add("L_hole", w25); w1.AddDefault(); } } diff --git a/Mundus/gtk-gui/gui.stetic b/Mundus/gtk-gui/gui.stetic index 5a185ab..6675c89 100644 --- a/Mundus/gtk-gui/gui.stetic +++ b/Mundus/gtk-gui/gui.stetic @@ -7,14 +7,14 @@ - + - resource:Mundus.Icons.Land.Ground.grass.png + resource:Mundus.Icons.Land.Ground.L_grass.png - + - resource:Mundus.Icons.Land.Items.boulder.png + resource:Mundus.Icons.Land.Structures.L_boulder.png @@ -37,19 +37,14 @@ resource:Mundus.Icons.UI.Blanks.blank_gear.png - + - resource:Mundus.Icons.Land.Materials.land_rock.png + resource:Mundus.Icons.Land.Materials.L_rock.png - + - resource:Mundus.Icons.Land.Items.tree.png - - - - - resource:Mundus.Icons.Land.Ground.water.png + resource:Mundus.Icons.Land.Structures.L_tree.png @@ -77,9 +72,9 @@ resource:Mundus.Icons.UI.Hearth.1-4.png - + - resource:Mundus.Icons.Land.Materials.stick.png + resource:Mundus.Icons.Land.Materials.L_stick.png @@ -117,6 +112,21 @@ resource:Mundus.Icons.Land.Tools.stone_shovel.png + + + resource:Mundus.Icons.Underground.Structures.U_rock.png + + + + + resource:Mundus.Icons.Underground.Ground.U_roche.png + + + + + resource:Mundus.Icons.Land.Ground.L_hole.png + + -- cgit v1.2.3