From 6a3f991fb8516bfc8fe8837f4c13091ce9229c30 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 1 May 2020 16:20:11 +0300 Subject: Added system to restore energy points; it is done by double clicking on a material that can be consumed/eaten (energy restore points > 0). Cows now drop beef steak. Modified a bit difficulty related values. Fixed issue where player woudn't appear upon game start. Reverted game windows namespace (created problems with monodevelop window designer). Removed useless assembly references. Updated executable. --- Mundus Build 01-05-2020 No1.exe | Bin 1647616 -> 0 bytes Mundus Build 01-05-2020 No2.exe | Bin 0 -> 1652736 bytes Mundus/Data/Crafting/RI.cs | 18 +++---- Mundus/Data/Difficulty.cs | 9 +++- Mundus/Data/Windows/WI.cs | 3 +- Mundus/Icons/Land/Materials/L_beef_steak.png | Bin 0 -> 4339 bytes Mundus/Icons/Project files/L_beef_steak.xcf | Bin 0 -> 4299 bytes Mundus/Mundus.csproj | 23 ++------- .../Generators/LandSuperLayerGenerator.cs | 57 +++++++++++---------- Mundus/Service/Tiles/Items/Material.cs | 17 ++++-- .../Service/Tiles/Items/Presets/MaterialPresets.cs | 18 +++---- .../Tiles/Items/Presets/StructurePresets.cs | 2 +- Mundus/Service/Tiles/Items/SwitchItems.cs | 18 ++++++- .../Service/Tiles/Mobs/Controllers/MobFighting.cs | 2 +- .../Service/Tiles/Mobs/Controllers/MobMovement.cs | 2 +- .../Tiles/Mobs/Controllers/MobTerraforming.cs | 8 +-- .../Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs | 2 +- Mundus/Views/Windows/GameWindows/IGameWindow.cs | 2 +- .../Views/Windows/GameWindows/LargeGameWindow.cs | 2 +- .../Views/Windows/GameWindows/MediumGameWindow.cs | 2 +- .../Views/Windows/GameWindows/SmallGameWindow.cs | 2 +- Mundus/Views/Windows/PauseWindow.cs | 1 - .../Mundus.Views.Windows.LargeGameWindow.cs | 2 +- .../Mundus.Views.Windows.MediumGameWindow.cs | 2 +- .../gtk-gui/Mundus.Views.Windows.NewGameWindow.cs | 4 -- .../Mundus.Views.Windows.SmallGameWindow.cs | 2 +- Mundus/gtk-gui/generated.cs | 2 + Mundus/gtk-gui/gui.stetic | 9 ++-- 28 files changed, 112 insertions(+), 97 deletions(-) delete mode 100644 Mundus Build 01-05-2020 No1.exe create mode 100644 Mundus Build 01-05-2020 No2.exe create mode 100644 Mundus/Icons/Land/Materials/L_beef_steak.png create mode 100644 Mundus/Icons/Project files/L_beef_steak.xcf diff --git a/Mundus Build 01-05-2020 No1.exe b/Mundus Build 01-05-2020 No1.exe deleted file mode 100644 index 04e6ec1..0000000 Binary files a/Mundus Build 01-05-2020 No1.exe and /dev/null differ diff --git a/Mundus Build 01-05-2020 No2.exe b/Mundus Build 01-05-2020 No2.exe new file mode 100644 index 0000000..6308eaa Binary files /dev/null and b/Mundus Build 01-05-2020 No2.exe differ diff --git a/Mundus/Data/Crafting/RI.cs b/Mundus/Data/Crafting/RI.cs index 10a8b89..fd06dc4 100644 --- a/Mundus/Data/Crafting/RI.cs +++ b/Mundus/Data/Crafting/RI.cs @@ -19,17 +19,17 @@ namespace Mundus.Data.Crafting { public static CraftingRecipe WoodenLadder { get; private set; } public static void CreateInstances() { - WoodenShovel = new CraftingRecipe(ToolPresets.GetAWoodenShovel(), 5, MaterialPresets.GetAStick()); - WoodenPickaxe = new CraftingRecipe(ToolPresets.GetAWoodenPickaxe(), 4, MaterialPresets.GetAStick()); - WoodenAxe = new CraftingRecipe(ToolPresets.GetAWoodenAxe(), 3, MaterialPresets.GetAStick()); - WoodenLongsword = new CraftingRecipe(ToolPresets.GetAWoodenLongsword(), 4, MaterialPresets.GetAStick()); + WoodenShovel = new CraftingRecipe(ToolPresets.GetAWoodenShovel(), 5, MaterialPresets.GetALandStick()); + WoodenPickaxe = new CraftingRecipe(ToolPresets.GetAWoodenPickaxe(), 4, MaterialPresets.GetALandStick()); + WoodenAxe = new CraftingRecipe(ToolPresets.GetAWoodenAxe(), 3, MaterialPresets.GetALandStick()); + WoodenLongsword = new CraftingRecipe(ToolPresets.GetAWoodenLongsword(), 4, MaterialPresets.GetALandStick()); - RockShovel = new CraftingRecipe(ToolPresets.GetARockShovel(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); - RockPickaxe = new CraftingRecipe(ToolPresets.GetARockPickaxe(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); - RockAxe = new CraftingRecipe(ToolPresets.GetARockAxe(), 3, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); - RockLongsword = new CraftingRecipe(ToolPresets.GetARockLongsword(), 5, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); + RockShovel = new CraftingRecipe(ToolPresets.GetARockShovel(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetALandStick()); + RockPickaxe = new CraftingRecipe(ToolPresets.GetARockPickaxe(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetALandStick()); + RockAxe = new CraftingRecipe(ToolPresets.GetARockAxe(), 3, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetALandStick()); + RockLongsword = new CraftingRecipe(ToolPresets.GetARockLongsword(), 5, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetALandStick()); - WoodenLadder = new CraftingRecipe(StructurePresets.GetAWoodenLadder(), 6, MaterialPresets.GetAStick()); + WoodenLadder = new CraftingRecipe(StructurePresets.GetAWoodenLadder(), 6, MaterialPresets.GetALandStick()); AllRecipies = new List { WoodenShovel, WoodenPickaxe, WoodenAxe, WoodenLongsword, diff --git a/Mundus/Data/Difficulty.cs b/Mundus/Data/Difficulty.cs index 3ab9020..5bef4af 100644 --- a/Mundus/Data/Difficulty.cs +++ b/Mundus/Data/Difficulty.cs @@ -5,8 +5,15 @@ namespace Mundus.Data { public const int Easy = 0; public const int Normal = 10; public const int Hard = 40; - public const int Insane = 128; + public const int Insane = 80; public static int SelDifficulty { get; set; } + + /// + /// Returns selected difficulty divided by a number. Used to change energy drain values. + /// + public static double ValueModifier() { + return SelDifficulty / 80.0; + } } } diff --git a/Mundus/Data/Windows/WI.cs b/Mundus/Data/Windows/WI.cs index 3d43480..6e80f44 100644 --- a/Mundus/Data/Windows/WI.cs +++ b/Mundus/Data/Windows/WI.cs @@ -1,9 +1,8 @@ using Mundus.Views.Windows; -using Mundus.Views.Windows.GameWindows; namespace Mundus.Data.Windows { public static class WI { //stands for Window Instances - public const string BuildName = "Build 01-05-2020 No1"; + public const string BuildName = "Build 01-05-2020 No2"; public static IGameWindow SelWin { get; set; } diff --git a/Mundus/Icons/Land/Materials/L_beef_steak.png b/Mundus/Icons/Land/Materials/L_beef_steak.png new file mode 100644 index 0000000..3a37d17 Binary files /dev/null and b/Mundus/Icons/Land/Materials/L_beef_steak.png differ diff --git a/Mundus/Icons/Project files/L_beef_steak.xcf b/Mundus/Icons/Project files/L_beef_steak.xcf new file mode 100644 index 0000000..24d34dd Binary files /dev/null and b/Mundus/Icons/Project files/L_beef_steak.xcf differ diff --git a/Mundus/Mundus.csproj b/Mundus/Mundus.csproj index d89ab1a..7d58d02 100644 --- a/Mundus/Mundus.csproj +++ b/Mundus/Mundus.csproj @@ -28,24 +28,10 @@ - - False - - - False - - - False - - - False - - - False - - - False - + + + + @@ -92,6 +78,7 @@ + diff --git a/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs index ebcfd82..a5e4950 100644 --- a/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs +++ b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs @@ -17,38 +17,15 @@ namespace Mundus.Service.SuperLayers.Generators { LI.Land.SetMobLayer(GenerateMobLayer(size)); } - private static MobTile[,] GenerateMobLayer(int size) { - MobTile[,] tiles = new MobTile[size, size]; - - for (int y = 0; y < size; y++) { - for (int x = 0; x < size; x++) { - if (LI.Land.GetGroundLayerTile(y, x) != null && - LI.Land.GetStructureLayerTile(y, x) == null) - { - if (y == size / 2 && x == size / 2) { - MI.Player.YPos = y; - MI.Player.XPos = x; - tiles[y, x] = MI.Player; - } - else if (rnd.Next(0, 20 + Difficulty.SelDifficulty) == 1) { - tiles[y, x] = LandMobsPresets.GetACow(); - tiles[y, x].YPos = y; - tiles[y, x].XPos = x; - } - } - } - } - 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++) { + bool atPlayerSpawnPosition = (col == size / 2) && (row == size / 2); // Holes in the ground should be more common with higher difficulties - if (rnd.Next(0, 210 - Difficulty.SelDifficulty) == 1) { + if (rnd.Next(0, 210 - Difficulty.SelDifficulty) == 1 && !atPlayerSpawnPosition) { tiles[col, row] = null; } else { @@ -64,7 +41,10 @@ namespace Mundus.Service.SuperLayers.Generators { for (int col = 0; col < size; col++) { for (int row = 0; row < size; row++) { - if (LI.Land.GetGroundLayerTile(col, row) != null) { + bool atPlayerSpawnPosition = (col == size / 2) && (row == size / 2); + + if (LI.Land.GetGroundLayerTile(col, row) != null && + !atPlayerSpawnPosition) { if (rnd.Next(0, 40 + Difficulty.SelDifficulty) == 1) { tiles[col, row] = StructurePresets.GetALBoulder(); } @@ -76,5 +56,30 @@ namespace Mundus.Service.SuperLayers.Generators { } return tiles; } + + 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++) { + bool atPlayerSpawnPosition = (col == size / 2) && (row == size / 2); + + if (LI.Land.GetGroundLayerTile(col, row) != null && + LI.Land.GetStructureLayerTile(col, row) == null) { + if (atPlayerSpawnPosition) { + MI.Player.YPos = col; + MI.Player.XPos = row; + tiles[col, row] = MI.Player; + } + else if (rnd.Next(0, 15 + Difficulty.SelDifficulty) == 1) { + tiles[col, row] = LandMobsPresets.GetACow(); + tiles[col, row].YPos = col; + tiles[col, row].XPos = row; + } + } + } + } + return tiles; + } } } diff --git a/Mundus/Service/Tiles/Items/Material.cs b/Mundus/Service/Tiles/Items/Material.cs index 5853763..5a1931a 100644 --- a/Mundus/Service/Tiles/Items/Material.cs +++ b/Mundus/Service/Tiles/Items/Material.cs @@ -1,12 +1,23 @@ namespace Mundus.Service.Tiles.Items { public class Material : ItemTile { - public Material(Material material) : base(material.stock_id) - { } + /// + /// Certain materials can be eaten to replenish energy points. This stores by how much to restore energy points. + /// Note: If a material mustn't be consumed, his energy points should be less or equal to 0 + /// + public double EnergyRestorePoints { get; private set; } - public Material(string stock_id) : base(stock_id) + public Material(Material material) : this(material.stock_id, material.EnergyRestorePoints) { } + public Material(string stock_id, double energyRestorePoints = -1) : base(stock_id) + { + this.EnergyRestorePoints = energyRestorePoints; + } + public override string ToString() { + if (EnergyRestorePoints > 0) { + return $"Material | ID: {this.stock_id} EnergyRP: {this.EnergyRestorePoints}"; + } return $"Material | ID: {this.stock_id}"; } } diff --git a/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs b/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs index 24e2597..56cf4f1 100644 --- a/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs +++ b/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs @@ -1,24 +1,18 @@ namespace Mundus.Service.Tiles.Items.Presets { public static class MaterialPresets { - /// - /// Returns a new instance of the land rock material tile - /// + /// New instance public static Material GetALandRock() { return new Material("L_rock"); } - /// - /// Returns a new instance of the stick material tile - /// - public static Material GetAStick() { + /// New instance + public static Material GetALandStick() { return new Material("L_stick"); } - /// - /// (TEMPORARY) - /// - public static Material GetAGrass() { - return new Material("L_grass"); + /// New instance + public static Material GetALandBeefSteak() { + return new Material("L_beef_steak", 4); } /// diff --git a/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs b/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs index 7736005..1834de4 100644 --- a/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs +++ b/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs @@ -13,7 +13,7 @@ namespace Mundus.Service.Tiles.Items.Presets { /// Returns a new instance of the land tree structure /// public static Structure GetALTree() { - return new Structure("L_tree", "L_tree_inventory", 5, ToolTypes.Axe, 1, false, false, MaterialPresets.GetAStick()); + return new Structure("L_tree", "L_tree_inventory", 5, ToolTypes.Axe, 1, false, false, MaterialPresets.GetALandStick()); } /// diff --git a/Mundus/Service/Tiles/Items/SwitchItems.cs b/Mundus/Service/Tiles/Items/SwitchItems.cs index ef65a62..693363a 100644 --- a/Mundus/Service/Tiles/Items/SwitchItems.cs +++ b/Mundus/Service/Tiles/Items/SwitchItems.cs @@ -45,11 +45,17 @@ namespace Mundus.Service.Tiles.Items { case "gear": destinationLocation = MI.Player.Inventory.Gear; break; } - var toTransfer = origin[oIndex]; + ItemTile toTransfer = origin[oIndex]; if (toTransfer != null) { + if (toTransfer == destinationLocation[destinationIndex]) { + if (toTransfer.GetType() == typeof(Material) && + PlayerTryEat((Material)toTransfer)) { + origin[oIndex] = null; + } + } // Certain item types can only be placed inside certain inventory places. - if (((toTransfer.GetType() == typeof(Tool) || toTransfer.GetType() == typeof(GroundTile)) && (destination == "hotbar" || destination == "items")) || + else if (((toTransfer.GetType() == typeof(Tool) || toTransfer.GetType() == typeof(GroundTile)) && (destination == "hotbar" || destination == "items")) || ((toTransfer.GetType() == typeof(Material) || toTransfer.GetType() == typeof(Structure)) && (destination == "hotbar" || destination == "items")) || (toTransfer.GetType() == typeof(Gear) && (destination == "hotbar" || destination == "items" || destination == "accessories" || destination == "gear"))) { @@ -64,6 +70,14 @@ namespace Mundus.Service.Tiles.Items { public static bool HasOrigin() { return origin != null && oIndex != -1; + } + + private static bool PlayerTryEat(Material material) { + if (material.EnergyRestorePoints > 0) { + MI.Player.RestoreEnergy(material.EnergyRestorePoints); + return true; + } + return false; } } } diff --git a/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs index cf17d37..25a02d1 100644 --- a/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs +++ b/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs @@ -36,7 +36,7 @@ namespace Mundus.Service.Tiles.Mobs.Controllers { /// XPos of target mob public static void PlayerTryFight(string selPlace, int selIndex, int mapYPos, int mapXPos) { if (MobTryFight(MI.Player, selPlace, selIndex, mapYPos, mapXPos)) { - MI.Player.DrainEnergy(TAKEN_ENERGY_FROM_FIGHTING + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(TAKEN_ENERGY_FROM_FIGHTING + Difficulty.ValueModifier()); } } diff --git a/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs index 404e8e3..5ebd300 100644 --- a/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs +++ b/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs @@ -54,7 +54,7 @@ namespace Mundus.Service.Tiles.Mobs.Controllers { ChangeMobPosition(MI.Player, yPos, xPos, mapSize); if (MI.Player.YPos == yPos && MI.Player.XPos == xPos) { - MI.Player.DrainEnergy(TAKEN_ENERGY_FROM_MOVEMENT + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(TAKEN_ENERGY_FROM_MOVEMENT + Difficulty.ValueModifier()); } } diff --git a/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs index 59bdb48..e6afb09 100644 --- a/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs +++ b/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs @@ -61,13 +61,13 @@ namespace Mundus.Service.Tiles.Mobs.Controllers { // Only shovels can destroy ground layer tiles, but not when there is something over the ground tile if (selectedTool.Type == ToolTypes.Shovel && MI.Player.CurrSuperLayer.GetStructureLayerTile(mapYPos, mapXPos) == null) { if (PlayerTryDestroyGroundAt(mapYPos, mapXPos, selectedTool)) { - MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_DESTROYING + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_DESTROYING + Difficulty.ValueModifier()); } } // Don't try to destroy structure if there is no structure else if (MI.Player.CurrSuperLayer.GetStructureLayerTile(mapYPos, mapXPos) != null) { if (PlayerTryDestroyStructureAt(mapYPos, mapXPos, selectedTool)) { - MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_DESTROYING + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_DESTROYING + Difficulty.ValueModifier()); } } } @@ -153,7 +153,7 @@ namespace Mundus.Service.Tiles.Mobs.Controllers { GroundTile toPlace = (GroundTile)MI.Player.Inventory.GetItemTile(inventoryPlace, inventoryIndex); MI.Player.CurrSuperLayer.SetGroundAtPosition(toPlace, yPos, xPos); - MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_PLACING_GROUND + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_PLACING_GROUND + Difficulty.ValueModifier()); LogController.AddMessage($"Set ground \"{toPlace.stock_id}\" on layer \"{MI.Player.CurrSuperLayer}\" at Y:{yPos}, X:{xPos}"); } @@ -182,7 +182,7 @@ namespace Mundus.Service.Tiles.Mobs.Controllers { LogController.AddMessage($"Set structure \"{toBuild.stock_id}\" on layer \"{MI.Player.CurrSuperLayer}\" at Y:{yPos}, X:{xPos}"); } - MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_BUILDING_STRUCTURE + (Difficulty.SelDifficulty / 80.0)); + MI.Player.DrainEnergy(ENERGY_TAKEN_FROM_BUILDING_STRUCTURE + Difficulty.ValueModifier()); } } } diff --git a/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs b/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs index ef4a2d4..28eca25 100644 --- a/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs +++ b/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs @@ -7,7 +7,7 @@ namespace Mundus.Service.Tiles.Mobs.LandMobs { /// Returns a new instance of the cow mob tile /// public static MobTile GetACow() { - return new MobTile("L_cow", 10, 1, LI.Land, 1, MaterialPresets.GetAGrass()); + return new MobTile("L_cow", 10, 1, LI.Land, 1, MaterialPresets.GetALandBeefSteak()); } } } diff --git a/Mundus/Views/Windows/GameWindows/IGameWindow.cs b/Mundus/Views/Windows/GameWindows/IGameWindow.cs index 21c329f..95f8636 100644 --- a/Mundus/Views/Windows/GameWindows/IGameWindow.cs +++ b/Mundus/Views/Windows/GameWindows/IGameWindow.cs @@ -1,6 +1,6 @@ using Mundus.Service.Tiles.Items; -namespace Mundus.Views.Windows.GameWindows { +namespace Mundus.Views.Windows { public interface IGameWindow { int Size { get; } diff --git a/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs b/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs index 55e02ea..b511fb6 100644 --- a/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs +++ b/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs @@ -6,7 +6,7 @@ using Mundus.Service.SuperLayers; using Mundus.Service.Tiles.Items; using Mundus.Service.Tiles.Mobs; -namespace Mundus.Views.Windows.GameWindows { +namespace Mundus.Views.Windows { public partial class LargeGameWindow : Gtk.Window, IGameWindow { public int Size { get; private set; } diff --git a/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs b/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs index 398d059..9790425 100644 --- a/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs +++ b/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs @@ -6,7 +6,7 @@ using Mundus.Service.SuperLayers; using Mundus.Service.Tiles.Items; using Mundus.Service.Tiles.Mobs; -namespace Mundus.Views.Windows.GameWindows { +namespace Mundus.Views.Windows { public partial class MediumGameWindow : Gtk.Window, IGameWindow { public int Size { get; private set; } diff --git a/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs b/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs index 5af2939..e178e2a 100644 --- a/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs +++ b/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs @@ -6,7 +6,7 @@ using Mundus.Service.SuperLayers; using Mundus.Service.Tiles.Items; using Mundus.Service.Tiles.Mobs; -namespace Mundus.Views.Windows.GameWindows { +namespace Mundus.Views.Windows { public partial class SmallGameWindow : Gtk.Window, IGameWindow { /*Value for the height and width of the game screen, map screens and inventory screen *and the width of stats, hotbar, accessories, gear & items on the ground menus*/ diff --git a/Mundus/Views/Windows/PauseWindow.cs b/Mundus/Views/Windows/PauseWindow.cs index 7df7717..b67e27c 100644 --- a/Mundus/Views/Windows/PauseWindow.cs +++ b/Mundus/Views/Windows/PauseWindow.cs @@ -1,7 +1,6 @@ using System; using Gtk; using Mundus.Service; -using Mundus.Views.Windows.GameWindows; namespace Mundus.Views.Windows { public partial class PauseWindow : Gtk.Window { diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs index 18c246f..3a31e9d 100644 --- a/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs +++ b/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs @@ -1,6 +1,6 @@ // This file has been generated by the GUI designer. Do not modify. -namespace Mundus.Views.Windows.GameWindows +namespace Mundus.Views.Windows { public partial class LargeGameWindow { diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs index f802514..7dac688 100644 --- a/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs +++ b/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs @@ -1,6 +1,6 @@ // This file has been generated by the GUI designer. Do not modify. -namespace Mundus.Views.Windows.GameWindows +namespace Mundus.Views.Windows { public partial class MediumGameWindow { diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.NewGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.NewGameWindow.cs index f9c8100..13f023a 100644 --- a/Mundus/gtk-gui/Mundus.Views.Windows.NewGameWindow.cs +++ b/Mundus/gtk-gui/Mundus.Views.Windows.NewGameWindow.cs @@ -246,7 +246,6 @@ namespace Mundus.Views.Windows this.rbCreative.WidthRequest = 90; this.rbCreative.CanFocus = true; this.rbCreative.Name = "rbCreative"; - this.rbCreative.Active = true; this.rbCreative.DrawIndicator = true; this.rbCreative.UseUnderline = true; this.rbCreative.Group = new global::GLib.SList(global::System.IntPtr.Zero); @@ -263,7 +262,6 @@ namespace Mundus.Views.Windows this.rbEasy.WidthRequest = 90; this.rbEasy.CanFocus = true; this.rbEasy.Name = "rbEasy"; - this.rbEasy.Active = true; this.rbEasy.DrawIndicator = true; this.rbEasy.UseUnderline = true; this.rbEasy.Group = new global::GLib.SList(global::System.IntPtr.Zero); @@ -312,7 +310,6 @@ namespace Mundus.Views.Windows this.rbLarge.WidthRequest = 90; this.rbLarge.CanFocus = true; this.rbLarge.Name = "rbLarge"; - this.rbLarge.Active = true; this.rbLarge.DrawIndicator = true; this.rbLarge.UseUnderline = true; this.rbLarge.Group = new global::GLib.SList(global::System.IntPtr.Zero); @@ -344,7 +341,6 @@ namespace Mundus.Views.Windows this.rbMLarge = new global::Gtk.RadioButton("Large"); this.rbMLarge.CanFocus = true; this.rbMLarge.Name = "rbMLarge"; - this.rbMLarge.Active = true; this.rbMLarge.DrawIndicator = true; this.rbMLarge.UseUnderline = true; this.rbMLarge.Group = new global::GLib.SList(global::System.IntPtr.Zero); diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs index 7cc5178..5cb01f0 100644 --- a/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs +++ b/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs @@ -1,6 +1,6 @@ // This file has been generated by the GUI designer. Do not modify. -namespace Mundus.Views.Windows.GameWindows +namespace Mundus.Views.Windows { public partial class SmallGameWindow { diff --git a/Mundus/gtk-gui/generated.cs b/Mundus/gtk-gui/generated.cs index 67b7372..3a896d9 100644 --- a/Mundus/gtk-gui/generated.cs +++ b/Mundus/gtk-gui/generated.cs @@ -94,6 +94,8 @@ namespace Stetic w1.Add("energy_5", w41); global::Gtk.IconSet w42 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.UI.Energy.energy_6.png")); w1.Add("energy_6", w42); + global::Gtk.IconSet w43 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Materials.L_beef_steak.png")); + w1.Add("L_beef_steak", w43); w1.AddDefault(); } } diff --git a/Mundus/gtk-gui/gui.stetic b/Mundus/gtk-gui/gui.stetic index 093fae4..9dd0094 100644 --- a/Mundus/gtk-gui/gui.stetic +++ b/Mundus/gtk-gui/gui.stetic @@ -212,6 +212,11 @@ resource:Mundus.Icons.UI.Energy.energy_6.png + + + resource:Mundus.Icons.Land.Materials.L_beef_steak.png + + @@ -574,7 +579,6 @@ 90 True Creative - True True True True @@ -603,7 +607,6 @@ 90 True Easy - True True True True @@ -688,7 +691,6 @@ 90 True Large - True True True True @@ -744,7 +746,6 @@ True Large - True True True True -- cgit v1.2.3