new inventory category 'fixtures'; fixture code refactoring

src/net/torvald/terrarum/modulebasegame/gameitems/FixtureItemBase.kt

@@ -39,10 +39,13 @@ open class FixtureItemBase(originalID: ItemID, val fixtureClassName: String) : G
     @Transient private var ghostInit = AtomicBoolean(false)
 
     override var dynamicID: ItemID = originalID
-    override var baseMass = 1.0
-    override var inventoryCategory = Category.MISC
+    @Transient override var baseMass = 1.0
+    @Transient override var inventoryCategory = Category.FIXTURE
     override val isDynamic = false
-    override val materialId = ""
+    @Transient override val materialId = ""
+
+    @Transient override var equipPosition: Int = EquipPosition.HAND_GRIP
+
 
     /**
      * Do not address the CommonResourcePool directly; just do it like this snippet:

src/net/torvald/terrarum/modulebasegame/gameitems/ItemLogicSignalEmitter.kt

@@ -12,18 +12,13 @@ class ItemLogicSignalEmitter(originalID: ItemID) : FixtureItemBase(originalID, "
 
     override var dynamicID: ItemID = originalID
     override var baseMass = FixtureLogicSignalEmitter.MASS
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/signal_source.tga")
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_LOGIC_SIGNAL_EMITTER"
-    }
+    override var originalName = "ITEM_LOGIC_SIGNAL_EMITTER"
 
     override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) {
         super.effectWhileEquipped(actor, delta)

src/net/torvald/terrarum/modulebasegame/gameitems/ItemStorageChest.kt

@@ -14,16 +14,11 @@ class ItemStorageChest(originalID: ItemID) : FixtureItemBase(originalID, "net.to
 
     override var dynamicID: ItemID = originalID
     override var baseMass = FixtureTikiTorch.MASS
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_48")
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_STORAGE_CHEST"
-    }
+    override var originalName = "ITEM_STORAGE_CHEST"
 
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemSwingingDoorOak.kt

@@ -14,22 +14,12 @@ class ItemSwingingDoorOak(originalID: ItemID) :
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 20.0 // 360[L] * 0.1 * 0.56[SpecificGravity], rounded to the nearest integer
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,3)
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_DOOR_OAK"
-    }
-
-    @Transient override val makeFixture: () -> FixtureBase = {
-        FixtureSwingingDoorOak()
-    }
-
+    override var originalName = "ITEM_DOOR_OAK"
 }
 
 class ItemSwingingDoorEbony(originalID: ItemID) :
@@ -37,22 +27,12 @@ class ItemSwingingDoorEbony(originalID: ItemID) :
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 30.0 // 360[L] * 0.1 * 0.82[SpecificGravity], rounded to the nearest integer
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(9,3)
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_DOOR_EBONY"
-    }
-
-    @Transient override val makeFixture: () -> FixtureBase = {
-        FixtureSwingingDoorEbony()
-    }
-
+    override var originalName = "ITEM_DOOR_EBONY"
 }
 
 class ItemSwingingDoorBirch(originalID: ItemID) :
@@ -60,22 +40,12 @@ class ItemSwingingDoorBirch(originalID: ItemID) :
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 17.0 // 360[L] * 0.1 * 0.48[SpecificGravity], rounded to the nearest integer
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,3)
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_DOOR_BIRCH"
-    }
-
-    @Transient override val makeFixture: () -> FixtureBase = {
-        FixtureSwingingDoorBirch()
-    }
-
+    override var originalName = "ITEM_DOOR_BIRCH"
 }
 
 class ItemSwingingDoorRosewood(originalID: ItemID) :
@@ -83,20 +53,10 @@ class ItemSwingingDoorRosewood(originalID: ItemID) :
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 24.0 // 360[L] * 0.1 * 0.68[SpecificGravity], rounded to the nearest integer
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(11,3)
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_DOOR_ROSEWOOD"
-    }
-
-    @Transient override val makeFixture: () -> FixtureBase = {
-        FixtureSwingingDoorRosewood()
-    }
-
+    override var originalName = "ITEM_DOOR_ROSEWOOD"
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemTapestry.kt

@@ -16,17 +16,12 @@ class ItemTapestry(originalID: ItemID) : FixtureItemBase(originalID, "net.torval
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 6.0
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsTextureRegion("itemplaceholder_16")
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_TAPESTRY"
-    }
+    override var originalName = "ITEM_TAPESTRY"
 
     @Transient override val makeFixture: () -> FixtureBase = {
         FixtureTapestry(

src/net/torvald/terrarum/modulebasegame/gameitems/ItemTikiTorch.kt

@@ -12,17 +12,12 @@ class ItemTikiTorch(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
 
     override var dynamicID: ItemID = originalID
     override var baseMass = FixtureTikiTorch.MASS
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = getItemImageFromSheet("basegame", "sprites/fixtures/tiki_torch.tga", 16, 32)
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_TIKI_TORCH"
-    }
+    override var originalName = "ITEM_TIKI_TORCH"
 
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemTypewriter.kt

@@ -12,17 +12,12 @@ class ItemTypewriter(originalID: ItemID) : FixtureItemBase(originalID, "net.torv
 
     override var dynamicID: ItemID = originalID
     override var baseMass = FixtureTikiTorch.MASS
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = getItemImageFromSheet("basegame", "sprites/fixtures/typewriter.tga", 32, 16)
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_TYPEWRITER"
-    }
+    override var originalName = "ITEM_TYPEWRITER"
 
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemWallCalendar.kt

@@ -11,17 +11,12 @@ class ItemWallCalendar(originalID: ItemID) : FixtureItemBase(originalID, "net.to
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 1.0
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/calendar.tga")
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_CALENDAR"
-    }
+    override var originalName = "ITEM_CALENDAR"
 
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorkbench.kt

@@ -10,18 +10,12 @@ class ItemWorkbench(originalID: ItemID) : FixtureItemBase(originalID, "net.torva
 
 
     override var baseMass = 20.0
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = getItemImageFromSingleImage("basegame", "sprites/fixtures/workbench.tga")
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_WORKBENCH"
-    }
-
+    override var originalName = "ITEM_WORKBENCH"
 
 }

src/net/torvald/terrarum/modulebasegame/gameitems/ItemWorldPortal.kt

@@ -12,17 +12,11 @@ class ItemWorldPortal(originalID: ItemID) : FixtureItemBase(originalID, "net.tor
 
     override var dynamicID: ItemID = originalID
     override var baseMass = 6000.0
-    override var inventoryCategory = Category.MISC
     override val isDynamic = false
     override val materialId = ""
     override val itemImage: TextureRegion
         get() = CommonResourcePool.getAsItemSheet("basegame.items").get(3,3)
 
     override var baseToolSize: Double? = baseMass
-
-    init {
-        equipPosition = EquipPosition.HAND_GRIP
-        originalName = "ITEM_WORLD_PORTAL"
-    }
-
+    override var originalName = "ITEM_WORLD_PORTAL"
 }