From f1151977d98e684cdbf53fb53b7a03f001abae5a Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Mon, 13 Mar 2017 21:40:50 +0900 Subject: [PATCH] UI testing env and working text buttons Former-commit-id: b8fd27c7f71f9bc8da259ae132badcbc9ce117ac --- assets/locales/en/game.json | 7 +- assets/locales/fiFI/game.json | 8 +- assets/locales/koKR/game.json | 7 +- src/net/torvald/serialise/WriteGameMapData.kt | 2 +- src/net/torvald/terrarum/StateInGame.kt | 13 +- src/net/torvald/terrarum/StateMonitorCheck.kt | 6 +- src/net/torvald/terrarum/StateSplash.kt | 9 +- src/net/torvald/terrarum/StateUITest.kt | 120 ++++++++++++++++++ src/net/torvald/terrarum/Terrarum.kt | 16 ++- src/net/torvald/terrarum/console/AVTracker.kt | 6 +- .../torvald/terrarum/console/ActorsList.kt | 4 +- .../torvald/terrarum/console/Authenticator.kt | 2 +- src/net/torvald/terrarum/console/Echo.kt | 4 +- src/net/torvald/terrarum/console/EchoError.kt | 2 +- src/net/torvald/terrarum/console/ExportAV.kt | 2 +- src/net/torvald/terrarum/console/ExportMap.kt | 6 +- src/net/torvald/terrarum/console/GetAV.kt | 20 +-- .../torvald/terrarum/console/GetFactioning.kt | 2 +- src/net/torvald/terrarum/console/GetTime.kt | 2 +- src/net/torvald/terrarum/console/GsonTest.kt | 2 +- src/net/torvald/terrarum/console/Inventory.kt | 4 +- src/net/torvald/terrarum/console/KillActor.kt | 2 +- src/net/torvald/terrarum/console/Seed.kt | 4 +- src/net/torvald/terrarum/console/SetAV.kt | 4 +- .../torvald/terrarum/console/SetBulletin.kt | 2 +- .../console/SetGlobalLightOverride.kt | 4 +- src/net/torvald/terrarum/console/SetScale.kt | 4 +- src/net/torvald/terrarum/console/SetTime.kt | 6 +- .../torvald/terrarum/console/SetTimeDelta.kt | 6 +- .../terrarum/console/SpawnPhysTestBall.kt | 4 +- .../torvald/terrarum/console/SpawnTapestry.kt | 2 +- .../terrarum/console/SpawnTikiTorch.kt | 2 +- src/net/torvald/terrarum/console/Teleport.kt | 16 +-- .../torvald/terrarum/console/ToggleNoClip.kt | 4 +- src/net/torvald/terrarum/console/Zoom.kt | 10 +- .../terrarum/debuggerapp/ActorValueTracker.kt | 4 +- src/net/torvald/terrarum/gameactors/Actor.kt | 2 +- .../terrarum/gameactors/ActorHumanoid.kt | 4 +- .../terrarum/gameactors/ActorInventory.kt | 5 +- .../terrarum/gameactors/ActorWithSprite.kt | 15 +-- .../terrarum/gameactors/HumanoidNPC.kt | 1 + .../terrarum/gameactors/ParticleBase.kt | 4 +- .../terrarum/gameactors/PhysTestBall.kt | 4 +- .../terrarum/gameactors/PlayerBuilder.kt | 2 +- .../terrarum/gameactors/ProjectileSimple.kt | 12 +- .../terrarum/gameactors/ThreadActorUpdate.kt | 2 +- .../terrarum/gameactors/ai/AILuaAPI.kt | 8 +- .../gameactors/faction/FactionFactory.kt | 8 +- .../physicssolver/CollisionSolver.kt | 4 +- .../terrarum/gamecontroller/GameController.kt | 98 +++++++------- .../terrarum/gameitem/InventoryItem.kt | 4 +- .../terrarum/gameworld/WorldSimulator.kt | 2 +- .../terrarum/itemproperties/ItemCodex.kt | 9 +- .../terrarum/mapdrawer/FeaturesDrawer.kt | 2 +- .../terrarum/mapdrawer/LightmapRenderer.kt | 22 ++-- .../torvald/terrarum/mapdrawer/MapCamera.kt | 27 ++-- .../torvald/terrarum/mapdrawer/TilesDrawer.kt | 4 +- .../terrarum/realestate/RealEstateUtility.kt | 6 +- .../terrarum/tileproperties/TilePropUtil.kt | 2 +- .../torvald/terrarum/tilestats/TileStats.kt | 4 +- .../terrarum/ui/BasicDebugInfoWindow.kt | 22 ++-- .../torvald/terrarum/ui/ItemImageGallery.kt | 10 +- src/net/torvald/terrarum/ui/NullUI.kt | 36 ++++++ src/net/torvald/terrarum/ui/UIHandler.kt | 18 +-- src/net/torvald/terrarum/ui/UIInventory.kt | 63 +++++++++ src/net/torvald/terrarum/ui/UIItem.kt | 44 +++++-- .../torvald/terrarum/ui/UIItemTextButton.kt | 82 ++++++++++++ .../terrarum/ui/UIItemTextButtonList.kt | 83 ++++++++++++ src/net/torvald/terrarum/ui/UIPieMenu.kt | 2 +- src/net/torvald/terrarum/ui/UIQuickBar.kt | 4 +- src/net/torvald/terrarum/ui/UIVitalMetre.kt | 1 - .../luaapi/WorldInformationProvider.kt | 4 +- .../torvald/terrarum/weather/WeatherMixer.kt | 14 +- 73 files changed, 688 insertions(+), 264 deletions(-) create mode 100644 src/net/torvald/terrarum/StateUITest.kt create mode 100644 src/net/torvald/terrarum/ui/NullUI.kt create mode 100644 src/net/torvald/terrarum/ui/UIInventory.kt create mode 100644 src/net/torvald/terrarum/ui/UIItemTextButton.kt create mode 100644 src/net/torvald/terrarum/ui/UIItemTextButtonList.kt diff --git a/assets/locales/en/game.json b/assets/locales/en/game.json index 73436e6cc..030ca5455 100644 --- a/assets/locales/en/game.json +++ b/assets/locales/en/game.json @@ -5,6 +5,11 @@ "APP_ADJUST_YOUR_MONITOR": "Best player experience can be achieved with properly adjusted monitor. If you have not, please do it before you play.", "APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY", - "MENU_LABEL_PRESS_START_SYMBOL": "Press >" + "MENU_LABEL_PRESS_START_SYMBOL": "Press >", + "GAME_INVENTORY_INGREDIENTS" : "Ingredients", + "GAME_INVENTORY_POTIONS" : "Potions", + "GAME_INVENTORY_BLOCKS" : "Blocks", + "GAME_INVENTORY_WALLPAPERS" : "Walls", + "CONTEXT_ITEM_EQUIPMENT_PLURAL" : "Equipments" } \ No newline at end of file diff --git a/assets/locales/fiFI/game.json b/assets/locales/fiFI/game.json index adb4e49c5..c70ed475c 100644 --- a/assets/locales/fiFI/game.json +++ b/assets/locales/fiFI/game.json @@ -6,5 +6,11 @@ "APP_ADJUST_YOUR_MONITOR": "Paras pelikokemus saavutetaan on oikealla säädetty näytöllä. Jos et ole ollut, säädä ennen pelaamista.", "APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS", - "MENU_LABEL_PRESS_START_SYMBOL": "Paina >" + "MENU_LABEL_PRESS_START_SYMBOL": "Paina >", + + "GAME_INVENTORY_INGREDIENTS" : "Ainekset", + "GAME_INVENTORY_POTIONS" : "Juomat", + "GAME_INVENTORY_BLOCKS" : "Lohkareet", + "GAME_INVENTORY_WALLPAPERS" : "Tapetit", + "CONTEXT_ITEM_EQUIPMENT_PLURAL" : "Varusteet" } \ No newline at end of file diff --git a/assets/locales/koKR/game.json b/assets/locales/koKR/game.json index ed3c2300c..1a48697e4 100644 --- a/assets/locales/koKR/game.json +++ b/assets/locales/koKR/game.json @@ -6,6 +6,11 @@ "APP_ADJUST_YOUR_MONITOR": "본 게임은 적절히 조정된 모니터에서 최상으로 즐길 수 있습니다. 조정하지 않았다면 플레이하기 전에 조정해 주십시오.", "APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여", - "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요" + "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요", + "GAME_INVENTORY_INGREDIENTS" : "재료", + "GAME_INVENTORY_POTIONS" : "물약", + "GAME_INVENTORY_BLOCKS" : "블록", + "GAME_INVENTORY_WALLPAPERS" : "벽지", + "CONTEXT_ITEM_EQUIPMENT_PLURAL" : "장비" } \ No newline at end of file diff --git a/src/net/torvald/serialise/WriteGameMapData.kt b/src/net/torvald/serialise/WriteGameMapData.kt index 17d2ab830..aef54ef5b 100644 --- a/src/net/torvald/serialise/WriteGameMapData.kt +++ b/src/net/torvald/serialise/WriteGameMapData.kt @@ -25,7 +25,7 @@ object WriteGameMapData { val path = Paths.get("${Terrarum.defaultSaveDir}" + "/$saveDirectoryName/${WriteMeta.META_FILENAME}") val tempPath = Files.createTempFile(path.toString(), "_temp") - val map = Terrarum.ingame.world + val map = Terrarum.ingame!!.world // TODO gzip diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index 4af050624..fd48cece8 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -178,17 +178,16 @@ class StateInGame : BasicGameState() { // vital metre // fill in getter functions by // (uiAliases[UI_QUICK_BAR]!!.UI as UIVitalMetre).vitalGetterMax = { some_function } - uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { 80f }, { 100f }, Color.green, 0)) + uiAliases[UI_VITAL1] = UIHandler(UIVitalMetre(player, { 80f }, { 100f }, Color.red, 0)) uiAliases[UI_VITAL1]!!.setAsAlwaysVisible() - uiAliases[UI_VITAL2] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 1)) + uiAliases[UI_VITAL2] = UIHandler(UIVitalMetre(player, { 73f }, { 100f }, Color(0x00dfff), 1)) uiAliases[UI_VITAL2]!!.setAsAlwaysVisible() - uiAliases[UI_VITAL3] = UIHandler(UIVitalMetre(player, { null }, { null }, null, 2)) + uiAliases[UI_VITAL3] = UIHandler(UIVitalMetre(player, { 32f }, { 100f }, Color(0xffcc00), 2)) uiAliases[UI_VITAL3]!!.setAsAlwaysVisible() // batch-process uiAliases uiAliases.forEach { _, uiHandler -> - uiHandler.UI.handler = uiHandler // attach UIHandlers uiContainer.add(uiHandler) // put them all to the UIContainer } @@ -281,7 +280,7 @@ class StateInGame : BasicGameState() { } // determine if lightmap blending should be done - Terrarum.gameConfig["smoothlighting"] = KeyToggler.isOn(KEY_LIGHTMAP_SMOOTH) + Terrarum.setConfig("smoothlighting", KeyToggler.isOn(KEY_LIGHTMAP_SMOOTH)) } private fun repossessActor() { @@ -644,8 +643,8 @@ class StateInGame : BasicGameState() { /** whether the actor is within screen */ private fun ActorVisible.inScreen() = distToCameraSqr(this) <= - (Terrarum.WIDTH.plus(this.hitbox.width.div(2)).times(1 / Terrarum.ingame.screenZoom).sqr() + - Terrarum.HEIGHT.plus(this.hitbox.height.div(2)).times(1 / Terrarum.ingame.screenZoom).sqr()) + (Terrarum.WIDTH.plus(this.hitbox.width.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr() + + Terrarum.HEIGHT.plus(this.hitbox.height.div(2)).times(1 / Terrarum.ingame!!.screenZoom).sqr()) /** whether the actor is within update range */ diff --git a/src/net/torvald/terrarum/StateMonitorCheck.kt b/src/net/torvald/terrarum/StateMonitorCheck.kt index e93311dcd..b94f36400 100644 --- a/src/net/torvald/terrarum/StateMonitorCheck.kt +++ b/src/net/torvald/terrarum/StateMonitorCheck.kt @@ -44,7 +44,7 @@ class StateMonitorCheck : BasicGameState() { private val colourLUT = IntArray(32, { 255.times(it + 1).div(32) }) val pictograms = ArrayList() - lateinit var imageGallery: ItemImageGallery + val imageGallery: UIItemImageGallery val instructionY = Terrarum.HEIGHT / 2//Terrarum.HEIGHT * 9 / 16 val anykeyY = Terrarum.HEIGHT * 15 / 16 @@ -58,7 +58,9 @@ class StateMonitorCheck : BasicGameState() { pictograms.add(Image("./assets/graphics/gui/monitor_good.tga")) pictograms.add(Image("./assets/graphics/gui/monitor_bad.tga")) - imageGallery = ItemImageGallery(0, instructionY, Terrarum.WIDTH, anykeyY - instructionY, pictograms) + imageGallery = UIItemImageGallery( + this, 0, instructionY, Terrarum.WIDTH, anykeyY - instructionY, pictograms + ) } override fun update(gc: GameContainer, delta: Int) { diff --git a/src/net/torvald/terrarum/StateSplash.kt b/src/net/torvald/terrarum/StateSplash.kt index 0cb379d45..429b1f8b6 100644 --- a/src/net/torvald/terrarum/StateSplash.kt +++ b/src/net/torvald/terrarum/StateSplash.kt @@ -5,7 +5,8 @@ import net.torvald.terrarum.gameactors.roundInt import net.torvald.terrarum.gamecontroller.Key import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.ui.DrawUtil -import net.torvald.terrarum.ui.ItemImageGallery +import net.torvald.terrarum.ui.NullUI +import net.torvald.terrarum.ui.UIItemImageGallery import net.torvald.terrarum.ui.Typography import org.newdawn.slick.Color import org.newdawn.slick.GameContainer @@ -46,7 +47,7 @@ class StateSplash : BasicGameState() { var init = false - lateinit var imageGallery: ItemImageGallery + lateinit var imageGallery: UIItemImageGallery override fun init(container: GameContainer?, game: StateBasedGame?) { // pre-load lang @@ -62,7 +63,9 @@ class StateSplash : BasicGameState() { imageBoardHeight = Terrarum.HEIGHT - thisG.font.lineHeight.times(6) imageBoardOffset = thisG.font.lineHeight.times(3) - imageGallery = ItemImageGallery(0, imageBoardOffset, Terrarum.WIDTH, imageBoardHeight, pictogramCollection) + imageGallery = UIItemImageGallery( + NullUI(), 0, imageBoardOffset, Terrarum.WIDTH, imageBoardHeight, pictogramCollection + ) } override fun update(container: GameContainer, game: StateBasedGame, delta: Int) { diff --git a/src/net/torvald/terrarum/StateUITest.kt b/src/net/torvald/terrarum/StateUITest.kt new file mode 100644 index 000000000..d93876c64 --- /dev/null +++ b/src/net/torvald/terrarum/StateUITest.kt @@ -0,0 +1,120 @@ +package net.torvald.terrarum + +import net.torvald.terrarum.gameactors.ActorInventory +import net.torvald.terrarum.gameitem.InventoryItem +import net.torvald.terrarum.mapdrawer.MapCamera +import net.torvald.terrarum.ui.UICanvas +import net.torvald.terrarum.ui.UIHandler +import net.torvald.terrarum.ui.UIItemTextButton +import net.torvald.terrarum.ui.UIItemTextButtonList +import org.newdawn.slick.Color +import org.newdawn.slick.GameContainer +import org.newdawn.slick.Graphics +import org.newdawn.slick.Input +import org.newdawn.slick.state.BasicGameState +import org.newdawn.slick.state.StateBasedGame + +/** + * Created by SKYHi14 on 2017-03-13. + */ +class StateUITest : BasicGameState() { + + val ui = UIHandler(SimpleUI()) + + val inventory = ActorInventory() + + init { + ui.posX = 50 + ui.isVisible = true + + + inventory.add(object : InventoryItem() { + override val id: Int = 5656 + override var baseMass: Double = 12.0 + override var baseToolSize: Double? = 8.0 + override var category: String = "tool" + }) + + inventory.add(object : InventoryItem() { + override val id: Int = 4633 + override var baseMass: Double = 1.4 + override var baseToolSize: Double? = null + override var category: String = "bulk" + }) + } + + override fun init(container: GameContainer?, game: StateBasedGame?) { + } + + override fun update(container: GameContainer, game: StateBasedGame, delta: Int) { + ui.update(container, delta) + } + + override fun getID() = Terrarum.STATE_ID_TEST_UI + + override fun render(container: GameContainer, game: StateBasedGame, g: Graphics) { + ui.render(container, game, g) + } +} + + + + + + + +private class SimpleUI : UICanvas { + override var width = 400 + override var height = 600 + override var handler: UIHandler? = null + override var openCloseTime: Int = UICanvas.OPENCLOSE_GENERIC + + val buttons = UIItemTextButtonList( + this, + arrayOf( + "GAME_INVENTORY_WEAPONS", // weapons and tools + "CONTEXT_ITEM_EQUIPMENT_PLURAL", + "CONTEXT_ITEM_ARMOR", + "GAME_INVENTORY_INGREDIENTS", + "GAME_INVENTORY_POTIONS", + "GAME_INVENTORY_BLOCKS", + "GAME_INVENTORY_WALLPAPERS", + "MENU_LABEL_ALL" + ), + 300, height, + readFromLang = true + ) + + override fun update(gc: GameContainer, delta: Int) { + Terrarum.gameLocale = "fiFI" // hot swap this to test + + buttons.update(gc, delta) + } + + override fun render(gc: GameContainer, g: Graphics) { + g.color = Color(0x282828) + g.fillRect(0f, 0f, 300f, 600f) + + + buttons.render(gc, g) + } + + override fun processInput(gc: GameContainer, delta: Int, input: Input) { + } + + override fun doOpening(gc: GameContainer, delta: Int) { + UICanvas.doOpeningFade(handler, openCloseTime) + } + + override fun doClosing(gc: GameContainer, delta: Int) { + UICanvas.doClosingFade(handler, openCloseTime) + } + + override fun endOpening(gc: GameContainer, delta: Int) { + UICanvas.endOpeningFade(handler) + } + + override fun endClosing(gc: GameContainer, delta: Int) { + UICanvas.endClosingFade(handler) + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index 8da88ce03..be2e39433 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -66,8 +66,8 @@ object Terrarum : StateBasedGame(GAME_NAME) { var gameStarted = false - lateinit var ingame: StateInGame - lateinit var gameConfig: GameConfig + var ingame: StateInGame? = null + private val gameConfig = GameConfig() val OSName = System.getProperty("os.name") val OSVersion = System.getProperty("os.version") @@ -133,6 +133,7 @@ object Terrarum : StateBasedGame(GAME_NAME) { val STATE_ID_TEST_TTY = 0x102 val STATE_ID_TEST_BLUR = 0x103 val STATE_ID_TEST_SHADER = 0x104 + val STATE_ID_TEST_UI = 0x105 val STATE_ID_TOOL_NOISEGEN = 0x200 @@ -187,8 +188,6 @@ object Terrarum : StateBasedGame(GAME_NAME) { println("Java is running in 32 Bit") } - gameConfig = GameConfig() - joypadLabelStart = when (getConfigString("joypadlabelstyle")) { "nwii" -> 0xE04B.toChar() // + mark "logitech" -> 0xE05A.toChar() // number 10 @@ -282,9 +281,10 @@ object Terrarum : StateBasedGame(GAME_NAME) { //addState(StateBlurTest()) //addState(StateShaderTest()) //addState(StateNoiseTester()) + addState(StateUITest()) - ingame = StateInGame() - addState(ingame) + //ingame = StateInGame() + //addState(ingame) // foolproof @@ -435,6 +435,10 @@ object Terrarum : StateBasedGame(GAME_NAME) { return cfg!! } + fun setConfig(key: String, value: Any) { + gameConfig[key] = value + } + val currentSaveDir: File get() { val file = File(defaultSaveDir + "/test") diff --git a/src/net/torvald/terrarum/console/AVTracker.kt b/src/net/torvald/terrarum/console/AVTracker.kt index 053d29844..eb0021895 100644 --- a/src/net/torvald/terrarum/console/AVTracker.kt +++ b/src/net/torvald/terrarum/console/AVTracker.kt @@ -12,14 +12,14 @@ object AVTracker : ConsoleCommand { override fun execute(args: Array) { if (args.size < 2) { - jPanelInstances.add(ActorValueTracker(Terrarum.ingame.player)) + jPanelInstances.add(ActorValueTracker(Terrarum.ingame!!.player)) } else { try { val actorID = args[1].toInt() - if (Terrarum.ingame.theGameHasActor(actorID)) { - jPanelInstances.add(ActorValueTracker(Terrarum.ingame.getActorByID(actorID))) + if (Terrarum.ingame!!.theGameHasActor(actorID)) { + jPanelInstances.add(ActorValueTracker(Terrarum.ingame!!.getActorByID(actorID))) } else { throw IllegalArgumentException() diff --git a/src/net/torvald/terrarum/console/ActorsList.kt b/src/net/torvald/terrarum/console/ActorsList.kt index 8bae65a38..56637ef1e 100644 --- a/src/net/torvald/terrarum/console/ActorsList.kt +++ b/src/net/torvald/terrarum/console/ActorsList.kt @@ -12,8 +12,8 @@ object ActorsList : ConsoleCommand { override fun execute(args: Array) { jPanelInstances.add(ActorsLister( - Terrarum.ingame.actorContainer, - Terrarum.ingame.actorContainerInactive) + Terrarum.ingame!!.actorContainer, + Terrarum.ingame!!.actorContainerInactive) ) } diff --git a/src/net/torvald/terrarum/console/Authenticator.kt b/src/net/torvald/terrarum/console/Authenticator.kt index 2c8fe1222..ddb425714 100644 --- a/src/net/torvald/terrarum/console/Authenticator.kt +++ b/src/net/torvald/terrarum/console/Authenticator.kt @@ -39,7 +39,7 @@ internal object Authenticator : ConsoleCommand { Echo(msg) println("[Authenticator] " + msg) a = !a - (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).reset() + (Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).reset() } else { printUsage() // thou shalt not pass! diff --git a/src/net/torvald/terrarum/console/Echo.kt b/src/net/torvald/terrarum/console/Echo.kt index 53c4ff458..5e7d304b3 100644 --- a/src/net/torvald/terrarum/console/Echo.kt +++ b/src/net/torvald/terrarum/console/Echo.kt @@ -19,13 +19,13 @@ internal object Echo : ConsoleCommand { val sb = StringBuilder() for (ch in single_line) { if (ch == '\n') { - (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString()) + (Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString()) sb.delete(0, sb.length - 1) } else sb.append(ch) } - (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString()) + (Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage(sb.toString()) } operator fun invoke(args: Array) = execute(args) diff --git a/src/net/torvald/terrarum/console/EchoError.kt b/src/net/torvald/terrarum/console/EchoError.kt index ab8bb682c..fd89fd29c 100644 --- a/src/net/torvald/terrarum/console/EchoError.kt +++ b/src/net/torvald/terrarum/console/EchoError.kt @@ -14,7 +14,7 @@ internal object EchoError : ConsoleCommand { } fun execute(single_line: String) { - (Terrarum.ingame.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line") + (Terrarum.ingame!!.consoleHandler.UI as ConsoleWindow).sendMessage("${GameFontBase.colToCode["r"]}$single_line") } operator fun invoke(args: Array) = execute(args) diff --git a/src/net/torvald/terrarum/console/ExportAV.kt b/src/net/torvald/terrarum/console/ExportAV.kt index b02e80e64..5c909a919 100644 --- a/src/net/torvald/terrarum/console/ExportAV.kt +++ b/src/net/torvald/terrarum/console/ExportAV.kt @@ -13,7 +13,7 @@ internal object ExportAV : ConsoleCommand { if (args.size == 2) { try { JsonWriter.writeToFile( - Terrarum.ingame.player.actorValue, + Terrarum.ingame!!.player.actorValue, Terrarum.defaultDir + "/Exports/" + args[1] + ".json") Echo("ExportAV: exported to " + args[1] + ".json") diff --git a/src/net/torvald/terrarum/console/ExportMap.kt b/src/net/torvald/terrarum/console/ExportMap.kt index 652e580b3..84ebeb44b 100644 --- a/src/net/torvald/terrarum/console/ExportMap.kt +++ b/src/net/torvald/terrarum/console/ExportMap.kt @@ -60,10 +60,10 @@ internal object ExportMap : ConsoleCommand { override fun execute(args: Array) { if (args.size == 2) { - var mapData = ByteArray(Terrarum.ingame.world.width * Terrarum.ingame.world.height * 3) + var mapData = ByteArray(Terrarum.ingame!!.world.width * Terrarum.ingame!!.world.height * 3) var mapDataPointer = 0 - for (tile in Terrarum.ingame.world.terrainIterator()) { + for (tile in Terrarum.ingame!!.world.terrainIterator()) { val colArray = (colorTable as Map) .getOrElse(tile, { Col4096(0xFFF) }).toByteArray() @@ -82,7 +82,7 @@ internal object ExportMap : ConsoleCommand { try { RasterWriter.writePNG_RGB( - Terrarum.ingame.world.width, Terrarum.ingame.world.height, mapData, dir + args[1] + ".png") + Terrarum.ingame!!.world.width, Terrarum.ingame!!.world.height, mapData, dir + args[1] + ".png") Echo("ExportMap: exported to " + args[1] + ".png") } diff --git a/src/net/torvald/terrarum/console/GetAV.kt b/src/net/torvald/terrarum/console/GetAV.kt index 7f07fa56e..cef3f0725 100644 --- a/src/net/torvald/terrarum/console/GetAV.kt +++ b/src/net/torvald/terrarum/console/GetAV.kt @@ -19,7 +19,7 @@ internal object GetAV : ConsoleCommand { try { if (args.size == 1) { // print all actorvalue of player - val av = Terrarum.ingame.player.actorValue + val av = Terrarum.ingame!!.player.actorValue val keyset = av.keySet Echo("$ccW== ActorValue list for ${ccY}player $ccW==") @@ -37,19 +37,19 @@ internal object GetAV : ConsoleCommand { if (!args[1].isNum()) { // args[1] is ActorValue name Echo("${ccW}player.$ccM${args[1]} $ccW= " + ccG + - Terrarum.ingame.player.actorValue[args[1]] + + Terrarum.ingame!!.player.actorValue[args[1]] + " $ccO" + - Terrarum.ingame.player.actorValue[args[1]]!!.javaClass.simpleName + Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName ) println("[GetAV] player.${args[1]} = " + - Terrarum.ingame.player.actorValue[args[1]] + + Terrarum.ingame!!.player.actorValue[args[1]] + " " + - Terrarum.ingame.player.actorValue[args[1]]!!.javaClass.simpleName + Terrarum.ingame!!.player.actorValue[args[1]]!!.javaClass.simpleName ) } else { // args[1] is actor ID - val actor = Terrarum.ingame.getActorByID(args[1].toInt()) + val actor = Terrarum.ingame!!.getActorByID(args[1].toInt()) val av = actor.actorValue val keyset = av.keySet @@ -71,14 +71,14 @@ internal object GetAV : ConsoleCommand { val id = args[1].toInt() val av = args[2] Echo("$ccW$id.$ccM$av $ccW= $ccG" + - Terrarum.ingame.getActorByID(id).actorValue[av] + + Terrarum.ingame!!.getActorByID(id).actorValue[av] + " $ccO" + - Terrarum.ingame.getActorByID(id).actorValue[av]!!.javaClass.simpleName + Terrarum.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName ) println("$id.$av = " + - Terrarum.ingame.getActorByID(id).actorValue[av] + + Terrarum.ingame!!.getActorByID(id).actorValue[av] + " " + - Terrarum.ingame.getActorByID(id).actorValue[av]!!.javaClass.simpleName + Terrarum.ingame!!.getActorByID(id).actorValue[av]!!.javaClass.simpleName ) } } diff --git a/src/net/torvald/terrarum/console/GetFactioning.kt b/src/net/torvald/terrarum/console/GetFactioning.kt index fe2079580..194ef01f4 100644 --- a/src/net/torvald/terrarum/console/GetFactioning.kt +++ b/src/net/torvald/terrarum/console/GetFactioning.kt @@ -25,7 +25,7 @@ internal object GetFactioning : ConsoleCommand { val error = Error() fun printOutFactioning(id: Int) { - val a = Terrarum.ingame.getActorByID(id) + val a = Terrarum.ingame!!.getActorByID(id) if (a is Factionable) { Echo("$ccW== Faction assignment for $ccY${if (id == Player.PLAYER_REF_ID) "player" else id.toString()} $ccW==") println("[GetFactioning] == Faction assignment for '${if (id == Player.PLAYER_REF_ID) "player" else id.toString()}' ==") diff --git a/src/net/torvald/terrarum/console/GetTime.kt b/src/net/torvald/terrarum/console/GetTime.kt index 1f4555fab..595964021 100644 --- a/src/net/torvald/terrarum/console/GetTime.kt +++ b/src/net/torvald/terrarum/console/GetTime.kt @@ -8,7 +8,7 @@ import net.torvald.terrarum.Terrarum internal object GetTime : ConsoleCommand { override fun execute(args: Array) { - val worldTime = Terrarum.ingame.world.time + val worldTime = Terrarum.ingame!!.world.time Echo(worldTime.getFormattedTime()) } diff --git a/src/net/torvald/terrarum/console/GsonTest.kt b/src/net/torvald/terrarum/console/GsonTest.kt index 87365fa28..703e85ab7 100644 --- a/src/net/torvald/terrarum/console/GsonTest.kt +++ b/src/net/torvald/terrarum/console/GsonTest.kt @@ -14,7 +14,7 @@ import java.io.IOException internal object GsonTest : ConsoleCommand { override fun execute(args: Array) { if (args.size == 2) { - val avelem = Gson().toJsonTree(Terrarum.ingame.player) + val avelem = Gson().toJsonTree(Terrarum.ingame!!.player) val jsonString = avelem.toString() diff --git a/src/net/torvald/terrarum/console/Inventory.kt b/src/net/torvald/terrarum/console/Inventory.kt index 1528a51f4..14ecaa59d 100644 --- a/src/net/torvald/terrarum/console/Inventory.kt +++ b/src/net/torvald/terrarum/console/Inventory.kt @@ -12,7 +12,7 @@ import net.torvald.terrarum.itemproperties.ItemCodex */ internal object Inventory : ConsoleCommand { - private var target: Pocketed = Terrarum.ingame.player + private var target: Pocketed = Terrarum.ingame!!.player override fun execute(args: Array) { if (args.size == 1) { @@ -45,7 +45,7 @@ internal object Inventory : ConsoleCommand { } private fun setTarget(actorRefId: Int = Player.PLAYER_REF_ID) { - val actor = Terrarum.ingame.getActorByID(actorRefId) + val actor = Terrarum.ingame!!.getActorByID(actorRefId) if (actor !is Pocketed) { EchoError("Cannot edit inventory of incompatible actor: $actor") } diff --git a/src/net/torvald/terrarum/console/KillActor.kt b/src/net/torvald/terrarum/console/KillActor.kt index c16c35702..20403e658 100644 --- a/src/net/torvald/terrarum/console/KillActor.kt +++ b/src/net/torvald/terrarum/console/KillActor.kt @@ -11,7 +11,7 @@ object KillActor : ConsoleCommand { if (args.size == 2) { try { val actorid = args[1].toInt() - Terrarum.ingame.removeActor(actorid) + Terrarum.ingame!!.removeActor(actorid) } catch (e: NumberFormatException) { EchoError("Wrong number input.") diff --git a/src/net/torvald/terrarum/console/Seed.kt b/src/net/torvald/terrarum/console/Seed.kt index 7a85dec8e..b0406c21d 100644 --- a/src/net/torvald/terrarum/console/Seed.kt +++ b/src/net/torvald/terrarum/console/Seed.kt @@ -12,8 +12,8 @@ internal object Seed : ConsoleCommand { val ccY = GameFontBase.colToCode["y"] override fun execute(args: Array) { - Echo("Map$ccW: $ccG${Terrarum.ingame.world.generatorSeed}") - println("[seed] Map$ccW: $ccG${Terrarum.ingame.world.generatorSeed}") + Echo("Map$ccW: $ccG${Terrarum.ingame!!.world.generatorSeed}") + println("[seed] Map$ccW: $ccG${Terrarum.ingame!!.world.generatorSeed}") // TODO display randomiser seed } diff --git a/src/net/torvald/terrarum/console/SetAV.kt b/src/net/torvald/terrarum/console/SetAV.kt index a484388ea..02c14e490 100644 --- a/src/net/torvald/terrarum/console/SetAV.kt +++ b/src/net/torvald/terrarum/console/SetAV.kt @@ -66,7 +66,7 @@ internal object SetAV : ConsoleCommand { return } - Terrarum.ingame.player.actorValue[args[1]] = newValue + Terrarum.ingame!!.player.actorValue[args[1]] = newValue Echo("${ccW}Set $ccM${args[1]} ${ccW}for ${ccY}player ${ccW}to $ccG$newValue") println("[SetAV] set ActorValue '${args[1]}' for player to '$newValue'.") } @@ -74,7 +74,7 @@ internal object SetAV : ConsoleCommand { try { val id = args[1].toInt() val newValue = parseAVInput(args[3]) - val actor = Terrarum.ingame.getActorByID(id) + val actor = Terrarum.ingame!!.getActorByID(id) // check if av is number if (args[2].isNum()) { diff --git a/src/net/torvald/terrarum/console/SetBulletin.kt b/src/net/torvald/terrarum/console/SetBulletin.kt index a768df025..c4c1fcf18 100644 --- a/src/net/torvald/terrarum/console/SetBulletin.kt +++ b/src/net/torvald/terrarum/console/SetBulletin.kt @@ -25,7 +25,7 @@ internal object SetBulletin : ConsoleCommand { * @param message real message */ fun send(message: Array) { - Terrarum.ingame.sendNotification(message) + Terrarum.ingame!!.sendNotification(message) println("sent notifinator") } } diff --git a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt index d3c39a4ed..366947967 100644 --- a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt +++ b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt @@ -20,7 +20,7 @@ internal object SetGlobalLightOverride : ConsoleCommand { val GL = LightmapRenderer.constructRGBFromInt(r, g, b) lightOverride = true - Terrarum.ingame.world.globalLight = GL + Terrarum.ingame!!.world.globalLight = GL } catch (e: NumberFormatException) { Echo("Wrong number input.") @@ -38,7 +38,7 @@ internal object SetGlobalLightOverride : ConsoleCommand { Echo("Range: 0-" + (LightmapRenderer.COLOUR_RANGE_SIZE - 1)) } else { - Terrarum.ingame.world.globalLight = GL + Terrarum.ingame!!.world.globalLight = GL } } catch (e: NumberFormatException) { diff --git a/src/net/torvald/terrarum/console/SetScale.kt b/src/net/torvald/terrarum/console/SetScale.kt index c41755ab3..5811930e8 100644 --- a/src/net/torvald/terrarum/console/SetScale.kt +++ b/src/net/torvald/terrarum/console/SetScale.kt @@ -10,10 +10,10 @@ object SetScale : ConsoleCommand { override fun execute(args: Array) { if (args.size == 2 || args.size == 3) { try { - val targetID = if (args.size == 3) args[1].toInt() else Terrarum.ingame.player.referenceID + val targetID = if (args.size == 3) args[1].toInt() else Terrarum.ingame!!.player.referenceID val scale = args[if (args.size == 3) 2 else 1].toDouble() - val target = Terrarum.ingame.getActorByID(targetID) + val target = Terrarum.ingame!!.getActorByID(targetID) if (target !is ActorWithSprite) { EchoError("Target is not ActorWithSprite") diff --git a/src/net/torvald/terrarum/console/SetTime.kt b/src/net/torvald/terrarum/console/SetTime.kt index 672c5ddec..94623e133 100644 --- a/src/net/torvald/terrarum/console/SetTime.kt +++ b/src/net/torvald/terrarum/console/SetTime.kt @@ -11,10 +11,10 @@ internal object SetTime : ConsoleCommand { if (args.size == 2) { val timeToSet = WorldTime.parseTime(args[1]) - Terrarum.ingame.world.time.setTime(timeToSet) + Terrarum.ingame!!.world.time.setTime(timeToSet) - Echo("Set time to ${Terrarum.ingame.world.time.elapsedSeconds} " + - "(${Terrarum.ingame.world.time.hours}h${formatMin(Terrarum.ingame.world.time.minutes)})") + Echo("Set time to ${Terrarum.ingame!!.world.time.elapsedSeconds} " + + "(${Terrarum.ingame!!.world.time.hours}h${formatMin(Terrarum.ingame!!.world.time.minutes)})") } else { printUsage() diff --git a/src/net/torvald/terrarum/console/SetTimeDelta.kt b/src/net/torvald/terrarum/console/SetTimeDelta.kt index e5551e0f9..a2599b598 100644 --- a/src/net/torvald/terrarum/console/SetTimeDelta.kt +++ b/src/net/torvald/terrarum/console/SetTimeDelta.kt @@ -14,11 +14,11 @@ internal object SetTimeDelta : ConsoleCommand { if (args[1].toInt() > HARD_LIMIT) EchoError("Delta too large -- acceptable delta is 0-60.") - Terrarum.ingame.world.time.setTimeDelta(args[1].toInt()) - if (Terrarum.ingame.world.time.timeDelta == 0) + Terrarum.ingame!!.world.time.setTimeDelta(args[1].toInt()) + if (Terrarum.ingame!!.world.time.timeDelta == 0) Echo("時間よ止まれ！ザ・ワルド！！") else - Echo("Set time delta to ${Terrarum.ingame.world.time.timeDelta}") + Echo("Set time delta to ${Terrarum.ingame!!.world.time.timeDelta}") } else { printUsage() diff --git a/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt index 9445007e5..ad098bb6d 100644 --- a/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt +++ b/src/net/torvald/terrarum/console/SpawnPhysTestBall.kt @@ -31,7 +31,7 @@ internal object SpawnPhysTestBall : ConsoleCommand { ball.elasticity = elasticity ball.applyForce(Vector2(xvel, yvel)) - Terrarum.ingame.addNewActor(ball) + Terrarum.ingame!!.addNewActor(ball) } else if (args.size == 2) { val elasticity = args[1].toDouble() @@ -43,7 +43,7 @@ internal object SpawnPhysTestBall : ConsoleCommand { ) ball.elasticity = elasticity - Terrarum.ingame.addNewActor(ball) + Terrarum.ingame!!.addNewActor(ball) } else { printUsage() diff --git a/src/net/torvald/terrarum/console/SpawnTapestry.kt b/src/net/torvald/terrarum/console/SpawnTapestry.kt index ba39b8a17..db4bf0d1d 100644 --- a/src/net/torvald/terrarum/console/SpawnTapestry.kt +++ b/src/net/torvald/terrarum/console/SpawnTapestry.kt @@ -16,7 +16,7 @@ object SpawnTapestry : ConsoleCommand { } val tapestry = DecodeTapestry(File(args[1])) - Terrarum.ingame.addNewActor(tapestry) + Terrarum.ingame!!.addNewActor(tapestry) } override fun printUsage() { diff --git a/src/net/torvald/terrarum/console/SpawnTikiTorch.kt b/src/net/torvald/terrarum/console/SpawnTikiTorch.kt index 59fd21ed0..48e2fb8c8 100644 --- a/src/net/torvald/terrarum/console/SpawnTikiTorch.kt +++ b/src/net/torvald/terrarum/console/SpawnTikiTorch.kt @@ -13,7 +13,7 @@ object SpawnTikiTorch : ConsoleCommand { val torch = FixtureTikiTorch() torch.setPosition(Terrarum.appgc.mouseX, Terrarum.appgc.mouseY) - Terrarum.ingame.addNewActor(torch) + Terrarum.ingame!!.addNewActor(torch) } override fun printUsage() { diff --git a/src/net/torvald/terrarum/console/Teleport.kt b/src/net/torvald/terrarum/console/Teleport.kt index e935b9c3a..0f36f64db 100644 --- a/src/net/torvald/terrarum/console/Teleport.kt +++ b/src/net/torvald/terrarum/console/Teleport.kt @@ -24,7 +24,7 @@ internal object Teleport : ConsoleCommand { return } - Terrarum.ingame.player.setPosition(x.toDouble(), y.toDouble()) + Terrarum.ingame!!.player.setPosition(x.toDouble(), y.toDouble()) } else if (args.size == 4) { if (args[2].toLowerCase() != "to") { @@ -36,20 +36,20 @@ internal object Teleport : ConsoleCommand { try { val fromActorID = args[1].toInt() val targetActorID = if (args[3].toLowerCase() == "player") - Terrarum.ingame.player.referenceID + Terrarum.ingame!!.player.referenceID else args[3].toInt() // if from == target, ignore the action if (fromActorID == targetActorID) return - if (Terrarum.ingame.getActorByID(fromActorID) !is ActorWithSprite || - Terrarum.ingame.getActorByID(targetActorID) !is ActorWithSprite) { + if (Terrarum.ingame!!.getActorByID(fromActorID) !is ActorWithSprite || + Terrarum.ingame!!.getActorByID(targetActorID) !is ActorWithSprite) { throw IllegalArgumentException() } else { - fromActor = Terrarum.ingame.getActorByID(fromActorID) as ActorWithSprite - targetActor = Terrarum.ingame.getActorByID(targetActorID) as ActorWithSprite + fromActor = Terrarum.ingame!!.getActorByID(fromActorID) as ActorWithSprite + targetActor = Terrarum.ingame!!.getActorByID(targetActorID) as ActorWithSprite } } catch (e: NumberFormatException) { @@ -80,11 +80,11 @@ internal object Teleport : ConsoleCommand { y = args[4].toInt() * FeaturesDrawer.TILE_SIZE + FeaturesDrawer.TILE_SIZE / 2 val actorID = args[1].toInt() - if (Terrarum.ingame.getActorByID(actorID) !is ActorWithSprite) { + if (Terrarum.ingame!!.getActorByID(actorID) !is ActorWithSprite) { throw IllegalArgumentException() } else { - actor = Terrarum.ingame.getActorByID(actorID) as ActorWithSprite + actor = Terrarum.ingame!!.getActorByID(actorID) as ActorWithSprite } } catch (e: NumberFormatException) { diff --git a/src/net/torvald/terrarum/console/ToggleNoClip.kt b/src/net/torvald/terrarum/console/ToggleNoClip.kt index 24c71d844..ca110ab05 100644 --- a/src/net/torvald/terrarum/console/ToggleNoClip.kt +++ b/src/net/torvald/terrarum/console/ToggleNoClip.kt @@ -8,9 +8,9 @@ import net.torvald.terrarum.Terrarum */ internal object ToggleNoClip : ConsoleCommand { override fun execute(args: Array) { - val status = Terrarum.ingame.player.isNoClip() + val status = Terrarum.ingame!!.player.isNoClip() - Terrarum.ingame.player.setNoClip(!status) + Terrarum.ingame!!.player.setNoClip(!status) Echo("Set no-clip status to " + (!status).toString()) } diff --git a/src/net/torvald/terrarum/console/Zoom.kt b/src/net/torvald/terrarum/console/Zoom.kt index 6356ca93f..ba8f43fd9 100644 --- a/src/net/torvald/terrarum/console/Zoom.kt +++ b/src/net/torvald/terrarum/console/Zoom.kt @@ -18,14 +18,14 @@ internal object Zoom : ConsoleCommand { return } - if (zoom < Terrarum.ingame.ZOOM_MIN) { - zoom = Terrarum.ingame.ZOOM_MIN + if (zoom < Terrarum.ingame!!.ZOOM_MIN) { + zoom = Terrarum.ingame!!.ZOOM_MIN } - else if (zoom > Terrarum.ingame.ZOOM_MAX) { - zoom = Terrarum.ingame.ZOOM_MAX + else if (zoom > Terrarum.ingame!!.ZOOM_MAX) { + zoom = Terrarum.ingame!!.ZOOM_MAX } - Terrarum.ingame.screenZoom = zoom + Terrarum.ingame!!.screenZoom = zoom System.gc() diff --git a/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt b/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt index cbe3806ff..e1e3003c1 100644 --- a/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt +++ b/src/net/torvald/terrarum/debuggerapp/ActorValueTracker.kt @@ -94,11 +94,11 @@ class ActorValueTracker constructor() : JFrame() { override fun mouseExited(e: MouseEvent?) { } override fun mousePressed(e: MouseEvent?) { if (actorIDField.text.toLowerCase() == "player") { - actor = Terrarum.ingame.player + actor = Terrarum.ingame!!.player actorValue = actor!!.actorValue } else if (actorIDField.text.isNotBlank()) { - actor = Terrarum.ingame.getActorByID(actorIDField.text.toInt()) as ActorWithSprite + actor = Terrarum.ingame!!.getActorByID(actorIDField.text.toInt()) as ActorWithSprite actorValue = actor!!.actorValue } } diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt index a8ec9d2ac..57437aec1 100644 --- a/src/net/torvald/terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -41,7 +41,7 @@ abstract class Actor(val renderOrder: ActorOrder) : Comparable, Runnable */ fun generateUniqueReferenceID(): Int { fun checkForCollision(value: Int) = - Terrarum.ingame.theGameHasActor(value) || + Terrarum.ingame!!.theGameHasActor(value) || value < ItemCodex.ITEM_COUNT_MAX || value < when (renderOrder) { ActorOrder.BEHIND -> ItemCodex.ITEM_COUNT_MAX diff --git a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt index 3f3d2591b..cd4774b88 100644 --- a/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt +++ b/src/net/torvald/terrarum/gameactors/ActorHumanoid.kt @@ -132,14 +132,14 @@ open class ActorHumanoid(birth: GameDate, death: GameDate? = null) protected var isRightDown = false protected var isJumpDown = false protected val isGamer: Boolean - get() = this == Terrarum.ingame.player + get() = this == Terrarum.ingame!!.player private val nullItem = object : InventoryItem() { override val id: Int = 0 - override var scale: Double = 1.0 override var baseMass: Double = 0.0 override var baseToolSize: Double? = null + override var category = "should_not_be_seen" } override fun update(gc: GameContainer, delta: Int) { diff --git a/src/net/torvald/terrarum/gameactors/ActorInventory.kt b/src/net/torvald/terrarum/gameactors/ActorInventory.kt index 652d9448e..d3c3f6170 100644 --- a/src/net/torvald/terrarum/gameactors/ActorInventory.kt +++ b/src/net/torvald/terrarum/gameactors/ActorInventory.kt @@ -55,8 +55,9 @@ class ActorInventory() { fun add(item: InventoryItem, count: Int = 1) { if (item.id == Player.PLAYER_REF_ID) throw IllegalArgumentException("Attempted to put human player into the inventory.") - if (Terrarum.ingame.playableActorDelegate != null && - item.id == Terrarum.ingame.player.referenceID) + if (Terrarum.ingame != null && + Terrarum.ingame!!.playableActorDelegate != null && + item.id == Terrarum.ingame!!.player.referenceID) throw IllegalArgumentException("Attempted to put active player into the inventory.") // If we already have the item, increment the amount diff --git a/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt b/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt index 6dd71d2d7..a1bb37f30 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt @@ -7,15 +7,10 @@ import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.mapdrawer.FeaturesDrawer import net.torvald.terrarum.tileproperties.TileCodex import net.torvald.spriteanimation.SpriteAnimation -import net.torvald.terrarum.gamecontroller.Key -import net.torvald.terrarum.gamecontroller.KeyToggler -import net.torvald.terrarum.mapdrawer.FeaturesDrawer.TILE_SIZE import net.torvald.terrarum.mapdrawer.MapCamera import net.torvald.terrarum.tileproperties.Tile import net.torvald.terrarum.tileproperties.TileProp -import org.dyn4j.Epsilon import org.dyn4j.geometry.Vector2 -import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics import org.newdawn.slick.Image @@ -42,7 +37,7 @@ open class ActorWithSprite(renderOrder: ActorOrder, val immobileBody: Boolean = var drawMode = BLEND_NORMAL - @Transient private val world: GameWorld = Terrarum.ingame.world + @Transient private val world: GameWorld = Terrarum.ingame!!.world var hitboxTranslateX: Double = 0.0// relative to spritePosX protected set @@ -1273,8 +1268,8 @@ open class ActorWithSprite(renderOrder: ActorOrder, val immobileBody: Boolean = private fun div16TruncateToMapWidth(x: Int): Int { if (x < 0) return 0 - else if (x >= Terrarum.ingame.world.width shl 4) - return Terrarum.ingame.world.width - 1 + else if (x >= Terrarum.ingame!!.world.width shl 4) + return Terrarum.ingame!!.world.width - 1 else return x and 0x7FFFFFFF shr 4 } @@ -1282,8 +1277,8 @@ open class ActorWithSprite(renderOrder: ActorOrder, val immobileBody: Boolean = private fun div16TruncateToMapHeight(y: Int): Int { if (y < 0) return 0 - else if (y >= Terrarum.ingame.world.height shl 4) - return Terrarum.ingame.world.height - 1 + else if (y >= Terrarum.ingame!!.world.height shl 4) + return Terrarum.ingame!!.world.height - 1 else return y and 0x7FFFFFFF shr 4 } diff --git a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt index 4d78cfa0c..2ab424b20 100644 --- a/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt +++ b/src/net/torvald/terrarum/gameactors/HumanoidNPC.kt @@ -52,6 +52,7 @@ open class HumanoidNPC( set(value) { actorValue[AVKey.SCALE] = value } + override var category = "npc" override fun secondaryUse(gc: GameContainer, delta: Int) { // TODO place this Actor to the world diff --git a/src/net/torvald/terrarum/gameactors/ParticleBase.kt b/src/net/torvald/terrarum/gameactors/ParticleBase.kt index 4ee1bc6bb..ab082ca89 100644 --- a/src/net/torvald/terrarum/gameactors/ParticleBase.kt +++ b/src/net/torvald/terrarum/gameactors/ParticleBase.kt @@ -43,7 +43,7 @@ open class ParticleBase(renderOrder: ActorOrder, maxLifeTime: Int? = null) : Run lifetimeCounter += delta if (velocity.isZero || lifetimeCounter >= lifetimeMax || // simple stuck check - TileCodex[Terrarum.ingame.world.getTileFromTerrain( + TileCodex[Terrarum.ingame!!.world.getTileFromTerrain( hitbox.pointedX.div(TILE_SIZE).floorInt(), hitbox.pointedY.div(TILE_SIZE).floorInt() ) ?: Tile.STONE].isSolid) { @@ -52,7 +52,7 @@ open class ParticleBase(renderOrder: ActorOrder, maxLifeTime: Int? = null) : Run // gravity, winds, etc. (external forces) if (!isNoSubjectToGrav) { - velocity += Terrarum.ingame.world.gravitation / dragCoefficient * SI_TO_GAME_ACC + velocity += Terrarum.ingame!!.world.gravitation / dragCoefficient * SI_TO_GAME_ACC } diff --git a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt index 003ed0174..c77913547 100644 --- a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt +++ b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt @@ -31,13 +31,13 @@ class PhysTestBall : ActorWithSprite(ActorOrder.MIDDLE, immobileBody = true) { hitbox.height.toFloat()) g.fillOval( - hitbox.posX.toFloat() + Terrarum.ingame.world.width * TILE_SIZE, + hitbox.posX.toFloat() + Terrarum.ingame!!.world.width * TILE_SIZE, hitbox.posY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat()) g.fillOval( - hitbox.posX.toFloat() - Terrarum.ingame.world.width * TILE_SIZE, + hitbox.posX.toFloat() - Terrarum.ingame!!.world.width * TILE_SIZE, hitbox.posY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat()) diff --git a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt index ec101443f..305ba7aea 100644 --- a/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt +++ b/src/net/torvald/terrarum/gameactors/PlayerBuilder.kt @@ -12,7 +12,7 @@ object PlayerBuilder { private val jsonString = String() operator fun invoke(): Actor { - val p: Actor = Player(Terrarum.ingame.world.time.currentTimeAsGameDate) + val p: Actor = Player(Terrarum.ingame!!.world.time.currentTimeAsGameDate) InjectCreatureRaw(p.actorValue, "CreatureHuman.json") // attach sprite diff --git a/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt b/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt index 06569757c..670a673ae 100644 --- a/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt +++ b/src/net/torvald/terrarum/gameactors/ProjectileSimple.kt @@ -75,7 +75,7 @@ open class ProjectileSimple( lifetimeCounter += delta if (ccdCollided || grounded || lifetimeCounter >= lifetimeMax || // stuck check - TileCodex[Terrarum.ingame.world.getTileFromTerrain(feetPosTile[0], feetPosTile[1]) ?: Tile.STONE].isSolid + TileCodex[Terrarum.ingame!!.world.getTileFromTerrain(feetPosTile[0], feetPosTile[1]) ?: Tile.STONE].isSolid ) { flagDespawn() } @@ -90,13 +90,13 @@ open class ProjectileSimple( colourTail.a = 0.16f // draw trail of solid colour (Terraria style maybe?) - g.lineWidth = 2f * Terrarum.ingame.screenZoom + g.lineWidth = 2f * Terrarum.ingame!!.screenZoom g.drawGradientLine( - hitbox.centeredX.toFloat() * Terrarum.ingame.screenZoom, - hitbox.centeredY.toFloat() * Terrarum.ingame.screenZoom, + hitbox.centeredX.toFloat() * Terrarum.ingame!!.screenZoom, + hitbox.centeredY.toFloat() * Terrarum.ingame!!.screenZoom, displayColour, - posPre.x.toFloat() * Terrarum.ingame.screenZoom, - posPre.y.toFloat() * Terrarum.ingame.screenZoom, + posPre.x.toFloat() * Terrarum.ingame!!.screenZoom, + posPre.y.toFloat() * Terrarum.ingame!!.screenZoom, colourTail ) } diff --git a/src/net/torvald/terrarum/gameactors/ThreadActorUpdate.kt b/src/net/torvald/terrarum/gameactors/ThreadActorUpdate.kt index ff1f61285..c2ccd8204 100644 --- a/src/net/torvald/terrarum/gameactors/ThreadActorUpdate.kt +++ b/src/net/torvald/terrarum/gameactors/ThreadActorUpdate.kt @@ -10,6 +10,6 @@ class ThreadActorUpdate(val startIndex: Int, val endIndex: Int, val gc: GameContainer, val delta: Int) : Runnable { override fun run() { for (i in startIndex..endIndex) - Terrarum.ingame.actorContainer[i].update(gc, delta) + Terrarum.ingame!!.actorContainer[i].update(gc, delta) } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/ai/AILuaAPI.kt b/src/net/torvald/terrarum/gameactors/ai/AILuaAPI.kt index d0df66530..2b640845d 100644 --- a/src/net/torvald/terrarum/gameactors/ai/AILuaAPI.kt +++ b/src/net/torvald/terrarum/gameactors/ai/AILuaAPI.kt @@ -239,7 +239,7 @@ internal class AILuaAPI(g: Globals, actor: ActorWithSprite) { luatable[y - feetTilePos[1]] = LuaTable() for (x in feetTilePos[0] - radius..feetTilePos[0] + radius) { - val tile = TileCodex[Terrarum.ingame.world.getTileFromTerrain(x, y) ?: 4096] + val tile = TileCodex[Terrarum.ingame!!.world.getTileFromTerrain(x, y) ?: 4096] val solidity = tile.isSolid.toInt() val liquidity = tile.isFluid.toInt() val gravity = tile.isFallable.toInt() @@ -283,7 +283,7 @@ internal class AILuaAPI(g: Globals, actor: ActorWithSprite) { // search down var searchDownCounter = 0 while (true) { - val tile = Terrarum.ingame.world.getTileFromTerrain(x, feetTilePos[1] + searchDownCounter) ?: Tile.STONE + val tile = Terrarum.ingame!!.world.getTileFromTerrain(x, feetTilePos[1] + searchDownCounter) ?: Tile.STONE if (TileCodex[tile].isSolid || searchDownCounter >= searchDownLimit) { luatable[x - feetTilePos[0]] = searchDownCounter break @@ -326,7 +326,7 @@ internal class AILuaAPI(g: Globals, actor: ActorWithSprite) { // search up var searchUpCounter = 0 while (true) { - val tile = Terrarum.ingame.world.getTileFromTerrain(x, feetTilePos[1] - searchUpCounter) ?: Tile.STONE + val tile = Terrarum.ingame!!.world.getTileFromTerrain(x, feetTilePos[1] - searchUpCounter) ?: Tile.STONE if (TileCodex[tile].isSolid || searchUpCounter >= searchUpLimit) { luatable[x - feetTilePos[0]] = searchUpCounter break @@ -368,7 +368,7 @@ internal class AILuaAPI(g: Globals, actor: ActorWithSprite) { // search up var searchUpCounter = 0 while (true) { - val tile = Terrarum.ingame.world.getTileFromTerrain(x, feetTilePos[1] - searchUpCounter) ?: Tile.STONE + val tile = Terrarum.ingame!!.world.getTileFromTerrain(x, feetTilePos[1] - searchUpCounter) ?: Tile.STONE if (!TileCodex[tile].isSolid || searchUpCounter >= searchUpLimit) { luatable[x - feetTilePos[0]] = searchUpCounter break diff --git a/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt index 198056d4a..187536a9e 100644 --- a/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt +++ b/src/net/torvald/terrarum/gameactors/faction/FactionFactory.kt @@ -20,10 +20,10 @@ object FactionFactory { val jsonObj = JsonFetcher(JSONPATH + filename) val factionObj = Faction(jsonObj.get("factionname").asString) - jsonObj.get("factionamicable").asJsonArray.forEach { s -> factionObj.addFactionAmicable(s.asString) } - jsonObj.get("factionneutral").asJsonArray.forEach { s -> factionObj.addFactionNeutral(s.asString) } - jsonObj.get("factionhostile").asJsonArray.forEach { s -> factionObj.addFactionHostile(s.asString) } - jsonObj.get("factionfearful").asJsonArray.forEach { s -> factionObj.addFactionFearful(s.asString) } + jsonObj.get("factionamicable").asJsonArray.forEach { factionObj.addFactionAmicable(it.asString) } + jsonObj.get("factionneutral").asJsonArray.forEach { factionObj.addFactionNeutral(it.asString) } + jsonObj.get("factionhostile").asJsonArray.forEach { factionObj.addFactionHostile(it.asString) } + jsonObj.get("factionfearful").asJsonArray.forEach { factionObj.addFactionFearful(it.asString) } return factionObj } diff --git a/src/net/torvald/terrarum/gameactors/physicssolver/CollisionSolver.kt b/src/net/torvald/terrarum/gameactors/physicssolver/CollisionSolver.kt index fcc9f0561..e40256d39 100644 --- a/src/net/torvald/terrarum/gameactors/physicssolver/CollisionSolver.kt +++ b/src/net/torvald/terrarum/gameactors/physicssolver/CollisionSolver.kt @@ -39,7 +39,7 @@ object CollisionSolver { collCandidateY.clear() // mark list x - Terrarum.ingame.actorContainer.forEach { it -> + Terrarum.ingame!!.actorContainer.forEach { it -> if (it is ActorWithSprite) { collListX.add(CollisionMarkings(it.hitbox.hitboxStart.x, STARTPOINT, it)) collListX.add(CollisionMarkings(it.hitbox.hitboxEnd.x, ENDPOINT, it)) @@ -72,7 +72,7 @@ object CollisionSolver { collCandidateStack.clear() // mark list y - Terrarum.ingame.actorContainer.forEach { it -> + Terrarum.ingame!!.actorContainer.forEach { it -> if (it is ActorWithSprite) { collListY.add(CollisionMarkings(it.hitbox.hitboxStart.y, STARTPOINT, it)) collListY.add(CollisionMarkings(it.hitbox.hitboxEnd.y, ENDPOINT, it)) diff --git a/src/net/torvald/terrarum/gamecontroller/GameController.kt b/src/net/torvald/terrarum/gamecontroller/GameController.kt index 612f26960..fa02b3ae4 100644 --- a/src/net/torvald/terrarum/gamecontroller/GameController.kt +++ b/src/net/torvald/terrarum/gamecontroller/GameController.kt @@ -25,10 +25,10 @@ object GameController { /** position of the mouse (pixelwise) relative to the world (also, currently pointing world-wise coordinate, if the world coordinate is pixel-wise) */ internal val mouseX: Float - get() = (MapCamera.x + Terrarum.appgc.input.mouseX / Terrarum.ingame.screenZoom) + get() = (MapCamera.x + Terrarum.appgc.input.mouseX / (Terrarum.ingame?.screenZoom ?: 1f)) /** position of the mouse (pixelwise) relative to the world (also, currently pointing world-wise coordinate, if the world coordinate is pixel-wise)*/ internal val mouseY: Float - get() = (MapCamera.y + Terrarum.appgc.input.mouseY / Terrarum.ingame.screenZoom) + get() = (MapCamera.y + Terrarum.appgc.input.mouseY / (Terrarum.ingame?.screenZoom ?: 1f)) /** currently pointing tile coordinate */ internal val mouseTileX: Int get() = (mouseX / FeaturesDrawer.TILE_SIZE).floorInt() @@ -40,62 +40,68 @@ object GameController { KeyToggler.update(input) + if (Terrarum.ingame != null) { + val ingame = Terrarum.ingame!! - if (!Terrarum.ingame.consoleHandler.isTakingControl) { - if (Terrarum.ingame.player is Player && (Terrarum.ingame.player as Player).vehicleRiding != null) { - (Terrarum.ingame.player as Player).vehicleRiding!!.processInput(gc, delta, input) + + if (!ingame.consoleHandler.isTakingControl) { + if (ingame.player is Player && (ingame.player as Player).vehicleRiding != null) { + (ingame.player as Player).vehicleRiding!!.processInput(gc, delta, input) + } + + ingame.actorContainer.forEach { + if (it is Controllable) it.processInput(gc, delta, input) + } + + ingame.uiContainer.forEach { + it.processInput(gc, delta, input) + } + } + else { + ingame.consoleHandler.processInput(gc, delta, input) } - Terrarum.ingame.actorContainer.forEach { - if (it is Controllable) it.processInput(gc, delta, input) - } - Terrarum.ingame.uiContainer.forEach { - it.processInput(gc, delta, input) - } + /////////////////// + // MOUSE CONTROL // + /////////////////// + // PRIMARY/SECONDARY IS FIXED TO LEFT/RIGHT BUTTON // + + + ///////////////////// + // GAMEPAD CONTROL // + ///////////////////// } - else { - Terrarum.ingame.consoleHandler.processInput(gc, delta, input) - } - - - /////////////////// - // MOUSE CONTROL // - /////////////////// - // PRIMARY/SECONDARY IS FIXED TO LEFT/RIGHT BUTTON // - - - - - - - ///////////////////// - // GAMEPAD CONTROL // - ///////////////////// } fun keyPressed(key: Int, c: Char) { - if (keyPressedByCode(key, EnumKeyFunc.UI_CONSOLE)) { - Terrarum.ingame.consoleHandler.toggleOpening() - } - else if (keyPressedByCode(key, EnumKeyFunc.UI_BASIC_INFO)) { - Terrarum.ingame.debugWindow.toggleOpening() - } + if (Terrarum.ingame != null) { + val ingame = Terrarum.ingame!! - if (!Terrarum.ingame.consoleHandler.isTakingControl) { - if (Terrarum.ingame.player is Player && (Terrarum.ingame.player as Player).vehicleRiding != null) { - (Terrarum.ingame.player as Player).vehicleRiding!!.keyPressed(key, c) + if (keyPressedByCode(key, EnumKeyFunc.UI_CONSOLE)) { + ingame.consoleHandler.toggleOpening() + } + else if (keyPressedByCode(key, EnumKeyFunc.UI_BASIC_INFO)) { + ingame.debugWindow.toggleOpening() } - Terrarum.ingame.player.keyPressed(key, c) - } - else { - Terrarum.ingame.consoleHandler.keyPressed(key, c) - } - //System.out.println(String.valueOf(key) + ", " + String.valueOf(c)); + + if (!ingame.consoleHandler.isTakingControl) { + if (ingame.player is Player && (ingame.player as Player).vehicleRiding != null) { + (ingame.player as Player).vehicleRiding!!.keyPressed(key, c) + } + + ingame.player.keyPressed(key, c) + } + else { + ingame.consoleHandler.keyPressed(key, c) + } + + //System.out.println(String.valueOf(key) + ", " + String.valueOf(c)); + } } fun keyReleased(key: Int, c: Char) { @@ -113,9 +119,9 @@ object GameController { fun mousePressed(button: Int, x: Int, y: Int) { // bullet test /*if (button == 0) { - Terrarum.ingame.addActor(ProjectileSimple( + Terrarum.ingame!!.addActor(ProjectileSimple( 0, - Terrarum.ingame.player.centrePosVector, + Terrarum.ingame!!.player.centrePosVector, Vector2(mouseX.toDouble(), mouseY.toDouble()) )) }*/ diff --git a/src/net/torvald/terrarum/gameitem/InventoryItem.kt b/src/net/torvald/terrarum/gameitem/InventoryItem.kt index 91d02f385..0316cffd1 100644 --- a/src/net/torvald/terrarum/gameitem/InventoryItem.kt +++ b/src/net/torvald/terrarum/gameitem/InventoryItem.kt @@ -20,6 +20,8 @@ abstract class InventoryItem { abstract var baseToolSize: Double? + abstract var category: String // "weapon", "tool", "armor", etc. (all smallcaps) + /** * Where to equip the item */ @@ -55,7 +57,7 @@ abstract class InventoryItem { * For static item, it must be 1.0. If you tinkered the item to be bigger, * it must be re-assigned as Dynamic Item */ - abstract var scale: Double + open var scale: Double = 1.0 /** * Effects applied continuously while in pocket diff --git a/src/net/torvald/terrarum/gameworld/WorldSimulator.kt b/src/net/torvald/terrarum/gameworld/WorldSimulator.kt index b9cef00c2..b3a2e434a 100644 --- a/src/net/torvald/terrarum/gameworld/WorldSimulator.kt +++ b/src/net/torvald/terrarum/gameworld/WorldSimulator.kt @@ -38,7 +38,7 @@ object WorldSimulator { val colourNone = Color(0x808080) val colourWater = Color(0x66BBFF) - private val world = Terrarum.ingame.world + private val world = Terrarum.ingame!!.world // TODO future Kotlin feature -- typealias AnyPlayer: HistoricalFigure operator fun invoke(p: HistoricalFigure, delta: Int) { diff --git a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt index 581ad28b3..1c3e9dbda 100644 --- a/src/net/torvald/terrarum/itemproperties/ItemCodex.kt +++ b/src/net/torvald/terrarum/itemproperties/ItemCodex.kt @@ -39,10 +39,9 @@ object ItemCodex { itemCodex[i] = object : InventoryItem() { override val id: Int = i override var baseMass: Double = TileCodex[i].density / 1000.0 - override var scale: Double = 1.0 // no need to set setter as scale would not change override var baseToolSize: Double? = null override var equipPosition = EquipPosition.HAND_GRIP - + override var category = "block" override fun primaryUse(gc: GameContainer, delta: Int) { // TODO base punch attack @@ -51,12 +50,12 @@ object ItemCodex { override fun secondaryUse(gc: GameContainer, delta: Int) { val mousePoint = Point2d(gc.mouseTileX.toDouble(), gc.mouseTileY.toDouble()) // linear search filter (check for intersection with tilewise mouse point and tilewise hitbox) - Terrarum.ingame.actorContainer.forEach { + Terrarum.ingame!!.actorContainer.forEach { if (it is ActorWithSprite && it.tilewiseHitbox.intersects(mousePoint)) return } // filter passed, do the job - Terrarum.ingame.world.setTileTerrain( + Terrarum.ingame!!.world.setTileTerrain( gc.mouseTileX, gc.mouseTileY, i @@ -77,7 +76,7 @@ object ItemCodex { TODO("read from dynamicitem description (JSON)") } else { - val a = Terrarum.ingame.getActorByID(code) // actor item + val a = Terrarum.ingame!!.getActorByID(code) // actor item if (a is CanBeAnItem) return a.itemData throw IllegalArgumentException("Attempted to get item data of actor that cannot be an item. ($a)") diff --git a/src/net/torvald/terrarum/mapdrawer/FeaturesDrawer.kt b/src/net/torvald/terrarum/mapdrawer/FeaturesDrawer.kt index 608b07923..b748369e9 100644 --- a/src/net/torvald/terrarum/mapdrawer/FeaturesDrawer.kt +++ b/src/net/torvald/terrarum/mapdrawer/FeaturesDrawer.kt @@ -52,7 +52,7 @@ object FeaturesDrawer { val colTemp_cold = colTempLinearFunc(onscreen_cold_tiles / onscreen_tiles_cap) val colTemp_warm = colTempLinearFunc(-(onscreen_warm_tiles / onscreen_tiles_cap)) colTemp = colTemp_warm + colTemp_cold - ENV_COLTEMP_NOON - val zoom = Terrarum.ingame.screenZoom + val zoom = Terrarum.ingame!!.screenZoom blendMul() diff --git a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt index 2c4a64394..55e2a6139 100644 --- a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt +++ b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt @@ -23,21 +23,21 @@ import java.util.concurrent.locks.ReentrantLock */ object LightmapRenderer { - private val world: GameWorld = Terrarum.ingame.world + private val world: GameWorld = Terrarum.ingame!!.world val overscan_open: Int = Math.min(32, 256f.div(TileCodex[Tile.AIR].opacity and 0xFF).ceil()) val overscan_opaque: Int = Math.min(8, 256f.div(TileCodex[Tile.STONE].opacity and 0xFF).ceil()) - private val LIGHTMAP_WIDTH = Terrarum.ingame.ZOOM_MIN.inv().times(Terrarum.WIDTH) + private val LIGHTMAP_WIDTH = Terrarum.ingame!!.ZOOM_MIN.inv().times(Terrarum.WIDTH) .div(FeaturesDrawer.TILE_SIZE).ceil() + overscan_open * 2 + 3 - private val LIGHTMAP_HEIGHT = Terrarum.ingame.ZOOM_MIN.inv().times(Terrarum.HEIGHT) + private val LIGHTMAP_HEIGHT = Terrarum.ingame!!.ZOOM_MIN.inv().times(Terrarum.HEIGHT) .div(FeaturesDrawer.TILE_SIZE).ceil() + overscan_open * 2 + 3 /** * 8-Bit RGB values */ private val lightmap: Array = Array(LIGHTMAP_HEIGHT) { IntArray(LIGHTMAP_WIDTH) } - private val lanternMap = ArrayList(Terrarum.ingame.ACTORCONTAINER_INITIAL_SIZE * 4) + private val lanternMap = ArrayList(Terrarum.ingame!!.ACTORCONTAINER_INITIAL_SIZE * 4) private val AIR = Tile.AIR @@ -159,7 +159,7 @@ object LightmapRenderer { // build noop map for (i in 0..rect_size) { val point = edgeToMaskNum(i) - val tile = Terrarum.ingame.world.getTileFromTerrain(point.first, point.second) ?: Tile.NULL + val tile = Terrarum.ingame!!.world.getTileFromTerrain(point.first, point.second) ?: Tile.NULL val isSolid = TileCodex[tile].isSolid noop_mask.set(i, isSolid) @@ -216,7 +216,7 @@ object LightmapRenderer { private fun buildLanternmap() { lanternMap.clear() - Terrarum.ingame.actorContainer.forEach { it -> + Terrarum.ingame!!.actorContainer.forEach { it -> if (it is Luminous && it is ActorWithSprite) { // put lanterns to the area the luminantBox is occupying for (lightBox in it.lightBoxList) { @@ -246,11 +246,11 @@ object LightmapRenderer { // TODO devise multithreading on this var lightLevelThis: Int = 0 - val thisTerrain = Terrarum.ingame.world.getTileFromTerrain(x, y) - val thisWall = Terrarum.ingame.world.getTileFromWall(x, y) + val thisTerrain = Terrarum.ingame!!.world.getTileFromTerrain(x, y) + val thisWall = Terrarum.ingame!!.world.getTileFromWall(x, y) val thisTileLuminosity = TileCodex[thisTerrain].luminosity val thisTileOpacity = TileCodex[thisTerrain].opacity - val sunLight = Terrarum.ingame.world.globalLight + val sunLight = Terrarum.ingame!!.world.globalLight // MIX TILE // open air @@ -313,8 +313,8 @@ object LightmapRenderer { while (x < this_x_end) { // smoothing enabled and zoom is 0.75 or greater // (zoom of 0.5 should not smoothed, for performance) - if (Terrarum.gameConfig.getAsBoolean("smoothlighting") ?: false && - Terrarum.ingame.screenZoom >= 0.75) { + if (Terrarum.getConfigBoolean("smoothlighting") ?: false && + Terrarum.ingame!!.screenZoom >= 0.75) { val thisLightLevel = getLight(x, y) ?: 0 diff --git a/src/net/torvald/terrarum/mapdrawer/MapCamera.kt b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt index 941e7f100..7cd35d287 100644 --- a/src/net/torvald/terrarum/mapdrawer/MapCamera.kt +++ b/src/net/torvald/terrarum/mapdrawer/MapCamera.kt @@ -8,7 +8,7 @@ import net.torvald.terrarum.gameworld.GameWorld * Created by minjaesong on 2016-12-30. */ object MapCamera { - private val world: GameWorld = Terrarum.ingame.world + private val world: GameWorld? = Terrarum.ingame?.world private val TILE_SIZE = FeaturesDrawer.TILE_SIZE var x: Int = 0 @@ -25,19 +25,22 @@ object MapCamera { get() = y + height.ushr(1) fun update() { - val player = Terrarum.ingame.player + if (Terrarum.ingame != null) { - width = FastMath.ceil(Terrarum.WIDTH / Terrarum.ingame.screenZoom) // div, not mul - height = FastMath.ceil(Terrarum.HEIGHT / Terrarum.ingame.screenZoom) + val player = Terrarum.ingame!!.player - // position - (WH / 2) - x = Math.round(// X only: ROUNDWORLD implementation - player.hitbox.centeredX.toFloat() - width / 2) - y = Math.round(FastMath.clamp( - player.hitbox.centeredY.toFloat() - height / 2, - TILE_SIZE.toFloat(), - world.height * TILE_SIZE - height - TILE_SIZE.toFloat() - )) + width = FastMath.ceil(Terrarum.WIDTH / Terrarum.ingame!!.screenZoom) // div, not mul + height = FastMath.ceil(Terrarum.HEIGHT / Terrarum.ingame!!.screenZoom) + // position - (WH / 2) + x = Math.round(// X only: ROUNDWORLD implementation + player.hitbox.centeredX.toFloat() - width / 2) + y = Math.round(FastMath.clamp( + player.hitbox.centeredY.toFloat() - height / 2, + TILE_SIZE.toFloat(), + world!!.height * TILE_SIZE - height - TILE_SIZE.toFloat() + )) + + } } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt b/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt index 3f7534b09..d7429fc4d 100644 --- a/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt +++ b/src/net/torvald/terrarum/mapdrawer/TilesDrawer.kt @@ -24,7 +24,7 @@ import java.util.* * Created by minjaesong on 16-01-19. */ object TilesDrawer { - private val world: GameWorld = Terrarum.ingame.world + private val world: GameWorld = Terrarum.ingame!!.world private val TILE_SIZE = FeaturesDrawer.TILE_SIZE private val TILE_SIZEF = FeaturesDrawer.TILE_SIZE.toFloat() @@ -225,7 +225,7 @@ object TilesDrawer { ) fun update() { - val player = Terrarum.ingame.player + val player = Terrarum.ingame!!.player } val wallOverlayColour = Color(2f/3f, 2f/3f, 2f/3f, 1f) diff --git a/src/net/torvald/terrarum/realestate/RealEstateUtility.kt b/src/net/torvald/terrarum/realestate/RealEstateUtility.kt index c0926b77f..accb20635 100644 --- a/src/net/torvald/terrarum/realestate/RealEstateUtility.kt +++ b/src/net/torvald/terrarum/realestate/RealEstateUtility.kt @@ -8,17 +8,17 @@ import net.torvald.terrarum.gameactors.faction.FactionCodex */ object RealEstateUtility { fun getAbsoluteTileNumber(x: Int, y: Int): Long = - (Terrarum.ingame.world.width * y).toLong() + x + (Terrarum.ingame!!.world.width * y).toLong() + x fun resolveAbsoluteTileNumber(t: Long): Pair = - Pair((t % Terrarum.ingame.world.width).toInt(), (t / Terrarum.ingame.world.width).toInt()) + Pair((t % Terrarum.ingame!!.world.width).toInt(), (t / Terrarum.ingame!!.world.width).toInt()) /** * Get owner ID as an Actor/Faction */ fun resolveOwner(id: Long): Any = if (id < 0x80000000L) - Terrarum.ingame.getActorByID(id.toInt()) + Terrarum.ingame!!.getActorByID(id.toInt()) else FactionCodex.getFactionByID(id) } \ No newline at end of file diff --git a/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt b/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt index d850c82cd..8fc4ec81b 100644 --- a/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt +++ b/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt @@ -90,7 +90,7 @@ object TilePropUtil { fun getDynamicLumFunc(baseLum: Int, type: Int): Int { return when (type) { 1 -> getTorchFlicker(baseLum) - 2 -> Terrarum.ingame.world.globalLight // current global light + 2 -> Terrarum.ingame!!.world.globalLight // current global light 3 -> WeatherMixer.getGlobalLightOfTime(WorldTime.DAY_LENGTH / 2).toInt() // daylight at noon 4 -> getSlowBreath(baseLum) 5 -> getPulsate(baseLum) diff --git a/src/net/torvald/terrarum/tilestats/TileStats.kt b/src/net/torvald/terrarum/tilestats/TileStats.kt index 303226217..36eec3c2c 100644 --- a/src/net/torvald/terrarum/tilestats/TileStats.kt +++ b/src/net/torvald/terrarum/tilestats/TileStats.kt @@ -27,8 +27,8 @@ object TileStats { // Get stats on no-zoomed screen area. In other words, will behave as if screen zoom were 1.0 // no matter how the screen is zoomed. - val map = Terrarum.ingame.world - val player = Terrarum.ingame.player + val map = Terrarum.ingame!!.world + val player = Terrarum.ingame!!.player val renderWidth = FastMath.ceil(Terrarum.WIDTH.toFloat()) val renderHeight = FastMath.ceil(Terrarum.HEIGHT.toFloat()) diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index 15d42efb0..1dfd17a42 100644 --- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -44,7 +44,7 @@ class BasicDebugInfoWindow : UICanvas { } override fun update(gc: GameContainer, delta: Int) { - val player = Terrarum.ingame.player + val player = Terrarum.ingame!!.player val hitbox = player.hitbox xdelta = hitbox.pointedX - prevPlayerX @@ -59,10 +59,10 @@ class BasicDebugInfoWindow : UICanvas { fun Int.rawG() = this % LightmapRenderer.MUL_2 / LightmapRenderer.MUL fun Int.rawB() = this % LightmapRenderer.MUL - val player = Terrarum.ingame.player + val player = Terrarum.ingame!!.player - val mouseTileX = ((MapCamera.x + gc.input.mouseX / Terrarum.ingame.screenZoom) / FeaturesDrawer.TILE_SIZE).toInt() - val mouseTileY = ((MapCamera.y + gc.input.mouseY / Terrarum.ingame.screenZoom) / FeaturesDrawer.TILE_SIZE).toInt() + val mouseTileX = ((MapCamera.x + gc.input.mouseX / Terrarum.ingame!!.screenZoom) / FeaturesDrawer.TILE_SIZE).toInt() + val mouseTileY = ((MapCamera.y + gc.input.mouseY / Terrarum.ingame!!.screenZoom) / FeaturesDrawer.TILE_SIZE).toInt() g.font = Terrarum.fontSmallNumbers g.color = GameFontBase.codeToCol["y"] @@ -114,7 +114,7 @@ class BasicDebugInfoWindow : UICanvas { printLine(g, 8, "light@cursor $ccG$lightVal") val tileNo: String - val tileNumRaw = Terrarum.ingame.world.getTileFromTerrain(mouseTileX, mouseTileY) ?: -1 + val tileNumRaw = Terrarum.ingame!!.world.getTileFromTerrain(mouseTileX, mouseTileY) ?: -1 val tilenum = tileNumRaw / PairedMapLayer.RANGE val tiledmg = tileNumRaw % PairedMapLayer.RANGE tileNo = if (tileNumRaw == -1) "—" else "$tilenum:$tiledmg" @@ -127,8 +127,8 @@ class BasicDebugInfoWindow : UICanvas { printLineColumn(g, 2, 1, "VSync $ccG" + Terrarum.appgc.isVSyncRequested) printLineColumn(g, 2, 2, "Env colour temp $ccG" + FeaturesDrawer.colTemp) - printLineColumn(g, 2, 5, "Time $ccG${Terrarum.ingame.world.time.elapsedSeconds}" + - " (${Terrarum.ingame.world.time.getFormattedTime()})") + printLineColumn(g, 2, 5, "Time $ccG${Terrarum.ingame!!.world.time.elapsedSeconds}" + + " (${Terrarum.ingame!!.world.time.getFormattedTime()})") printLineColumn(g, 2, 6, "Mass $ccG${player.mass}") printLineColumn(g, 2, 7, "p_WalkX $ccG${player.walkX}") @@ -171,13 +171,13 @@ class BasicDebugInfoWindow : UICanvas { * Bottom left */ - g.drawString("${ccY}Actors total $ccG${Terrarum.ingame.actorContainer.size + Terrarum.ingame.actorContainerInactive.size}", + g.drawString("${ccY}Actors total $ccG${Terrarum.ingame!!.actorContainer.size + Terrarum.ingame!!.actorContainerInactive.size}", 2f, Terrarum.HEIGHT - 10f) - g.drawString("${ccY}Active $ccG${Terrarum.ingame.actorContainer.size}", + g.drawString("${ccY}Active $ccG${Terrarum.ingame!!.actorContainer.size}", (2 + 17*8).toFloat(), Terrarum.HEIGHT - 10f) - g.drawString("${ccY}Dormant $ccG${Terrarum.ingame.actorContainerInactive.size}", + g.drawString("${ccY}Dormant $ccG${Terrarum.ingame!!.actorContainerInactive.size}", (2 + 28*8).toFloat(), Terrarum.HEIGHT - 10f) - g.drawString("${ccM}Particles $ccG${Terrarum.ingame.particlesActive}", + g.drawString("${ccM}Particles $ccG${Terrarum.ingame!!.particlesActive}", (2 + 41*8).toFloat(), Terrarum.HEIGHT - 10f) } diff --git a/src/net/torvald/terrarum/ui/ItemImageGallery.kt b/src/net/torvald/terrarum/ui/ItemImageGallery.kt index c0dadc72b..8c2a937b7 100644 --- a/src/net/torvald/terrarum/ui/ItemImageGallery.kt +++ b/src/net/torvald/terrarum/ui/ItemImageGallery.kt @@ -10,13 +10,15 @@ import java.util.* * Image gallery. Images will be equally spaced, counted from top-left to bottom-right. * Created by minjaesong on 16-08-08. */ -class ItemImageGallery( +class UIItemImageGallery( + parentUI: UICanvas, override var posX: Int, override var posY: Int, - val width: Int, - val height: Int, + override val width: Int, + override val height: Int, val imageList: ArrayList, - val column: Int = 1) : UIItem { + val column: Int = 1 +) : UIItem(parentUI) { override fun update(gc: GameContainer, delta: Int) { } diff --git a/src/net/torvald/terrarum/ui/NullUI.kt b/src/net/torvald/terrarum/ui/NullUI.kt new file mode 100644 index 000000000..9804d6270 --- /dev/null +++ b/src/net/torvald/terrarum/ui/NullUI.kt @@ -0,0 +1,36 @@ +package net.torvald.terrarum.ui + +import org.newdawn.slick.GameContainer +import org.newdawn.slick.Graphics +import org.newdawn.slick.Input + +/** + * Created by SKYHi14 on 2017-03-13. + */ +class NullUI : UICanvas { + override var width: Int = 0 + override var height: Int = 0 + override var handler: UIHandler? = null + override var openCloseTime: Int = 0 + + override fun update(gc: GameContainer, delta: Int) { + } + + override fun render(gc: GameContainer, g: Graphics) { + } + + override fun processInput(gc: GameContainer, delta: Int, input: Input) { + } + + override fun doOpening(gc: GameContainer, delta: Int) { + } + + override fun doClosing(gc: GameContainer, delta: Int) { + } + + override fun endOpening(gc: GameContainer, delta: Int) { + } + + override fun endClosing(gc: GameContainer, delta: Int) { + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/ui/UIHandler.kt b/src/net/torvald/terrarum/ui/UIHandler.kt index bbea31f51..8f19dc362 100644 --- a/src/net/torvald/terrarum/ui/UIHandler.kt +++ b/src/net/torvald/terrarum/ui/UIHandler.kt @@ -12,24 +12,15 @@ import org.newdawn.slick.state.StateBasedGame * to the coordinate of displayed cartesian coords, and update and render the UI. * It also process game inputs and send control events to the UI so that the UI can handle them. * + * Newly created UI is invisible by default. + * * Created by minjaesong on 15-12-31. */ -class UIHandler -/** - * Construct new UIHandler with given UI attached. - * Invisible in default. - * @param UI - * * - * @throws SlickException - */ -@Throws(SlickException::class) -constructor(val UI: UICanvas) { +class UIHandler(val UI: UICanvas) { // X/Y Position to the game window. var posX: Int = 0 - private set var posY: Int = 0 - private set private var alwaysVisible = false @@ -61,10 +52,11 @@ constructor(val UI: UICanvas) { var openCloseCounter: Int = 0 init { + UI.handler = this + println("[UIHandler] Creating framebuffer for UI '${UI.javaClass.simpleName}'") UIDrawnCanvas = Image(UI.width, UI.height) - UIGraphicInstance = UIDrawnCanvas.graphics } diff --git a/src/net/torvald/terrarum/ui/UIInventory.kt b/src/net/torvald/terrarum/ui/UIInventory.kt new file mode 100644 index 000000000..1d2b08ec0 --- /dev/null +++ b/src/net/torvald/terrarum/ui/UIInventory.kt @@ -0,0 +1,63 @@ +package net.torvald.terrarum.ui + +import org.newdawn.slick.GameContainer +import org.newdawn.slick.Graphics +import org.newdawn.slick.Input + +/** + * Created by SKYHi14 on 2017-03-13. + */ +class UIInventory : UICanvas { + override var width: Int + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + set(value) {} + override var height: Int + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + set(value) {} + override var handler: UIHandler? + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + set(value) {} + override var openCloseTime: Int + get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates. + set(value) {} + + + private val categories = arrayOf( + "GAME_INVENTORY_WEAPONS", // weapons and tools + "CONTEXT_ITEM_EQUIPMENT_PLURAL", + "CONTEXT_ITEM_ARMOR", + "GAME_INVENTORY_INGREDIENTS", + "GAME_INVENTORY_POTIONS", + "GAME_INVENTORY_BLOCKS", + "GAME_INVENTORY_WALLPAPERS", + "MENU_LABEL_ALL" + ) + + override fun update(gc: GameContainer, delta: Int) { + TODO("not implemented") + } + + override fun render(gc: GameContainer, g: Graphics) { + TODO("not implemented") + } + + override fun processInput(gc: GameContainer, delta: Int, input: Input) { + TODO("not implemented") + } + + override fun doOpening(gc: GameContainer, delta: Int) { + TODO("not implemented") + } + + override fun doClosing(gc: GameContainer, delta: Int) { + TODO("not implemented") + } + + override fun endOpening(gc: GameContainer, delta: Int) { + TODO("not implemented") + } + + override fun endClosing(gc: GameContainer, delta: Int) { + TODO("not implemented") + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/ui/UIItem.kt b/src/net/torvald/terrarum/ui/UIItem.kt index 2fdc801bd..38655e799 100644 --- a/src/net/torvald/terrarum/ui/UIItem.kt +++ b/src/net/torvald/terrarum/ui/UIItem.kt @@ -1,32 +1,48 @@ package net.torvald.terrarum.ui +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.gameactors.roundInt +import net.torvald.terrarum.gamecontroller.mouseX +import net.torvald.terrarum.gamecontroller.mouseY import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics /** * Created by minjaesong on 15-12-31. */ -interface UIItem { +abstract class UIItem(var parentUI: UICanvas) { // do not replace parentUI to UIHandler! // X/Y Position relative to the containing canvas - var posX: Int - var posY: Int + abstract var posX: Int + abstract var posY: Int + abstract val width: Int + abstract val height: Int - fun update(gc: GameContainer, delta: Int) - fun render(gc: GameContainer, g: Graphics) + protected val relativeMouseX: Int + get() = (Terrarum.appgc.mouseX - (parentUI.handler?.posX ?: 0) - this.posX).roundInt() + protected val relativeMouseY: Int + get() = (Terrarum.appgc.mouseY - (parentUI.handler?.posY ?: 0) - this.posY).roundInt() + + val mouseUp: Boolean + get() = relativeMouseX in 0..width - 1 && relativeMouseY in 0..height - 1 + val mousePushed: Boolean + get() = mouseUp && Terrarum.appgc.input.isMouseButtonDown(Terrarum.getConfigInt("mouseprimary")!!) + + abstract fun update(gc: GameContainer, delta: Int) + abstract fun render(gc: GameContainer, g: Graphics) // keyboard controlled - fun keyPressed(key: Int, c: Char) - fun keyReleased(key: Int, c: Char) + abstract fun keyPressed(key: Int, c: Char) + abstract fun keyReleased(key: Int, c: Char) // mouse controlled - fun mouseMoved(oldx: Int, oldy: Int, newx: Int, newy: Int) - fun mouseDragged(oldx: Int, oldy: Int, newx: Int, newy: Int) - fun mousePressed(button: Int, x: Int, y: Int) - fun mouseReleased(button: Int, x: Int, y: Int) - fun mouseWheelMoved(change: Int) + abstract fun mouseMoved(oldx: Int, oldy: Int, newx: Int, newy: Int) + abstract fun mouseDragged(oldx: Int, oldy: Int, newx: Int, newy: Int) + abstract fun mousePressed(button: Int, x: Int, y: Int) + abstract fun mouseReleased(button: Int, x: Int, y: Int) + abstract fun mouseWheelMoved(change: Int) // gamepad controlled - fun controllerButtonPressed(controller: Int, button: Int) - fun controllerButtonReleased(controller: Int, button: Int) + abstract fun controllerButtonPressed(controller: Int, button: Int) + abstract fun controllerButtonReleased(controller: Int, button: Int) } diff --git a/src/net/torvald/terrarum/ui/UIItemTextButton.kt b/src/net/torvald/terrarum/ui/UIItemTextButton.kt new file mode 100644 index 000000000..020d389ff --- /dev/null +++ b/src/net/torvald/terrarum/ui/UIItemTextButton.kt @@ -0,0 +1,82 @@ +package net.torvald.terrarum.ui + +import net.torvald.terrarum.Terrarum +import net.torvald.terrarum.langpack.Lang +import org.newdawn.slick.Color +import org.newdawn.slick.GameContainer +import org.newdawn.slick.Graphics + +/** + * Text button. Height of hitbox is extended (double lineHeight, or 40 px) for better clicking + * + * Created by SKYHi14 on 2017-03-13. + */ +class UIItemTextButton( + parentUI: UICanvas, + val labelText: String, + override var posX: Int, + override var posY: Int, + override val width: Int, + val readFromLang: Boolean = false, + val activeCol: Color = Color.white, + val highlightCol: Color = Color(0x00f8ff), + val inactiveCol: Color = Color(0xc0c0c0) +) : UIItem(parentUI) { + + companion object { + val font = Terrarum.fontGame!! + val height = font.lineHeight * 2 + } + + private val label: String + get() = if (readFromLang) Lang[labelText] else labelText + + + override val height: Int = UIItemTextButton.height + + var highlighted: Boolean = false + var mouseOver = false + + + override fun update(gc: GameContainer, delta: Int) { + } + + override fun render(gc: GameContainer, g: Graphics) { + val textW = font.getWidth(label) + + g.font = font + mouseOver = mouseUp + g.color = if (highlighted) highlightCol + else if (mouseOver) activeCol + else inactiveCol + + g.drawString(label, posX.toFloat() + (width.minus(textW).div(2)), posY.toFloat() + height / 4) + } + + override fun keyPressed(key: Int, c: Char) { + } + + override fun keyReleased(key: Int, c: Char) { + } + + override fun mouseMoved(oldx: Int, oldy: Int, newx: Int, newy: Int) { + } + + override fun mouseDragged(oldx: Int, oldy: Int, newx: Int, newy: Int) { + } + + override fun mousePressed(button: Int, x: Int, y: Int) { + } + + override fun mouseReleased(button: Int, x: Int, y: Int) { + } + + override fun mouseWheelMoved(change: Int) { + } + + override fun controllerButtonPressed(controller: Int, button: Int) { + } + + override fun controllerButtonReleased(controller: Int, button: Int) { + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt new file mode 100644 index 000000000..8cfc2e1dc --- /dev/null +++ b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt @@ -0,0 +1,83 @@ +package net.torvald.terrarum.ui + +import net.torvald.terrarum.gameactors.roundInt +import net.torvald.terrarum.langpack.Lang +import org.newdawn.slick.GameContainer +import org.newdawn.slick.Graphics + +/** + * Created by SKYHi14 on 2017-03-13. + */ +class UIItemTextButtonList( + parentUI: UICanvas, + labelsList: Array, + override val width: Int, + override val height: Int, + val readFromLang: Boolean = false +) : UIItem(parentUI) { + + val buttons = labelsList.mapIndexed { index, s -> + val height = this.height - UIItemTextButton.height + UIItemTextButton( + parentUI, s, + 0, + (height / labelsList.size.minus(1).toFloat() * index).roundInt(), + width, + readFromLang = true + ) + } + + override var posX = 0 + override var posY = 0 + + var selected: Int? = labelsList.size - 1 // default to "All" + + override fun update(gc: GameContainer, delta: Int) { + buttons.forEachIndexed { index, btn -> + // update width because Lang is mutable (you can change language at any moment) + val textW = UIItemTextButton.font.getWidth( + if (readFromLang) Lang[btn.labelText] else btn.labelText + ) + + btn.update(gc, delta) + + + if (btn.mousePushed) { + selected = index + } + btn.highlighted = (index == selected) // forcibly highlight if this.highlighted != null + + } + } + + override fun render(gc: GameContainer, g: Graphics) { + buttons.forEach { it.render(gc, g) } + } + + override fun keyPressed(key: Int, c: Char) { + } + + override fun keyReleased(key: Int, c: Char) { + } + + override fun mouseMoved(oldx: Int, oldy: Int, newx: Int, newy: Int) { + } + + override fun mouseDragged(oldx: Int, oldy: Int, newx: Int, newy: Int) { + } + + override fun mousePressed(button: Int, x: Int, y: Int) { + } + + override fun mouseReleased(button: Int, x: Int, y: Int) { + } + + override fun mouseWheelMoved(change: Int) { + } + + override fun controllerButtonPressed(controller: Int, button: Int) { + } + + override fun controllerButtonReleased(controller: Int, button: Int) { + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/ui/UIPieMenu.kt b/src/net/torvald/terrarum/ui/UIPieMenu.kt index c55386d34..6cd2b8086 100644 --- a/src/net/torvald/terrarum/ui/UIPieMenu.kt +++ b/src/net/torvald/terrarum/ui/UIPieMenu.kt @@ -34,7 +34,7 @@ class UIPieMenu : UICanvas { override fun update(gc: GameContainer, delta: Int) { if (selection >= 0) - Terrarum.ingame.player.actorValue[AVKey.__PLAYER_QUICKBARSEL] = + Terrarum.ingame!!.player.actorValue[AVKey.__PLAYER_QUICKBARSEL] = selection % slotCount diff --git a/src/net/torvald/terrarum/ui/UIQuickBar.kt b/src/net/torvald/terrarum/ui/UIQuickBar.kt index 6e6654ef3..137443c9a 100644 --- a/src/net/torvald/terrarum/ui/UIQuickBar.kt +++ b/src/net/torvald/terrarum/ui/UIQuickBar.kt @@ -24,8 +24,8 @@ class UIQuickBar : UICanvas, MouseControlled { override var handler: UIHandler? = null private var selection: Int - get() = Terrarum.ingame.player.actorValue.getAsInt(AVKey.__PLAYER_QUICKBARSEL) ?: 0 - set(value) { Terrarum.ingame.player.actorValue[AVKey.__PLAYER_QUICKBARSEL] = value } + get() = Terrarum.ingame!!.player.actorValue.getAsInt(AVKey.__PLAYER_QUICKBARSEL) ?: 0 + set(value) { Terrarum.ingame!!.player.actorValue[AVKey.__PLAYER_QUICKBARSEL] = value } override fun update(gc: GameContainer, delta: Int) { } diff --git a/src/net/torvald/terrarum/ui/UIVitalMetre.kt b/src/net/torvald/terrarum/ui/UIVitalMetre.kt index da7350a80..5cdf32ab6 100644 --- a/src/net/torvald/terrarum/ui/UIVitalMetre.kt +++ b/src/net/torvald/terrarum/ui/UIVitalMetre.kt @@ -5,7 +5,6 @@ import net.torvald.terrarum.Terrarum import net.torvald.terrarum.gameactors.ActorHumanoid import net.torvald.terrarum.gameactors.floorInt import net.torvald.terrarum.gameactors.roundInt -import net.torvald.terrarum.times import org.newdawn.slick.Color import org.newdawn.slick.GameContainer import org.newdawn.slick.Graphics diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/WorldInformationProvider.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/WorldInformationProvider.kt index 4f0ff6b6e..2fe641682 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/WorldInformationProvider.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/WorldInformationProvider.kt @@ -24,7 +24,7 @@ class WorldInformationProvider(globals: Globals) { companion object { fun getWorldTimeInLuaFormat() : LuaTable { val t = LuaTable() - val time = if (Terrarum.gameStarted) Terrarum.ingame.world.time else WorldTime() + val time = if (Terrarum.gameStarted) Terrarum.ingame!!.world.time else WorldTime() // int Terrarum World Time format t["hour"] = time.hours @@ -43,7 +43,7 @@ class WorldInformationProvider(globals: Globals) { /** evaluate single C date format */ fun String.evalAsDate(): String { - val time = if (Terrarum.gameStarted) Terrarum.ingame.world.time else WorldTime() + val time = if (Terrarum.gameStarted) Terrarum.ingame!!.world.time else WorldTime() return when (this) { "%a" -> time.getDayNameShort() "%A" -> time.getDayNameFull() diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index ee411f181..91a95a9e2 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -40,7 +40,7 @@ object WeatherMixer { lateinit var mixedWeather: BaseModularWeather val globalLightNow = Color(0) - private val world = Terrarum.ingame.world + private val world = Terrarum.ingame!!.world // Weather indices const val WEATHER_GENERIC = "generic" @@ -83,13 +83,13 @@ object WeatherMixer { // test rain toggled by F2 if (KeyToggler.isOn(Key.F2)) { - val playerPos = Terrarum.ingame.player.centrePosPoint + val playerPos = Terrarum.ingame!!.player.centrePosPoint kotlin.repeat(4) { // 4 seems good val rainParticle = ParticleTestRain( playerPos.x + HQRNG().nextInt(Terrarum.WIDTH) - Terrarum.HALFW, playerPos.y - Terrarum.HALFH ) - Terrarum.ingame.addParticle(rainParticle) + Terrarum.ingame!!.addParticle(rainParticle) } globalLightNow.set(getGlobalLightOfTime(world.time.elapsedSeconds).darker(0.3f)) } @@ -105,7 +105,7 @@ object WeatherMixer { fun render(g: Graphics) { // we will not care for nextSkybox for now - val timeNow = Terrarum.ingame.world.time.elapsedSeconds + val timeNow = Terrarum.ingame!!.world.time.elapsedSeconds val skyboxColourMap = currentWeather.skyboxGradColourMap val lightColourMap = currentWeather.globalLightColourMap @@ -119,15 +119,15 @@ object WeatherMixer { val skyColourFill = GradientFill( 0f, 0f, getGradientColour(skyboxColourMap, 0, timeNow), - 0f, Terrarum.HEIGHT.toFloat(),// / Terrarum.ingame.screenZoom, + 0f, Terrarum.HEIGHT.toFloat(),// / Terrarum.ingame!!.screenZoom, getGradientColour(skyboxColourMap, 1, timeNow) ) blendNormal() g.fill(Rectangle( 0f, 0f, - Terrarum.WIDTH.toFloat(),// / Terrarum.ingame.screenZoom, - Terrarum.HEIGHT.toFloat()// / Terrarum.ingame.screenZoom + Terrarum.WIDTH.toFloat(),// / Terrarum.ingame!!.screenZoom, + Terrarum.HEIGHT.toFloat()// / Terrarum.ingame!!.screenZoom ), skyColourFill) }