diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt index ad02f74..c3cc584 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt @@ -80,6 +80,8 @@ class CraftFragment : Fragment() { buttonForge.setOnClickListener{ currentPlayer.craft(recipe) + initializeViews(view, currentPlayer) + setUpRecyclerView(view, currentPlayer) } diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt index 3af9a9d..0cdc1f9 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Item.kt @@ -10,7 +10,7 @@ class Item( var stack: Int = 1, var image: Int, var xpReward: Int = 0, -) : Parcelable{ +) : Parcelable { override fun describeContents(): Int { diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt index 51accc8..baf4f2a 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt @@ -49,7 +49,7 @@ class Player(val pseudo: String, var xp: Int = 0) { println("findItem n: "+findItem.stack+" item nb:"+item.stack) findItem.stack += item.stack } - else{items.add(item)} + else{items.add( Item(item.name, item.rarity, item.stack, item.image, item.xpReward))} } fun gainXp(xp: Int) { diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt index 33c3902..d04c343 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt @@ -14,8 +14,8 @@ class RecipeManager { Item("Wooden Plank", image = R.drawable.wooden_plank, stack = 2) ), "Objects"), Recipe( - Item("Wooden Plank", image = R.drawable.wooden_plank, stack = 4),listOf( - Item("Beech Log", image = R.drawable.log2, stack = 2) + Item("Wooden Plank", image = R.drawable.wooden_plank, stack = 3),listOf( + Item("Beech Log", image = R.drawable.log2, stack = 1) ), "Objects"), Recipe( Item("Wooden Ball", image = R.drawable.wooden_ball, stack = 1),listOf(