blocks now have properly formatted ids

This commit is contained in:
Song Minjae
2017-04-29 00:05:10 +09:00
parent 3498a100a4
commit 9508249533
17 changed files with 3346 additions and 851 deletions

Binary file not shown.

150
assets/ktGrepExample.kts Normal file
View File

@@ -0,0 +1,150 @@
"""val STONE = BlockCodex.idDamageToIndex(1, 0)
val STONE_QUARRIED = BlockCodex.idDamageToIndex(1, 1)
val STONE_TILE_WHITE = BlockCodex.idDamageToIndex(1, 2)
val STONE_BRICKS = BlockCodex.idDamageToIndex(1, 3)
val DIRT = BlockCodex.idDamageToIndex(2, 0)
val GRASS = BlockCodex.idDamageToIndex(2, 1)
val GRASSWALL = BlockCodex.idDamageToIndex(2, 2)
val PLANK_NORMAL = BlockCodex.idDamageToIndex(3, 0)
val PLANK_EBONY = BlockCodex.idDamageToIndex(3, 1)
val PLANK_BIRCH = BlockCodex.idDamageToIndex(3, 2)
val PLANK_BLOODROSE = BlockCodex.idDamageToIndex(3, 3)
val TRUNK_NORMAL = BlockCodex.idDamageToIndex(4, 0)
val TRUNK_EBONY = BlockCodex.idDamageToIndex(4, 1)
val TRUNK_BIRCH = BlockCodex.idDamageToIndex(4, 2)
val TRUNK_BLOODROSE = BlockCodex.idDamageToIndex(4, 3)
val SAND = BlockCodex.idDamageToIndex(5, 0)
val SAND_WHITE = BlockCodex.idDamageToIndex(5, 1)
val SAND_RED = BlockCodex.idDamageToIndex(5, 2)
val SAND_DESERT = BlockCodex.idDamageToIndex(5, 3)
val SAND_BLACK = BlockCodex.idDamageToIndex(5, 4)
val SAND_GREEN = BlockCodex.idDamageToIndex(5, 5)
val GRAVEL = BlockCodex.idDamageToIndex(6, 0)
val GRAVEL_GREY = BlockCodex.idDamageToIndex(6, 1)
val ORE_COPPER = BlockCodex.idDamageToIndex(7, 0)
val ORE_IRON = BlockCodex.idDamageToIndex(7, 1)
val ORE_GOLD = BlockCodex.idDamageToIndex(7, 2)
val ORE_SILVER = BlockCodex.idDamageToIndex(7, 3)
val ORE_ILMENITE = BlockCodex.idDamageToIndex(7, 4)
val ORE_AURICHALCUM = BlockCodex.idDamageToIndex(7, 5)
val RAW_RUBY = BlockCodex.idDamageToIndex(8, 0)
val RAW_EMERALD = BlockCodex.idDamageToIndex(8, 1)
val RAW_SAPPHIRE = BlockCodex.idDamageToIndex(8, 2)
val RAW_TOPAZ = BlockCodex.idDamageToIndex(8, 3)
val RAW_DIAMOND = BlockCodex.idDamageToIndex(8, 4)
val RAW_AMETHYST = BlockCodex.idDamageToIndex(8, 5)
val SNOW = BlockCodex.idDamageToIndex(9, 0)
val ICE_FRAGILE = BlockCodex.idDamageToIndex(9, 1)
val ICE_NATURAL = BlockCodex.idDamageToIndex(9, 2)
val ICE_MAGICAL = BlockCodex.idDamageToIndex(9, 3)
val GLASS_CRUDE = BlockCodex.idDamageToIndex(9, 4)
val GLASS_CLEAN = BlockCodex.idDamageToIndex(9, 5)
val PLATFORM_STONE = BlockCodex.idDamageToIndex(10, 0)
val PLATFORM_WOODEN = BlockCodex.idDamageToIndex(10, 1)
val PLATFORM_EBONY = BlockCodex.idDamageToIndex(10, 2)
val PLATFORM_BIRCH = BlockCodex.idDamageToIndex(10, 3)
val PLATFORM_BLOODROSE = BlockCodex.idDamageToIndex(10, 4)
val TORCH = BlockCodex.idDamageToIndex(11, 0)
val TORCH_FROST = BlockCodex.idDamageToIndex(11, 1)
val TORCH_OFF = BlockCodex.idDamageToIndex(12, 0)
val TORCH_FROST_OFF = BlockCodex.idDamageToIndex(12, 1)
val ILLUMINATOR_WHITE = BlockCodex.idDamageToIndex(13, 0)
val ILLUMINATOR_YELLOW = BlockCodex.idDamageToIndex(13, 1)
val ILLUMINATOR_ORANGE = BlockCodex.idDamageToIndex(13, 2)
val ILLUMINATOR_RED = BlockCodex.idDamageToIndex(13, 3)
val ILLUMINATOR_FUCHSIA = BlockCodex.idDamageToIndex(13, 4)
val ILLUMINATOR_PURPLE = BlockCodex.idDamageToIndex(13, 5)
val ILLUMINATOR_BLUE = BlockCodex.idDamageToIndex(13, 6)
val ILLUMINATOR_CYAN = BlockCodex.idDamageToIndex(13, 7)
val ILLUMINATOR_GREEN = BlockCodex.idDamageToIndex(13, 8)
val ILLUMINATOR_GREEN_DARK = BlockCodex.idDamageToIndex(13, 9)
val ILLUMINATOR_BROWN = BlockCodex.idDamageToIndex(13, 10)
val ILLUMINATOR_TAN = BlockCodex.idDamageToIndex(13, 11)
val ILLUMINATOR_GREY_LIGHT = BlockCodex.idDamageToIndex(13, 12)
val ILLUMINATOR_GREY_MED = BlockCodex.idDamageToIndex(13, 13)
val ILLUMINATOR_GREY_DARK = BlockCodex.idDamageToIndex(13, 14)
val ILLUMINATOR_BLACK = BlockCodex.idDamageToIndex(13, 15)
val ILLUMINATOR_WHITE_OFF = BlockCodex.idDamageToIndex(14, 0)
val ILLUMINATOR_YELLOW_OFF = BlockCodex.idDamageToIndex(14, 1)
val ILLUMINATOR_ORANGE_OFF = BlockCodex.idDamageToIndex(14, 2)
val ILLUMINATOR_RED_OFF = BlockCodex.idDamageToIndex(14, 3)
val ILLUMINATOR_FUCHSIA_OFF = BlockCodex.idDamageToIndex(14, 4)
val ILLUMINATOR_PURPLE_OFF = BlockCodex.idDamageToIndex(14, 5)
val ILLUMINATOR_BLUE_OFF = BlockCodex.idDamageToIndex(14, 6)
val ILLUMINATOR_CYAN_OFF = BlockCodex.idDamageToIndex(14, 7)
val ILLUMINATOR_GREEN_OFF = BlockCodex.idDamageToIndex(14, 8)
val ILLUMINATOR_GREEN_DARK_OFF = BlockCodex.idDamageToIndex(14, 9)
val ILLUMINATOR_BROWN_OFF = BlockCodex.idDamageToIndex(14, 10)
val ILLUMINATOR_TAN_OFF = BlockCodex.idDamageToIndex(14, 11)
val ILLUMINATOR_GREY_LIGHT_OFF = BlockCodex.idDamageToIndex(14, 12)
val ILLUMINATOR_GREY_MED_OFF = BlockCodex.idDamageToIndex(14, 13)
val ILLUMINATOR_GREY_DARK_OFF = BlockCodex.idDamageToIndex(14, 14)
val ILLUMINATOR_BLACK_OFF = BlockCodex.idDamageToIndex(14, 15)
val SANDSTONE = BlockCodex.idDamageToIndex(15, 0)
val SANDSTONE_WHITE = BlockCodex.idDamageToIndex(15, 1)
val SANDSTONE_RED = BlockCodex.idDamageToIndex(15, 2)
val SANDSTONE_DESERT = BlockCodex.idDamageToIndex(15, 3)
val SANDSTONE_BLACK = BlockCodex.idDamageToIndex(15, 4)
val SANDSTONE_GREEN = BlockCodex.idDamageToIndex(15, 5)
val LANTERN = BlockCodex.idDamageToIndex(16, 0)
val SUNSTONE = BlockCodex.idDamageToIndex(16, 1)
val DAYLIGHT_CAPACITOR = BlockCodex.idDamageToIndex(16, 2)
val WATER_1 = BlockCodex.idDamageToIndex(255, 0)
val WATER_2 = BlockCodex.idDamageToIndex(255, 1)
val WATER_3 = BlockCodex.idDamageToIndex(255, 2)
val WATER_4 = BlockCodex.idDamageToIndex(255, 3)
val WATER_5 = BlockCodex.idDamageToIndex(255, 4)
val WATER_6 = BlockCodex.idDamageToIndex(255, 5)
val WATER_7 = BlockCodex.idDamageToIndex(255, 6)
val WATER_8 = BlockCodex.idDamageToIndex(255, 7)
val WATER_9 = BlockCodex.idDamageToIndex(255, 8)
val WATER_10 = BlockCodex.idDamageToIndex(255, 9)
val WATER_11 = BlockCodex.idDamageToIndex(255, 10)
val WATER_12 = BlockCodex.idDamageToIndex(255, 11)
val WATER_13 = BlockCodex.idDamageToIndex(255, 12)
val WATER_14 = BlockCodex.idDamageToIndex(255, 13)
val WATER_15 = BlockCodex.idDamageToIndex(255, 14)
val WATER = BlockCodex.idDamageToIndex(255, 15)
val LAVA_1 = BlockCodex.idDamageToIndex(254, 0)
val LAVA_2 = BlockCodex.idDamageToIndex(254, 1)
val LAVA_3 = BlockCodex.idDamageToIndex(254, 2)
val LAVA_4 = BlockCodex.idDamageToIndex(254, 3)
val LAVA_5 = BlockCodex.idDamageToIndex(254, 4)
val LAVA_6 = BlockCodex.idDamageToIndex(254, 5)
val LAVA_7 = BlockCodex.idDamageToIndex(254, 6)
val LAVA_8 = BlockCodex.idDamageToIndex(254, 7)
val LAVA_9 = BlockCodex.idDamageToIndex(254, 8)
val LAVA_10 = BlockCodex.idDamageToIndex(254, 9)
val LAVA_11 = BlockCodex.idDamageToIndex(254, 10)
val LAVA_12 = BlockCodex.idDamageToIndex(254, 11)
val LAVA_13 = BlockCodex.idDamageToIndex(254, 12)
val LAVA_14 = BlockCodex.idDamageToIndex(254, 13)
val LAVA_15 = BlockCodex.idDamageToIndex(254, 14)
val LAVA = BlockCodex.idDamageToIndex(254, 15)""".split("\n").map {
it.replace(Regex("""BlockCodex.idDamageToIndex\([0-9]+, [0-9]+\)""")) {
val matches = ArrayList<Int>(2)
it.value.replace(Regex("[0-9]+")) {
matches.add(it.value.toInt())
""
}
"${matches[0] * 16 + matches[1]}"
}
}.forEach { println(it) }

View File

@@ -1,138 +1,141 @@
"id";"sid";"name" ; "opacity";"strength";"dsty";"mate";"fluid";"solid";"wall"; "lumcolor";"drop";"ddmg";"fall";"dlfn";"vscs";"fv";"friction" "blid";"drid";"name" ; "opacity";"strength";"dsty";"mate";"fluid";"solid";"wall"; "lumcolor";"fall";"dlfn";"vscs";"fv";"friction"
"0"; "0";"BLOCK_AIR" ; "8396808"; "1"; "1";"null"; "0"; "0"; "1"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"4" "0"; "0";"BLOCK_AIR" ; "8396808"; "1"; "1";"null"; "0"; "0"; "1"; "0"; "0"; "0"; "N/A"; "0";"4"
"1"; "0";"BLOCK_STONE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "1"; "0"; "0"; "0"; "N/A"; "0";"16" "16"; "17";"BLOCK_STONE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"1"; "1";"BLOCK_STONE_QUARRIED" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "1"; "1"; "0"; "0"; "N/A"; "0";"16" "17"; "17";"BLOCK_STONE_QUARRIED" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"1"; "2";"BLOCK_STONE_TILE_WHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "1"; "2"; "0"; "0"; "N/A"; "0";"16" "18"; "18";"BLOCK_STONE_TILE_WHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"1"; "3";"BLOCK_STONE_BRICKS" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "1"; "3"; "0"; "0"; "N/A"; "0";"16" "19"; "19";"BLOCK_STONE_BRICKS" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "0";"BLOCK_DIRT" ; "33587232"; "24";"1400";"dirt"; "0"; "1"; "1"; "0"; "2"; "0"; "0"; "0"; "N/A"; "0";"16" "32"; "32";"BLOCK_DIRT" ; "33587232"; "24";"1400";"dirt"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "1";"BLOCK_GRASS" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "0"; "0"; "2"; "1"; "0"; "0"; "N/A"; "0";"16" "33"; "32";"BLOCK_GRASS" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "2";"BLOCK_GRASSWALL" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "2"; "0"; "0"; "N/A"; "0";"16" "34"; "34";"BLOCK_GRASSWALL" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "3";"BLOCK_FOLIAGE_GREEN" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "3"; "0"; "0"; "N/A"; "0";"16" "35"; "35";"BLOCK_FOLIAGE_GREEN" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "4";"BLOCK_FOLIAGE_LIME" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "4"; "0"; "0"; "N/A"; "0";"16" "36"; "36";"BLOCK_FOLIAGE_LIME" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "5";"BLOCK_FOLIAGE_GOLD" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "5"; "0"; "0"; "N/A"; "0";"16" "37"; "37";"BLOCK_FOLIAGE_GOLD" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "6";"BLOCK_FOLIAGE_RED" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "6"; "0"; "0"; "N/A"; "0";"16" "38"; "38";"BLOCK_FOLIAGE_RED" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "7";"BLOCK_FOLIAGE_ICEBLUE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "7"; "0"; "0"; "N/A"; "0";"16" "39"; "39";"BLOCK_FOLIAGE_ICEBLUE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"2"; "8";"BLOCK_FOLIAGE_PURPLE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "8"; "0"; "0"; "N/A"; "0";"16" "40"; "40";"BLOCK_FOLIAGE_PURPLE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"3"; "0";"BLOCK_PLANK_NORMAL" ; "33587232"; "16"; "740";"wood"; "0"; "1"; "1"; "0"; "3"; "0"; "0"; "0"; "N/A"; "0";"16" "48"; "48";"BLOCK_PLANK_NORMAL" ; "33587232"; "16"; "740";"wood"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"3"; "1";"BLOCK_PLANK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "1"; "0"; "3"; "1"; "0"; "0"; "N/A"; "0";"16" "49"; "49";"BLOCK_PLANK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"3"; "2";"BLOCK_PLANK_BIRCH" ; "33587232"; "15"; "670";"wood"; "0"; "1"; "1"; "0"; "3"; "2"; "0"; "0"; "N/A"; "0";"16" "50"; "50";"BLOCK_PLANK_BIRCH" ; "33587232"; "15"; "670";"wood"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"3"; "3";"BLOCK_PLANK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "1"; "0"; "3"; "3"; "0"; "0"; "N/A"; "0";"16" "51"; "51";"BLOCK_PLANK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"4"; "0";"BLOCK_TRUNK_NORMAL" ; "33587232"; "16"; "740";"wood"; "0"; "1"; "0"; "0"; "3"; "0"; "0"; "0"; "N/A"; "0";"16" "64"; "64";"BLOCK_TRUNK_NORMAL" ; "33587232"; "16"; "740";"wood"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"4"; "1";"BLOCK_TRUNK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "0"; "0"; "3"; "1"; "0"; "0"; "N/A"; "0";"16" "65"; "65";"BLOCK_TRUNK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"4"; "2";"BLOCK_TRUNK_BIRCH" ; "33587232"; "15"; "670";"wood"; "0"; "1"; "0"; "0"; "3"; "2"; "0"; "0"; "N/A"; "0";"16" "66"; "66";"BLOCK_TRUNK_BIRCH" ; "33587232"; "15"; "670";"wood"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"4"; "3";"BLOCK_TRUNK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "0"; "0"; "3"; "3"; "0"; "0"; "N/A"; "0";"16" "67"; "67";"BLOCK_TRUNK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"5"; "0";"BLOCK_SAND" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "0"; "1"; "0"; "N/A"; "0";"16" "80"; "80";"BLOCK_SAND" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"5"; "1";"BLOCK_SAND_WHITE" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "1"; "1"; "0"; "N/A"; "0";"16" "81"; "81";"BLOCK_SAND_WHITE" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"5"; "2";"BLOCK_SAND_RED" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "2"; "1"; "0"; "N/A"; "0";"16" "82"; "82";"BLOCK_SAND_RED" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"5"; "3";"BLOCK_SAND_DESERT" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "3"; "1"; "0"; "N/A"; "0";"16" "83"; "83";"BLOCK_SAND_DESERT" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"5"; "4";"BLOCK_SAND_BLACK" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "4"; "1"; "0"; "N/A"; "0";"16" "84"; "84";"BLOCK_SAND_BLACK" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"5"; "5";"BLOCK_SAND_GREEN" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "5"; "1"; "0"; "N/A"; "0";"16" "85"; "85";"BLOCK_SAND_GREEN" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"6"; "0";"BLOCK_GRAVEL" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "6"; "0"; "1"; "0"; "N/A"; "0";"16" "96"; "96";"BLOCK_GRAVEL" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"6"; "1";"BLOCK_GRAVEL_GREY" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "6"; "1"; "1"; "0"; "N/A"; "0";"16" "97"; "97";"BLOCK_GRAVEL_GREY" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "1"; "0"; "N/A"; "0";"16"
"7"; "0";"BLOCK_ORE_MALACHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "0"; "0"; "0"; "N/A"; "0";"16" "112"; "112";"BLOCK_ORE_MALACHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"7"; "1";"BLOCK_ORE_HEMATITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "1"; "0"; "0"; "N/A"; "0";"16" "113"; "113";"BLOCK_ORE_HEMATITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"7"; "2";"BLOCK_ORE_NATURAL_GOLD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "2"; "0"; "0"; "N/A"; "0";"16" "114"; "114";"BLOCK_ORE_NATURAL_GOLD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"7"; "3";"BLOCK_ORE_NATURAL_SILVER" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "3"; "0"; "0"; "N/A"; "0";"16" "115"; "115";"BLOCK_ORE_NATURAL_SILVER" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"7"; "4";"BLOCK_ORE_RUTILE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "4"; "0"; "0"; "N/A"; "0";"16" "116"; "116";"BLOCK_ORE_RUTILE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"7"; "5";"BLOCK_ORE_AURICHALCUMITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "5"; "0"; "0"; "N/A"; "0";"16" "117"; "117";"BLOCK_ORE_AURICHALCUMITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "0";"BLOCK_GEM_RUBY" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "0"; "0"; "0"; "N/A"; "0";"16" "128"; "128";"BLOCK_GEM_RUBY" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "1";"BLOCK_GEM_EMERALD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "1"; "0"; "0"; "N/A"; "0";"16" "129"; "129";"BLOCK_GEM_EMERALD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "2";"BLOCK_GEM_SAPPHIRE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "2"; "0"; "0"; "N/A"; "0";"16" "130"; "130";"BLOCK_GEM_SAPPHIRE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "3";"BLOCK_GEM_TOPAZ" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "3"; "0"; "0"; "N/A"; "0";"16" "131"; "131";"BLOCK_GEM_TOPAZ" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "4";"BLOCK_GEM_DIAMOND" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "4"; "0"; "0"; "N/A"; "0";"16" "132"; "132";"BLOCK_GEM_DIAMOND" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"8"; "5";"BLOCK_GEM_AMETHYST" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "5"; "0"; "0"; "N/A"; "0";"16" "133"; "133";"BLOCK_GEM_AMETHYST" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"9"; "0";"BLOCK_SNOW" ; "33587232"; "24"; "500";"snow"; "0"; "1"; "1"; "0"; "9"; "0"; "0"; "0"; "N/A"; "0";"16" "144"; "144";"BLOCK_SNOW" ; "33587232"; "24"; "500";"snow"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"9"; "1";"BLOCK_ICE_FRAGILE" ; "13644813"; "5"; "930";"icei"; "0"; "1"; "0"; "0"; "9"; "1"; "0"; "0"; "N/A"; "0"; "4" "145"; "0";"BLOCK_ICE_FRAGILE" ; "13644813"; "5"; "930";"icei"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0"; "4"
"9"; "2";"BLOCK_ICE_NATURAL" ; "27289626"; "35"; "930";"icei"; "0"; "1"; "1"; "0"; "9"; "2"; "0"; "0"; "N/A"; "0"; "4" "146"; "146";"BLOCK_ICE_NATURAL" ; "27289626"; "35"; "930";"icei"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0"; "4"
"9"; "3";"BLOCK_ICE_CLEAR_MAGICAL" ; "33587232"; "48";"3720";"icex"; "0"; "1"; "1"; "19955770"; "9"; "3"; "0"; "0"; "N/A"; "0"; "4" "147"; "147";"BLOCK_ICE_CLEAR_MAGICAL" ; "33587232"; "48";"3720";"icex"; "0"; "1"; "1"; "19955770"; "0"; "0"; "N/A"; "0"; "4"
"9"; "4";"BLOCK_GLASS_CRUDE" ; "3146755"; "5";"2500";"glas"; "0"; "1"; "1"; "0"; "9"; "4"; "0"; "0"; "N/A"; "0";"16" "148"; "148";"BLOCK_GLASS_CRUDE" ; "3146755"; "5";"2500";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"9"; "5";"BLOCK_GLASS_CLEAN" ; "1049601"; "5";"2203";"glas"; "0"; "1"; "1"; "0"; "9"; "5"; "0"; "0"; "N/A"; "0";"16" "149"; "149";"BLOCK_GLASS_CLEAN" ; "1049601"; "5";"2203";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"10"; "0";"BLOCK_PLATFORM_STONE" ; "8396808"; "5"; "N/A";"rock"; "0"; "0"; "0"; "0"; "10"; "0"; "0"; "0"; "N/A"; "0";"16" "160"; "160";"BLOCK_PLATFORM_STONE" ; "8396808"; "5"; "N/A";"rock"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"10"; "1";"BLOCK_PLATFORM_WOODEN" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "1"; "0"; "0"; "N/A"; "0";"16" "161"; "161";"BLOCK_PLATFORM_WOODEN" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"10"; "2";"BLOCK_PLATFORM_EBONY" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "2"; "0"; "0"; "N/A"; "0";"16" "162"; "162";"BLOCK_PLATFORM_EBONY" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"10"; "3";"BLOCK_PLATFORM_BIRCH" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "3"; "0"; "0"; "N/A"; "0";"16" "163"; "163";"BLOCK_PLATFORM_BIRCH" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"10"; "4";"BLOCK_PLATFORM_BLOODROSE" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "4"; "0"; "0"; "N/A"; "0";"16" "164"; "164";"BLOCK_PLATFORM_BLOODROSE" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"11"; "0";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "11"; "0"; "0"; "1"; "N/A"; "0";"16" "176"; "176";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "0"; "1"; "N/A"; "0";"16"
"11"; "1";"BLOCK_TORCH_FROST" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "81916159"; "11"; "1"; "0"; "1"; "N/A"; "0";"16" "177"; "177";"BLOCK_TORCH_FROST" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "81916159"; "0"; "1"; "N/A"; "0";"16"
"12"; "0";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "11"; "0"; "0"; "0"; "N/A"; "0";"16" "192"; "176";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"12"; "1";"BLOCK_TORCH_FROST" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "11"; "1"; "0"; "0"; "N/A"; "0";"16" "193"; "177";"BLOCK_TORCH_FROST" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16"
"13"; "0";"BLOCK_ILLUMINATOR_WHITE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "239319274"; "13"; "0"; "0"; "0"; "N/A"; "0";"16" "208"; "208";"BLOCK_ILLUMINATOR_WHITE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "239319274"; "0"; "0"; "N/A"; "0";"16"
"13"; "1";"BLOCK_ILLUMINATOR_YELLOW" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267607040"; "13"; "1"; "0"; "0"; "N/A"; "0";"16" "209"; "209";"BLOCK_ILLUMINATOR_YELLOW" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267607040"; "0"; "0"; "N/A"; "0";"16"
"13"; "2";"BLOCK_ILLUMINATOR_ORANGE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267546624"; "13"; "2"; "0"; "0"; "N/A"; "0";"16" "210"; "210";"BLOCK_ILLUMINATOR_ORANGE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267546624"; "0"; "0"; "N/A"; "0";"16"
"13"; "3";"BLOCK_ILLUMINATOR_RED" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415360"; "13"; "3"; "0"; "0"; "N/A"; "0";"16" "211"; "211";"BLOCK_ILLUMINATOR_RED" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415360"; "0"; "0"; "N/A"; "0";"16"
"13"; "4";"BLOCK_ILLUMINATOR_FUCHSIA" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415543"; "13"; "4"; "0"; "0"; "N/A"; "0";"16" "212"; "212";"BLOCK_ILLUMINATOR_FUCHSIA" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415543"; "0"; "0"; "N/A"; "0";"16"
"13"; "5";"BLOCK_ILLUMINATOR_PURPLE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "191889643"; "13"; "5"; "0"; "0"; "N/A"; "0";"16" "213"; "213";"BLOCK_ILLUMINATOR_PURPLE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "191889643"; "0"; "0"; "N/A"; "0";"16"
"13"; "6";"BLOCK_ILLUMINATOR_BLUE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "52479"; "13"; "6"; "0"; "0"; "N/A"; "0";"16" "214"; "214";"BLOCK_ILLUMINATOR_BLUE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "52479"; "0"; "0"; "N/A"; "0";"16"
"13"; "7";"BLOCK_ILLUMINATOR_CYAN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "219391"; "13"; "7"; "0"; "0"; "N/A"; "0";"16" "215"; "215";"BLOCK_ILLUMINATOR_CYAN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "219391"; "0"; "0"; "N/A"; "0";"16"
"13"; "8";"BLOCK_ILLUMINATOR_GREEN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "56884224"; "13"; "8"; "0"; "0"; "N/A"; "0";"16" "216"; "216";"BLOCK_ILLUMINATOR_GREEN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "56884224"; "0"; "0"; "N/A"; "0";"16"
"13"; "9";"BLOCK_ILLUMINATOR_GREEN_DARK";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "33660928"; "13"; "9"; "0"; "0"; "N/A"; "0";"16" "217"; "217";"BLOCK_ILLUMINATOR_GREEN_DARK";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "33660928"; "0"; "0"; "N/A"; "0";"16"
"13"; "10";"BLOCK_ILLUMINATOR_BROWN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "89161728"; "13"; "10"; "0"; "0"; "N/A"; "0";"16" "218"; "218";"BLOCK_ILLUMINATOR_BROWN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "89161728"; "0"; "0"; "N/A"; "0";"16"
"13"; "11";"BLOCK_ILLUMINATOR_TAN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "157392948"; "13"; "11"; "0"; "0"; "N/A"; "0";"16" "219"; "219";"BLOCK_ILLUMINATOR_TAN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "157392948"; "0"; "0"; "N/A"; "0";"16"
"13"; "12";"BLOCK_ILLUMINATOR_GREY_LIGHT";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "198374589"; "13"; "12"; "0"; "0"; "N/A"; "0";"16" "220"; "220";"BLOCK_ILLUMINATOR_GREY_LIGHT";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "198374589"; "0"; "0"; "N/A"; "0";"16"
"13"; "13";"BLOCK_ILLUMINATOR_GREY_MED"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "122803317"; "13"; "13"; "0"; "0"; "N/A"; "0";"16" "221"; "221";"BLOCK_ILLUMINATOR_GREY_MED"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "122803317"; "0"; "0"; "N/A"; "0";"16"
"13"; "14";"BLOCK_ILLUMINATOR_GREY_DARK"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "68224065"; "13"; "14"; "0"; "0"; "N/A"; "0";"16" "222"; "222";"BLOCK_ILLUMINATOR_GREY_DARK"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "68224065"; "0"; "0"; "N/A"; "0";"16"
"13"; "15";"BLOCK_ILLUMINATOR_BLACK" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "116392191"; "13"; "15"; "0"; "0"; "N/A"; "0";"16" "223"; "223";"BLOCK_ILLUMINATOR_BLACK" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "116392191"; "0"; "0"; "N/A"; "0";"16"
"14"; "0";"BLOCK_ILLUMINATOR_WHITE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "0"; "0"; "0"; "N/A"; "0";"16" "224"; "208";"BLOCK_ILLUMINATOR_WHITE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "1";"BLOCK_ILLUMINATOR_YELLOW" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "1"; "0"; "0"; "N/A"; "0";"16" "225"; "209";"BLOCK_ILLUMINATOR_YELLOW" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "2";"BLOCK_ILLUMINATOR_ORANGE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "2"; "0"; "0"; "N/A"; "0";"16" "226"; "210";"BLOCK_ILLUMINATOR_ORANGE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "3";"BLOCK_ILLUMINATOR_RED" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "3"; "0"; "0"; "N/A"; "0";"16" "227"; "211";"BLOCK_ILLUMINATOR_RED" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "4";"BLOCK_ILLUMINATOR_FUCHSIA" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "4"; "0"; "0"; "N/A"; "0";"16" "228"; "212";"BLOCK_ILLUMINATOR_FUCHSIA" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "5";"BLOCK_ILLUMINATOR_PURPLE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "5"; "0"; "0"; "N/A"; "0";"16" "229"; "213";"BLOCK_ILLUMINATOR_PURPLE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "6";"BLOCK_ILLUMINATOR_BLUE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "6"; "0"; "0"; "N/A"; "0";"16" "230"; "214";"BLOCK_ILLUMINATOR_BLUE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "7";"BLOCK_ILLUMINATOR_CYAN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "7"; "0"; "0"; "N/A"; "0";"16" "231"; "215";"BLOCK_ILLUMINATOR_CYAN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "8";"BLOCK_ILLUMINATOR_GREEN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "8"; "0"; "0"; "N/A"; "0";"16" "232"; "216";"BLOCK_ILLUMINATOR_GREEN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "9";"BLOCK_ILLUMINATOR_GREEN_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "9"; "0"; "0"; "N/A"; "0";"16" "233"; "217";"BLOCK_ILLUMINATOR_GREEN_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "10";"BLOCK_ILLUMINATOR_BROWN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "10"; "0"; "0"; "N/A"; "0";"16" "234"; "218";"BLOCK_ILLUMINATOR_BROWN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "11";"BLOCK_ILLUMINATOR_TAN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "11"; "0"; "0"; "N/A"; "0";"16" "235"; "219";"BLOCK_ILLUMINATOR_TAN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "12";"BLOCK_ILLUMINATOR_GREY_LIGHT";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "12"; "0"; "0"; "N/A"; "0";"16" "236"; "220";"BLOCK_ILLUMINATOR_GREY_LIGHT";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "13";"BLOCK_ILLUMINATOR_GREY_MED"; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "13"; "0"; "0"; "N/A"; "0";"16" "237"; "221";"BLOCK_ILLUMINATOR_GREY_MED"; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "14";"BLOCK_ILLUMINATOR_GREY_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "14"; "0"; "0"; "N/A"; "0";"16" "238"; "222";"BLOCK_ILLUMINATOR_GREY_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"14"; "15";"BLOCK_ILLUMINATOR_BLACK" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "15"; "0"; "0"; "N/A"; "0";"16" "239"; "223";"BLOCK_ILLUMINATOR_BLACK" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "0";"BLOCK_SANDSTONE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "0"; "0"; "0"; "N/A"; "0";"16" "240"; "240";"BLOCK_SANDSTONE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "1";"BLOCK_SANDSTONE_WHITE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "1"; "0"; "0"; "N/A"; "0";"16" "241"; "241";"BLOCK_SANDSTONE_WHITE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "2";"BLOCK_SANDSTONE_RED" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "2"; "0"; "0"; "N/A"; "0";"16" "242"; "242";"BLOCK_SANDSTONE_RED" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "3";"BLOCK_SANDSTONE_DESERT" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "3"; "0"; "0"; "N/A"; "0";"16" "243"; "243";"BLOCK_SANDSTONE_DESERT" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "4";"BLOCK_SANDSTONE_BLACK" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "4"; "0"; "0"; "N/A"; "0";"16" "244"; "244";"BLOCK_SANDSTONE_BLACK" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"15"; "5";"BLOCK_SANDSTONE_GREEN" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "5"; "0"; "0"; "N/A"; "0";"16" "245"; "245";"BLOCK_SANDSTONE_GREEN" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
"16"; "0";"BLOCK_LANTERN_IRON_REGULAR"; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "16"; "0"; "0"; "0"; "N/A"; "0";"16" "256"; "256";"BLOCK_LANTERN_IRON_REGULAR"; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "0"; "0"; "N/A"; "0";"16"
"16"; "1";"BLOCK_SUNSTONE" ; "33587232"; "1"; "N/A";"rock"; "0"; "1"; "0"; "0"; "16"; "1"; "0"; "2"; "N/A"; "0";"16" "257"; "257";"BLOCK_SUNSTONE" ; "33587232"; "1"; "N/A";"rock"; "0"; "1"; "0"; "0"; "0"; "2"; "N/A"; "0";"16"
"16"; "2";"BLOCK_DAYLIGHT_CAPACITOR" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "0"; "0"; "16"; "2"; "0"; "3"; "N/A"; "0";"16" "258"; "258";"BLOCK_DAYLIGHT_CAPACITOR" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "0"; "0"; "0"; "3"; "N/A"; "0";"16"
"254"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4064"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "1";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4065"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "2";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4066"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "3";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4067"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "4";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4068"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "5";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4069"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "6";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4070"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "7";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4071"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "8";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4072"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "9";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4073"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "10";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4074"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "11";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4075"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "12";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4076"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "13";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4077"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "14";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4078"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"254"; "15";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "0"; "0"; "32"; "0";"16" "4079"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16"
"255"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4080"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "1";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4081"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "2";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4082"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "3";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4083"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "4";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4084"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "5";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4085"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "6";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4086"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "7";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4087"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "8";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4088"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "9";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4089"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "10";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4090"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "11";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4091"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "12";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4092"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "13";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4093"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "14";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4094"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"255"; "15";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "0"; "0"; "16"; "0";"16" "4095"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16"
"0"; "-1";"BLOCK_NULL" ;"1073741823"; "-1";"2600";"null"; "0"; "0"; "1"; "0"; "N/A"; "N/A"; "0"; "0"; "N/A"; "0";"16" "-1"; "0";"BLOCK_NULL" ;"1073741823"; "-1";"2600";"null"; "0"; "0"; "1"; "0"; "0"; "0"; "N/A"; "0";"16"
## Notes ## ## Notes ##
# blid: Block ID
# drid: Drop ID
# Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky # Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky
# Opacity/Lumcolor: 30-bit RGB. Only the light diffusers have a opacity value of ZERO. # Opacity/Lumcolor: 30-bit RGB. Only the light diffusers have a opacity value of ZERO.
Can't render this file because it contains an unexpected character in line 1 and column 18.

View File

@@ -1,13 +1,13 @@
"idst";"forcemod";"endurance";"comments" "idst";"dsty";"forcemod";"endurance";"comments"
"rock"; "1"; "0.42"; "rock";"2400"; "1"; "0.42";
"cupr"; "2"; "1.00";"copper" "cupr";"1000"; "2"; "1.00";"copper"
"egls"; "4"; "0.82";"elven glass" "egls";"2500"; "4"; "0.82";"elven glass"
"iron"; "5"; "1.42"; "iron";"1000"; "5"; "1.42";
"argn"; "9"; "0.91";"argentum/silver" "argn";"1000"; "9"; "0.91";"argentum/silver"
"stal"; "14"; "1.73";"steel" "stal";"1000"; "14"; "1.73";"steel"
"eaur"; "21"; "1.36";"elven aurichalcum" "eaur";"1000"; "21"; "1.36";"elven aurichalcum"
"tial"; "33"; "2.16";"titanium alloy (Ti6Al4V)" "tial";"1000"; "33"; "2.16";"titanium alloy (Ti6Al4V)"
"admt"; "71"; "3.42";"adamant" "admt";"1000"; "71"; "3.42";"adamant"
# idst: ID_STRING # idst: ID_STRING
1 idst dsty forcemod endurance comments
2 rock 2400 1 0.42
3 cupr 1000 2 1.00 copper
4 egls 2500 4 0.82 elven glass
5 iron 1000 5 1.42
6 argn 1000 9 0.91 argentum/silver
7 stal 1000 14 1.73 steel
8 eaur 1000 21 1.36 elven aurichalcum
9 tial 1000 33 2.16 titanium alloy (Ti6Al4V)
10 admt 1000 71 3.42 adamant
11 # idst: ID_STRING
12 # forcemod: related to attack points
13 # Attack points = `4 * forcemod.sqrt()` for each strike

View File

@@ -54,10 +54,10 @@ class StateInGame : BasicGameState() {
val particlesContainer = CircularArray<ParticleBase>(PARTICLES_MAX) val particlesContainer = CircularArray<ParticleBase>(PARTICLES_MAX)
val uiContainer = ArrayList<UIHandler>() val uiContainer = ArrayList<UIHandler>()
private val actorsRenderBehind = ArrayList<ActorVisible>(ACTORCONTAINER_INITIAL_SIZE) private val actorsRenderBehind = ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
private val actorsRenderMiddle = ArrayList<ActorVisible>(ACTORCONTAINER_INITIAL_SIZE) private val actorsRenderMiddle = ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
private val actorsRenderMidTop = ArrayList<ActorVisible>(ACTORCONTAINER_INITIAL_SIZE) private val actorsRenderMidTop = ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
private val actorsRenderFront = ArrayList<ActorVisible>(ACTORCONTAINER_INITIAL_SIZE) private val actorsRenderFront = ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
var playableActorDelegate: PlayableActorDelegate? = null // DO NOT LATEINIT! var playableActorDelegate: PlayableActorDelegate? = null // DO NOT LATEINIT!
private set private set
@@ -204,11 +204,13 @@ class StateInGame : BasicGameState() {
// batch-process uiAliases // batch-process uiAliases
uiAliases = arrayListOf( uiAliases = arrayListOf(
uiPieMenu, // drawn first
uiQuickBar,
uiVitalPrimary, uiVitalPrimary,
uiVitalSecondary, uiVitalSecondary,
uiVitalItem uiVitalItem,
uiPieMenu,
uiQuickBar
// drawn last
) )
uiAlasesPausing = arrayListOf( uiAlasesPausing = arrayListOf(
uiInventoryPlayer, uiInventoryPlayer,
@@ -391,7 +393,7 @@ class StateInGame : BasicGameState() {
actorsRenderMidTop.forEach { it.drawBody(worldG) } actorsRenderMidTop.forEach { it.drawBody(worldG) }
player?.drawBody(worldG) player?.drawBody(worldG)
actorsRenderFront.forEach { it.drawBody(worldG) } actorsRenderFront.forEach { it.drawBody(worldG) }
// --> Change of blend mode <-- introduced by ActorVisible // // --> Change of blend mode <-- introduced by childs of ActorWithBody //
///////////////////////////// /////////////////////////////
@@ -418,7 +420,7 @@ class StateInGame : BasicGameState() {
actorsRenderMidTop.forEach { it.drawGlow(worldG) } actorsRenderMidTop.forEach { it.drawGlow(worldG) }
player?.drawGlow(worldG) player?.drawGlow(worldG)
actorsRenderFront.forEach { it.drawGlow(worldG) } actorsRenderFront.forEach { it.drawGlow(worldG) }
// --> blendLightenOnly() <-- introduced by ActorVisible // // --> blendLightenOnly() <-- introduced by childs of ActorWithBody //
//////////////////////// ////////////////////////
@@ -428,7 +430,7 @@ class StateInGame : BasicGameState() {
// draw reference ID if debugWindow is open // draw reference ID if debugWindow is open
if (debugWindow.isVisible) { if (debugWindow.isVisible) {
actorContainer.forEachIndexed { i, actor -> actorContainer.forEachIndexed { i, actor ->
if (actor is ActorVisible) { if (actor is ActorWithBody) {
worldG.color = Color.white worldG.color = Color.white
worldG.font = Terrarum.fontSmallNumbers worldG.font = Terrarum.fontSmallNumbers
worldG.drawString( worldG.drawString(
@@ -540,7 +542,7 @@ class StateInGame : BasicGameState() {
var i = 0 var i = 0
while (i < actorContainerSize) { // loop through actorContainerInactive while (i < actorContainerSize) { // loop through actorContainerInactive
val actor = actorContainerInactive[i] val actor = actorContainerInactive[i]
if (actor is ActorVisible && actor.inUpdateRange()) { if (actor is ActorWithBody && actor.inUpdateRange()) {
activateDormantActor(actor) // duplicates are checked here activateDormantActor(actor) // duplicates are checked here
actorContainerSize -= 1 actorContainerSize -= 1
i-- // array removed 1 elem, so we also decrement counter by 1 i-- // array removed 1 elem, so we also decrement counter by 1
@@ -567,7 +569,7 @@ class StateInGame : BasicGameState() {
i-- // array removed 1 elem, so we also decrement counter by 1 i-- // array removed 1 elem, so we also decrement counter by 1
} }
// inactivate distant actors // inactivate distant actors
else if (actor is ActorVisible && !actor.inUpdateRange()) { else if (actor is ActorWithBody && !actor.inUpdateRange()) {
if (actor !is Projectile) { // if it's a projectile, don't inactivate it; just kill it. if (actor !is Projectile) { // if it's a projectile, don't inactivate it; just kill it.
actorContainerInactive.add(actor) // naïve add; duplicates are checked when the actor is re-activated actorContainerInactive.add(actor) // naïve add; duplicates are checked when the actor is re-activated
} }
@@ -626,7 +628,7 @@ class StateInGame : BasicGameState() {
d.forEach { if (it < ret) ret = it } d.forEach { if (it < ret) ret = it }
return ret return ret
} }
private fun distToActorSqr(a: ActorVisible, p: ActorVisible) = private fun distToActorSqr(a: ActorWithBody, p: ActorWithBody) =
min(// take min of normal position and wrapped (x < 0) position min(// take min of normal position and wrapped (x < 0) position
(a.hitbox.centeredX - p.hitbox.centeredX).sqr() + (a.hitbox.centeredX - p.hitbox.centeredX).sqr() +
(a.hitbox.centeredY - p.hitbox.centeredY).sqr(), (a.hitbox.centeredY - p.hitbox.centeredY).sqr(),
@@ -635,7 +637,7 @@ class StateInGame : BasicGameState() {
(a.hitbox.centeredX - p.hitbox.centeredX - world.width * TILE_SIZE).sqr() + (a.hitbox.centeredX - p.hitbox.centeredX - world.width * TILE_SIZE).sqr() +
(a.hitbox.centeredY - p.hitbox.centeredY).sqr() (a.hitbox.centeredY - p.hitbox.centeredY).sqr()
) )
private fun distToCameraSqr(a: ActorVisible) = private fun distToCameraSqr(a: ActorWithBody) =
min( min(
(a.hitbox.posX - WorldCamera.x).sqr() + (a.hitbox.posX - WorldCamera.x).sqr() +
(a.hitbox.posY - WorldCamera.y).sqr(), (a.hitbox.posY - WorldCamera.y).sqr(),
@@ -646,14 +648,14 @@ class StateInGame : BasicGameState() {
) )
/** whether the actor is within screen */ /** whether the actor is within screen */
private fun ActorVisible.inScreen() = private fun ActorWithBody.inScreen() =
distToCameraSqr(this) <= distToCameraSqr(this) <=
(Terrarum.WIDTH.plus(this.hitbox.width.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr() + (Terrarum.WIDTH.plus(this.hitbox.width.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr() +
Terrarum.HEIGHT.plus(this.hitbox.height.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr()) Terrarum.HEIGHT.plus(this.hitbox.height.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr())
/** whether the actor is within update range */ /** whether the actor is within update range */
private fun ActorVisible.inUpdateRange() = distToCameraSqr(this) <= ACTOR_UPDATE_RANGE.sqr() private fun ActorWithBody.inUpdateRange() = distToCameraSqr(this) <= ACTOR_UPDATE_RANGE.sqr()
/** /**
* actorContainer extensions * actorContainer extensions
@@ -693,7 +695,7 @@ class StateInGame : BasicGameState() {
// indexToDelete >= 0 means that the actor certainly exists in the game // indexToDelete >= 0 means that the actor certainly exists in the game
// which means we don't need to check if i >= 0 again // which means we don't need to check if i >= 0 again
if (actor is ActorVisible) { if (actor is ActorWithBody) {
when (actor.renderOrder) { when (actor.renderOrder) {
Actor.RenderOrder.BEHIND -> { Actor.RenderOrder.BEHIND -> {
val i = actorsRenderBehind.binarySearch(actor.referenceID) val i = actorsRenderBehind.binarySearch(actor.referenceID)
@@ -727,7 +729,7 @@ class StateInGame : BasicGameState() {
actorContainer.add(actor) actorContainer.add(actor)
insertionSortLastElem(actorContainer) // we can do this as we are only adding single actor insertionSortLastElem(actorContainer) // we can do this as we are only adding single actor
if (actor is ActorVisible) { if (actor is ActorWithBody) {
when (actor.renderOrder) { when (actor.renderOrder) {
Actor.RenderOrder.BEHIND -> { Actor.RenderOrder.BEHIND -> {
actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind) actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind)
@@ -758,7 +760,7 @@ class StateInGame : BasicGameState() {
actorContainer.add(actor) actorContainer.add(actor)
insertionSortLastElem(actorContainer) // we can do this as we are only adding single actor insertionSortLastElem(actorContainer) // we can do this as we are only adding single actor
if (actor is ActorVisible) { if (actor is ActorWithBody) {
when (actor.renderOrder) { when (actor.renderOrder) {
Actor.RenderOrder.BEHIND -> { Actor.RenderOrder.BEHIND -> {
actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind) actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind)
@@ -820,7 +822,7 @@ class StateInGame : BasicGameState() {
arr[j + 1] = x arr[j + 1] = x
} }
} }
private fun insertionSortLastElemAV(arr: ArrayList<ActorVisible>) { // out-projection doesn't work, duh private fun insertionSortLastElemAV(arr: ArrayList<ActorWithBody>) { // out-projection doesn't work, duh
lock(ReentrantLock()) { lock(ReentrantLock()) {
var j = arr.lastIndex - 1 var j = arr.lastIndex - 1
val x = arr.last() val x = arr.last()

View File

@@ -7,147 +7,147 @@ object Block {
val AIR = 0 // hard coded; this is the standard val AIR = 0 // hard coded; this is the standard
val STONE = BlockCodex.idDamageToIndex(1, 0) val STONE = 16
val STONE_QUARRIED = BlockCodex.idDamageToIndex(1, 1) val STONE_QUARRIED = 17
val STONE_TILE_WHITE = BlockCodex.idDamageToIndex(1, 2) val STONE_TILE_WHITE = 18
val STONE_BRICKS = BlockCodex.idDamageToIndex(1, 3) val STONE_BRICKS = 19
val DIRT = BlockCodex.idDamageToIndex(2, 0) val DIRT = 32
val GRASS = BlockCodex.idDamageToIndex(2, 1) val GRASS = 33
val GRASSWALL = BlockCodex.idDamageToIndex(2, 2) val GRASSWALL = 34
val PLANK_NORMAL = BlockCodex.idDamageToIndex(3, 0) val PLANK_NORMAL = 48
val PLANK_EBONY = BlockCodex.idDamageToIndex(3, 1) val PLANK_EBONY = 49
val PLANK_BIRCH = BlockCodex.idDamageToIndex(3, 2) val PLANK_BIRCH = 50
val PLANK_BLOODROSE = BlockCodex.idDamageToIndex(3, 3) val PLANK_BLOODROSE = 51
val TRUNK_NORMAL = BlockCodex.idDamageToIndex(4, 0) val TRUNK_NORMAL = 64
val TRUNK_EBONY = BlockCodex.idDamageToIndex(4, 1) val TRUNK_EBONY = 65
val TRUNK_BIRCH = BlockCodex.idDamageToIndex(4, 2) val TRUNK_BIRCH = 66
val TRUNK_BLOODROSE = BlockCodex.idDamageToIndex(4, 3) val TRUNK_BLOODROSE = 67
val SAND = BlockCodex.idDamageToIndex(5, 0) val SAND = 80
val SAND_WHITE = BlockCodex.idDamageToIndex(5, 1) val SAND_WHITE = 81
val SAND_RED = BlockCodex.idDamageToIndex(5, 2) val SAND_RED = 82
val SAND_DESERT = BlockCodex.idDamageToIndex(5, 3) val SAND_DESERT = 83
val SAND_BLACK = BlockCodex.idDamageToIndex(5, 4) val SAND_BLACK = 84
val SAND_GREEN = BlockCodex.idDamageToIndex(5, 5) val SAND_GREEN = 85
val GRAVEL = BlockCodex.idDamageToIndex(6, 0) val GRAVEL = 96
val GRAVEL_GREY = BlockCodex.idDamageToIndex(6, 1) val GRAVEL_GREY = 97
val ORE_COPPER = BlockCodex.idDamageToIndex(7, 0) val ORE_COPPER = 112
val ORE_IRON = BlockCodex.idDamageToIndex(7, 1) val ORE_IRON = 113
val ORE_GOLD = BlockCodex.idDamageToIndex(7, 2) val ORE_GOLD = 114
val ORE_SILVER = BlockCodex.idDamageToIndex(7, 3) val ORE_SILVER = 115
val ORE_ILMENITE = BlockCodex.idDamageToIndex(7, 4) val ORE_ILMENITE = 116
val ORE_AURICHALCUM = BlockCodex.idDamageToIndex(7, 5) val ORE_AURICHALCUM = 117
val RAW_RUBY = BlockCodex.idDamageToIndex(8, 0) val RAW_RUBY = 128
val RAW_EMERALD = BlockCodex.idDamageToIndex(8, 1) val RAW_EMERALD = 129
val RAW_SAPPHIRE = BlockCodex.idDamageToIndex(8, 2) val RAW_SAPPHIRE = 130
val RAW_TOPAZ = BlockCodex.idDamageToIndex(8, 3) val RAW_TOPAZ = 131
val RAW_DIAMOND = BlockCodex.idDamageToIndex(8, 4) val RAW_DIAMOND = 132
val RAW_AMETHYST = BlockCodex.idDamageToIndex(8, 5) val RAW_AMETHYST = 133
val SNOW = BlockCodex.idDamageToIndex(9, 0) val SNOW = 144
val ICE_FRAGILE = BlockCodex.idDamageToIndex(9, 1) val ICE_FRAGILE = 145
val ICE_NATURAL = BlockCodex.idDamageToIndex(9, 2) val ICE_NATURAL = 146
val ICE_MAGICAL = BlockCodex.idDamageToIndex(9, 3) val ICE_MAGICAL = 147
val GLASS_CRUDE = BlockCodex.idDamageToIndex(9, 4) val GLASS_CRUDE = 148
val GLASS_CLEAN = BlockCodex.idDamageToIndex(9, 5) val GLASS_CLEAN = 149
val PLATFORM_STONE = BlockCodex.idDamageToIndex(10, 0) val PLATFORM_STONE = 160
val PLATFORM_WOODEN = BlockCodex.idDamageToIndex(10, 1) val PLATFORM_WOODEN = 161
val PLATFORM_EBONY = BlockCodex.idDamageToIndex(10, 2) val PLATFORM_EBONY = 162
val PLATFORM_BIRCH = BlockCodex.idDamageToIndex(10, 3) val PLATFORM_BIRCH = 163
val PLATFORM_BLOODROSE = BlockCodex.idDamageToIndex(10, 4) val PLATFORM_BLOODROSE = 164
val TORCH = BlockCodex.idDamageToIndex(11, 0) val TORCH = 176
val TORCH_FROST = BlockCodex.idDamageToIndex(11, 1) val TORCH_FROST = 177
val TORCH_OFF = BlockCodex.idDamageToIndex(12, 0) val TORCH_OFF = 192
val TORCH_FROST_OFF = BlockCodex.idDamageToIndex(12, 1) val TORCH_FROST_OFF = 193
val ILLUMINATOR_WHITE = BlockCodex.idDamageToIndex(13, 0) val ILLUMINATOR_WHITE = 208
val ILLUMINATOR_YELLOW = BlockCodex.idDamageToIndex(13, 1) val ILLUMINATOR_YELLOW = 209
val ILLUMINATOR_ORANGE = BlockCodex.idDamageToIndex(13, 2) val ILLUMINATOR_ORANGE = 210
val ILLUMINATOR_RED = BlockCodex.idDamageToIndex(13, 3) val ILLUMINATOR_RED = 211
val ILLUMINATOR_FUCHSIA = BlockCodex.idDamageToIndex(13, 4) val ILLUMINATOR_FUCHSIA = 212
val ILLUMINATOR_PURPLE = BlockCodex.idDamageToIndex(13, 5) val ILLUMINATOR_PURPLE = 213
val ILLUMINATOR_BLUE = BlockCodex.idDamageToIndex(13, 6) val ILLUMINATOR_BLUE = 214
val ILLUMINATOR_CYAN = BlockCodex.idDamageToIndex(13, 7) val ILLUMINATOR_CYAN = 215
val ILLUMINATOR_GREEN = BlockCodex.idDamageToIndex(13, 8) val ILLUMINATOR_GREEN = 216
val ILLUMINATOR_GREEN_DARK = BlockCodex.idDamageToIndex(13, 9) val ILLUMINATOR_GREEN_DARK = 217
val ILLUMINATOR_BROWN = BlockCodex.idDamageToIndex(13, 10) val ILLUMINATOR_BROWN = 218
val ILLUMINATOR_TAN = BlockCodex.idDamageToIndex(13, 11) val ILLUMINATOR_TAN = 219
val ILLUMINATOR_GREY_LIGHT = BlockCodex.idDamageToIndex(13, 12) val ILLUMINATOR_GREY_LIGHT = 220
val ILLUMINATOR_GREY_MED = BlockCodex.idDamageToIndex(13, 13) val ILLUMINATOR_GREY_MED = 221
val ILLUMINATOR_GREY_DARK = BlockCodex.idDamageToIndex(13, 14) val ILLUMINATOR_GREY_DARK = 222
val ILLUMINATOR_BLACK = BlockCodex.idDamageToIndex(13, 15) val ILLUMINATOR_BLACK = 223
val ILLUMINATOR_WHITE_OFF = BlockCodex.idDamageToIndex(14, 0) val ILLUMINATOR_WHITE_OFF = 224
val ILLUMINATOR_YELLOW_OFF = BlockCodex.idDamageToIndex(14, 1) val ILLUMINATOR_YELLOW_OFF = 225
val ILLUMINATOR_ORANGE_OFF = BlockCodex.idDamageToIndex(14, 2) val ILLUMINATOR_ORANGE_OFF = 226
val ILLUMINATOR_RED_OFF = BlockCodex.idDamageToIndex(14, 3) val ILLUMINATOR_RED_OFF = 227
val ILLUMINATOR_FUCHSIA_OFF = BlockCodex.idDamageToIndex(14, 4) val ILLUMINATOR_FUCHSIA_OFF = 228
val ILLUMINATOR_PURPLE_OFF = BlockCodex.idDamageToIndex(14, 5) val ILLUMINATOR_PURPLE_OFF = 229
val ILLUMINATOR_BLUE_OFF = BlockCodex.idDamageToIndex(14, 6) val ILLUMINATOR_BLUE_OFF = 230
val ILLUMINATOR_CYAN_OFF = BlockCodex.idDamageToIndex(14, 7) val ILLUMINATOR_CYAN_OFF = 231
val ILLUMINATOR_GREEN_OFF = BlockCodex.idDamageToIndex(14, 8) val ILLUMINATOR_GREEN_OFF = 232
val ILLUMINATOR_GREEN_DARK_OFF = BlockCodex.idDamageToIndex(14, 9) val ILLUMINATOR_GREEN_DARK_OFF = 233
val ILLUMINATOR_BROWN_OFF = BlockCodex.idDamageToIndex(14, 10) val ILLUMINATOR_BROWN_OFF = 234
val ILLUMINATOR_TAN_OFF = BlockCodex.idDamageToIndex(14, 11) val ILLUMINATOR_TAN_OFF = 235
val ILLUMINATOR_GREY_LIGHT_OFF = BlockCodex.idDamageToIndex(14, 12) val ILLUMINATOR_GREY_LIGHT_OFF = 236
val ILLUMINATOR_GREY_MED_OFF = BlockCodex.idDamageToIndex(14, 13) val ILLUMINATOR_GREY_MED_OFF = 237
val ILLUMINATOR_GREY_DARK_OFF = BlockCodex.idDamageToIndex(14, 14) val ILLUMINATOR_GREY_DARK_OFF = 238
val ILLUMINATOR_BLACK_OFF = BlockCodex.idDamageToIndex(14, 15) val ILLUMINATOR_BLACK_OFF = 239
val SANDSTONE = BlockCodex.idDamageToIndex(15, 0) val SANDSTONE = 240
val SANDSTONE_WHITE = BlockCodex.idDamageToIndex(15, 1) val SANDSTONE_WHITE = 241
val SANDSTONE_RED = BlockCodex.idDamageToIndex(15, 2) val SANDSTONE_RED = 242
val SANDSTONE_DESERT = BlockCodex.idDamageToIndex(15, 3) val SANDSTONE_DESERT = 243
val SANDSTONE_BLACK = BlockCodex.idDamageToIndex(15, 4) val SANDSTONE_BLACK = 244
val SANDSTONE_GREEN = BlockCodex.idDamageToIndex(15, 5) val SANDSTONE_GREEN = 245
val LANTERN = BlockCodex.idDamageToIndex(16, 0) val LANTERN = 256
val SUNSTONE = BlockCodex.idDamageToIndex(16, 1) val SUNSTONE = 257
val DAYLIGHT_CAPACITOR = BlockCodex.idDamageToIndex(16, 2) val DAYLIGHT_CAPACITOR = 258
val WATER_1 = BlockCodex.idDamageToIndex(255, 0) val WATER_1 = 4080
val WATER_2 = BlockCodex.idDamageToIndex(255, 1) val WATER_2 = 4081
val WATER_3 = BlockCodex.idDamageToIndex(255, 2) val WATER_3 = 4082
val WATER_4 = BlockCodex.idDamageToIndex(255, 3) val WATER_4 = 4083
val WATER_5 = BlockCodex.idDamageToIndex(255, 4) val WATER_5 = 4084
val WATER_6 = BlockCodex.idDamageToIndex(255, 5) val WATER_6 = 4085
val WATER_7 = BlockCodex.idDamageToIndex(255, 6) val WATER_7 = 4086
val WATER_8 = BlockCodex.idDamageToIndex(255, 7) val WATER_8 = 4087
val WATER_9 = BlockCodex.idDamageToIndex(255, 8) val WATER_9 = 4088
val WATER_10 = BlockCodex.idDamageToIndex(255, 9) val WATER_10 = 4089
val WATER_11 = BlockCodex.idDamageToIndex(255, 10) val WATER_11 = 4090
val WATER_12 = BlockCodex.idDamageToIndex(255, 11) val WATER_12 = 4091
val WATER_13 = BlockCodex.idDamageToIndex(255, 12) val WATER_13 = 4092
val WATER_14 = BlockCodex.idDamageToIndex(255, 13) val WATER_14 = 4093
val WATER_15 = BlockCodex.idDamageToIndex(255, 14) val WATER_15 = 4094
val WATER = BlockCodex.idDamageToIndex(255, 15) val WATER = 4095
val LAVA_1 = BlockCodex.idDamageToIndex(254, 0) val LAVA_1 = 4064
val LAVA_2 = BlockCodex.idDamageToIndex(254, 1) val LAVA_2 = 4065
val LAVA_3 = BlockCodex.idDamageToIndex(254, 2) val LAVA_3 = 4066
val LAVA_4 = BlockCodex.idDamageToIndex(254, 3) val LAVA_4 = 4067
val LAVA_5 = BlockCodex.idDamageToIndex(254, 4) val LAVA_5 = 4068
val LAVA_6 = BlockCodex.idDamageToIndex(254, 5) val LAVA_6 = 4069
val LAVA_7 = BlockCodex.idDamageToIndex(254, 6) val LAVA_7 = 4070
val LAVA_8 = BlockCodex.idDamageToIndex(254, 7) val LAVA_8 = 4071
val LAVA_9 = BlockCodex.idDamageToIndex(254, 8) val LAVA_9 = 4072
val LAVA_10 = BlockCodex.idDamageToIndex(254, 9) val LAVA_10 = 4073
val LAVA_11 = BlockCodex.idDamageToIndex(254, 10) val LAVA_11 = 4074
val LAVA_12 = BlockCodex.idDamageToIndex(254, 11) val LAVA_12 = 4075
val LAVA_13 = BlockCodex.idDamageToIndex(254, 12) val LAVA_13 = 4076
val LAVA_14 = BlockCodex.idDamageToIndex(254, 13) val LAVA_14 = 4077
val LAVA_15 = BlockCodex.idDamageToIndex(254, 14) val LAVA_15 = 4078
val LAVA = BlockCodex.idDamageToIndex(254, 15) val LAVA = 4079
val NULL = -1 val NULL = -1
} }

View File

@@ -29,13 +29,11 @@ object BlockCodex {
println("[BlockCodex] Building block properties table") println("[BlockCodex] Building block properties table")
records.forEach { records.forEach {
if (intVal(it, "sid") == -1) { if (intVal(it, "blid") == -1) {
setProp(nullProp, it) setProp(nullProp, it)
} }
else { else {
setProp( setProp(blockProps[intVal(it, "blid")], it)
blockProps[idDamageToIndex(intVal(it, "id"), intVal(it, "sid"))], it
)
} }
} }
} }
@@ -44,15 +42,13 @@ object BlockCodex {
} }
} }
fun get(index: Int, subID: Int): BlockProp { fun get(index: Int): BlockProp {
try { try {
blockProps[idDamageToIndex(index, subID)].id return blockProps[index]
} }
catch (e: NullPointerException) { catch (e: NullPointerException) {
throw NullPointerException("Blockprop with id $index and subID $subID does not exist.") throw NullPointerException("Blockprop with id $index does not exist.")
} }
return blockProps[idDamageToIndex(index, subID)]
} }
operator fun get(rawIndex: Int?): BlockProp { operator fun get(rawIndex: Int?): BlockProp {
@@ -71,14 +67,13 @@ object BlockCodex {
private fun setProp(prop: BlockProp, record: CSVRecord) { private fun setProp(prop: BlockProp, record: CSVRecord) {
prop.nameKey = record.get("name") prop.nameKey = record.get("name")
prop.id = idDamageToIndex(intVal(record, "id"), intVal(record, "sid")) prop.id = intVal(record, "blid")
prop.drop = intVal(record, "drid")
prop.opacity = intVal(record, "opacity") prop.opacity = intVal(record, "opacity")
prop.strength = intVal(record, "strength") prop.strength = intVal(record, "strength")
prop.density = intVal(record, "dsty") prop.density = intVal(record, "dsty")
prop.luminosity = intVal(record, "lumcolor") prop.luminosity = intVal(record, "lumcolor")
prop.drop = intVal(record, "drop")
prop.dropDamage = intVal(record, "ddmg")
prop.friction = intVal(record, "friction") prop.friction = intVal(record, "friction")
prop.viscosity = intVal(record, "vscs") prop.viscosity = intVal(record, "vscs")
@@ -90,7 +85,7 @@ object BlockCodex {
prop.dynamicLuminosityFunction = intVal(record, "dlfn") prop.dynamicLuminosityFunction = intVal(record, "dlfn")
print(formatNum3(intVal(record, "id")) + ":" + formatNum2(intVal(record, "sid"))) print("${intVal(record, "blid")}")
println("\t" + prop.nameKey) println("\t" + prop.nameKey)
} }
@@ -107,16 +102,5 @@ object BlockCodex {
private fun boolVal(rec: CSVRecord, s: String) = intVal(rec, s) != 0 private fun boolVal(rec: CSVRecord, s: String) = intVal(rec, s) != 0
fun idDamageToIndex(index: Int, damage: Int) = index * PairedMapLayer.RANGE + damage
private fun formatNum3(i: Int): String {
if (i < 10)
return "00" + i
else if (i < 100)
return "0" + i
else
return i.toString()
}
private fun formatNum2(i: Int) = if (i < 10) "0" + i else i.toString() private fun formatNum2(i: Int) = if (i < 10) "0" + i else i.toString()
} }

View File

@@ -33,7 +33,6 @@ class BlockProp {
get() = BlockPropUtil.getDynamicLumFunc(field, dynamicLuminosityFunction) get() = BlockPropUtil.getDynamicLumFunc(field, dynamicLuminosityFunction)
var drop: Int = 0 var drop: Int = 0
var dropDamage: Int = 0
var isFallable: Boolean = false var isFallable: Boolean = false

View File

@@ -7,6 +7,7 @@ import net.torvald.terrarum.gamecontroller.Key
import net.torvald.terrarum.itemproperties.InventoryItem import net.torvald.terrarum.itemproperties.InventoryItem
import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.realestate.LandUtil import net.torvald.terrarum.realestate.LandUtil
import net.torvald.terrarum.ui.UIInventory
import org.newdawn.slick.GameContainer import org.newdawn.slick.GameContainer
import org.newdawn.slick.Input import org.newdawn.slick.Input
import java.util.* import java.util.*
@@ -479,12 +480,15 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null)
// ONLY FOR HAND_GRIPs!! // ONLY FOR HAND_GRIPs!!
val quickBarItem = inventory.getQuickBar(actorValue.getAsInt(key)!!)?.item val quickBarItem = inventory.getQuickBar(actorValue.getAsInt(key)!!)?.item
if (quickBarItem == null) { if (quickBarItem != null && quickBarItem.equipPosition == InventoryItem.EquipPosition.HAND_GRIP) {
unequipSlot(InventoryItem.EquipPosition.HAND_GRIP)
}
else if (quickBarItem.equipPosition == InventoryItem.EquipPosition.HAND_GRIP) {
equipItem(quickBarItem) equipItem(quickBarItem)
} }
// force update inventory UI
try {
(Terrarum.ingame!!.uiInventoryPlayer.UI as UIInventory).shutUpAndRebuild()
}
catch (LateInitMyArse: kotlin.UninitializedPropertyAccessException) { }
} }
} }

View File

@@ -8,9 +8,8 @@ import org.newdawn.slick.Graphics
* *
* Created by minjaesong on 2017-01-21. * Created by minjaesong on 2017-01-21.
*/ */
abstract class ActorVisible(renderOrder: RenderOrder) : Actor(renderOrder) { abstract class ActorWithBody(renderOrder: RenderOrder) : Actor(renderOrder) {
open val hitbox = Hitbox(0.0, 0.0, 0.0, 0.0) open val hitbox = Hitbox(0.0, 0.0, 0.0, 0.0)
override abstract fun update(gc: GameContainer, delta: Int)
abstract fun drawBody(g: Graphics) abstract fun drawBody(g: Graphics)
abstract fun drawGlow(g: Graphics) abstract fun drawGlow(g: Graphics)
} }

View File

@@ -26,7 +26,7 @@ import java.util.*
* *
* Created by minjaesong on 16-01-13. * Created by minjaesong on 16-01-13.
*/ */
open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean = false, physics: Boolean = true) : ActorVisible(renderOrder) { open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean = false, physics: Boolean = true) : ActorWithBody(renderOrder) {
/** !! ActorValue macros are on the very bottom of the source !! **/ /** !! ActorValue macros are on the very bottom of the source !! **/

View File

@@ -13,7 +13,11 @@ typealias AnyPlayer = HistoricalFigure
* *
* Created by minjaesong on 16-10-10. * Created by minjaesong on 16-10-10.
*/ */
open class HistoricalFigure(val born: GameDate, val dead: GameDate? = null, realAirFriction: Boolean = false) : ActorWithPhysics(Actor.RenderOrder.MIDDLE, realAirFriction) { open class HistoricalFigure(
val born: GameDate,
val dead: GameDate? = null,
realAirFriction: Boolean = false
) : ActorWithPhysics(Actor.RenderOrder.MIDDLE, realAirFriction) {
init { init {
this.actorValue["_bornyear"] = born.year this.actorValue["_bornyear"] = born.year

View File

@@ -115,11 +115,11 @@ class UIInventory(
val listControlHelp: String val listControlHelp: String
get() = if (Terrarum.environment == RunningEnvironment.PC) get() = if (Terrarum.environment == RunningEnvironment.PC)
"${0xe006.toChar()} ${Lang["GAME_INVENTORY_USE"]}$SP" + "${0xe006.toChar()} ${Lang["GAME_INVENTORY_USE"]}$SP" +
"${0xe011.toChar()}..${0xe019.toChar()} ${Lang["GAME_INVENTORY_REGISTER"]}$SP" + "${0xe011.toChar()}..${0xe010.toChar()} ${Lang["GAME_INVENTORY_REGISTER"]}$SP" +
"${0xe034.toChar()} ${Lang["GAME_INVENTORY_DROP"]}" "${0xe034.toChar()} ${Lang["GAME_INVENTORY_DROP"]}"
else else
"$joypadLabelNinY ${Lang["GAME_INVENTORY_USE"]}$SP" + "$joypadLabelNinY ${Lang["GAME_INVENTORY_USE"]}$SP" +
"${0xe011.toChar()}${0xe019.toChar()} ${Lang["GAME_INVENTORY_REGISTER"]}$SP" + "${0xe011.toChar()}${0xe010.toChar()} ${Lang["GAME_INVENTORY_REGISTER"]}$SP" +
"$joypadLabelNinA ${Lang["GAME_INVENTORY_DROP"]}" "$joypadLabelNinA ${Lang["GAME_INVENTORY_DROP"]}"
val listControlClose: String val listControlClose: String
get() = if (Terrarum.environment == RunningEnvironment.PC) get() = if (Terrarum.environment == RunningEnvironment.PC)

File diff suppressed because it is too large Load Diff

Binary file not shown.