lowered crafting recipe requirements, and raised tile health

chrisj42 · May 13, 2018 · cf69175 · cf69175
1 parent 7f0a96f
commit cf69175
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/core/game/src/miniventure/game/item/Recipes.java b/core/game/src/miniventure/game/item/Recipes.java
@@ -9,16 +9,16 @@ private Recipes() {}
 
 	public static final Recipe[] recipes = new Recipe[] {
 		new Recipe(new ToolItem(ToolType.Pickaxe, Material.Wood),
-			new ItemStack(ResourceItem.Log.get(), 5)
+			new ItemStack(ResourceItem.Log.get(), 2)
 		),
 
 		new Recipe(new ToolItem(ToolType.Pickaxe, Material.Stone),
-			new ItemStack(TileItem.get(TileType.STONE), 4),
+			new ItemStack(TileItem.get(TileType.STONE), 1),
 			new ItemStack(ResourceItem.Log.get(), 1)
 		),
 
 		new Recipe(new ToolItem(ToolType.Shovel, Material.Wood),
-			new ItemStack(ResourceItem.Log.get(), 3)
+			new ItemStack(ResourceItem.Log.get(), 2)
 		),
 
 		new Recipe(new ToolItem(ToolType.Shovel, Material.Stone),
@@ -27,20 +27,20 @@ private Recipes() {}
 		),
 
 		new Recipe(new ToolItem(ToolType.Sword, Material.Wood),
-			new ItemStack(ResourceItem.Log.get(), 4)
+			new ItemStack(ResourceItem.Log.get(), 2)
 		),
 
 		new Recipe(new ToolItem(ToolType.Sword, Material.Stone),
-			new ItemStack(TileItem.get(TileType.STONE), 3),
+			new ItemStack(TileItem.get(TileType.STONE), 2),
 			new ItemStack(ResourceItem.Log.get(), 1)
 		),
 
 		new Recipe(new ToolItem(ToolType.Axe, Material.Wood),
-			new ItemStack(ResourceItem.Log.get(), 4)
+			new ItemStack(ResourceItem.Log.get(), 2)
 		),
 
 		new Recipe(new ToolItem(ToolType.Axe, Material.Stone),
-			new ItemStack(TileItem.get(TileType.STONE), 3),
+			new ItemStack(TileItem.get(TileType.STONE), 1),
 			new ItemStack(ResourceItem.Log.get(), 1)
 		),
 
@@ -49,15 +49,15 @@ private Recipes() {}
 		),
 
 		new Recipe(TileItem.get(TileType.DOOR_CLOSED),
-			new ItemStack(ResourceItem.Log.get(), 4)
+			new ItemStack(ResourceItem.Log.get(), 3)
 		),
 
 		new Recipe(TileItem.get(TileType.WOOD_WALL),
-			new ItemStack(ResourceItem.Log.get(), 6)
+			new ItemStack(ResourceItem.Log.get(), 3)
 		),
 
 		new Recipe(TileItem.get(TileType.STONE_WALL),
-			new ItemStack(TileItem.get(TileType.STONE), 6)
+			new ItemStack(TileItem.get(TileType.STONE), 3)
 		)
 	};
 }
diff --git a/core/game/src/miniventure/game/world/tile/TileType.java b/core/game/src/miniventure/game/world/tile/TileType.java
@@ -54,7 +54,7 @@ public enum TileType {
 
 	STONE((tileType, map) -> {
 		map.put(Solid, SolidProperty.get(tileType, true));
-		map.put(Attack, new DestructibleProperty(tileType, 20, new PreferredTool(ToolType.Pickaxe, 5)));
+		map.put(Attack, new DestructibleProperty(tileType, 40, new PreferredTool(ToolType.Pickaxe, 5)));
 	}),
 
 	WOOD_WALL(((tileType, map) -> {
@@ -100,14 +100,14 @@ public enum TileType {
 
 	CACTUS((tileType, map) -> {
 		map.put(Solid, SolidProperty.get(tileType, true));
-		map.put(Attack, new DestructibleProperty(tileType, 7, null));
+		map.put(Attack, new DestructibleProperty(tileType, 12, null));
 		map.put(Render, new AnimationProperty(tileType, false, AnimationType.SINGLE_FRAME));
 		map.put(Touch, new TouchListener(tileType, (e, t, initial) -> e.attackedBy(t, null, 1)));
 	}),
 
 	TREE((tileType, map) -> {
 		map.put(Solid, SolidProperty.get(tileType, true));
-		map.put(Attack, new DestructibleProperty(tileType, 10, new PreferredTool(ToolType.Axe, 2), new ItemDrop(ResourceItem.Log.get()/*, 1, 2, 0.25f*/), new ItemDrop(FoodItem.Apple.get(), 0, 2, 0.2f)));
+		map.put(Attack, new DestructibleProperty(tileType, 24, new PreferredTool(ToolType.Axe, 2), new ItemDrop(ResourceItem.Log.get()/*, 1, 2, 0.25f*/), new ItemDrop(FoodItem.Apple.get(), 0, 2, 0.2f)));
 		map.put(Render, new AnimationProperty(tileType, false, AnimationType.SINGLE_FRAME));
 		map.put(Connect, new ConnectionProperty(tileType, true));
 	});