alloy yield doubled; turntable now requires brass for crafting

assets/mods/basegame/crafting/fixtures.json

@@ -109,7 +109,7 @@
   "item@basegame:30": { /* turntable */
     "workbench": "basiccrafting",
     "ingredients": [
-      [1, 4, "item@basegame:144", 14, "$WOOD", 10, "item@basegame:113"] /* 1 turntable = 4 quartz, 14 wood, 10 iron */
+      [1, 4, "item@basegame:144", 14, "$WOOD", 10, "item@basegame:177"] /* 1 turntable = 4 quartz, 14 wood, 10 brass */
     ]
   },
 

assets/mods/basegame/smelting/alloys.json

@@ -2,26 +2,26 @@
   /* as for the plus operator, the itemIDs must be sorted lexicographically and first word should come left */
   "item@basegame:112+item@basegame:116": { /* copper + tin -> bronze */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:176"]
+    "product": [2, "item@basegame:176"]
   },
   "item@basegame:112+item@basegame:115": { /* copper + zinc -> brass */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:177"]
+    "product": [2, "item@basegame:177"]
   },
   "item@basegame:117+item@basegame:118": { /* gold + silver -> electrum */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:178"]
+    "product": [2, "item@basegame:178"]
   },
   "item@basegame:112+item@basegame:118": { /* copper + silver -> silver billon */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:179"]
+    "product": [2, "item@basegame:179"]
   },
   "item@basegame:112+item@basegame:117": { /* copper + gold -> rose gold */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:180"]
+    "product": [2, "item@basegame:180"]
   },
   "item@basegame:116+item@basegame:119": { /* tin + lead -> solder */
     "difficulty": 1.0,
-    "product": [1, "item@basegame:181"]
+    "product": [2, "item@basegame:181"]
   }
 }

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureAlloyingFurnace.kt

@@ -319,13 +319,14 @@ class FixtureAlloyingFurnace : FixtureBase {
             progress += temperature
 
             if (progress >= FixtureSmelterBasic.CALORIES_PER_ROASTING) {
+                val moq = smeltingProduct.moq
                 val smeltingProduct = smeltingProduct.item
 
                 // check if the item even exists
                 if (ItemCodex[smeltingProduct] == null) throw NullPointerException("No item prop for $smeltingProduct")
 
                 if (productItem == null)
-                    productItem = InventoryPair(smeltingProduct, 1L)
+                    productItem = InventoryPair(smeltingProduct, moq)
                 else
                     productItemStatus.changeCount(1)
 

src/net/torvald/terrarum/modulebasegame/gameactors/FixtureMusicalTurntable.kt

@@ -166,6 +166,8 @@ class FixtureMusicalTurntable : Electric, PlaysMusic {
         super.reload()
         // cannot resume playback, just stop the music
         musicNowPlaying = null
+        // update sprite
+        (sprite as SheetSpriteAnimation).currentRow = (disc == null).toInt()
     }
 
     override fun dispose() {