diff --git a/REFERENCING.md b/REFERENCING.md index 67bc522e5..f1b29dfcc 100644 --- a/REFERENCING.md +++ b/REFERENCING.md @@ -3,7 +3,16 @@ |0..4095|Tiles| |4096..32767|Items (static)| |32768..1048575|Items (dynamic\*)| -|1048576..0x7FFFFFFF|Actors| -|0x80000000..0xFFFFFFFF (all negative numbers)|Faction| +|1048576..0x7FFF_FFFF|Actors| +|0x8000_0000..0xFFFF_FFFF (all negative numbers)|Faction| -* dynamic items can have their own properties that will persist through savegame. \ No newline at end of file +* dynamic items can have their own properties that will persist through savegame. + +Actors range in-depth + +|Range|Description| +|-----|-----------| +|1048576..0x0FFF_FFFF|Rendered behind (e.g. tapestries) +|0x1000_0000..0x5FFF_FFFF|Regular actors (e.g. almost all of them) +|0x6000_0000..0x6FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles) +|0x7000_0000..0x7FFF_FFFF|Rendered front (e.g. fake tile) \ No newline at end of file diff --git a/assets/graphics/art/.gitattributes b/assets/graphics/.gitattributes similarity index 100% rename from assets/graphics/art/.gitattributes rename to assets/graphics/.gitattributes diff --git a/assets/graphics/background_black.png b/assets/graphics/background_black.png deleted file mode 100755 index be0fdc527..000000000 Binary files a/assets/graphics/background_black.png and /dev/null differ diff --git a/assets/graphics/background_white.png b/assets/graphics/background_white.png deleted file mode 100755 index 9b9fcf279..000000000 Binary files a/assets/graphics/background_white.png and /dev/null differ diff --git a/assets/graphics/breakAnim.png b/assets/graphics/breakAnim.png deleted file mode 100755 index eb0d46c03..000000000 Binary files a/assets/graphics/breakAnim.png and /dev/null differ diff --git a/assets/graphics/gui/creativeInventory/.gitattributes b/assets/graphics/colourmap/.gitattributes similarity index 100% rename from assets/graphics/gui/creativeInventory/.gitattributes rename to assets/graphics/colourmap/.gitattributes diff --git a/assets/graphics/colourmap/black_body_col_1000_40000_K.png b/assets/graphics/colourmap/black_body_col_1000_40000_K.png deleted file mode 100644 index 9acea64da..000000000 Binary files a/assets/graphics/colourmap/black_body_col_1000_40000_K.png and /dev/null differ diff --git a/assets/graphics/colourmap/col12spectrum.png b/assets/graphics/colourmap/col12spectrum.png deleted file mode 100644 index 91d8d22a2..000000000 Binary files a/assets/graphics/colourmap/col12spectrum.png and /dev/null differ diff --git a/assets/graphics/colourmap/col216spectrum.png b/assets/graphics/colourmap/col216spectrum.png deleted file mode 100644 index 7ee0c75a3..000000000 Binary files a/assets/graphics/colourmap/col216spectrum.png and /dev/null differ diff --git a/assets/graphics/colourmap/colourkey12.png b/assets/graphics/colourmap/colourkey12.png deleted file mode 100644 index 26c22a75e..000000000 Binary files a/assets/graphics/colourmap/colourkey12.png and /dev/null differ diff --git a/assets/graphics/colourmap/colourkey216.png b/assets/graphics/colourmap/colourkey216.png deleted file mode 100644 index 18cfa8e09..000000000 Binary files a/assets/graphics/colourmap/colourkey216.png and /dev/null differ diff --git a/assets/graphics/colourmap/health_bar_colouring_4096.png b/assets/graphics/colourmap/health_bar_colouring_4096.png deleted file mode 100644 index c022e19fb..000000000 Binary files a/assets/graphics/colourmap/health_bar_colouring_4096.png and /dev/null differ diff --git a/assets/graphics/colourmap/pal16.png b/assets/graphics/colourmap/pal16.png deleted file mode 100644 index 3ae4e1ba2..000000000 Binary files a/assets/graphics/colourmap/pal16.png and /dev/null differ diff --git a/assets/graphics/colourmap/pal64.png b/assets/graphics/colourmap/pal64.png deleted file mode 100644 index c5f97f287..000000000 Binary files a/assets/graphics/colourmap/pal64.png and /dev/null differ diff --git a/assets/graphics/colourmap/pal64_ryb_based.png b/assets/graphics/colourmap/pal64_ryb_based.png deleted file mode 100644 index ecfb30f1d..000000000 Binary files a/assets/graphics/colourmap/pal64_ryb_based.png and /dev/null differ diff --git a/assets/graphics/colourmap/sky_colour.png b/assets/graphics/colourmap/sky_colour.png deleted file mode 100644 index 995a57d0b..000000000 Binary files a/assets/graphics/colourmap/sky_colour.png and /dev/null differ diff --git a/assets/graphics/fonts/.gitattributes b/assets/graphics/fonts/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/fonts/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/fonts/24-seg_red.png b/assets/graphics/fonts/24-seg_red.png deleted file mode 100644 index 3e5df2a80..000000000 Binary files a/assets/graphics/fonts/24-seg_red.png and /dev/null differ diff --git a/assets/graphics/fonts/Braille.png b/assets/graphics/fonts/Braille.png deleted file mode 100755 index ba603fbbb..000000000 Binary files a/assets/graphics/fonts/Braille.png and /dev/null differ diff --git a/assets/graphics/fonts/LatinExtA_ef.png b/assets/graphics/fonts/LatinExtA_ef.png deleted file mode 100644 index fc99ccaa3..000000000 Binary files a/assets/graphics/fonts/LatinExtA_ef.png and /dev/null differ diff --git a/assets/graphics/fonts/LatinExtA_fullwidth.png b/assets/graphics/fonts/LatinExtA_fullwidth.png deleted file mode 100644 index 53bde7176..000000000 Binary files a/assets/graphics/fonts/LatinExtA_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png b/assets/graphics/fonts/MDA.png deleted file mode 100644 index edb113e8b..000000000 Binary files a/assets/graphics/fonts/MDA.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.0.png b/assets/graphics/fonts/MDA.png.0.png deleted file mode 100644 index 9f10df7b5..000000000 Binary files a/assets/graphics/fonts/MDA.png.0.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.1.png b/assets/graphics/fonts/MDA.png.1.png deleted file mode 100644 index edb113e8b..000000000 Binary files a/assets/graphics/fonts/MDA.png.1.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.10.png b/assets/graphics/fonts/MDA.png.10.png deleted file mode 100644 index c79a78fab..000000000 Binary files a/assets/graphics/fonts/MDA.png.10.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.11.png b/assets/graphics/fonts/MDA.png.11.png deleted file mode 100644 index 35b7096c8..000000000 Binary files a/assets/graphics/fonts/MDA.png.11.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.12.png b/assets/graphics/fonts/MDA.png.12.png deleted file mode 100644 index 38e8efb37..000000000 Binary files a/assets/graphics/fonts/MDA.png.12.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.13.png b/assets/graphics/fonts/MDA.png.13.png deleted file mode 100644 index 22995f3d6..000000000 Binary files a/assets/graphics/fonts/MDA.png.13.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.14.png b/assets/graphics/fonts/MDA.png.14.png deleted file mode 100644 index 96efed0f1..000000000 Binary files a/assets/graphics/fonts/MDA.png.14.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.15.png b/assets/graphics/fonts/MDA.png.15.png deleted file mode 100644 index 2ee9ab279..000000000 Binary files a/assets/graphics/fonts/MDA.png.15.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.2.png b/assets/graphics/fonts/MDA.png.2.png deleted file mode 100644 index c63823f3a..000000000 Binary files a/assets/graphics/fonts/MDA.png.2.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.3.png b/assets/graphics/fonts/MDA.png.3.png deleted file mode 100644 index db61de538..000000000 Binary files a/assets/graphics/fonts/MDA.png.3.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.4.png b/assets/graphics/fonts/MDA.png.4.png deleted file mode 100644 index 919bc497b..000000000 Binary files a/assets/graphics/fonts/MDA.png.4.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.5.png b/assets/graphics/fonts/MDA.png.5.png deleted file mode 100644 index 10198f9b2..000000000 Binary files a/assets/graphics/fonts/MDA.png.5.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.6.png b/assets/graphics/fonts/MDA.png.6.png deleted file mode 100644 index 33cb46900..000000000 Binary files a/assets/graphics/fonts/MDA.png.6.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.7.png b/assets/graphics/fonts/MDA.png.7.png deleted file mode 100644 index a7bd2ddbe..000000000 Binary files a/assets/graphics/fonts/MDA.png.7.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.8.png b/assets/graphics/fonts/MDA.png.8.png deleted file mode 100644 index 8f21111f8..000000000 Binary files a/assets/graphics/fonts/MDA.png.8.png and /dev/null differ diff --git a/assets/graphics/fonts/MDA.png.9.png b/assets/graphics/fonts/MDA.png.9.png deleted file mode 100644 index 83497ff83..000000000 Binary files a/assets/graphics/fonts/MDA.png.9.png and /dev/null differ diff --git a/assets/graphics/fonts/OSXBSD8x16.png b/assets/graphics/fonts/OSXBSD8x16.png deleted file mode 100755 index 03ec53a76..000000000 Binary files a/assets/graphics/fonts/OSXBSD8x16.png and /dev/null differ diff --git a/assets/graphics/fonts/alphanumeric_small.png b/assets/graphics/fonts/alphanumeric_small.png deleted file mode 100644 index bcf024bbd..000000000 Binary files a/assets/graphics/fonts/alphanumeric_small.png and /dev/null differ diff --git a/assets/graphics/fonts/ascii_fullwidth.png b/assets/graphics/fonts/ascii_fullwidth.png deleted file mode 100644 index 1c205e41a..000000000 Binary files a/assets/graphics/fonts/ascii_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/ascii_special_ef.png b/assets/graphics/fonts/ascii_special_ef.png deleted file mode 100644 index a7ff3f424..000000000 Binary files a/assets/graphics/fonts/ascii_special_ef.png and /dev/null differ diff --git a/assets/graphics/fonts/cjkpunct.png b/assets/graphics/fonts/cjkpunct.png deleted file mode 100644 index e19409990..000000000 Binary files a/assets/graphics/fonts/cjkpunct.png and /dev/null differ diff --git a/assets/graphics/fonts/cyrilic_ef.png b/assets/graphics/fonts/cyrilic_ef.png deleted file mode 100644 index e9f43cb4b..000000000 Binary files a/assets/graphics/fonts/cyrilic_ef.png and /dev/null differ diff --git a/assets/graphics/fonts/cyrilic_fullwidth.png b/assets/graphics/fonts/cyrilic_fullwidth.png deleted file mode 100644 index 23b6eb450..000000000 Binary files a/assets/graphics/fonts/cyrilic_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/fullwidth_forms.png b/assets/graphics/fonts/fullwidth_forms.png deleted file mode 100644 index e7c8c75bf..000000000 Binary files a/assets/graphics/fonts/fullwidth_forms.png and /dev/null differ diff --git a/assets/graphics/fonts/futhark.png b/assets/graphics/fonts/futhark.png deleted file mode 100644 index 7b85a1b7e..000000000 Binary files a/assets/graphics/fonts/futhark.png and /dev/null differ diff --git a/assets/graphics/fonts/greek_ef.png b/assets/graphics/fonts/greek_ef.png deleted file mode 100644 index d40991939..000000000 Binary files a/assets/graphics/fonts/greek_ef.png and /dev/null differ diff --git a/assets/graphics/fonts/greek_fullwidth.png b/assets/graphics/fonts/greek_fullwidth.png deleted file mode 100644 index 948ba86d9..000000000 Binary files a/assets/graphics/fonts/greek_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/hangul_johab.png b/assets/graphics/fonts/hangul_johab.png deleted file mode 100644 index 452fe91c8..000000000 Binary files a/assets/graphics/fonts/hangul_johab.png and /dev/null differ diff --git a/assets/graphics/fonts/kana.png b/assets/graphics/fonts/kana.png deleted file mode 100644 index 47b515b38..000000000 Binary files a/assets/graphics/fonts/kana.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png b/assets/graphics/fonts/milky.png deleted file mode 100644 index 6f44cc859..000000000 Binary files a/assets/graphics/fonts/milky.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.0.png b/assets/graphics/fonts/milky.png.0.png deleted file mode 100644 index e1c76e3a9..000000000 Binary files a/assets/graphics/fonts/milky.png.0.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.1.png b/assets/graphics/fonts/milky.png.1.png deleted file mode 100644 index 3a5120b1b..000000000 Binary files a/assets/graphics/fonts/milky.png.1.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.10.png b/assets/graphics/fonts/milky.png.10.png deleted file mode 100644 index 270573d94..000000000 Binary files a/assets/graphics/fonts/milky.png.10.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.11.png b/assets/graphics/fonts/milky.png.11.png deleted file mode 100644 index a816278cf..000000000 Binary files a/assets/graphics/fonts/milky.png.11.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.12.png b/assets/graphics/fonts/milky.png.12.png deleted file mode 100644 index 2463e5224..000000000 Binary files a/assets/graphics/fonts/milky.png.12.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.13.png b/assets/graphics/fonts/milky.png.13.png deleted file mode 100644 index 0d89c1f22..000000000 Binary files a/assets/graphics/fonts/milky.png.13.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.14.png b/assets/graphics/fonts/milky.png.14.png deleted file mode 100644 index 80286b990..000000000 Binary files a/assets/graphics/fonts/milky.png.14.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.15.png b/assets/graphics/fonts/milky.png.15.png deleted file mode 100644 index 09adb1ce4..000000000 Binary files a/assets/graphics/fonts/milky.png.15.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.2.png b/assets/graphics/fonts/milky.png.2.png deleted file mode 100644 index 73f05eff2..000000000 Binary files a/assets/graphics/fonts/milky.png.2.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.3.png b/assets/graphics/fonts/milky.png.3.png deleted file mode 100644 index 5386e20d6..000000000 Binary files a/assets/graphics/fonts/milky.png.3.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.4.png b/assets/graphics/fonts/milky.png.4.png deleted file mode 100644 index ddfaf832a..000000000 Binary files a/assets/graphics/fonts/milky.png.4.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.5.png b/assets/graphics/fonts/milky.png.5.png deleted file mode 100644 index f5571c265..000000000 Binary files a/assets/graphics/fonts/milky.png.5.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.6.png b/assets/graphics/fonts/milky.png.6.png deleted file mode 100644 index 624b24aff..000000000 Binary files a/assets/graphics/fonts/milky.png.6.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.7.png b/assets/graphics/fonts/milky.png.7.png deleted file mode 100644 index 0f8ff89c6..000000000 Binary files a/assets/graphics/fonts/milky.png.7.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.8.png b/assets/graphics/fonts/milky.png.8.png deleted file mode 100644 index eaf683082..000000000 Binary files a/assets/graphics/fonts/milky.png.8.png and /dev/null differ diff --git a/assets/graphics/fonts/milky.png.9.png b/assets/graphics/fonts/milky.png.9.png deleted file mode 100644 index 429044c67..000000000 Binary files a/assets/graphics/fonts/milky.png.9.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png b/assets/graphics/fonts/milkymda.png deleted file mode 100644 index 5ff998fcb..000000000 Binary files a/assets/graphics/fonts/milkymda.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.0.png b/assets/graphics/fonts/milkymda.png.0.png deleted file mode 100644 index 99fd43b6b..000000000 Binary files a/assets/graphics/fonts/milkymda.png.0.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.1.png b/assets/graphics/fonts/milkymda.png.1.png deleted file mode 100644 index c4d67becc..000000000 Binary files a/assets/graphics/fonts/milkymda.png.1.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.10.png b/assets/graphics/fonts/milkymda.png.10.png deleted file mode 100644 index e68895070..000000000 Binary files a/assets/graphics/fonts/milkymda.png.10.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.11.png b/assets/graphics/fonts/milkymda.png.11.png deleted file mode 100644 index 18b570c93..000000000 Binary files a/assets/graphics/fonts/milkymda.png.11.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.12.png b/assets/graphics/fonts/milkymda.png.12.png deleted file mode 100644 index d0887f31b..000000000 Binary files a/assets/graphics/fonts/milkymda.png.12.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.13.png b/assets/graphics/fonts/milkymda.png.13.png deleted file mode 100644 index ea792eb36..000000000 Binary files a/assets/graphics/fonts/milkymda.png.13.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.14.png b/assets/graphics/fonts/milkymda.png.14.png deleted file mode 100644 index 8f364ac4c..000000000 Binary files a/assets/graphics/fonts/milkymda.png.14.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.15.png b/assets/graphics/fonts/milkymda.png.15.png deleted file mode 100644 index ef6707959..000000000 Binary files a/assets/graphics/fonts/milkymda.png.15.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.2.png b/assets/graphics/fonts/milkymda.png.2.png deleted file mode 100644 index 10e0f7353..000000000 Binary files a/assets/graphics/fonts/milkymda.png.2.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.3.png b/assets/graphics/fonts/milkymda.png.3.png deleted file mode 100644 index bbc36d114..000000000 Binary files a/assets/graphics/fonts/milkymda.png.3.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.4.png b/assets/graphics/fonts/milkymda.png.4.png deleted file mode 100644 index 86fc440fb..000000000 Binary files a/assets/graphics/fonts/milkymda.png.4.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.5.png b/assets/graphics/fonts/milkymda.png.5.png deleted file mode 100644 index 1126dfe0c..000000000 Binary files a/assets/graphics/fonts/milkymda.png.5.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.6.png b/assets/graphics/fonts/milkymda.png.6.png deleted file mode 100644 index d14008c7b..000000000 Binary files a/assets/graphics/fonts/milkymda.png.6.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.7.png b/assets/graphics/fonts/milkymda.png.7.png deleted file mode 100644 index 0395cbc46..000000000 Binary files a/assets/graphics/fonts/milkymda.png.7.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.8.png b/assets/graphics/fonts/milkymda.png.8.png deleted file mode 100644 index 5b8dfdf69..000000000 Binary files a/assets/graphics/fonts/milkymda.png.8.png and /dev/null differ diff --git a/assets/graphics/fonts/milkymda.png.9.png b/assets/graphics/fonts/milkymda.png.9.png deleted file mode 100644 index 97adb0a4f..000000000 Binary files a/assets/graphics/fonts/milkymda.png.9.png and /dev/null differ diff --git a/assets/graphics/fonts/numeric_small.png b/assets/graphics/fonts/numeric_small.png deleted file mode 100644 index 52b9272ac..000000000 Binary files a/assets/graphics/fonts/numeric_small.png and /dev/null differ diff --git a/assets/graphics/fonts/puae000-e07f.png b/assets/graphics/fonts/puae000-e07f.png deleted file mode 100644 index 580131f32..000000000 Binary files a/assets/graphics/fonts/puae000-e07f.png and /dev/null differ diff --git a/assets/graphics/fonts/romana_ef.png b/assets/graphics/fonts/romana_ef.png deleted file mode 100644 index 508e78bc0..000000000 Binary files a/assets/graphics/fonts/romana_ef.png and /dev/null differ diff --git a/assets/graphics/fonts/romana_fullwidth.png b/assets/graphics/fonts/romana_fullwidth.png deleted file mode 100644 index fbeb79e10..000000000 Binary files a/assets/graphics/fonts/romana_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/teletype_9x12.png b/assets/graphics/fonts/teletype_9x12.png deleted file mode 100644 index 12424cdcc..000000000 Binary files a/assets/graphics/fonts/teletype_9x12.png and /dev/null differ diff --git a/assets/graphics/fonts/thai_fullwidth.png b/assets/graphics/fonts/thai_fullwidth.png deleted file mode 100644 index 5d7cd78eb..000000000 Binary files a/assets/graphics/fonts/thai_fullwidth.png and /dev/null differ diff --git a/assets/graphics/fonts/unipunct.png b/assets/graphics/fonts/unipunct.png deleted file mode 100644 index bf1754b56..000000000 Binary files a/assets/graphics/fonts/unipunct.png and /dev/null differ diff --git a/assets/graphics/fonts/wenquanyi_11pt_part1.png b/assets/graphics/fonts/wenquanyi_11pt_part1.png deleted file mode 100644 index 243e6b497..000000000 Binary files a/assets/graphics/fonts/wenquanyi_11pt_part1.png and /dev/null differ diff --git a/assets/graphics/fonts/wenquanyi_11pt_part2.png b/assets/graphics/fonts/wenquanyi_11pt_part2.png deleted file mode 100644 index cc1ba8628..000000000 Binary files a/assets/graphics/fonts/wenquanyi_11pt_part2.png and /dev/null differ diff --git a/assets/graphics/gui/StoneGUITex.png b/assets/graphics/gui/StoneGUITex.png deleted file mode 100755 index f49c3675e..000000000 Binary files a/assets/graphics/gui/StoneGUITex.png and /dev/null differ diff --git a/assets/graphics/gui/control_helper_right.png b/assets/graphics/gui/control_helper_right.png deleted file mode 100644 index 3dde6c237..000000000 Binary files a/assets/graphics/gui/control_helper_right.png and /dev/null differ diff --git a/assets/graphics/gui/cursor_black_over.png b/assets/graphics/gui/cursor_black_over.png deleted file mode 100644 index d38f243f5..000000000 Binary files a/assets/graphics/gui/cursor_black_over.png and /dev/null differ diff --git a/assets/graphics/gui/cursor_over.png b/assets/graphics/gui/cursor_over.png deleted file mode 100644 index d03b8a9e9..000000000 Binary files a/assets/graphics/gui/cursor_over.png and /dev/null differ diff --git a/assets/graphics/gui/cursor_pressed.png b/assets/graphics/gui/cursor_pressed.png deleted file mode 100644 index 34f18010f..000000000 Binary files a/assets/graphics/gui/cursor_pressed.png and /dev/null differ diff --git a/assets/graphics/gui/health_distance.png b/assets/graphics/gui/health_distance.png deleted file mode 100644 index 0dfdd5d58..000000000 Binary files a/assets/graphics/gui/health_distance.png and /dev/null differ diff --git a/assets/graphics/gui/health_take_a_break.png b/assets/graphics/gui/health_take_a_break.png deleted file mode 100644 index b795eab8e..000000000 Binary files a/assets/graphics/gui/health_take_a_break.png and /dev/null differ diff --git a/assets/graphics/gui/message_twoline_black_body.png b/assets/graphics/gui/message_twoline_black_body.png deleted file mode 100644 index bf8e82985..000000000 Binary files a/assets/graphics/gui/message_twoline_black_body.png and /dev/null differ diff --git a/assets/graphics/gui/message_twoline_black_left.png b/assets/graphics/gui/message_twoline_black_left.png deleted file mode 100644 index 8f442f606..000000000 Binary files a/assets/graphics/gui/message_twoline_black_left.png and /dev/null differ diff --git a/assets/graphics/gui/message_twoline_black_right.png b/assets/graphics/gui/message_twoline_black_right.png deleted file mode 100644 index e925de099..000000000 Binary files a/assets/graphics/gui/message_twoline_black_right.png and /dev/null differ diff --git a/assets/graphics/gui/monitor_bad.png b/assets/graphics/gui/monitor_bad.png deleted file mode 100644 index a75ed3bda..000000000 Binary files a/assets/graphics/gui/monitor_bad.png and /dev/null differ diff --git a/assets/graphics/gui/monitor_good.png b/assets/graphics/gui/monitor_good.png deleted file mode 100644 index 84396ee53..000000000 Binary files a/assets/graphics/gui/monitor_good.png and /dev/null differ diff --git a/assets/graphics/gui/monitor_good_alt_maru.png b/assets/graphics/gui/monitor_good_alt_maru.png deleted file mode 100644 index 2e8a6d3e1..000000000 Binary files a/assets/graphics/gui/monitor_good_alt_maru.png and /dev/null differ diff --git a/assets/graphics/gui/progress_round_sheet.png b/assets/graphics/gui/progress_round_sheet.png deleted file mode 100644 index 3f62f8cec..000000000 Binary files a/assets/graphics/gui/progress_round_sheet.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/hotbar.png b/assets/graphics/gui/quickbar/hotbar.png deleted file mode 100755 index 74e9ea1d0..000000000 Binary files a/assets/graphics/gui/quickbar/hotbar.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/hotbarIndicator.png b/assets/graphics/gui/quickbar/hotbarIndicator.png deleted file mode 100755 index d1a811f31..000000000 Binary files a/assets/graphics/gui/quickbar/hotbarIndicator.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/item_slot.png b/assets/graphics/gui/quickbar/item_slot.png deleted file mode 100644 index b712a7c13..000000000 Binary files a/assets/graphics/gui/quickbar/item_slot.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/item_slot_large.png b/assets/graphics/gui/quickbar/item_slot_large.png deleted file mode 100644 index e6c9a225e..000000000 Binary files a/assets/graphics/gui/quickbar/item_slot_large.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/slot_separator.png b/assets/graphics/gui/quickbar/slot_separator.png deleted file mode 100755 index ff1e90c50..000000000 Binary files a/assets/graphics/gui/quickbar/slot_separator.png and /dev/null differ diff --git a/assets/graphics/gui/quickbar/topbar_creative.png b/assets/graphics/gui/quickbar/topbar_creative.png deleted file mode 100755 index 6ba963129..000000000 Binary files a/assets/graphics/gui/quickbar/topbar_creative.png and /dev/null differ diff --git a/assets/graphics/gui/tooltip_black_body.png b/assets/graphics/gui/tooltip_black_body.png deleted file mode 100644 index a69eb8da0..000000000 Binary files a/assets/graphics/gui/tooltip_black_body.png and /dev/null differ diff --git a/assets/graphics/gui/tooltip_black_left.png b/assets/graphics/gui/tooltip_black_left.png deleted file mode 100644 index 09783d78d..000000000 Binary files a/assets/graphics/gui/tooltip_black_left.png and /dev/null differ diff --git a/assets/graphics/gui/tooltip_black_right.png b/assets/graphics/gui/tooltip_black_right.png deleted file mode 100644 index c69637ed4..000000000 Binary files a/assets/graphics/gui/tooltip_black_right.png and /dev/null differ diff --git a/assets/graphics/gui/ui_background.png b/assets/graphics/gui/ui_background.png deleted file mode 100755 index 3fa28b496..000000000 Binary files a/assets/graphics/gui/ui_background.png and /dev/null differ diff --git a/assets/graphics/gui/ui_corners.png b/assets/graphics/gui/ui_corners.png deleted file mode 100755 index d7956a0c4..000000000 Binary files a/assets/graphics/gui/ui_corners.png and /dev/null differ diff --git a/assets/graphics/gui/ui_separator.png b/assets/graphics/gui/ui_separator.png deleted file mode 100755 index f9c9d30b0..000000000 Binary files a/assets/graphics/gui/ui_separator.png and /dev/null differ diff --git a/assets/graphics/gui/ui_sides.png b/assets/graphics/gui/ui_sides.png deleted file mode 100755 index cb160407e..000000000 Binary files a/assets/graphics/gui/ui_sides.png and /dev/null differ diff --git a/assets/graphics/gui/zoom_menu.png b/assets/graphics/gui/zoom_menu.png deleted file mode 100644 index 20cf257eb..000000000 Binary files a/assets/graphics/gui/zoom_menu.png and /dev/null differ diff --git a/assets/graphics/gui/zoom_menu.raw b/assets/graphics/gui/zoom_menu.raw deleted file mode 100644 index 64db05649..000000000 Binary files a/assets/graphics/gui/zoom_menu.raw and /dev/null differ diff --git a/assets/graphics/gui/zoom_menu12.raw b/assets/graphics/gui/zoom_menu12.raw deleted file mode 100644 index 7a02cc41f..000000000 Binary files a/assets/graphics/gui/zoom_menu12.raw and /dev/null differ diff --git a/assets/graphics/items/.gitattributes b/assets/graphics/items/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/items/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/items/items.png b/assets/graphics/items/items.png deleted file mode 100755 index fcfb90d7b..000000000 Binary files a/assets/graphics/items/items.png and /dev/null differ diff --git a/assets/graphics/items/items24.png b/assets/graphics/items/items24.png deleted file mode 100755 index 8cecc9d40..000000000 Binary files a/assets/graphics/items/items24.png and /dev/null differ diff --git a/assets/graphics/items/items48.png b/assets/graphics/items/items48.png deleted file mode 100755 index ef9eb3b43..000000000 Binary files a/assets/graphics/items/items48.png and /dev/null differ diff --git a/assets/graphics/logo_placeholder.png b/assets/graphics/logo_placeholder.png deleted file mode 100755 index f1aeb9614..000000000 Binary files a/assets/graphics/logo_placeholder.png and /dev/null differ diff --git a/assets/graphics/logo_placeholder_noreflection.png b/assets/graphics/logo_placeholder_noreflection.png deleted file mode 100644 index 93055dc12..000000000 Binary files a/assets/graphics/logo_placeholder_noreflection.png and /dev/null differ diff --git a/assets/graphics/overlay_bloodshot.png b/assets/graphics/overlay_bloodshot.png deleted file mode 100644 index b15815ed9..000000000 Binary files a/assets/graphics/overlay_bloodshot.png and /dev/null differ diff --git a/assets/graphics/overlay_darkrim.png b/assets/graphics/overlay_darkrim.png deleted file mode 100644 index 4cbaa3876..000000000 Binary files a/assets/graphics/overlay_darkrim.png and /dev/null differ diff --git a/assets/graphics/overlay_darkrim_deletemask.png b/assets/graphics/overlay_darkrim_deletemask.png deleted file mode 100644 index 8c74d5f2f..000000000 Binary files a/assets/graphics/overlay_darkrim_deletemask.png and /dev/null differ diff --git a/assets/graphics/placeholder.png b/assets/graphics/placeholder.png deleted file mode 100755 index b572aa814..000000000 Binary files a/assets/graphics/placeholder.png and /dev/null differ diff --git a/assets/graphics/sprites/.gitattributes b/assets/graphics/sprites/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/sprites/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/sprites/fixtures/.gitattributes b/assets/graphics/sprites/fixtures/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/sprites/fixtures/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/sprites/fixtures/tiki_torch.png b/assets/graphics/sprites/fixtures/tiki_torch.png deleted file mode 100644 index ba064eec7..000000000 Binary files a/assets/graphics/sprites/fixtures/tiki_torch.png and /dev/null differ diff --git a/assets/graphics/sprites/slime.png b/assets/graphics/sprites/slime.png deleted file mode 100755 index 9054f20b6..000000000 Binary files a/assets/graphics/sprites/slime.png and /dev/null differ diff --git a/assets/graphics/sprites/slime_1.png b/assets/graphics/sprites/slime_1.png deleted file mode 100755 index 0a26150bd..000000000 Binary files a/assets/graphics/sprites/slime_1.png and /dev/null differ diff --git a/assets/graphics/sprites/sprite_placeholder_24_48.png b/assets/graphics/sprites/sprite_placeholder_24_48.png deleted file mode 100755 index 681c57e03..000000000 Binary files a/assets/graphics/sprites/sprite_placeholder_24_48.png and /dev/null differ diff --git a/assets/graphics/sprites/test_player.png b/assets/graphics/sprites/test_player.png deleted file mode 100644 index 63601a254..000000000 Binary files a/assets/graphics/sprites/test_player.png and /dev/null differ diff --git a/assets/graphics/sprites/test_player_2.png b/assets/graphics/sprites/test_player_2.png deleted file mode 100644 index a229c871a..000000000 Binary files a/assets/graphics/sprites/test_player_2.png and /dev/null differ diff --git a/assets/graphics/sprites/test_player_2_testa.png b/assets/graphics/sprites/test_player_2_testa.png deleted file mode 100644 index 17e2360f4..000000000 Binary files a/assets/graphics/sprites/test_player_2_testa.png and /dev/null differ diff --git a/assets/graphics/sprites/test_player_glow.png b/assets/graphics/sprites/test_player_glow.png deleted file mode 100644 index bd76c80e7..000000000 Binary files a/assets/graphics/sprites/test_player_glow.png and /dev/null differ diff --git a/assets/theworld b/assets/graphics/tapestries/the_world similarity index 100% rename from assets/theworld rename to assets/graphics/tapestries/the_world diff --git a/assets/graphics/terrain/wire.png b/assets/graphics/terrain/wire.png deleted file mode 100755 index 1194e27de..000000000 Binary files a/assets/graphics/terrain/wire.png and /dev/null differ diff --git a/assets/graphics/tgaToRawTGA.bat b/assets/graphics/tgaToRawTGA.bat new file mode 100644 index 000000000..cd9bd025d --- /dev/null +++ b/assets/graphics/tgaToRawTGA.bat @@ -0,0 +1,5 @@ + +for %%I in (*.tga) do ( + "C:\Program Files\ImageMagick-7.0.4-Q16\magick" convert "-matte" "%%~I" "%%~nI.bmp" + "C:\Program Files\ImageMagick-7.0.4-Q16\magick" convert "+compress" "%%~nI.bmp" "%%~nI.tga" +) \ No newline at end of file diff --git a/assets/graphics/toTGA.bat b/assets/graphics/toTGA.bat new file mode 100644 index 000000000..7d278b327 --- /dev/null +++ b/assets/graphics/toTGA.bat @@ -0,0 +1,5 @@ + +for %%I in (*.png) do ( + "C:\Program Files\ImageMagick-7.0.4-Q16\magick" convert "+compress" "-matte" "%%~I" "%%~nI.bmp" + "C:\Program Files\ImageMagick-7.0.4-Q16\magick" convert "+compress" "-matte" "%%~nI.bmp" "%%~nI.tga" +) \ No newline at end of file diff --git a/assets/graphics/weathers/.gitattributes b/assets/graphics/weathers/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/assets/graphics/weathers/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/weathers/generic_light.png b/assets/graphics/weathers/generic_light.png deleted file mode 100644 index 71f1e6efb..000000000 Binary files a/assets/graphics/weathers/generic_light.png and /dev/null differ diff --git a/assets/graphics/weathers/generic_skybox.png b/assets/graphics/weathers/generic_skybox.png deleted file mode 100644 index f4beae885..000000000 Binary files a/assets/graphics/weathers/generic_skybox.png and /dev/null differ diff --git a/assets/graphics/weathers/raindrop.png b/assets/graphics/weathers/raindrop.png deleted file mode 100644 index 97d09416d..000000000 Binary files a/assets/graphics/weathers/raindrop.png and /dev/null differ diff --git a/assets/raw/weathers/WeatherGeneric.json b/assets/raw/weathers/WeatherGeneric.json index ab55c383d..b3d1201cc 100644 --- a/assets/raw/weathers/WeatherGeneric.json +++ b/assets/raw/weathers/WeatherGeneric.json @@ -1,6 +1,6 @@ { - "globalLight": "generic_light.png", - "skyboxGradColourMap": "generic_skybox.png", + "globalLight": "generic_light.tga", + "skyboxGradColourMap": "generic_skybox.tga", "classification": "generic", "extraImages": [ diff --git a/assets/raw/weathers/WeatherGenericRain.json.asrtinears b/assets/raw/weathers/WeatherGenericRain.json.asrtinears index b4a791cbc..9bc935e4c 100644 --- a/assets/raw/weathers/WeatherGenericRain.json.asrtinears +++ b/assets/raw/weathers/WeatherGenericRain.json.asrtinears @@ -1,9 +1,9 @@ { - "globalLight": "generic_light.png", - "skyboxGradColourMap": "generic_skybox.png", + "globalLight": "generic_light.tga", + "skyboxGradColourMap": "generic_skybox.tga", "classification": "genericrain", "extraImages": [ - "raindrop.png" + "raindrop.tga" ], "mixFrom": "__CURRENTWEATHER", "mixPercentage": 80.0 diff --git a/src/net/torvald/aa/ColouredFastFont.kt b/src/net/torvald/aa/ColouredFastFont.kt index 0a12b49ec..d38304afc 100644 --- a/src/net/torvald/aa/ColouredFastFont.kt +++ b/src/net/torvald/aa/ColouredFastFont.kt @@ -33,7 +33,7 @@ class ColouredFastFont(val vt: Terminal, fontRef: String, val fontW: Int, val fo sheetImageBuffer = Image(sheetW, sheetH) for (i in 0..vt.coloursCount - 1) { - val sheet = SpriteSheet("$fontRef.$i.png", fontW, fontH) + val sheet = SpriteSheet("$fontRef.$i.tga", fontW, fontH) colouredSheet.add(sheet) //sheetImageBuffer.graphics.clear() diff --git a/src/net/torvald/colourutil/ColourTemp.kt b/src/net/torvald/colourutil/ColourTemp.kt index 97abc18ba..32b305158 100644 --- a/src/net/torvald/colourutil/ColourTemp.kt +++ b/src/net/torvald/colourutil/ColourTemp.kt @@ -11,7 +11,7 @@ import net.torvald.colourutil.CIEXYZUtil.toColor * Created by minjaesong on 16-07-26. */ object ColourTemp { - private var envOverlayColourmap = Image("./assets/graphics/colourmap/black_body_col_1000_40000_K.png") + private var envOverlayColourmap = Image("./assets/graphics/colourmap/black_body_col_1000_40000_K.tga") private fun colTempToImagePos(K: Int): Int { if (K < 1000 || K >= 40000) throw IllegalArgumentException("K: out of range. ($K)") diff --git a/src/net/torvald/imagefont/GameFontWhite.kt b/src/net/torvald/imagefont/GameFontWhite.kt index 95ead87f5..17abad772 100644 --- a/src/net/torvald/imagefont/GameFontWhite.kt +++ b/src/net/torvald/imagefont/GameFontWhite.kt @@ -10,52 +10,52 @@ class GameFontWhite : GameFontBase() { init { GameFontBase.hangulSheet = SpriteSheet( - "./assets/graphics/fonts/hangul_johab.png", GameFontBase.W_HANGUL, GameFontBase.H_HANGUL) + "./assets/graphics/fonts/hangul_johab.tga", GameFontBase.W_HANGUL, GameFontBase.H_HANGUL) GameFontBase.asciiSheet = SpriteSheet( - "./assets/graphics/fonts/ascii_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/ascii_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.asciiSheetEF = SpriteSheet( - "./assets/graphics/fonts/ascii_special_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/ascii_special_ef.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.runicSheet = SpriteSheet( - "./assets/graphics/fonts/futhark.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/futhark.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.extASheet = SpriteSheet( - "./assets/graphics/fonts/LatinExtA_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/LatinExtA_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.extASheetEF = SpriteSheet( - "./assets/graphics/fonts/LatinExtA_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/LatinExtA_ef.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.kanaSheet = SpriteSheet( - "./assets/graphics/fonts/kana.png", GameFontBase.W_KANA, GameFontBase.H_KANA) + "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA) GameFontBase.cjkPunct = SpriteSheet( - "./assets/graphics/fonts/cjkpunct.png", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H_KANA) + "./assets/graphics/fonts/cjkpunct.tga", GameFontBase.W_ASIAN_PUNCT, GameFontBase.H_KANA) /*uniHan = new SpriteSheet( "./assets/graphics/fonts/unifont_unihan" + ((!terrarum.gameLocale.contains("zh")) ? "_ja" : "") - +".png" + +".tga" , W_UNIHAN, H_UNIHAN );*/ GameFontBase.cyrilic = SpriteSheet( - "./assets/graphics/fonts/cyrilic_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/cyrilic_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.cyrilicEF = SpriteSheet( - "./assets/graphics/fonts/cyrilic_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/cyrilic_ef.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.fullwidthForms = SpriteSheet( - "./assets/graphics/fonts/fullwidth_forms.png", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN) + "./assets/graphics/fonts/fullwidth_forms.tga", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN) GameFontBase.uniPunct = SpriteSheet( - "./assets/graphics/fonts/unipunct.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/unipunct.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.wenQuanYi_1 = SpriteSheet( - "./assets/graphics/fonts/wenquanyi_11pt_part1.png", 16, 18, 2) + "./assets/graphics/fonts/wenquanyi_11pt_part1.tga", 16, 18, 2) GameFontBase.wenQuanYi_2 = SpriteSheet( - "./assets/graphics/fonts/wenquanyi_11pt_part2.png", 16, 18, 2) + "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2) GameFontBase.greekSheet = SpriteSheet( - "./assets/graphics/fonts/greek_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/greek_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.greekSheetEF = SpriteSheet( - "./assets/graphics/fonts/greek_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/greek_ef.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.romanianSheet = SpriteSheet( - "./assets/graphics/fonts/romana_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/romana_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.romanianSheetEF = SpriteSheet( - "./assets/graphics/fonts/romana_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/romana_ef.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.thaiSheet = SpriteSheet( - "./assets/graphics/fonts/thai_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/thai_fullwidth.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.keycapSheet = SpriteSheet( - "./assets/graphics/fonts/puae000-e07f.png", GameFontBase.SIZE_KEYCAP, GameFontBase.SIZE_KEYCAP) + "./assets/graphics/fonts/puae000-e07f.tga", GameFontBase.SIZE_KEYCAP, GameFontBase.SIZE_KEYCAP) val shk = arrayOf( GameFontBase.asciiSheet, diff --git a/src/net/torvald/imagefont/TinyAlphNum.kt b/src/net/torvald/imagefont/TinyAlphNum.kt index 812a21f94..d400f3913 100644 --- a/src/net/torvald/imagefont/TinyAlphNum.kt +++ b/src/net/torvald/imagefont/TinyAlphNum.kt @@ -28,7 +28,7 @@ class TinyAlphNum : Font { private val mappingTable = HashMap()*/ init { - fontSheet = SpriteSheet("./assets/graphics/fonts/milky.png", W, H) + fontSheet = SpriteSheet("./assets/graphics/fonts/milky.tga", W, H) //chars.forEachIndexed { i, c -> mappingTable[c.toInt()] = i } } diff --git a/src/net/torvald/terrarum/StateBlurTest.kt b/src/net/torvald/terrarum/StateBlurTest.kt index c099077d0..ad870e754 100644 --- a/src/net/torvald/terrarum/StateBlurTest.kt +++ b/src/net/torvald/terrarum/StateBlurTest.kt @@ -17,7 +17,7 @@ import java.nio.ByteOrder class StateBlurTest : BasicGameState() { /** Warning: the image must have a bit depth of 32! (use 32-bit PNG or TGA) */ - private val testImage = Image("./assets/testimage_resized.png") + private val testImage = Image("./assets/testimage_resized.tga") private val bluredImage = ImageBuffer(testImage.width, testImage.height) override fun init(gc: GameContainer, sbg: StateBasedGame) { diff --git a/src/net/torvald/terrarum/StateFontTester.kt b/src/net/torvald/terrarum/StateFontTester.kt index a34bc3f67..6814355ec 100644 --- a/src/net/torvald/terrarum/StateFontTester.kt +++ b/src/net/torvald/terrarum/StateFontTester.kt @@ -22,7 +22,7 @@ class StateFontTester : BasicGameState() { Terrarum.gameLocale = "fiFI" segfont = SpriteSheetFont( - SpriteSheet("./assets/graphics/fonts/24-seg_red.png", 22, 31), + SpriteSheet("./assets/graphics/fonts/24-seg_red.tga", 22, 31), ' ' ) } diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 0e0d8fe9b..8a55a2cf7 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -56,6 +56,11 @@ constructor() : BasicGameState() { val actorContainerInactive = ArrayList(ACTORCONTAINER_INITIAL_SIZE) 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) + lateinit var consoleHandler: UIHandler lateinit var debugWindow: UIHandler lateinit var notifier: UIHandler @@ -72,7 +77,9 @@ constructor() : BasicGameState() { val ZOOM_MIN = 0.5f val worldDrawFrameBuffer = Image(Terrarum.WIDTH.div(ZOOM_MIN).ceilInt(), Terrarum.HEIGHT.div(ZOOM_MIN).ceilInt()) + val worldG = worldDrawFrameBuffer.graphics val uisDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT) + val uiG = uisDrawFrameBuffer.graphics //private lateinit var shader12BitCol: Shader // grab LibGDX if you want some shader //private lateinit var shaderBlur: Shader @@ -285,48 +292,35 @@ constructor() : BasicGameState() { override fun render(gc: GameContainer, sbg: StateBasedGame, gwin: Graphics) { // clean the shit beforehand - worldDrawFrameBuffer.graphics.clear() - uisDrawFrameBuffer.graphics.clear() + worldG.clear() + uiG.clear() blendNormal() drawSkybox(gwin) - /*drawSkybox(worldDrawFrameBuffer.graphics) - uisDrawFrameBuffer.graphics.color = Color(255, 255, 255, 0) - uisDrawFrameBuffer.graphics.fillRect( - 0f, 0f, uisDrawFrameBuffer.width.toFloat(), uisDrawFrameBuffer.height.toFloat() - )*/ // make camara work // // compensate for zoom. UIs must be treated specially! (see UIHandler) - //g.translate(-MapCamera.x * screenZoom, -MapCamera.y * screenZoom) - worldDrawFrameBuffer.graphics.translate(-MapCamera.x.toFloat(), -MapCamera.y.toFloat()) + worldG.translate(-MapCamera.x.toFloat(), -MapCamera.y.toFloat()) ///////////////////////////// // draw map related stuffs // ///////////////////////////// - TilesDrawer.renderBehind(gc, worldDrawFrameBuffer.graphics) - // --> blendNormal() <-- by TilesDrawer.renderBehind - + TilesDrawer.renderWall(worldG) + actorsRenderBehind.forEach { actor -> actor.drawBody(worldG) } + actorsRenderBehind.forEach { actor -> actor.drawGlow(worldG) } + TilesDrawer.renderTerrain(worldG) ///////////////// // draw actors // ///////////////// - actorContainer.forEach { actor -> - if (actor is ActorWithBody && actor.inScreen() && actor !is Player && !actor.drawTopmost) { - actor.drawBody(gc, worldDrawFrameBuffer.graphics) - } - } - player.drawBody(gc, worldDrawFrameBuffer.graphics) - // actors that are drawTopmost - actorContainer.forEach { actor -> - if (actor is ActorWithBody && actor.inScreen() && actor !is Player && actor.drawTopmost) { - actor.drawBody(gc, worldDrawFrameBuffer.graphics) - } - } + actorsRenderMiddle.forEach { actor -> actor.drawBody(worldG) } + actorsRenderMidTop.forEach { actor -> actor.drawBody(worldG) } + player.drawBody(worldG) + actorsRenderFront.forEach { actor -> actor.drawBody(worldG) } // --> Change of blend mode <-- introduced by ActorWithBody // @@ -335,33 +329,25 @@ constructor() : BasicGameState() { ///////////////////////////// LightmapRenderer.renderLightMap() - TilesDrawer.renderFront(gc, worldDrawFrameBuffer.graphics, false) + TilesDrawer.renderFront(worldG, false) // --> blendNormal() <-- by TilesDrawer.renderFront - FeaturesDrawer.render(gc, worldDrawFrameBuffer.graphics) + FeaturesDrawer.render(gc, worldG) - FeaturesDrawer.drawEnvOverlay(worldDrawFrameBuffer.graphics) + FeaturesDrawer.drawEnvOverlay(worldG) if (!KeyToggler.isOn(KEY_LIGHTMAP_RENDER)) blendMul() else blendNormal() - LightmapRenderer.draw(worldDrawFrameBuffer.graphics) + LightmapRenderer.draw(worldG) ////////////////////// // draw actor glows // ////////////////////// - actorContainer.forEach { actor -> - if (actor is ActorWithBody && actor.inScreen() && actor !is Player) { - actor.drawGlow(gc, worldDrawFrameBuffer.graphics) - } - } - player.drawGlow(gc, worldDrawFrameBuffer.graphics) - // actors that are drawTopmost - actorContainer.forEach { actor -> - if (actor is ActorWithBody && actor.inScreen() && actor !is Player && actor.drawTopmost) { - actor.drawGlow(gc, worldDrawFrameBuffer.graphics) - } - } + actorsRenderMiddle.forEach { actor -> actor.drawGlow(worldG) } + actorsRenderMidTop.forEach { actor -> actor.drawGlow(worldG) } + player.drawGlow(worldG) + actorsRenderFront.forEach { actor -> actor.drawGlow(worldG) } // --> blendLightenOnly() <-- introduced by ActorWithBody // @@ -373,17 +359,17 @@ constructor() : BasicGameState() { if (debugWindow.isVisible) { actorContainer.forEachIndexed { i, actor -> if (actor is ActorWithBody) { - worldDrawFrameBuffer.graphics.color = Color.white - worldDrawFrameBuffer.graphics.font = Terrarum.fontSmallNumbers - worldDrawFrameBuffer.graphics.drawString( + worldG.color = Color.white + worldG.font = Terrarum.fontSmallNumbers + worldG.drawString( actor.referenceID.toString(), actor.hitbox.posX.toFloat(), actor.hitbox.pointedY.toFloat() + 4 ) if (DEBUG_ARRAY) { - worldDrawFrameBuffer.graphics.color = GameFontBase.codeToCol["g"] - worldDrawFrameBuffer.graphics.drawString( + worldG.color = GameFontBase.codeToCol["g"] + worldG.drawString( i.toString(), actor.hitbox.posX.toFloat(), actor.hitbox.pointedY.toFloat() + 4 + 10 @@ -394,16 +380,16 @@ constructor() : BasicGameState() { } // fluidmap debug if (KeyToggler.isOn(Key.F4)) - WorldSimulator.drawFluidMapDebug(worldDrawFrameBuffer.graphics) + WorldSimulator.drawFluidMapDebug(worldG) ////////////// // draw UIs // ////////////// - uiContainer.forEach { ui -> ui.render(gc, sbg, uisDrawFrameBuffer.graphics) } - debugWindow.render(gc, sbg, uisDrawFrameBuffer.graphics) - consoleHandler.render(gc, sbg, uisDrawFrameBuffer.graphics) - notifier.render(gc, sbg, uisDrawFrameBuffer.graphics) + uiContainer.forEach { ui -> ui.render(gc, sbg, uiG) } + debugWindow.render(gc, sbg, uiG) + consoleHandler.render(gc, sbg, uiG) + notifier.render(gc, sbg, uiG) ///////////////// @@ -609,7 +595,7 @@ constructor() : BasicGameState() { else actorContainer.binarySearch(ID) >= 0 - fun removeActor(actor: Actor) = removeActor(actor.referenceID) + fun removeActor(ID: Int) = removeActor(getActorByID(ID)) /** * get index of the actor and delete by the index. * we can do this as the list is guaranteed to be sorted @@ -618,10 +604,35 @@ constructor() : BasicGameState() { * Any values behind the index will be automatically pushed to front. * This is how remove function of [java.util.ArrayList] is defined. */ - fun removeActor(ID: Int) { - if (ID == player.referenceID) throw RuntimeException("Attempted to remove player.") - val indexToDelete = actorContainer.binarySearch(ID) - if (indexToDelete >= 0) actorContainer.removeAt(indexToDelete) + fun removeActor(actor: Actor) { + if (actor.referenceID == player.referenceID) throw RuntimeException("Attempted to remove player.") + val indexToDelete = actorContainer.binarySearch(actor.referenceID) + if (indexToDelete >= 0) { + actorContainer.removeAt(indexToDelete) + + // 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 ActorWithBody) { + when (actor.renderOrder) { + ActorOrder.BEHIND -> { + val i = actorsRenderBehind.binarySearch(actor.referenceID) + actorsRenderBehind.removeAt(i) + } + ActorOrder.MIDDLE -> { + val i = actorsRenderMiddle.binarySearch(actor.referenceID) + actorsRenderMiddle.removeAt(i) + } + ActorOrder.MIDTOP -> { + val i = actorsRenderMidTop.binarySearch(actor.referenceID) + actorsRenderMidTop.removeAt(i) + } + ActorOrder.FRONT -> { + val i = actorsRenderFront.binarySearch(actor.referenceID) + actorsRenderFront.removeAt(i) + } + } + } + } } /** @@ -632,6 +643,15 @@ constructor() : BasicGameState() { throw RuntimeException("Actor with ID ${actor.referenceID} already exists.") actorContainer.add(actor) insertionSortLastElem(actorContainer) // we can do this as we are only adding single actor + + if (actor is ActorWithBody) { + when (actor.renderOrder) { + ActorOrder.BEHIND -> actorsRenderBehind.add(actor) + ActorOrder.MIDDLE -> actorsRenderMiddle.add(actor) + ActorOrder.MIDTOP -> actorsRenderMidTop.add(actor) + ActorOrder.FRONT -> actorsRenderFront.add(actor) + } + } } /** @@ -668,9 +688,9 @@ constructor() : BasicGameState() { arr[j + 1] = x } - private fun ArrayList.binarySearch(actor: Actor) = this.binarySearch(actor.referenceID) + private fun ArrayList.binarySearch(actor: Actor) = this.binarySearch(actor.referenceID) - private fun ArrayList.binarySearch(ID: Int): Int { + private fun ArrayList.binarySearch(ID: Int): Int { // code from collections/Collections.kt var low = 0 var high = actorContainer.size - 1 diff --git a/src/net/torvald/terrarum/StateMonitorCheck.kt b/src/net/torvald/terrarum/StateMonitorCheck.kt index 3d47908bc..e93311dcd 100644 --- a/src/net/torvald/terrarum/StateMonitorCheck.kt +++ b/src/net/torvald/terrarum/StateMonitorCheck.kt @@ -53,10 +53,10 @@ class StateMonitorCheck : BasicGameState() { init { if (Terrarum.gameLocale.length >= 4 && Terrarum.gameLocale.contains(maru_alt)) - pictograms.add(Image("./assets/graphics/gui/monitor_good_alt_maru.png")) + pictograms.add(Image("./assets/graphics/gui/monitor_good_alt_maru.tga")) else - pictograms.add(Image("./assets/graphics/gui/monitor_good.png")) - pictograms.add(Image("./assets/graphics/gui/monitor_bad.png")) + pictograms.add(Image("./assets/graphics/gui/monitor_good.tga")) + pictograms.add(Image("./assets/graphics/gui/monitor_bad.tga")) imageGallery = ItemImageGallery(0, instructionY, Terrarum.WIDTH, anykeyY - instructionY, pictograms) } diff --git a/src/net/torvald/terrarum/StateSplash.kt b/src/net/torvald/terrarum/StateSplash.kt index bdad69b01..0cb379d45 100644 --- a/src/net/torvald/terrarum/StateSplash.kt +++ b/src/net/torvald/terrarum/StateSplash.kt @@ -52,8 +52,8 @@ class StateSplash : BasicGameState() { // pre-load lang Lang["MENU_LANGUAGE_THIS"] - pictogramCollection.add(Image("./assets/graphics/gui/health_take_a_break.png")) - pictogramCollection.add(Image("./assets/graphics/gui/health_distance.png")) + pictogramCollection.add(Image("./assets/graphics/gui/health_take_a_break.tga")) + pictogramCollection.add(Image("./assets/graphics/gui/health_distance.tga")) fadeSheet = Image(Terrarum.WIDTH, Terrarum.HEIGHT) thisG = fadeSheet.graphics diff --git a/src/net/torvald/terrarum/console/ExportMap.kt b/src/net/torvald/terrarum/console/ExportMap.kt index 652e580b3..f41a0df28 100644 --- a/src/net/torvald/terrarum/console/ExportMap.kt +++ b/src/net/torvald/terrarum/console/ExportMap.kt @@ -82,8 +82,8 @@ internal object ExportMap : ConsoleCommand { try { RasterWriter.writePNG_RGB( - Terrarum.ingame.world.width, Terrarum.ingame.world.height, mapData, dir + args[1] + ".png") - Echo("ExportMap: exported to " + args[1] + ".png") + Terrarum.ingame.world.width, Terrarum.ingame.world.height, mapData, dir + args[1] + ".tga") + Echo("ExportMap: exported to " + args[1] + ".tga") } catch (e: IOException) { diff --git a/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt b/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt index ce48cf57c..8c23eb1f7 100644 --- a/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt +++ b/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt @@ -192,7 +192,9 @@ class ActorValueTracker constructor() : JFrame() { sb.append("$key = $value ($type)\n") } - sb.deleteCharAt(sb.length - 1) // delete trailing \n + if (sb.isNotEmpty()) { + sb.deleteCharAt(sb.length - 1) // delete trailing \n + } avInfoArea.text = "$sb" } diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt index fd0b3fc9b..bc99696e6 100644 --- a/src/net/torvald/terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -6,9 +6,11 @@ import net.torvald.terrarum.itemproperties.ItemCodex import org.newdawn.slick.GameContainer /** + * @param renderOrder invisible/technical -> ActorOrder.MIDDLE + * * Created by minjaesong on 15-12-31. */ -abstract class Actor : Comparable, Runnable { +abstract class Actor(val renderOrder: ActorOrder) : Comparable, Runnable { abstract fun update(gc: GameContainer, delta: Int) @@ -37,10 +39,29 @@ abstract class Actor : Comparable, Runnable { * override var referenceID: Int = generateUniqueReferenceID() */ fun generateUniqueReferenceID(): Int { + fun checkForCollision(value: Int) = + Terrarum.ingame.hasActor(value) || + value < ItemCodex.ITEM_COUNT_MAX || + value < when (renderOrder) { + ActorOrder.BEHIND -> ItemCodex.ITEM_COUNT_MAX + ActorOrder.MIDDLE -> 0x10000000 + ActorOrder.MIDTOP -> 0x60000000 + ActorOrder.FRONT -> 0x70000000 + } || + value > when (renderOrder) { + ActorOrder.BEHIND -> 0x0FFFFFFF + ActorOrder.MIDDLE -> 0x5FFFFFFF + ActorOrder.MIDTOP -> 0x6FFFFFFF + ActorOrder.FRONT -> 0x7FFFFFFF + } + var ret: Int do { ret = HQRNG().nextInt().and(0x7FFFFFFF) // set new ID - } while (Terrarum.ingame.hasActor(ret) || ret < ItemCodex.ITEM_COUNT_MAX) // check for collision + } while (checkForCollision(ret)) // check for collision return ret } -} \ No newline at end of file + +} + +enum class ActorOrder { BEHIND, MIDDLE, MIDTOP, FRONT } \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt index 308b2365d..cbdf7b6b4 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithBody.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithBody.kt @@ -21,7 +21,7 @@ import java.util.* * * Created by minjaesong on 16-01-13. */ -open class ActorWithBody : Actor() { +open class ActorWithBody(renderOrder: ActorOrder) : Actor(renderOrder) { /** !! ActorValue macros are on the very bottom of the source !! **/ @@ -32,8 +32,6 @@ open class ActorWithBody : Actor() { @Transient internal var spriteGlow: SpriteAnimation? = null var drawMode = BLEND_NORMAL - /** for fake tiles. Draw on top of player(s) */ - var drawTopmost = false @Transient private val world: GameWorld = Terrarum.ingame.world @@ -909,7 +907,7 @@ open class ActorWithBody : Actor() { private fun updateHitbox() = hitbox.reassign(nextHitbox) - open fun drawGlow(gc: GameContainer, g: Graphics) { + open fun drawGlow(g: Graphics) { if (isVisible && spriteGlow != null) { blendLightenOnly() @@ -952,7 +950,7 @@ open class ActorWithBody : Actor() { } } - open fun drawBody(gc: GameContainer, g: Graphics) { + open fun drawBody(g: Graphics) { if (isVisible && sprite != null) { diff --git a/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt index 0905089c6..14d04ec18 100644 --- a/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/CreatureBuilder.kt @@ -19,7 +19,7 @@ object CreatureBuilder { */ @Throws(IOException::class, SlickException::class) operator fun invoke(jsonFileName: String): ActorWithBody { - val actor = ActorWithBody() + val actor = ActorWithBody(ActorOrder.MIDDLE) InjectCreatureRaw(actor.actorValue, jsonFileName) return actor diff --git a/src/net/torvald/terrarum/gameactors/DroppedItem.kt b/src/net/torvald/terrarum/gameactors/DroppedItem.kt index fcb1c33ec..4b5e3b7f9 100644 --- a/src/net/torvald/terrarum/gameactors/DroppedItem.kt +++ b/src/net/torvald/terrarum/gameactors/DroppedItem.kt @@ -9,7 +9,7 @@ import org.newdawn.slick.Graphics /** * Created by minjaesong on 16-03-15. */ -class DroppedItem(private val item: InventoryItem) : ActorWithBody() { +class DroppedItem(private val item: InventoryItem) : ActorWithBody(ActorOrder.MIDTOP) { init { if (item.id >= ItemCodex.ITEM_COUNT_MAX) @@ -29,7 +29,7 @@ class DroppedItem(private val item: InventoryItem) : ActorWithBody() { item.effectWhenEquipped(gc, delta) } - override fun drawBody(gc: GameContainer, g: Graphics) { + override fun drawBody(g: Graphics) { } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/FixtureBase.kt b/src/net/torvald/terrarum/gameactors/FixtureBase.kt index 8b63f814e..6d08d8449 100644 --- a/src/net/torvald/terrarum/gameactors/FixtureBase.kt +++ b/src/net/torvald/terrarum/gameactors/FixtureBase.kt @@ -5,7 +5,7 @@ import net.torvald.spriteanimation.SpriteAnimation /** * Created by minjaesong on 16-06-17. */ -open class FixtureBase : ActorWithBody() { +open class FixtureBase : ActorWithBody(ActorOrder.BEHIND) { /** * 0: Open * 1: Blocked diff --git a/src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt b/src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt index 34b357e40..e5094d3fa 100644 --- a/src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt +++ b/src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt @@ -26,7 +26,7 @@ class FixtureTikiTorch : FixtureBase(), Luminous { lightBoxList.add(Hitbox(3.0, 0.0, 4.0, 3.0)) makeNewSprite(10, 27) - sprite!!.setSpriteImage("assets/graphics/sprites/fixtures/tiki_torch.png") + sprite!!.setSpriteImage("assets/graphics/sprites/fixtures/tiki_torch.tga") sprite!!.setDelay(200) sprite!!.setRowsAndFrames(1, 1) diff --git a/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt b/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt index 6392a0172..8a50e3fc6 100644 --- a/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt +++ b/src/net/torvald/terrarum/gameactors/HistoricalFigure.kt @@ -11,7 +11,7 @@ import org.newdawn.slick.Input * * Created by minjaesong on 16-10-10. */ -open class HistoricalFigure(val born: GameDate, val dead: GameDate? = null) : ActorWithBody() { +open class HistoricalFigure(val born: GameDate, val dead: GameDate? = null) : ActorWithBody(ActorOrder.MIDDLE) { init { this.actorValue["_bornyear"] = born.year diff --git a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt index 32608ffa4..6d5003af0 100644 --- a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt +++ b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt @@ -10,7 +10,7 @@ import org.newdawn.slick.Graphics /** * Created by minjaesong on 16-03-05. */ -class PhysTestBall : ActorWithBody() { +class PhysTestBall : ActorWithBody(ActorOrder.MIDDLE) { private var color = Color.orange @@ -22,7 +22,7 @@ class PhysTestBall : ActorWithBody() { color = RoguelikeRandomiser.composeColourFrom(RoguelikeRandomiser.POTION_PRIMARY_COLSET) } - override fun drawBody(gc: GameContainer, g: Graphics) { + override fun drawBody(g: Graphics) { g.color = color g.fillOval( hitbox.posX.toFloat(), diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt index c0c3a65cb..f4b1d9910 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderCynthia.kt @@ -20,7 +20,7 @@ object PlayerBuilderCynthia { p.makeNewSprite(26, 42) - p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player_2.png") + p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player_2.tga") p.sprite!!.setDelay(200) p.sprite!!.setRowsAndFrames(1, 1) @@ -31,7 +31,7 @@ object PlayerBuilderCynthia { - p.referenceID = 12345678 + p.referenceID = 321321321 diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt index 28427dde3..addd6ffdb 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt @@ -27,12 +27,12 @@ object PlayerBuilderSigrid { p.referenceID = 0x51621D // the only constant of this procedural universe p.makeNewSprite(28, 51) - p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player.png") + p.sprite!!.setSpriteImage("assets/graphics/sprites/test_player.tga") p.sprite!!.setDelay(200) p.sprite!!.setRowsAndFrames(1, 1) p.makeNewSpriteGlow(28, 51) - p.spriteGlow!!.setSpriteImage("assets/graphics/sprites/test_player_glow.png") + p.spriteGlow!!.setSpriteImage("assets/graphics/sprites/test_player_glow.tga") p.spriteGlow!!.setDelay(200) p.spriteGlow!!.setRowsAndFrames(1, 1) diff --git a/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt b/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt index f15f86bbc..435e7b380 100644 --- a/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt +++ b/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt @@ -19,7 +19,7 @@ open class ProjectileSimple( private val type: Int, fromPoint: Vector2, // projected coord toPoint: Vector2 // arriving coord - ) : ActorWithBody(), Luminous, Projectile { + ) : ActorWithBody(ActorOrder.MIDTOP), Luminous, Projectile { val damage: Int val displayColour: Color @@ -76,7 +76,7 @@ open class ProjectileSimple( super.update(gc, delta) } - override fun drawBody(gc: GameContainer, g: Graphics) { + override fun drawBody(g: Graphics) { val colourTail = displayColour.darker(0f) // clone a colour colourTail.a = 0.16f @@ -92,7 +92,7 @@ open class ProjectileSimple( ) } - override fun drawGlow(gc: GameContainer, g: Graphics) = drawBody(gc, g) + override fun drawGlow(g: Graphics) = drawBody(g) companion object { val OFFSET_DAMAGE = 0 diff --git a/src/net/torvald/terrarum/gameactors/TapestryObject.kt b/src/net/torvald/terrarum/gameactors/TapestryObject.kt index feb8bb3af..918eb7bf9 100644 --- a/src/net/torvald/terrarum/gameactors/TapestryObject.kt +++ b/src/net/torvald/terrarum/gameactors/TapestryObject.kt @@ -24,8 +24,8 @@ class TapestryObject(val image: Image, val artName: String, val artAuthor: Strin super.update(gc, delta) } - override fun drawBody(gc: GameContainer, g: Graphics) { - super.drawBody(gc, g) + override fun drawBody(g: Graphics) { + super.drawBody(g) } override fun updateBodySprite(gc: GameContainer, delta: Int) { diff --git a/src/net/torvald/terrarum/gameactors/WeaponSwung.kt b/src/net/torvald/terrarum/gameactors/WeaponSwung.kt index 05d6b39dd..886f2d9ea 100644 --- a/src/net/torvald/terrarum/gameactors/WeaponSwung.kt +++ b/src/net/torvald/terrarum/gameactors/WeaponSwung.kt @@ -3,7 +3,7 @@ package net.torvald.terrarum.gameactors /** * Created by minjaesong on 16-04-26. */ -class WeaponSwung(val itemID: Int) : ActorWithBody(), Luminous { +class WeaponSwung(val itemID: Int) : ActorWithBody(ActorOrder.MIDTOP), Luminous { // just let the solver use AABB; it's cheap but works just enough /** diff --git a/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt b/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt index 1a23ef502..f45823107 100644 --- a/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt +++ b/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt @@ -28,7 +28,7 @@ object TilesDrawer { var tilesTerrain: SpriteSheet = SpriteSheet("./assets/graphics/terrain/terrain.tga", TILE_SIZE, TILE_SIZE) private set // Slick has some weird quirks with PNG's transparency. I'm using 32-bit targa here. - var tilesWire: SpriteSheet = SpriteSheet("./assets/graphics/terrain/wire.png", TILE_SIZE, TILE_SIZE) + var tilesWire: SpriteSheet = SpriteSheet("./assets/graphics/terrain/wire.tga", TILE_SIZE, TILE_SIZE) private set val WALL = GameWorld.WALL @@ -228,7 +228,7 @@ object TilesDrawer { val wallOverlayColour = Color(2f/3f, 2f/3f, 2f/3f, 1f) - fun renderBehind(gc: GameContainer, g: Graphics) { + fun renderWall(g: Graphics) { /** * render to camera */ @@ -236,7 +236,7 @@ object TilesDrawer { tilesTerrain.startUse() drawTiles(g, WALL, false) - tilesTerrain.endUse() // you absolutely need this + tilesTerrain.endUse() blendMul() @@ -246,17 +246,27 @@ object TilesDrawer { ) blendNormal() + } - tilesTerrain.startUse() // you absolutely need this - drawTiles(g, TERRAIN, false) + fun renderTerrain(g: Graphics) { + /** + * render to camera + */ + blendNormal() + + tilesTerrain.startUse() + drawTiles(g, TERRAIN, false) // regular tiles tilesTerrain.endUse() } - fun renderFront(gc: GameContainer, g: Graphics, drawWires: Boolean) { + fun renderFront(g: Graphics, drawWires: Boolean) { + /** + * render to camera + */ blendMul() tilesTerrain.startUse() - drawTiles(g, TERRAIN, true) + drawTiles(g, TERRAIN, true) // blendmul tiles tilesTerrain.endUse() if (drawWires) { diff --git a/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt b/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt index 0afe31d2b..36b618a09 100644 --- a/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt +++ b/src/net/torvald/terrarum/ui/ItemSlotImageBuilder.kt @@ -20,11 +20,11 @@ object ItemSlotImageBuilder { private val colourWhite = Color(0xC0, 0xC0, 0xC0, 0xEE) private val numberFont = SpriteSheetFont( - SpriteSheet("./assets/graphics/fonts/numeric_small.png", 5, 8), + SpriteSheet("./assets/graphics/fonts/numeric_small.tga", 5, 8), '0' ) - val slotImage = Image("./assets/graphics/gui/quickbar/item_slot.png") // must have same w/h as slotLarge - val slotLarge = Image("./assets/graphics/gui/quickbar/item_slot_large.png") + val slotImage = Image("./assets/graphics/gui/quickbar/item_slot.tga") // must have same w/h as slotLarge + val slotLarge = Image("./assets/graphics/gui/quickbar/item_slot_large.tga") private val canvas = Image(slotImage.width, slotImage.height) private val canvasLarge = Image(slotLarge.width, slotLarge.height) diff --git a/src/net/torvald/terrarum/ui/UIHandler.kt b/src/net/torvald/terrarum/ui/UIHandler.kt index 74974cf9c..f5d31a898 100644 --- a/src/net/torvald/terrarum/ui/UIHandler.kt +++ b/src/net/torvald/terrarum/ui/UIHandler.kt @@ -121,10 +121,8 @@ constructor(val UI: UICanvas) { UI.render(gc, UIGraphicInstance) - ingameGraphics.drawImage(UIDrawnCanvas.getScaledCopy(scale), - posX.toFloat() - (UI.width / 2f * scale.minus(1)), - posY.toFloat() - (UI.height / 2f * scale.minus(1)), - Color(1f, 1f, 1f, opacity) + ingameGraphics.drawImage( + UIDrawnCanvas, posX.toFloat(), posY.toFloat(), Color(1f, 1f, 1f, opacity) ) } } diff --git a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt index 892b18fa4..369093cbe 100644 --- a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt +++ b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt @@ -86,9 +86,9 @@ open class SimpleTextTerminal( open protected val fontRef = "./assets/graphics/fonts/${ - if (hires) "milky.png" - else if (phosphor == GREEN || phosphor == AMBER) "MDA.png" - else "milkymda.png" + if (hires) "milky.tga" + else if (phosphor == GREEN || phosphor == AMBER) "MDA.tga" + else "milkymda.tga" }" open protected val fontImg = Image(fontRef) open val fontW = fontImg.width / 16 diff --git a/src/net/torvald/terrarum/virtualcomputer/terminal/TeletypeTerminal.kt b/src/net/torvald/terrarum/virtualcomputer/terminal/TeletypeTerminal.kt index 615a4af20..84c684d16 100644 --- a/src/net/torvald/terrarum/virtualcomputer/terminal/TeletypeTerminal.kt +++ b/src/net/torvald/terrarum/virtualcomputer/terminal/TeletypeTerminal.kt @@ -192,7 +192,7 @@ class TeletypeTerminal : Teletype { private val mappingTable = HashMap() init { - fontSheet = SpriteSheet("./assets/graphics/fonts/teletype_9x12.png", W, H) + fontSheet = SpriteSheet("./assets/graphics/fonts/teletype_9x12.tga", W, H) chars.forEachIndexed { i, c -> mappingTable[c.toInt()] = i } } diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index 870af76c2..f5d0b20fd 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -147,14 +147,14 @@ object WeatherMixer { fun readFromJson(path: String): BaseModularWeather { /* JSON structure: { - "globalLight": "colourmap/sky_colour.png", // integer for static, string (path to image) for dynamic - "skyboxGradColourMap": "colourmap/sky_colour.png", // integer for static, string (path to image) for dynamic + "globalLight": "colourmap/sky_colour.tga", // integer for static, string (path to image) for dynamic + "skyboxGradColourMap": "colourmap/sky_colour.tga", // integer for static, string (path to image) for dynamic "extraImages": [ // if any, it will be like: - sun01.png, - clouds01.png, - clouds02.png, - auroraBlueViolet.png + sun01.tga, + clouds01.tga, + clouds02.tga, + auroraBlueViolet.tga ] } */ diff --git a/assets/graphics/gui/control_helper_body.png b/work_files/graphics/colourmap/64_from_master_final - Copy.act similarity index 66% rename from assets/graphics/gui/control_helper_body.png rename to work_files/graphics/colourmap/64_from_master_final - Copy.act index 1c0ba6e35..14451f449 100644 Binary files a/assets/graphics/gui/control_helper_body.png and b/work_files/graphics/colourmap/64_from_master_final - Copy.act differ diff --git a/work_files/graphics/gui/creativeInventory/.gitattributes b/work_files/graphics/gui/creativeInventory/.gitattributes new file mode 100644 index 000000000..ca82ef549 --- /dev/null +++ b/work_files/graphics/gui/creativeInventory/.gitattributes @@ -0,0 +1 @@ +*.{psd,tga,ogg} filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/assets/graphics/gui/creativeInventory/creativePalette.png b/work_files/graphics/gui/creativeInventory/creativePalette.png old mode 100755 new mode 100644 similarity index 100% rename from assets/graphics/gui/creativeInventory/creativePalette.png rename to work_files/graphics/gui/creativeInventory/creativePalette.png