aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mundus Build 11-04-2020 No1.exe (renamed from Mundus Build 09-04-2020 No1.exe)bin540160 -> 544768 bytes
-rw-r--r--Mundus/Data/Crafting/RI.cs6
-rw-r--r--Mundus/Icons/Land/Tools/rock_axe.png (renamed from Mundus/Icons/Land/Tools/stone_axe.png)bin4339 -> 4339 bytes
-rw-r--r--Mundus/Icons/Land/Tools/rock_pickaxe.png (renamed from Mundus/Icons/Land/Tools/stone_pickaxe.png)bin4339 -> 4339 bytes
-rw-r--r--Mundus/Icons/Land/Tools/rock_shovel.png (renamed from Mundus/Icons/Land/Tools/stone_shovel.png)bin4339 -> 4339 bytes
-rw-r--r--Mundus/Icons/Project files/rock_axe.xcf (renamed from Mundus/Icons/Project files/stone_axe.xcf)bin2599 -> 2599 bytes
-rw-r--r--Mundus/Icons/Project files/rock_pickaxe.xcf (renamed from Mundus/Icons/Project files/stone_pickaxe.xcf)bin3051 -> 3051 bytes
-rw-r--r--Mundus/Icons/Project files/rock_shovel.xcf (renamed from Mundus/Icons/Project files/stone_shovel.xcf)bin2594 -> 2594 bytes
-rw-r--r--Mundus/Mundus.csproj7
-rw-r--r--Mundus/Service/Tiles/ItemPresets/ToolPresets.cs12
-rw-r--r--Mundus/gtk-gui/generated.cs12
-rw-r--r--Mundus/gtk-gui/gui.stetic12
12 files changed, 24 insertions, 25 deletions
diff --git a/Mundus Build 09-04-2020 No1.exe b/Mundus Build 11-04-2020 No1.exe
index 3ca324a..89d9be9 100644
--- a/Mundus Build 09-04-2020 No1.exe
+++ b/Mundus Build 11-04-2020 No1.exe
Binary files 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/stone_axe.png b/Mundus/Icons/Land/Tools/rock_axe.png
index 1c93f9f..1c93f9f 100644
--- a/Mundus/Icons/Land/Tools/stone_axe.png
+++ b/Mundus/Icons/Land/Tools/rock_axe.png
Binary files differ
diff --git a/Mundus/Icons/Land/Tools/stone_pickaxe.png b/Mundus/Icons/Land/Tools/rock_pickaxe.png
index 0f17039..0f17039 100644
--- a/Mundus/Icons/Land/Tools/stone_pickaxe.png
+++ b/Mundus/Icons/Land/Tools/rock_pickaxe.png
Binary files differ
diff --git a/Mundus/Icons/Land/Tools/stone_shovel.png b/Mundus/Icons/Land/Tools/rock_shovel.png
index e771e3f..e771e3f 100644
--- a/Mundus/Icons/Land/Tools/stone_shovel.png
+++ b/Mundus/Icons/Land/Tools/rock_shovel.png
Binary files differ
diff --git a/Mundus/Icons/Project files/stone_axe.xcf b/Mundus/Icons/Project files/rock_axe.xcf
index 59729da..59729da 100644
--- a/Mundus/Icons/Project files/stone_axe.xcf
+++ b/Mundus/Icons/Project files/rock_axe.xcf
Binary files differ
diff --git a/Mundus/Icons/Project files/stone_pickaxe.xcf b/Mundus/Icons/Project files/rock_pickaxe.xcf
index fcfeca5..fcfeca5 100644
--- a/Mundus/Icons/Project files/stone_pickaxe.xcf
+++ b/Mundus/Icons/Project files/rock_pickaxe.xcf
Binary files differ
diff --git a/Mundus/Icons/Project files/stone_shovel.xcf b/Mundus/Icons/Project files/rock_shovel.xcf
index 294ebea..294ebea 100644
--- a/Mundus/Icons/Project files/stone_shovel.xcf
+++ b/Mundus/Icons/Project files/rock_shovel.xcf
Binary files 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 @@
<Reference Include="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
</Reference>
- <Reference Include="Mono.Posix" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -61,13 +60,10 @@
<EmbeddedResource Include="Icons\UI\Hearth\3-4.png" />
<EmbeddedResource Include="Icons\UI\Hearth\2-4.png" />
<EmbeddedResource Include="Icons\UI\Hearth\1-4.png" />
- <EmbeddedResource Include="Icons\Land\Tools\stone_pickaxe.png" />
- <EmbeddedResource Include="Icons\Land\Tools\stone_axe.png" />
<EmbeddedResource Include="Icons\UI\Blanks\blank_multiplication.png" />
<EmbeddedResource Include="Icons\Land\Tools\wooden_axe.png" />
<EmbeddedResource Include="Icons\Land\Tools\wooden_pickaxe.png" />
<EmbeddedResource Include="Icons\Land\Tools\wooden_shovel.png" />
- <EmbeddedResource Include="Icons\Land\Tools\stone_shovel.png" />
<EmbeddedResource Include="Icons\Land\Ground\L_grass.png" />
<EmbeddedResource Include="Icons\Land\Structures\L_boulder.png" />
<EmbeddedResource Include="Icons\Land\Materials\L_rock.png" />
@@ -81,6 +77,9 @@
<EmbeddedResource Include="Icons\Land\Structures\L_tree_inventory.png" />
<EmbeddedResource Include="Icons\Land\Structures\L_wooden_ladder_inventory.png" />
<EmbeddedResource Include="Icons\Underground\Materials\U_stone.png" />
+ <EmbeddedResource Include="Icons\Land\Tools\rock_pickaxe.png" />
+ <EmbeddedResource Include="Icons\Land\Tools\rock_axe.png" />
+ <EmbeddedResource Include="Icons\Land\Tools\rock_shovel.png" />
</ItemGroup>
<ItemGroup>
<Compile Include="gtk-gui\generated.cs" />
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 @@
<property name="Image">resource:Mundus.Icons.Land.Materials.L_stick.png</property>
</source>
</icon-set>
- <icon-set id="stone_pickaxe">
+ <icon-set id="rock_pickaxe">
<source>
- <property name="Image">resource:Mundus.Icons.Land.Tools.stone_pickaxe.png</property>
+ <property name="Image">resource:Mundus.Icons.Land.Tools.rock_pickaxe.png</property>
</source>
</icon-set>
- <icon-set id="stone_axe">
+ <icon-set id="rock_axe">
<source>
- <property name="Image">resource:Mundus.Icons.Land.Tools.stone_axe.png</property>
+ <property name="Image">resource:Mundus.Icons.Land.Tools.rock_axe.png</property>
</source>
</icon-set>
<icon-set id="blank_multiplication">
@@ -107,9 +107,9 @@
<property name="Image">resource:Mundus.Icons.Land.Tools.wooden_shovel.png</property>
</source>
</icon-set>
- <icon-set id="stone_shovel">
+ <icon-set id="rock_shovel">
<source>
- <property name="Image">resource:Mundus.Icons.Land.Tools.stone_shovel.png</property>
+ <property name="Image">resource:Mundus.Icons.Land.Tools.rock_shovel.png</property>
</source>
</icon-set>
<icon-set id="U_rock">
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-14 23:01:36 +0000