From 5e4f3b67c28e7f2976e3c636239b92577e5475f4 Mon Sep 17 00:00:00 2001 From: Minjae Song Date: Wed, 12 Dec 2018 03:00:49 +0900 Subject: [PATCH] adjusted items ID range for more static items --- REFERENCING.md | 4 ++-- src/net/torvald/terrarum/itemproperties/ItemCodex.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/REFERENCING.md b/REFERENCING.md index 8e279d897..20b867371 100644 --- a/REFERENCING.md +++ b/REFERENCING.md @@ -3,8 +3,8 @@ |0..4095|Tiles (4096 possible)| |4096..8191|Walls (4096 possible)| |8192..8447|Wires (256 possible)| -|8448..32767|Items (static) (24320 possible)| -|32768..0x0FFF_FFFF|Items (dynamic\*) (268M possible)| +|8448..0x0F_FFFF|Items (static) (1M possible)| +|0x10_0000..0x0FFF_FFFF|Items (dynamic\*) (267M possible)| |0x1000_0000..0x7FFF_FFFF|Actors (1879M possible)| |-2147483648..-1 (all negative numbers)|Faction (2147M possible)| diff --git a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt index 93e9a4f22..84b3ee480 100644 --- a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt @@ -26,8 +26,8 @@ object ItemCodex { val ITEM_TILES = 0..GameWorld.TILES_SUPPORTED - 1 val ITEM_WALLS = GameWorld.TILES_SUPPORTED..GameWorld.TILES_SUPPORTED * 2 - 1 val ITEM_WIRES = GameWorld.TILES_SUPPORTED * 2..GameWorld.TILES_SUPPORTED * 2 + 255 - val ITEM_STATIC = ITEM_WIRES.endInclusive + 1..32767 - val ITEM_DYNAMIC = 32768..0x0FFF_FFFF + val ITEM_STATIC = ITEM_WIRES.endInclusive + 1..0x0F_FFFF + val ITEM_DYNAMIC = 0x10_0000..0x0FFF_FFFF val ACTORID_MIN = ITEM_DYNAMIC.endInclusive + 1 private val itemImagePlaceholder = TextureRegion(Texture("./assets/item_kari_24.tga"))