From 17c39c1824eacd6d7b67ad961a45fb5e1f6d29ca Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Tue, 2 Aug 2016 17:32:42 +0900 Subject: [PATCH] =?UTF-8?q?Player=20movement=20seems=20like=20back=20to=20?= =?UTF-8?q?working,=20res=E2=86=92assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f91181caee4dabf4cb2e51d8077441c6b0f83757 Former-commit-id: 8b450303698c5c85dea9145a056b290b95a6a7b0 --- Terrarum_renewed.iml | 2 +- {res => assets}/4096.frg | 0 {res => assets}/4096.vrt | 0 {res => assets}/batchtest.txt | 0 {res => assets}/blur.frg | 0 {res => assets}/blurH.vrt | 0 {res => assets}/blurV.vrt | 0 .../books/Blacksmith_s_handbook.txt | 0 {res => assets}/books/Book_writing_guide.txt | 0 {res => assets}/books/cjk_test.txt | 0 {res => assets}/books/hangul_test.txt | 0 {res => assets}/books/isl_test.txt | 0 {res => assets}/books/kana_test.txt | 0 {res => assets}/books/kana_test_2.txt | 0 {res => assets}/books/kana_test_2_kanji.txt | 0 {res => assets}/books/kana_test_kanji.txt | 0 {res => assets}/books/kanji_test_3.txt | 0 {res => assets}/books/kanji_test_4.txt | 0 {res => assets}/books/polyglot_test.txt | 0 {res => assets}/books/polyglot_test_2.txt | 0 {res => assets}/books/runic_short_1.txt | 0 {res => assets}/books/runic_short_2.txt | 0 {res => assets}/books/userguide_ENG.aux | 0 {res => assets}/books/userguide_ENG.log | 0 {res => assets}/books/userguide_ENG.out | 0 {res => assets}/books/userguide_ENG.pdf | Bin .../books/userguide_ENG.synctex.gz | Bin {res => assets}/books/userguide_ENG.tex | 0 {res => assets}/books/userguide_ENG.toc | 0 {res => assets}/books/userguide_NON.aux | 0 {res => assets}/books/userguide_NON.log | 0 {res => assets}/books/userguide_NON.out | 0 {res => assets}/books/userguide_NON.pdf | Bin .../books/userguide_NON.synctex.gz | Bin {res => assets}/books/userguide_NON.tex | 0 {res => assets}/books/userguide_NON.toc | 0 {res => assets}/graphics/art/.gitattributes | 0 {res => assets}/graphics/background_black.png | Bin {res => assets}/graphics/background_white.png | Bin {res => assets}/graphics/breakAnim.png | Bin .../colourmap/black_body_col_1000_40000_K.png | Bin .../colourmap/black_body_how_to_use.txt | 0 .../graphics/colourmap/col12spectrum.png | Bin .../graphics/colourmap/col216spectrum.png | Bin .../graphics/colourmap/colourkey12.png | Bin .../graphics/colourmap/colourkey216.png | Bin .../colourmap/health_bar_colouring_4096.png | Bin .../graphics/colourmap/sky_colour.png | Bin {res => assets}/graphics/fonts/Braille.png | Bin .../graphics/fonts/LatinExtA_ef.png | Bin .../graphics/fonts/LatinExtA_fullwidth.png | Bin {res => assets}/graphics/fonts/OSXBSD8x16.png | Bin .../graphics/fonts/alphanumeric_small.png | Bin .../graphics/fonts/ascii_fullwidth.png | Bin .../graphics/fonts/ascii_special_ef.png | Bin {res => assets}/graphics/fonts/cjkpunct.png | Bin {res => assets}/graphics/fonts/cyrilic_ef.png | Bin .../graphics/fonts/cyrilic_fullwidth.png | Bin .../graphics/fonts/fullwidth_forms.png | Bin {res => assets}/graphics/fonts/futhark.png | Bin {res => assets}/graphics/fonts/greek_ef.png | Bin .../graphics/fonts/greek_fullwidth.png | Bin {res => assets}/graphics/fonts/han_johab.png | Bin {res => assets}/graphics/fonts/kana.png | Bin .../graphics/fonts/numeric_small.png | Bin {res => assets}/graphics/fonts/romana_ef.png | Bin .../graphics/fonts/romana_fullwidth.png | Bin assets/graphics/fonts/thai_fullwidth.png | Bin 0 -> 1939 bytes {res => assets}/graphics/fonts/unipunct.png | Bin .../graphics/fonts/wenquanyi_11pt_part1.png | Bin .../graphics/fonts/wenquanyi_11pt_part2.png | Bin {res => assets}/graphics/gui/StoneGUITex.png | Bin .../graphics/gui/control_helper_body.png | Bin .../graphics/gui/control_helper_left | Bin .../graphics/gui/control_helper_right.png | Bin .../gui/creativeInventory/.gitattributes | 0 .../gui/creativeInventory/creativePalette.png | Bin .../graphics/gui/cursor_black_over.png | Bin {res => assets}/graphics/gui/cursor_over.png | Bin .../graphics/gui/cursor_pressed.png | Bin .../gui/message_twoline_black_body.png | Bin .../gui/message_twoline_black_left.png | Bin .../gui/message_twoline_black_right.png | Bin .../graphics/gui/progress_round_sheet.png | Bin .../graphics/gui/quickbar/hotbar.png | Bin .../graphics/gui/quickbar/hotbarIndicator.png | Bin .../graphics/gui/quickbar/item_slot.png | Bin .../graphics/gui/quickbar/item_slot_large.png | Bin .../graphics/gui/quickbar/slot_separator.png | Bin .../graphics/gui/quickbar/topbar_creative.png | Bin .../graphics/gui/tooltip_black_body.png | Bin .../graphics/gui/tooltip_black_left.png | Bin .../graphics/gui/tooltip_black_right.png | Bin .../graphics/gui/ui_background.png | Bin {res => assets}/graphics/gui/ui_corners.png | Bin {res => assets}/graphics/gui/ui_separator.png | Bin {res => assets}/graphics/gui/ui_sides.png | Bin {res => assets}/graphics/gui/zoom_menu.png | Bin {res => assets}/graphics/gui/zoom_menu.raw | Bin {res => assets}/graphics/gui/zoom_menu12.raw | Bin {res => assets}/graphics/items/items.png | Bin {res => assets}/graphics/items/items24.png | Bin {res => assets}/graphics/items/items48.png | Bin {res => assets}/graphics/logo_placeholder.png | Bin .../logo_placeholder_noreflection.png | Bin .../graphics/overlay_bloodshot.png | Bin {res => assets}/graphics/overlay_darkrim.png | Bin .../graphics/overlay_darkrim_deletemask.png | Bin {res => assets}/graphics/placeholder.png | Bin .../graphics/sprites/fixtures/tiki_torch.png | Bin {res => assets}/graphics/sprites/slime.png | Bin {res => assets}/graphics/sprites/slime_1.png | Bin .../sprites/sprite_placeholder_24_48.png | Bin .../graphics/sprites/test_player.png | Bin .../graphics/sprites/test_player_2.png | Bin .../graphics/sprites/test_player_glow.png | Bin .../graphics/sprites/test_player_raw.raw | Bin {res => assets}/graphics/terrain/fluid.png | Bin .../graphics/terrain/grassplusplus.png | Bin {res => assets}/graphics/terrain/terrain.png | Bin .../graphics/terrain/terrain12.raw | Bin .../graphics/terrain/terrain_12.raw | Bin .../graphics/terrain/terrain_old.png | Bin .../graphics/terrain/terrain_ref.png | Bin {res => assets}/graphics/terrain/wall.png | Bin {res => assets}/graphics/terrain/wall_old.png | Bin {res => assets}/graphics/terrain/wire.png | Bin .../graphics/weathers/generic_light.png | Bin .../graphics/weathers/generic_skybox.png | Bin {res => assets}/keylayout.json | 0 .../locales/bgBG/Polyglot-100_bgBG.json | 0 {res => assets}/locales/bgBG/game.json | 0 .../locales/csCZ/Polyglot-100_csCZ.json | 0 {res => assets}/locales/csCZ/game.json | 0 .../locales/daDK/Polyglot-100_daDK.json | 0 {res => assets}/locales/daDK/game.json | 0 .../locales/de/Polyglot-100_de.json | 0 {res => assets}/locales/de/game.json | 0 .../locales/elGR/Polyglot-100_elGR.json | 0 {res => assets}/locales/elGR/game.json | 0 .../locales/en/Polyglot-100_en.json | 0 {res => assets}/locales/en/configurator.json | 0 {res => assets}/locales/en/devmsg.json | 0 {res => assets}/locales/en/game.json | 0 {res => assets}/locales/en/help.json | 0 {res => assets}/locales/en/tiles.json | 0 {res => assets}/locales/en/tips.json | 0 .../locales/es/Polyglot-100_es.json | 0 {res => assets}/locales/es/game.json | 0 .../locales/fiFI/Polyglot-100_fiFI.json | 0 {res => assets}/locales/fiFI/game.json | 0 {res => assets}/locales/fiFI/tips.json | 0 .../locales/frFR/Polyglot-100_frFR.json | 4 +- .../locales/frFR/configurator.json | 0 {res => assets}/locales/frFR/devmsg.json | 0 {res => assets}/locales/frFR/game.json | 0 {res => assets}/locales/frFR/tips.json | 0 {res => assets}/locales/helpOnTheFly.csv | 0 .../locales/huHU/Polyglot-100_huHU.json | 0 {res => assets}/locales/huHU/game.json | 0 .../locales/isIC/Polyglot-100_isIC.json | 0 {res => assets}/locales/isIC/game.json | 0 .../locales/it/Polyglot-100_it.json | 0 {res => assets}/locales/it/game.json | 0 .../locales/jaJP/Polyglot-100_jaJP.json | 0 .../locales/jaJP/configurator.json | 0 {res => assets}/locales/jaJP/devmsg.json | 0 {res => assets}/locales/jaJP/game.json | 0 {res => assets}/locales/jaJP/tips.json | 0 .../jakanaJP/Polyglot-100_jakanaJP.json | 0 {res => assets}/locales/jakanaJP/game.json | 0 .../locales/koKR/Polyglot-100_koKR.json | 0 .../locales/koKR/configurator.json | 0 {res => assets}/locales/koKR/devmsg.json | 0 {res => assets}/locales/koKR/game.json | 0 {res => assets}/locales/koKR/tips.json | 0 {res => assets}/locales/langprop.csv | 0 {res => assets}/locales/nameset_russian_f.csv | 0 {res => assets}/locales/nameset_russian_m.csv | 0 .../locales/nameset_scandinavian_f.csv | 0 .../locales/nameset_scandinavian_m.csv | 0 .../locales/nlNL/Polyglot-100_nlNL.json | 0 {res => assets}/locales/nlNL/game.json | 0 .../locales/noNB/Polyglot-100_noNB.json | 0 {res => assets}/locales/noNB/game.json | 0 .../locales/plPL/Polyglot-100_plPL.json | 0 {res => assets}/locales/plPL/game.json | 0 .../locales/ptBR/Polyglot-100_ptBR.json | 0 {res => assets}/locales/ptBR/game.json | 0 .../locales/ptPT/Polyglot-100_ptPT.json | 0 {res => assets}/locales/ptPT/game.json | 0 .../locales/roRO/Polyglot-100_roRO.json | 0 {res => assets}/locales/roRO/game.json | 0 .../locales/ruRU/Polyglot-100_ruRU.json | 0 {res => assets}/locales/ruRU/game.json | 0 .../locales/svSE/Polyglot-100_svSE.json | 0 {res => assets}/locales/svSE/game.json | 0 .../locales/thTH/Polyglot-100_thTH.json | 0 {res => assets}/locales/thTH/game.json | 0 {res => assets}/locales/tiles.csv | 0 .../locales/trTR/Polyglot-100_trTR.json | 0 {res => assets}/locales/trTR/game.json | 0 .../locales/zhCN/Polyglot-100_zhCN.json | 0 {res => assets}/locales/zhCN/game.json | 0 .../locales/zhTW/Polyglot-100_zhTW.json | 0 {res => assets}/locales/zhTW/game.json | 0 {res => assets}/raw/Creature_raw_doc.md | 0 {res => assets}/raw/Faction_doc.txt | 0 .../raw/ReligionSphereRelations.csv | 0 .../raw/creatures/CreatureHuman.json | 0 .../raw/factions/FactionGenericPlayer.json | 0 .../raw/factions/FactionSigrid.json | 0 .../factions/FactionWildHamletTemplate.json | 0 .../raw/weathers/WeatherGeneric.json | 0 .../raw/weathers/WeatherHellish.json | 0 {res => assets}/sounds/ambient/.gitattributes | 0 .../sounds/ambient/ambient_forest_01.ogg | 0 .../sounds/ambient/ambient_meadow_01.ogg | 0 .../sounds/ambient/ambient_windy_01.ogg | 0 .../sounds/ambient/ambient_woods_01.ogg | 0 .../sounds/ambient/crickets_01.ogg | 0 .../sounds/ambient/crickets_02.ogg | 0 res/graphics/fonts/thai_fullwidth.png | Bin 21678 -> 0 bytes res/musicbox_test/dragonborn.mid | Bin 12301 -> 0 bytes src/net/torvald/colourutil/ColourTemp.kt | 2 +- src/net/torvald/imagefont/GameFontWhite.kt | 40 ++--- src/net/torvald/imagefont/TinyAlphNum.kt | 2 +- src/net/torvald/terrarum/DefaultConfig.kt | 2 +- src/net/torvald/terrarum/StateFontTester.kt | 6 +- src/net/torvald/terrarum/StateInGame.kt | 6 +- src/net/torvald/terrarum/Terrarum.kt | 25 ++- src/net/torvald/terrarum/audio/AudioMixer.kt | 24 ++- .../terrarum/audio/AudioResourceLibrary.kt | 16 +- .../torvald/terrarum/console/CommandDict.kt | 3 +- src/net/torvald/terrarum/console/MusicTest.kt | 45 +++++ .../terrarum/gameactors/ActorWithBody.kt | 81 +++++---- .../gameactors/MDLInterpreterState.kt | 166 ++++++++++++++++++ .../torvald/terrarum/gameactors/PBCynthia.kt | 2 +- .../torvald/terrarum/gameactors/PBSigrid.kt | 4 +- src/net/torvald/terrarum/gameactors/Player.kt | 9 +- .../terrarum/gameactors/PlayerBuilder.kt | 2 +- .../gameactors/faction/FactionFactory.kt | 2 +- src/net/torvald/terrarum/langpack/Lang.kt | 2 +- .../torvald/terrarum/mapdrawer/MapCamera.kt | 6 +- .../terrarum/ui/ItemSlotImageBuilder.kt | 6 +- src/net/torvald/terrarum/ui/MessageWindow.kt | 12 +- .../torvald/terrarum/weather/WeatherMixer.kt | 6 +- work_files/magic_description_language.numbers | Bin 0 -> 141201 bytes 248 files changed, 371 insertions(+), 104 deletions(-) rename {res => assets}/4096.frg (100%) rename {res => assets}/4096.vrt (100%) rename {res => assets}/batchtest.txt (100%) rename {res => assets}/blur.frg (100%) rename {res => assets}/blurH.vrt (100%) rename {res => assets}/blurV.vrt (100%) rename {res => assets}/books/Blacksmith_s_handbook.txt (100%) rename {res => assets}/books/Book_writing_guide.txt (100%) rename {res => assets}/books/cjk_test.txt (100%) rename {res => assets}/books/hangul_test.txt (100%) rename {res => assets}/books/isl_test.txt (100%) rename {res => assets}/books/kana_test.txt (100%) rename {res => assets}/books/kana_test_2.txt (100%) rename {res => assets}/books/kana_test_2_kanji.txt (100%) rename {res => assets}/books/kana_test_kanji.txt (100%) rename {res => assets}/books/kanji_test_3.txt (100%) rename {res => assets}/books/kanji_test_4.txt (100%) rename {res => assets}/books/polyglot_test.txt (100%) rename {res => assets}/books/polyglot_test_2.txt (100%) rename {res => assets}/books/runic_short_1.txt (100%) rename {res => assets}/books/runic_short_2.txt (100%) rename {res => assets}/books/userguide_ENG.aux (100%) rename {res => assets}/books/userguide_ENG.log (100%) rename {res => assets}/books/userguide_ENG.out (100%) rename {res => assets}/books/userguide_ENG.pdf (100%) rename {res => assets}/books/userguide_ENG.synctex.gz (100%) rename {res => assets}/books/userguide_ENG.tex (100%) rename {res => assets}/books/userguide_ENG.toc (100%) rename {res => assets}/books/userguide_NON.aux (100%) rename {res => assets}/books/userguide_NON.log (100%) rename {res => assets}/books/userguide_NON.out (100%) rename {res => assets}/books/userguide_NON.pdf (100%) rename {res => assets}/books/userguide_NON.synctex.gz (100%) rename {res => assets}/books/userguide_NON.tex (100%) rename {res => assets}/books/userguide_NON.toc (100%) rename {res => assets}/graphics/art/.gitattributes (100%) rename {res => assets}/graphics/background_black.png (100%) rename {res => assets}/graphics/background_white.png (100%) rename {res => assets}/graphics/breakAnim.png (100%) rename {res => assets}/graphics/colourmap/black_body_col_1000_40000_K.png (100%) rename {res => assets}/graphics/colourmap/black_body_how_to_use.txt (100%) rename {res => assets}/graphics/colourmap/col12spectrum.png (100%) rename {res => assets}/graphics/colourmap/col216spectrum.png (100%) rename {res => assets}/graphics/colourmap/colourkey12.png (100%) rename {res => assets}/graphics/colourmap/colourkey216.png (100%) rename {res => assets}/graphics/colourmap/health_bar_colouring_4096.png (100%) rename {res => assets}/graphics/colourmap/sky_colour.png (100%) rename {res => assets}/graphics/fonts/Braille.png (100%) rename {res => assets}/graphics/fonts/LatinExtA_ef.png (100%) rename {res => assets}/graphics/fonts/LatinExtA_fullwidth.png (100%) rename {res => assets}/graphics/fonts/OSXBSD8x16.png (100%) rename {res => assets}/graphics/fonts/alphanumeric_small.png (100%) rename {res => assets}/graphics/fonts/ascii_fullwidth.png (100%) rename {res => assets}/graphics/fonts/ascii_special_ef.png (100%) rename {res => assets}/graphics/fonts/cjkpunct.png (100%) rename {res => assets}/graphics/fonts/cyrilic_ef.png (100%) rename {res => assets}/graphics/fonts/cyrilic_fullwidth.png (100%) rename {res => assets}/graphics/fonts/fullwidth_forms.png (100%) rename {res => assets}/graphics/fonts/futhark.png (100%) rename {res => assets}/graphics/fonts/greek_ef.png (100%) rename {res => assets}/graphics/fonts/greek_fullwidth.png (100%) rename {res => assets}/graphics/fonts/han_johab.png (100%) rename {res => assets}/graphics/fonts/kana.png (100%) rename {res => assets}/graphics/fonts/numeric_small.png (100%) rename {res => assets}/graphics/fonts/romana_ef.png (100%) rename {res => assets}/graphics/fonts/romana_fullwidth.png (100%) create mode 100644 assets/graphics/fonts/thai_fullwidth.png rename {res => assets}/graphics/fonts/unipunct.png (100%) rename {res => assets}/graphics/fonts/wenquanyi_11pt_part1.png (100%) rename {res => assets}/graphics/fonts/wenquanyi_11pt_part2.png (100%) rename {res => assets}/graphics/gui/StoneGUITex.png (100%) rename {res => assets}/graphics/gui/control_helper_body.png (100%) rename {res => assets}/graphics/gui/control_helper_left (100%) rename {res => assets}/graphics/gui/control_helper_right.png (100%) rename {res => assets}/graphics/gui/creativeInventory/.gitattributes (100%) rename {res => assets}/graphics/gui/creativeInventory/creativePalette.png (100%) rename {res => assets}/graphics/gui/cursor_black_over.png (100%) rename {res => assets}/graphics/gui/cursor_over.png (100%) rename {res => assets}/graphics/gui/cursor_pressed.png (100%) rename {res => assets}/graphics/gui/message_twoline_black_body.png (100%) rename {res => assets}/graphics/gui/message_twoline_black_left.png (100%) rename {res => assets}/graphics/gui/message_twoline_black_right.png (100%) rename {res => assets}/graphics/gui/progress_round_sheet.png (100%) rename {res => assets}/graphics/gui/quickbar/hotbar.png (100%) rename {res => assets}/graphics/gui/quickbar/hotbarIndicator.png (100%) rename {res => assets}/graphics/gui/quickbar/item_slot.png (100%) rename {res => assets}/graphics/gui/quickbar/item_slot_large.png (100%) rename {res => assets}/graphics/gui/quickbar/slot_separator.png (100%) rename {res => assets}/graphics/gui/quickbar/topbar_creative.png (100%) rename {res => assets}/graphics/gui/tooltip_black_body.png (100%) rename {res => assets}/graphics/gui/tooltip_black_left.png (100%) rename {res => assets}/graphics/gui/tooltip_black_right.png (100%) rename {res => assets}/graphics/gui/ui_background.png (100%) rename {res => assets}/graphics/gui/ui_corners.png (100%) rename {res => assets}/graphics/gui/ui_separator.png (100%) rename {res => assets}/graphics/gui/ui_sides.png (100%) rename {res => assets}/graphics/gui/zoom_menu.png (100%) rename {res => assets}/graphics/gui/zoom_menu.raw (100%) rename {res => assets}/graphics/gui/zoom_menu12.raw (100%) rename {res => assets}/graphics/items/items.png (100%) rename {res => assets}/graphics/items/items24.png (100%) rename {res => assets}/graphics/items/items48.png (100%) rename {res => assets}/graphics/logo_placeholder.png (100%) rename {res => assets}/graphics/logo_placeholder_noreflection.png (100%) rename {res => assets}/graphics/overlay_bloodshot.png (100%) rename {res => assets}/graphics/overlay_darkrim.png (100%) rename {res => assets}/graphics/overlay_darkrim_deletemask.png (100%) rename {res => assets}/graphics/placeholder.png (100%) rename {res => assets}/graphics/sprites/fixtures/tiki_torch.png (100%) rename {res => assets}/graphics/sprites/slime.png (100%) rename {res => assets}/graphics/sprites/slime_1.png (100%) rename {res => assets}/graphics/sprites/sprite_placeholder_24_48.png (100%) rename {res => assets}/graphics/sprites/test_player.png (100%) rename {res => assets}/graphics/sprites/test_player_2.png (100%) rename {res => assets}/graphics/sprites/test_player_glow.png (100%) rename {res => assets}/graphics/sprites/test_player_raw.raw (100%) rename {res => assets}/graphics/terrain/fluid.png (100%) rename {res => assets}/graphics/terrain/grassplusplus.png (100%) rename {res => assets}/graphics/terrain/terrain.png (100%) rename {res => assets}/graphics/terrain/terrain12.raw (100%) rename {res => assets}/graphics/terrain/terrain_12.raw (100%) rename {res => assets}/graphics/terrain/terrain_old.png (100%) rename {res => assets}/graphics/terrain/terrain_ref.png (100%) rename {res => assets}/graphics/terrain/wall.png (100%) rename {res => assets}/graphics/terrain/wall_old.png (100%) rename {res => assets}/graphics/terrain/wire.png (100%) rename {res => assets}/graphics/weathers/generic_light.png (100%) rename {res => assets}/graphics/weathers/generic_skybox.png (100%) rename {res => assets}/keylayout.json (100%) rename {res => assets}/locales/bgBG/Polyglot-100_bgBG.json (100%) rename {res => assets}/locales/bgBG/game.json (100%) rename {res => assets}/locales/csCZ/Polyglot-100_csCZ.json (100%) rename {res => assets}/locales/csCZ/game.json (100%) rename {res => assets}/locales/daDK/Polyglot-100_daDK.json (100%) rename {res => assets}/locales/daDK/game.json (100%) rename {res => assets}/locales/de/Polyglot-100_de.json (100%) rename {res => assets}/locales/de/game.json (100%) rename {res => assets}/locales/elGR/Polyglot-100_elGR.json (100%) rename {res => assets}/locales/elGR/game.json (100%) rename {res => assets}/locales/en/Polyglot-100_en.json (100%) rename {res => assets}/locales/en/configurator.json (100%) rename {res => assets}/locales/en/devmsg.json (100%) rename {res => assets}/locales/en/game.json (100%) rename {res => assets}/locales/en/help.json (100%) rename {res => assets}/locales/en/tiles.json (100%) rename {res => assets}/locales/en/tips.json (100%) rename {res => assets}/locales/es/Polyglot-100_es.json (100%) rename {res => assets}/locales/es/game.json (100%) rename {res => assets}/locales/fiFI/Polyglot-100_fiFI.json (100%) rename {res => assets}/locales/fiFI/game.json (100%) rename {res => assets}/locales/fiFI/tips.json (100%) rename {res => assets}/locales/frFR/Polyglot-100_frFR.json (99%) rename {res => assets}/locales/frFR/configurator.json (100%) rename {res => assets}/locales/frFR/devmsg.json (100%) rename {res => assets}/locales/frFR/game.json (100%) rename {res => assets}/locales/frFR/tips.json (100%) rename {res => assets}/locales/helpOnTheFly.csv (100%) rename {res => assets}/locales/huHU/Polyglot-100_huHU.json (100%) rename {res => assets}/locales/huHU/game.json (100%) rename {res => assets}/locales/isIC/Polyglot-100_isIC.json (100%) rename {res => assets}/locales/isIC/game.json (100%) rename {res => assets}/locales/it/Polyglot-100_it.json (100%) rename {res => assets}/locales/it/game.json (100%) rename {res => assets}/locales/jaJP/Polyglot-100_jaJP.json (100%) rename {res => assets}/locales/jaJP/configurator.json (100%) rename {res => assets}/locales/jaJP/devmsg.json (100%) rename {res => assets}/locales/jaJP/game.json (100%) rename {res => assets}/locales/jaJP/tips.json (100%) rename {res => assets}/locales/jakanaJP/Polyglot-100_jakanaJP.json (100%) rename {res => assets}/locales/jakanaJP/game.json (100%) rename {res => assets}/locales/koKR/Polyglot-100_koKR.json (100%) rename {res => assets}/locales/koKR/configurator.json (100%) rename {res => assets}/locales/koKR/devmsg.json (100%) rename {res => assets}/locales/koKR/game.json (100%) rename {res => assets}/locales/koKR/tips.json (100%) rename {res => assets}/locales/langprop.csv (100%) rename {res => assets}/locales/nameset_russian_f.csv (100%) rename {res => assets}/locales/nameset_russian_m.csv (100%) rename {res => assets}/locales/nameset_scandinavian_f.csv (100%) rename {res => assets}/locales/nameset_scandinavian_m.csv (100%) rename {res => assets}/locales/nlNL/Polyglot-100_nlNL.json (100%) rename {res => assets}/locales/nlNL/game.json (100%) rename {res => assets}/locales/noNB/Polyglot-100_noNB.json (100%) rename {res => assets}/locales/noNB/game.json (100%) rename {res => assets}/locales/plPL/Polyglot-100_plPL.json (100%) rename {res => assets}/locales/plPL/game.json (100%) rename {res => assets}/locales/ptBR/Polyglot-100_ptBR.json (100%) rename {res => assets}/locales/ptBR/game.json (100%) rename {res => assets}/locales/ptPT/Polyglot-100_ptPT.json (100%) rename {res => assets}/locales/ptPT/game.json (100%) rename {res => assets}/locales/roRO/Polyglot-100_roRO.json (100%) rename {res => assets}/locales/roRO/game.json (100%) rename {res => assets}/locales/ruRU/Polyglot-100_ruRU.json (100%) rename {res => assets}/locales/ruRU/game.json (100%) rename {res => assets}/locales/svSE/Polyglot-100_svSE.json (100%) rename {res => assets}/locales/svSE/game.json (100%) rename {res => assets}/locales/thTH/Polyglot-100_thTH.json (100%) rename {res => assets}/locales/thTH/game.json (100%) rename {res => assets}/locales/tiles.csv (100%) rename {res => assets}/locales/trTR/Polyglot-100_trTR.json (100%) rename {res => assets}/locales/trTR/game.json (100%) rename {res => assets}/locales/zhCN/Polyglot-100_zhCN.json (100%) rename {res => assets}/locales/zhCN/game.json (100%) rename {res => assets}/locales/zhTW/Polyglot-100_zhTW.json (100%) rename {res => assets}/locales/zhTW/game.json (100%) rename {res => assets}/raw/Creature_raw_doc.md (100%) rename {res => assets}/raw/Faction_doc.txt (100%) rename {res => assets}/raw/ReligionSphereRelations.csv (100%) rename {res => assets}/raw/creatures/CreatureHuman.json (100%) rename {res => assets}/raw/factions/FactionGenericPlayer.json (100%) rename {res => assets}/raw/factions/FactionSigrid.json (100%) rename {res => assets}/raw/factions/FactionWildHamletTemplate.json (100%) rename {res => assets}/raw/weathers/WeatherGeneric.json (100%) rename {res => assets}/raw/weathers/WeatherHellish.json (100%) rename {res => assets}/sounds/ambient/.gitattributes (100%) rename {res => assets}/sounds/ambient/ambient_forest_01.ogg (100%) rename {res => assets}/sounds/ambient/ambient_meadow_01.ogg (100%) rename {res => assets}/sounds/ambient/ambient_windy_01.ogg (100%) rename {res => assets}/sounds/ambient/ambient_woods_01.ogg (100%) rename {res => assets}/sounds/ambient/crickets_01.ogg (100%) rename {res => assets}/sounds/ambient/crickets_02.ogg (100%) delete mode 100644 res/graphics/fonts/thai_fullwidth.png delete mode 100755 res/musicbox_test/dragonborn.mid create mode 100644 src/net/torvald/terrarum/console/MusicTest.kt create mode 100644 src/net/torvald/terrarum/gameactors/MDLInterpreterState.kt create mode 100644 work_files/magic_description_language.numbers diff --git a/Terrarum_renewed.iml b/Terrarum_renewed.iml index 35a74489f..728bcc8a5 100644 --- a/Terrarum_renewed.iml +++ b/Terrarum_renewed.iml @@ -4,7 +4,7 @@ - + diff --git a/res/4096.frg b/assets/4096.frg similarity index 100% rename from res/4096.frg rename to assets/4096.frg diff --git a/res/4096.vrt b/assets/4096.vrt similarity index 100% rename from res/4096.vrt rename to assets/4096.vrt diff --git a/res/batchtest.txt b/assets/batchtest.txt similarity index 100% rename from res/batchtest.txt rename to assets/batchtest.txt diff --git a/res/blur.frg b/assets/blur.frg similarity index 100% rename from res/blur.frg rename to assets/blur.frg diff --git a/res/blurH.vrt b/assets/blurH.vrt similarity index 100% rename from res/blurH.vrt rename to assets/blurH.vrt diff --git a/res/blurV.vrt b/assets/blurV.vrt similarity index 100% rename from res/blurV.vrt rename to assets/blurV.vrt diff --git a/res/books/Blacksmith_s_handbook.txt b/assets/books/Blacksmith_s_handbook.txt similarity index 100% rename from res/books/Blacksmith_s_handbook.txt rename to assets/books/Blacksmith_s_handbook.txt diff --git a/res/books/Book_writing_guide.txt b/assets/books/Book_writing_guide.txt similarity index 100% rename from res/books/Book_writing_guide.txt rename to assets/books/Book_writing_guide.txt diff --git a/res/books/cjk_test.txt b/assets/books/cjk_test.txt similarity index 100% rename from res/books/cjk_test.txt rename to assets/books/cjk_test.txt diff --git a/res/books/hangul_test.txt b/assets/books/hangul_test.txt similarity index 100% rename from res/books/hangul_test.txt rename to assets/books/hangul_test.txt diff --git a/res/books/isl_test.txt b/assets/books/isl_test.txt similarity index 100% rename from res/books/isl_test.txt rename to assets/books/isl_test.txt diff --git a/res/books/kana_test.txt b/assets/books/kana_test.txt similarity index 100% rename from res/books/kana_test.txt rename to assets/books/kana_test.txt diff --git a/res/books/kana_test_2.txt b/assets/books/kana_test_2.txt similarity index 100% rename from res/books/kana_test_2.txt rename to assets/books/kana_test_2.txt diff --git a/res/books/kana_test_2_kanji.txt b/assets/books/kana_test_2_kanji.txt similarity index 100% rename from res/books/kana_test_2_kanji.txt rename to assets/books/kana_test_2_kanji.txt diff --git a/res/books/kana_test_kanji.txt b/assets/books/kana_test_kanji.txt similarity index 100% rename from res/books/kana_test_kanji.txt rename to assets/books/kana_test_kanji.txt diff --git a/res/books/kanji_test_3.txt b/assets/books/kanji_test_3.txt similarity index 100% rename from res/books/kanji_test_3.txt rename to assets/books/kanji_test_3.txt diff --git a/res/books/kanji_test_4.txt b/assets/books/kanji_test_4.txt similarity index 100% rename from res/books/kanji_test_4.txt rename to assets/books/kanji_test_4.txt diff --git a/res/books/polyglot_test.txt b/assets/books/polyglot_test.txt similarity index 100% rename from res/books/polyglot_test.txt rename to assets/books/polyglot_test.txt diff --git a/res/books/polyglot_test_2.txt b/assets/books/polyglot_test_2.txt similarity index 100% rename from res/books/polyglot_test_2.txt rename to assets/books/polyglot_test_2.txt diff --git a/res/books/runic_short_1.txt b/assets/books/runic_short_1.txt similarity index 100% rename from res/books/runic_short_1.txt rename to assets/books/runic_short_1.txt diff --git a/res/books/runic_short_2.txt b/assets/books/runic_short_2.txt similarity index 100% rename from res/books/runic_short_2.txt rename to assets/books/runic_short_2.txt diff --git a/res/books/userguide_ENG.aux b/assets/books/userguide_ENG.aux similarity index 100% rename from res/books/userguide_ENG.aux rename to assets/books/userguide_ENG.aux diff --git a/res/books/userguide_ENG.log b/assets/books/userguide_ENG.log similarity index 100% rename from res/books/userguide_ENG.log rename to assets/books/userguide_ENG.log diff --git a/res/books/userguide_ENG.out b/assets/books/userguide_ENG.out similarity index 100% rename from res/books/userguide_ENG.out rename to assets/books/userguide_ENG.out diff --git a/res/books/userguide_ENG.pdf b/assets/books/userguide_ENG.pdf similarity index 100% rename from res/books/userguide_ENG.pdf rename to assets/books/userguide_ENG.pdf diff --git a/res/books/userguide_ENG.synctex.gz b/assets/books/userguide_ENG.synctex.gz similarity index 100% rename from res/books/userguide_ENG.synctex.gz rename to assets/books/userguide_ENG.synctex.gz diff --git a/res/books/userguide_ENG.tex b/assets/books/userguide_ENG.tex similarity index 100% rename from res/books/userguide_ENG.tex rename to assets/books/userguide_ENG.tex diff --git a/res/books/userguide_ENG.toc b/assets/books/userguide_ENG.toc similarity index 100% rename from res/books/userguide_ENG.toc rename to assets/books/userguide_ENG.toc diff --git a/res/books/userguide_NON.aux b/assets/books/userguide_NON.aux similarity index 100% rename from res/books/userguide_NON.aux rename to assets/books/userguide_NON.aux diff --git a/res/books/userguide_NON.log b/assets/books/userguide_NON.log similarity index 100% rename from res/books/userguide_NON.log rename to assets/books/userguide_NON.log diff --git a/res/books/userguide_NON.out b/assets/books/userguide_NON.out similarity index 100% rename from res/books/userguide_NON.out rename to assets/books/userguide_NON.out diff --git a/res/books/userguide_NON.pdf b/assets/books/userguide_NON.pdf similarity index 100% rename from res/books/userguide_NON.pdf rename to assets/books/userguide_NON.pdf diff --git a/res/books/userguide_NON.synctex.gz b/assets/books/userguide_NON.synctex.gz similarity index 100% rename from res/books/userguide_NON.synctex.gz rename to assets/books/userguide_NON.synctex.gz diff --git a/res/books/userguide_NON.tex b/assets/books/userguide_NON.tex similarity index 100% rename from res/books/userguide_NON.tex rename to assets/books/userguide_NON.tex diff --git a/res/books/userguide_NON.toc b/assets/books/userguide_NON.toc similarity index 100% rename from res/books/userguide_NON.toc rename to assets/books/userguide_NON.toc diff --git a/res/graphics/art/.gitattributes b/assets/graphics/art/.gitattributes similarity index 100% rename from res/graphics/art/.gitattributes rename to assets/graphics/art/.gitattributes diff --git a/res/graphics/background_black.png b/assets/graphics/background_black.png similarity index 100% rename from res/graphics/background_black.png rename to assets/graphics/background_black.png diff --git a/res/graphics/background_white.png b/assets/graphics/background_white.png similarity index 100% rename from res/graphics/background_white.png rename to assets/graphics/background_white.png diff --git a/res/graphics/breakAnim.png b/assets/graphics/breakAnim.png similarity index 100% rename from res/graphics/breakAnim.png rename to assets/graphics/breakAnim.png diff --git a/res/graphics/colourmap/black_body_col_1000_40000_K.png b/assets/graphics/colourmap/black_body_col_1000_40000_K.png similarity index 100% rename from res/graphics/colourmap/black_body_col_1000_40000_K.png rename to assets/graphics/colourmap/black_body_col_1000_40000_K.png diff --git a/res/graphics/colourmap/black_body_how_to_use.txt b/assets/graphics/colourmap/black_body_how_to_use.txt similarity index 100% rename from res/graphics/colourmap/black_body_how_to_use.txt rename to assets/graphics/colourmap/black_body_how_to_use.txt diff --git a/res/graphics/colourmap/col12spectrum.png b/assets/graphics/colourmap/col12spectrum.png similarity index 100% rename from res/graphics/colourmap/col12spectrum.png rename to assets/graphics/colourmap/col12spectrum.png diff --git a/res/graphics/colourmap/col216spectrum.png b/assets/graphics/colourmap/col216spectrum.png similarity index 100% rename from res/graphics/colourmap/col216spectrum.png rename to assets/graphics/colourmap/col216spectrum.png diff --git a/res/graphics/colourmap/colourkey12.png b/assets/graphics/colourmap/colourkey12.png similarity index 100% rename from res/graphics/colourmap/colourkey12.png rename to assets/graphics/colourmap/colourkey12.png diff --git a/res/graphics/colourmap/colourkey216.png b/assets/graphics/colourmap/colourkey216.png similarity index 100% rename from res/graphics/colourmap/colourkey216.png rename to assets/graphics/colourmap/colourkey216.png diff --git a/res/graphics/colourmap/health_bar_colouring_4096.png b/assets/graphics/colourmap/health_bar_colouring_4096.png similarity index 100% rename from res/graphics/colourmap/health_bar_colouring_4096.png rename to assets/graphics/colourmap/health_bar_colouring_4096.png diff --git a/res/graphics/colourmap/sky_colour.png b/assets/graphics/colourmap/sky_colour.png similarity index 100% rename from res/graphics/colourmap/sky_colour.png rename to assets/graphics/colourmap/sky_colour.png diff --git a/res/graphics/fonts/Braille.png b/assets/graphics/fonts/Braille.png similarity index 100% rename from res/graphics/fonts/Braille.png rename to assets/graphics/fonts/Braille.png diff --git a/res/graphics/fonts/LatinExtA_ef.png b/assets/graphics/fonts/LatinExtA_ef.png similarity index 100% rename from res/graphics/fonts/LatinExtA_ef.png rename to assets/graphics/fonts/LatinExtA_ef.png diff --git a/res/graphics/fonts/LatinExtA_fullwidth.png b/assets/graphics/fonts/LatinExtA_fullwidth.png similarity index 100% rename from res/graphics/fonts/LatinExtA_fullwidth.png rename to assets/graphics/fonts/LatinExtA_fullwidth.png diff --git a/res/graphics/fonts/OSXBSD8x16.png b/assets/graphics/fonts/OSXBSD8x16.png similarity index 100% rename from res/graphics/fonts/OSXBSD8x16.png rename to assets/graphics/fonts/OSXBSD8x16.png diff --git a/res/graphics/fonts/alphanumeric_small.png b/assets/graphics/fonts/alphanumeric_small.png similarity index 100% rename from res/graphics/fonts/alphanumeric_small.png rename to assets/graphics/fonts/alphanumeric_small.png diff --git a/res/graphics/fonts/ascii_fullwidth.png b/assets/graphics/fonts/ascii_fullwidth.png similarity index 100% rename from res/graphics/fonts/ascii_fullwidth.png rename to assets/graphics/fonts/ascii_fullwidth.png diff --git a/res/graphics/fonts/ascii_special_ef.png b/assets/graphics/fonts/ascii_special_ef.png similarity index 100% rename from res/graphics/fonts/ascii_special_ef.png rename to assets/graphics/fonts/ascii_special_ef.png diff --git a/res/graphics/fonts/cjkpunct.png b/assets/graphics/fonts/cjkpunct.png similarity index 100% rename from res/graphics/fonts/cjkpunct.png rename to assets/graphics/fonts/cjkpunct.png diff --git a/res/graphics/fonts/cyrilic_ef.png b/assets/graphics/fonts/cyrilic_ef.png similarity index 100% rename from res/graphics/fonts/cyrilic_ef.png rename to assets/graphics/fonts/cyrilic_ef.png diff --git a/res/graphics/fonts/cyrilic_fullwidth.png b/assets/graphics/fonts/cyrilic_fullwidth.png similarity index 100% rename from res/graphics/fonts/cyrilic_fullwidth.png rename to assets/graphics/fonts/cyrilic_fullwidth.png diff --git a/res/graphics/fonts/fullwidth_forms.png b/assets/graphics/fonts/fullwidth_forms.png similarity index 100% rename from res/graphics/fonts/fullwidth_forms.png rename to assets/graphics/fonts/fullwidth_forms.png diff --git a/res/graphics/fonts/futhark.png b/assets/graphics/fonts/futhark.png similarity index 100% rename from res/graphics/fonts/futhark.png rename to assets/graphics/fonts/futhark.png diff --git a/res/graphics/fonts/greek_ef.png b/assets/graphics/fonts/greek_ef.png similarity index 100% rename from res/graphics/fonts/greek_ef.png rename to assets/graphics/fonts/greek_ef.png diff --git a/res/graphics/fonts/greek_fullwidth.png b/assets/graphics/fonts/greek_fullwidth.png similarity index 100% rename from res/graphics/fonts/greek_fullwidth.png rename to assets/graphics/fonts/greek_fullwidth.png diff --git a/res/graphics/fonts/han_johab.png b/assets/graphics/fonts/han_johab.png similarity index 100% rename from res/graphics/fonts/han_johab.png rename to assets/graphics/fonts/han_johab.png diff --git a/res/graphics/fonts/kana.png b/assets/graphics/fonts/kana.png similarity index 100% rename from res/graphics/fonts/kana.png rename to assets/graphics/fonts/kana.png diff --git a/res/graphics/fonts/numeric_small.png b/assets/graphics/fonts/numeric_small.png similarity index 100% rename from res/graphics/fonts/numeric_small.png rename to assets/graphics/fonts/numeric_small.png diff --git a/res/graphics/fonts/romana_ef.png b/assets/graphics/fonts/romana_ef.png similarity index 100% rename from res/graphics/fonts/romana_ef.png rename to assets/graphics/fonts/romana_ef.png diff --git a/res/graphics/fonts/romana_fullwidth.png b/assets/graphics/fonts/romana_fullwidth.png similarity index 100% rename from res/graphics/fonts/romana_fullwidth.png rename to assets/graphics/fonts/romana_fullwidth.png diff --git a/assets/graphics/fonts/thai_fullwidth.png b/assets/graphics/fonts/thai_fullwidth.png new file mode 100644 index 0000000000000000000000000000000000000000..26ce5b6064916b99b5b3fa79e4999adce78df18c GIT binary patch literal 1939 zcmeAS@N?(olHy`uVBq!ia0vp^6M(pagBeI_^>?Q-FfcO&_=LFr|Np^WjmgZp3wXb5Z&ax?`}9A(>rMAH$+?zCROEXWt7V0< zPLiFv?YPf1ftHlhY9i`}r}>XhjCEZf^l<0hG=ohm`vYD`onk5yNIvs%a(jSv^i&3; z^UEJI8bvw@EJ|qb;woHxhhv_Wi(i+<`GA50OfyrY0~ge)_n3OQS~gA9Y6@UaQgBIA z&dSi^ZnlwGK7VT#uZl89=bR&_m#%Y|vb|7cKHH=v66_E8Qcj+8YN)bQa-Wg%DOtf< zUe^7EK#PE~TcX@v8OJRhEJhCUR!?pg>DCFIm{gPBzQK-t3b*I%L%;9V0X_HJY~JH} zyhk>&OgeJS_R6iFT{5Xt0y>y~7pjPy%gDR?E%~|jS04 z)AN#cL(bzG&IdKO9U>mw5yZM2}@#koH^WGg-|y!MpxmV7uk8pVi~j)`py)UJlvCyaDA^ zlin*;J1eeOb?9noMoH=%&07s;RR0ti#?Mn)<#eK>I#gJ=Bc=TOsfI~xANMjdU(og2 zeljm?7l-O zDti)OXXu&d@OG7k!`*etzfz7{-i`TuQ}^iMLYL{QG|RqRE@p7?s|#O{(Qd&osUxv# zwRl`~Cfh8_kcoHV809=U8ul0+y?LQHc;hA36E|{KWfcjY&EMQ>zx(jMUq3E7l)b-M zm%$t><6-wPYx0@AZ)ytJ=MGJg*s`=jSRmTOeqoNiK>f=_@5+9DcG#ABq@4M0vDfL2 ze6~$j)LB2@ZcIwlV>!~pye?A|-4w?yTX7O! zqt42GyGq_~bk&#|vz=wZb%)4$9+vvoAEtb{B#?Y`y2D)Nk8R8n4NuApbsFz&7xeff z-tfxpgV#KXpDF?OIpR(VKM!vZ&}W^rwXyEfq{wYgS2JvUxcbe)Qu*9RwGKHytU^D3 z+xuHn!E+ynK)uC{|6IEp%`U{VPO@iLxhzwoR3Y~wL8tIK6GzLe32sLt7wEVgnc{p> z^0EF|%_Wi_Cn!A;*!J|Z!{2Q}g^xFdzQ5=85kZFMIsLR&P;wYucXb`*r%i?>hWv{3l<0#bHsNET}Z~boFyt=akR{06b$L^8f$< literal 0 HcmV?d00001 diff --git a/res/graphics/fonts/unipunct.png b/assets/graphics/fonts/unipunct.png similarity index 100% rename from res/graphics/fonts/unipunct.png rename to assets/graphics/fonts/unipunct.png diff --git a/res/graphics/fonts/wenquanyi_11pt_part1.png b/assets/graphics/fonts/wenquanyi_11pt_part1.png similarity index 100% rename from res/graphics/fonts/wenquanyi_11pt_part1.png rename to assets/graphics/fonts/wenquanyi_11pt_part1.png diff --git a/res/graphics/fonts/wenquanyi_11pt_part2.png b/assets/graphics/fonts/wenquanyi_11pt_part2.png similarity index 100% rename from res/graphics/fonts/wenquanyi_11pt_part2.png rename to assets/graphics/fonts/wenquanyi_11pt_part2.png diff --git a/res/graphics/gui/StoneGUITex.png b/assets/graphics/gui/StoneGUITex.png similarity index 100% rename from res/graphics/gui/StoneGUITex.png rename to assets/graphics/gui/StoneGUITex.png diff --git a/res/graphics/gui/control_helper_body.png b/assets/graphics/gui/control_helper_body.png similarity index 100% rename from res/graphics/gui/control_helper_body.png rename to assets/graphics/gui/control_helper_body.png diff --git a/res/graphics/gui/control_helper_left b/assets/graphics/gui/control_helper_left similarity index 100% rename from res/graphics/gui/control_helper_left rename to assets/graphics/gui/control_helper_left diff --git a/res/graphics/gui/control_helper_right.png b/assets/graphics/gui/control_helper_right.png similarity index 100% rename from res/graphics/gui/control_helper_right.png rename to assets/graphics/gui/control_helper_right.png diff --git a/res/graphics/gui/creativeInventory/.gitattributes b/assets/graphics/gui/creativeInventory/.gitattributes similarity index 100% rename from res/graphics/gui/creativeInventory/.gitattributes rename to assets/graphics/gui/creativeInventory/.gitattributes diff --git a/res/graphics/gui/creativeInventory/creativePalette.png b/assets/graphics/gui/creativeInventory/creativePalette.png similarity index 100% rename from res/graphics/gui/creativeInventory/creativePalette.png rename to assets/graphics/gui/creativeInventory/creativePalette.png diff --git a/res/graphics/gui/cursor_black_over.png b/assets/graphics/gui/cursor_black_over.png similarity index 100% rename from res/graphics/gui/cursor_black_over.png rename to assets/graphics/gui/cursor_black_over.png diff --git a/res/graphics/gui/cursor_over.png b/assets/graphics/gui/cursor_over.png similarity index 100% rename from res/graphics/gui/cursor_over.png rename to assets/graphics/gui/cursor_over.png diff --git a/res/graphics/gui/cursor_pressed.png b/assets/graphics/gui/cursor_pressed.png similarity index 100% rename from res/graphics/gui/cursor_pressed.png rename to assets/graphics/gui/cursor_pressed.png diff --git a/res/graphics/gui/message_twoline_black_body.png b/assets/graphics/gui/message_twoline_black_body.png similarity index 100% rename from res/graphics/gui/message_twoline_black_body.png rename to assets/graphics/gui/message_twoline_black_body.png diff --git a/res/graphics/gui/message_twoline_black_left.png b/assets/graphics/gui/message_twoline_black_left.png similarity index 100% rename from res/graphics/gui/message_twoline_black_left.png rename to assets/graphics/gui/message_twoline_black_left.png diff --git a/res/graphics/gui/message_twoline_black_right.png b/assets/graphics/gui/message_twoline_black_right.png similarity index 100% rename from res/graphics/gui/message_twoline_black_right.png rename to assets/graphics/gui/message_twoline_black_right.png diff --git a/res/graphics/gui/progress_round_sheet.png b/assets/graphics/gui/progress_round_sheet.png similarity index 100% rename from res/graphics/gui/progress_round_sheet.png rename to assets/graphics/gui/progress_round_sheet.png diff --git a/res/graphics/gui/quickbar/hotbar.png b/assets/graphics/gui/quickbar/hotbar.png similarity index 100% rename from res/graphics/gui/quickbar/hotbar.png rename to assets/graphics/gui/quickbar/hotbar.png diff --git a/res/graphics/gui/quickbar/hotbarIndicator.png b/assets/graphics/gui/quickbar/hotbarIndicator.png similarity index 100% rename from res/graphics/gui/quickbar/hotbarIndicator.png rename to assets/graphics/gui/quickbar/hotbarIndicator.png diff --git a/res/graphics/gui/quickbar/item_slot.png b/assets/graphics/gui/quickbar/item_slot.png similarity index 100% rename from res/graphics/gui/quickbar/item_slot.png rename to assets/graphics/gui/quickbar/item_slot.png diff --git a/res/graphics/gui/quickbar/item_slot_large.png b/assets/graphics/gui/quickbar/item_slot_large.png similarity index 100% rename from res/graphics/gui/quickbar/item_slot_large.png rename to assets/graphics/gui/quickbar/item_slot_large.png diff --git a/res/graphics/gui/quickbar/slot_separator.png b/assets/graphics/gui/quickbar/slot_separator.png similarity index 100% rename from res/graphics/gui/quickbar/slot_separator.png rename to assets/graphics/gui/quickbar/slot_separator.png diff --git a/res/graphics/gui/quickbar/topbar_creative.png b/assets/graphics/gui/quickbar/topbar_creative.png similarity index 100% rename from res/graphics/gui/quickbar/topbar_creative.png rename to assets/graphics/gui/quickbar/topbar_creative.png diff --git a/res/graphics/gui/tooltip_black_body.png b/assets/graphics/gui/tooltip_black_body.png similarity index 100% rename from res/graphics/gui/tooltip_black_body.png rename to assets/graphics/gui/tooltip_black_body.png diff --git a/res/graphics/gui/tooltip_black_left.png b/assets/graphics/gui/tooltip_black_left.png similarity index 100% rename from res/graphics/gui/tooltip_black_left.png rename to assets/graphics/gui/tooltip_black_left.png diff --git a/res/graphics/gui/tooltip_black_right.png b/assets/graphics/gui/tooltip_black_right.png similarity index 100% rename from res/graphics/gui/tooltip_black_right.png rename to assets/graphics/gui/tooltip_black_right.png diff --git a/res/graphics/gui/ui_background.png b/assets/graphics/gui/ui_background.png similarity index 100% rename from res/graphics/gui/ui_background.png rename to assets/graphics/gui/ui_background.png diff --git a/res/graphics/gui/ui_corners.png b/assets/graphics/gui/ui_corners.png similarity index 100% rename from res/graphics/gui/ui_corners.png rename to assets/graphics/gui/ui_corners.png diff --git a/res/graphics/gui/ui_separator.png b/assets/graphics/gui/ui_separator.png similarity index 100% rename from res/graphics/gui/ui_separator.png rename to assets/graphics/gui/ui_separator.png diff --git a/res/graphics/gui/ui_sides.png b/assets/graphics/gui/ui_sides.png similarity index 100% rename from res/graphics/gui/ui_sides.png rename to assets/graphics/gui/ui_sides.png diff --git a/res/graphics/gui/zoom_menu.png b/assets/graphics/gui/zoom_menu.png similarity index 100% rename from res/graphics/gui/zoom_menu.png rename to assets/graphics/gui/zoom_menu.png diff --git a/res/graphics/gui/zoom_menu.raw b/assets/graphics/gui/zoom_menu.raw similarity index 100% rename from res/graphics/gui/zoom_menu.raw rename to assets/graphics/gui/zoom_menu.raw diff --git a/res/graphics/gui/zoom_menu12.raw b/assets/graphics/gui/zoom_menu12.raw similarity index 100% rename from res/graphics/gui/zoom_menu12.raw rename to assets/graphics/gui/zoom_menu12.raw diff --git a/res/graphics/items/items.png b/assets/graphics/items/items.png similarity index 100% rename from res/graphics/items/items.png rename to assets/graphics/items/items.png diff --git a/res/graphics/items/items24.png b/assets/graphics/items/items24.png similarity index 100% rename from res/graphics/items/items24.png rename to assets/graphics/items/items24.png diff --git a/res/graphics/items/items48.png b/assets/graphics/items/items48.png similarity index 100% rename from res/graphics/items/items48.png rename to assets/graphics/items/items48.png diff --git a/res/graphics/logo_placeholder.png b/assets/graphics/logo_placeholder.png similarity index 100% rename from res/graphics/logo_placeholder.png rename to assets/graphics/logo_placeholder.png diff --git a/res/graphics/logo_placeholder_noreflection.png b/assets/graphics/logo_placeholder_noreflection.png similarity index 100% rename from res/graphics/logo_placeholder_noreflection.png rename to assets/graphics/logo_placeholder_noreflection.png diff --git a/res/graphics/overlay_bloodshot.png b/assets/graphics/overlay_bloodshot.png similarity index 100% rename from res/graphics/overlay_bloodshot.png rename to assets/graphics/overlay_bloodshot.png diff --git a/res/graphics/overlay_darkrim.png b/assets/graphics/overlay_darkrim.png similarity index 100% rename from res/graphics/overlay_darkrim.png rename to assets/graphics/overlay_darkrim.png diff --git a/res/graphics/overlay_darkrim_deletemask.png b/assets/graphics/overlay_darkrim_deletemask.png similarity index 100% rename from res/graphics/overlay_darkrim_deletemask.png rename to assets/graphics/overlay_darkrim_deletemask.png diff --git a/res/graphics/placeholder.png b/assets/graphics/placeholder.png similarity index 100% rename from res/graphics/placeholder.png rename to assets/graphics/placeholder.png diff --git a/res/graphics/sprites/fixtures/tiki_torch.png b/assets/graphics/sprites/fixtures/tiki_torch.png similarity index 100% rename from res/graphics/sprites/fixtures/tiki_torch.png rename to assets/graphics/sprites/fixtures/tiki_torch.png diff --git a/res/graphics/sprites/slime.png b/assets/graphics/sprites/slime.png similarity index 100% rename from res/graphics/sprites/slime.png rename to assets/graphics/sprites/slime.png diff --git a/res/graphics/sprites/slime_1.png b/assets/graphics/sprites/slime_1.png similarity index 100% rename from res/graphics/sprites/slime_1.png rename to assets/graphics/sprites/slime_1.png diff --git a/res/graphics/sprites/sprite_placeholder_24_48.png b/assets/graphics/sprites/sprite_placeholder_24_48.png similarity index 100% rename from res/graphics/sprites/sprite_placeholder_24_48.png rename to assets/graphics/sprites/sprite_placeholder_24_48.png diff --git a/res/graphics/sprites/test_player.png b/assets/graphics/sprites/test_player.png similarity index 100% rename from res/graphics/sprites/test_player.png rename to assets/graphics/sprites/test_player.png diff --git a/res/graphics/sprites/test_player_2.png b/assets/graphics/sprites/test_player_2.png similarity index 100% rename from res/graphics/sprites/test_player_2.png rename to assets/graphics/sprites/test_player_2.png diff --git a/res/graphics/sprites/test_player_glow.png b/assets/graphics/sprites/test_player_glow.png similarity index 100% rename from res/graphics/sprites/test_player_glow.png rename to assets/graphics/sprites/test_player_glow.png diff --git a/res/graphics/sprites/test_player_raw.raw b/assets/graphics/sprites/test_player_raw.raw similarity index 100% rename from res/graphics/sprites/test_player_raw.raw rename to assets/graphics/sprites/test_player_raw.raw diff --git a/res/graphics/terrain/fluid.png b/assets/graphics/terrain/fluid.png similarity index 100% rename from res/graphics/terrain/fluid.png rename to assets/graphics/terrain/fluid.png diff --git a/res/graphics/terrain/grassplusplus.png b/assets/graphics/terrain/grassplusplus.png similarity index 100% rename from res/graphics/terrain/grassplusplus.png rename to assets/graphics/terrain/grassplusplus.png diff --git a/res/graphics/terrain/terrain.png b/assets/graphics/terrain/terrain.png similarity index 100% rename from res/graphics/terrain/terrain.png rename to assets/graphics/terrain/terrain.png diff --git a/res/graphics/terrain/terrain12.raw b/assets/graphics/terrain/terrain12.raw similarity index 100% rename from res/graphics/terrain/terrain12.raw rename to assets/graphics/terrain/terrain12.raw diff --git a/res/graphics/terrain/terrain_12.raw b/assets/graphics/terrain/terrain_12.raw similarity index 100% rename from res/graphics/terrain/terrain_12.raw rename to assets/graphics/terrain/terrain_12.raw diff --git a/res/graphics/terrain/terrain_old.png b/assets/graphics/terrain/terrain_old.png similarity index 100% rename from res/graphics/terrain/terrain_old.png rename to assets/graphics/terrain/terrain_old.png diff --git a/res/graphics/terrain/terrain_ref.png b/assets/graphics/terrain/terrain_ref.png similarity index 100% rename from res/graphics/terrain/terrain_ref.png rename to assets/graphics/terrain/terrain_ref.png diff --git a/res/graphics/terrain/wall.png b/assets/graphics/terrain/wall.png similarity index 100% rename from res/graphics/terrain/wall.png rename to assets/graphics/terrain/wall.png diff --git a/res/graphics/terrain/wall_old.png b/assets/graphics/terrain/wall_old.png similarity index 100% rename from res/graphics/terrain/wall_old.png rename to assets/graphics/terrain/wall_old.png diff --git a/res/graphics/terrain/wire.png b/assets/graphics/terrain/wire.png similarity index 100% rename from res/graphics/terrain/wire.png rename to assets/graphics/terrain/wire.png diff --git a/res/graphics/weathers/generic_light.png b/assets/graphics/weathers/generic_light.png similarity index 100% rename from res/graphics/weathers/generic_light.png rename to assets/graphics/weathers/generic_light.png diff --git a/res/graphics/weathers/generic_skybox.png b/assets/graphics/weathers/generic_skybox.png similarity index 100% rename from res/graphics/weathers/generic_skybox.png rename to assets/graphics/weathers/generic_skybox.png diff --git a/res/keylayout.json b/assets/keylayout.json similarity index 100% rename from res/keylayout.json rename to assets/keylayout.json diff --git a/res/locales/bgBG/Polyglot-100_bgBG.json b/assets/locales/bgBG/Polyglot-100_bgBG.json similarity index 100% rename from res/locales/bgBG/Polyglot-100_bgBG.json rename to assets/locales/bgBG/Polyglot-100_bgBG.json diff --git a/res/locales/bgBG/game.json b/assets/locales/bgBG/game.json similarity index 100% rename from res/locales/bgBG/game.json rename to assets/locales/bgBG/game.json diff --git a/res/locales/csCZ/Polyglot-100_csCZ.json b/assets/locales/csCZ/Polyglot-100_csCZ.json similarity index 100% rename from res/locales/csCZ/Polyglot-100_csCZ.json rename to assets/locales/csCZ/Polyglot-100_csCZ.json diff --git a/res/locales/csCZ/game.json b/assets/locales/csCZ/game.json similarity index 100% rename from res/locales/csCZ/game.json rename to assets/locales/csCZ/game.json diff --git a/res/locales/daDK/Polyglot-100_daDK.json b/assets/locales/daDK/Polyglot-100_daDK.json similarity index 100% rename from res/locales/daDK/Polyglot-100_daDK.json rename to assets/locales/daDK/Polyglot-100_daDK.json diff --git a/res/locales/daDK/game.json b/assets/locales/daDK/game.json similarity index 100% rename from res/locales/daDK/game.json rename to assets/locales/daDK/game.json diff --git a/res/locales/de/Polyglot-100_de.json b/assets/locales/de/Polyglot-100_de.json similarity index 100% rename from res/locales/de/Polyglot-100_de.json rename to assets/locales/de/Polyglot-100_de.json diff --git a/res/locales/de/game.json b/assets/locales/de/game.json similarity index 100% rename from res/locales/de/game.json rename to assets/locales/de/game.json diff --git a/res/locales/elGR/Polyglot-100_elGR.json b/assets/locales/elGR/Polyglot-100_elGR.json similarity index 100% rename from res/locales/elGR/Polyglot-100_elGR.json rename to assets/locales/elGR/Polyglot-100_elGR.json diff --git a/res/locales/elGR/game.json b/assets/locales/elGR/game.json similarity index 100% rename from res/locales/elGR/game.json rename to assets/locales/elGR/game.json diff --git a/res/locales/en/Polyglot-100_en.json b/assets/locales/en/Polyglot-100_en.json similarity index 100% rename from res/locales/en/Polyglot-100_en.json rename to assets/locales/en/Polyglot-100_en.json diff --git a/res/locales/en/configurator.json b/assets/locales/en/configurator.json similarity index 100% rename from res/locales/en/configurator.json rename to assets/locales/en/configurator.json diff --git a/res/locales/en/devmsg.json b/assets/locales/en/devmsg.json similarity index 100% rename from res/locales/en/devmsg.json rename to assets/locales/en/devmsg.json diff --git a/res/locales/en/game.json b/assets/locales/en/game.json similarity index 100% rename from res/locales/en/game.json rename to assets/locales/en/game.json diff --git a/res/locales/en/help.json b/assets/locales/en/help.json similarity index 100% rename from res/locales/en/help.json rename to assets/locales/en/help.json diff --git a/res/locales/en/tiles.json b/assets/locales/en/tiles.json similarity index 100% rename from res/locales/en/tiles.json rename to assets/locales/en/tiles.json diff --git a/res/locales/en/tips.json b/assets/locales/en/tips.json similarity index 100% rename from res/locales/en/tips.json rename to assets/locales/en/tips.json diff --git a/res/locales/es/Polyglot-100_es.json b/assets/locales/es/Polyglot-100_es.json similarity index 100% rename from res/locales/es/Polyglot-100_es.json rename to assets/locales/es/Polyglot-100_es.json diff --git a/res/locales/es/game.json b/assets/locales/es/game.json similarity index 100% rename from res/locales/es/game.json rename to assets/locales/es/game.json diff --git a/res/locales/fiFI/Polyglot-100_fiFI.json b/assets/locales/fiFI/Polyglot-100_fiFI.json similarity index 100% rename from res/locales/fiFI/Polyglot-100_fiFI.json rename to assets/locales/fiFI/Polyglot-100_fiFI.json diff --git a/res/locales/fiFI/game.json b/assets/locales/fiFI/game.json similarity index 100% rename from res/locales/fiFI/game.json rename to assets/locales/fiFI/game.json diff --git a/res/locales/fiFI/tips.json b/assets/locales/fiFI/tips.json similarity index 100% rename from res/locales/fiFI/tips.json rename to assets/locales/fiFI/tips.json diff --git a/res/locales/frFR/Polyglot-100_frFR.json b/assets/locales/frFR/Polyglot-100_frFR.json similarity index 99% rename from res/locales/frFR/Polyglot-100_frFR.json rename to assets/locales/frFR/Polyglot-100_frFR.json index c448ec503..e90ca0bc0 100644 --- a/res/locales/frFR/Polyglot-100_frFR.json +++ b/assets/locales/frFR/Polyglot-100_frFR.json @@ -1129,11 +1129,11 @@ }, { "n": "GAME_CHARACTER_HEART", - "s": "Coeur" + "s": "Cœur" }, { "n": "GAME_CHARACTER_HEART_PLURAL", - "s": "Coeurs" + "s": "Cœurs" }, { "n": "GAME_CHARACTER_LEVEL", diff --git a/res/locales/frFR/configurator.json b/assets/locales/frFR/configurator.json similarity index 100% rename from res/locales/frFR/configurator.json rename to assets/locales/frFR/configurator.json diff --git a/res/locales/frFR/devmsg.json b/assets/locales/frFR/devmsg.json similarity index 100% rename from res/locales/frFR/devmsg.json rename to assets/locales/frFR/devmsg.json diff --git a/res/locales/frFR/game.json b/assets/locales/frFR/game.json similarity index 100% rename from res/locales/frFR/game.json rename to assets/locales/frFR/game.json diff --git a/res/locales/frFR/tips.json b/assets/locales/frFR/tips.json similarity index 100% rename from res/locales/frFR/tips.json rename to assets/locales/frFR/tips.json diff --git a/res/locales/helpOnTheFly.csv b/assets/locales/helpOnTheFly.csv similarity index 100% rename from res/locales/helpOnTheFly.csv rename to assets/locales/helpOnTheFly.csv diff --git a/res/locales/huHU/Polyglot-100_huHU.json b/assets/locales/huHU/Polyglot-100_huHU.json similarity index 100% rename from res/locales/huHU/Polyglot-100_huHU.json rename to assets/locales/huHU/Polyglot-100_huHU.json diff --git a/res/locales/huHU/game.json b/assets/locales/huHU/game.json similarity index 100% rename from res/locales/huHU/game.json rename to assets/locales/huHU/game.json diff --git a/res/locales/isIC/Polyglot-100_isIC.json b/assets/locales/isIC/Polyglot-100_isIC.json similarity index 100% rename from res/locales/isIC/Polyglot-100_isIC.json rename to assets/locales/isIC/Polyglot-100_isIC.json diff --git a/res/locales/isIC/game.json b/assets/locales/isIC/game.json similarity index 100% rename from res/locales/isIC/game.json rename to assets/locales/isIC/game.json diff --git a/res/locales/it/Polyglot-100_it.json b/assets/locales/it/Polyglot-100_it.json similarity index 100% rename from res/locales/it/Polyglot-100_it.json rename to assets/locales/it/Polyglot-100_it.json diff --git a/res/locales/it/game.json b/assets/locales/it/game.json similarity index 100% rename from res/locales/it/game.json rename to assets/locales/it/game.json diff --git a/res/locales/jaJP/Polyglot-100_jaJP.json b/assets/locales/jaJP/Polyglot-100_jaJP.json similarity index 100% rename from res/locales/jaJP/Polyglot-100_jaJP.json rename to assets/locales/jaJP/Polyglot-100_jaJP.json diff --git a/res/locales/jaJP/configurator.json b/assets/locales/jaJP/configurator.json similarity index 100% rename from res/locales/jaJP/configurator.json rename to assets/locales/jaJP/configurator.json diff --git a/res/locales/jaJP/devmsg.json b/assets/locales/jaJP/devmsg.json similarity index 100% rename from res/locales/jaJP/devmsg.json rename to assets/locales/jaJP/devmsg.json diff --git a/res/locales/jaJP/game.json b/assets/locales/jaJP/game.json similarity index 100% rename from res/locales/jaJP/game.json rename to assets/locales/jaJP/game.json diff --git a/res/locales/jaJP/tips.json b/assets/locales/jaJP/tips.json similarity index 100% rename from res/locales/jaJP/tips.json rename to assets/locales/jaJP/tips.json diff --git a/res/locales/jakanaJP/Polyglot-100_jakanaJP.json b/assets/locales/jakanaJP/Polyglot-100_jakanaJP.json similarity index 100% rename from res/locales/jakanaJP/Polyglot-100_jakanaJP.json rename to assets/locales/jakanaJP/Polyglot-100_jakanaJP.json diff --git a/res/locales/jakanaJP/game.json b/assets/locales/jakanaJP/game.json similarity index 100% rename from res/locales/jakanaJP/game.json rename to assets/locales/jakanaJP/game.json diff --git a/res/locales/koKR/Polyglot-100_koKR.json b/assets/locales/koKR/Polyglot-100_koKR.json similarity index 100% rename from res/locales/koKR/Polyglot-100_koKR.json rename to assets/locales/koKR/Polyglot-100_koKR.json diff --git a/res/locales/koKR/configurator.json b/assets/locales/koKR/configurator.json similarity index 100% rename from res/locales/koKR/configurator.json rename to assets/locales/koKR/configurator.json diff --git a/res/locales/koKR/devmsg.json b/assets/locales/koKR/devmsg.json similarity index 100% rename from res/locales/koKR/devmsg.json rename to assets/locales/koKR/devmsg.json diff --git a/res/locales/koKR/game.json b/assets/locales/koKR/game.json similarity index 100% rename from res/locales/koKR/game.json rename to assets/locales/koKR/game.json diff --git a/res/locales/koKR/tips.json b/assets/locales/koKR/tips.json similarity index 100% rename from res/locales/koKR/tips.json rename to assets/locales/koKR/tips.json diff --git a/res/locales/langprop.csv b/assets/locales/langprop.csv similarity index 100% rename from res/locales/langprop.csv rename to assets/locales/langprop.csv diff --git a/res/locales/nameset_russian_f.csv b/assets/locales/nameset_russian_f.csv similarity index 100% rename from res/locales/nameset_russian_f.csv rename to assets/locales/nameset_russian_f.csv diff --git a/res/locales/nameset_russian_m.csv b/assets/locales/nameset_russian_m.csv similarity index 100% rename from res/locales/nameset_russian_m.csv rename to assets/locales/nameset_russian_m.csv diff --git a/res/locales/nameset_scandinavian_f.csv b/assets/locales/nameset_scandinavian_f.csv similarity index 100% rename from res/locales/nameset_scandinavian_f.csv rename to assets/locales/nameset_scandinavian_f.csv diff --git a/res/locales/nameset_scandinavian_m.csv b/assets/locales/nameset_scandinavian_m.csv similarity index 100% rename from res/locales/nameset_scandinavian_m.csv rename to assets/locales/nameset_scandinavian_m.csv diff --git a/res/locales/nlNL/Polyglot-100_nlNL.json b/assets/locales/nlNL/Polyglot-100_nlNL.json similarity index 100% rename from res/locales/nlNL/Polyglot-100_nlNL.json rename to assets/locales/nlNL/Polyglot-100_nlNL.json diff --git a/res/locales/nlNL/game.json b/assets/locales/nlNL/game.json similarity index 100% rename from res/locales/nlNL/game.json rename to assets/locales/nlNL/game.json diff --git a/res/locales/noNB/Polyglot-100_noNB.json b/assets/locales/noNB/Polyglot-100_noNB.json similarity index 100% rename from res/locales/noNB/Polyglot-100_noNB.json rename to assets/locales/noNB/Polyglot-100_noNB.json diff --git a/res/locales/noNB/game.json b/assets/locales/noNB/game.json similarity index 100% rename from res/locales/noNB/game.json rename to assets/locales/noNB/game.json diff --git a/res/locales/plPL/Polyglot-100_plPL.json b/assets/locales/plPL/Polyglot-100_plPL.json similarity index 100% rename from res/locales/plPL/Polyglot-100_plPL.json rename to assets/locales/plPL/Polyglot-100_plPL.json diff --git a/res/locales/plPL/game.json b/assets/locales/plPL/game.json similarity index 100% rename from res/locales/plPL/game.json rename to assets/locales/plPL/game.json diff --git a/res/locales/ptBR/Polyglot-100_ptBR.json b/assets/locales/ptBR/Polyglot-100_ptBR.json similarity index 100% rename from res/locales/ptBR/Polyglot-100_ptBR.json rename to assets/locales/ptBR/Polyglot-100_ptBR.json diff --git a/res/locales/ptBR/game.json b/assets/locales/ptBR/game.json similarity index 100% rename from res/locales/ptBR/game.json rename to assets/locales/ptBR/game.json diff --git a/res/locales/ptPT/Polyglot-100_ptPT.json b/assets/locales/ptPT/Polyglot-100_ptPT.json similarity index 100% rename from res/locales/ptPT/Polyglot-100_ptPT.json rename to assets/locales/ptPT/Polyglot-100_ptPT.json diff --git a/res/locales/ptPT/game.json b/assets/locales/ptPT/game.json similarity index 100% rename from res/locales/ptPT/game.json rename to assets/locales/ptPT/game.json diff --git a/res/locales/roRO/Polyglot-100_roRO.json b/assets/locales/roRO/Polyglot-100_roRO.json similarity index 100% rename from res/locales/roRO/Polyglot-100_roRO.json rename to assets/locales/roRO/Polyglot-100_roRO.json diff --git a/res/locales/roRO/game.json b/assets/locales/roRO/game.json similarity index 100% rename from res/locales/roRO/game.json rename to assets/locales/roRO/game.json diff --git a/res/locales/ruRU/Polyglot-100_ruRU.json b/assets/locales/ruRU/Polyglot-100_ruRU.json similarity index 100% rename from res/locales/ruRU/Polyglot-100_ruRU.json rename to assets/locales/ruRU/Polyglot-100_ruRU.json diff --git a/res/locales/ruRU/game.json b/assets/locales/ruRU/game.json similarity index 100% rename from res/locales/ruRU/game.json rename to assets/locales/ruRU/game.json diff --git a/res/locales/svSE/Polyglot-100_svSE.json b/assets/locales/svSE/Polyglot-100_svSE.json similarity index 100% rename from res/locales/svSE/Polyglot-100_svSE.json rename to assets/locales/svSE/Polyglot-100_svSE.json diff --git a/res/locales/svSE/game.json b/assets/locales/svSE/game.json similarity index 100% rename from res/locales/svSE/game.json rename to assets/locales/svSE/game.json diff --git a/res/locales/thTH/Polyglot-100_thTH.json b/assets/locales/thTH/Polyglot-100_thTH.json similarity index 100% rename from res/locales/thTH/Polyglot-100_thTH.json rename to assets/locales/thTH/Polyglot-100_thTH.json diff --git a/res/locales/thTH/game.json b/assets/locales/thTH/game.json similarity index 100% rename from res/locales/thTH/game.json rename to assets/locales/thTH/game.json diff --git a/res/locales/tiles.csv b/assets/locales/tiles.csv similarity index 100% rename from res/locales/tiles.csv rename to assets/locales/tiles.csv diff --git a/res/locales/trTR/Polyglot-100_trTR.json b/assets/locales/trTR/Polyglot-100_trTR.json similarity index 100% rename from res/locales/trTR/Polyglot-100_trTR.json rename to assets/locales/trTR/Polyglot-100_trTR.json diff --git a/res/locales/trTR/game.json b/assets/locales/trTR/game.json similarity index 100% rename from res/locales/trTR/game.json rename to assets/locales/trTR/game.json diff --git a/res/locales/zhCN/Polyglot-100_zhCN.json b/assets/locales/zhCN/Polyglot-100_zhCN.json similarity index 100% rename from res/locales/zhCN/Polyglot-100_zhCN.json rename to assets/locales/zhCN/Polyglot-100_zhCN.json diff --git a/res/locales/zhCN/game.json b/assets/locales/zhCN/game.json similarity index 100% rename from res/locales/zhCN/game.json rename to assets/locales/zhCN/game.json diff --git a/res/locales/zhTW/Polyglot-100_zhTW.json b/assets/locales/zhTW/Polyglot-100_zhTW.json similarity index 100% rename from res/locales/zhTW/Polyglot-100_zhTW.json rename to assets/locales/zhTW/Polyglot-100_zhTW.json diff --git a/res/locales/zhTW/game.json b/assets/locales/zhTW/game.json similarity index 100% rename from res/locales/zhTW/game.json rename to assets/locales/zhTW/game.json diff --git a/res/raw/Creature_raw_doc.md b/assets/raw/Creature_raw_doc.md similarity index 100% rename from res/raw/Creature_raw_doc.md rename to assets/raw/Creature_raw_doc.md diff --git a/res/raw/Faction_doc.txt b/assets/raw/Faction_doc.txt similarity index 100% rename from res/raw/Faction_doc.txt rename to assets/raw/Faction_doc.txt diff --git a/res/raw/ReligionSphereRelations.csv b/assets/raw/ReligionSphereRelations.csv similarity index 100% rename from res/raw/ReligionSphereRelations.csv rename to assets/raw/ReligionSphereRelations.csv diff --git a/res/raw/creatures/CreatureHuman.json b/assets/raw/creatures/CreatureHuman.json similarity index 100% rename from res/raw/creatures/CreatureHuman.json rename to assets/raw/creatures/CreatureHuman.json diff --git a/res/raw/factions/FactionGenericPlayer.json b/assets/raw/factions/FactionGenericPlayer.json similarity index 100% rename from res/raw/factions/FactionGenericPlayer.json rename to assets/raw/factions/FactionGenericPlayer.json diff --git a/res/raw/factions/FactionSigrid.json b/assets/raw/factions/FactionSigrid.json similarity index 100% rename from res/raw/factions/FactionSigrid.json rename to assets/raw/factions/FactionSigrid.json diff --git a/res/raw/factions/FactionWildHamletTemplate.json b/assets/raw/factions/FactionWildHamletTemplate.json similarity index 100% rename from res/raw/factions/FactionWildHamletTemplate.json rename to assets/raw/factions/FactionWildHamletTemplate.json diff --git a/res/raw/weathers/WeatherGeneric.json b/assets/raw/weathers/WeatherGeneric.json similarity index 100% rename from res/raw/weathers/WeatherGeneric.json rename to assets/raw/weathers/WeatherGeneric.json diff --git a/res/raw/weathers/WeatherHellish.json b/assets/raw/weathers/WeatherHellish.json similarity index 100% rename from res/raw/weathers/WeatherHellish.json rename to assets/raw/weathers/WeatherHellish.json diff --git a/res/sounds/ambient/.gitattributes b/assets/sounds/ambient/.gitattributes similarity index 100% rename from res/sounds/ambient/.gitattributes rename to assets/sounds/ambient/.gitattributes diff --git a/res/sounds/ambient/ambient_forest_01.ogg b/assets/sounds/ambient/ambient_forest_01.ogg similarity index 100% rename from res/sounds/ambient/ambient_forest_01.ogg rename to assets/sounds/ambient/ambient_forest_01.ogg diff --git a/res/sounds/ambient/ambient_meadow_01.ogg b/assets/sounds/ambient/ambient_meadow_01.ogg similarity index 100% rename from res/sounds/ambient/ambient_meadow_01.ogg rename to assets/sounds/ambient/ambient_meadow_01.ogg diff --git a/res/sounds/ambient/ambient_windy_01.ogg b/assets/sounds/ambient/ambient_windy_01.ogg similarity index 100% rename from res/sounds/ambient/ambient_windy_01.ogg rename to assets/sounds/ambient/ambient_windy_01.ogg diff --git a/res/sounds/ambient/ambient_woods_01.ogg b/assets/sounds/ambient/ambient_woods_01.ogg similarity index 100% rename from res/sounds/ambient/ambient_woods_01.ogg rename to assets/sounds/ambient/ambient_woods_01.ogg diff --git a/res/sounds/ambient/crickets_01.ogg b/assets/sounds/ambient/crickets_01.ogg similarity index 100% rename from res/sounds/ambient/crickets_01.ogg rename to assets/sounds/ambient/crickets_01.ogg diff --git a/res/sounds/ambient/crickets_02.ogg b/assets/sounds/ambient/crickets_02.ogg similarity index 100% rename from res/sounds/ambient/crickets_02.ogg rename to assets/sounds/ambient/crickets_02.ogg diff --git a/res/graphics/fonts/thai_fullwidth.png b/res/graphics/fonts/thai_fullwidth.png deleted file mode 100644 index abff042a90b4f88961c8d5f459bbc8263c122fe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21678 zcmeI42|Sct+rV#2g;J6dD$|J8F^j>N?7JQ!yGo3i!7y7hV@=Ycl(Lj1SyCz#t;$lC ziYQwYipoy5NF+=8Ze&tV&->2%J@5B@zxVge{li?&xvuM+`+v^4&UJ1-_i?lB2Esy; zLI3~=8yV`FgP&pGx3>Tv_;XWeFcJI^q#N2X0bqsf)Hjcj`MLoB5Hca@=$M(g(pWU6 zD~%2@($Rs?88l}S8MN@OkGJr$Ju|XGy>W!N#9I5+z^!QVK>#X~CQu?`cTwatfIA{0 zs#z2mBxEhNd}*AaRpFr;A;b8fmc$KNE?Osob_QGR#(a=|lYDo-Z+~Ckc-{De&bZEr z3ZKd)0ZT>Y!aFXy0V?K!s@PZ3p{9m~Pjdr!mm4=z zs8$fmihM5VH8{}JvbNh_pI#y}YH5 zaPB1c4;5XUbRVEW)z^M(oP2PSmmd(>UfEyo(B59lM=$2N>5=cAx(lec23#9Q?G+jX z6L$(d_ZP8RUqd!lwV-e9-m?6}N896BW>Ax2pKSAR-L+36 zTSU7Kpgu}ReHA?8B@Cn;H7(eFZ^7MCa)JK`9^T-^w$+}1rvE3{Ny&xbfQSnk(H8`MR2m z))lCVXwPp8SS55}Wt5hLWdZgT|J|E>l8H;tHH&0CL}G+Hn?!dX?4gU#cU+n9Xyt>W zg8W(~0?Tk~u|Z3nLS8{D1jJ)P_@OvM^yz?0kgg!H9nhi@#wFfVZMSfHLzzJsLrmq= zZq2cK!4~V+xUL~2aMlImp#pJ3# z-g~fs{U<{30aeJw&L>~vcAq?^=Xl&!Qm%LfzTH;QI#dzA+E&?fxl};{u3umsZ*ah} zUV%MFL>`e3g@qZ|8r$lm$o9%)h~@~`2p&Fye6${VCdD*E)>m}2(Ax=nE6i3uP42_m zHER=O_pD#M%;AjTy2VdVw`~_%D;tI~T4>~M*kA~|WN}HoT7(p5EY}l8dHSwR;C4V7 zBsx4ZY)P2u>G7wJ+cL$lML{jbf*04BUy2ajrbyIi=f8X&r5%%abw_z>!b^dxLD=&< zjVOtpW^jvRsmstF=VZ%cSLl>pf+f{FKSy#Qjkv8& zuSLQ~g%1}SI&F|}m)IwfyfRY)9%FoE-izp%5=%rKN-D-@8rLH;Qg|10eMoH_lupr@bL6 zHF53b}MVEAA{vl=1HbM=(*I4ewFN*0IvBpdUnk2@2auGtSTo#0RBD@d|HTww$Y4{!Ac#`A(@ZM46oNn%boyM=J#yMf_=3 zMvc45?g<1n8IXgrq)8Gn;-mY;Hf};)mG9n>VZqwV8rf2t)@C>Ek{j|dH1%Zm)&{qG z3{RIdH?lby-y541kaacdp!cyadLN@jSScpRVgpU}@-CjbxZ_r4 z);87C9r4zYpD}N@?$;S}J!-1&@kBw;)O@o~xWwsfnNKFxy0!1pDqrt?4O5ATi-=1y z7bZnzY_3COZpbus-n{vYaGOsD<(br(W6ws~WJZ~v8kUm-jjNI}%&(g*USSMR+3dY* zw79LvRmm7A|EbHc-S6SY6ADf{0diPhz1Y3xE$s_H}a|qs~ zf$IIGuBEr5zM8eznp+LJ`MennF+W^=`LfRDLpJEh)QG30)aye#v+>Jukp!!Lx9FN( z)(19;M>?d@(^9T~xv8Jk(PFdRp~i36hf-hvZd>NFz8=G#OFh)I5xe{w+j8BsYMvh* z5Kfo+c&c5>fwJu#>w>S_a7cMZ`Ll99MVw;auCjY+4TBeyl0N&!AFwaA{+fO*Gw-!r zeQo|*uYI2uA6~tD>%0Dl-UoL#d)v6@>g^wPMvpyJSI*dI1^sY11e&7Lp z2s+}_Ae;F|y4rO$1AqG0X2To1Xg$P{(mos2>#QM@o~>2=FAj{k71S{6zSPOvpZCe_ zf6^1S~K5;Lh55{loeM7x(Oyt#n?Orgpr29a|KdV2du{c*cX2XQ$ zq}ivcF?@0IbJG#^PQS?s_{fn@_V{`>h*2#KHuwNW%dn9y~It|UWW2GPQIyCvS&9j`)wYN!jT zdSgKc6e0@;@urZeOsuyWblNW#l&6Z}P{_0j%UunsHPs-**2D~=Lt_vjit2zWS=Or#L0 zEGB4&{H+~`)Wn2s`rGCxl;2u1S$dw}9egM9TT7;;51j}%Co*Xs3_MZK6YPo1?>f(9 znG=7&<-irF{#!@%*@MjQ`^B#QON=a%^Ivpis^%}vh~A{XFq^8GF`J%KGefNkQpf5r zh&UFFVM(Kr)n}&bk7F2k3Y(gqkPRj{Jc&AWHruEQ|JCTn)cN6$sEcC})j?Y&7(y9_ zRJKGaVUZ~CYcoOxi$KhAGNbv64-;@15pXQrPhLG_K_qB2=HDxPShs}2^(lSl+C-q{(i zjKd>g2nHRL3Wg`5FbD-a4y~lDJdMM|WUl$2Td~dqhL-rGzO`pg2y1y$k~SGIQvsWrVKD4r{c(S zbf)fw05(R%A)JVcI5Z58QNqK}N;t4F1)>rRr=m)PEIXPiaFf>=WFvV~0Q*)sx8hSArlIYH?s%OJp$Bof$L= z1V^WnNqF2;K!tl!3E%TV_C5q*(I9g+%Ng=>eEcuYQv#7e`d6aNoL=H*F+u*r?)mS> zRgUr%?%Mo$Pn_8)f6iKFGoe3cIa7HunC|J$%uoHPRW-HI{_~^;%uB!{2X@YWHk)R0 z8d85T|7kUT_YNkOvzg| zn(pc^#dEBt&Y3e0h#HpM6wdhxEGm<(!)DmNUzA&NGndX)#j@K4AeL?!ehkcjn9(_POBSFZ{Trf4^_GM{Xl*6r2cL zT%1s1>u_u_U<9!K4D)^EFFYs*$_@o2}@J$L3yrH=X z0QiEh^a?l(0Hfc)&n^J)Kmb6uBLHB}0)RN}v_p|T0Pq23#+G{DzI_AVT>$=^dJhBl z;u83OMqp88Qxka0d@S?r7T_YNdnT*}0P}Vk>1tVe*Z1yv9o4&G(V6bSZ|BM7e2$9< z*Iq^?oEg%|wp)(SS30s}cTcutg4A>2_w$E7c1l0ikUKbBtf{k9b)j6uZusM<=mX02 zw~SW0Uk*AJpcx?@-~`)UeNtrYO(G8rUbl-@9He#D?eb#N?WL5?gri#mfaSLtHbO-0 zts*B~)jD$o9$9XFFLL>44#d3A)>?O2&X)d@i7^4H=%EjmLKZ;#T}9T;K!mnXcOm$X z)|G((md`QfzLIzL$wLTb1;HK13hcVIl4Hxd;}; z-3LmEjsvLdb2}2O8gThCHyh*tnfQyw8&f~>orr;$D8<3+XiJKw-Ix-UxX{_pR~kOl{3gRw@s! z+_!(WDlf%&nNaRd$Ce}fZsD=f%byDpcL#?Z(kLT#lpfSuo!HPr#2^NZnvzc2?Q!WT zdBKQJPZI970_+7U%2(1fY3AMiV?(ddK8*_sDf$CnH|~-=-{ijz^kmgn@loD6)+PJFUx=s?Harfie)JNsTWeikDRNRMkWYBC zZn*V(vGfd!T_)kzL;YTl=0C}nDjmwb_sUTHn7t9=Ki=ch#k?;$3CoH}uygWdCqc`iBsU#(+J3lfpcQ zW!&6`<8s#wCmgp}opkf?TIx_{r-hX~OHFr`dbc9HJeU)Wur(B1k zu4muYH(B4(3FtNSHJ=@pNxH1SkQv9zxx8zA)I%whl=eO3@g*K6ZMU#_!Cu5X;rm77 z3-1Sn$h2UJKaJwi^9on`^(=n;LVuzwqp}jVcWBkoJEJcp{64rRoF^6)d>n1 zvoDqf`rba(a8yy}MaCZx_a{96fEk_&GRgq>dbE_Gw>krrMLWmrPKK_3SI56n_AKv_ zVUwb=A@ps!gzS^2!Jj(nvSY7Zo~W^ybga1HXG2@mC;H{-2Cqkt?w%ftNpk3*`VZsP*Q@2FH>Vo{oNgys+)t!OJqASCm7PF(qalrPtCN zGd-WX;rkH=sc(l8E#XNS!4j}Q(bs}_Sna$oP_5veqc6lS!H9V_ pYPFJi_JuL~@|Cs5nE{hhK%nx&)@@!M@TrZ)NN>CDb#2E({{`++Gxq=h diff --git a/res/musicbox_test/dragonborn.mid b/res/musicbox_test/dragonborn.mid deleted file mode 100755 index 90e219069ad82fa9edfcf7a72d4a5819f31fde52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12301 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 DlF_ob diff --git a/src/net/torvald/colourutil/ColourTemp.kt b/src/net/torvald/colourutil/ColourTemp.kt index d6e6998ac..9ae7b06b6 100644 --- a/src/net/torvald/colourutil/ColourTemp.kt +++ b/src/net/torvald/colourutil/ColourTemp.kt @@ -7,7 +7,7 @@ import org.newdawn.slick.Image * Created by minjaesong on 16-07-26. */ object ColourTemp { - private var envOverlayColourmap = Image("./res/graphics/colourmap/black_body_col_1000_40000_K.png") + private var envOverlayColourmap = Image("./assets/graphics/colourmap/black_body_col_1000_40000_K.png") 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 232461064..aba08f639 100644 --- a/src/net/torvald/imagefont/GameFontWhite.kt +++ b/src/net/torvald/imagefont/GameFontWhite.kt @@ -12,50 +12,50 @@ constructor() : GameFontBase() { init { GameFontBase.hangulSheet = SpriteSheet( - "./res/graphics/fonts/han_johab.png", GameFontBase.W_CJK, GameFontBase.H_HANGUL) + "./assets/graphics/fonts/han_johab.png", GameFontBase.W_CJK, GameFontBase.H_HANGUL) GameFontBase.asciiSheet = SpriteSheet( - "./res/graphics/fonts/ascii_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/ascii_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.asciiSheetEF = SpriteSheet( - "./res/graphics/fonts/ascii_special_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/ascii_special_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.runicSheet = SpriteSheet( - "./res/graphics/fonts/futhark.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/futhark.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.extASheet = SpriteSheet( - "./res/graphics/fonts/LatinExtA_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/LatinExtA_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.extASheetEF = SpriteSheet( - "./res/graphics/fonts/LatinExtA_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/LatinExtA_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.kanaSheet = SpriteSheet( - "./res/graphics/fonts/kana.png", GameFontBase.W_CJK, GameFontBase.H_KANA) + "./assets/graphics/fonts/kana.png", GameFontBase.W_CJK, GameFontBase.H_KANA) GameFontBase.cjkPunct = SpriteSheet( - "./res/graphics/fonts/cjkpunct.png", GameFontBase.W_CJK, GameFontBase.H_KANA) + "./assets/graphics/fonts/cjkpunct.png", GameFontBase.W_CJK, GameFontBase.H_KANA) /*uniHan = new SpriteSheet( - "./res/graphics/fonts/unifont_unihan" + "./assets/graphics/fonts/unifont_unihan" + ((!terrarum.gameLocale.contains("zh")) ? "_ja" : "") +".png" , W_UNIHAN, H_UNIHAN );*/ GameFontBase.cyrilic = SpriteSheet( - "./res/graphics/fonts/cyrilic_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/cyrilic_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.cyrilicEF = SpriteSheet( - "./res/graphics/fonts/cyrilic_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/cyrilic_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.fullwidthForms = SpriteSheet( - "./res/graphics/fonts/fullwidth_forms.png", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN) + "./assets/graphics/fonts/fullwidth_forms.png", GameFontBase.W_UNIHAN, GameFontBase.H_UNIHAN) GameFontBase.uniPunct = SpriteSheet( - "./res/graphics/fonts/unipunct.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/unipunct.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.wenQuanYi_1 = SpriteSheet( - "./res/graphics/fonts/wenquanyi_11pt_part1.png", 16, 18, 2) + "./assets/graphics/fonts/wenquanyi_11pt_part1.png", 16, 18, 2) GameFontBase.wenQuanYi_2 = SpriteSheet( - "./res/graphics/fonts/wenquanyi_11pt_part2.png", 16, 18, 2) + "./assets/graphics/fonts/wenquanyi_11pt_part2.png", 16, 18, 2) GameFontBase.greekSheet = SpriteSheet( - "./res/graphics/fonts/greek_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/greek_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.greekSheetEF = SpriteSheet( - "./res/graphics/fonts/greek_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/greek_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.romanianSheet = SpriteSheet( - "./res/graphics/fonts/romana_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/romana_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) GameFontBase.romanianSheetEF = SpriteSheet( - "./res/graphics/fonts/romana_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) + "./assets/graphics/fonts/romana_ef.png", GameFontBase.W_LATIN_NARROW, GameFontBase.H) GameFontBase.thaiSheet = SpriteSheet( - "./res/graphics/fonts/thai_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) + "./assets/graphics/fonts/thai_fullwidth.png", GameFontBase.W_LATIN_WIDE, GameFontBase.H) val shk = arrayOf( GameFontBase.asciiSheet, diff --git a/src/net/torvald/imagefont/TinyAlphNum.kt b/src/net/torvald/imagefont/TinyAlphNum.kt index 44f9d83de..3d55c4862 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("./res/graphics/fonts/alphanumeric_small.png", W, H) + fontSheet = SpriteSheet("./assets/graphics/fonts/alphanumeric_small.png", W, H) chars.forEachIndexed { i, c -> mappingTable[c.toInt()] = i } } diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt index 26c2645a6..9cdf62580 100644 --- a/src/net/torvald/terrarum/DefaultConfig.kt +++ b/src/net/torvald/terrarum/DefaultConfig.kt @@ -56,7 +56,7 @@ object DefaultConfig { val keyquickbars = JsonArray(); for (i in 2..11) keyquickbars.add(i) // NUM_1 to NUM_0 jsonObject.add("keyquickbars", keyquickbars) - + jsonObject.addProperty("pcgamepadenv", "console") return jsonObject diff --git a/src/net/torvald/terrarum/StateFontTester.kt b/src/net/torvald/terrarum/StateFontTester.kt index 2a8a552fc..179b18a15 100644 --- a/src/net/torvald/terrarum/StateFontTester.kt +++ b/src/net/torvald/terrarum/StateFontTester.kt @@ -1,5 +1,6 @@ package net.torvald.terrarum +import net.torvald.imagefont.GameFontWhite import org.newdawn.slick.Font import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics @@ -17,6 +18,8 @@ class StateFontTester : BasicGameState() { override fun init(gc: GameContainer, game: StateBasedGame) { canvas = Graphics(1024, 1024) + + gameFont = GameFontWhite() } override fun update(gc: GameContainer, game: StateBasedGame, delta: Int) { @@ -24,7 +27,8 @@ class StateFontTester : BasicGameState() { } override fun render(gc: GameContainer, game: StateBasedGame, g: Graphics) { - + g.font = gameFont + g.drawString(textToPrint, 10f, 10f) } override fun getID(): Int = Terrarum.SCENE_ID_TEST_FONT diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 73fc3445a..e72caa8fc 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -94,9 +94,9 @@ constructor() : BasicGameState() { @Throws(SlickException::class) override fun init(gameContainer: GameContainer, stateBasedGame: StateBasedGame) { // load necessary shaders - shader12BitCol = Shader.makeShader("./res/4096.vrt", "./res/4096.frg") - shaderBlurH = Shader.makeShader("./res/blurH.vrt", "./res/blur.frg") - shaderBlurV = Shader.makeShader("./res/blurV.vrt", "./res/blur.frg") + shader12BitCol = Shader.makeShader("./assets/4096.vrt", "./assets/4096.frg") + shaderBlurH = Shader.makeShader("./assets/blurH.vrt", "./assets/blur.frg") + shaderBlurV = Shader.makeShader("./assets/blurV.vrt", "./assets/blur.frg") // init map as chosen size world = GameWorld(8192, 2048) diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index 1a0b7d443..b87c0a13a 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -46,6 +46,17 @@ constructor(gamename: String) : StateBasedGame(gamename) { gameLocale = gameLocaleFromConfig println("[terrarum] Locale: " + gameLocale) + + try { + Controllers.getController(0) + environment = if (getConfigString("pcgamepadenv") == "console") + RunningEnvironment.CONSOLE + else + RunningEnvironment.PC + } + catch (e: IndexOutOfBoundsException) { + environment = RunningEnvironment.PC + } } @Throws(SlickException::class) @@ -63,8 +74,8 @@ constructor(gamename: String) : StateBasedGame(gamename) { } ingame = StateInGame() - addState(ingame) - //addState(StateMonitorCheck()) + //addState(ingame) + addState(StateMonitorCheck()) } companion object { @@ -111,6 +122,8 @@ constructor(gamename: String) : StateBasedGame(gamename) { lateinit var defaultSaveDir: String private set + lateinit var environment: RunningEnvironment + private val localeSimple = arrayOf("de", "en", "es", "it") var gameLocale = "####" // locale override set(value) { @@ -335,9 +348,9 @@ constructor(gamename: String) : StateBasedGame(gamename) { private fun getConfigMaster(key: String): Any { var cfg: Any? = null - try { cfg = gameConfig[key]!! } + try { cfg = gameConfig[key.toLowerCase()]!! } catch (e: NullPointerException) { - try { cfg = DefaultConfig.fetch()[key] } + try { cfg = DefaultConfig.fetch()[key.toLowerCase()] } catch (e1: NullPointerException) { e.printStackTrace() } } return cfg!! @@ -372,3 +385,7 @@ fun setBlendScreen() { fun setBlendDisable() { GL11.glDisable(GL11.GL_BLEND) } + +enum class RunningEnvironment { + PC, CONSOLE, MOBILE +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt index 7eeef68e2..0287d1555 100644 --- a/src/net/torvald/terrarum/audio/AudioMixer.kt +++ b/src/net/torvald/terrarum/audio/AudioMixer.kt @@ -1,9 +1,12 @@ package net.torvald.terrarum.audio +import org.lwjgl.BufferUtils import org.lwjgl.openal.AL10 +import org.newdawn.slick.Music import org.newdawn.slick.openal.Audio import org.newdawn.slick.openal.AudioImpl import org.newdawn.slick.openal.MODSound +import org.newdawn.slick.openal.StreamSound import java.util.* /** @@ -12,10 +15,10 @@ import java.util.* object AudioMixer { const val TRACK_COUNT = 32 - const val TRACK_AMBIENT_ONE = 0 - const val TRACK_AMBIENT_ONE_NEXT = 1 - const val TRACK_AMBIENT_TWO = 2 - const val TRACK_AMBIENT_TWO_NEXT = 3 + const val TRACK_AMBIENT_ONE = 0 // music track one + const val TRACK_AMBIENT_ONE_NEXT = 1 // music track two + const val TRACK_AMBIENT_TWO = 2 // music track three + const val TRACK_AMBIENT_TWO_NEXT = 3 // music track four const val TRACK_UI_ONE = 8 const val TRACK_UI_TWO = 9 @@ -23,14 +26,18 @@ object AudioMixer { const val TRACK_SFX_START = 16 const val TRACK_SFX_END = 31 - val tracks = ArrayList(TRACK_COUNT) + val tracks = ArrayList(TRACK_COUNT) // stores index of ALSource init { - + tracks[TRACK_AMBIENT_ONE] } fun getAudio(track: Int) = tracks[track] + fun play(channel: Int) { + + } + /** * Queue an SFX to any empty SFX track and play it. */ @@ -38,11 +45,12 @@ object AudioMixer { } - fun update() { + fun update(delta: Int) { } + class MixerTrack(val audio: Audio, var volume: Float, var pan: Float) { } -} \ No newline at end of file +} diff --git a/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt b/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt index 566be4a3b..68e5d89e0 100644 --- a/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt +++ b/src/net/torvald/terrarum/audio/AudioResourceLibrary.kt @@ -2,6 +2,7 @@ package net.torvald.terrarum.audio import org.newdawn.slick.openal.Audio import org.newdawn.slick.openal.AudioLoader +import java.io.File import java.io.FileInputStream import java.util.* @@ -10,22 +11,25 @@ import java.util.* */ object AudioResourceLibrary { + // will play as music val ambientsForest = ArrayList