aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSyndamia <kamen.d.mladenov@protonmail.com>2020-04-06 13:47:55 +0300
committerSyndamia <kamen.d.mladenov@protonmail.com>2020-04-06 13:47:55 +0300
commit88d8ae7f090e2f9efc298e7adfc39fc849a1b910 (patch)
treec9997fdf52a4671e9814810fb39fbea111a4dfd9
parente2a7342511612805d113661a211c8b439ccc1342 (diff)
downloadMundus-88d8ae7f090e2f9efc298e7adfc39fc849a1b910.tar
Mundus-88d8ae7f090e2f9efc298e7adfc39fc849a1b910.tar.gz
Mundus-88d8ae7f090e2f9efc298e7adfc39fc849a1b910.zip
Added wooden axe and pickaxe. Player starts with those two.
-rw-r--r--Mundus/Data/Crafting/RI.cs8
-rw-r--r--Mundus/Data/SuperLayers/Mobs/LMI.cs3
-rw-r--r--Mundus/Icons/Land/Tools/wooden_axe.pngbin0 -> 4339 bytes
-rw-r--r--Mundus/Icons/Land/Tools/wooden_pickaxe.pngbin0 -> 4339 bytes
-rw-r--r--Mundus/Icons/Project files/blank_multiplication.pngbin4339 -> 0 bytes
-rw-r--r--Mundus/Icons/Project files/wooden_axe.xcfbin0 -> 2648 bytes
-rw-r--r--Mundus/Icons/Project files/wooden_pickaxe.xcfbin0 -> 2761 bytes
-rw-r--r--Mundus/Mundus.csproj2
-rw-r--r--Mundus/Service/Tiles/ItemPresets/ToolPresets.cs8
-rw-r--r--Mundus/gtk-gui/generated.cs4
-rw-r--r--Mundus/gtk-gui/gui.stetic10
11 files changed, 34 insertions, 1 deletions
diff --git a/Mundus/Data/Crafting/RI.cs b/Mundus/Data/Crafting/RI.cs
index 00a54b8..18ba00d 100644
--- a/Mundus/Data/Crafting/RI.cs
+++ b/Mundus/Data/Crafting/RI.cs
@@ -9,15 +9,21 @@ namespace Mundus.Data.Crafting {
public static class RI { //short for Recipe Instances
public static List<CraftingRecipe> AllRecipies { get; private set; }
+ public static CraftingRecipe WoodenPickaxe { get; private set; }
+ public static CraftingRecipe WoodenAxe { get; private set; }
+
public static CraftingRecipe StonePickAxe { get; private set; }
public static CraftingRecipe StoneAxe { get; private set; }
public static void CreateInstances() {
+ WoodenPickaxe = new CraftingRecipe(ToolPresets.GetAWoodenPickaxe(), 4, MaterialPresets.GetAStick());
+ WoodenAxe = new CraftingRecipe(ToolPresets.GetAWoodenAxe(), 3, MaterialPresets.GetAStick());
+
StonePickAxe = new CraftingRecipe(ToolPresets.GetAStonePickaxe(), 4, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick());
StoneAxe = new CraftingRecipe(ToolPresets.GetAStoneAxe(), 3, MaterialPresets.GetALandRock(), 2, MaterialPresets.GetAStick());
AllRecipies = new List<CraftingRecipe> {
- StonePickAxe, StoneAxe
+ WoodenPickaxe, WoodenAxe, StonePickAxe, StoneAxe
};
}
}
diff --git a/Mundus/Data/SuperLayers/Mobs/LMI.cs b/Mundus/Data/SuperLayers/Mobs/LMI.cs
index fc3efc4..4a173d9 100644
--- a/Mundus/Data/SuperLayers/Mobs/LMI.cs
+++ b/Mundus/Data/SuperLayers/Mobs/LMI.cs
@@ -1,4 +1,5 @@
using Mundus.Service.Mobs.LandMobs;
+using Mundus.Service.Tiles.ItemPresets;
namespace Mundus.Data.Superlayers.Mobs {
public static class LMI { //stands for Land Mob Instances
@@ -10,6 +11,8 @@ namespace Mundus.Data.Superlayers.Mobs {
public static void CreateInventories(int screenInvSize) {
Player.Inventory.SetNewSizes(screenInvSize);
+ Player.Inventory.AppendToHotbar(ToolPresets.GetAWoodenAxe());
+ Player.Inventory.AppendToHotbar(ToolPresets.GetAWoodenPickaxe());
}
}
}
diff --git a/Mundus/Icons/Land/Tools/wooden_axe.png b/Mundus/Icons/Land/Tools/wooden_axe.png
new file mode 100644
index 0000000..34f50fc
--- /dev/null
+++ b/Mundus/Icons/Land/Tools/wooden_axe.png
Binary files differ
diff --git a/Mundus/Icons/Land/Tools/wooden_pickaxe.png b/Mundus/Icons/Land/Tools/wooden_pickaxe.png
new file mode 100644
index 0000000..b874d18
--- /dev/null
+++ b/Mundus/Icons/Land/Tools/wooden_pickaxe.png
Binary files differ
diff --git a/Mundus/Icons/Project files/blank_multiplication.png b/Mundus/Icons/Project files/blank_multiplication.png
deleted file mode 100644
index 2867e8d..0000000
--- a/Mundus/Icons/Project files/blank_multiplication.png
+++ /dev/null
Binary files differ
diff --git a/Mundus/Icons/Project files/wooden_axe.xcf b/Mundus/Icons/Project files/wooden_axe.xcf
new file mode 100644
index 0000000..416011e
--- /dev/null
+++ b/Mundus/Icons/Project files/wooden_axe.xcf
Binary files differ
diff --git a/Mundus/Icons/Project files/wooden_pickaxe.xcf b/Mundus/Icons/Project files/wooden_pickaxe.xcf
new file mode 100644
index 0000000..75295ab
--- /dev/null
+++ b/Mundus/Icons/Project files/wooden_pickaxe.xcf
Binary files differ
diff --git a/Mundus/Mundus.csproj b/Mundus/Mundus.csproj
index 48549fa..5dca99b 100644
--- a/Mundus/Mundus.csproj
+++ b/Mundus/Mundus.csproj
@@ -70,6 +70,8 @@
<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" />
</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 e938bbc..cd4b6e0 100644
--- a/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs
+++ b/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs
@@ -4,6 +4,14 @@ using Mundus.Service.Tiles.Items;
namespace Mundus.Service.Tiles.ItemPresets {
public static class ToolPresets {
+ public static Tool GetAWoodenPickaxe() {
+ return new Tool("wooden_pickaxe", ToolTypes.Pickaxe, 1);
+ }
+
+ public static Tool GetAWoodenAxe() {
+ return new Tool("wooden_axe", ToolTypes.Axe, 1);
+ }
+
public static Tool GetAStonePickaxe() {
return new Tool("stone_pickaxe", ToolTypes.Pickaxe, 2);
}
diff --git a/Mundus/gtk-gui/generated.cs b/Mundus/gtk-gui/generated.cs
index 48cf89a..6aa9169 100644
--- a/Mundus/gtk-gui/generated.cs
+++ b/Mundus/gtk-gui/generated.cs
@@ -48,6 +48,10 @@ namespace Stetic
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);
w1.AddDefault();
}
}
diff --git a/Mundus/gtk-gui/gui.stetic b/Mundus/gtk-gui/gui.stetic
index 77c203a..6aab50a 100644
--- a/Mundus/gtk-gui/gui.stetic
+++ b/Mundus/gtk-gui/gui.stetic
@@ -97,6 +97,16 @@
<property name="Image">resource:Mundus.Icons.UI.Blanks.blank_multiplication.png</property>
</source>
</icon-set>
+ <icon-set id="wooden_axe">
+ <source>
+ <property name="Image">resource:Mundus.Icons.Land.Tools.wooden_axe.png</property>
+ </source>
+ </icon-set>
+ <icon-set id="wooden_pickaxe">
+ <source>
+ <property name="Image">resource:Mundus.Icons.Land.Tools.wooden_pickaxe.png</property>
+ </source>
+ </icon-set>
</icon-factory>
<widget class="Gtk.Window" id="Mundus.Views.Windows.NewGameWindow" design-size="581 275">
<property name="MemberName" />