From 0510ac230b7d37b350dcbbe29ceb9bc05ef76f21 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sat, 29 Apr 2017 00:05:10 +0900 Subject: [PATCH] blocks now have properly formatted ids --- assets/graphics/fonts/ascii_variable.tga | 2 +- assets/ktGrepExample.kts | 150 + assets/modules/basegame/blocks/blocks.csv | 267 +- assets/modules/basegame/blocks/terrain.tga.gz | 4 +- assets/modules/basegame/materialprop.csv | 20 +- src/net/torvald/terrarum/StateInGame.kt | 42 +- .../torvald/terrarum/blockproperties/Block.kt | 246 +- .../terrarum/blockproperties/BlockCodex.kt | 32 +- .../terrarum/blockproperties/BlockProp.kt | 1 - .../terrarum/gameactors/ActorHumanoid.kt | 12 +- .../{ActorVisible.kt => ActorWithBody.kt} | 3 +- .../terrarum/gameactors/ActorWithPhysics.kt | 2 +- .../terrarum/gameactors/HistoricalFigure.kt | 6 +- src/net/torvald/terrarum/ui/UIInventory.kt | 4 +- work_files/UML/actors.mdj | 3398 ++++++++++++++--- work_files/graphics/fonts/ascii_variable.psd | 4 +- work_files/graphics/terrain/terrain.psd.gz | 4 +- 17 files changed, 3346 insertions(+), 851 deletions(-) create mode 100644 assets/ktGrepExample.kts rename src/net/torvald/terrarum/gameactors/{ActorVisible.kt => ActorWithBody.kt} (69%) diff --git a/assets/graphics/fonts/ascii_variable.tga b/assets/graphics/fonts/ascii_variable.tga index f0f79ed93..96b499eee 100644 --- a/assets/graphics/fonts/ascii_variable.tga +++ b/assets/graphics/fonts/ascii_variable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73a8db03dd982f29582ba5f8afb5de787329362c22abcca4a2c8c7b15b914eff +oid sha256:cd37bd59cc3f17d021760a32fcf736829cebb40189b7c1e70aca08103505b572 size 327724 diff --git a/assets/ktGrepExample.kts b/assets/ktGrepExample.kts new file mode 100644 index 000000000..429fd9a0d --- /dev/null +++ b/assets/ktGrepExample.kts @@ -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(2) + it.value.replace(Regex("[0-9]+")) { + matches.add(it.value.toInt()) + "" + } + "${matches[0] * 16 + matches[1]}" + } +}.forEach { println(it) } \ No newline at end of file diff --git a/assets/modules/basegame/blocks/blocks.csv b/assets/modules/basegame/blocks/blocks.csv index d80a1679e..2cbacca3c 100644 --- a/assets/modules/basegame/blocks/blocks.csv +++ b/assets/modules/basegame/blocks/blocks.csv @@ -1,138 +1,141 @@ - "id";"sid";"name" ; "opacity";"strength";"dsty";"mate";"fluid";"solid";"wall"; "lumcolor";"drop";"ddmg";"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" - "1"; "0";"BLOCK_STONE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "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" - "1"; "2";"BLOCK_STONE_TILE_WHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "1"; "2"; "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" - "2"; "0";"BLOCK_DIRT" ; "33587232"; "24";"1400";"dirt"; "0"; "1"; "1"; "0"; "2"; "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" - "2"; "2";"BLOCK_GRASSWALL" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "2"; "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" - "2"; "4";"BLOCK_FOLIAGE_LIME" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "4"; "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" - "2"; "6";"BLOCK_FOLIAGE_RED" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "6"; "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" - "2"; "8";"BLOCK_FOLIAGE_PURPLE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "2"; "8"; "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" - "3"; "1";"BLOCK_PLANK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "1"; "0"; "3"; "1"; "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" - "3"; "3";"BLOCK_PLANK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "1"; "0"; "3"; "3"; "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" - "4"; "1";"BLOCK_TRUNK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "0"; "0"; "3"; "1"; "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" - "4"; "3";"BLOCK_TRUNK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "0"; "0"; "3"; "3"; "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" - "5"; "1";"BLOCK_SAND_WHITE" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "1"; "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" - "5"; "3";"BLOCK_SAND_DESERT" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "3"; "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" - "5"; "5";"BLOCK_SAND_GREEN" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "5"; "5"; "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" - "6"; "1";"BLOCK_GRAVEL_GREY" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "6"; "1"; "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" - "7"; "1";"BLOCK_ORE_HEMATITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "1"; "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" - "7"; "3";"BLOCK_ORE_NATURAL_SILVER" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "3"; "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" - "7"; "5";"BLOCK_ORE_AURICHALCUMITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "7"; "5"; "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" - "8"; "1";"BLOCK_GEM_EMERALD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "1"; "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" - "8"; "3";"BLOCK_GEM_TOPAZ" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "3"; "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" - "8"; "5";"BLOCK_GEM_AMETHYST" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "8"; "5"; "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" - "9"; "1";"BLOCK_ICE_FRAGILE" ; "13644813"; "5"; "930";"icei"; "0"; "1"; "0"; "0"; "9"; "1"; "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" - "9"; "3";"BLOCK_ICE_CLEAR_MAGICAL" ; "33587232"; "48";"3720";"icex"; "0"; "1"; "1"; "19955770"; "9"; "3"; "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" - "9"; "5";"BLOCK_GLASS_CLEAN" ; "1049601"; "5";"2203";"glas"; "0"; "1"; "1"; "0"; "9"; "5"; "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" - "10"; "1";"BLOCK_PLATFORM_WOODEN" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "1"; "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" - "10"; "3";"BLOCK_PLATFORM_BIRCH" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "10"; "3"; "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" - "11"; "0";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "11"; "0"; "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" - "12"; "0";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "11"; "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" - "13"; "0";"BLOCK_ILLUMINATOR_WHITE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "239319274"; "13"; "0"; "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" - "13"; "2";"BLOCK_ILLUMINATOR_ORANGE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267546624"; "13"; "2"; "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" - "13"; "4";"BLOCK_ILLUMINATOR_FUCHSIA" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415543"; "13"; "4"; "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" - "13"; "6";"BLOCK_ILLUMINATOR_BLUE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "52479"; "13"; "6"; "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" - "13"; "8";"BLOCK_ILLUMINATOR_GREEN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "56884224"; "13"; "8"; "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" - "13"; "10";"BLOCK_ILLUMINATOR_BROWN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "89161728"; "13"; "10"; "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" - "13"; "12";"BLOCK_ILLUMINATOR_GREY_LIGHT";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "198374589"; "13"; "12"; "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" - "13"; "14";"BLOCK_ILLUMINATOR_GREY_DARK"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "68224065"; "13"; "14"; "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" - "14"; "0";"BLOCK_ILLUMINATOR_WHITE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "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" - "14"; "2";"BLOCK_ILLUMINATOR_ORANGE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "2"; "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" - "14"; "4";"BLOCK_ILLUMINATOR_FUCHSIA" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "4"; "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" - "14"; "6";"BLOCK_ILLUMINATOR_BLUE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "6"; "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" - "14"; "8";"BLOCK_ILLUMINATOR_GREEN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "8"; "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" - "14"; "10";"BLOCK_ILLUMINATOR_BROWN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "10"; "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" - "14"; "12";"BLOCK_ILLUMINATOR_GREY_LIGHT";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "12"; "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" - "14"; "14";"BLOCK_ILLUMINATOR_GREY_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "13"; "14"; "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" - "15"; "0";"BLOCK_SANDSTONE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "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" - "15"; "2";"BLOCK_SANDSTONE_RED" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "2"; "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" - "15"; "4";"BLOCK_SANDSTONE_BLACK" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "15"; "4"; "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" - "16"; "0";"BLOCK_LANTERN_IRON_REGULAR"; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "16"; "0"; "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" - "16"; "2";"BLOCK_DAYLIGHT_CAPACITOR" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "0"; "0"; "16"; "2"; "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" -"254"; "1";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "3";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "5";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "7";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "9";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "11";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "13";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"254"; "15";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "N/A"; "N/A"; "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" -"255"; "1";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "3";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "5";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "7";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "9";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "11";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "13";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" -"255"; "15";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "N/A"; "N/A"; "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" +"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"; "N/A"; "0";"4" + "16"; "17";"BLOCK_STONE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "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" + "18"; "18";"BLOCK_STONE_TILE_WHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "1"; "0"; "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" + "32"; "32";"BLOCK_DIRT" ; "33587232"; "24";"1400";"dirt"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16" + "33"; "32";"BLOCK_GRASS" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16" + "34"; "34";"BLOCK_GRASSWALL" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "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" + "36"; "36";"BLOCK_FOLIAGE_LIME" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "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" + "38"; "38";"BLOCK_FOLIAGE_RED" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "0"; "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" + "40"; "40";"BLOCK_FOLIAGE_PURPLE" ; "33587232"; "24";"1400";"grss"; "0"; "1"; "1"; "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" + "49"; "49";"BLOCK_PLANK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "1"; "0"; "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" + "51"; "51";"BLOCK_PLANK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "1"; "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" + "65"; "65";"BLOCK_TRUNK_EBONY" ; "33587232"; "19";"1200";"wood"; "0"; "1"; "0"; "0"; "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" + "67"; "67";"BLOCK_TRUNK_BLOODROSE" ; "33587232"; "17"; "900";"wood"; "0"; "1"; "0"; "0"; "0"; "0"; "N/A"; "0";"16" + "80"; "80";"BLOCK_SAND" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "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" + "82"; "82";"BLOCK_SAND_RED" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "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" + "84"; "84";"BLOCK_SAND_BLACK" ; "33587232"; "24";"2400";"sand"; "0"; "1"; "0"; "0"; "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" + "96"; "96";"BLOCK_GRAVEL" ; "33587232"; "24";"2400";"grvl"; "0"; "1"; "0"; "0"; "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" + "112"; "112";"BLOCK_ORE_MALACHITE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "114"; "114";"BLOCK_ORE_NATURAL_GOLD" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "116"; "116";"BLOCK_ORE_RUTILE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "128"; "128";"BLOCK_GEM_RUBY" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "130"; "130";"BLOCK_GEM_SAPPHIRE" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "132"; "132";"BLOCK_GEM_DIAMOND" ; "33587232"; "48";"2400";"rock"; "0"; "1"; "0"; "0"; "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" + "144"; "144";"BLOCK_SNOW" ; "33587232"; "24"; "500";"snow"; "0"; "1"; "1"; "0"; "0"; "0"; "N/A"; "0";"16" + "145"; "0";"BLOCK_ICE_FRAGILE" ; "13644813"; "5"; "930";"icei"; "0"; "1"; "0"; "0"; "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" + "147"; "147";"BLOCK_ICE_CLEAR_MAGICAL" ; "33587232"; "48";"3720";"icex"; "0"; "1"; "1"; "19955770"; "0"; "0"; "N/A"; "0"; "4" + "148"; "148";"BLOCK_GLASS_CRUDE" ; "3146755"; "5";"2500";"glas"; "0"; "1"; "1"; "0"; "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" + "160"; "160";"BLOCK_PLATFORM_STONE" ; "8396808"; "5"; "N/A";"rock"; "0"; "0"; "0"; "0"; "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" + "162"; "162";"BLOCK_PLATFORM_EBONY" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "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" + "164"; "164";"BLOCK_PLATFORM_BLOODROSE" ; "8396808"; "5"; "N/A";"wood"; "0"; "0"; "0"; "0"; "0"; "0"; "N/A"; "0";"16" + "176"; "176";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "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" + "192"; "176";"BLOCK_TORCH" ; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "0"; "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" + "208"; "208";"BLOCK_ILLUMINATOR_WHITE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "239319274"; "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" + "210"; "210";"BLOCK_ILLUMINATOR_ORANGE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "267546624"; "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" + "212"; "212";"BLOCK_ILLUMINATOR_FUCHSIA" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "246415543"; "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" + "214"; "214";"BLOCK_ILLUMINATOR_BLUE" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "52479"; "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" + "216"; "216";"BLOCK_ILLUMINATOR_GREEN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "56884224"; "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" + "218"; "218";"BLOCK_ILLUMINATOR_BROWN" ; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "89161728"; "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" + "220"; "220";"BLOCK_ILLUMINATOR_GREY_LIGHT";"8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "198374589"; "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" + "222"; "222";"BLOCK_ILLUMINATOR_GREY_DARK"; "8396808"; "1"; "N/A";"glas"; "0"; "1"; "1"; "68224065"; "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" + "224"; "208";"BLOCK_ILLUMINATOR_WHITE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "226"; "210";"BLOCK_ILLUMINATOR_ORANGE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "228"; "212";"BLOCK_ILLUMINATOR_FUCHSIA" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "230"; "214";"BLOCK_ILLUMINATOR_BLUE" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "232"; "216";"BLOCK_ILLUMINATOR_GREEN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "234"; "218";"BLOCK_ILLUMINATOR_BROWN" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "236"; "220";"BLOCK_ILLUMINATOR_GREY_LIGHT";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "238"; "222";"BLOCK_ILLUMINATOR_GREY_DARK";"33587232"; "1"; "N/A";"glas"; "0"; "1"; "1"; "0"; "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" + "240"; "240";"BLOCK_SANDSTONE" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "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" + "242"; "242";"BLOCK_SANDSTONE_RED" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "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" + "244"; "244";"BLOCK_SANDSTONE_BLACK" ; "33587232"; "48";"1900";"rock"; "0"; "1"; "1"; "0"; "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" + "256"; "256";"BLOCK_LANTERN_IRON_REGULAR"; "8396808"; "1"; "N/A";"fxtr"; "0"; "0"; "0"; "267553792"; "0"; "0"; "N/A"; "0";"16" + "257"; "257";"BLOCK_SUNSTONE" ; "33587232"; "1"; "N/A";"rock"; "0"; "1"; "0"; "0"; "0"; "2"; "N/A"; "0";"16" + "258"; "258";"BLOCK_DAYLIGHT_CAPACITOR" ; "33587232"; "1"; "N/A";"glas"; "0"; "1"; "0"; "0"; "0"; "3"; "N/A"; "0";"16" +"4064"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4065"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4066"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4067"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4068"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4069"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4070"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4071"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4072"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4073"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4074"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4075"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4076"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4077"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4078"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4079"; "0";"BLOCK_LAVA" ;"260301048"; "100";"2600";"rock"; "1"; "0"; "0"; "205574144"; "0"; "0"; "32"; "0";"16" +"4080"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4081"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4082"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4083"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4084"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4085"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4086"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4087"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4088"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4089"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4090"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4091"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4092"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4093"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4094"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" +"4095"; "0";"BLOCK_WATER" ; "27282445"; "100";"1000";"watr"; "1"; "0"; "0"; "0"; "0"; "0"; "16"; "0";"16" + "-1"; "0";"BLOCK_NULL" ;"1073741823"; "-1";"2600";"null"; "0"; "0"; "1"; "0"; "0"; "0"; "N/A"; "0";"16" ## Notes ## +# blid: Block ID +# drid: Drop ID + # Friction: 0: frictionless, <16: slippery, 16: regular, >16: sticky # Opacity/Lumcolor: 30-bit RGB. Only the light diffusers have a opacity value of ZERO. diff --git a/assets/modules/basegame/blocks/terrain.tga.gz b/assets/modules/basegame/blocks/terrain.tga.gz index 068b99537..fb85a45e2 100644 --- a/assets/modules/basegame/blocks/terrain.tga.gz +++ b/assets/modules/basegame/blocks/terrain.tga.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d17e3330acbf39b06555e5d371240cb4141f85e35b84c86faed1442a95ca903 -size 3016144 +oid sha256:d4848204132e9bd906f0ef6c3bd829853dc2d25c49c570ee03b8d7e6cc36037b +size 3015858 diff --git a/assets/modules/basegame/materialprop.csv b/assets/modules/basegame/materialprop.csv index f36003b1f..43bf8d491 100644 --- a/assets/modules/basegame/materialprop.csv +++ b/assets/modules/basegame/materialprop.csv @@ -1,13 +1,13 @@ -"idst";"forcemod";"endurance";"comments" -"rock"; "1"; "0.42"; -"cupr"; "2"; "1.00";"copper" -"egls"; "4"; "0.82";"elven glass" -"iron"; "5"; "1.42"; -"argn"; "9"; "0.91";"argentum/silver" -"stal"; "14"; "1.73";"steel" -"eaur"; "21"; "1.36";"elven aurichalcum" -"tial"; "33"; "2.16";"titanium alloy (Ti6Al4V)" -"admt"; "71"; "3.42";"adamant" +"idst";"dsty";"forcemod";"endurance";"comments" +"rock";"2400"; "1"; "0.42"; +"cupr";"1000"; "2"; "1.00";"copper" +"egls";"2500"; "4"; "0.82";"elven glass" +"iron";"1000"; "5"; "1.42"; +"argn";"1000"; "9"; "0.91";"argentum/silver" +"stal";"1000"; "14"; "1.73";"steel" +"eaur";"1000"; "21"; "1.36";"elven aurichalcum" +"tial";"1000"; "33"; "2.16";"titanium alloy (Ti6Al4V)" +"admt";"1000"; "71"; "3.42";"adamant" # idst: ID_STRING diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 5688f08cc..b1ef41409 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -54,10 +54,10 @@ class StateInGame : BasicGameState() { val particlesContainer = CircularArray(PARTICLES_MAX) val uiContainer = ArrayList() - private val actorsRenderBehind = ArrayList(ACTORCONTAINER_INITIAL_SIZE) - private val actorsRenderMiddle = ArrayList(ACTORCONTAINER_INITIAL_SIZE) - private val actorsRenderMidTop = ArrayList(ACTORCONTAINER_INITIAL_SIZE) - private val actorsRenderFront = ArrayList(ACTORCONTAINER_INITIAL_SIZE) + private val actorsRenderBehind = ArrayList(ACTORCONTAINER_INITIAL_SIZE) + private val actorsRenderMiddle = ArrayList(ACTORCONTAINER_INITIAL_SIZE) + private val actorsRenderMidTop = ArrayList(ACTORCONTAINER_INITIAL_SIZE) + private val actorsRenderFront = ArrayList(ACTORCONTAINER_INITIAL_SIZE) var playableActorDelegate: PlayableActorDelegate? = null // DO NOT LATEINIT! private set @@ -204,11 +204,13 @@ class StateInGame : BasicGameState() { // batch-process uiAliases uiAliases = arrayListOf( - uiPieMenu, - uiQuickBar, + // drawn first uiVitalPrimary, uiVitalSecondary, - uiVitalItem + uiVitalItem, + uiPieMenu, + uiQuickBar + // drawn last ) uiAlasesPausing = arrayListOf( uiInventoryPlayer, @@ -391,7 +393,7 @@ class StateInGame : BasicGameState() { actorsRenderMidTop.forEach { it.drawBody(worldG) } player?.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) } player?.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 if (debugWindow.isVisible) { actorContainer.forEachIndexed { i, actor -> - if (actor is ActorVisible) { + if (actor is ActorWithBody) { worldG.color = Color.white worldG.font = Terrarum.fontSmallNumbers worldG.drawString( @@ -540,7 +542,7 @@ class StateInGame : BasicGameState() { var i = 0 while (i < actorContainerSize) { // loop through actorContainerInactive val actor = actorContainerInactive[i] - if (actor is ActorVisible && actor.inUpdateRange()) { + if (actor is ActorWithBody && actor.inUpdateRange()) { activateDormantActor(actor) // duplicates are checked here actorContainerSize -= 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 } // 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. 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 } 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 (a.hitbox.centeredX - p.hitbox.centeredX).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.centeredY - p.hitbox.centeredY).sqr() ) - private fun distToCameraSqr(a: ActorVisible) = + private fun distToCameraSqr(a: ActorWithBody) = min( (a.hitbox.posX - WorldCamera.x).sqr() + (a.hitbox.posY - WorldCamera.y).sqr(), @@ -646,14 +648,14 @@ class StateInGame : BasicGameState() { ) /** whether the actor is within screen */ - private fun ActorVisible.inScreen() = + private fun ActorWithBody.inScreen() = distToCameraSqr(this) <= (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()) /** 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 @@ -693,7 +695,7 @@ class StateInGame : BasicGameState() { // indexToDelete >= 0 means that the actor certainly exists in the game // which means we don't need to check if i >= 0 again - if (actor is ActorVisible) { + if (actor is ActorWithBody) { when (actor.renderOrder) { Actor.RenderOrder.BEHIND -> { val i = actorsRenderBehind.binarySearch(actor.referenceID) @@ -727,7 +729,7 @@ class StateInGame : BasicGameState() { actorContainer.add(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) { Actor.RenderOrder.BEHIND -> { actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind) @@ -758,7 +760,7 @@ class StateInGame : BasicGameState() { actorContainer.add(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) { Actor.RenderOrder.BEHIND -> { actorsRenderBehind.add(actor); insertionSortLastElemAV(actorsRenderBehind) @@ -820,7 +822,7 @@ class StateInGame : BasicGameState() { arr[j + 1] = x } } - private fun insertionSortLastElemAV(arr: ArrayList) { // out-projection doesn't work, duh + private fun insertionSortLastElemAV(arr: ArrayList) { // out-projection doesn't work, duh lock(ReentrantLock()) { var j = arr.lastIndex - 1 val x = arr.last() diff --git a/src/net/torvald/terrarum/blockproperties/Block.kt b/src/net/torvald/terrarum/blockproperties/Block.kt index 6b2db85d3..8bf1fee3d 100644 --- a/src/net/torvald/terrarum/blockproperties/Block.kt +++ b/src/net/torvald/terrarum/blockproperties/Block.kt @@ -7,147 +7,147 @@ object Block { val AIR = 0 // hard coded; this is the standard - 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 STONE = 16 + val STONE_QUARRIED = 17 + val STONE_TILE_WHITE = 18 + val STONE_BRICKS = 19 - val DIRT = BlockCodex.idDamageToIndex(2, 0) - val GRASS = BlockCodex.idDamageToIndex(2, 1) - val GRASSWALL = BlockCodex.idDamageToIndex(2, 2) + val DIRT = 32 + val GRASS = 33 + val GRASSWALL = 34 - 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 PLANK_NORMAL = 48 + val PLANK_EBONY = 49 + val PLANK_BIRCH = 50 + val PLANK_BLOODROSE = 51 - 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 TRUNK_NORMAL = 64 + val TRUNK_EBONY = 65 + val TRUNK_BIRCH = 66 + val TRUNK_BLOODROSE = 67 - 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 SAND = 80 + val SAND_WHITE = 81 + val SAND_RED = 82 + val SAND_DESERT = 83 + val SAND_BLACK = 84 + val SAND_GREEN = 85 - val GRAVEL = BlockCodex.idDamageToIndex(6, 0) - val GRAVEL_GREY = BlockCodex.idDamageToIndex(6, 1) + val GRAVEL = 96 + val GRAVEL_GREY = 97 - 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 ORE_COPPER = 112 + val ORE_IRON = 113 + val ORE_GOLD = 114 + val ORE_SILVER = 115 + val ORE_ILMENITE = 116 + val ORE_AURICHALCUM = 117 - 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 RAW_RUBY = 128 + val RAW_EMERALD = 129 + val RAW_SAPPHIRE = 130 + val RAW_TOPAZ = 131 + val RAW_DIAMOND = 132 + val RAW_AMETHYST = 133 - 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 SNOW = 144 + val ICE_FRAGILE = 145 + val ICE_NATURAL = 146 + val ICE_MAGICAL = 147 - val GLASS_CRUDE = BlockCodex.idDamageToIndex(9, 4) - val GLASS_CLEAN = BlockCodex.idDamageToIndex(9, 5) + val GLASS_CRUDE = 148 + val GLASS_CLEAN = 149 - 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 PLATFORM_STONE = 160 + val PLATFORM_WOODEN = 161 + val PLATFORM_EBONY = 162 + val PLATFORM_BIRCH = 163 + val PLATFORM_BLOODROSE = 164 - val TORCH = BlockCodex.idDamageToIndex(11, 0) - val TORCH_FROST = BlockCodex.idDamageToIndex(11, 1) + val TORCH = 176 + val TORCH_FROST = 177 - val TORCH_OFF = BlockCodex.idDamageToIndex(12, 0) - val TORCH_FROST_OFF = BlockCodex.idDamageToIndex(12, 1) + val TORCH_OFF = 192 + val TORCH_FROST_OFF = 193 - 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 = 208 + val ILLUMINATOR_YELLOW = 209 + val ILLUMINATOR_ORANGE = 210 + val ILLUMINATOR_RED = 211 + val ILLUMINATOR_FUCHSIA = 212 + val ILLUMINATOR_PURPLE = 213 + val ILLUMINATOR_BLUE = 214 + val ILLUMINATOR_CYAN = 215 + val ILLUMINATOR_GREEN = 216 + val ILLUMINATOR_GREEN_DARK = 217 + val ILLUMINATOR_BROWN = 218 + val ILLUMINATOR_TAN = 219 + val ILLUMINATOR_GREY_LIGHT = 220 + val ILLUMINATOR_GREY_MED = 221 + val ILLUMINATOR_GREY_DARK = 222 + val ILLUMINATOR_BLACK = 223 - 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 ILLUMINATOR_WHITE_OFF = 224 + val ILLUMINATOR_YELLOW_OFF = 225 + val ILLUMINATOR_ORANGE_OFF = 226 + val ILLUMINATOR_RED_OFF = 227 + val ILLUMINATOR_FUCHSIA_OFF = 228 + val ILLUMINATOR_PURPLE_OFF = 229 + val ILLUMINATOR_BLUE_OFF = 230 + val ILLUMINATOR_CYAN_OFF = 231 + val ILLUMINATOR_GREEN_OFF = 232 + val ILLUMINATOR_GREEN_DARK_OFF = 233 + val ILLUMINATOR_BROWN_OFF = 234 + val ILLUMINATOR_TAN_OFF = 235 + val ILLUMINATOR_GREY_LIGHT_OFF = 236 + val ILLUMINATOR_GREY_MED_OFF = 237 + val ILLUMINATOR_GREY_DARK_OFF = 238 + val ILLUMINATOR_BLACK_OFF = 239 - 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 SANDSTONE = 240 + val SANDSTONE_WHITE = 241 + val SANDSTONE_RED = 242 + val SANDSTONE_DESERT = 243 + val SANDSTONE_BLACK = 244 + val SANDSTONE_GREEN = 245 - val LANTERN = BlockCodex.idDamageToIndex(16, 0) - val SUNSTONE = BlockCodex.idDamageToIndex(16, 1) - val DAYLIGHT_CAPACITOR = BlockCodex.idDamageToIndex(16, 2) + val LANTERN = 256 + val SUNSTONE = 257 + val DAYLIGHT_CAPACITOR = 258 - 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 WATER_1 = 4080 + val WATER_2 = 4081 + val WATER_3 = 4082 + val WATER_4 = 4083 + val WATER_5 = 4084 + val WATER_6 = 4085 + val WATER_7 = 4086 + val WATER_8 = 4087 + val WATER_9 = 4088 + val WATER_10 = 4089 + val WATER_11 = 4090 + val WATER_12 = 4091 + val WATER_13 = 4092 + val WATER_14 = 4093 + val WATER_15 = 4094 + val WATER = 4095 - 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) + val LAVA_1 = 4064 + val LAVA_2 = 4065 + val LAVA_3 = 4066 + val LAVA_4 = 4067 + val LAVA_5 = 4068 + val LAVA_6 = 4069 + val LAVA_7 = 4070 + val LAVA_8 = 4071 + val LAVA_9 = 4072 + val LAVA_10 = 4073 + val LAVA_11 = 4074 + val LAVA_12 = 4075 + val LAVA_13 = 4076 + val LAVA_14 = 4077 + val LAVA_15 = 4078 + val LAVA = 4079 val NULL = -1 } diff --git a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt index 0d483ec27..dc223ad63 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt @@ -29,13 +29,11 @@ object BlockCodex { println("[BlockCodex] Building block properties table") records.forEach { - if (intVal(it, "sid") == -1) { + if (intVal(it, "blid") == -1) { setProp(nullProp, it) } else { - setProp( - blockProps[idDamageToIndex(intVal(it, "id"), intVal(it, "sid"))], it - ) + setProp(blockProps[intVal(it, "blid")], it) } } } @@ -44,15 +42,13 @@ object BlockCodex { } } - fun get(index: Int, subID: Int): BlockProp { + fun get(index: Int): BlockProp { try { - blockProps[idDamageToIndex(index, subID)].id + return blockProps[index] } 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 { @@ -71,14 +67,13 @@ object BlockCodex { private fun setProp(prop: BlockProp, record: CSVRecord) { 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.strength = intVal(record, "strength") prop.density = intVal(record, "dsty") prop.luminosity = intVal(record, "lumcolor") - prop.drop = intVal(record, "drop") - prop.dropDamage = intVal(record, "ddmg") prop.friction = intVal(record, "friction") prop.viscosity = intVal(record, "vscs") @@ -90,7 +85,7 @@ object BlockCodex { prop.dynamicLuminosityFunction = intVal(record, "dlfn") - print(formatNum3(intVal(record, "id")) + ":" + formatNum2(intVal(record, "sid"))) + print("${intVal(record, "blid")}") println("\t" + prop.nameKey) } @@ -107,16 +102,5 @@ object BlockCodex { 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() } diff --git a/src/net/torvald/terrarum/blockproperties/BlockProp.kt b/src/net/torvald/terrarum/blockproperties/BlockProp.kt index 852ae9289..d58aea8ea 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockProp.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockProp.kt @@ -33,7 +33,6 @@ class BlockProp { get() = BlockPropUtil.getDynamicLumFunc(field, dynamicLuminosityFunction) var drop: Int = 0 - var dropDamage: Int = 0 var isFallable: Boolean = false diff --git a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt index 94fc66d52..2b4d45517 100644 --- a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt +++ b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt @@ -7,6 +7,7 @@ import net.torvald.terrarum.gamecontroller.Key import net.torvald.terrarum.itemproperties.InventoryItem import net.torvald.terrarum.itemproperties.Material import net.torvald.terrarum.realestate.LandUtil +import net.torvald.terrarum.ui.UIInventory import org.newdawn.slick.GameContainer import org.newdawn.slick.Input import java.util.* @@ -479,12 +480,15 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null) // ONLY FOR HAND_GRIPs!! val quickBarItem = inventory.getQuickBar(actorValue.getAsInt(key)!!)?.item - if (quickBarItem == null) { - unequipSlot(InventoryItem.EquipPosition.HAND_GRIP) - } - else if (quickBarItem.equipPosition == InventoryItem.EquipPosition.HAND_GRIP) { + if (quickBarItem != null && quickBarItem.equipPosition == InventoryItem.EquipPosition.HAND_GRIP) { equipItem(quickBarItem) } + + // force update inventory UI + try { + (Terrarum.ingame!!.uiInventoryPlayer.UI as UIInventory).shutUpAndRebuild() + } + catch (LateInitMyArse: kotlin.UninitializedPropertyAccessException) { } } } diff --git a/src/net/torvald/terrarum/gameactors/ActorVisible.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt similarity index 69% rename from src/net/torvald/terrarum/gameactors/ActorVisible.kt rename to src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 995109903..2e8ef9007 100644 --- a/src/net/torvald/terrarum/gameactors/ActorVisible.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -8,9 +8,8 @@ import org.newdawn.slick.Graphics * * 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) - override abstract fun update(gc: GameContainer, delta: Int) abstract fun drawBody(g: Graphics) abstract fun drawGlow(g: Graphics) } \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt index 811735a2f..b63b93058 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt @@ -26,7 +26,7 @@ import java.util.* * * 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 !! **/ diff --git a/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt b/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt index 9a5808faa..385e052e8 100644 --- a/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt +++ b/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt @@ -13,7 +13,11 @@ typealias AnyPlayer = HistoricalFigure * * 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 { this.actorValue["_bornyear"] = born.year diff --git a/src/net/torvald/terrarum/ui/UIInventory.kt b/src/net/torvald/terrarum/ui/UIInventory.kt index 9bda33b16..f1d72d788 100644 --- a/src/net/torvald/terrarum/ui/UIInventory.kt +++ b/src/net/torvald/terrarum/ui/UIInventory.kt @@ -115,11 +115,11 @@ class UIInventory( val listControlHelp: String get() = if (Terrarum.environment == RunningEnvironment.PC) "${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"]}" else "$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"]}" val listControlClose: String get() = if (Terrarum.environment == RunningEnvironment.PC) diff --git a/work_files/UML/actors.mdj b/work_files/UML/actors.mdj index 3f8ad12db..624188dce 100644 --- a/work_files/UML/actors.mdj +++ b/work_files/UML/actors.mdj @@ -21,149 +21,6 @@ "visible": true, "defaultDiagram": true, "ownedViews": [ - { - "_type": "UMLGeneralizationView", - "_id": "AAAAAAFYplNAama5uQo=", - "_parent": { - "$ref": "AAAAAAFF+qBtyKM79qY=" - }, - "model": { - "$ref": "AAAAAAFYplNAama3fyg=" - }, - "subViews": [ - { - "_type": "EdgeLabelView", - "_id": "AAAAAAFYplNAa2a6BS0=", - "_parent": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "model": { - "$ref": "AAAAAAFYplNAama3fyg=" - }, - "visible": false, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Arial;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "left": 81, - "top": 243, - "width": 0, - "height": 13, - "autoResize": false, - "alpha": 1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "edgePosition": 1, - "underline": false, - "horizontalAlignment": 2, - "verticalAlignment": 5, - "wordWrap": false - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAFYplNAa2a7pKU=", - "_parent": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "model": { - "$ref": "AAAAAAFYplNAama3fyg=" - }, - "visible": null, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Arial;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "left": 66, - "top": 243, - "width": 0, - "height": 13, - "autoResize": false, - "alpha": 1.5707963267948966, - "distance": 30, - "hostEdge": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "edgePosition": 1, - "underline": false, - "horizontalAlignment": 2, - "verticalAlignment": 5, - "wordWrap": false - }, - { - "_type": "EdgeLabelView", - "_id": "AAAAAAFYplNAa2a8JvY=", - "_parent": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "model": { - "$ref": "AAAAAAFYplNAama3fyg=" - }, - "visible": false, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Arial;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "left": 110, - "top": 244, - "width": 0, - "height": 13, - "autoResize": false, - "alpha": -1.5707963267948966, - "distance": 15, - "hostEdge": { - "$ref": "AAAAAAFYplNAama5uQo=" - }, - "edgePosition": 1, - "underline": false, - "horizontalAlignment": 2, - "verticalAlignment": 5, - "wordWrap": false - } - ], - "visible": true, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Lato;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "head": { - "$ref": "AAAAAAFYpky+N2SmJKQ=" - }, - "tail": { - "$ref": "AAAAAAFYplBdqGVJPVc=" - }, - "lineStyle": 2, - "points": "96:320;96:180", - "stereotypeDisplay": "label", - "showVisibility": true, - "showProperty": true, - "nameLabel": { - "$ref": "AAAAAAFYplNAa2a6BS0=" - }, - "stereotypeLabel": { - "$ref": "AAAAAAFYplNAa2a7pKU=" - }, - "propertyLabel": { - "$ref": "AAAAAAFYplNAa2a8JvY=" - } - }, { "_type": "UMLGeneralizationView", "_id": "AAAAAAFYplPanGb3MWs=", @@ -193,7 +50,7 @@ "containerChangeable": false, "containerExtending": false, "left": 81, - "top": 1049, + "top": 1017, "width": 0, "height": 13, "autoResize": false, @@ -227,7 +84,7 @@ "containerChangeable": false, "containerExtending": false, "left": 66, - "top": 1049, + "top": 1017, "width": 0, "height": 13, "autoResize": false, @@ -261,7 +118,7 @@ "containerChangeable": false, "containerExtending": false, "left": 111, - "top": 1050, + "top": 1018, "width": 0, "height": 13, "autoResize": false, @@ -293,7 +150,7 @@ "$ref": "AAAAAAFYplN+AWbNDUo=" }, "lineStyle": 2, - "points": "432:1056;96:1056;96:480", + "points": "384:1024;96:1024;96:536", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -335,7 +192,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 581, + "left": 557, "top": 1033, "width": 0, "height": 13, @@ -369,7 +226,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 581, + "left": 557, "top": 1048, "width": 0, "height": 13, @@ -403,7 +260,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 582, + "left": 558, "top": 1003, "width": 0, "height": 13, @@ -436,7 +293,7 @@ "$ref": "AAAAAAFYplR452dt4u8=" }, "lineStyle": 2, - "points": "608:1024;556:1024", + "points": "608:1024;508:1024", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -1010,7 +867,7 @@ "$ref": "AAAAAAFYplWBi2f5GNY=" }, "lineStyle": 2, - "points": "128:656;96:656;96:480", + "points": "128:656;96:656;96:536", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -2332,7 +2189,7 @@ "containerChangeable": false, "containerExtending": false, "left": -48, - "top": 600, + "top": 712, "width": 0, "height": 13, "autoResize": false, @@ -2357,12 +2214,12 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 327, + "top": 383, "width": 236.76123046875, "height": 13, "autoResize": false, "underline": false, - "text": "ActorWithBody", + "text": "ActorWithPhysics", "horizontalAlignment": 2, "verticalAlignment": 5, "wordWrap": false @@ -2383,7 +2240,7 @@ "containerChangeable": false, "containerExtending": false, "left": -48, - "top": 600, + "top": 712, "width": 223, "height": 13, "autoResize": false, @@ -2409,7 +2266,7 @@ "containerChangeable": false, "containerExtending": false, "left": -155, - "top": 446, + "top": 558, "width": 94, "height": 13, "autoResize": false, @@ -2429,7 +2286,7 @@ "containerChangeable": false, "containerExtending": false, "left": 48, - "top": 320, + "top": 376, "width": 246.76123046875, "height": 25, "autoResize": false, @@ -2475,7 +2332,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 350, + "top": 406, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2504,7 +2361,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 365, + "top": 421, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2533,7 +2390,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 380, + "top": 436, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2554,7 +2411,7 @@ "containerChangeable": false, "containerExtending": false, "left": 48, - "top": 345, + "top": 401, "width": 246.76123046875, "height": 53, "autoResize": false @@ -2588,7 +2445,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 403, + "top": 459, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2598,64 +2455,6 @@ "verticalAlignment": 5, "wordWrap": false }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAFYqPZ+XJppsD0=", - "_parent": { - "$ref": "AAAAAAFYplBdqmVQXMo=" - }, - "model": { - "$ref": "AAAAAAFYqPZ+PJpmkYQ=" - }, - "visible": true, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Lato;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "left": 53, - "top": 418, - "width": 236.76123046875, - "height": 13, - "autoResize": false, - "underline": false, - "text": "+drawBody(GameContainer, Graphics)", - "horizontalAlignment": 0, - "verticalAlignment": 5, - "wordWrap": false - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAFYqPckFJq3yBg=", - "_parent": { - "$ref": "AAAAAAFYplBdqmVQXMo=" - }, - "model": { - "$ref": "AAAAAAFYqPcj9pq00aE=" - }, - "visible": true, - "enabled": true, - "lineColor": "#000000", - "fillColor": "#ffffff", - "fontColor": "#000000", - "font": "Lato;13;0", - "showShadow": true, - "containerChangeable": false, - "containerExtending": false, - "left": 53, - "top": 433, - "width": 236.76123046875, - "height": 13, - "autoResize": false, - "underline": false, - "text": "+drawGlow(GameContainer, Graphics)", - "horizontalAlignment": 0, - "verticalAlignment": 5, - "wordWrap": false - }, { "_type": "UMLOperationView", "_id": "AAAAAAFYqPdUFprtMmA=", @@ -2675,7 +2474,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 448, + "top": 474, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2704,7 +2503,7 @@ "containerChangeable": false, "containerExtending": false, "left": 53, - "top": 463, + "top": 489, "width": 236.76123046875, "height": 13, "autoResize": false, @@ -2725,9 +2524,9 @@ "containerChangeable": false, "containerExtending": false, "left": 48, - "top": 398, + "top": 454, "width": 246.76123046875, - "height": 83, + "height": 53, "autoResize": false }, { @@ -2749,7 +2548,7 @@ "containerChangeable": false, "containerExtending": false, "left": -8, - "top": 416, + "top": 472, "width": 10, "height": 10, "autoResize": false @@ -2773,7 +2572,7 @@ "containerChangeable": false, "containerExtending": false, "left": -8, - "top": 416, + "top": 472, "width": 10, "height": 10, "autoResize": false @@ -2789,7 +2588,7 @@ "containerChangeable": true, "containerExtending": false, "left": 48, - "top": 320, + "top": 376, "width": 246.76123046875, "height": 161, "autoResize": false, @@ -2855,8 +2654,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 152, - "top": 1400, + "left": 56, + "top": 1352, "width": 0, "height": 13, "autoResize": false, @@ -2880,8 +2679,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 437, - "top": 1015, + "left": 389, + "top": 991, "width": 114.50537109375, "height": 13, "autoResize": false, @@ -2906,8 +2705,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 152, - "top": 1400, + "left": 56, + "top": 1352, "width": 223, "height": 13, "autoResize": false, @@ -2932,8 +2731,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 152, - "top": 1400, + "left": 56, + "top": 1352, "width": 0, "height": 13, "autoResize": false, @@ -2952,8 +2751,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 432, - "top": 1008, + "left": 384, + "top": 984, "width": 124.50537109375, "height": 25, "autoResize": false, @@ -2998,8 +2797,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 437, - "top": 1038, + "left": 389, + "top": 1014, "width": 114.50537109375, "height": 13, "autoResize": false, @@ -3027,8 +2826,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 437, - "top": 1053, + "left": 389, + "top": 1029, "width": 114.50537109375, "height": 13, "autoResize": false, @@ -3048,8 +2847,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 432, - "top": 1033, + "left": 384, + "top": 1009, "width": 124.50537109375, "height": 38, "autoResize": false @@ -3072,8 +2871,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 432, - "top": 1071, + "left": 384, + "top": 1047, "width": 124.50537109375, "height": 10, "autoResize": false @@ -3096,8 +2895,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": -104, - "top": 792, + "left": -152, + "top": 768, "width": 10, "height": 10, "autoResize": false @@ -3120,8 +2919,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": -104, - "top": 792, + "left": -152, + "top": 768, "width": 10, "height": 10, "autoResize": false @@ -3136,8 +2935,8 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 432, - "top": 1008, + "left": 384, + "top": 984, "width": 124.50537109375, "height": 73, "autoResize": false, @@ -3696,8 +3495,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 896, + "left": 656, + "top": 656, "width": 0, "height": 13, "autoResize": false, @@ -3721,8 +3520,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 821, - "top": 1015, + "left": 741, + "top": 895, "width": 147.55126953125, "height": 13, "autoResize": false, @@ -3747,8 +3546,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 896, + "left": 656, + "top": 656, "width": 223, "height": 13, "autoResize": false, @@ -3773,8 +3572,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 896, + "left": 656, + "top": 656, "width": 0, "height": 13, "autoResize": false, @@ -3793,8 +3592,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 1008, + "left": 736, + "top": 888, "width": 157.55126953125, "height": 25, "autoResize": false, @@ -3839,8 +3638,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 821, - "top": 1038, + "left": 741, + "top": 918, "width": 147.55126953125, "height": 13, "autoResize": false, @@ -3860,8 +3659,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 1033, + "left": 736, + "top": 913, "width": 157.55126953125, "height": 23, "autoResize": false @@ -3884,8 +3683,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 1056, + "left": 736, + "top": 936, "width": 157.55126953125, "height": 10, "autoResize": false @@ -3908,8 +3707,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 232, - "top": 384, + "left": 152, + "top": 264, "width": 10, "height": 10, "autoResize": false @@ -3932,8 +3731,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 232, - "top": 384, + "left": 152, + "top": 264, "width": 10, "height": 10, "autoResize": false @@ -3948,8 +3747,8 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 816, - "top": 1008, + "left": 736, + "top": 888, "width": 157.55126953125, "height": 58, "autoResize": false, @@ -5364,13 +5163,13 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 758, - "top": 1022, + "left": 767, + "top": 983, "width": 48, "height": 13, "autoResize": false, - "alpha": -2.1175849164412224, - "distance": 26.92582403567252, + "alpha": -0.936773798035488, + "distance": 42.20189569201838, "hostEdge": { "$ref": "AAAAAAFYpme/N34yGKY=" }, @@ -5399,8 +5198,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 768, - "top": 1076, + "left": 815, + "top": 1048, "width": 0, "height": 13, "autoResize": false, @@ -5433,8 +5232,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 769, - "top": 1031, + "left": 816, + "top": 1003, "width": 0, "height": 13, "autoResize": false, @@ -5467,8 +5266,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 790, - "top": 1060, + "left": 831, + "top": 964, "width": 0, "height": 13, "autoResize": false, @@ -5501,8 +5300,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 787, - "top": 1074, + "left": 844, + "top": 967, "width": 0, "height": 13, "autoResize": false, @@ -5535,8 +5334,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 794, - "top": 1033, + "left": 803, + "top": 960, "width": 0, "height": 13, "autoResize": false, @@ -5570,7 +5369,7 @@ "containerChangeable": false, "containerExtending": false, "left": 747, - "top": 1060, + "top": 1032, "width": 0, "height": 13, "autoResize": false, @@ -5604,7 +5403,7 @@ "containerChangeable": false, "containerExtending": false, "left": 750, - "top": 1074, + "top": 1046, "width": 0, "height": 13, "autoResize": false, @@ -5638,7 +5437,7 @@ "containerChangeable": false, "containerExtending": false, "left": 743, - "top": 1033, + "top": 1005, "width": 0, "height": 13, "autoResize": false, @@ -5718,7 +5517,7 @@ "$ref": "AAAAAAFYplXHPmg0ww8=" }, "lineStyle": 2, - "points": "816:1052;722:1052", + "points": "816:945;816:1024;722:1024", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -5936,7 +5735,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 613, + "left": 605, "top": 661, "width": 180.603515625, "height": 13, @@ -5962,7 +5761,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 613, + "left": 605, "top": 676, "width": 180.603515625, "height": 13, @@ -5988,7 +5787,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 28, + "left": 12, "top": 224, "width": 80.49462890625, "height": 13, @@ -6014,7 +5813,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 28, + "left": 12, "top": 224, "width": 0, "height": 13, @@ -6034,7 +5833,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 608, + "left": 600, "top": 656, "width": 190.603515625, "height": 38, @@ -6070,7 +5869,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 608, + "left": 600, "top": 694, "width": 190.603515625, "height": 10, @@ -6104,7 +5903,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 613, + "left": 605, "top": 709, "width": 180.603515625, "height": 13, @@ -6133,7 +5932,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 613, + "left": 605, "top": 724, "width": 180.603515625, "height": 13, @@ -6154,7 +5953,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 608, + "left": 600, "top": 704, "width": 190.603515625, "height": 38, @@ -6178,7 +5977,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 14, + "left": 6, "top": 80, "width": 10, "height": 10, @@ -6202,7 +6001,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 14, + "left": 6, "top": 80, "width": 10, "height": 10, @@ -6218,7 +6017,7 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 608, + "left": 600, "top": 656, "width": 190.603515625, "height": 86, @@ -6428,9 +6227,9 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 821, - "top": 661, - "width": 165.42626953125, + "left": 885, + "top": 381, + "width": 226.1997528076172, "height": 13, "autoResize": false, "underline": false, @@ -6454,9 +6253,9 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 821, - "top": 676, - "width": 165.42626953125, + "left": 885, + "top": 396, + "width": 226.1997528076172, "height": 13, "autoResize": false, "underline": false, @@ -6480,8 +6279,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 284, - "top": 224, + "left": 412, + "top": -336, "width": 80.49462890625, "height": 13, "autoResize": false, @@ -6506,8 +6305,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 284, - "top": 224, + "left": 412, + "top": -336, "width": 0, "height": 13, "autoResize": false, @@ -6526,9 +6325,9 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 656, - "width": 175.42626953125, + "left": 880, + "top": 376, + "width": 236.1997528076172, "height": 38, "autoResize": false, "stereotypeLabel": { @@ -6572,9 +6371,9 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 821, - "top": 699, - "width": 165.42626953125, + "left": 885, + "top": 419, + "width": 226.1997528076172, "height": 13, "autoResize": false, "underline": false, @@ -6593,9 +6392,9 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 694, - "width": 175.42626953125, + "left": 880, + "top": 414, + "width": 236.1997528076172, "height": 23, "autoResize": false }, @@ -6608,6 +6407,356 @@ "model": { "$ref": "AAAAAAFYqONJmYWMOFQ=" }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssluGOFWlek=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbsslt5+FQzxY=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 442, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+unequipItem(InventoryItem?)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssmjw+GAg4w=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssmjmeF6rBU=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 457, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+unequipSlot(Int)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssnLQ+Gb87o=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssnLAuGVreQ=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 472, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+equipItem(InventoryItem)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssnqYuG2XNM=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssnqKOGwQ20=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 487, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+equpped(InventoryItem): Boolean", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssol0+HWeFc=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssoln+HQMeM=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 502, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+addItem(itemID: Int, count: Int = 1)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssp03OH2NfU=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssp0r+HwQcU=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 517, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+addItem(InventoryItem, Int)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssqpf+IWqzs=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssqpUeIQK70=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 532, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+removeItem(itemID: Int, count: Int = 1)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssrK9+I25qg=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssrKxOIwUA4=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 547, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+removeItem(InventoryItem, Int)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssr3guJW4Bk=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssr3UuJQNjo=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 562, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+hasItem(InventoryItem): Boolean", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbsssmbOJ2THU=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbsssmOOJwL60=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 577, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+hasItem(itemID: Int): Boolean", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssts5+Kc9dg=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbsstss+KWt5o=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 592, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+consumePrimary(InventoryItem)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssufGOK3SY4=", + "_parent": { + "$ref": "AAAAAAFYqONJm4WVxvY=" + }, + "model": { + "$ref": "AAAAAAFbssue7OKxESE=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Lato;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 885, + "top": 607, + "width": 226.1997528076172, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+consumeSecondary(InventoryItem)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + } + ], "visible": true, "enabled": true, "lineColor": "#000000", @@ -6617,10 +6766,10 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 816, - "top": 717, - "width": 175.42626953125, - "height": 10, + "left": 880, + "top": 437, + "width": 236.1997528076172, + "height": 188, "autoResize": false }, { @@ -6641,8 +6790,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 142, - "top": 80, + "left": 206, + "top": -200, "width": 10, "height": 10, "autoResize": false @@ -6665,8 +6814,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 142, - "top": 80, + "left": 206, + "top": -200, "width": 10, "height": 10, "autoResize": false @@ -6681,10 +6830,10 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 816, - "top": 656, - "width": 175.42626953125, - "height": 71, + "left": 880, + "top": 376, + "width": 236.1997528076172, + "height": 249, "autoResize": false, "stereotypeDisplay": "label", "showVisibility": true, @@ -6741,7 +6890,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 776, + "left": 860, "top": 819, "width": 0, "height": 13, @@ -6775,7 +6924,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 776, + "left": 860, "top": 804, "width": 0, "height": 13, @@ -6809,7 +6958,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 776, + "left": 860, "top": 849, "width": 0, "height": 13, @@ -6842,7 +6991,7 @@ "$ref": "AAAAAAFYplR452dt4u8=" }, "lineStyle": 2, - "points": "656:1008;656:840;896:840;896:726", + "points": "656:1008;656:840;1064:840;1064:624", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -6891,7 +7040,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1013, + "left": 1077, "top": 661, "width": 167.57177734375, "height": 13, @@ -6917,7 +7066,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1013, + "left": 1077, "top": 676, "width": 167.57177734375, "height": 13, @@ -6943,7 +7092,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 508, + "left": 636, "top": 224, "width": 80.49462890625, "height": 13, @@ -6969,7 +7118,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 508, + "left": 636, "top": 224, "width": 0, "height": 13, @@ -6989,7 +7138,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1008, + "left": 1072, "top": 656, "width": 177.57177734375, "height": 38, @@ -7035,7 +7184,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1013, + "left": 1077, "top": 699, "width": 167.57177734375, "height": 13, @@ -7056,7 +7205,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1008, + "left": 1072, "top": 694, "width": 177.57177734375, "height": 23, @@ -7080,7 +7229,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1008, + "left": 1072, "top": 717, "width": 177.57177734375, "height": 10, @@ -7104,7 +7253,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 254, + "left": 318, "top": 80, "width": 10, "height": 10, @@ -7128,7 +7277,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 254, + "left": 318, "top": 80, "width": 10, "height": 10, @@ -7144,7 +7293,7 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 1008, + "left": 1072, "top": 656, "width": 177.57177734375, "height": 71, @@ -7204,7 +7353,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 872, + "left": 908, "top": 819, "width": 0, "height": 13, @@ -7238,7 +7387,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 872, + "left": 908, "top": 804, "width": 0, "height": 13, @@ -7272,7 +7421,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 872, + "left": 908, "top": 849, "width": 0, "height": 13, @@ -7305,7 +7454,7 @@ "$ref": "AAAAAAFYplR452dt4u8=" }, "lineStyle": 2, - "points": "656:1008;656:840;1088:840;1088:726", + "points": "656:1008;656:840;1160:840;1160:726", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -7354,8 +7503,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 453, + "left": 813, + "top": 661, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7380,8 +7529,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 468, + "left": 813, + "top": 676, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7406,8 +7555,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 60, - "top": -192, + "left": -52, + "top": 224, "width": 80.49462890625, "height": 13, "autoResize": false, @@ -7432,8 +7581,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 60, - "top": -192, + "left": -52, + "top": 224, "width": 0, "height": 13, "autoResize": false, @@ -7452,8 +7601,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 864, - "top": 448, + "left": 808, + "top": 656, "width": 244.2666015625, "height": 38, "autoResize": false, @@ -7498,8 +7647,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 491, + "left": 813, + "top": 699, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7519,8 +7668,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 864, - "top": 486, + "left": 808, + "top": 694, "width": 244.2666015625, "height": 23, "autoResize": false @@ -7553,8 +7702,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 514, + "left": 813, + "top": 722, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7582,8 +7731,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 529, + "left": 813, + "top": 737, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7611,8 +7760,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 869, - "top": 544, + "left": 813, + "top": 752, "width": 234.2666015625, "height": 13, "autoResize": false, @@ -7632,8 +7781,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 864, - "top": 509, + "left": 808, + "top": 717, "width": 244.2666015625, "height": 53, "autoResize": false @@ -7656,8 +7805,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 30, - "top": -128, + "left": -26, + "top": 80, "width": 10, "height": 10, "autoResize": false @@ -7680,8 +7829,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 30, - "top": -128, + "left": -26, + "top": 80, "width": 10, "height": 10, "autoResize": false @@ -7696,8 +7845,8 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 864, - "top": 448, + "left": 808, + "top": 656, "width": 244.2666015625, "height": 114, "autoResize": false, @@ -7756,7 +7905,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 824, + "left": 796, "top": 819, "width": 0, "height": 13, @@ -7790,7 +7939,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 824, + "left": 796, "top": 804, "width": 0, "height": 13, @@ -7824,7 +7973,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 824, + "left": 796, "top": 849, "width": 0, "height": 13, @@ -7857,7 +8006,7 @@ "$ref": "AAAAAAFYplR452dt4u8=" }, "lineStyle": 2, - "points": "656:1008;656:840;992:840;992:561", + "points": "656:1008;656:840;937:840;937:769", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -8056,7 +8205,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+scriptPath: String", + "text": "+ai: ActorAI", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8111,7 +8260,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+moveLeft()", + "text": "+moveLeft(amount: Float)", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8140,7 +8289,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+moveRight()", + "text": "+moveRight(amount: Float)", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8169,7 +8318,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+moveUp()", + "text": "+moveUp(amount: Float)", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8198,7 +8347,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+moveDown()", + "text": "+moveDown(amount: Float)", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8227,7 +8376,7 @@ "height": 13, "autoResize": false, "underline": false, - "text": "+jump()", + "text": "+jump(amount: Float)", "horizontalAlignment": 0, "verticalAlignment": 5, "wordWrap": false @@ -8431,8 +8580,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 453, + "left": 1125, + "top": 517, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8457,8 +8606,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 468, + "left": 1125, + "top": 532, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8483,8 +8632,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 768, - "top": -376, + "left": 800, + "top": -248, "width": 80.49462890625, "height": 13, "autoResize": false, @@ -8509,8 +8658,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 768, - "top": -376, + "left": 800, + "top": -248, "width": 0, "height": 13, "autoResize": false, @@ -8529,8 +8678,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1104, - "top": 448, + "left": 1120, + "top": 512, "width": 174.556640625, "height": 38, "autoResize": false, @@ -8575,8 +8724,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 491, + "left": 1125, + "top": 555, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8596,8 +8745,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1104, - "top": 486, + "left": 1120, + "top": 550, "width": 174.556640625, "height": 23, "autoResize": false @@ -8630,8 +8779,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 514, + "left": 1125, + "top": 578, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8659,8 +8808,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 529, + "left": 1125, + "top": 593, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8688,8 +8837,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1109, - "top": 544, + "left": 1125, + "top": 608, "width": 164.556640625, "height": 13, "autoResize": false, @@ -8709,8 +8858,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 1104, - "top": 509, + "left": 1120, + "top": 573, "width": 174.556640625, "height": 53, "autoResize": false @@ -8733,8 +8882,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 384, - "top": -188, + "left": 400, + "top": -124, "width": 10, "height": 10, "autoResize": false @@ -8757,8 +8906,8 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 384, - "top": -188, + "left": 400, + "top": -124, "width": 10, "height": 10, "autoResize": false @@ -8773,8 +8922,8 @@ "showShadow": true, "containerChangeable": true, "containerExtending": false, - "left": 1104, - "top": 448, + "left": 1120, + "top": 512, "width": 174.556640625, "height": 114, "autoResize": false, @@ -9119,7 +9268,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 921, + "left": 956, "top": 819, "width": 0, "height": 13, @@ -9153,7 +9302,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 921, + "left": 956, "top": 804, "width": 0, "height": 13, @@ -9187,7 +9336,7 @@ "showShadow": true, "containerChangeable": false, "containerExtending": false, - "left": 921, + "left": 956, "top": 849, "width": 0, "height": 13, @@ -9220,7 +9369,7 @@ "$ref": "AAAAAAFYplR452dt4u8=" }, "lineStyle": 2, - "points": "656:1008;656:840;1186:840;1186:561", + "points": "656:1008;656:840;1256:840;1256:625", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -9937,7 +10086,7 @@ "$ref": "AAAAAAFYplPlN2cIYnI=" }, "lineStyle": 2, - "points": "352:656;245:656;245:480", + "points": "352:656;245:656;245:536", "stereotypeDisplay": "label", "showVisibility": true, "showProperty": true, @@ -9950,6 +10099,1535 @@ "propertyLabel": { "$ref": "AAAAAAFZK34BdbP39AM=" } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAFbssDTZ9v54nw=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAFbssDTZ9v6ea4=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFbssDTZ9v7nBQ=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v6ea4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -592, + "top": 0, + "width": 0, + "height": 13, + "autoResize": false, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbssDTZ9v80YE=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v6ea4=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;1", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 93, + "top": 239, + "width": 142, + "height": 13, + "autoResize": false, + "underline": false, + "text": "ActorWithBody", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbssDTZ9v9VGU=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v6ea4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -592, + "top": 0, + "width": 73.67724609375, + "height": 13, + "autoResize": false, + "underline": false, + "text": "(from Model)", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbssDTZ9v+N68=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v6ea4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -592, + "top": 0, + "width": 0, + "height": 13, + "autoResize": false, + "underline": false, + "horizontalAlignment": 1, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 88, + "top": 232, + "width": 152, + "height": 25, + "autoResize": false, + "stereotypeLabel": { + "$ref": "AAAAAAFbssDTZ9v7nBQ=" + }, + "nameLabel": { + "$ref": "AAAAAAFbssDTZ9v80YE=" + }, + "namespaceLabel": { + "$ref": "AAAAAAFbssDTZ9v9VGU=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbssDTZ9v+N68=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAFbssDTaNv/udc=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAFbssFHNtxF924=", + "_parent": { + "$ref": "AAAAAAFbssDTaNv/udc=" + }, + "model": { + "$ref": "AAAAAAFbssFHCtw/HYw=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 93, + "top": 262, + "width": 142, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+hitbox: Hitbox", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 88, + "top": 257, + "width": 152, + "height": 23, + "autoResize": false + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAFbssDTaNwAGv0=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssFyNdxkHdE=", + "_parent": { + "$ref": "AAAAAAFbssDTaNwAGv0=" + }, + "model": { + "$ref": "AAAAAAFbssFyDNxefS8=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 93, + "top": 285, + "width": 142, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+drawBody(g: Graphics)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFbssIZkNyUsyI=", + "_parent": { + "$ref": "AAAAAAFbssDTaNwAGv0=" + }, + "model": { + "$ref": "AAAAAAFbssIZWtyOPpk=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 93, + "top": 300, + "width": 142, + "height": 13, + "autoResize": false, + "underline": false, + "text": "+drawGlow(g: Graphics)", + "horizontalAlignment": 0, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 88, + "top": 280, + "width": 152, + "height": 38, + "autoResize": false + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAFbssDTaNwBmK4=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -296, + "top": 0, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAFbssDTaNwCI3Q=", + "_parent": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "model": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -296, + "top": 0, + "width": 10, + "height": 10, + "autoResize": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": true, + "containerExtending": false, + "left": 88, + "top": 232, + "width": 152, + "height": 96, + "autoResize": false, + "stereotypeDisplay": "label", + "showVisibility": true, + "showNamespace": false, + "showProperty": true, + "showType": true, + "nameCompartment": { + "$ref": "AAAAAAFbssDTZ9v6ea4=" + }, + "wordWrap": false, + "suppressAttributes": false, + "suppressOperations": false, + "suppressReceptions": true, + "showMultiplicity": true, + "showOperationSignature": true, + "attributeCompartment": { + "$ref": "AAAAAAFbssDTaNv/udc=" + }, + "operationCompartment": { + "$ref": "AAAAAAFbssDTaNwAGv0=" + }, + "receptionCompartment": { + "$ref": "AAAAAAFbssDTaNwBmK4=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAFbssDTaNwCI3Q=" + } + }, + { + "_type": "UMLGeneralizationView", + "_id": "AAAAAAFbssJ69tz1hRs=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbssJ69tzzPng=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssJ69tz27LM=", + "_parent": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "model": { + "$ref": "AAAAAAFbssJ69tzzPng=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 148, + "top": 344, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssJ69tz3ee8=", + "_parent": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "model": { + "$ref": "AAAAAAFbssJ69tzzPng=" + }, + "visible": null, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 133, + "top": 344, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssJ69tz4vo4=", + "_parent": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "model": { + "$ref": "AAAAAAFbssJ69tzzPng=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 177, + "top": 345, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbssJ69tz1hRs=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "head": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "tail": { + "$ref": "AAAAAAFYplBdqGVJPVc=" + }, + "lineStyle": 2, + "points": "163:376;163:327", + "stereotypeDisplay": "label", + "showVisibility": true, + "showProperty": true, + "nameLabel": { + "$ref": "AAAAAAFbssJ69tz27LM=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAFbssJ69tz3ee8=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbssJ69tz4vo4=" + } + }, + { + "_type": "UMLGeneralizationView", + "_id": "AAAAAAFbssLfKt2N6nc=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbssLfKt2LlXM=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssLfKt2OAFI=", + "_parent": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "model": { + "$ref": "AAAAAAFbssLfKt2LlXM=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 145, + "top": 199, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssLfK92PHnI=", + "_parent": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "model": { + "$ref": "AAAAAAFbssLfKt2LlXM=" + }, + "visible": null, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 130, + "top": 199, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbssLfK92QJ0k=", + "_parent": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "model": { + "$ref": "AAAAAAFbssLfKt2LlXM=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 174, + "top": 200, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbssLfKt2N6nc=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "head": { + "$ref": "AAAAAAFYpky+N2SmJKQ=" + }, + "tail": { + "$ref": "AAAAAAFbssDTZ9v54nw=" + }, + "lineStyle": 2, + "points": "160:232;160:180", + "stereotypeDisplay": "label", + "showVisibility": true, + "showProperty": true, + "nameLabel": { + "$ref": "AAAAAAFbssLfKt2OAFI=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAFbssLfK92PHnI=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbssLfK92QJ0k=" + } + }, + { + "_type": "UMLInterfaceView", + "_id": "AAAAAAFbss6MrOVBsUw=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAFbss6MrOVCZWY=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFbss6MrOVD5xU=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVCZWY=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -16, + "top": -112, + "width": 64.32080078125, + "height": 13, + "autoResize": false, + "underline": false, + "text": "«interface»", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss6MrOVEfjo=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVCZWY=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;1", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 789, + "top": 1070, + "width": 87, + "height": 13, + "autoResize": false, + "underline": false, + "text": "AIControlled", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss6MrOVFKmg=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVCZWY=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -16, + "top": -112, + "width": 73.67724609375, + "height": 13, + "autoResize": false, + "underline": false, + "text": "(from Model)", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss6MrOVGDJo=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVCZWY=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -16, + "top": -112, + "width": 0, + "height": 13, + "autoResize": false, + "underline": false, + "horizontalAlignment": 1, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 784, + "top": 1063, + "width": 97, + "height": 25, + "autoResize": false, + "stereotypeLabel": { + "$ref": "AAAAAAFbss6MrOVD5xU=" + }, + "nameLabel": { + "$ref": "AAAAAAFbss6MrOVEfjo=" + }, + "namespaceLabel": { + "$ref": "AAAAAAFbss6MrOVFKmg=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbss6MrOVGDJo=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAFbss6MrOVHiC0=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -8, + "top": -56, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAFbss6MrOVIF5A=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -8, + "top": -56, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAFbss6MreVJA4g=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -8, + "top": -56, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAFbss6MreVKFRo=", + "_parent": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "model": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -8, + "top": -56, + "width": 10, + "height": 10, + "autoResize": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": true, + "containerExtending": false, + "left": 784, + "top": 1040, + "width": 97, + "height": 49, + "autoResize": false, + "stereotypeDisplay": "icon", + "showVisibility": true, + "showNamespace": false, + "showProperty": true, + "showType": true, + "nameCompartment": { + "$ref": "AAAAAAFbss6MrOVCZWY=" + }, + "wordWrap": false, + "suppressAttributes": true, + "suppressOperations": true, + "suppressReceptions": true, + "showMultiplicity": true, + "showOperationSignature": true, + "attributeCompartment": { + "$ref": "AAAAAAFbss6MrOVHiC0=" + }, + "operationCompartment": { + "$ref": "AAAAAAFbss6MrOVIF5A=" + }, + "receptionCompartment": { + "$ref": "AAAAAAFbss6MreVJA4g=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAFbss6MreVKFRo=" + } + }, + { + "_type": "UMLInterfaceRealizationView", + "_id": "AAAAAAFbss6+mOV/uwg=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbss6+mOV+qdk=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss6+mOWARWM=", + "_parent": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "model": { + "$ref": "AAAAAAFbss6+mOV+qdk=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 756, + "top": 1030, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss6+meWB86k=", + "_parent": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "model": { + "$ref": "AAAAAAFbss6+mOV+qdk=" + }, + "visible": null, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 756, + "top": 1015, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss6+meWCRWE=", + "_parent": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "model": { + "$ref": "AAAAAAFbss6+mOV+qdk=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 756, + "top": 1060, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbss6+mOV/uwg=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "head": { + "$ref": "AAAAAAFbss6MrOVBsUw=" + }, + "tail": { + "$ref": "AAAAAAFZJ0Tfp5SKqYM=" + }, + "lineStyle": 2, + "points": "756:1104;756:1051;820.5:1051", + "stereotypeDisplay": "label", + "showVisibility": true, + "showProperty": true, + "nameLabel": { + "$ref": "AAAAAAFbss6+mOWARWM=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAFbss6+meWB86k=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbss6+meWCRWE=" + } + }, + { + "_type": "UMLInterfaceView", + "_id": "AAAAAAFbss7vPuXIvJ0=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAFbss7vPuXJJkE=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAFbss7vPuXKujg=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXJJkE=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -80, + "top": -128, + "width": 64.32080078125, + "height": 13, + "autoResize": false, + "underline": false, + "text": "«interface»", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss7vPuXLIeI=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXJJkE=" + }, + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;1", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 789, + "top": 1126, + "width": 85.236328125, + "height": 13, + "autoResize": false, + "underline": false, + "text": "CanBeAnItem", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss7vPuXMuI4=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXJJkE=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -80, + "top": -128, + "width": 73.67724609375, + "height": 13, + "autoResize": false, + "underline": false, + "text": "(from Model)", + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "LabelView", + "_id": "AAAAAAFbss7vPuXNWUA=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXJJkE=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -80, + "top": -128, + "width": 0, + "height": 13, + "autoResize": false, + "underline": false, + "horizontalAlignment": 1, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 784, + "top": 1119, + "width": 95.236328125, + "height": 25, + "autoResize": false, + "stereotypeLabel": { + "$ref": "AAAAAAFbss7vPuXKujg=" + }, + "nameLabel": { + "$ref": "AAAAAAFbss7vPuXLIeI=" + }, + "namespaceLabel": { + "$ref": "AAAAAAFbss7vPuXMuI4=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbss7vPuXNWUA=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAFbss7vPuXOxLU=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -40, + "top": -64, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAFbss7vPuXP1Hc=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -40, + "top": -64, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAFbss7vPuXQuO8=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -40, + "top": -64, + "width": 10, + "height": 10, + "autoResize": false + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAFbss7vP+XRlsw=", + "_parent": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "model": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": -40, + "top": -64, + "width": 10, + "height": 10, + "autoResize": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": true, + "containerExtending": false, + "left": 784, + "top": 1096, + "width": 95.236328125, + "height": 49, + "autoResize": false, + "stereotypeDisplay": "icon", + "showVisibility": true, + "showNamespace": false, + "showProperty": true, + "showType": true, + "nameCompartment": { + "$ref": "AAAAAAFbss7vPuXJJkE=" + }, + "wordWrap": false, + "suppressAttributes": true, + "suppressOperations": true, + "suppressReceptions": true, + "showMultiplicity": true, + "showOperationSignature": true, + "attributeCompartment": { + "$ref": "AAAAAAFbss7vPuXOxLU=" + }, + "operationCompartment": { + "$ref": "AAAAAAFbss7vPuXP1Hc=" + }, + "receptionCompartment": { + "$ref": "AAAAAAFbss7vPuXQuO8=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAFbss7vP+XRlsw=" + } + }, + { + "_type": "UMLInterfaceRealizationView", + "_id": "AAAAAAFbss8t1eYv17o=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAFbss8t1eYubi8=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss8t1eYwcjI=", + "_parent": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "model": { + "$ref": "AAAAAAFbss8t1eYubi8=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 787, + "top": 1086, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss8t1eYxXxg=", + "_parent": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "model": { + "$ref": "AAAAAAFbss8t1eYubi8=" + }, + "visible": null, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 787, + "top": 1071, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAFbss8t1eYyz+8=", + "_parent": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "model": { + "$ref": "AAAAAAFbss8t1eYubi8=" + }, + "visible": false, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "left": 787, + "top": 1116, + "width": 0, + "height": 13, + "autoResize": false, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAFbss8t1eYv17o=" + }, + "edgePosition": 1, + "underline": false, + "horizontalAlignment": 2, + "verticalAlignment": 5, + "wordWrap": false + } + ], + "visible": true, + "enabled": true, + "lineColor": "#000000", + "fillColor": "#ffffff", + "fontColor": "#000000", + "font": "Arial;13;0", + "showShadow": true, + "containerChangeable": false, + "containerExtending": false, + "head": { + "$ref": "AAAAAAFbss7vPuXIvJ0=" + }, + "tail": { + "$ref": "AAAAAAFZJ0Tfp5SKqYM=" + }, + "lineStyle": 2, + "points": "756:1107;819.6181640625:1107", + "stereotypeDisplay": "label", + "showVisibility": true, + "showProperty": true, + "nameLabel": { + "$ref": "AAAAAAFbss8t1eYwcjI=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAFbss8t1eYxXxg=" + }, + "propertyLabel": { + "$ref": "AAAAAAFbss8t1eYyz+8=" + } } ] }, @@ -10254,7 +11932,7 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "ActorWithBody", + "name": "ActorWithPhysics", "ownedElements": [ { "_type": "UMLGeneralization", @@ -10269,6 +11947,20 @@ "$ref": "AAAAAAFYpky+NmSk2L4=" }, "visibility": "public" + }, + { + "_type": "UMLGeneralization", + "_id": "AAAAAAFbssJ69tzzPng=", + "_parent": { + "$ref": "AAAAAAFYplBdp2VHGxk=" + }, + "source": { + "$ref": "AAAAAAFYplBdp2VHGxk=" + }, + "target": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "visibility": "public" } ], "visibility": "public", @@ -10343,102 +12035,6 @@ "isQuery": false, "isAbstract": false }, - { - "_type": "UMLOperation", - "_id": "AAAAAAFYqPZ+PJpmkYQ=", - "_parent": { - "$ref": "AAAAAAFYplBdp2VHGxk=" - }, - "name": "drawBody", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAFYqPbgypqS9Z0=", - "_parent": { - "$ref": "AAAAAAFYqPZ+PJpmkYQ=" - }, - "name": "GameContainer", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "type": "", - "isReadOnly": false, - "isOrdered": false, - "isUnique": false, - "direction": "in" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAFYqPbgy5qTthU=", - "_parent": { - "$ref": "AAAAAAFYqPZ+PJpmkYQ=" - }, - "name": "Graphics", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "type": "", - "isReadOnly": false, - "isOrdered": false, - "isUnique": false, - "direction": "in" - } - ], - "concurrency": "sequential", - "isQuery": false, - "isAbstract": false - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAFYqPcj9pq00aE=", - "_parent": { - "$ref": "AAAAAAFYplBdp2VHGxk=" - }, - "name": "drawGlow", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAFYqPdShJraw3U=", - "_parent": { - "$ref": "AAAAAAFYqPcj9pq00aE=" - }, - "name": "GameContainer", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "type": "", - "isReadOnly": false, - "isOrdered": false, - "isUnique": false, - "direction": "in" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAFYqPdShZrbup0=", - "_parent": { - "$ref": "AAAAAAFYqPcj9pq00aE=" - }, - "name": "Graphics", - "visibility": "public", - "isStatic": false, - "isLeaf": false, - "type": "", - "isReadOnly": false, - "isOrdered": false, - "isUnique": false, - "direction": "in" - } - ], - "concurrency": "sequential", - "isQuery": false, - "isAbstract": false - }, { "_type": "UMLOperation", "_id": "AAAAAAFYqPdT+ZrqM2g=", @@ -11271,6 +12867,503 @@ "isID": false } ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAFbsslt5+FQzxY=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "unequipItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssmjI+Fv75w=", + "_parent": { + "$ref": "AAAAAAFbsslt5+FQzxY=" + }, + "name": "InventoryItem?", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssmjmeF6rBU=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "unequipSlot", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssnKk+GKXSA=", + "_parent": { + "$ref": "AAAAAAFbssmjmeF6rBU=" + }, + "name": "Int", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssnLAuGVreQ=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "equipItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssnpuOGlobE=", + "_parent": { + "$ref": "AAAAAAFbssnLAuGVreQ=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssnqKOGwQ20=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "equpped", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssok+OHAoTE=", + "_parent": { + "$ref": "AAAAAAFbssnqKOGwQ20=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssok+OHBzDo=", + "_parent": { + "$ref": "AAAAAAFbssnqKOGwQ20=" + }, + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Boolean", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "return" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssoln+HQMeM=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "addItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssp0AeHg+f8=", + "_parent": { + "$ref": "AAAAAAFbssoln+HQMeM=" + }, + "name": "itemID", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Int", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssp0AeHhhjU=", + "_parent": { + "$ref": "AAAAAAFbssoln+HQMeM=" + }, + "name": "count", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Int", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "defaultValue": "1", + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssp0r+HwQcU=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "addItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssqom+IAoPc=", + "_parent": { + "$ref": "AAAAAAFbssp0r+HwQcU=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssqom+IBsM8=", + "_parent": { + "$ref": "AAAAAAFbssp0r+HwQcU=" + }, + "name": "Int", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssqpUeIQK70=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "removeItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssrKGuIgcxI=", + "_parent": { + "$ref": "AAAAAAFbssqpUeIQK70=" + }, + "name": "itemID", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Int", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssrKGuIhvMI=", + "_parent": { + "$ref": "AAAAAAFbssqpUeIQK70=" + }, + "name": "count", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Int", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "defaultValue": "1", + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssrKxOIwUA4=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "removeItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssr2qeJAT9g=", + "_parent": { + "$ref": "AAAAAAFbssrKxOIwUA4=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssr2qeJBK+s=", + "_parent": { + "$ref": "AAAAAAFbssrKxOIwUA4=" + }, + "name": "Int", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssr3UuJQNjo=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "hasItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsssliuJg1j4=", + "_parent": { + "$ref": "AAAAAAFbssr3UuJQNjo=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsssliuJhbj0=", + "_parent": { + "$ref": "AAAAAAFbssr3UuJQNjo=" + }, + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Boolean", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "return" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbsssmOOJwL60=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "hasItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsstr9eKGgHk=", + "_parent": { + "$ref": "AAAAAAFbsssmOOJwL60=" + }, + "name": "itemID", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Int", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsstr9eKHQe8=", + "_parent": { + "$ref": "AAAAAAFbsssmOOJwL60=" + }, + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Boolean", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "return" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbsstss+KWt5o=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "consumePrimary", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssueeOKm3Pw=", + "_parent": { + "$ref": "AAAAAAFbsstss+KWt5o=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssue7OKxESE=", + "_parent": { + "$ref": "AAAAAAFYqONJmYWMOFQ=" + }, + "name": "consumeSecondary", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssu6MeLBC8U=", + "_parent": { + "$ref": "AAAAAAFbssue7OKxESE=" + }, + "name": "InventoryItem", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + } + ], "isAbstract": false, "isFinalSpecialization": false, "isLeaf": false @@ -11467,11 +13560,11 @@ "_parent": { "$ref": "AAAAAAFYqO9aBZED2og=" }, - "name": "scriptPath", + "name": "ai", "visibility": "public", "isStatic": false, "isLeaf": false, - "type": "String", + "type": "ActorAI", "isReadOnly": false, "isOrdered": false, "isUnique": false, @@ -11491,6 +13584,24 @@ "visibility": "public", "isStatic": false, "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssitcOBsMHM=", + "_parent": { + "$ref": "AAAAAAFYqQhKc6/zCY0=" + }, + "name": "amount", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Float", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], "concurrency": "sequential", "isQuery": false, "isAbstract": false @@ -11505,6 +13616,24 @@ "visibility": "public", "isStatic": false, "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssjwyeD6VSQ=", + "_parent": { + "$ref": "AAAAAAFYqQhfbLAJEJc=" + }, + "name": "amount", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Float", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], "concurrency": "sequential", "isQuery": false, "isAbstract": false @@ -11519,6 +13648,24 @@ "visibility": "public", "isStatic": false, "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssj6GuESNBY=", + "_parent": { + "$ref": "AAAAAAFYqQhzAbAfpdw=" + }, + "name": "amount", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Float", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], "concurrency": "sequential", "isQuery": false, "isAbstract": false @@ -11533,6 +13680,24 @@ "visibility": "public", "isStatic": false, "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsskHgOEnVGw=", + "_parent": { + "$ref": "AAAAAAFYqQiB+LA16cs=" + }, + "name": "amount", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Float", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], "concurrency": "sequential", "isQuery": false, "isAbstract": false @@ -11547,6 +13712,24 @@ "visibility": "public", "isStatic": false, "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbsskY9+E8jpw=", + "_parent": { + "$ref": "AAAAAAFYqQiRjrBLpuA=" + }, + "name": "amount", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Float", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], "concurrency": "sequential", "isQuery": false, "isAbstract": false @@ -11750,6 +13933,34 @@ "$ref": "AAAAAAFYplR452drOZI=" }, "visibility": "public" + }, + { + "_type": "UMLInterfaceRealization", + "_id": "AAAAAAFbss6+mOV+qdk=", + "_parent": { + "$ref": "AAAAAAFZJ0TfppSIKrU=" + }, + "source": { + "$ref": "AAAAAAFZJ0TfppSIKrU=" + }, + "target": { + "$ref": "AAAAAAFbss6Mq+U/ya0=" + }, + "visibility": "public" + }, + { + "_type": "UMLInterfaceRealization", + "_id": "AAAAAAFbss8t1eYubi8=", + "_parent": { + "$ref": "AAAAAAFZJ0TfppSIKrU=" + }, + "source": { + "$ref": "AAAAAAFZJ0TfppSIKrU=" + }, + "target": { + "$ref": "AAAAAAFbss7vPuXGlD4=" + }, + "visibility": "public" } ], "visibility": "public", @@ -11757,6 +13968,145 @@ "isFinalSpecialization": false, "isLeaf": false, "isActive": false + }, + { + "_type": "UMLClass", + "_id": "AAAAAAFbssDTZtv3QHg=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "ActorWithBody", + "ownedElements": [ + { + "_type": "UMLGeneralization", + "_id": "AAAAAAFbssLfKt2LlXM=", + "_parent": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "source": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "target": { + "$ref": "AAAAAAFYpky+NmSk2L4=" + }, + "visibility": "public" + } + ], + "visibility": "public", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAFbssFHCtw/HYw=", + "_parent": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "name": "hitbox", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Hitbox", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "isDerived": false, + "aggregation": "none", + "isID": false + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssFyDNxefS8=", + "_parent": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "name": "drawBody", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssIY4NyDPqE=", + "_parent": { + "$ref": "AAAAAAFbssFyDNxefS8=" + }, + "name": "g", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Graphics", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFbssIZWtyOPpk=", + "_parent": { + "$ref": "AAAAAAFbssDTZtv3QHg=" + }, + "name": "drawGlow", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFbssI+FNyeFHs=", + "_parent": { + "$ref": "AAAAAAFbssIZWtyOPpk=" + }, + "name": "g", + "visibility": "public", + "isStatic": false, + "isLeaf": false, + "type": "Graphics", + "isReadOnly": false, + "isOrdered": false, + "isUnique": false, + "direction": "in" + } + ], + "concurrency": "sequential", + "isQuery": false, + "isAbstract": false + } + ], + "isAbstract": false, + "isFinalSpecialization": false, + "isLeaf": false, + "isActive": false + }, + { + "_type": "UMLInterface", + "_id": "AAAAAAFbss6Mq+U/ya0=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "AIControlled", + "visibility": "public", + "isAbstract": false, + "isFinalSpecialization": false, + "isLeaf": false + }, + { + "_type": "UMLInterface", + "_id": "AAAAAAFbss7vPuXGlD4=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "CanBeAnItem", + "visibility": "public", + "isAbstract": false, + "isFinalSpecialization": false, + "isLeaf": false } ], "visibility": "public" diff --git a/work_files/graphics/fonts/ascii_variable.psd b/work_files/graphics/fonts/ascii_variable.psd index 6beac52bc..44c5f2f0f 100644 --- a/work_files/graphics/fonts/ascii_variable.psd +++ b/work_files/graphics/fonts/ascii_variable.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50409b4cbde84d71853ddb0f28c81528fb1884c68c6e8d3041b44be432a7b423 -size 268687 +oid sha256:0d04e98786a25303052e884008cd76573905c6e5b4a5faaeb27d1bb76e21d46b +size 268742 diff --git a/work_files/graphics/terrain/terrain.psd.gz b/work_files/graphics/terrain/terrain.psd.gz index 9bc928acd..026f645d0 100644 --- a/work_files/graphics/terrain/terrain.psd.gz +++ b/work_files/graphics/terrain/terrain.psd.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18e00cfb448ee1f1564f4a746c8f07237e23d72015c74c092981189bf0aa73ff -size 522859 +oid sha256:c70f1c529b71e9d02c616e4e0fd3525bfa7e669f1b896d8f79d3ddc460521079 +size 522778