From 54df320b873f0dedaba065ecda3f7defd82a8cfa Mon Sep 17 00:00:00 2001 From: Syndamia Date: Sat, 11 Apr 2020 11:44:35 +0300 Subject: Changed stone tools to rock tools (stone tools will be implimented in the future). Updated executable. --- Mundus Build 09-04-2020 No1.exe | Bin 540160 -> 0 bytes Mundus Build 11-04-2020 No1.exe | Bin 0 -> 544768 bytes Mundus/Data/Crafting/RI.cs | 6 +++--- Mundus/Icons/Land/Tools/rock_axe.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Tools/rock_pickaxe.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Tools/rock_shovel.png | Bin 0 -> 4339 bytes Mundus/Icons/Land/Tools/stone_axe.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Tools/stone_pickaxe.png | Bin 4339 -> 0 bytes Mundus/Icons/Land/Tools/stone_shovel.png | Bin 4339 -> 0 bytes Mundus/Icons/Project files/rock_axe.xcf | Bin 0 -> 2599 bytes Mundus/Icons/Project files/rock_pickaxe.xcf | Bin 0 -> 3051 bytes Mundus/Icons/Project files/rock_shovel.xcf | Bin 0 -> 2594 bytes Mundus/Icons/Project files/stone_axe.xcf | Bin 2599 -> 0 bytes Mundus/Icons/Project files/stone_pickaxe.xcf | Bin 3051 -> 0 bytes Mundus/Icons/Project files/stone_shovel.xcf | Bin 2594 -> 0 bytes Mundus/Mundus.csproj | 7 +++---- Mundus/Service/Tiles/ItemPresets/ToolPresets.cs | 12 ++++++------ Mundus/gtk-gui/generated.cs | 12 ++++++------ Mundus/gtk-gui/gui.stetic | 12 ++++++------ 19 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 Mundus Build 09-04-2020 No1.exe create mode 100644 Mundus Build 11-04-2020 No1.exe create mode 100644 Mundus/Icons/Land/Tools/rock_axe.png create mode 100644 Mundus/Icons/Land/Tools/rock_pickaxe.png create mode 100644 Mundus/Icons/Land/Tools/rock_shovel.png delete mode 100644 Mundus/Icons/Land/Tools/stone_axe.png delete mode 100644 Mundus/Icons/Land/Tools/stone_pickaxe.png delete mode 100644 Mundus/Icons/Land/Tools/stone_shovel.png create mode 100644 Mundus/Icons/Project files/rock_axe.xcf create mode 100644 Mundus/Icons/Project files/rock_pickaxe.xcf create mode 100644 Mundus/Icons/Project files/rock_shovel.xcf delete mode 100644 Mundus/Icons/Project files/stone_axe.xcf delete mode 100644 Mundus/Icons/Project files/stone_pickaxe.xcf delete mode 100644 Mundus/Icons/Project files/stone_shovel.xcf diff --git a/Mundus Build 09-04-2020 No1.exe b/Mundus Build 09-04-2020 No1.exe deleted file mode 100644 index 3ca324a..0000000 Binary files a/Mundus Build 09-04-2020 No1.exe and /dev/null differ diff --git a/Mundus Build 11-04-2020 No1.exe b/Mundus Build 11-04-2020 No1.exe new file mode 100644 index 0000000..89d9be9 Binary files /dev/null and b/Mundus Build 11-04-2020 No1.exe differ diff --git a/Mundus/Data/Crafting/RI.cs b/Mundus/Data/Crafting/RI.cs index 8c3999c..c040cef 100644 --- a/Mundus/Data/Crafting/RI.cs +++ b/Mundus/Data/Crafting/RI.cs @@ -21,9 +21,9 @@ namespace Mundus.Data.Crafting { WoodenPickaxe = new CraftingRecipe(ToolPresets.GetAWoodenPickaxe(), 4, MaterialPresets.GetAStick()); WoodenAxe = new CraftingRecipe(ToolPresets.GetAWoodenAxe(), 3, MaterialPresets.GetAStick()); - StoneShovel = new CraftingRecipe(ToolPresets.GetAStoneShovel(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); - StonePickAxe = new CraftingRecipe(ToolPresets.GetAStonePickaxe(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); - StoneAxe = new CraftingRecipe(ToolPresets.GetAStoneAxe(), 3, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); + StoneShovel = new CraftingRecipe(ToolPresets.GetARockShovel(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); + StonePickAxe = new CraftingRecipe(ToolPresets.GetARockPickaxe(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); + StoneAxe = new CraftingRecipe(ToolPresets.GetARockAxe(), 3, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick()); WoodenLadder = new CraftingRecipe(StructurePresets.GetAWoodenLadder(), 6, MaterialPresets.GetAStick()); diff --git a/Mundus/Icons/Land/Tools/rock_axe.png b/Mundus/Icons/Land/Tools/rock_axe.png new file mode 100644 index 0000000..1c93f9f Binary files /dev/null and b/Mundus/Icons/Land/Tools/rock_axe.png differ diff --git a/Mundus/Icons/Land/Tools/rock_pickaxe.png b/Mundus/Icons/Land/Tools/rock_pickaxe.png new file mode 100644 index 0000000..0f17039 Binary files /dev/null and b/Mundus/Icons/Land/Tools/rock_pickaxe.png differ diff --git a/Mundus/Icons/Land/Tools/rock_shovel.png b/Mundus/Icons/Land/Tools/rock_shovel.png new file mode 100644 index 0000000..e771e3f Binary files /dev/null and b/Mundus/Icons/Land/Tools/rock_shovel.png differ diff --git a/Mundus/Icons/Land/Tools/stone_axe.png b/Mundus/Icons/Land/Tools/stone_axe.png deleted file mode 100644 index 1c93f9f..0000000 Binary files a/Mundus/Icons/Land/Tools/stone_axe.png and /dev/null differ diff --git a/Mundus/Icons/Land/Tools/stone_pickaxe.png b/Mundus/Icons/Land/Tools/stone_pickaxe.png deleted file mode 100644 index 0f17039..0000000 Binary files a/Mundus/Icons/Land/Tools/stone_pickaxe.png and /dev/null differ diff --git a/Mundus/Icons/Land/Tools/stone_shovel.png b/Mundus/Icons/Land/Tools/stone_shovel.png deleted file mode 100644 index e771e3f..0000000 Binary files a/Mundus/Icons/Land/Tools/stone_shovel.png and /dev/null differ diff --git a/Mundus/Icons/Project files/rock_axe.xcf b/Mundus/Icons/Project files/rock_axe.xcf new file mode 100644 index 0000000..59729da Binary files /dev/null and b/Mundus/Icons/Project files/rock_axe.xcf differ diff --git a/Mundus/Icons/Project files/rock_pickaxe.xcf b/Mundus/Icons/Project files/rock_pickaxe.xcf new file mode 100644 index 0000000..fcfeca5 Binary files /dev/null and b/Mundus/Icons/Project files/rock_pickaxe.xcf differ diff --git a/Mundus/Icons/Project files/rock_shovel.xcf b/Mundus/Icons/Project files/rock_shovel.xcf new file mode 100644 index 0000000..294ebea Binary files /dev/null and b/Mundus/Icons/Project files/rock_shovel.xcf differ diff --git a/Mundus/Icons/Project files/stone_axe.xcf b/Mundus/Icons/Project files/stone_axe.xcf deleted file mode 100644 index 59729da..0000000 Binary files a/Mundus/Icons/Project files/stone_axe.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/stone_pickaxe.xcf b/Mundus/Icons/Project files/stone_pickaxe.xcf deleted file mode 100644 index fcfeca5..0000000 Binary files a/Mundus/Icons/Project files/stone_pickaxe.xcf and /dev/null differ diff --git a/Mundus/Icons/Project files/stone_shovel.xcf b/Mundus/Icons/Project files/stone_shovel.xcf deleted file mode 100644 index 294ebea..0000000 Binary files a/Mundus/Icons/Project files/stone_shovel.xcf and /dev/null differ diff --git a/Mundus/Mundus.csproj b/Mundus/Mundus.csproj index fdd515f..0686653 100644 --- a/Mundus/Mundus.csproj +++ b/Mundus/Mundus.csproj @@ -46,7 +46,6 @@ False - @@ -61,13 +60,10 @@ - - - @@ -81,6 +77,9 @@ + + + diff --git a/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs b/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs index b6ecddd..4979646 100644 --- a/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs +++ b/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs @@ -16,16 +16,16 @@ namespace Mundus.Service.Tiles.ItemPresets { return new Tool("wooden_shovel", ToolTypes.Shovel, 1); } - public static Tool GetAStonePickaxe() { - return new Tool("stone_pickaxe", ToolTypes.Pickaxe, 2); + public static Tool GetARockPickaxe() { + return new Tool("rock_pickaxe", ToolTypes.Pickaxe, 2); } - public static Tool GetAStoneAxe() { - return new Tool("stone_axe", ToolTypes.Axe, 2); + public static Tool GetARockAxe() { + return new Tool("rock_axe", ToolTypes.Axe, 2); } - public static Tool GetAStoneShovel() { - return new Tool("stone_shovel", ToolTypes.Shovel, 2); + public static Tool GetARockShovel() { + return new Tool("rock_shovel", ToolTypes.Shovel, 2); } } } diff --git a/Mundus/gtk-gui/generated.cs b/Mundus/gtk-gui/generated.cs index e67f971..d196d4b 100644 --- a/Mundus/gtk-gui/generated.cs +++ b/Mundus/gtk-gui/generated.cs @@ -40,10 +40,10 @@ namespace Stetic 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 w16 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.rock_pickaxe.png")); + w1.Add("rock_pickaxe", w16); + global::Gtk.IconSet w17 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.rock_axe.png")); + w1.Add("rock_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")); @@ -52,8 +52,8 @@ namespace Stetic 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 w22 = new global::Gtk.IconSet(global::Gdk.Pixbuf.LoadFromResource("Mundus.Icons.Land.Tools.rock_shovel.png")); + w1.Add("rock_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")); diff --git a/Mundus/gtk-gui/gui.stetic b/Mundus/gtk-gui/gui.stetic index ddcfd43..ded0fd0 100644 --- a/Mundus/gtk-gui/gui.stetic +++ b/Mundus/gtk-gui/gui.stetic @@ -77,14 +77,14 @@ resource:Mundus.Icons.Land.Materials.L_stick.png - + - resource:Mundus.Icons.Land.Tools.stone_pickaxe.png + resource:Mundus.Icons.Land.Tools.rock_pickaxe.png - + - resource:Mundus.Icons.Land.Tools.stone_axe.png + resource:Mundus.Icons.Land.Tools.rock_axe.png @@ -107,9 +107,9 @@ resource:Mundus.Icons.Land.Tools.wooden_shovel.png - + - resource:Mundus.Icons.Land.Tools.stone_shovel.png + resource:Mundus.Icons.Land.Tools.rock_shovel.png -- cgit v1.2.3