diff --git a/src/net/torvald/terrarum/gameactors/FixturesTikiTorch.kt b/src/net/torvald/terrarum/gameactors/FixturesTikiTorch.kt index 25dbb7580..b8c228d27 100644 --- a/src/net/torvald/terrarum/gameactors/FixturesTikiTorch.kt +++ b/src/net/torvald/terrarum/gameactors/FixturesTikiTorch.kt @@ -3,6 +3,7 @@ package net.torvald.terrarum.gameactors import net.torvald.spriteanimation.SpriteAnimation import net.torvald.terrarum.tileproperties.TileNameCode import net.torvald.terrarum.tileproperties.TilePropCodex +import java.util.* /** * Created by minjaesong on 16-06-17. @@ -14,7 +15,7 @@ class FixturesTikiTorch : FixturesBase(), Luminous { set(value) { throw UnsupportedOperationException() } - override val lightBox: Hitbox = Hitbox(3.0, 0.0, 4.0, 3.0) + override val lightBoxList: ArrayList init { isVisible = true @@ -22,6 +23,9 @@ class FixturesTikiTorch : FixturesBase(), Luminous { setHitboxDimension(10, 24, 0, 0) + lightBoxList = ArrayList(1) + lightBoxList.add(Hitbox(3.0, 0.0, 4.0, 3.0)) + sprite = SpriteAnimation() sprite!!.setDimension(10, 27) sprite!!.setSpriteImage("res/graphics/sprites/fixtures/tiki_torch.png") diff --git a/src/net/torvald/terrarum/gameactors/Luminous.kt b/src/net/torvald/terrarum/gameactors/Luminous.kt index 3cda7f0b6..105ac0ca3 100644 --- a/src/net/torvald/terrarum/gameactors/Luminous.kt +++ b/src/net/torvald/terrarum/gameactors/Luminous.kt @@ -1,5 +1,7 @@ package net.torvald.terrarum.gameactors +import java.util.* + /** * Created by minjaesong on 16-03-14. */ @@ -20,6 +22,7 @@ interface Luminous { * Arguments: * * Hitbox(x-offset, y-offset, width, height) + * (Use ArrayList for normal circumstances) */ - val lightBox: Hitbox + val lightBoxList: List } \ No newline at end of file diff --git a/src/net/torvald/terrarum/gameactors/Player.kt b/src/net/torvald/terrarum/gameactors/Player.kt index fae1289db..2c2766382 100644 --- a/src/net/torvald/terrarum/gameactors/Player.kt +++ b/src/net/torvald/terrarum/gameactors/Player.kt @@ -71,8 +71,8 @@ class Player : ActorWithBody(), Controllable, Pocketed, Factionable, Luminous, L set(value) { actorValue[AVKey.LUMINOSITY] = value } - override val lightBox: Hitbox - get() = Hitbox(0.0, 0.0, hitbox.width, hitbox.height) // use getter; dimension of the player may change by time. + override val lightBoxList: List + get() = arrayOf(Hitbox(0.0, 0.0, hitbox.width, hitbox.height)).toList() // use getter; dimension of the player may change by time. companion object { @Transient internal const val ACCEL_MULT_IN_FLIGHT: Double = 0.21 diff --git a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt index 0bd8376a2..9baf58fc1 100644 --- a/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt +++ b/src/net/torvald/terrarum/mapdrawer/LightmapRenderer.kt @@ -174,16 +174,17 @@ object LightmapRenderer { Terrarum.game.actorContainer.forEach { it -> if (it is Luminous && it is Visible) { // put lanterns to the area the luminantBox is occupying - val lightBox = it.lightBox - val lightBoxX = it.hitbox.posX + lightBox.posX - val lightBoxY = it.hitbox.posY + lightBox.posY - val lightBoxW = lightBox.width - val lightBoxH = lightBox.height - for (y in lightBoxY.div(TSIZE).floorInt() - ..lightBoxY.plus(lightBoxH).div(TSIZE).floorInt()) - for (x in lightBoxX.div(TSIZE).floorInt() - ..lightBoxX.plus(lightBoxW).div(TSIZE).floorInt()) - lanternMap.add(Lantern(x, y, it.luminosity)) + for (lightBox in it.lightBoxList) { + val lightBoxX = it.hitbox.posX + lightBox.posX + val lightBoxY = it.hitbox.posY + lightBox.posY + val lightBoxW = lightBox.width + val lightBoxH = lightBox.height + for (y in lightBoxY.div(TSIZE).floorInt() + ..lightBoxY.plus(lightBoxH).div(TSIZE).floorInt()) + for (x in lightBoxX.div(TSIZE).floorInt() + ..lightBoxX.plus(lightBoxW).div(TSIZE).floorInt()) + lanternMap.add(Lantern(x, y, it.luminosity)) + } } } diff --git a/work_files/Controls.numbers b/work_files/Controls.numbers index 27669d5d7..b6bdb0c3e 100644 Binary files a/work_files/Controls.numbers and b/work_files/Controls.numbers differ diff --git a/work_files/Controls.pdf b/work_files/Controls.pdf new file mode 100644 index 000000000..759122b62 Binary files /dev/null and b/work_files/Controls.pdf differ diff --git a/work_files/Joypad control.numbers/Index.zip b/work_files/Joypad control.numbers/Index.zip deleted file mode 100755 index 3bab7b53a..000000000 Binary files a/work_files/Joypad control.numbers/Index.zip and /dev/null differ diff --git a/work_files/Joypad control.numbers/Metadata/BuildVersionHistory.plist b/work_files/Joypad control.numbers/Metadata/BuildVersionHistory.plist deleted file mode 100755 index 426147e8b..000000000 --- a/work_files/Joypad control.numbers/Metadata/BuildVersionHistory.plist +++ /dev/null @@ -1,15 +0,0 @@ - - - - - numbers-trunk-20080702_1 - numbers-trunk-20080731_1 - numbers-trunk-20080801_2 - numbers-trunk-20080909_1 - numbers-trunk-20080911_1 - numbers-trunk-20080926_1 - numbers-trunk-20081016_1 - local build-Oct 16 2012 - M3.0.1-1483-1 - - diff --git a/work_files/Joypad control.numbers/Metadata/DocumentIdentifier b/work_files/Joypad control.numbers/Metadata/DocumentIdentifier deleted file mode 100755 index 5426a18b4..000000000 --- a/work_files/Joypad control.numbers/Metadata/DocumentIdentifier +++ /dev/null @@ -1 +0,0 @@ -54874EF4-5D25-4B52-8A3E-84AFFFAC77D3 \ No newline at end of file diff --git a/work_files/Joypad control.numbers/Metadata/Properties.plist b/work_files/Joypad control.numbers/Metadata/Properties.plist deleted file mode 100755 index fa2088fc3..000000000 Binary files a/work_files/Joypad control.numbers/Metadata/Properties.plist and /dev/null differ diff --git a/work_files/Joypad control.numbers/preview-micro.jpg b/work_files/Joypad control.numbers/preview-micro.jpg deleted file mode 100755 index 2e3712045..000000000 Binary files a/work_files/Joypad control.numbers/preview-micro.jpg and /dev/null differ diff --git a/work_files/Joypad control.numbers/preview-web.jpg b/work_files/Joypad control.numbers/preview-web.jpg deleted file mode 100755 index d8aecc00a..000000000 Binary files a/work_files/Joypad control.numbers/preview-web.jpg and /dev/null differ diff --git a/work_files/Joypad control.numbers/preview.jpg b/work_files/Joypad control.numbers/preview.jpg deleted file mode 100755 index 5985a3596..000000000 Binary files a/work_files/Joypad control.numbers/preview.jpg and /dev/null differ diff --git a/work_files/UI/inventory.numbers b/work_files/UI/inventory.numbers index 9b1d67044..85d85f861 100644 Binary files a/work_files/UI/inventory.numbers and b/work_files/UI/inventory.numbers differ diff --git a/work_files/UI/inventory.pdf b/work_files/UI/inventory.pdf index 6e362a113..a4286b044 100644 Binary files a/work_files/UI/inventory.pdf and b/work_files/UI/inventory.pdf differ