From eb43b016fe589869b8a34f60b8ee0757d45c0be1 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Thu, 29 Dec 2016 20:45:42 +0900 Subject: [PATCH] highest ID of dynamicItem reduced to 1048575 Former-commit-id: b1e36d020a57aac497eff5d3db7142940f590fe4 Former-commit-id: c437e8447ba2a58fdc7dfd05f1ac80284f845702 --- src/net/torvald/terrarum/REFERENCING.md | 4 ++-- src/net/torvald/terrarum/itemproperties/ItemCodex.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarum/REFERENCING.md b/src/net/torvald/terrarum/REFERENCING.md index 9bd9749a5..67bc522e5 100644 --- a/src/net/torvald/terrarum/REFERENCING.md +++ b/src/net/torvald/terrarum/REFERENCING.md @@ -2,8 +2,8 @@ |-----|-----------| |0..4095|Tiles| |4096..32767|Items (static)| -|32768..16777215|Items (dynamic\*)| -|16777216..0x7FFFFFFF|Actors| +|32768..1048575|Items (dynamic\*)| +|1048576..0x7FFFFFFF|Actors| |0x80000000..0xFFFFFFFF (all negative numbers)|Faction| * dynamic items can have their own properties that will persist through savegame. \ No newline at end of file diff --git a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt index 2ffbba0af..e4ceabdee 100644 --- a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt @@ -27,7 +27,7 @@ object ItemCodex { private val dynamicItemDescription = HashMap() val ITEM_TILE_MAX = GameWorld.TILES_SUPPORTED - 1 // 4095 - val ITEM_COUNT_MAX = 16777216 + val ITEM_COUNT_MAX = 1048576 val ITEM_DYNAMIC_MAX = ITEM_COUNT_MAX - 1 val ITEM_STATIC_MAX = 32767 val ITEM_DYNAMIC_MIN = ITEM_STATIC_MAX + 1