mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-20 15:34:05 +09:00
moved Codices out of the singleton so they can be serialised
This commit is contained in:
@@ -2,7 +2,6 @@ package net.torvald.terrarum.gameactors
|
||||
|
||||
import net.torvald.terrarum.ReferencingRanges
|
||||
import net.torvald.terrarum.Terrarum
|
||||
import net.torvald.terrarum.itemproperties.ItemCodex.ACTORID_MIN
|
||||
|
||||
|
||||
typealias ActorID = Int
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
package net.torvald.terrarum.gameactors
|
||||
|
||||
import com.badlogic.gdx.graphics.g2d.SpriteBatch
|
||||
import net.torvald.terrarum.BlendMode
|
||||
import net.torvald.terrarum.CommonResourcePool
|
||||
import net.torvald.terrarum.Point2i
|
||||
import net.torvald.terrarum.*
|
||||
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
|
||||
import net.torvald.terrarum.blockproperties.WireCodex
|
||||
import net.torvald.terrarum.gameitem.ItemID
|
||||
import net.torvald.terrarum.toInt
|
||||
|
||||
/**
|
||||
* FIXME Constructor is super expensive
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package net.torvald.terrarum.gameactors.faction
|
||||
|
||||
import net.torvald.random.HQRNG
|
||||
import java.util.HashSet
|
||||
import net.torvald.terrarum.*
|
||||
|
||||
/**
|
||||
* Created by minjaesong on 2016-02-15.
|
||||
|
||||
@@ -5,9 +5,13 @@ import java.util.*
|
||||
/**
|
||||
* Created by minjaesong on 2016-05-09.
|
||||
*/
|
||||
object FactionCodex {
|
||||
class FactionCodex {
|
||||
val factionContainer = ArrayList<Faction>()
|
||||
|
||||
fun clear() = factionContainer.clear()
|
||||
|
||||
internal constructor()
|
||||
|
||||
fun hasFaction(ID: FactionID): Boolean =
|
||||
if (factionContainer.size == 0)
|
||||
false
|
||||
|
||||
Reference in New Issue
Block a user