diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 43b000d95..b87105a8d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/res/graphics/sky_colour.png b/res/graphics/sky_colour.png index 240210244..ec6f98716 100644 Binary files a/res/graphics/sky_colour.png and b/res/graphics/sky_colour.png differ diff --git a/res/graphics/sprites/test_player_2.png b/res/graphics/sprites/test_player_2.png new file mode 100644 index 000000000..a229c871a Binary files /dev/null and b/res/graphics/sprites/test_player_2.png differ diff --git a/res/locales/helpOnTheFly.csv b/res/locales/helpOnTheFly.csv new file mode 100644 index 000000000..fdf9dcae4 --- /dev/null +++ b/res/locales/helpOnTheFly.csv @@ -0,0 +1,14 @@ +"STRING_ID";"IETF language tag(s) without dash";"enUS";"frFR";"esES";"deDE";"itIT";"ptBR";"ptPT";"ruRU";"elGR";"trTR";"daDK";"noNB";"svSE";"nlNL";"plPL";"fiFI";"jaJP";"zhCN";"zhTW";"koKR";"csCZ";"huHU";"roRO";"thTH";"bgBG";"heIL";"jakanaJP";"isIC" + +"HELP_OTF_MAIN_TEXT_1";;"Type “help slow” for the ways to make the game run faster.";;;;;;;;;;;;;;;;;;;"게임이 느리게 돌아간다면 “help slow”를 입력해 보세요." +"HELP_OTF_MAIN_TEXT_2";;"Press PageUp/PageDown to scroll the messages.";;;;;;;;;;;;;;;;;;;"PageUp/PageDown 키를 사용해 메시지를 스크롤할 수 있습니다." +"HELP_OTF_MAIN_TEXT_3";;"Utility keys:";;;;;;;;;;;;;;;;;;;"기능 키:" +"HELP_OTF_MAIN_TEXT_4";;"• F3: basic information";;;;;;;;;;;;;;;;;;;"• F3: 기본 정보" +"HELP_OTF_MAIN_TEXT_5";;"• F7: (debug only) toggle light blending";;;;;;;;;;;;;;;;;;;"• F7: (디버그용) 광원 블렌딩 켜고 끄기" +"HELP_OTF_MAIN_TEXT_6";;"• F8: toggle smooth lighting";;;;;;;;;;;;;;;;;;;"• F8: 부드러운 광원 켜고 끄기" + +"HELP_OTF_SLOW_TEXT_1";;"To make your game run faster:";;;;;;;;;;;;;;;;;;;"게임을 빠르게 하려면" +"HELP_OTF_SLOW_TEXT_2";;"• Reset screen zoom to 1.";;;;;;;;;;;;;;;;;;;"• 화면 줌을 1로 돌려주세요. " +"HELP_OTF_SLOW_TEXT_3";;"• Turn off basic information window using F3.";;;;;;;;;;;;;;;;;;;"• F3을 눌러 기본 정보 창을 꺼 주세요." +"HELP_OTF_SLOW_TEXT_4";;"• Turn off smooth lighting. You can do it now by pressing F8.";;;;;;;;;;;;;;;;;;;"• 부드러운 광원 효과를 꺼 주세요. F8을 사용할 수 있습니다." + diff --git a/res/locales/nameset_scandinavian_m.csv b/res/locales/nameset_scandinavian_m.csv index a02e7faac..dfa77060c 100644 --- a/res/locales/nameset_scandinavian_m.csv +++ b/res/locales/nameset_scandinavian_m.csv @@ -155,7 +155,7 @@ "NAMESET_SCAN_M_150";"Thomas";"토마스"; "NAMESET_SCAN_M_151";"Tim";"팀"; "NAMESET_SCAN_M_152";"Tobias";"토비아스"; -"NAMESET_SCAN_M_153";"Tor";"토드"; +"NAMESET_SCAN_M_153";"Tor";"토르"; "NAMESET_SCAN_M_154";"Truls";"트룰스"; "NAMESET_SCAN_M_155";"Ulrik";"울프릭"; "NAMESET_SCAN_M_156";"Valdemar";"발데마르"; diff --git a/res/locales/polyglot.csv b/res/locales/polyglot.csv index f729ac9bd..ff5a0bbcd 100644 --- a/res/locales/polyglot.csv +++ b/res/locales/polyglot.csv @@ -397,7 +397,7 @@ "MENU_LABEL_MORE";"";"More";"Plus";"Más";"Mehr";"Altro";"Mais";"Mais";"Ещё";"Περισσότερα";"Daha Fazla";"Mere";"Mer";"Mer";"Meer";"Więcej";"Lisää";"詳細";"更多";"更多";"다른";"Více";"Több";"Mai multe";"แสดงมากขึ้น";"Още";"עוד" "MENU_LABEL_MUSIC";"";"Music";"Musique";"Música";"Musik";"Musica";"Música";"Música";"Музыка";"Μουσική";"Müzik";"Musik";"Musikk";"Musik";"Muziek";"Muzyka";"Musiikki";"音楽";"音乐";"音樂";"음악";"Hudba";"Zene";"Muzică";"เพลง";"Музика";"מוזיקה" "MENU_LABEL_MUSIC_PLAYER";"";"Music Player";"Lecteur de musique";"Reproductor de música";"Musikspieler";"Lettore musicale";"Reprodutor de Música";"Leitor de Música";"Музыкальный плеер";"Music Player";"Müzik Oynatıcı";"Musikafspiller";"Musikkspiller";"Musikspelare";"Muziekspeler";"Odtwarzacz Muzyki";"Musiikinsoitin";"音楽プレーヤー";"音乐播放器";"音樂播放器";"음악 재생기";"Hudební přehrávač";"Zene lejátszó";"Player muzical";"เครื่องมือเล่นเพลง";"Музикален плейър";"נגן מוזיקה" -"MENU_LABEL_NEW_GAME";"";"New Game";"Nouvelle partie";"Juego nuevo";"Neues Spiel";"Nuova partita";"Novo Jogo";"Novo Jogo";"Новая игра";"Νέο παιχνίδι";"Yeni Oyun";"Nyt Spil";"Nytt Spill";"Nytt spel";"Nieuw spel";"Nowa Gra";"Uusi peli";"新しいゲーム";"新游戏";"新游戲";"새 게임";"Nová hra";"Új játék";"Joc nou";"เริ่มเกมใหม่";"Нова игра";"משחק חדש" +"MENU_LABEL_NEW_GAME";"";"New Game";"Nouvelle partie";"Juego nuevo";"Neues Spiel";"Nuova partita";"Novo Jogo";"Novo Jogo";"Новая игра";"Νέο παιχνίδι";"Yeni Oyun";"Nyt Spil";"Nytt Spill";"Nytt spel";"Nieuw spel";"Nowa Gra";"Uusi peli";"新しいゲーム";"新游戏";"新游戲";"새 게임";"Nová hra";"Új játék";"Joc nou";"เริ่มเกมใหม่";"Нова игра";"משחק חדש";"あたらしいゲーム";Nýr leikur" "MENU_LABEL_NEXT";"";"Next";"Suivant";"Siguiente";"Weiter";"Avanti";"Próximo";"Próximo";"След.";"Επόμενο";"Sonraki";"Næste";"Neste";"Nästa";"Volgende";"Dalej";"Seuraava";"次へ";"下一个";"下一個";"다음";"Další";"Következő";"Următorul";"ต่อไป";"Нататък";"הבא" "MENU_LABEL_NEXT_TRACK";"Next music track/song";"Next track";"Piste suivante";"Siguiente canción";"Nächster Titel";"Traccia successiva";"Próxima música";"Próxima música";"След. трек";"Επόμενο κομμάτι";"Sonraki parça";"Næste nummer";"Neste spor";"Nästa låt";"Volgend nummer";"Nastepny utwór";"Seuraava kappale";"次の曲";"下一个曲目";"下一個曲目";"다음 곡";"Další skladba";"Következő dal";"Melodia următoare";"เพลงต่อไป";"Следваща песен";"שיר הבא" "MENU_LABEL_NO";"";"No";"Non";"No";"Nein";"No";"Não";"Não";"Нет";"Όχι";"Hayır";"Nej";"Nei";"Nej";"Nee";"Nie";"Ei";"いいえ";"否";"否";"아니요";"Ne";"Nem";"Nu";"ไม่ใช่่";"Не";"לא";"いいえ";"Nei" @@ -433,7 +433,7 @@ "MENU_LABEL_VOICES";"";"Voices";"Voix";"Voces";"Stimmen";"Voci";"Vozes";"Vozes";"Голоса";"Ομιλία";"Konuşmalar";"Stemmer";"Stemmer";"Röster";"Stemmen";"Mowa";"Äänet";"ボイス";"声音";"聲音";"음성";"Hlasy";"Párbeszédek";"Voce";"เสียงพูด";"Говор";"קולות" "MENU_LABEL_WARNING";"";"Warning";"Avertissement";"Aviso";"Warnung";"Attenzione";"Aviso";"Aviso";"Внимание!";"Προειδοποίηση";"Uyarı";"Advarsel";"Advarsel";"Varning";"Waarschuwing";"Uwaga";"Varoitus";"警告";"注意";"注意";"경고";"Upozornění";"Figyelem!";"Atenție!";"คำเตือน";"Внимание";"אזהרה" "MENU_LABEL_WELCOME";"";"Welcome";"Bienvenue";"Bienvenido";"Willkommen";"Benvenuto";"Bem vindo";"Bem-vindo";"Добро пожаловать";"Καλωσήρθατε";"Hoşgeldiniz";"Velkommen";"Velkommen";"Välkommen";"Welkom";"Witaj";"Tervetuloa";"ようこそ";"欢迎";"歡迎";"환영합니다";"Vítejte";"Üdvözölünk";"Bine ai venit";"ยินดีต้อนรับ";"Привет";"שלום" -"MENU_LABEL_WORLD";"";"World";"Monde";"Mundo";"Welt";"Mondo";"Mundo";"Mundo";"Мир";"Κόσμος";"Dünya";"Verden";"Verden";"Värld";"Wereld";"Świat";"Maailma";"ワールド";"世界";"世界";"세계";"Svět";"Világ";"Lume";"โลก";"Свят";"עולם" +"MENU_LABEL_WORLD";"";"World";"Monde";"Mundo";"Welt";"Mondo";"Mundo";"Mundo";"Мир";"Κόσμος";"Dünya";"Verden";"Verden";"Värld";"Wereld";"Świat";"Maailma";"ワールド";"世界";"世界";"세계";"Svět";"Világ";"Lume";"โลก";"Свят";"עולם";"せかい";"Heimur" "MENU_LABEL_YEAH";"A more casual 'yes'";"Yeah";"Ouais";"Seh";"Jo";"Si";"Uhum";"Sim";"Ага";"Ναι";"Hee";"Jah";"Ja";"Japp";"Jup";"Tak";"Joo";"いいよ";"好的";"好的";"응";"Jistě";"Ja";"Dap";"ใช่";"Аха";"בסדר" "MENU_LABEL_YES";"";"Yes";"Oui";"Sí";"Ja";"Sì";"Sim";"Sim";"Да";"Ναι";"Evet";"Ja";"Ja";"Ja";"Ja";"Tak";"Kyllä";"はい";"是";"是";"예";"Ano";"Igen";"Da";"ใช่";"Да";"כן";"はい";"Já" "MENU_LABEL_YES_CAPS";"";"YES";"OUI";"SÍ";"JA";"SI";"SIM";"SIM";"ДА";"ΝΑΙ";"EVET";"JA";"JA";"JA";"JA";"TAK";"KYLLÄ";"はい";"是";"是";"예";"ANO";"IGEN";"DA";"ใช่";"ДА";"כן";"はい";"JÁ" diff --git a/res/locales/usermsg.csv b/res/locales/usermsg.csv index c6a1f7c39..34ebe030d 100644 --- a/res/locales/usermsg.csv +++ b/res/locales/usermsg.csv @@ -1,4 +1,6 @@ "STRING_ID";"IETF language tag(s) without dash";"enUS";"frFR";"esES";"deDE";"itIT";"ptBR";"ptPT";"ruRU";"elGR";"trTR";"daDK";"noNB";"svSE";"nlNL";"plPL";"fiFI";"jaJP";"zhCN";"zhTW";"koKR";"csCZ";"huHU";"roRO";"thTH";"bgBG";"heIL";"jakanaJP";"isIC" -"APP_CALIBRATE_YOUR_MONITOR";;"Best player experience can be achieved with properly calibrated monitor. If you have not, please do it before you play.";"Meilleure expérience de joueur peut être réalisé avec écran correctement calibré. Si vous ne l'avez pas, s.v.p. le calibrez avant de jouer.";;;;;;;;;;;;;;;"このゲームは、適切に調整したモニターから最高のプレイができます。調整していなかったら、プレイする前に調整して下さい。";;;"본 게임은 적절히 보정된 모니터에서 최상으로 즐길 수 있습니다. 보정하지 않았다면 플레이하기 전에 보정해 주십시오.";;;;;;;"この　ゲームは　てきせつに　ちょうせい　した　モニターから　さいこうの　プレイが　できます。ちょうせい　して　いなかったら　プレイする　まえに　ちょうせい　して　ください。";"Best leikmaður reynsla er getur náðist með rétt kvarðaður skjárinn. Ef þú ekki gerðir, gerðu svo vel að kvarða áður en þú spilar." -"COPYRIGHT_MSG";;"All rights reserved.";"Tous les droits sont réservés.";;;;;;;;;;;;;;;"全著作権所有。";;;"모든 권리 보유.";;;;;;;"ぜん　ちょさくけん　しょゆう。";"Allur réttur áskilinn." \ No newline at end of file +"APP_CALIBRATE_YOUR_MONITOR";;"Best player experience can be achieved with properly calibrated monitor. If you have not, please do it before you play.";"Meilleure expérience de joueur peut être réalisé avec écran correctement calibré. Si vous ne l'avez pas, s.v.p. le calibrez avant de jouer.";;;;;;;;;;;;;;;"このゲームは、適切に調整したモニターから最高のプレイができます。調整していなかったら、プレイする前に調整して下さい。";;;"본 게임은 적절히 보정된 모니터에서 최상으로 즐길 수 있습니다. 보정하지 않았다면 플레이하기 전에 보정해 주십시오.";;;;;;;"このゲームは　てきせつに　ちょうせいしたモニターから　さいこうのプレイができます。ちょうせいして　いなかったら　プレイするまえに　ちょうせいしてください。";"Best leikmaður reynsla er getur náðist með rétt kvarðaður skjárinn. Ef þú ekki gerðir, gerðu svo vel að kvarða áður en þú leikur." +"COPYRIGHT_MSG";;"All rights reserved.";"Tous les droits sont réservés.";;;;;;;;;;;;;;;"全著作権所有。";;;"모든 권리 보유.";;;;;;;"ぜん　ちょさくけん　しょゆう。";"Allur réttur áskilinn." + +"MENU_LABEL_NEW_WORLD";"";"New world";"Nouveau monde";"Nuevo mundo";"Neue Welt";"Nuovo mondo";"Novo mundo";"Novo mundo";"Новый мир";"Νέο κόσμο";"Yeni Dünya";"Ny verden";"Ny verden";"Ny värld";"Nieuwe wereld";"Nowy Świat";"Uusi maailma";"新しい世界";"新世界";"新世界";"새 세계";"Nový svět";"Új világ";"Lume noua";"โลกใหม่";"Нов свят";"עולם חדש";"あたらしいせかい";"Nýr heimur" diff --git a/res/raw/CreatureHuman.json b/res/raw/CreatureHuman.json index ae349d0cf..66e5fbe71 100644 --- a/res/raw/CreatureHuman.json +++ b/res/raw/CreatureHuman.json @@ -5,20 +5,18 @@ "basemass" : 60.0, "strength" : 1000, - "strengthvariable" : [100,100,100,100,100,100,100], + "strengthmult" : [100,100,100,100,100,100,100], "accel" : 0.32, "speed" : 3.0, - "speedvariable" : [100,100,100,100,100,100,100], + "speedmult" : [100,100,100,100,100,100,100], "jumppower" : 5, - "jumppowervariable" : [100,100,100,100,100,100,100], + "jumppowermult" : [100,100,100,100,100,100,100], "scale" : 1, - "scalevariable" : [100,100,100,100,100,100,100], - - "physiquemult" : [100,100,100,100,100,100,100], + "scalemult" : [100,100,100,100,100,100,100], "encumbrance" : 1000, "basedefence" : "work in progress", diff --git a/res/raw/Creature_raw_doc.txt b/res/raw/Creature_raw_doc.txt index b112e5e09..67a29c1ce 100644 --- a/res/raw/Creature_raw_doc.txt +++ b/res/raw/Creature_raw_doc.txt @@ -15,9 +15,7 @@ speed : walk speed. [px / TARGET_FPS] jumppower : self-explanatory. [-px / TARGET_FPS^2] scale : creature body scale. Mass/strength/accel/etc. will be changed accordingly, hence the prefix “base” for some raw tokens. --variable : variability factor. [array of percentiles] - -physiquemult : variable scale. Used for wild creatures ONLY. +-mass : variability factor. [array of percentiles] encumbrance : capacity of carrying. [kg] basedefence : base defence value of body. Sterner body material == higher value diff --git a/src/com/Torvald/CSVFetcher.kt b/src/com/Torvald/CSVFetcher.kt index 68ac10ae8..9019265e6 100644 --- a/src/com/Torvald/CSVFetcher.kt +++ b/src/com/Torvald/CSVFetcher.kt @@ -1,4 +1,4 @@ -package com.Torvald +package com.torvald import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.CSVParser diff --git a/src/com/Torvald/ColourUtil/Col216.kt b/src/com/Torvald/ColourUtil/Col216.kt index 870092833..5b6b6cb85 100644 --- a/src/com/Torvald/ColourUtil/Col216.kt +++ b/src/com/Torvald/ColourUtil/Col216.kt @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/Col40 b/src/com/Torvald/ColourUtil/Col40 index 3c2da2897..46a7d6b8b 100644 --- a/src/com/Torvald/ColourUtil/Col40 +++ b/src/com/Torvald/ColourUtil/Col40 @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/Col4096.kt b/src/com/Torvald/ColourUtil/Col4096.kt index 2199f430d..322a2672a 100644 --- a/src/com/Torvald/ColourUtil/Col4096.kt +++ b/src/com/Torvald/ColourUtil/Col4096.kt @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/HSV.kt b/src/com/Torvald/ColourUtil/HSV.kt index 4cf940a74..82c38c3d0 100644 --- a/src/com/Torvald/ColourUtil/HSV.kt +++ b/src/com/Torvald/ColourUtil/HSV.kt @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil /** * Created by minjaesong on 16-03-10. diff --git a/src/com/Torvald/ColourUtil/HSVUtil.kt b/src/com/Torvald/ColourUtil/HSVUtil.kt index fd2268ae5..344de266d 100644 --- a/src/com/Torvald/ColourUtil/HSVUtil.kt +++ b/src/com/Torvald/ColourUtil/HSVUtil.kt @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil import com.jme3.math.FastMath import org.newdawn.slick.Color diff --git a/src/com/Torvald/ColourUtil/LimitedColours.kt b/src/com/Torvald/ColourUtil/LimitedColours.kt index 82cc14fd3..aec9cb2c9 100644 --- a/src/com/Torvald/ColourUtil/LimitedColours.kt +++ b/src/com/Torvald/ColourUtil/LimitedColours.kt @@ -1,4 +1,4 @@ -package com.Torvald.ColourUtil +package com.torvald.colourutil import org.newdawn.slick.Color diff --git a/src/com/Torvald/ImageFont/GameFontBase.kt b/src/com/Torvald/ImageFont/GameFontBase.kt index 9cea5ddd2..743ba71c1 100644 --- a/src/com/Torvald/ImageFont/GameFontBase.kt +++ b/src/com/Torvald/ImageFont/GameFontBase.kt @@ -1,6 +1,6 @@ -package com.Torvald.ImageFont +package com.torvald.imagefont -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import org.lwjgl.opengl.GL11 import org.newdawn.slick.* diff --git a/src/com/Torvald/ImageFont/GameFontWhite.kt b/src/com/Torvald/ImageFont/GameFontWhite.kt index 65270bbf8..9bfa2a6a7 100644 --- a/src/com/Torvald/ImageFont/GameFontWhite.kt +++ b/src/com/Torvald/ImageFont/GameFontWhite.kt @@ -1,6 +1,6 @@ -package com.Torvald.ImageFont +package com.torvald.imagefont -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import org.newdawn.slick.* /** @@ -29,7 +29,7 @@ constructor() : GameFontBase() { "./res/graphics/fonts/cjkpunct.png", GameFontBase.W_CJK, GameFontBase.H_KANA) /*uniHan = new SpriteSheet( "./res/graphics/fonts/unifont_unihan" - + ((!Terrarum.gameLocale.contains("zh")) + + ((!terrarum.gameLocale.contains("zh")) ? "_ja" : "") +".png" , W_UNIHAN, H_UNIHAN @@ -70,7 +70,7 @@ constructor() : GameFontBase() { override fun reloadUnihan() { /*uniHan = new SpriteSheet( "./res/graphics/fonts/unifont_unihan" - + ((!Terrarum.gameLocale.contains("zh")) + + ((!terrarum.gameLocale.contains("zh")) ? "_ja" : "") +".png" , W_UNIHAN, H_UNIHAN diff --git a/src/com/Torvald/JsonFetcher.kt b/src/com/Torvald/JsonFetcher.kt index 5249ed84a..93c435a83 100644 --- a/src/com/Torvald/JsonFetcher.kt +++ b/src/com/Torvald/JsonFetcher.kt @@ -1,4 +1,4 @@ -package com.Torvald +package com.torvald import com.google.gson.JsonObject import com.google.gson.JsonParser diff --git a/src/com/Torvald/JsonWriter.kt b/src/com/Torvald/JsonWriter.kt index c32f970a0..e6d99041c 100644 --- a/src/com/Torvald/JsonWriter.kt +++ b/src/com/Torvald/JsonWriter.kt @@ -1,4 +1,4 @@ -package com.Torvald +package com.torvald import com.google.gson.Gson import com.google.gson.JsonElement @@ -13,7 +13,7 @@ import java.io.IOException object JsonWriter { /** - * Serialise a class to the file as JSON, using Google GSON. + * serialise a class to the file as JSON, using Google GSON. * * @param c: a class * @param path: path to write a file @@ -28,7 +28,7 @@ object JsonWriter { } /** - * Serialise JsonObject to the file as JSON, using Google GSON. + * serialise JsonObject to the file as JSON, using Google GSON. * * @param jsonObject * @param path: path to write a file diff --git a/src/com/Torvald/Point/Point2f.kt b/src/com/Torvald/Point/Point2f.kt index da5fb376c..e4c128dfe 100644 --- a/src/com/Torvald/Point/Point2f.kt +++ b/src/com/Torvald/Point/Point2f.kt @@ -1,4 +1,4 @@ -package com.Torvald.Point +package com.torvald.point /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/RasterWriter.kt b/src/com/Torvald/RasterWriter.kt index 182399e14..2cef7f216 100644 --- a/src/com/Torvald/RasterWriter.kt +++ b/src/com/Torvald/RasterWriter.kt @@ -1,6 +1,6 @@ -package com.Torvald +package com.torvald -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import javax.imageio.ImageIO import java.awt.* diff --git a/src/com/Torvald/Serialise/WriteCSV.kt b/src/com/Torvald/Serialise/WriteCSV.kt index 8eafa130d..9de2c07df 100644 --- a/src/com/Torvald/Serialise/WriteCSV.kt +++ b/src/com/Torvald/Serialise/WriteCSV.kt @@ -1,10 +1,10 @@ -package com.Torvald.Serialise +package com.torvald.serialise -import com.Torvald.CSVFetcher -import com.Torvald.Terrarum.ItemProperties.ItemPropCodex -import com.Torvald.Terrarum.ItemProperties.MaterialPropCodex -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TilePropCodex +import com.torvald.CSVFetcher +import com.torvald.terrarum.itemproperties.ItemPropCodex +import com.torvald.terrarum.itemproperties.MaterialPropCodex +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TilePropCodex import java.io.IOException import java.nio.file.Files import java.nio.file.Path diff --git a/src/com/Torvald/Serialise/WriteGameMapData.kt b/src/com/Torvald/Serialise/WriteGameMapData.kt index 9a41b8563..f2e422487 100644 --- a/src/com/Torvald/Serialise/WriteGameMapData.kt +++ b/src/com/Torvald/Serialise/WriteGameMapData.kt @@ -1,7 +1,7 @@ -package com.Torvald.Serialise +package com.torvald.serialise -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.Terrarum import java.io.IOException import java.nio.file.Files import java.nio.file.Path diff --git a/src/com/Torvald/Serialise/WriteMeta.kt b/src/com/Torvald/Serialise/WriteMeta.kt index f5af48c4e..d6cbcb58c 100644 --- a/src/com/Torvald/Serialise/WriteMeta.kt +++ b/src/com/Torvald/Serialise/WriteMeta.kt @@ -1,9 +1,9 @@ -package com.Torvald.Serialise +package com.torvald.serialise -import com.Torvald.Terrarum.MapGenerator.MapGenerator -import com.Torvald.Terrarum.MapGenerator.RoguelikeRandomiser -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TilePropCodex +import com.torvald.terrarum.mapgenerator.MapGenerator +import com.torvald.terrarum.mapgenerator.RoguelikeRandomiser +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TilePropCodex import org.apache.commons.codec.digest.DigestUtils import java.io.FileInputStream import java.io.File diff --git a/src/com/Torvald/SimpleCipher/ROTUtil.kt b/src/com/Torvald/SimpleCipher/ROTUtil.kt index 89316d54c..a8d8c8c05 100644 --- a/src/com/Torvald/SimpleCipher/ROTUtil.kt +++ b/src/com/Torvald/SimpleCipher/ROTUtil.kt @@ -1,4 +1,4 @@ -package com.Torvald.SimpleCipher +package com.torvald.simplecipher /** * Created by minjaesong on 16-03-20. diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Actor b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Actor deleted file mode 100644 index 54a60be02..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Actor +++ /dev/null @@ -1,18 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 15-12-31. - */ -public interface Actor { - - void update(GameContainer gc, int delta_t); - - /** - * Valid RefID is equal to or greater than 32768. - * @return Reference ID. (32768-0x7FFF_FFFF_FFFF_FFFF) - */ - long getRefID(); -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorInventory b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorInventory deleted file mode 100644 index bbf852a3f..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorInventory +++ /dev/null @@ -1,134 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.GameItem.InventoryItem; -import com.Torvald.Terrarum.GameItem.ItemCodex; -import com.Torvald.Terrarum.Nullable; - -import java.util.HashMap; -import java.util.Map; - -/** - * Created by minjaesong on 16-01-15. - */ -public class ActorInventory { - - private @Nullable int capacityByCount; - private @Nullable int capacityByWeight; - private int capacityMode; - - /** - * <ReferenceID, Amounts> - */ - private HashMap itemList; - - public transient final int CAPACITY_MODE_COUNT = 1; - public transient final int CAPACITY_MODE_WEIGHT = 2; - - /** - * Construct new inventory with specified capacity. - * @param capacity if is_weight is true, killogramme value is required, counts of items otherwise. - * @param is_weight whether encumbrance should be calculated upon the weight of the inventory. False to use item counts. - */ - public ActorInventory(int capacity, boolean is_weight) { - if (is_weight) { - capacityByWeight = capacity; - capacityMode = CAPACITY_MODE_WEIGHT; - } - else{ - capacityByCount = capacity; - capacityMode = CAPACITY_MODE_COUNT; - } - } - - /** - * Get capacity of inventory - * @return - */ - public int getCapacity() { - if (capacityMode == CAPACITY_MODE_WEIGHT) { - return capacityByWeight; - } - else { - return capacityByCount; - } - } - - public int getCapacityMode() { - return capacityMode; - } - - /** - * Get reference to the itemList - * @return - */ - public Map getItemList() { - return itemList; - } - - /** - * Get clone of the itemList - * @return - */ - public Map getCopyOfItemList() { - return (Map) (itemList.clone()); - } - - public float getTotalWeight() { - float weight = 0; - - for (Map.Entry item : itemList.entrySet()) { - weight += ItemCodex.getItem(item.getKey()).getWeight() - * item.getValue(); - } - - return weight; - } - - public int getTotalCount() { - int count = 0; - - for (Map.Entry item : itemList.entrySet()) { - count += item.getValue(); - } - - return count; - } - - public int getTotalUniqueCount() { - return itemList.entrySet().size(); - } - - public void appendToPocket(InventoryItem item) { - appendToPocket(item, 1); - } - - public void appendToPocket(InventoryItem item, int count) { - long key = item.getItemID(); - - // if (key == Player.PLAYER_REF_ID) - // throw new IllegalArgumentException("Attempted to put player into the inventory."); - - if (itemList.containsKey(key)) - // increment amount if it already has specified item - itemList.put(key, itemList.get(key) + count); - else - // add new entry if it does not have specified item - itemList.put(key, count); - } - - /** - * Check whether the itemList contains too many items - * @return - */ - public boolean isEncumbered() { - if (getCapacityMode() == CAPACITY_MODE_WEIGHT) { - return (capacityByWeight < getTotalWeight()); - } - else if (getCapacityMode() == CAPACITY_MODE_COUNT) { - return (capacityByCount < getTotalWeight()); - } - else { - throw new UnsupportedOperationException("capacity mode not valid."); - } - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorWithBody b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorWithBody deleted file mode 100644 index c9e1cb980..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/ActorWithBody +++ /dev/null @@ -1,1002 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Rand.HQRNG; -import com.Torvald.Terrarum.*; -import com.Torvald.Terrarum.GameMap.GameMap; -import com.Torvald.Terrarum.MapDrawer.MapDrawer; -import com.Torvald.Terrarum.NotNull; -import com.Torvald.Terrarum.Nullable; -import com.Torvald.Terrarum.TileProperties.TilePropCodex; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.jme3.math.FastMath; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-13. - */ -public class ActorWithBody implements Actor, Visible, Glowing { - - ActorValue actorValue; - - ActorInventory inventory; - - private @NotNull float hitboxTranslateX; // relative to spritePosX - private @NotNull float hitboxTranslateY; // relative to spritePosY - private @NotNull int baseHitboxW; - private @NotNull int baseHitboxH; - - /** - * Velocity for newtonian sim. - * Fluctuation in, otherwise still, velocity is equal to acceleration. - * - * Acceleration: used in code like: - * veloY += 3.0 - * +3.0 is acceleration. You __accumulate__ acceleration to the velocity. - */ - private volatile @NotNull float veloX, veloY; - private transient final float VELO_HARD_LIMIT = 10000; - - boolean grounded = false; - - transient @Nullable SpriteAnimation sprite; - transient @Nullable SpriteAnimation spriteGlow; - /** Default to 'false' */ - private boolean visible = false; - /** Default to 'true' */ - private boolean update = true; - - private boolean noSubjectToGrav = false; - private boolean noCollideWorld = false; - private boolean noSubjectToFluidResistance = false; - - int baseSpriteWidth, baseSpriteHeight; - - /** - * Positions: top-left point - */ - private volatile @NotNull Hitbox hitbox; - private volatile transient @NotNull Hitbox nextHitbox; - - /** - * Physical properties - */ - private volatile transient @NonZero float scale = 1; - private volatile transient @NonZero float mass = 2f; - private transient final float MASS_LOWEST = 2f; - /** Valid range: [0, 1] */ - private float elasticity = 0; - private transient final float ELASTICITY_MAX = 0.993f; - private @NoNegative float density = 1000; - - private static transient final int TSIZE = MapDrawer.TILE_SIZE; - private static int AUTO_CLIMB_RATE = TSIZE / 8; - - /** - * Gravitational Constant G. Load from GameMap. - * [m / s^2] - * s^2 = 1/FPS = 1/60 if FPS is targeted to 60 - * meter to pixel : 24/FPS - */ - private transient final float METER = 24f; - /** - * [m / s^2] * SI_TO_GAME_ACC -> [px / IFrame^2] - */ - private transient final float SI_TO_GAME_ACC = METER / FastMath.sqr(Terrarum.TARGET_FPS); - /** - * [m / s] * SI_TO_GAME_VEL -> [px / IFrame] - */ - private transient final float SI_TO_GAME_VEL = METER / Terrarum.TARGET_FPS; - - private transient float gravitation; - private transient final float DRAG_COEFF = 1f; - - private transient final int CONTACT_AREA_TOP = 0; - private transient final int CONTACT_AREA_RIGHT = 1; - private transient final int CONTACT_AREA_BOTTOM = 2; - private transient final int CONTACT_AREA_LEFT = 3; - - private transient final int UD_COMPENSATOR_MAX = TSIZE; - private transient final int LR_COMPENSATOR_MAX = TSIZE; - private transient final int TILE_AUTOCLIMB_RATE = 4; - - /** - * A constant to make falling faster so that the game is more playable - */ - private transient final float G_MUL_PLAYABLE_CONST = 1.4142f; - - long referenceID; - - private transient final int EVENT_MOVE_TOP = 0; - private transient final int EVENT_MOVE_RIGHT = 1; - private transient final int EVENT_MOVE_BOTTOM = 2; - private transient final int EVENT_MOVE_LEFT = 3; - private transient final int EVENT_MOVE_NONE = -1; - - transient int eventMoving = EVENT_MOVE_NONE; // cannot collide both X-axis and Y-axis, or else jump control breaks up. - - /** - * in milliseconds - */ - public transient final int INVINCIBILITY_TIME = 500; - - /** - * Will ignore fluid resistance if (submerged height / actor height) <= this var - */ - private transient final float FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO = 0.2f; - private transient final float FLUID_RESISTANCE_APPLY_FULL_RATIO = 0.5f; - - private transient GameMap map; - - /** - * Give new random ReferenceID and initialise ActorValue - */ - public ActorWithBody() { - referenceID = new HQRNG().nextLong(); - actorValue = new ActorValue(); - map = Terrarum.game.map; - } - - /** - * - * @param w - * @param h - * @param tx +: translate drawn sprite to LEFT. - * @param ty +: translate drawn sprite to DOWN. - * @see ActorWithBody#drawBody(GameContainer, Graphics) - * @see ActorWithBody#drawGlow(GameContainer, Graphics) - */ - public void setHitboxDimension(int w, int h, int tx, int ty) { - baseHitboxH = h; - baseHitboxW = w; - hitboxTranslateX = tx; - hitboxTranslateY = ty; - } - - /** - * Set hitbox position from bottom-center point - * @param x - * @param y - */ - public void setPosition(float x, float y) { - hitbox = new Hitbox( - x - ((baseHitboxW / 2) - hitboxTranslateX) * scale - , y - (baseHitboxH - hitboxTranslateY) * scale - , baseHitboxW * scale - , baseHitboxH * scale - ); - - nextHitbox = new Hitbox( - x - ((baseHitboxW / 2) - hitboxTranslateX) * scale - , y - (baseHitboxH - hitboxTranslateY) * scale - , baseHitboxW * scale - , baseHitboxH * scale - ); - } - - public void setSprite(SpriteAnimation sprite) {this.sprite = sprite; } - - public void setSpriteGlow(SpriteAnimation sprite) { this.spriteGlow = sprite; } - - public void update(GameContainer gc, int delta_t) { - if (update) { - /** - * Update variables - */ - if (this instanceof Player) { - noSubjectToGrav = isPlayerNoClip(); - noCollideWorld = isPlayerNoClip(); - noSubjectToFluidResistance = isPlayerNoClip(); - } - - if (mass < MASS_LOWEST) mass = MASS_LOWEST; // clamp to minimum possible mass - if (sprite != null) { - baseSpriteHeight = sprite.getHeight(); - baseSpriteWidth = sprite.getWidth(); - } - gravitation = map.getGravitation(); - AUTO_CLIMB_RATE = (int) Math.min(TSIZE / 8 * FastMath.sqrt(scale), TSIZE); - - if (!isNoSubjectToGrav()) { - applyGravitation(); - applyBuoyancy(); - } - - // hard limit velocity - if (veloX > VELO_HARD_LIMIT) veloX = VELO_HARD_LIMIT; - if (veloY > VELO_HARD_LIMIT) veloY = VELO_HARD_LIMIT; - // limit velocity by fluid resistance - //int tilePropResistance = getTileMvmtRstc(); - //if (!noSubjectToFluidResistance) { - // veloX *= mvmtRstcToMultiplier(tilePropResistance); - // veloY *= mvmtRstcToMultiplier(tilePropResistance); - //} - - - // Set 'next' positions to fiddle with - updateNextHitboxFromVelo(); - - - // if not horizontally moving then ... - //if (Math.abs(veloX) < 0.5) { // fix for special situations (see fig. 1 at the bottom of the source) - // updateVerticalPos(); - // updateHorizontalPos(); - //} - //else { - updateHorizontalPos(); - updateVerticalPos(); - //} - - - updateHitboxX(); - updateHitboxY(); - - - clampNextHitbox(); - clampHitbox(); - } - } - - /** - * Apply gravitation to the every falling body (unless not levitating) - * - * Apply only if not grounded; normal force is not implemented (and redundant) - * so we manually reset G to zero (not applying G. force) if grounded. - */ - // FIXME abnormal jump behaviour if mass < 2, same thing happens if mass == 0 (but zero mass is invalid anyway). - private void applyGravitation() { - if (!getGrounded()) { - /** - * weight; gravitational force in action - * W = mass * G (9.8 [m/s^2]) - */ - float W = gravitation * mass; - /** - * Drag of atmosphere - * D = Cd (drag coefficient) * 0.5 * rho (density) * V^2 (velocity) * A (area) - */ - float A = scale * scale; - float D = DRAG_COEFF * 0.5f * 1.292f * veloY * veloY * A; - - int fluidResistance = getTileMvmtRstc(); - - veloY += clampCeil( - ((W - D) / mass) * SI_TO_GAME_ACC * G_MUL_PLAYABLE_CONST - // * mvmtRstcToMultiplier(fluidResistance) // eliminate shoot-up from fluids - , VELO_HARD_LIMIT - ); - } - } - - private void updateVerticalPos() { - if (!isNoCollideWorld()) { - // check downward - if (veloY >= 0) { - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_BOTTOM)) { - adjustHitBottom(); - elasticReflectY(); - grounded = true; - } - else if (isColliding(CONTACT_AREA_BOTTOM, 0, 1)) { - elasticReflectY(); - grounded = true; - } - else { - grounded = false; - } - } - else if (veloY < 0) { - grounded = false; - - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_TOP)) { - adjustHitTop(); - elasticReflectY(); - } - else if (isColliding(CONTACT_AREA_TOP, 0, -1)) { - elasticReflectY(); // for reversed gravity - } - else { - } - } - } - } - - private void adjustHitBottom() { - float newX = nextHitbox.getPointedX(); // look carefully, getPos or getPointed - // int-ify posY of nextHitbox - nextHitbox.setPositionYFromPoint( FastMath.floor(nextHitbox.getPointedY()) ); - - int newYOff = 0; // always positive - - boolean colliding; - do { - newYOff += 1; - colliding = isColliding(CONTACT_AREA_BOTTOM, 0, -newYOff); - } while (colliding); - - float newY = nextHitbox.getPointedY() - newYOff; - nextHitbox.setPositionFromPoint(newX, newY); - } - - private void adjustHitTop() { - float newX = nextHitbox.getPosX(); - // int-ify posY of nextHitbox - nextHitbox.setPositionY( FastMath.ceil(nextHitbox.getPosY()) ); - - int newYOff = 0; // always positive - - boolean colliding; - do { - newYOff += 1; - colliding = isColliding(CONTACT_AREA_TOP, 0, newYOff); - } while (colliding); - - float newY = nextHitbox.getPosY() + newYOff; - nextHitbox.setPosition(newX, newY); - } - - private void updateHorizontalPos() { - if (!isNoCollideWorld()) { - // check right - if (veloX >= 0.5) { - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_RIGHT) && !isColliding(CONTACT_AREA_LEFT)) { - adjustHitRight(); - elasticReflectX(); - } - else if (isColliding(CONTACT_AREA_RIGHT, 1, 0) - && !isColliding(CONTACT_AREA_LEFT, -1, 0)) { - elasticReflectX(); - } - else { - } - } - else if (veloX <= -0.5) { - // System.out.println("collidingleft"); - // order of the if-elseif chain is IMPORTANT - if (isColliding(CONTACT_AREA_LEFT) && !isColliding(CONTACT_AREA_RIGHT)) { - adjustHitLeft(); - elasticReflectX(); - } - else if (isColliding(CONTACT_AREA_LEFT, -1, 0) - && !isColliding(CONTACT_AREA_RIGHT, 1, 0)) { - elasticReflectX(); - } - else { - } - } - else { - // System.out.println("updatehorizontal - |velo| < 0.5"); - if (isColliding(CONTACT_AREA_LEFT) || isColliding(CONTACT_AREA_RIGHT)) { - elasticReflectX(); - } - } - } - } - - private void adjustHitRight() { - float newY = nextHitbox.getPosY(); // look carefully, getPos or getPointed - // int-ify posY of nextHitbox - nextHitbox.setPositionX( FastMath.floor(nextHitbox.getPosX() + nextHitbox.getWidth()) - - nextHitbox.getWidth() - ); - - int newXOff = 0; // always positive - - boolean colliding; - do { - newXOff += 1; - colliding = isColliding(CONTACT_AREA_BOTTOM, -newXOff, 0); - } while (newXOff < TSIZE && colliding); - - float newX = nextHitbox.getPosX() - newXOff; - nextHitbox.setPosition(newX, newY); - } - - private void adjustHitLeft() { - float newY = nextHitbox.getPosY(); - // int-ify posY of nextHitbox - nextHitbox.setPositionX( FastMath.ceil(nextHitbox.getPosX()) ); - - int newXOff = 0; // always positive - - boolean colliding; - do { - newXOff += 1; - colliding = isColliding(CONTACT_AREA_TOP, newXOff, 0); - } while (newXOff < TSIZE && colliding); - - float newX = nextHitbox.getPosX() + newXOff; - nextHitbox.setPosition(newX, newY); // + 1; float-point rounding compensation (i think...) - } - - private void elasticReflectX() { - if (veloX != 0) veloX = -veloX * elasticity; - } - - private void elasticReflectY() { - if (veloY != 0) veloY = -veloY * elasticity; - } - - private boolean isColliding(int side) { - return isColliding(side, 0, 0); - } - - private boolean isColliding(int side, int tx, int ty) { - return getContactingArea(side, tx, ty) > 1; - } - - private int getContactingArea(int side) { - return getContactingArea(side, 0, 0); - } - - private int getContactingArea(int side, int translateX, int translateY) { - int contactAreaCounter = 0; - for (int i = 0 - ; i < Math.round((side % 2 == 0) ? nextHitbox.getWidth() : nextHitbox.getHeight()) - ; i++) { - // set tile positions - int tileX, tileY; - /*if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(FastMath.floor(nextHitbox.getHitboxEnd().getY()) - + translateY); - } - else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(FastMath.ceil(nextHitbox.getHitboxStart().getY()) - + translateY); - } - else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(FastMath.floor(nextHitbox.getHitboxEnd().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(FastMath.ceil(nextHitbox.getHitboxStart().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - }*/ - if (side == CONTACT_AREA_BOTTOM) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxEnd().getY()) - + translateY); - } - else if (side == CONTACT_AREA_TOP) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + i + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + translateY); - } - else if (side == CONTACT_AREA_RIGHT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxEnd().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else if (side == CONTACT_AREA_LEFT) { - tileX = div16TruncateToMapWidth(Math.round(nextHitbox.getHitboxStart().getX()) - + translateX); - tileY = div16TruncateToMapHeight(Math.round(nextHitbox.getHitboxStart().getY()) - + i + translateY); - } - else { - throw new IllegalArgumentException(String.valueOf(side) + ": Wrong side input"); - } - - // evaluate - if (TilePropCodex.getProp(map.getTileFromTerrain(tileX, tileY)).isSolid()) { - contactAreaCounter += 1; - } - } - - return contactAreaCounter; - } - - /** - * [N] = [kg * m / s^2] - * F(bo) = density * submerged_volume * gravitational_acceleration [N] - */ - private void applyBuoyancy() { - int fluidDensity = getTileDensity(); - float submergedVolume = getSubmergedVolume(); - - if (!isPlayerNoClip() && !grounded) { - // System.out.println("density: "+density); - veloY -= ((fluidDensity - this.density) - * map.getGravitation() * submergedVolume - * Math.pow(mass, -1) - * SI_TO_GAME_ACC); - } - } - - private float getSubmergedVolume() { - float GAME_TO_SI_VOL = FastMath.pow((1f/METER), 3); - - if( density > 0 ){ - return getSubmergedHeight() - * nextHitbox.getWidth() * nextHitbox.getWidth() - * GAME_TO_SI_VOL - ; - //System.out.println("fluidHeight: "+fluidHeight+", submerged: "+submergedVolume); - //submergedHeight / TILE_SIZE * 1^2 (pixel to meter) - } - else{ - return 0; - } - } - - private float getSubmergedHeight() { - return FastMath.clamp( - nextHitbox.getPointedY() - getFluidLevel() - , 0 - , nextHitbox.getHeight() - ); - } - - private int getFluidLevel() { - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosY = Math.round(nextHitbox.getPosY() / TSIZE); - - int fluidHeight = 2147483647; - - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, tilePosY); - if ( TilePropCodex.getProp(tile).isFluid() - && tilePosY * TSIZE < fluidHeight ){ - fluidHeight = tilePosY * TSIZE; - } - } - - return fluidHeight; - } - - /** - * Get highest friction value from feet tiles. - * @return - */ - private int getTileFriction(){ - int friction = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosY = Math.round(nextHitbox.getPointedY() / TSIZE); - - //get density - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, tilePosY); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getFriction(); - - if (thisFluidDensity > friction) friction = thisFluidDensity; - } - } - - return friction; - } - - /** - * Get highest movement resistance value from tiles that the body occupies. - * @return - */ - private int getTileMvmtRstc(){ - int resistance = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosYStart = Math.round(nextHitbox.getPosY() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosYEnd = Math.round(nextHitbox.getHitboxEnd().getY() / TSIZE); - - //get density - for (int y = tilePosYStart; y <= tilePosYEnd; y++) { - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, y); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getMovementResistance(); - - if (thisFluidDensity > resistance) resistance = thisFluidDensity; - } - } - } - - return resistance; - } - - /** - * Get highest density (specific gravity) value from tiles that the body occupies. - * @return - */ - private int getTileDensity() { - int density = 0; - - int tilePosXStart = Math.round(nextHitbox.getPosX() / TSIZE); - int tilePosYStart = Math.round(nextHitbox.getPosY() / TSIZE); - int tilePosXEnd = Math.round(nextHitbox.getHitboxEnd().getX() / TSIZE); - int tilePosYEnd = Math.round(nextHitbox.getHitboxEnd().getY() / TSIZE); - - //get density - for (int y = tilePosYStart; y <= tilePosYEnd; y++) { - for (int x = tilePosXStart; x <= tilePosXEnd; x++) { - int tile = map.getTileFromTerrain(x, y); - if (TilePropCodex.getProp(tile).isFluid()) { - int thisFluidDensity = TilePropCodex.getProp(tile).getDensity(); - - if (thisFluidDensity > density) density = thisFluidDensity; - } - } - } - - return density; - } - - private float mvmtRstcToMultiplier(int movementResistanceValue) { - return 1f / (1 + (movementResistanceValue / 16f)); - } - - private void clampHitbox() { - hitbox.setPositionFromPoint( - clampW(hitbox.getPointedX()) - , clampH(hitbox.getPointedY()) - ); - } - - private void clampNextHitbox() { - nextHitbox.setPositionFromPoint( - clampW(nextHitbox.getPointedX()) - , clampH(nextHitbox.getPointedY()) - ); - } - - private void updateNextHitboxFromVelo() { - float fluidResistance = mvmtRstcToMultiplier(getTileMvmtRstc()); - float submergedRatio = FastMath.clamp( - getSubmergedHeight() / nextHitbox.getHeight() - , 0f, 1f - ); - - boolean applyResistance = (!isNoSubjectToFluidResistance() - && submergedRatio > FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO - ); - float resistanceMulInterValueSize = FLUID_RESISTANCE_APPLY_FULL_RATIO - FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO; - float resistanceMultiplier = FastMath.interpolateLinear( - (submergedRatio - FLUID_RESISTANCE_IGNORE_THRESHOLD_RATIO) - * FastMath.pow(resistanceMulInterValueSize, -1) - , 0, 1 - ); - float adjustedResistance = FastMath.interpolateLinear( - resistanceMultiplier - , 1f, fluidResistance - ); - - nextHitbox.set( - Math.round(hitbox.getPosX() - + (veloX - * (!applyResistance ? 1 : adjustedResistance) - )) - , Math.round(hitbox.getPosY() - + (veloY - * (!applyResistance ? 1 : adjustedResistance) - )) - , Math.round(baseHitboxW * scale) - , Math.round(baseHitboxH * scale) - /** Full quantisation; wonder what havoc these statements would wreak... - */ - ); - } - - private void updateHitboxX() { - hitbox.setDimension( - nextHitbox.getWidth() - , nextHitbox.getHeight() - ); - hitbox.setPositionX(nextHitbox.getPosX()); - } - - private void updateHitboxY() { - hitbox.setDimension( - nextHitbox.getWidth() - , nextHitbox.getHeight() - ); - hitbox.setPositionY(nextHitbox.getPosY()); - } - - @Override - public void drawGlow(GameContainer gc, Graphics g) { - if (visible && spriteGlow != null) { - if (!sprite.flippedHorizontal()) { - spriteGlow.render(g - , (hitbox.getPosX() - (hitboxTranslateX * scale)) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - else { - spriteGlow.render(g - , (hitbox.getPosX() - scale) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - } - } - - @Override - public void drawBody(GameContainer gc, Graphics g) { - if (visible && sprite != null) { - if (!sprite.flippedHorizontal()) { - sprite.render(g - , (hitbox.getPosX() - (hitboxTranslateX * scale)) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - else { - sprite.render(g - , (hitbox.getPosX() - scale) - , (hitbox.getPosY() + (hitboxTranslateY * scale)) - - (baseSpriteHeight - baseHitboxH) * scale - + 2 - , scale - ); - } - } - } - - @Override - public void updateGlowSprite(GameContainer gc, int delta_t) { - if (spriteGlow != null) spriteGlow.update(delta_t); - } - - @Override - public void updateBodySprite(GameContainer gc, int delta_t) { - if (sprite != null) sprite.update(delta_t); - } - - private float clampW(float x) { - if (x < TSIZE + nextHitbox.getWidth() / 2) { - return TSIZE + nextHitbox.getWidth() / 2; - } - else if (x >= map.width * TSIZE - TSIZE - nextHitbox.getWidth() / 2) { - return map.width * TSIZE - 1 - TSIZE - nextHitbox.getWidth() / 2; - } - else { - return x; - } - } - - private float clampH(float y) { - if (y < TSIZE + nextHitbox.getHeight()) { - return TSIZE + nextHitbox.getHeight(); - } - else if (y >= map.height * TSIZE - TSIZE - nextHitbox.getHeight()) { - return map.height * TSIZE - 1 - TSIZE - nextHitbox.getHeight(); - } - else { - return y; - } - } - - private int clampWtile(int x) { - if (x < 0) { - return 0; - } - else if (x >= map.width) { - return map.width - 1; - } - else { - return x; - } - } - - private int clampHtile(int x) { - if (x < 0) { - return 0; - } - else if (x >= map.height) { - return map.height - 1; - } - else { - return x; - } - } - - private boolean isPlayerNoClip() { - return (this instanceof Player && ((Player) this).isNoClip()); - } - - private static int div16(int x) { - if (x < 0) { throw new IllegalArgumentException("div16: Positive integer only: " - + String.valueOf(x)); } - return (x & 0x7FFF_FFFF) >> 4; - } - - private static int div16TruncateToMapWidth(int x) { - if (x < 0) return 0; - else if (x >= Terrarum.game.map.width << 4) return Terrarum.game.map.width - 1; - else return (x & 0x7FFF_FFFF) >> 4; - } - - private static int div16TruncateToMapHeight(int y) { - if (y < 0) return 0; - else if (y >= Terrarum.game.map.height << 4) return Terrarum.game.map.height - 1; - else return (y & 0x7FFF_FFFF) >> 4; - } - - private static int mod16(int x) { - if (x < 0) { throw new IllegalArgumentException("mod16: Positive integer only: " - + String.valueOf(x)); } - return x & 0b1111; - } - - private static float clampCeil(float x, float ceil) { - return (Math.abs(x) > ceil ? ceil : x); - } - - public void setVisible(boolean visible) { - this.visible = visible; - } - - public void setScale(float scale) { - this.scale = scale; - } - - public void setMass(float mass) { - this.mass = mass; - } - - public void setVeloX(float veloX) { - this.veloX = veloX; - } - - public void setVeloY(float veloY) { - this.veloY = veloY; - } - - public void setGrounded(boolean grounded) { - this.grounded = grounded; - } - - public boolean isVisible() { - return visible; - } - - public float getScale() { - return scale; - } - - public float getMass() { - return mass; - } - - public float getVeloX() { - return veloX; - } - - public float getVeloY() { - return veloY; - } - - public boolean isGrounded() { - return grounded; - } - - public int getBaseHitboxW() { - return baseHitboxW; - } - - public int getBaseHitboxH() { - return baseHitboxH; - } - - public float getHitboxTranslateX() { - return hitboxTranslateX; - } - - public float getHitboxTranslateY() { - return hitboxTranslateY; - } - - public Hitbox getHitbox() { - return hitbox; - } - - public Hitbox getNextHitbox() { - return nextHitbox; - } - - public boolean isUpdate() { - return update; - } - - public void setUpdate(boolean update) { - this.update = update; - } - - private int quantiseTSize(float v) { - return FastMath.floor(v / TSIZE) * TSIZE; - } - - public boolean isNoSubjectToGrav() { - return noSubjectToGrav; - } - - public void setNoSubjectToGrav(boolean noSubjectToGrav) { - this.noSubjectToGrav = noSubjectToGrav; - } - - public boolean isNoCollideWorld() { - return noCollideWorld; - } - - public boolean isNoSubjectToFluidResistance() { - return noSubjectToFluidResistance; - } - - public void setNoCollideWorld(boolean noCollideWorld) { - this.noCollideWorld = noCollideWorld; - } - - public void setNoSubjectToFluidResistance(boolean noSubjectToFluidResistance) { - this.noSubjectToFluidResistance = noSubjectToFluidResistance; - } - - public float getElasticity() { - return elasticity; - } - - public void setElasticity(float elasticity) { - if (elasticity < 0) - throw new IllegalArgumentException("[ActorWithBody] " + elasticity + ": valid elasticity value is [0, 1]."); - - if (elasticity > 1) { - System.out.println("[ActorWithBody] Elasticity were capped to 1."); - this.elasticity = ELASTICITY_MAX; - } - else this.elasticity = elasticity * ELASTICITY_MAX; - } - - public void setDensity(int density) { - if (density < 0) - throw new IllegalArgumentException("[ActorWithBody] " + density + ": density cannot be negative."); - - this.density = density; - } - - @org.jetbrains.annotations.Nullable - @Override - public Long getReferenceID() { - return this.referenceID; - } - - @Override - public void setReferenceID(@org.jetbrains.annotations.Nullable Long aLong) { - referenceID = aLong; - } -} - -/** - - = = ↑ - === ===@! - =↑ =↑ - =↑ = - =↑ = - =@ (pressing R) = -================== ================== - - Fig. 1: the fix was not applied - */ \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CanBeStoredAsItem b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CanBeStoredAsItem deleted file mode 100644 index 93d9aa723..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CanBeStoredAsItem +++ /dev/null @@ -1,20 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.GameItem.InventoryItem; - -/** - * Created by minjaesong on 16-01-31. - */ -public interface CanBeStoredAsItem { - - void attachItemData(); - - float getItemWeight(); - - void stopUpdateAndDraw(); - - void resumeUpdateAndDraw(); - - InventoryItem getItemData(); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Controllable b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Controllable deleted file mode 100644 index 0e3ee33f6..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Controllable +++ /dev/null @@ -1,17 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.spriteAnimation.SpriteAnimation; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; -import org.newdawn.slick.Input; - -/** - * Created by minjaesong on 15-12-31. - */ -public interface Controllable { - - void processInput(Input input); - - void keyPressed(int key, char c); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CreatureFactory b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CreatureFactory deleted file mode 100644 index 571a8f745..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/CreatureFactory +++ /dev/null @@ -1,137 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.JsonFetcher; -import com.Torvald.Rand.Fudge3; -import com.Torvald.Rand.HQRNG; -import com.Torvald.Terrarum.LangPack.Lang; -import com.google.gson.JsonObject; -import org.newdawn.slick.SlickException; - -import java.io.IOException; - -/** - * Created by minjaesong on 16-02-05. - */ -public class CreatureFactory { - - private static final String JSONPATH = "./res/raw/"; - - public ActorWithBody build(String jsonFileName) throws IOException, SlickException { - JsonObject jsonObj = JsonFetcher.readJson(JSONPATH + jsonFileName); - ActorWithBody actor = new ActorWithBody(); - - - String[] elementsString = { - "racename" - , "racenameplural" - }; - - String[] elementsFloat = { - "baseheight" - , "basemass" - , "accel" - , "toolsize" - , "encumbrance" - }; - - String[] elementsFloatVariable = { - "strength" - , "speed" - , "jumppower" - , "scale" - , "speed" - }; - - String[] elementsBoolean = { - "intelligent" - }; - - String[] elementsMultiplyFromOne = { - "physiquemult" - }; - - - setAVStrings(actor, elementsString, jsonObj); - setAVFloats(actor, elementsFloat, jsonObj); - setAVFloatsVariable(actor, elementsFloatVariable, jsonObj); - setAVMultiplyFromOne(actor, elementsMultiplyFromOne, jsonObj); - setAVBooleans(actor, elementsBoolean, jsonObj); - - actor.actorValue.set("accel", Player.WALK_ACCEL_BASE); - actor.actorValue.set("accelmult", 1f); - - actor.inventory = new ActorInventory((int) actor.actorValue.get("encumberance"), true); - - return actor; - } - - /** - * Fetch and set actor values that have 'variable' appended. E.g. strength - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVFloatsVariable(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - float baseValue = jsonObject.get(s).getAsFloat(); - // roll fudge dice and get value [-3, 3] as [0, 6] - int varSelected = new Fudge3(new HQRNG()).rollForArray(); - // get multiplier from json. Assuming percentile - int multiplier = jsonObject.get(s + "variable").getAsJsonArray().get(varSelected).getAsInt(); - float realValue = baseValue * multiplier / 100f; - - p.actorValue.set(s, realValue); - } - } - - /** - * Fetch and set string actor values - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVStrings(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - String key = jsonObject.get(s).getAsString(); - p.actorValue.set(s, Lang.get(key)); - } - } - - /** - * Fetch and set float actor values - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVFloats(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - p.actorValue.set(s, jsonObject.get(s).getAsFloat()); - } - } - - /** - * Fetch and set actor values that should multiplier be applied to the base value of 1. - * E.g. physiquemult - * @param p - * @param elemSet - * @param jsonObject - */ - private void setAVMultiplyFromOne(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - float baseValue = 1f; - // roll fudge dice and get value [-3, 3] as [0, 6] - int varSelected = new Fudge3(new HQRNG()).rollForArray(); - // get multiplier from json. Assuming percentile - int multiplier = jsonObject.get(s).getAsJsonArray().get(varSelected).getAsInt(); - float realValue = baseValue * multiplier / 100f; - - p.actorValue.set(s, realValue); - } - } - - private void setAVBooleans(ActorWithBody p, String[] elemSet, JsonObject jsonObject) { - for (String s : elemSet) { - p.actorValue.set(s, jsonObject.get(s).getAsBoolean()); - } - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/DroppedItem b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/DroppedItem deleted file mode 100644 index ef14f1575..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/DroppedItem +++ /dev/null @@ -1,28 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.sun.istack.internal.NotNull; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-03. - */ -public class ItemTangible extends ActorWithBody { - - @NotNull private float mass; - - public ItemTangible() { - super.setVisible(true); - } - - @Override - public void update(GameContainer gc, int delta_t) { - - } - - @Override - public void drawBody(GameContainer gc, Graphics g) { - super.drawBody(gc, g); - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Factionable b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Factionable deleted file mode 100644 index 1ad44cfb0..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Factionable +++ /dev/null @@ -1,17 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.Faction.Faction; - -import java.util.HashSet; - -/** - * Created by minjaesong on 16-02-15. - */ -public interface Factionable { - - void assignFaction(Faction f); - void unassignFaction(Faction f); - HashSet getAssignedFactions(); - void clearFactionAssigning(); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Glowing b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Glowing deleted file mode 100644 index 01be025aa..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Glowing +++ /dev/null @@ -1,15 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-25. - */ -public interface Glowing { - - void drawGlow(GameContainer gc, Graphics g); - - void updateGlowSprite(GameContainer gc, int delta_t); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Landholder b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Landholder deleted file mode 100644 index a76f694f1..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Landholder +++ /dev/null @@ -1,16 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import java.util.ArrayList; - -/** - * Created by minjaesong on 16-02-20. - */ -public interface Landholder { - - ArrayList getHouseDesignation(); - void setHouseDesignation(ArrayList list); - void addHouseTile(int x, int y); - void removeHouseTile(int x, int y); - void clearHouseDesignation(); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Luminous b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Luminous deleted file mode 100644 index f0b1e7730..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Luminous +++ /dev/null @@ -1,11 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -/** - * Created by minjaesong on 16-02-19. - */ -public interface Luminous { - - void setLuminance(char RGB); - char getLuminance(); - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/NPCIntelligentBase b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/NPCIntelligentBase deleted file mode 100644 index eae22f103..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/NPCIntelligentBase +++ /dev/null @@ -1,152 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.AI.ActorAI; -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.GameItem.InventoryItem; -import com.Torvald.Terrarum.Terrarum; -import org.newdawn.slick.GameContainer; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; - -/** - * Created by minjaesong on 16-01-31. - */ -public class NPCIntelligentBase extends ActorWithBody implements AIControlled, Pocketed, CanBeStoredAsItem, - Factionable, Landholder { - - private InventoryItem itemData; // keep it for extendibility, like Carriers in SC1 - private transient ActorAI ai; - private ActorInventory inventory; - - private HashSet factionSet = new HashSet<>(); - - /** - * Absolute tile index. index(x, y) = y * map.width + x
- * The arraylist will be saved in JSON format with GSON. - */ - private ArrayList houseTiles = new ArrayList<>(); - - @Override - public void assignFaction(Faction f) { - factionSet.add(f); - } - - @Override - public void unassignFaction(Faction f) { - factionSet.remove(f); - } - - @Override - public HashSet getAssignedFactions() { - return factionSet; - } - - @Override - public void clearFactionAssigning() { - factionSet.clear(); - } - - @Override - public void attachItemData() { - itemData = new InventoryItem() { - @Override - public long getItemID() { - return 0; - } - - @Override - public float getWeight() { - return 0; - } - - @Override - public void effectWhileInPocket(GameContainer gc, int delta_t) { - - } - - @Override - public void effectWhenPickedUp(GameContainer gc, int delta_t) { - - } - - @Override - public void primaryUse(GameContainer gc, int delta_t) { - - } - - @Override - public void secondaryUse(GameContainer gc, int delta_t) { - - } - - @Override - public void effectWhenThrownAway(GameContainer gc, int delta_t) { - - } - }; - } - - @Override - public float getItemWeight() { - return super.getMass(); - } - - @Override - public ArrayList getHouseDesignation() { - return houseTiles; - } - - @Override - public void setHouseDesignation(ArrayList list) { - houseTiles = list; - } - - @Override - public void addHouseTile(int x, int y) { - houseTiles.add(Terrarum.game.map.width * y + x); - } - - @Override - public void removeHouseTile(int x, int y) { - houseTiles.remove(new Integer(Terrarum.game.map.width * y + x)); - } - - @Override - public void clearHouseDesignation() { - houseTiles.clear(); - } - - @Override - public void stopUpdateAndDraw() { - super.setUpdate(false); - super.setVisible(false); - } - - @Override - public void resumeUpdateAndDraw() { - super.setUpdate(true); - super.setVisible(true); - } - - @Override - public InventoryItem getItemData() { - return itemData; - } - - @Override - public ActorInventory getInventory() { - return null; - } - - @Override - public void overwriteInventory(ActorInventory inventory) { - this.inventory = inventory; - } - - @Override - public void attachAI(ActorAI ai) { - this.ai = ai; - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PFSigrid b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PFSigrid deleted file mode 100644 index 197a1b9f8..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PFSigrid +++ /dev/null @@ -1,104 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.JsonFetcher; -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.Game; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.google.gson.JsonObject; -import org.lwjgl.Sys; -import org.newdawn.slick.SlickException; - -import java.io.IOException; - -/** - * Created by minjaesong on 16-02-03. - */ -public class PFSigrid { - - private static String FACTION_PATH = "./res/raw/"; - - public Player build() throws SlickException { - Player p = new Player(); - - p.sprite = new SpriteAnimation(); - p.sprite.setDimension(28, 51); - p.sprite.setSpriteImage("res/graphics/sprites/test_player.png"); - p.sprite.setDelay(200); - p.sprite.setRowsAndFrames(1, 1); - p.sprite.setAsVisible(); - p.sprite.composeSprite(); - - p.spriteGlow = new SpriteAnimation(); - p.spriteGlow.setDimension(28, 51); - p.spriteGlow.setSpriteImage("res/graphics/sprites/test_player_glow.png"); - p.spriteGlow.setDelay(200); - p.spriteGlow.setRowsAndFrames(1, 1); - p.spriteGlow.setAsVisible(); - p.spriteGlow.composeSprite(); - - p.actorValue = new ActorValue(); - p.actorValue.set("scale", 1.0f); - p.actorValue.set("speed", 4.0f); - p.actorValue.set("speedmult", 1.0f); - p.actorValue.set("accel", Player.WALK_ACCEL_BASE); - p.actorValue.set("accelmult", 1.0f); - - p.actorValue.set("jumppower", 5f); - - p.actorValue.set("basemass", 80f); - - p.actorValue.set("physiquemult", 1); // Constant 1.0 for player, meant to be used by random mobs - /** - * fixed value, or 'base value', from creature strength of Dwarf Fortress. - * Human race uses 1000. (see CreatureHuman.json) - */ - p.actorValue.set("strength", 1414); - p.actorValue.set("encumbrance", 1000); - - p.actorValue.set("name", "Sigrid"); - - p.actorValue.set("intelligent", true); - - p.actorValue.set("luminosity", 22819); - - p.actorValue.set("selectedtile", 16); - - p.setHitboxDimension(18, 46, 8, 0); - - p.setInventory(new ActorInventory(0x7FFFFFFF, true)); - - p.setPosition(4096 * 16, 300 * 16); - - p.assignFaction(loadFactioningData("FactionSigrid.json")); - - return p; - } - - private Faction loadFactioningData(String filename) { - JsonObject jsonObject = null; - try { - jsonObject = JsonFetcher.readJson(FACTION_PATH + filename); - } - catch (IOException e) { - e.printStackTrace(); - System.exit(-1); - } - - Faction faction = new Faction(jsonObject.get("factionname").getAsString()); - - jsonObject.get("factionamicable").getAsJsonArray().forEach( - jobj -> faction.addFactionAmicable(jobj.getAsString()) - ); - jsonObject.get("factionneutral").getAsJsonArray().forEach( - jobj -> faction.addFactionNeutral(jobj.getAsString()) - ); - jsonObject.get("factionhostile").getAsJsonArray().forEach( - jobj -> faction.addFactionHostile(jobj.getAsString()) - ); - jsonObject.get("factionfearful").getAsJsonArray().forEach( - jobj -> faction.addFactionFearful(jobj.getAsString()) - ); - - return faction; - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PhysTestBall b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PhysTestBall deleted file mode 100644 index 930bb6b66..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PhysTestBall +++ /dev/null @@ -1,29 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.Color; -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-03-05. - */ -public class PhysTestBall extends ActorWithBody { - - public PhysTestBall() { - super(); - setHitboxDimension(16, 16, 0, 0); - setVisible(true); - setMass(10f); - } - - @Override - public void drawBody(GameContainer gc, Graphics g) { - g.setColor(Color.orange); - g.fillOval( - getHitbox().getPosX() - , getHitbox().getPosY() - , getHitbox().getWidth() - , getHitbox().getHeight() - ); - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Player b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Player deleted file mode 100644 index 81db85bd4..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Player +++ /dev/null @@ -1,571 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.Terrarum.Actors.Faction.Faction; -import com.Torvald.Terrarum.GameControl.EnumKeyFunc; -import com.Torvald.Terrarum.GameControl.KeyMap; -import com.Torvald.Terrarum.MapDrawer.MapDrawer; -import com.Torvald.Terrarum.Terrarum; -import com.Torvald.spriteAnimation.SpriteAnimation; -import com.jme3.math.FastMath; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; -import org.lwjgl.input.Controller; -import org.lwjgl.input.Controllers; -import org.newdawn.slick.*; - -import java.io.Serializable; -import java.util.HashSet; - -/** - * Created by minjaesong on 15-12-31. - */ -public class Player extends ActorWithBody implements Controllable, Pocketed, Factionable, Luminous { - - public transient @Nullable Controllable vehicleRiding; - - int jumpCounter = 0; - int walkPowerCounter = 0; - private transient final int MAX_JUMP_LENGTH = 17; // use 17; in internal frames - /** - * experimental value. - */ - // private transient final float JUMP_ACCELERATION_MOD = ???f / 10000f; //quadratic mode - private transient final float JUMP_ACCELERATION_MOD = 170f / 10000f; //linear mode - private transient final int WALK_FRAMES_TO_MAX_ACCEL = 6; - - public float readonly_totalX = 0, readonly_totalY = 0; - - boolean jumping = false; - - @NotNull int walkHeading; - - private transient final int LEFT = 1; - private transient final int RIGHT = 2; - - private transient final int KEY_NULL = -1; - private transient int prevHMoveKey = KEY_NULL; - private transient int prevVMoveKey = KEY_NULL; - - static transient final float ACCEL_MULT_IN_FLIGHT = 0.48f; - static transient final float WALK_STOP_ACCEL = 0.32f; - static transient final float WALK_ACCEL_BASE = 0.32f; - - private boolean noClip = false; - - public static transient final long PLAYER_REF_ID = 0x51621D; - - private transient final float AXIS_POSMAX = 1.0f; - private transient final int GAMEPAD_JUMP = 5; - - private transient final int TSIZE = MapDrawer.TILE_SIZE; - - private HashSet factionSet = new HashSet<>(); - - private transient final int BASE_DENSITY = 1020; - - - /** - * Creates new Player instance with empty elements (sprites, actorvalue, etc.).
- * - * Use PlayerBuildFactory to build player! - * - * @throws SlickException - */ - public Player() throws SlickException { - super(); - referenceID = PLAYER_REF_ID; - setVisible(true); - super.setDensity(BASE_DENSITY); - } - - @Override - public void update(GameContainer gc, int delta_t) { - if (vehicleRiding instanceof Player) throw new RuntimeException("Attempted to 'ride' " + - "player object."); - - updatePhysicalInfos(); - super.update(gc, delta_t); - - updateSprite(delta_t); - - updateMovementControl(); - - if (noClip) { super.setGrounded(true); } - - } - - private void updatePhysicalInfos() { - super.setScale(actorValue.getAsFloat("scale")); - super.setMass(actorValue.getAsFloat("basemass") - * FastMath.pow(super.getScale(), 3)); - if (super.getElasticity() != 0) super.setElasticity(0); - } - - /** - * - * @param left (even if the game is joypad controlled, you must give valid value) - * @param absAxisVal (set AXIS_POSMAX if keyboard controlled) - */ - private void walkHorizontal(boolean left, float absAxisVal) { - //if ((!super.isWalledLeft() && left) || (!super.isWalledRight() && !left)) { - readonly_totalX = super.getVeloX() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - * applyAccelRealism(walkPowerCounter) - * (left ? -1 : 1) - * absAxisVal; - - super.setVeloX(readonly_totalX); - - if (walkPowerCounter < WALK_FRAMES_TO_MAX_ACCEL) { - walkPowerCounter += 1; - } - - // Clamp veloX - super.setVeloX( - absClamp(super.getVeloX() - , actorValue.getAsFloat("speed") - * actorValue.getAsFloat("speedmult") - * FastMath.sqrt(super.getScale()) - ) - ); - - // Heading flag - if (left) walkHeading = LEFT; - else walkHeading = RIGHT; - //} - } - - /** - * - * @param up (even if the game is joypad controlled, you must give valid value) - * @param absAxisVal (set AXIS_POSMAX if keyboard controlled) - */ - private void walkVertical(boolean up, float absAxisVal) { - readonly_totalY = super.getVeloY() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - * applyAccelRealism(walkPowerCounter) - * (up ? -1 : 1) - * absAxisVal; - - super.setVeloY(readonly_totalY); - - if (walkPowerCounter < WALK_FRAMES_TO_MAX_ACCEL) { - walkPowerCounter += 1; - } - - // Clamp veloX - super.setVeloY( - absClamp(super.getVeloY() - , actorValue.getAsFloat("speed") - * actorValue.getAsFloat("speedmult") - * FastMath.sqrt(super.getScale()) - ) - ); - } - - /** - * For realistic accelerating while walking. - * - * Naïve 'veloX += 3' is actually like: - * - * a - * | ------------ - * | - * | - * 0+------············ t - * - * which is unrealistic, so this method tries to introduce some realism by doing: - * - * a - * | ------------ - * | --- - * | - - * | --- - * 0+----··················· t - * - * - * @param x - */ - private float applyAccelRealism(int x) { - return 0.5f + 0.5f * -FastMath.cos(10 * x / (WALK_FRAMES_TO_MAX_ACCEL * FastMath.PI)); - } - - private void walkHStop() { - if (super.getVeloX() > 0) { - super.setVeloX(super.getVeloX() - - - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloX() < 0) - super.setVeloX(0); - } - else if (super.getVeloX() < 0) { - super.setVeloX(super.getVeloX() - + - actorValue.getAsFloat("accel") - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloX() > 0) - super.setVeloX(0); - } - else { - super.setVeloX(0); - } - - walkPowerCounter = 0; - } - - private void walkVStop() { - if (super.getVeloY() > 0) { - super.setVeloY(super.getVeloY() - - - WALK_STOP_ACCEL - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloY() < 0) - super.setVeloY(0); - } - else if (super.getVeloY() < 0) { - super.setVeloY(super.getVeloY() - + - WALK_STOP_ACCEL - * actorValue.getAsFloat("accelmult") - * FastMath.sqrt(super.getScale()) - ); - - // compensate overshoot - if (super.getVeloY() > 0) - super.setVeloY(0); - } - else { - super.setVeloY(0); - } - - walkPowerCounter = 0; - } - - private void updateMovementControl() { - if (!noClip) { - if (super.isGrounded()) { - actorValue.set("accelmult", 1f); - } else { - actorValue.set("accelmult", ACCEL_MULT_IN_FLIGHT); - } - } - else { - actorValue.set("accelmult", 1f); - } - } - - public void processInput(Input input) { - Controller gamepad = null; - float axisX = 0, axisY = 0, axisRX = 0, axisRY = 0; - if (Terrarum.hasController) { - gamepad = Controllers.getController(0); - axisX = gamepad.getAxisValue(0); - axisY = gamepad.getAxisValue(1); - axisRX = gamepad.getAxisValue(2); - axisRY = gamepad.getAxisValue(3); - - if (Math.abs(axisX) < Terrarum.CONTROLLER_DEADZONE) axisX = 0; - if (Math.abs(axisY) < Terrarum.CONTROLLER_DEADZONE) axisY = 0; - if (Math.abs(axisRX) < Terrarum.CONTROLLER_DEADZONE) axisRX = 0; - if (Math.abs(axisRY) < Terrarum.CONTROLLER_DEADZONE) axisRY = 0; - } - - /** - * L-R stop - */ - if (Terrarum.hasController) { - if (axisX == 0) { - walkHStop(); - } - } - else { - // ↑F, ↑S - if (!isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && !isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - walkHStop(); - prevHMoveKey = KEY_NULL; - } - } - /** - * U-D stop - */ - if (Terrarum.hasController) { - if (axisY == 0) { - walkVStop(); - } - } - else { - // ↑E - // ↑D - if (isNoClip() - && !isFuncDown(input, EnumKeyFunc.MOVE_UP) - && !isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - walkVStop(); - prevVMoveKey = KEY_NULL; - } - } - - /** - * Left/Right movement - */ - - if (Terrarum.hasController) { - if (axisX != 0) { - walkHorizontal(axisX < 0, AXIS_POSMAX); - } - } - else { - // ↑F, ↓S - if (isFuncDown(input, EnumKeyFunc.MOVE_RIGHT) - && !isFuncDown(input, EnumKeyFunc.MOVE_LEFT)) { - walkHorizontal(false, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT); - } - // ↓F, ↑S - else if (isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && !isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - walkHorizontal(true, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT); - } - // ↓F, ↓S - else if (isFuncDown(input, EnumKeyFunc.MOVE_LEFT) - && isFuncDown(input, EnumKeyFunc.MOVE_RIGHT)) { - if (prevHMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT)) { - walkHorizontal(false, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT); - } - else if (prevHMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_RIGHT)) { - walkHorizontal(true, AXIS_POSMAX); - prevHMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_LEFT); - } - } - } - - /** - * Up/Down movement - */ - if (noClip) { - if (Terrarum.hasController) { - if (axisY != 0) { - walkVertical(axisY > 0, AXIS_POSMAX); - } - } - else { - // ↑E - // ↓D - if (isFuncDown(input, EnumKeyFunc.MOVE_DOWN) - && !isFuncDown(input, EnumKeyFunc.MOVE_UP)) { - walkVertical(false, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN); - } - // ↓E - // ↑D - else if (isFuncDown(input, EnumKeyFunc.MOVE_UP) - && !isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - walkVertical(true, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP); - } - // ↓E - // ↓D - else if (isFuncDown(input, EnumKeyFunc.MOVE_UP) - && isFuncDown(input, EnumKeyFunc.MOVE_DOWN)) { - if (prevVMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP)) { - walkVertical(false, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN); - } - else if (prevVMoveKey == KeyMap.getKeyCode(EnumKeyFunc.MOVE_DOWN)) { - walkVertical(true, AXIS_POSMAX); - prevVMoveKey = KeyMap.getKeyCode(EnumKeyFunc.MOVE_UP); - } - } - } - } - - /** - * Jump control - */ - if (isFuncDown(input, EnumKeyFunc.JUMP) - || (Terrarum.hasController && gamepad.isButtonPressed(GAMEPAD_JUMP))) { - if (!noClip) { - if (super.isGrounded()) { - jumping = true; - } - jump(); - } - else { - walkVertical(true, AXIS_POSMAX); - } - } - else { - jumping = false; - jumpCounter = 0; - } - - } - - public void keyPressed(int key, char c) { - - } - - /** - * See ./work_files/Jump\ power\ by\ pressing\ time.gcx - */ - private void jump() { - if (jumping) { - float len = MAX_JUMP_LENGTH; - float pwr = actorValue.getAsFloat("jumppower"); - - // increment jump counter - if (jumpCounter < len) jumpCounter += 1; - // quadratic time (convex) mode - /* - float sumT = (jumpCounter * (jumpCounter + 1)) / 2f; - float timedJumpCharge = ((len + 1) / 2f) - (sumT / len); - if (timedJumpCharge < 0) timedJumpCharge = 0; - - float jumpAcc = pwr * timedJumpCharge * JUMP_ACCELERATION_MOD; - - super.setVeloY(super.getVeloY() - - jumpAcc - ); - */ - - // linear time mode - float init = (len + 1) / 2f; - float timedJumpCharge = init - (init / len) * jumpCounter; - if (timedJumpCharge < 0) timedJumpCharge = 0; - - float jumpAcc = pwr * timedJumpCharge * JUMP_ACCELERATION_MOD - * FastMath.sqrt(getScale()); - - super.setVeloY(super.getVeloY() - - jumpAcc - ); - - // concave mode? - } - - // for mob AI: - //super.setVeloY(super.getVeloY() - // - - // pwr * FastMath.sqrt(super.getScale()) - //); - } - - private float jumpFuncLin(float pwr, float len) { - return -(pwr / len) * jumpCounter; - } - - private float jumpFuncSqu(float pwr, float len) { - return (pwr / (len * len)) - * (jumpCounter - len) - * (jumpCounter - len) // square - - pwr; - } - - private float jumpFuncExp(float pwr, float len) { - float a = FastMath.pow(pwr + 1, 1 / len); - return -FastMath.pow(a, len) + 1; - } - - private boolean isFuncDown(Input input, EnumKeyFunc fn) { - return input.isKeyDown(KeyMap.getKeyCode(fn)); - } - - private float absClamp(float i, float ceil) { - if (i > 0) - return (i > ceil) ? ceil : i; - else if (i < 0) - return (-i > ceil) ? -ceil : i; - else - return 0; - } - - private void updateSprite(int delta_t) { - sprite.update(delta_t); - if (spriteGlow != null) { - spriteGlow.update(delta_t); - } - - if (super.isGrounded()) { - if (walkHeading == LEFT) { - sprite.flip(true, false); - if (spriteGlow != null) { - spriteGlow.flip(true, false); - } - } - else { - sprite.flip(false, false); - if (spriteGlow != null) { - spriteGlow.flip(false, false); - } - } - } - } - - public boolean isNoClip() { - return noClip; - } - - public void setNoClip(boolean b) { - noClip = b; - } - - public ActorValue getActorValue() { - return actorValue; - } - - public SpriteAnimation getSpriteGlow() { - return spriteGlow; - } - - @Override - public void assignFaction(Faction f) { - factionSet.add(f); - } - - @Override - public void unassignFaction(Faction f) { - factionSet.remove(f); - } - - @Override - public HashSet getAssignedFactions() { - return factionSet; - } - - @Override - public void clearFactionAssigning() { - factionSet.clear(); - } - - @Override - public void setLuminance(char RGB) { - actorValue.set("luminosity", (int) RGB); - } - - @Override - public char getLuminance() { - return actorValue.hasKey("luminosity") ? - (char) actorValue.getAsInt("luminosity") : 0; - } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerDebugger b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerDebugger deleted file mode 100644 index 3999b080c..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerDebugger +++ /dev/null @@ -1,46 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import com.Torvald.spriteAnimation.SpriteAnimation; - -/** - * Created by minjaesong on 16-01-14. - */ -public class PlayerDebugger { - - private Actor actor; - - public PlayerDebugger(Actor actor) { - this.actor = actor; - } - - public Player getPlayer() { - if (actor instanceof Player) { - return (Player) actor; - } - else { - throw new UnsupportedOperationException(); - } - } - - /** - * Delegates for Player instances - */ - - public float baseHitboxW() { return getPlayer().getBaseHitboxW(); } - public float baseHitboxH() { return getPlayer().getBaseHitboxH(); } - public float hitboxTranslateX() { return getPlayer().getHitboxTranslateX(); } - public float hitboxTranslateY() { return getPlayer().getHitboxTranslateY(); } - public float veloX() { return getPlayer().getVeloX(); } - public float veloY() { return getPlayer().getVeloY(); } - public int baseSpriteWidth() { return getPlayer().baseSpriteWidth; } - public int baseSpriteHeight() { return getPlayer().baseSpriteHeight; } - public SpriteAnimation sprite() { return getPlayer().sprite; } - public float scale() { return getPlayer().getScale(); } - public Hitbox hitbox() { return getPlayer().getHitbox(); } - public Hitbox nextHitbox() { return getPlayer().getNextHitbox(); } - public boolean grounded() { return getPlayer().getGrounded(); } - public ActorValue actorValue() { return getPlayer().getActorValue(); } - public float mass() { return getPlayer().getMass(); } - public boolean noClip() { return getPlayer().isNoClip(); } - public int eventMoving() { return getPlayer().eventMoving; } -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerFactory b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerFactory deleted file mode 100644 index a571222d1..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/PlayerFactory +++ /dev/null @@ -1,26 +0,0 @@ -package com.Torvald.Terrarum.Actors; - - -import org.newdawn.slick.SlickException; - -import java.io.IOException; - -/** - * Created by minjaesong on 16-02-03. - */ -public class PlayerFactory { - - private static final String JSONPATH = "./res/raw/"; - private static String jsonString = new String(); - - public Player build(String jsonFileName) throws IOException, SlickException { - Player p = (Player) (new CreatureFactory().build("CreatureHuman")); - - // attach sprite - - // do etc. - - return p; - } - -} diff --git a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Visible b/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Visible deleted file mode 100644 index f78a6cdf4..000000000 --- a/src/com/Torvald/Terrarum/Actors/DeprecatedJavaCode/Visible +++ /dev/null @@ -1,15 +0,0 @@ -package com.Torvald.Terrarum.Actors; - -import org.newdawn.slick.GameContainer; -import org.newdawn.slick.Graphics; - -/** - * Created by minjaesong on 16-01-25. - */ -public interface Visible { - - void drawBody(GameContainer gc, Graphics g); - - void updateBodySprite(GameContainer gc, int delta_t); - -} diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Help.kt b/src/com/Torvald/Terrarum/ConsoleCommand/Help.kt deleted file mode 100644 index e042e38bc..000000000 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Help.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.Torvald.Terrarum.ConsoleCommand - -/** - * Created by minjaesong on 16-03-22. - */ -class Help : ConsoleCommand { - override fun execute(args: Array) { - Echo().execute(arrayOf( - "echo", - "Utility keys:", - "F3: Basic debug information", - "F7: Toggle lightmap blending", - "F8: Toggle smooth lighting" - )) - } - - override fun printUsage() { - Echo().execute("Prints some utility functions assigned to function row of the keyboard.") - } -} \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/DefaultConfig.kt b/src/com/Torvald/Terrarum/DefaultConfig.kt index cc0ffeb51..592b96ef7 100644 --- a/src/com/Torvald/Terrarum/DefaultConfig.kt +++ b/src/com/Torvald/Terrarum/DefaultConfig.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum +package com.torvald.terrarum import com.google.gson.JsonObject diff --git a/src/com/Torvald/Terrarum/Game.kt b/src/com/Torvald/Terrarum/Game.kt index 3d5c3e631..bd94b8966 100644 --- a/src/com/Torvald/Terrarum/Game.kt +++ b/src/com/Torvald/Terrarum/Game.kt @@ -1,24 +1,24 @@ -package com.Torvald.Terrarum +package com.torvald.terrarum -import com.Torvald.Terrarum.Actors.* -import com.Torvald.Terrarum.ConsoleCommand.Authenticator -import com.Torvald.Terrarum.GameControl.GameController -import com.Torvald.Terrarum.GameControl.Key -import com.Torvald.Terrarum.GameControl.KeyMap -import com.Torvald.Terrarum.GameControl.KeyToggler -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.GameMap.WorldTime -import com.Torvald.Terrarum.MapDrawer.LightmapRenderer -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.MapGenerator.MapGenerator -import com.Torvald.Terrarum.MapGenerator.RoguelikeRandomiser -import com.Torvald.Terrarum.TileProperties.TilePropCodex -import com.Torvald.Terrarum.TileStat.TileStat -import com.Torvald.Terrarum.UserInterface.BasicDebugInfoWindow -import com.Torvald.Terrarum.UserInterface.ConsoleWindow -import com.Torvald.Terrarum.UserInterface.Notification -import com.Torvald.Terrarum.UserInterface.UIHandler +import com.torvald.terrarum.gameactors.* +import com.torvald.terrarum.console.Authenticator +import com.torvald.terrarum.gamecontroller.GameController +import com.torvald.terrarum.gamecontroller.Key +import com.torvald.terrarum.gamecontroller.KeyMap +import com.torvald.terrarum.gamecontroller.KeyToggler +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.gamemap.WorldTime +import com.torvald.terrarum.mapdrawer.LightmapRenderer +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.mapgenerator.MapGenerator +import com.torvald.terrarum.mapgenerator.RoguelikeRandomiser +import com.torvald.terrarum.tileproperties.TilePropCodex +import com.torvald.terrarum.tilestats.TileStat +import com.torvald.terrarum.ui.BasicDebugInfoWindow +import com.torvald.terrarum.ui.ConsoleWindow +import com.torvald.terrarum.ui.Notification +import com.torvald.terrarum.ui.UIHandler import com.jme3.math.FastMath import org.lwjgl.opengl.ARBShaderObjects import org.lwjgl.opengl.GL11 @@ -101,7 +101,7 @@ constructor() : BasicGameState() { MapGenerator.attachMap(map) MapGenerator.setSeed(0x51621D2) - //MapGenerator.setSeed(new HQRNG().nextLong()); + //mapgenerator.setSeed(new HQRNG().nextLong()); MapGenerator.generateMap() RoguelikeRandomiser.setSeed(0x540198) @@ -109,8 +109,8 @@ constructor() : BasicGameState() { // add new player and put it to actorContainer - //player = new Player(); - player = PFSigrid.build() + //player = PFSigrid.build() + player = PFCynthia.create() //player.setNoClip(true); actorContainer.add(player) diff --git a/src/com/Torvald/Terrarum/GameConfig.kt b/src/com/Torvald/Terrarum/GameConfig.kt index 2bb01c682..85e774b50 100644 --- a/src/com/Torvald/Terrarum/GameConfig.kt +++ b/src/com/Torvald/Terrarum/GameConfig.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum +package com.torvald.terrarum /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt b/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt index eed2fd7b5..0b38e661f 100644 --- a/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt +++ b/src/com/Torvald/Terrarum/GameItem/InventoryItem.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameItem +package com.torvald.terrarum.gameitem import org.newdawn.slick.GameContainer diff --git a/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt b/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt index cab35535a..f87668814 100644 --- a/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt +++ b/src/com/Torvald/Terrarum/GameItem/TileAsItem.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.GameItem +package com.torvald.terrarum.gameitem -import com.Torvald.Terrarum.TileProperties.TilePropCodex +import com.torvald.terrarum.tileproperties.TilePropCodex import org.newdawn.slick.GameContainer /** diff --git a/src/com/Torvald/Terrarum/GameMap/GameMap.kt b/src/com/Torvald/Terrarum/GameMap/GameMap.kt index 44a529569..53bfc8a05 100644 --- a/src/com/Torvald/Terrarum/GameMap/GameMap.kt +++ b/src/com/Torvald/Terrarum/GameMap/GameMap.kt @@ -7,7 +7,7 @@ * See http://www.gnu.org/licenses/gpl.html for information. */ -package com.Torvald.Terrarum.GameMap +package com.torvald.terrarum.gamemap import org.newdawn.slick.SlickException diff --git a/src/com/Torvald/Terrarum/GameMap/MapLayer.kt b/src/com/Torvald/Terrarum/GameMap/MapLayer.kt index 2c89c3942..cb4384efd 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapLayer.kt +++ b/src/com/Torvald/Terrarum/GameMap/MapLayer.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameMap +package com.torvald.terrarum.gamemap import java.io.Serializable import java.util.Spliterator diff --git a/src/com/Torvald/Terrarum/GameMap/MapPoint.kt b/src/com/Torvald/Terrarum/GameMap/MapPoint.kt index a449e2370..67483036d 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapPoint.kt +++ b/src/com/Torvald/Terrarum/GameMap/MapPoint.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.GameMap +package com.torvald.terrarum.gamemap -import com.Torvald.Point.Point2f +import com.torvald.point.Point2f import java.io.Serializable diff --git a/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt b/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt index a4fd75fa0..44e7d7f60 100644 --- a/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt +++ b/src/com/Torvald/Terrarum/GameMap/PairedMapLayer.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameMap +package com.torvald.terrarum.gamemap import java.io.Serializable import java.util.Spliterator diff --git a/src/com/Torvald/Terrarum/GameMap/WorldTime.kt b/src/com/Torvald/Terrarum/GameMap/WorldTime.kt index d1404edf8..d7f263e5a 100644 --- a/src/com/Torvald/Terrarum/GameMap/WorldTime.kt +++ b/src/com/Torvald/Terrarum/GameMap/WorldTime.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameMap +package com.torvald.terrarum.gamemap /** * Created by minjaesong on 16-01-24. diff --git a/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt b/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt index 511051468..b9272c4df 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt +++ b/src/com/Torvald/Terrarum/ItemProperties/ItemProp.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ItemProperties +package com.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. diff --git a/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt b/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt index 111f97511..028da8b95 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt +++ b/src/com/Torvald/Terrarum/ItemProperties/ItemPropCodex.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ItemProperties +package com.torvald.terrarum.itemproperties -import com.Torvald.Terrarum.Actors.CanBeStoredAsItem -import com.Torvald.Terrarum.GameItem.InventoryItem -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gameactors.CanBeStoredAsItem +import com.torvald.terrarum.gameitem.InventoryItem +import com.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import java.util.* @@ -11,7 +11,7 @@ import java.util.* */ object ItemPropCodex { - val CSV_PATH = "./src/com/Torvald/Terrarum/ItemProperties/itemprop.csv" + val CSV_PATH = "./src/com/torvald/terrarum/itemproperties/itemprop.csv" /** * <ItemID or RefID for Actor, TheItem> diff --git a/src/com/Torvald/Terrarum/ItemProperties/Material.kt b/src/com/Torvald/Terrarum/ItemProperties/Material.kt index 174cedcfc..07cc13820 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/Material.kt +++ b/src/com/Torvald/Terrarum/ItemProperties/Material.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ItemProperties +package com.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. diff --git a/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt b/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt index 4655052f7..dd2ddab87 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt +++ b/src/com/Torvald/Terrarum/ItemProperties/MaterialFactory.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ItemProperties +package com.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt b/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt index 085ce9130..8c080606e 100644 --- a/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt +++ b/src/com/Torvald/Terrarum/ItemProperties/MaterialPropCodex.kt @@ -1,9 +1,9 @@ -package com.Torvald.Terrarum.ItemProperties +package com.torvald.terrarum.itemproperties /** * Created by minjaesong on 16-03-18. */ object MaterialPropCodex { - val CSV_PATH = "./src/com/Torvald/Terrarum/ItemProperties/materialprop.csv" + val CSV_PATH = "./src/com/torvald/terrarum/itemproperties/materialprop.csv" } \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/KVHashMap.kt b/src/com/Torvald/Terrarum/KVHashMap.kt index be065ff2a..d725582bb 100644 --- a/src/com/Torvald/Terrarum/KVHashMap.kt +++ b/src/com/Torvald/Terrarum/KVHashMap.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum +package com.torvald.terrarum import com.google.gson.JsonPrimitive import java.util.* @@ -39,7 +39,7 @@ open class KVHashMap { } fun getAsInt(key: String): Int? { - return get(key) as Int + return get(key) as Int? } fun getAsFloat(key: String): Float? { @@ -47,19 +47,19 @@ open class KVHashMap { if (value is Int) return value.toFloat() else if (value is JsonPrimitive) return value.asFloat - return value as Float + return value as Float? } fun getAsString(key: String): String? { val value = get(key) if (value is JsonPrimitive) return value.asString - return value as String + return value as String? } fun getAsBoolean(key: String): Boolean? { val value = get(key) if (value is JsonPrimitive) return value.asBoolean - return value as Boolean + return value as Boolean? } fun hasKey(key: String): Boolean { diff --git a/src/com/Torvald/Terrarum/LangPack/Lang.kt b/src/com/Torvald/Terrarum/LangPack/Lang.kt index 965d925b6..a8ad22b8b 100644 --- a/src/com/Torvald/Terrarum/LangPack/Lang.kt +++ b/src/com/Torvald/Terrarum/LangPack/Lang.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.LangPack +package com.torvald.terrarum.langpack -import com.Torvald.CSVFetcher -import com.Torvald.ImageFont.GameFontWhite -import com.Torvald.Terrarum.Terrarum +import com.torvald.CSVFetcher +import com.torvald.imagefont.GameFontWhite +import com.torvald.terrarum.Terrarum import org.apache.commons.csv.CSVRecord import org.newdawn.slick.SlickException @@ -78,12 +78,21 @@ object Lang { } operator fun get(key: String): String { + fun fallback(): String = lang[key]!!.get(FALLBACK_LANG_CODE) + var value: String try { value = lang[key]!!.get(Terrarum.gameLocale) + // fallback if empty string + if (value.length == 0) + value = fallback() + } + catch (e1: kotlin.KotlinNullPointerException) { + value = "ERRNULL:$key" } catch (e: IllegalArgumentException) { - value = key + //value = key + value = fallback() } return value diff --git a/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt b/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt index b27de7e43..07f611c14 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt +++ b/src/com/Torvald/Terrarum/MapDrawer/LightmapRenderer.kt @@ -1,10 +1,10 @@ -package com.Torvald.Terrarum.MapDrawer +package com.torvald.terrarum.mapdrawer -import com.Torvald.Terrarum.Actors.ActorWithBody -import com.Torvald.Terrarum.Actors.Luminous -import com.Torvald.Terrarum.GameMap.WorldTime -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TilePropCodex +import com.torvald.terrarum.gameactors.ActorWithBody +import com.torvald.terrarum.gameactors.Luminous +import com.torvald.terrarum.gamemap.WorldTime +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TilePropCodex import com.jme3.math.FastMath import org.newdawn.slick.Color import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt index 88282bf13..00f38d179 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt +++ b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.kt @@ -1,10 +1,10 @@ -package com.Torvald.Terrarum.MapDrawer +package com.torvald.terrarum.mapdrawer -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.GameMap.PairedMapLayer -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TileNameCode -import com.Torvald.Terrarum.TileProperties.TilePropCodex +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.gamemap.PairedMapLayer +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TileNameCode +import com.torvald.terrarum.tileproperties.TilePropCodex import com.jme3.math.FastMath import org.lwjgl.opengl.GL11 import org.newdawn.slick.GameContainer diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt b/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt index 475fd26dc..7d2fb9ae1 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt +++ b/src/com/Torvald/Terrarum/MapDrawer/MapDrawer.kt @@ -1,9 +1,9 @@ -package com.Torvald.Terrarum.MapDrawer +package com.torvald.terrarum.mapdrawer -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TileNameCode -import com.Torvald.Terrarum.TileStat.TileStat +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TileNameCode +import com.torvald.terrarum.tilestats.TileStat import com.jme3.math.FastMath import org.newdawn.slick.* diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt index e429d1665..1ce4ae945 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslandsPreset.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator -import com.Torvald.Rand.HQRNG +import com.torvald.random.HQRNG import com.sun.javaws.exceptions.InvalidArgumentException import java.util.Random diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt index 1337f14bd..1f4fd49fc 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset01.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator internal object FloatingIslePreset01 { var w = 100 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt index 071ad2d57..a2f71ac3e 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset02.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator internal object FloatingIslePreset02 { var w = 80 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt index 7ce8b0a69..830df1524 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset03.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator internal object FloatingIslePreset03 { var w = 66 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt index 23ac7d93c..645b26735 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset04.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator internal object FloatingIslePreset04 { var w = 88 diff --git a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt index 9edfb89e8..849539553 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/FloatingIslePreset05.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator internal object FloatingIslePreset05 { var w = 74 diff --git a/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt b/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt index 5dc7d11ca..3d7c71351 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/MapGenerator.kt @@ -1,9 +1,9 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator -import com.Torvald.Rand.HQRNG -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.GameMap.MapLayer -import com.Torvald.Terrarum.TileProperties.TileNameCode +import com.torvald.random.HQRNG +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.gamemap.MapLayer +import com.torvald.terrarum.tileproperties.TileNameCode import com.jme3.math.FastMath import java.util.* @@ -12,7 +12,7 @@ object MapGenerator { private lateinit var map: GameMap private lateinit var random: Random //private static float[] noiseArray; - private var seed: Long? = null + private var seed: Long = 0 private var width: Int = 0 private var height: Int = 0 @@ -51,7 +51,7 @@ object MapGenerator { private val CAVEGEN_LARGEST_FEATURE = 256 private val CAVEGEN_LARGEST_FEATURE_PERTURB = 128 - private var worldOceanPosition: Int? = null + private var worldOceanPosition: Int = -1 private val TYPE_OCEAN_LEFT = 0 private val TYPE_OCEAN_RIGHT = 1 @@ -88,7 +88,7 @@ object MapGenerator { @JvmStatic fun generateMap() { random = HQRNG(seed!!) - println("[MapGenerator] Seed: " + seed) + println("[mapgenerator] Seed: " + seed) worldOceanPosition = if (random.nextBoolean()) TYPE_OCEAN_LEFT else TYPE_OCEAN_RIGHT @@ -468,7 +468,7 @@ object MapGenerator { } private fun placeGlacierMount(heightMap: IntArray) { - println("[MapGenerator] Putting glacier...") + println("[mapgenerator] Putting glacier...") // raise for (i in heightMap.indices) { @@ -498,7 +498,7 @@ object MapGenerator { } private fun heightMapToObjectMap(fs: IntArray) { - println("[MapGenerator] Shaping world as processed...") + println("[mapgenerator] Shaping world as processed...") // iterate for heightmap for (x in 0..width - 1) { @@ -586,7 +586,7 @@ object MapGenerator { /* 2. Carve */ private fun carveCave(noisemap: Array, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -608,7 +608,7 @@ object MapGenerator { * @param message */ private fun carveByMap(noisemap: Array, scarcity: Float, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -632,7 +632,7 @@ object MapGenerator { * @param message */ private fun fillByMap(noisemap: Array, scarcity: Float, replaceFrom: Int, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -656,7 +656,7 @@ object MapGenerator { * @param message */ private fun fillByMapInverseGradFilter(noisemap: Array, scarcity: Float, replaceFrom: Int, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -684,7 +684,7 @@ object MapGenerator { * @param message */ private fun fillByMapNoFilter(noisemap: Array, scarcity: Float, replaceFrom: Int, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -696,7 +696,7 @@ object MapGenerator { } private fun fillByMapNoFilterUnderground(noisemap: Array, scarcity: Float, replaceFrom: Int, tile: Int, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -710,7 +710,7 @@ object MapGenerator { } private fun fillByMap(noisemap: Array, scarcity: Float, replaceFrom: Int, tile: IntArray, message: String) { - println("[MapGenerator] " + message) + println("[mapgenerator] " + message) for (i in 0..height - 1) { for (j in 0..width - 1) { @@ -862,7 +862,7 @@ object MapGenerator { } private fun generateFloatingIslands() { - println("[MapGenerator] Placing floating islands...") + println("[mapgenerator] Placing floating islands...") val nIslandsMax = Math.round(map.width * 6f / 8192f) val nIslandsMin = Math.max(2, Math.round(map.width * 4f / 8192f)) @@ -894,7 +894,7 @@ object MapGenerator { /* Flood */ private fun floodBottomLava() { - println("[MapGenerator] Flooding bottom lava...") + println("[mapgenerator] Flooding bottom lava...") for (i in height * 14 / 15..height - 1) { for (j in 0..width - 1) { if (map.terrainArray[i][j].toInt() == 0) { @@ -907,7 +907,7 @@ object MapGenerator { /* Plant */ private fun plantGrass() { - println("[MapGenerator] Planting grass...") + println("[mapgenerator] Planting grass...") /* TODO composing dirt and stone * over certain level, use background dirt with stone 'peckles' @@ -970,7 +970,7 @@ object MapGenerator { "green" else "white" - println("[MapGenerator] Beach sand type: " + thisSandStr) + println("[mapgenerator] Beach sand type: " + thisSandStr) var ix = 0 while (ix < OCEAN_WIDTH * 1.5) { @@ -1030,7 +1030,7 @@ object MapGenerator { /** - * @return width of the frozen area for MapGenerator.freeze + * @return width of the frozen area for mapgenerator.freeze */ private fun getFrozenAreaWidth(y: Int): Int { val randDeviation = 7 diff --git a/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt b/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt index 2166fc591..26a125e95 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/RoguelikeRandomiser.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator -import com.Torvald.ColourUtil.Col4096 -import com.Torvald.Rand.HQRNG +import com.torvald.colourutil.Col4096 +import com.torvald.random.HQRNG import java.util.* /** diff --git a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt b/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt index ef3885360..7d998bb42 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator -import com.Torvald.Rand.HQRNG +import com.torvald.random.HQRNG import com.jme3.math.FastMath class SimplexNoise diff --git a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt b/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt index e856502d6..574c6bc7d 100644 --- a/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt +++ b/src/com/Torvald/Terrarum/MapGenerator/SimplexNoise_octave.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.MapGenerator +package com.torvald.terrarum.mapgenerator /* * A speed-improved simplex noise algorithm for 2D, 3D and 4D in Java. @@ -17,7 +17,7 @@ package com.Torvald.Terrarum.MapGenerator * */ -import com.Torvald.Rand.HQRNG +import com.torvald.random.HQRNG class SimplexNoise_octave(seed: Int) { // Simplex noise in 2D, 3D and 4D diff --git a/src/com/Torvald/Terrarum/Terrarum.kt b/src/com/Torvald/Terrarum/Terrarum.kt index 2466ecb8b..cdfbab2a6 100644 --- a/src/com/Torvald/Terrarum/Terrarum.kt +++ b/src/com/Torvald/Terrarum/Terrarum.kt @@ -1,9 +1,9 @@ -package com.Torvald.Terrarum +package com.torvald.terrarum -import com.Torvald.ImageFont.GameFontWhite -import com.Torvald.JsonFetcher -import com.Torvald.JsonWriter -import com.Torvald.Terrarum.LangPack.Lang +import com.torvald.imagefont.GameFontWhite +import com.torvald.JsonFetcher +import com.torvald.JsonWriter +import com.torvald.terrarum.langpack.Lang import org.lwjgl.input.Controllers import org.newdawn.slick.AppGameContainer import org.newdawn.slick.Font @@ -39,7 +39,7 @@ constructor(gamename: String) : StateBasedGame(gamename) { if (gameLocale.length < 4) gameLocale = sysLang - println("[Terrarum] Locale: " + gameLocale) + println("[terrarum] Locale: " + gameLocale) } @Throws(SlickException::class) @@ -105,7 +105,7 @@ constructor(gamename: String) : StateBasedGame(gamename) { @JvmStatic fun main(args: Array) { try { - appgc = AppGameContainer(Terrarum("Terrarum")) + appgc = AppGameContainer(Terrarum("terrarum")) appgc.setDisplayMode(WIDTH, HEIGHT, false) appgc.setTargetFrameRate(TARGET_INTERNAL_FPS) @@ -131,11 +131,11 @@ constructor(gamename: String) : StateBasedGame(gamename) { val OS = System.getProperty("os.name").toUpperCase() if (OS.contains("WIN")) { OperationSystem = "WINDOWS" - defaultDir = System.getenv("APPDATA") + "/Terrarum" + defaultDir = System.getenv("APPDATA") + "/terrarum" } else if (OS.contains("OS X")) { OperationSystem = "OSX" - defaultDir = System.getProperty("user.home") + "/Library/Application Support/Terrarum" + defaultDir = System.getProperty("user.home") + "/Library/Application Support/terrarum" } else if (OS.contains("NUX") || OS.contains("NIX")) { OperationSystem = "LINUX" diff --git a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt index f1e744f57..6a9950891 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt +++ b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.TileProperties +package com.torvald.terrarum.tileproperties -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-02-21. diff --git a/src/com/Torvald/Terrarum/TileProperties/TileProp.kt b/src/com/Torvald/Terrarum/TileProperties/TileProp.kt index 9978e41d1..45b373225 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileProp.kt +++ b/src/com/Torvald/Terrarum/TileProperties/TileProp.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.TileProperties +package com.torvald.terrarum.tileproperties /** * Created by minjaesong on 16-02-16. diff --git a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt index 081feb2bb..ef614bdf9 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt +++ b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.TileProperties +package com.torvald.terrarum.tileproperties -import com.Torvald.CSVFetcher -import com.Torvald.Terrarum.GameMap.MapLayer -import com.Torvald.Terrarum.GameMap.PairedMapLayer +import com.torvald.CSVFetcher +import com.torvald.terrarum.gamemap.MapLayer +import com.torvald.terrarum.gamemap.PairedMapLayer import org.apache.commons.csv.CSVRecord import java.io.IOException @@ -42,7 +42,7 @@ class TilePropCodex { private lateinit var tileProps: Array - val CSV_PATH = "./src/com/Torvald/Terrarum/TileProperties/tileprop.csv" + val CSV_PATH = "./src/com/torvald/terrarum/tileproperties/tileprop.csv" fun getProp(index: Int, damage: Int): TileProp { try { diff --git a/src/com/Torvald/Terrarum/Actors/AIControlled.kt b/src/com/Torvald/Terrarum/gameactors/AIControlled.kt similarity index 53% rename from src/com/Torvald/Terrarum/Actors/AIControlled.kt rename to src/com/Torvald/Terrarum/gameactors/AIControlled.kt index 82729002a..2a330c734 100644 --- a/src/com/Torvald/Terrarum/Actors/AIControlled.kt +++ b/src/com/Torvald/Terrarum/gameactors/AIControlled.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.Actors.AI.ActorAI +import com.torvald.terrarum.gameactors.ai.ActorAI /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/Actors/Actor.kt b/src/com/Torvald/Terrarum/gameactors/Actor.kt similarity index 81% rename from src/com/Torvald/Terrarum/Actors/Actor.kt rename to src/com/Torvald/Terrarum/gameactors/Actor.kt index af99e0f4e..ecb80ccc7 100644 --- a/src/com/Torvald/Terrarum/Actors/Actor.kt +++ b/src/com/Torvald/Terrarum/gameactors/Actor.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer @@ -14,4 +14,6 @@ interface Actor { * @return Reference ID. (32768-0x7FFF_FFFF_FFFF_FFFF) */ var referenceID: Long + + var actorValue: ActorValue } \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/ActorInventory.kt b/src/com/Torvald/Terrarum/gameactors/ActorInventory.kt similarity index 95% rename from src/com/Torvald/Terrarum/Actors/ActorInventory.kt rename to src/com/Torvald/Terrarum/gameactors/ActorInventory.kt index 72b3f52c9..4490e8692 100644 --- a/src/com/Torvald/Terrarum/Actors/ActorInventory.kt +++ b/src/com/Torvald/Terrarum/gameactors/ActorInventory.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.GameItem.InventoryItem -import com.Torvald.Terrarum.ItemProperties.ItemPropCodex +import com.torvald.terrarum.gameitem.InventoryItem +import com.torvald.terrarum.itemproperties.ItemPropCodex import java.util.* /** diff --git a/src/com/Torvald/Terrarum/Actors/ActorValue.kt b/src/com/Torvald/Terrarum/gameactors/ActorValue.kt similarity index 50% rename from src/com/Torvald/Terrarum/Actors/ActorValue.kt rename to src/com/Torvald/Terrarum/gameactors/ActorValue.kt index 6d98c83fa..8167f065f 100644 --- a/src/com/Torvald/Terrarum/Actors/ActorValue.kt +++ b/src/com/Torvald/Terrarum/gameactors/ActorValue.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.KVHashMap +import com.torvald.terrarum.KVHashMap /** * Created by minjaesong on 16-03-19. diff --git a/src/com/Torvald/Terrarum/Actors/ActorWithBody.kt b/src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt similarity index 98% rename from src/com/Torvald/Terrarum/Actors/ActorWithBody.kt rename to src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt index f92a7a550..5cfdf12de 100644 --- a/src/com/Torvald/Terrarum/Actors/ActorWithBody.kt +++ b/src/com/Torvald/Terrarum/gameactors/ActorWithBody.kt @@ -1,11 +1,11 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Rand.HQRNG -import com.Torvald.Terrarum.* -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.TileProperties.TilePropCodex -import com.Torvald.spriteAnimation.SpriteAnimation +import com.torvald.random.HQRNG +import com.torvald.terrarum.* +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.tileproperties.TilePropCodex +import com.torvald.spriteanimation.SpriteAnimation import com.jme3.math.FastMath import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics @@ -15,7 +15,7 @@ import org.newdawn.slick.Graphics */ open class ActorWithBody constructor() : Actor, Visible, Glowing { - internal var actorValue: ActorValue + override var actorValue: ActorValue = ActorValue() var hitboxTranslateX: Float = 0.toFloat()// relative to spritePosX var hitboxTranslateY: Float = 0.toFloat()// relative to spritePosY @@ -79,7 +79,7 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { private var density = 1000f /** - * Gravitational Constant G. Load from GameMap. + * Gravitational Constant G. Load from gamemap. * [m / s^2] * s^2 = 1/FPS = 1/60 if FPS is targeted to 60 * meter to pixel : 24/FPS @@ -134,7 +134,6 @@ open class ActorWithBody constructor() : Actor, Visible, Glowing { init { // referenceID = HQRNG().nextLong() // renew ID just in case - actorValue = ActorValue() map = Terrarum.game.map } diff --git a/src/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.kt b/src/com/Torvald/Terrarum/gameactors/CanBeStoredAsItem.kt similarity index 71% rename from src/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.kt rename to src/com/Torvald/Terrarum/gameactors/CanBeStoredAsItem.kt index 2a50926bf..ecb950b2c 100644 --- a/src/com/Torvald/Terrarum/Actors/CanBeStoredAsItem.kt +++ b/src/com/Torvald/Terrarum/gameactors/CanBeStoredAsItem.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.GameItem.InventoryItem +import com.torvald.terrarum.gameitem.InventoryItem /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/Actors/Controllable.kt b/src/com/Torvald/Terrarum/gameactors/Controllable.kt similarity index 81% rename from src/com/Torvald/Terrarum/Actors/Controllable.kt rename to src/com/Torvald/Terrarum/gameactors/Controllable.kt index 43d1a3160..255e5d60f 100644 --- a/src/com/Torvald/Terrarum/Actors/Controllable.kt +++ b/src/com/Torvald/Terrarum/gameactors/Controllable.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.Input diff --git a/src/com/Torvald/Terrarum/gameactors/CreatureFactory.kt b/src/com/Torvald/Terrarum/gameactors/CreatureFactory.kt new file mode 100644 index 000000000..60aa64d2f --- /dev/null +++ b/src/com/Torvald/Terrarum/gameactors/CreatureFactory.kt @@ -0,0 +1,27 @@ +package com.torvald.terrarum.gameactors + +import com.torvald.JsonFetcher +import com.torvald.random.Fudge3 +import com.torvald.random.HQRNG +import com.torvald.terrarum.langpack.Lang +import com.google.gson.JsonObject +import org.newdawn.slick.SlickException +import java.io.IOException + +/** + * Created by minjaesong on 16-03-14. + */ + +object CreatureFactory { + + /** + * @Param jsonFileName with extension + */ + @Throws(IOException::class, SlickException::class) + fun create(jsonFileName: String): ActorWithBody { + val actor = ActorWithBody() + CreatureRawInjector.inject(actor.actorValue, jsonFileName) + + return actor + } +} \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/CreatureFactory.kt b/src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt similarity index 52% rename from src/com/Torvald/Terrarum/Actors/CreatureFactory.kt rename to src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt index 8b56b40e7..379ee684a 100644 --- a/src/com/Torvald/Terrarum/Actors/CreatureFactory.kt +++ b/src/com/Torvald/Terrarum/gameactors/CreatureRawInjector.kt @@ -1,111 +1,107 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.JsonFetcher -import com.Torvald.Rand.Fudge3 -import com.Torvald.Rand.HQRNG -import com.Torvald.Terrarum.LangPack.Lang +import com.torvald.JsonFetcher +import com.torvald.random.Fudge3 +import com.torvald.random.HQRNG +import com.torvald.terrarum.langpack.Lang import com.google.gson.JsonObject import org.newdawn.slick.SlickException import java.io.IOException /** - * Created by minjaesong on 16-03-14. + * Created by minjaesong on 16-03-25. */ +object CreatureRawInjector { -object CreatureFactory { + const val JSONPATH = "./res/raw/" + private const val MULTIPLIER_RAW_ELEM_SUFFIX = "mult" - private val JSONPATH = "./res/raw/" - - @JvmStatic + /** + * 'Injects' creature raw ActorValue to the ActorValue reference provided. + * + * @param actorValueRef ActorValue object to be injected. + */ @Throws(IOException::class, SlickException::class) - fun build(jsonFileName: String): ActorWithBody { + fun inject(actorValueRef: ActorValue, jsonFileName: String) { val jsonObj = JsonFetcher.readJson(JSONPATH + jsonFileName) - val actor = ActorWithBody() - val elementsString = arrayOf("racename", "racenameplural") - val elementsFloat = arrayOf("baseheight", "basemass", "accel", "toolsize", "encumbrance") - val elementsFloatVariable = arrayOf("strength", "speed", "jumppower", "scale", "speed") - val elementsBoolean = arrayOf("intelligent") + // val elementsMultiplyFromOne = arrayOf() - val elementsMultiplyFromOne = arrayOf("physiquemult") + setAVStrings(actorValueRef, elementsString, jsonObj) + setAVFloats(actorValueRef, elementsFloat, jsonObj) + setAVFloatsVariable(actorValueRef, elementsFloatVariable, jsonObj) + // setAVMultiplyFromOne(actorValueRef, elementsMultiplyFromOne, jsonObj) + setAVBooleans(actorValueRef, elementsBoolean, jsonObj) - - setAVStrings(actor, elementsString, jsonObj) - setAVFloats(actor, elementsFloat, jsonObj) - setAVFloatsVariable(actor, elementsFloatVariable, jsonObj) - setAVMultiplyFromOne(actor, elementsMultiplyFromOne, jsonObj) - setAVBooleans(actor, elementsBoolean, jsonObj) - - actor.actorValue.set("accel", Player.WALK_ACCEL_BASE) - actor.actorValue.set("accelmult", 1f) - - return actor + actorValueRef["accel"] = Player.WALK_ACCEL_BASE + actorValueRef["accelmult"] = 1f } /** * Fetch and set actor values that have 'variable' appended. E.g. strength - * @param p + * @param avRef * * * @param elemSet * * * @param jsonObject */ - private fun setAVFloatsVariable(p: ActorWithBody, elemSet: Array, jsonObject: JsonObject) { + private fun setAVFloatsVariable(avRef: ActorValue, elemSet: Array, jsonObject: JsonObject) { for (s in elemSet) { val baseValue = jsonObject.get(s).asFloat // roll fudge dice and get value [-3, 3] as [0, 6] val varSelected = Fudge3(HQRNG()).rollForArray() // get multiplier from json. Assuming percentile - val multiplier = jsonObject.get(s + "variable").asJsonArray.get(varSelected).asInt + val multiplier = jsonObject.get(s + MULTIPLIER_RAW_ELEM_SUFFIX).asJsonArray.get(varSelected).asInt val realValue = baseValue * multiplier / 100f - p.actorValue.set(s, realValue) + avRef[s] = realValue + avRef[s + MULTIPLIER_RAW_ELEM_SUFFIX] = 1.0f // use multiplied value as 'base' for all sort of things } } /** * Fetch and set string actor values - * @param p + * @param avRef * * * @param elemSet * * * @param jsonObject */ - private fun setAVStrings(p: ActorWithBody, elemSet: Array, jsonObject: JsonObject) { + private fun setAVStrings(avRef: ActorValue, elemSet: Array, jsonObject: JsonObject) { for (s in elemSet) { val key = jsonObject.get(s).asString - p.actorValue.set(s, Lang.get(key)) + avRef[s] = Lang[key] } } /** * Fetch and set float actor values - * @param p + * @param avRef * * * @param elemSet * * * @param jsonObject */ - private fun setAVFloats(p: ActorWithBody, elemSet: Array, jsonObject: JsonObject) { + private fun setAVFloats(avRef: ActorValue, elemSet: Array, jsonObject: JsonObject) { for (s in elemSet) { - p.actorValue.set(s, jsonObject.get(s).asFloat) + avRef[s] = jsonObject.get(s).asFloat } } /** * Fetch and set actor values that should multiplier be applied to the base value of 1. * E.g. physiquemult - * @param p + * @param avRef * * * @param elemSet * * * @param jsonObject */ - private fun setAVMultiplyFromOne(p: ActorWithBody, elemSet: Array, jsonObject: JsonObject) { + private fun setAVMultiplyFromOne(avRef: ActorValue, elemSet: Array, jsonObject: JsonObject) { for (s in elemSet) { val baseValue = 1f // roll fudge dice and get value [-3, 3] as [0, 6] @@ -114,13 +110,13 @@ object CreatureFactory { val multiplier = jsonObject.get(s).asJsonArray.get(varSelected).asInt val realValue = baseValue * multiplier / 100f - p.actorValue.set(s, realValue) + avRef[s] = realValue } } - private fun setAVBooleans(p: ActorWithBody, elemSet: Array, jsonObject: JsonObject) { + private fun setAVBooleans(avRef: ActorValue, elemSet: Array, jsonObject: JsonObject) { for (s in elemSet) { - p.actorValue.set(s, jsonObject.get(s).asBoolean) + avRef[s] = jsonObject.get(s).asBoolean } } } \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/DroppedItem.kt b/src/com/Torvald/Terrarum/gameactors/DroppedItem.kt similarity index 90% rename from src/com/Torvald/Terrarum/Actors/DroppedItem.kt rename to src/com/Torvald/Terrarum/gameactors/DroppedItem.kt index 7a862fa33..6eb4d3ecc 100644 --- a/src/com/Torvald/Terrarum/Actors/DroppedItem.kt +++ b/src/com/Torvald/Terrarum/gameactors/DroppedItem.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/Actors/Factionable.kt b/src/com/Torvald/Terrarum/gameactors/Factionable.kt similarity index 57% rename from src/com/Torvald/Terrarum/Actors/Factionable.kt rename to src/com/Torvald/Terrarum/gameactors/Factionable.kt index 912e8248e..e6dc5e179 100644 --- a/src/com/Torvald/Terrarum/Actors/Factionable.kt +++ b/src/com/Torvald/Terrarum/gameactors/Factionable.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.Actors.Faction.Faction +import com.torvald.terrarum.gameactors.faction.Faction import java.util.* /** diff --git a/src/com/Torvald/Terrarum/Actors/Glowing.kt b/src/com/Torvald/Terrarum/gameactors/Glowing.kt similarity index 86% rename from src/com/Torvald/Terrarum/Actors/Glowing.kt rename to src/com/Torvald/Terrarum/gameactors/Glowing.kt index 1890e2820..de6acb7a2 100644 --- a/src/com/Torvald/Terrarum/Actors/Glowing.kt +++ b/src/com/Torvald/Terrarum/gameactors/Glowing.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/Actors/Hitbox.kt b/src/com/Torvald/Terrarum/gameactors/Hitbox.kt similarity index 97% rename from src/com/Torvald/Terrarum/Actors/Hitbox.kt rename to src/com/Torvald/Terrarum/gameactors/Hitbox.kt index 8631ac807..7bdb40fb4 100644 --- a/src/com/Torvald/Terrarum/Actors/Hitbox.kt +++ b/src/com/Torvald/Terrarum/gameactors/Hitbox.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Point.Point2f +import com.torvald.point.Point2f /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/Actors/LandHolder.kt b/src/com/Torvald/Terrarum/gameactors/LandHolder.kt similarity index 90% rename from src/com/Torvald/Terrarum/Actors/LandHolder.kt rename to src/com/Torvald/Terrarum/gameactors/LandHolder.kt index a246d0960..22224f44d 100644 --- a/src/com/Torvald/Terrarum/Actors/LandHolder.kt +++ b/src/com/Torvald/Terrarum/gameactors/LandHolder.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import java.util.* diff --git a/src/com/Torvald/Terrarum/Actors/Luminous.kt b/src/com/Torvald/Terrarum/gameactors/Luminous.kt similarity index 91% rename from src/com/Torvald/Terrarum/Actors/Luminous.kt rename to src/com/Torvald/Terrarum/gameactors/Luminous.kt index 714a4587f..9051890b7 100644 --- a/src/com/Torvald/Terrarum/Actors/Luminous.kt +++ b/src/com/Torvald/Terrarum/gameactors/Luminous.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/Actors/NPCIntelligentBase.kt b/src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt similarity index 89% rename from src/com/Torvald/Terrarum/Actors/NPCIntelligentBase.kt rename to src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt index f5a1cd3de..2a53d7293 100644 --- a/src/com/Torvald/Terrarum/Actors/NPCIntelligentBase.kt +++ b/src/com/Torvald/Terrarum/gameactors/NPCIntelligentBase.kt @@ -1,10 +1,10 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Rand.HQRNG -import com.Torvald.Terrarum.Actors.AI.ActorAI -import com.Torvald.Terrarum.Actors.Faction.Faction -import com.Torvald.Terrarum.GameItem.InventoryItem -import com.Torvald.Terrarum.Terrarum +import com.torvald.random.HQRNG +import com.torvald.terrarum.gameactors.ai.ActorAI +import com.torvald.terrarum.gameactors.faction.Faction +import com.torvald.terrarum.gameitem.InventoryItem +import com.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import java.util.* diff --git a/src/com/Torvald/Terrarum/gameactors/PFCynthia.kt b/src/com/Torvald/Terrarum/gameactors/PFCynthia.kt new file mode 100644 index 000000000..2b128f978 --- /dev/null +++ b/src/com/Torvald/Terrarum/gameactors/PFCynthia.kt @@ -0,0 +1,30 @@ +package com.torvald.terrarum.gameactors + +import com.torvald.spriteanimation.SpriteAnimation + +/** + * Created by minjaesong on 16-03-25. + */ +object PFCynthia { + + fun create(): Player { + val p: Player = Player() + CreatureRawInjector.inject(p.actorValue, "CreatureHuman.json") + + p.actorValue["selectedtile"] = 16 + + p.sprite = SpriteAnimation() + p.sprite!!.setDimension(26, 42) + p.sprite!!.setSpriteImage("res/graphics/sprites/test_player_2.png") + p.sprite!!.setDelay(200) + p.sprite!!.setRowsAndFrames(1, 1) + p.sprite!!.setAsVisible() + + p.setHitboxDimension(15, 40, 9, 0) + + p.setPosition((4096 * 16).toFloat(), (300 * 16).toFloat()) + + return p + } + +} \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/Actors/PFSigrid.kt b/src/com/Torvald/Terrarum/gameactors/PFSigrid.kt similarity index 68% rename from src/com/Torvald/Terrarum/Actors/PFSigrid.kt rename to src/com/Torvald/Terrarum/gameactors/PFSigrid.kt index 282d86c57..ae7f7f3de 100644 --- a/src/com/Torvald/Terrarum/Actors/PFSigrid.kt +++ b/src/com/Torvald/Terrarum/gameactors/PFSigrid.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.JsonFetcher -import com.Torvald.Terrarum.Actors.Faction.Faction -import com.Torvald.spriteAnimation.SpriteAnimation +import com.torvald.JsonFetcher +import com.torvald.terrarum.gameactors.faction.Faction +import com.torvald.spriteanimation.SpriteAnimation import com.google.gson.JsonObject import org.newdawn.slick.SlickException import java.io.IOException @@ -15,9 +15,7 @@ object PFSigrid { private val FACTION_PATH = "./res/raw/" - @JvmStatic - @Throws(SlickException::class) - fun build(): Player { + fun create(): Player { val p = Player() p.sprite = SpriteAnimation() @@ -35,33 +33,34 @@ object PFSigrid { p.spriteGlow!!.setAsVisible() p.actorValue = ActorValue() - p.actorValue.set("scale", 1.0f) - p.actorValue.set("speed", 4.0f) - p.actorValue.set("speedmult", 1.0f) - p.actorValue.set("accel", Player.WALK_ACCEL_BASE) - p.actorValue.set("accelmult", 1.0f) + p.actorValue["scale"] = 1.0f + p.actorValue["speed"] = 4.0f + p.actorValue["speedmult"] = 1.0f + p.actorValue["accel"] = Player.WALK_ACCEL_BASE + p.actorValue["accelmult"] = 1.0f - p.actorValue.set("jumppower", 5f) + p.actorValue["jumppower"] = 5f - p.actorValue.set("basemass", 80f) + p.actorValue["basemass"] = 80f - p.actorValue.set("physiquemult", 1) // Constant 1.0 for player, meant to be used by random mobs + p.actorValue["physiquemult"] = 1 // Constant 1.0 for player, meant to be used by random mobs /** * fixed value, or 'base value', from creature strength of Dwarf Fortress. * Human race uses 1000. (see CreatureHuman.json) */ - p.actorValue.set("strength", 1414) - p.actorValue.set("encumbrance", 1000) + p.actorValue["strength"] = 1414 + p.actorValue["encumbrance"] = 1000 - p.actorValue.set("name", "Sigrid") + p.actorValue["name"] = "Sigrid" - p.actorValue.set("intelligent", true) + p.actorValue["intelligent"] = true - p.actorValue.set("luminosity", 5980540) + p.actorValue["luminosity"] = 5980540 - p.actorValue.set("selectedtile", 16) + p.actorValue["selectedtile"] = 16 - p.setHitboxDimension(18, 46, 8, 0) + //p.setHitboxDimension(18, 46, 8, 0) + p.setHitboxDimension(15, 46, 10, 0) p.inventory = ActorInventory(0x7FFFFFFF, true) diff --git a/src/com/Torvald/Terrarum/Actors/PhysTestBall.kt b/src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt similarity index 93% rename from src/com/Torvald/Terrarum/Actors/PhysTestBall.kt rename to src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt index 17c808645..c30c9942b 100644 --- a/src/com/Torvald/Terrarum/Actors/PhysTestBall.kt +++ b/src/com/Torvald/Terrarum/gameactors/PhysTestBall.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.Color import org.newdawn.slick.GameContainer diff --git a/src/com/Torvald/Terrarum/Actors/Player.kt b/src/com/Torvald/Terrarum/gameactors/Player.kt similarity index 96% rename from src/com/Torvald/Terrarum/Actors/Player.kt rename to src/com/Torvald/Terrarum/gameactors/Player.kt index 018990630..512dc3a4e 100644 --- a/src/com/Torvald/Terrarum/Actors/Player.kt +++ b/src/com/Torvald/Terrarum/gameactors/Player.kt @@ -1,11 +1,11 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors -import com.Torvald.Terrarum.Actors.Faction.Faction -import com.Torvald.Terrarum.GameControl.EnumKeyFunc -import com.Torvald.Terrarum.GameControl.KeyMap -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.Terrarum -import com.Torvald.spriteAnimation.SpriteAnimation +import com.torvald.terrarum.gameactors.faction.Faction +import com.torvald.terrarum.gamecontroller.EnumKeyFunc +import com.torvald.terrarum.gamecontroller.KeyMap +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.Terrarum +import com.torvald.spriteanimation.SpriteAnimation import com.jme3.math.FastMath import org.lwjgl.input.Controller import org.lwjgl.input.Controllers @@ -71,7 +71,7 @@ class Player : ActorWithBody, Controllable, Pocketed, Factionable, Luminous, Lan override var luminosity: Int get() = actorValue.getAsInt("luminosity") ?: 0 set(value) { - actorValue.set("luminosity", value) + actorValue["luminosity"] = value } companion object { @@ -422,7 +422,7 @@ class Player : ActorWithBody, Controllable, Pocketed, Factionable, Luminous, Lan // try concave mode? } - // for mob AI: + // for mob ai: //super.setVeloY(veloY // - // pwr * FastMath.sqrt(scale) @@ -484,10 +484,6 @@ class Player : ActorWithBody, Controllable, Pocketed, Factionable, Luminous, Lan noClip = b } - fun getActorValue(): ActorValue { - return actorValue - } - override fun addHouseTile(x: Int, y: Int) { throw UnsupportedOperationException() } diff --git a/src/com/Torvald/Terrarum/Actors/PlayerFactory.kt b/src/com/Torvald/Terrarum/gameactors/PlayerFactory.kt similarity index 66% rename from src/com/Torvald/Terrarum/Actors/PlayerFactory.kt rename to src/com/Torvald/Terrarum/gameactors/PlayerFactory.kt index 006059990..3763e3a76 100644 --- a/src/com/Torvald/Terrarum/Actors/PlayerFactory.kt +++ b/src/com/Torvald/Terrarum/gameactors/PlayerFactory.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.SlickException import java.io.IOException @@ -10,10 +10,10 @@ object PlayerFactory { private val JSONPATH = "./res/raw/" private val jsonString = String() - @JvmStatic @Throws(IOException::class, SlickException::class) - fun build(jsonFileName: String): Player { - var p: Player = CreatureFactory.build("CreatureHuman") as Player + fun create(): Player { + val p: Player = Player() + CreatureRawInjector.inject(p.actorValue, "CreatureHuman.json") // attach sprite diff --git a/src/com/Torvald/Terrarum/Actors/Pocketed.kt b/src/com/Torvald/Terrarum/gameactors/Pocketed.kt similarity index 72% rename from src/com/Torvald/Terrarum/Actors/Pocketed.kt rename to src/com/Torvald/Terrarum/gameactors/Pocketed.kt index b482f0e21..63a1a40f7 100644 --- a/src/com/Torvald/Terrarum/Actors/Pocketed.kt +++ b/src/com/Torvald/Terrarum/gameactors/Pocketed.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/Actors/Visible.kt b/src/com/Torvald/Terrarum/gameactors/Visible.kt similarity index 86% rename from src/com/Torvald/Terrarum/Actors/Visible.kt rename to src/com/Torvald/Terrarum/gameactors/Visible.kt index 693e12896..da18377ec 100644 --- a/src/com/Torvald/Terrarum/Actors/Visible.kt +++ b/src/com/Torvald/Terrarum/gameactors/Visible.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors +package com.torvald.terrarum.gameactors import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/Actors/AI/ActorAI.kt b/src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt similarity index 61% rename from src/com/Torvald/Terrarum/Actors/AI/ActorAI.kt rename to src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt index 952a1b735..c4c18780d 100644 --- a/src/com/Torvald/Terrarum/Actors/AI/ActorAI.kt +++ b/src/com/Torvald/Terrarum/gameactors/ai/ActorAI.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors.AI +package com.torvald.terrarum.gameactors.ai /** * Created by minjaesong on 16-03-14. diff --git a/src/com/Torvald/Terrarum/Actors/Faction/Faction.kt b/src/com/Torvald/Terrarum/gameactors/faction/Faction.kt similarity index 96% rename from src/com/Torvald/Terrarum/Actors/Faction/Faction.kt rename to src/com/Torvald/Terrarum/gameactors/faction/Faction.kt index b03817944..558babda1 100644 --- a/src/com/Torvald/Terrarum/Actors/Faction/Faction.kt +++ b/src/com/Torvald/Terrarum/gameactors/faction/Faction.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.Actors.Faction +package com.torvald.terrarum.gameactors.faction import java.util.HashSet diff --git a/src/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.kt b/src/com/Torvald/Terrarum/gameactors/faction/FactionRelatorFactory.kt similarity index 91% rename from src/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.kt rename to src/com/Torvald/Terrarum/gameactors/faction/FactionRelatorFactory.kt index 1f8a9abab..d8335bf07 100644 --- a/src/com/Torvald/Terrarum/Actors/Faction/FactionRelatorFactory.kt +++ b/src/com/Torvald/Terrarum/gameactors/faction/FactionRelatorFactory.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.Actors.Faction +package com.torvald.terrarum.gameactors.faction -import com.Torvald.JsonFetcher +import com.torvald.JsonFetcher import com.google.gson.JsonObject import java.io.IOException diff --git a/src/com/Torvald/Terrarum/GameControl/EnumKeyFunc.kt b/src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt similarity index 78% rename from src/com/Torvald/Terrarum/GameControl/EnumKeyFunc.kt rename to src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt index eb57e4b9c..e7530240c 100644 --- a/src/com/Torvald/Terrarum/GameControl/EnumKeyFunc.kt +++ b/src/com/Torvald/Terrarum/gamecontroller/EnumKeyFunc.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameControl +package com.torvald.terrarum.gamecontroller /** * Created by minjaesong on 15-12-31. diff --git a/src/com/Torvald/Terrarum/GameControl/GameController.kt b/src/com/Torvald/Terrarum/gamecontroller/GameController.kt similarity index 83% rename from src/com/Torvald/Terrarum/GameControl/GameController.kt rename to src/com/Torvald/Terrarum/gamecontroller/GameController.kt index b3e44d330..5163ffc2c 100644 --- a/src/com/Torvald/Terrarum/GameControl/GameController.kt +++ b/src/com/Torvald/Terrarum/gamecontroller/GameController.kt @@ -1,13 +1,13 @@ -package com.Torvald.Terrarum.GameControl +package com.torvald.terrarum.gamecontroller -import com.Torvald.Terrarum.Actors.Controllable -import com.Torvald.Terrarum.Actors.Player -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.TileProperties.TileNameCode -import com.Torvald.Terrarum.TileProperties.TilePropCodex -import com.Torvald.Terrarum.UserInterface.UIHandler +import com.torvald.terrarum.gameactors.Controllable +import com.torvald.terrarum.gameactors.Player +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.tileproperties.TileNameCode +import com.torvald.terrarum.tileproperties.TilePropCodex +import com.torvald.terrarum.ui.UIHandler import org.newdawn.slick.Input /** @@ -43,7 +43,7 @@ object GameController { // test tile remove try { Terrarum.game.map.setTileTerrain(mouseTileX, mouseTileY, TileNameCode.AIR) - // Terrarum.game.map.setTileWall(mouseTileX, mouseTileY, TileNameCode.AIR); + // terrarum.game.map.setTileWall(mouseTileX, mouseTileY, TileNameCode.AIR); } catch (e: ArrayIndexOutOfBoundsException) { } @@ -52,7 +52,7 @@ object GameController { else if (input.isMouseButtonDown(Input.MOUSE_RIGHT_BUTTON)) { // test tile place try { - Terrarum.game.map.setTileTerrain(mouseTileX, mouseTileY, Terrarum.game.player.getActorValue().getAsInt("selectedtile")!!) + Terrarum.game.map.setTileTerrain(mouseTileX, mouseTileY, Terrarum.game.player.actorValue.getAsInt("selectedtile")!!) } catch (e: ArrayIndexOutOfBoundsException) { } diff --git a/src/com/Torvald/Terrarum/GameControl/Key.kt b/src/com/Torvald/Terrarum/gamecontroller/Key.kt similarity index 96% rename from src/com/Torvald/Terrarum/GameControl/Key.kt rename to src/com/Torvald/Terrarum/gamecontroller/Key.kt index 851825994..2fa19315a 100644 --- a/src/com/Torvald/Terrarum/GameControl/Key.kt +++ b/src/com/Torvald/Terrarum/gamecontroller/Key.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameControl +package com.torvald.terrarum.gamecontroller /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/GameControl/KeyMap.kt b/src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt similarity index 94% rename from src/com/Torvald/Terrarum/GameControl/KeyMap.kt rename to src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt index 98dcfbff0..858e6b5a8 100644 --- a/src/com/Torvald/Terrarum/GameControl/KeyMap.kt +++ b/src/com/Torvald/Terrarum/gamecontroller/KeyMap.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameControl +package com.torvald.terrarum.gamecontroller import java.util.Hashtable diff --git a/src/com/Torvald/Terrarum/GameControl/KeyToggler.kt b/src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt similarity index 96% rename from src/com/Torvald/Terrarum/GameControl/KeyToggler.kt rename to src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt index 8875e0f82..5429d5df2 100644 --- a/src/com/Torvald/Terrarum/GameControl/KeyToggler.kt +++ b/src/com/Torvald/Terrarum/gamecontroller/KeyToggler.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.GameControl +package com.torvald.terrarum.gamecontroller import org.newdawn.slick.GameContainer import org.newdawn.slick.Input diff --git a/src/com/Torvald/spriteAnimation/SpriteAnimation.kt b/src/com/Torvald/spriteAnimation/SpriteAnimation.kt index a8347eac7..268d471f9 100644 --- a/src/com/Torvald/spriteAnimation/SpriteAnimation.kt +++ b/src/com/Torvald/spriteAnimation/SpriteAnimation.kt @@ -2,10 +2,10 @@ * This code is based on the original author's code written in Lua. */ -package com.Torvald.spriteAnimation +package com.torvald.spriteanimation -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Game +import com.torvald.terrarum.Terrarum import com.jme3.math.FastMath import org.newdawn.slick.Graphics import org.newdawn.slick.Image diff --git a/src/com/jme3/math/FastMath.java b/src/com/jme3/math/FastMath.java index 8018970d3..5455552e8 100644 --- a/src/com/jme3/math/FastMath.java +++ b/src/com/jme3/math/FastMath.java @@ -577,9 +577,9 @@ final public class FastMath { /** * Given 3 points in a 2d plane, this function computes if the points going from A-B-C * are moving counter clock wise. - * @param p0 Point 0. - * @param p1 Point 1. - * @param p2 Point 2. + * @param p0 point 0. + * @param p1 point 1. + * @param p2 point 2. * @return 1 If they are CCW, -1 if they are not CCW, 0 if p2 is between p0 and p1. */ public static int counterClockwise(Vector2f p0, Vector2f p1, Vector2f p2) { diff --git a/src/com/Torvald/Rand/Fudge3.kt b/src/com/torvald/random/Fudge3.kt similarity index 89% rename from src/com/Torvald/Rand/Fudge3.kt rename to src/com/torvald/random/Fudge3.kt index a2a2ab060..fb6fc5509 100644 --- a/src/com/Torvald/Rand/Fudge3.kt +++ b/src/com/torvald/random/Fudge3.kt @@ -1,4 +1,4 @@ -package com.Torvald.Rand +package com.torvald.random import java.util.Random diff --git a/src/com/Torvald/Rand/FudgeDice.kt b/src/com/torvald/random/FudgeDice.kt similarity index 97% rename from src/com/Torvald/Rand/FudgeDice.kt rename to src/com/torvald/random/FudgeDice.kt index 7ac5a2704..ca009ebe3 100644 --- a/src/com/Torvald/Rand/FudgeDice.kt +++ b/src/com/torvald/random/FudgeDice.kt @@ -1,4 +1,4 @@ -package com.Torvald.Rand +package com.torvald.random import java.util.Random diff --git a/src/com/Torvald/Rand/HQRNG.java b/src/com/torvald/random/HQRNG.java similarity index 98% rename from src/com/Torvald/Rand/HQRNG.java rename to src/com/torvald/random/HQRNG.java index 594bc7d8f..82367c4c9 100644 --- a/src/com/Torvald/Rand/HQRNG.java +++ b/src/com/torvald/random/HQRNG.java @@ -1,4 +1,4 @@ -package com.Torvald.Rand; +package com.torvald.random; import java.util.Random; //import java.util.concurrent.locks.*; diff --git a/src/com/Torvald/Rand/MTRandom.java b/src/com/torvald/random/MTRandom.java similarity index 99% rename from src/com/Torvald/Rand/MTRandom.java rename to src/com/torvald/random/MTRandom.java index 1dad9e5df..652e89918 100644 --- a/src/com/Torvald/Rand/MTRandom.java +++ b/src/com/torvald/random/MTRandom.java @@ -1,4 +1,4 @@ -package com.Torvald.Rand; +package com.torvald.random; import java.io.*; import java.util.*; diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.kt b/src/com/torvald/terrarum/console/Authenticator.kt similarity index 88% rename from src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.kt rename to src/com/torvald/terrarum/console/Authenticator.kt index 831af50f2..bbeda3d70 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Authenticator.kt +++ b/src/com/torvald/terrarum/console/Authenticator.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.UserInterface.ConsoleWindow +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.ui.ConsoleWindow import org.apache.commons.codec.digest.DigestUtils /** diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Batch.kt b/src/com/torvald/terrarum/console/Batch.kt similarity index 92% rename from src/com/Torvald/Terrarum/ConsoleCommand/Batch.kt rename to src/com/torvald/terrarum/console/Batch.kt index 1f3a04450..e10afb12f 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Batch.kt +++ b/src/com/torvald/terrarum/console/Batch.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console import java.nio.file.FileSystems import java.nio.file.Files diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CatStdout.kt b/src/com/torvald/terrarum/console/CatStdout.kt similarity index 93% rename from src/com/Torvald/Terrarum/ConsoleCommand/CatStdout.kt rename to src/com/torvald/terrarum/console/CatStdout.kt index 6ee8e12c7..68fa449da 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CatStdout.kt +++ b/src/com/torvald/terrarum/console/CatStdout.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console import java.io.IOException import java.nio.file.FileSystems diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.kt b/src/com/torvald/terrarum/console/CodexEdictis.kt similarity index 86% rename from src/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.kt rename to src/com/torvald/terrarum/console/CodexEdictis.kt index e36db126c..42715c7ee 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CodexEdictis.kt +++ b/src/com/torvald/terrarum/console/CodexEdictis.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.UserInterface.ConsoleWindow +import com.torvald.terrarum.Game +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.ui.ConsoleWindow import java.util.Formatter diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.kt b/src/com/torvald/terrarum/console/CommandDict.kt similarity index 94% rename from src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.kt rename to src/com/torvald/terrarum/console/CommandDict.kt index 2cd02bfcf..7ca92c12f 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CommandDict.kt +++ b/src/com/torvald/terrarum/console/CommandDict.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import java.util.HashMap diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.kt b/src/com/torvald/terrarum/console/CommandInterpreter.kt similarity index 96% rename from src/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.kt rename to src/com/torvald/terrarum/console/CommandInterpreter.kt index d1105246c..9a25d17d2 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/CommandInterpreter.kt +++ b/src/com/torvald/terrarum/console/CommandInterpreter.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum import java.util.ArrayList import java.util.Formatter diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.kt b/src/com/torvald/terrarum/console/ConsoleCommand.kt similarity index 79% rename from src/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.kt rename to src/com/torvald/terrarum/console/ConsoleCommand.kt index 6cdf45ea2..2b1eccc2b 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/ConsoleCommand.kt +++ b/src/com/torvald/terrarum/console/ConsoleCommand.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Echo.kt b/src/com/torvald/terrarum/console/Echo.kt similarity index 79% rename from src/com/Torvald/Terrarum/ConsoleCommand/Echo.kt rename to src/com/torvald/terrarum/console/Echo.kt index 5b5d39b8f..546e33a6e 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Echo.kt +++ b/src/com/torvald/terrarum/console/Echo.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.UserInterface.ConsoleWindow +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.ui.ConsoleWindow import java.util.Arrays diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/ExportAV.kt b/src/com/torvald/terrarum/console/ExportAV.kt similarity index 83% rename from src/com/Torvald/Terrarum/ConsoleCommand/ExportAV.kt rename to src/com/torvald/terrarum/console/ExportAV.kt index c37fe6828..e0e8956b7 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/ExportAV.kt +++ b/src/com/torvald/terrarum/console/ExportAV.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.JsonWriter -import com.Torvald.Terrarum.Terrarum +import com.torvald.JsonWriter +import com.torvald.terrarum.Terrarum import java.io.IOException @@ -13,7 +13,7 @@ class ExportAV : ConsoleCommand { if (args.size == 2) { try { JsonWriter.writeToFile( - Terrarum.game.player.getActorValue(), + Terrarum.game.player.actorValue, Terrarum.defaultDir + "/Exports/" + args[1] + ".json") Echo().execute("ExportAV: exported to " + args[1] + ".json") diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/ExportMap.kt b/src/com/torvald/terrarum/console/ExportMap.kt similarity index 91% rename from src/com/Torvald/Terrarum/ConsoleCommand/ExportMap.kt rename to src/com/torvald/terrarum/console/ExportMap.kt index 79d84cbb2..03e077d28 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/ExportMap.kt +++ b/src/com/torvald/terrarum/console/ExportMap.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.ColourUtil.Col4096 -import com.Torvald.RasterWriter -import com.Torvald.Terrarum.Terrarum +import com.torvald.colourutil.Col4096 +import com.torvald.RasterWriter +import com.torvald.terrarum.Terrarum import javax.imageio.ImageIO import java.awt.* @@ -71,7 +71,7 @@ class ExportMap : ConsoleCommand { val echo = Echo() echo.execute("Usage: export ") echo.execute("Exports current map into visible image.") - echo.execute("The image can be found at %adddata%/Terrarum/Exports") + echo.execute("The image can be found at %adddata%/terrarum/Exports") } private fun buildColorTable() { @@ -146,11 +146,11 @@ class ExportMap : ConsoleCommand { /* -package com.Torvald.Terrarum.ConsoleCommand; +package com.torvald.terrarum.console; -import com.Torvald.ColourUtil.Col4096; -import com.Torvald.RasterWriter; -import com.Torvald.Terrarum.Terrarum; +import com.torvald.colourutil.Col4096; +import com.torvald.RasterWriter; +import com.torvald.terrarum.terrarum; import javax.imageio.ImageIO; import java.awt.*; @@ -162,7 +162,7 @@ import java.util.Hashtable; /** * Created by minjaesong on 16-01-17. */ -public class ExportMap implements ConsoleCommand { +public class ExportMap implements console { private byte[] mapData; private int mapDataPointer = 0; @@ -205,9 +205,9 @@ public class ExportMap implements ConsoleCommand { if (args.length == 2) { buildColorTable(); - mapData = new byte[Terrarum.game.map.getWidth() * Terrarum.game.map.getHeight() * 3]; + mapData = new byte[terrarum.game.map.getWidth() * terrarum.game.map.getHeight() * 3]; - for (byte tile : Terrarum.game.map.getLayerTerrain()) { + for (byte tile : terrarum.game.map.getLayerTerrain()) { byte[] colArray = colorTable.getOrDefault(tile, new Col4096(0xFFF)) .toByteArray(); @@ -218,7 +218,7 @@ public class ExportMap implements ConsoleCommand { mapDataPointer += 3; } - String dir = Terrarum.defaultDir + "/Exports/"; + String dir = terrarum.defaultDir + "/Exports/"; File dirAsFile = new File(dir); if (!dirAsFile.exists()) { dirAsFile.mkdir(); @@ -226,8 +226,8 @@ public class ExportMap implements ConsoleCommand { try { RasterWriter.INSTANCE.writePNG_RGB( - Terrarum.game.map.getWidth() - , Terrarum.game.map.getHeight() + terrarum.game.map.getWidth() + , terrarum.game.map.getHeight() , mapData , dir + args[1] + ".png" ); @@ -254,7 +254,7 @@ public class ExportMap implements ConsoleCommand { Echo echo = new Echo(); echo.execute("Usage: export "); echo.execute("Exports current map into visible image."); - echo.execute("The image can be found at %adddata%/Terrarum/Exports"); + echo.execute("The image can be found at %adddata%/terrarum/Exports"); } private void buildColorTable() { diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/ForceGC.kt b/src/com/torvald/terrarum/console/ForceGC.kt similarity index 87% rename from src/com/Torvald/Terrarum/ConsoleCommand/ForceGC.kt rename to src/com/torvald/terrarum/console/ForceGC.kt index b3d41afc6..e4d37bc10 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/ForceGC.kt +++ b/src/com/torvald/terrarum/console/ForceGC.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console /** * Created by minjaesong on 16-01-18. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/GetAV.kt b/src/com/torvald/terrarum/console/GetAV.kt similarity index 77% rename from src/com/Torvald/Terrarum/ConsoleCommand/GetAV.kt rename to src/com/torvald/terrarum/console/GetAV.kt index 51d96e7f1..ff8ab8e8a 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/GetAV.kt +++ b/src/com/torvald/terrarum/console/GetAV.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Actors.ActorValue -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gameactors.ActorValue +import com.torvald.terrarum.Game +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-19. @@ -14,7 +14,7 @@ class GetAV : ConsoleCommand { try { if (args.size == 1) { // print all actorvalue of player - val av = Terrarum.game.player.getActorValue() + val av = Terrarum.game.player.actorValue val keyset = av.keySet keyset.forEach { elem -> echo.execute("$elem = ${av[elem as String]}") } @@ -25,9 +25,9 @@ class GetAV : ConsoleCommand { } else if (args.size == 2) { echo.execute("player." + args[1] + " = " - + Terrarum.game.player.getActorValue()[args[1]] + + Terrarum.game.player.actorValue[args[1]] + " (" - + Terrarum.game.player.getActorValue()[args[1]]!!.javaClass.simpleName + + Terrarum.game.player.actorValue[args[1]]!!.javaClass.simpleName + ")") } else if (args.size == 3) { diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.kt b/src/com/torvald/terrarum/console/GetFactioning.kt similarity index 84% rename from src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.kt rename to src/com/torvald/terrarum/console/GetFactioning.kt index 7a2a7fd18..49b31ef8b 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/GetFactioning.kt +++ b/src/com/torvald/terrarum/console/GetFactioning.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Actors.Faction.Faction -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gameactors.faction.Faction +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum import java.util.HashSet @@ -29,7 +29,7 @@ class GetFactioning : ConsoleCommand { echo.execute(count.toString() + Lang.pluralise(" faction", count) + " assigned.") for (faction in factionSet) { - echo.execute("Faction \"" + faction.factionName + "\"") + echo.execute("faction \"" + faction.factionName + "\"") echo.execute(" Amicable") faction.factionAmicable.forEach { s -> echo.execute(PRINT_INDENTATION + s) } diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/GetLocale.kt b/src/com/torvald/terrarum/console/GetLocale.kt similarity index 79% rename from src/com/Torvald/Terrarum/ConsoleCommand/GetLocale.kt rename to src/com/torvald/terrarum/console/GetLocale.kt index eb3f8b908..043929924 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/GetLocale.kt +++ b/src/com/torvald/terrarum/console/GetLocale.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-22. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Gettime.kt b/src/com/torvald/terrarum/console/GetTime.kt similarity index 87% rename from src/com/Torvald/Terrarum/ConsoleCommand/Gettime.kt rename to src/com/torvald/terrarum/console/GetTime.kt index e17206607..3ca39701f 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Gettime.kt +++ b/src/com/torvald/terrarum/console/GetTime.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/GsonTest.kt b/src/com/torvald/terrarum/console/GsonTest.kt similarity index 93% rename from src/com/Torvald/Terrarum/ConsoleCommand/GsonTest.kt rename to src/com/torvald/terrarum/console/GsonTest.kt index 13ed6898f..afcda820d 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/GsonTest.kt +++ b/src/com/torvald/terrarum/console/GsonTest.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/com/torvald/terrarum/console/Help.kt b/src/com/torvald/terrarum/console/Help.kt new file mode 100644 index 000000000..dc9bfc9d2 --- /dev/null +++ b/src/com/torvald/terrarum/console/Help.kt @@ -0,0 +1,25 @@ +package com.torvald.terrarum.console + +import com.torvald.terrarum.langpack.Lang + +/** + * Created by minjaesong on 16-03-22. + */ +class Help : ConsoleCommand { + override fun execute(args: Array) { + val echo = Echo() + if (args.size == 1) { + for (i in 1..6) echo.execute(Lang["HELP_OTF_MAIN_TEXT_$i"]) + } + else if (args[1].toLowerCase() == "slow") { + for (i in 1..4) echo.execute(Lang["HELP_OTF_SLOW_TEXT_$i"]) + } + else { + for (i in 1..6) echo.execute(Lang["HELP_OTF_MAIN_TEXT_$i"]) + } + } + + override fun printUsage() { + Echo().execute("Prints some utility functions assigned to function row of the keyboard.") + } +} \ No newline at end of file diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/QuitApp.kt b/src/com/torvald/terrarum/console/QuitApp.kt similarity index 81% rename from src/com/Torvald/Terrarum/ConsoleCommand/QuitApp.kt rename to src/com/torvald/terrarum/console/QuitApp.kt index ae1fe3013..0b9ece74a 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/QuitApp.kt +++ b/src/com/torvald/terrarum/console/QuitApp.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console /** * Created by minjaesong on 16-01-15. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetAV.kt b/src/com/torvald/terrarum/console/SetAV.kt similarity index 90% rename from src/com/Torvald/Terrarum/ConsoleCommand/SetAV.kt rename to src/com/torvald/terrarum/console/SetAV.kt index c542405ca..e2a6c0f67 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SetAV.kt +++ b/src/com/torvald/terrarum/console/SetAV.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Game +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-15. @@ -50,7 +50,7 @@ internal class SetAV : ConsoleCommand { } - Terrarum.game.player.getActorValue()[args[1]] = `val` + Terrarum.game.player.actorValue[args[1]] = `val` echo.execute("Set " + args[1] + " to " + `val`) } else if (args.size == 4) { diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.kt b/src/com/torvald/terrarum/console/SetBulletin.kt similarity index 75% rename from src/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.kt rename to src/com/torvald/terrarum/console/SetBulletin.kt index a78054b6a..88d7c1110 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SetBulletin.kt +++ b/src/com/torvald/terrarum/console/SetBulletin.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.UserInterface.Notification +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.ui.Notification /** * Created by minjaesong on 16-01-23. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.kt b/src/com/torvald/terrarum/console/SetGlobalLightLevel.kt similarity index 91% rename from src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.kt rename to src/com/torvald/terrarum/console/SetGlobalLightLevel.kt index 4fa9a4903..1ef471b32 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SetGlobalLightLevel.kt +++ b/src/com/torvald/terrarum/console/SetGlobalLightLevel.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.MapDrawer.LightmapRenderer -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.mapdrawer.LightmapRenderer +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-02-17. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetLocale.kt b/src/com/torvald/terrarum/console/SetLocale.kt similarity index 86% rename from src/com/Torvald/Terrarum/ConsoleCommand/SetLocale.kt rename to src/com/torvald/terrarum/console/SetLocale.kt index 08acbe7e2..f8503940e 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SetLocale.kt +++ b/src/com/torvald/terrarum/console/SetLocale.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.ImageFont.GameFontBase -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum +import com.torvald.imagefont.GameFontBase +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum import org.apache.commons.csv.CSVRecord import org.newdawn.slick.SlickException diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Settime.kt b/src/com/torvald/terrarum/console/SetTime.kt similarity index 91% rename from src/com/Torvald/Terrarum/ConsoleCommand/Settime.kt rename to src/com/torvald/terrarum/console/SetTime.kt index 601674225..91f372572 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Settime.kt +++ b/src/com/torvald/terrarum/console/SetTime.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.GameMap.WorldTime -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gamemap.WorldTime +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SetTimeDelta.kt b/src/com/torvald/terrarum/console/SetTimeDelta.kt similarity index 88% rename from src/com/Torvald/Terrarum/ConsoleCommand/SetTimeDelta.kt rename to src/com/torvald/terrarum/console/SetTimeDelta.kt index f56096d2b..1a42ccfe4 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SetTimeDelta.kt +++ b/src/com/torvald/terrarum/console/SetTimeDelta.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-20. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.kt b/src/com/torvald/terrarum/console/SpawnPhysTestBall.kt similarity index 74% rename from src/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.kt rename to src/com/torvald/terrarum/console/SpawnPhysTestBall.kt index b9669748a..d1135c544 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/SpawnPhysTestBall.kt +++ b/src/com/torvald/terrarum/console/SpawnPhysTestBall.kt @@ -1,10 +1,10 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Actors.Actor -import com.Torvald.Terrarum.Actors.ActorWithBody -import com.Torvald.Terrarum.Actors.PhysTestBall -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gameactors.Actor +import com.torvald.terrarum.gameactors.ActorWithBody +import com.torvald.terrarum.gameactors.PhysTestBall +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-03-05. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.kt b/src/com/torvald/terrarum/console/TeleportPlayer.kt similarity index 83% rename from src/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.kt rename to src/com/torvald/terrarum/console/TeleportPlayer.kt index d244eee5c..24d6f1c33 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/TeleportPlayer.kt +++ b/src/com/torvald/terrarum/console/TeleportPlayer.kt @@ -1,8 +1,8 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Game +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-24. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.kt b/src/com/torvald/terrarum/console/ToggleNoClip.kt similarity index 78% rename from src/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.kt rename to src/com/torvald/terrarum/console/ToggleNoClip.kt index 24dc5fb44..85342bacb 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/ToggleNoClip.kt +++ b/src/com/torvald/terrarum/console/ToggleNoClip.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Game -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Game +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-19. diff --git a/src/com/Torvald/Terrarum/ConsoleCommand/Zoom.kt b/src/com/torvald/terrarum/console/Zoom.kt similarity index 91% rename from src/com/Torvald/Terrarum/ConsoleCommand/Zoom.kt rename to src/com/torvald/terrarum/console/Zoom.kt index ab96aca58..db5c6bb48 100644 --- a/src/com/Torvald/Terrarum/ConsoleCommand/Zoom.kt +++ b/src/com/torvald/terrarum/console/Zoom.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.ConsoleCommand +package com.torvald.terrarum.console -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum /** * Created by minjaesong on 16-01-25. diff --git a/src/com/Torvald/Terrarum/TileStat/TileStat.kt b/src/com/torvald/terrarum/tilestats/TileStat.kt similarity index 88% rename from src/com/Torvald/Terrarum/TileStat/TileStat.kt rename to src/com/torvald/terrarum/tilestats/TileStat.kt index 9174492ae..3cf54f08b 100644 --- a/src/com/Torvald/Terrarum/TileStat/TileStat.kt +++ b/src/com/torvald/terrarum/tilestats/TileStat.kt @@ -1,11 +1,11 @@ -package com.Torvald.Terrarum.TileStat +package com.torvald.terrarum.tilestats -import com.Torvald.Terrarum.Actors.Player -import com.Torvald.Terrarum.GameMap.GameMap -import com.Torvald.Terrarum.GameMap.MapLayer -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gameactors.Player +import com.torvald.terrarum.gamemap.GameMap +import com.torvald.terrarum.gamemap.MapLayer +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.Terrarum import com.jme3.math.FastMath import java.util.Arrays diff --git a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.kt b/src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt similarity index 85% rename from src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.kt rename to src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt index 95d275285..a671dbbec 100644 --- a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.kt +++ b/src/com/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -1,11 +1,11 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui -import com.Torvald.Terrarum.GameMap.PairedMapLayer -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.MapDrawer.LightmapRenderer -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.MapDrawer.MapDrawer -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.gamemap.PairedMapLayer +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.mapdrawer.LightmapRenderer +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.mapdrawer.MapDrawer +import com.torvald.terrarum.Terrarum import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics @@ -35,7 +35,6 @@ class BasicDebugInfoWindow : UICanvas { override fun update(gc: GameContainer, delta_t: Int) { val player = Terrarum.game.player val hitbox = player.hitbox!! - val nextHitbox = player.nextHitbox xdelta = hitbox.pointedX - prevPlayerX ydelta = hitbox.pointedY - prevPlayerY @@ -53,7 +52,7 @@ class BasicDebugInfoWindow : UICanvas { val mouseTileX = ((MapCamera.cameraX + gc.getInput().mouseX / Terrarum.game.screenZoom) / MapDrawer.TILE_SIZE).toInt() val mouseTileY = ((MapCamera.cameraY + gc.getInput().mouseY / Terrarum.game.screenZoom) / MapDrawer.TILE_SIZE).toInt() - g.setColor(Color.white) + g.color = Color.white val hitbox = player.hitbox val nextHitbox = player.nextHitbox @@ -114,10 +113,11 @@ class BasicDebugInfoWindow : UICanvas { * Second column */ - printLineColumn(g, 2, 1, "Vsync : " + Terrarum.appgc.isVSyncRequested) + printLineColumn(g, 2, 1, "${Lang["MENU_OPTIONS_VSYNC"]} : " + Terrarum.appgc.isVSyncRequested) printLineColumn(g, 2, 2, "Env colour temp : " + MapDrawer.getColTemp()) printLineColumn(g, 2, 5, "Time : ${Terrarum.game.map.worldTime.elapsedSeconds()}" + " (${Terrarum.game.map.worldTime.getFormattedTime()})") + printLineColumn(g, 2, 6, "Mass : ${player.mass}") /** * On screen @@ -127,16 +127,16 @@ class BasicDebugInfoWindow : UICanvas { val memInUse = Terrarum.game.memInUse val totalVMMem = Terrarum.game.totalVMMem - g.setColor(Color(0xFF7F00)) + g.color = Color(0xFF7F00) g.drawString( - Lang.get("DEV_MEMORY_SHORT_CAP") + Lang["DEV_MEMORY_SHORT_CAP"] + " : " + formatter.format( - Lang.get("DEV_MEMORY_A_OF_B"), memInUse, totalVMMem), (Terrarum.WIDTH - 200).toFloat(), line(1).toFloat()) + Lang["DEV_MEMORY_A_OF_B"], memInUse, totalVMMem), (Terrarum.WIDTH - 200).toFloat(), line(1).toFloat()) // Hitbox val zoom = Terrarum.game.screenZoom - g.setColor(Color(0x007f00)) + g.color = Color(0x007f00) g.drawRect(hitbox.hitboxStart.x * zoom - MapCamera.cameraX * zoom , hitbox.hitboxStart.y * zoom - MapCamera.cameraY * zoom , hitbox.width * zoom @@ -147,11 +147,11 @@ class BasicDebugInfoWindow : UICanvas { , (hitbox.pointedY - 1) * zoom - MapCamera.cameraY * zoom , 3f, 3f) g.drawString( - Lang.get("DEV_COLOUR_LEGEND_GREEN") + " : hitbox", (Terrarum.WIDTH - 200).toFloat() + Lang["DEV_COLOUR_LEGEND_GREEN"] + " : hitbox", (Terrarum.WIDTH - 200).toFloat() , line(2).toFloat()) // Next hitbox - g.setColor(Color.blue) + g.color = Color.blue g.drawRect(nextHitbox!!.hitboxStart.x * zoom - MapCamera.cameraX * zoom , nextHitbox.hitboxStart.y * zoom - MapCamera.cameraY * zoom , nextHitbox.width * zoom @@ -162,7 +162,7 @@ class BasicDebugInfoWindow : UICanvas { , (nextHitbox.pointedY - 1) * zoom - MapCamera.cameraY * zoom , 3f, 3f) g.drawString( - Lang.get("DEV_COLOUR_LEGEND_BLUE") + " : nextHitbox", (Terrarum.WIDTH - 200).toFloat() + Lang["DEV_COLOUR_LEGEND_BLUE"] + " : nextHitbox", (Terrarum.WIDTH - 200).toFloat() , line(3).toFloat()) } diff --git a/src/com/Torvald/Terrarum/UserInterface/ConsoleWindow.kt b/src/com/torvald/terrarum/ui/ConsoleWindow.kt similarity index 94% rename from src/com/Torvald/Terrarum/UserInterface/ConsoleWindow.kt rename to src/com/torvald/terrarum/ui/ConsoleWindow.kt index 6d57dd72d..8d518c173 100644 --- a/src/com/Torvald/Terrarum/UserInterface/ConsoleWindow.kt +++ b/src/com/torvald/terrarum/ui/ConsoleWindow.kt @@ -1,9 +1,9 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui -import com.Torvald.Terrarum.LangPack.Lang -import com.Torvald.Terrarum.Terrarum -import com.Torvald.Terrarum.ConsoleCommand.CommandInterpreter -import com.Torvald.Terrarum.GameControl.Key +import com.torvald.terrarum.langpack.Lang +import com.torvald.terrarum.Terrarum +import com.torvald.terrarum.console.CommandInterpreter +import com.torvald.terrarum.gamecontroller.Key import com.jme3.math.FastMath import org.newdawn.slick.Color import org.newdawn.slick.GameContainer @@ -15,7 +15,7 @@ import org.newdawn.slick.Input */ class ConsoleWindow : UICanvas, UITypable { - internal var UIColour = Color(0xB0000000.toInt()) + internal var UIColour = Color(0xCC000000.toInt()) private var commandInputPool: StringBuffer? = null private var prevCommand: String? = null diff --git a/src/com/Torvald/Terrarum/UserInterface/MessageWindow.kt b/src/com/torvald/terrarum/ui/MessageWindow.kt similarity index 97% rename from src/com/Torvald/Terrarum/UserInterface/MessageWindow.kt rename to src/com/torvald/terrarum/ui/MessageWindow.kt index c1b385913..08381a1e4 100644 --- a/src/com/Torvald/Terrarum/UserInterface/MessageWindow.kt +++ b/src/com/torvald/terrarum/ui/MessageWindow.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui -import com.Torvald.ImageFont.GameFontWhite +import com.torvald.imagefont.GameFontWhite import com.jme3.math.FastMath import org.lwjgl.opengl.GL11 import org.newdawn.slick.* diff --git a/src/com/Torvald/Terrarum/UserInterface/MovementInterpolator.kt b/src/com/torvald/terrarum/ui/MovementInterpolator.kt similarity index 95% rename from src/com/Torvald/Terrarum/UserInterface/MovementInterpolator.kt rename to src/com/torvald/terrarum/ui/MovementInterpolator.kt index 96cfd4a82..b7cf5f79b 100644 --- a/src/com/Torvald/Terrarum/UserInterface/MovementInterpolator.kt +++ b/src/com/torvald/terrarum/ui/MovementInterpolator.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui import com.jme3.math.FastMath diff --git a/src/com/Torvald/Terrarum/UserInterface/Notification.kt b/src/com/torvald/terrarum/ui/Notification.kt similarity index 96% rename from src/com/Torvald/Terrarum/UserInterface/Notification.kt rename to src/com/torvald/terrarum/ui/Notification.kt index 9428ece2b..f258888fb 100644 --- a/src/com/Torvald/Terrarum/UserInterface/Notification.kt +++ b/src/com/torvald/terrarum/ui/Notification.kt @@ -1,6 +1,6 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.Terrarum import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics import org.newdawn.slick.Input diff --git a/src/com/Torvald/Terrarum/UserInterface/UICanvas.kt b/src/com/torvald/terrarum/ui/UICanvas.kt similarity index 93% rename from src/com/Torvald/Terrarum/UserInterface/UICanvas.kt rename to src/com/torvald/terrarum/ui/UICanvas.kt index cf6652970..ebb412dcf 100644 --- a/src/com/Torvald/Terrarum/UserInterface/UICanvas.kt +++ b/src/com/torvald/terrarum/ui/UICanvas.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/com/Torvald/Terrarum/UserInterface/UIClickable.kt b/src/com/torvald/terrarum/ui/UIClickable.kt similarity index 91% rename from src/com/Torvald/Terrarum/UserInterface/UIClickable.kt rename to src/com/torvald/terrarum/ui/UIClickable.kt index 814ffad94..a9f4dbccf 100644 --- a/src/com/Torvald/Terrarum/UserInterface/UIClickable.kt +++ b/src/com/torvald/terrarum/ui/UIClickable.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui /** * Created by minjaesong on 16-03-06. diff --git a/src/com/Torvald/Terrarum/UserInterface/UIHandler.kt b/src/com/torvald/terrarum/ui/UIHandler.kt similarity index 97% rename from src/com/Torvald/Terrarum/UserInterface/UIHandler.kt rename to src/com/torvald/terrarum/ui/UIHandler.kt index c01488b03..3bc7c088a 100644 --- a/src/com/Torvald/Terrarum/UserInterface/UIHandler.kt +++ b/src/com/torvald/terrarum/ui/UIHandler.kt @@ -1,7 +1,7 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui -import com.Torvald.Terrarum.MapDrawer.MapCamera -import com.Torvald.Terrarum.Terrarum +import com.torvald.terrarum.mapdrawer.MapCamera +import com.torvald.terrarum.Terrarum import com.jme3.math.FastMath import org.newdawn.slick.* diff --git a/src/com/Torvald/Terrarum/UserInterface/UIItem.kt b/src/com/torvald/terrarum/ui/UIItem.kt similarity index 80% rename from src/com/Torvald/Terrarum/UserInterface/UIItem.kt rename to src/com/torvald/terrarum/ui/UIItem.kt index 860697517..dfd22e042 100644 --- a/src/com/Torvald/Terrarum/UserInterface/UIItem.kt +++ b/src/com/torvald/terrarum/ui/UIItem.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui /** * Created by minjaesong on 15-12-31. diff --git a/src/com/Torvald/Terrarum/UserInterface/UITypable.kt b/src/com/torvald/terrarum/ui/UITypable.kt similarity index 77% rename from src/com/Torvald/Terrarum/UserInterface/UITypable.kt rename to src/com/torvald/terrarum/ui/UITypable.kt index f27ec1253..a5ca19048 100644 --- a/src/com/Torvald/Terrarum/UserInterface/UITypable.kt +++ b/src/com/torvald/terrarum/ui/UITypable.kt @@ -1,4 +1,4 @@ -package com.Torvald.Terrarum.UserInterface +package com.torvald.terrarum.ui /** * Created by minjaesong on 16-03-06.