diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv index 69c1c176a..d220933ef 100644 --- a/assets/mods/basegame/items/itemid.csv +++ b/assets/mods/basegame/items/itemid.csv @@ -75,6 +75,7 @@ id;classname;tags 133;net.torvald.terrarum.modulebasegame.gameitems.OreGold;SMELTABLE 134;net.torvald.terrarum.modulebasegame.gameitems.OreSilver;SMELTABLE 135;net.torvald.terrarum.modulebasegame.gameitems.OreLead;SMELTABLE +136;net.torvald.terrarum.modulebasegame.gameitems.OreUranium;RADIOACTIVE,RADIATION_LOW # gemstones 144;net.torvald.terrarum.modulebasegame.gameitems.GemQuartz;SMELTABLE,SIO2 diff --git a/assets/mods/basegame/items/items.tga b/assets/mods/basegame/items/items.tga index 77a273f74..969533bcb 100644 --- a/assets/mods/basegame/items/items.tga +++ b/assets/mods/basegame/items/items.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:789fcee21a0b8293c66bf2e62e8a503b53e4d242172dcd7ed4c24573e1f11bd3 +oid sha256:a64dfaf2d988f39b8c0299b79d9de0872fc1b1529c8772df6f668d46145a6147 size 4816914 diff --git a/assets/mods/basegame/ores/9.tga b/assets/mods/basegame/ores/9.tga new file mode 100644 index 000000000..f45bbf3ef --- /dev/null +++ b/assets/mods/basegame/ores/9.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84ded7a6690be1f9fcd16d07358e2dbd04ae00a107f1eb492d51bd966d1c32c3 +size 262162 diff --git a/assets/mods/basegame/ores/ores.csv b/assets/mods/basegame/ores/ores.csv index fc65cb505..9b55c728d 100644 --- a/assets/mods/basegame/ores/ores.csv +++ b/assets/mods/basegame/ores/ores.csv @@ -7,7 +7,8 @@ "6";"item@basegame:133";"GOLD,NATURAL_GOLD" "7";"item@basegame:134";"SILVER,NATURAL_SILVER" "8";"item@basegame:135";"LEAD,GALENA" -#"9";"item@basegame:143";"TITANIUM,RUTILE" +"9";"item@basegame:136";"URANIUM,URANINITE" +#"10";"item@basegame:143";"TITANIUM,RUTILE" "256";"item@basegame:146";"SALT" "257";"item@basegame:145";"GEM,SIO2,AMETHYST" diff --git a/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt b/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt index 1446ff7cd..baa11cbd9 100644 --- a/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt +++ b/src/net/torvald/terrarum/audio/MixerTrackProcessor.kt @@ -75,7 +75,7 @@ class MixerTrackProcessor(bufferSize: Int, val rate: Int, val track: TerrarumAud private fun purgeStreamBuf() { track.stop() streamBuf = null - printdbg("StreamBuf is now null") +// printdbg("StreamBuf is now null") } private var breakBomb = false @@ -87,7 +87,7 @@ class MixerTrackProcessor(bufferSize: Int, val rate: Int, val track: TerrarumAud } private fun allocateStreamBuf(track: TerrarumAudioMixerTrack) { - printdbg("Allocating a StreamBuf with rate ${track.currentTrack!!.samplingRate}") +// printdbg("Allocating a StreamBuf with rate ${track.currentTrack!!.samplingRate}") streamBuf = AudioProcessBuf(track.currentTrack!!.samplingRate, { bufL, bufR -> var samplesRead = track.currentTrack?.readSamples(bufL, bufR) ?: 0 diff --git a/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt b/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt index eb200721a..d80f8c7d5 100644 --- a/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt +++ b/src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt @@ -179,7 +179,7 @@ class TerrarumAudioMixerTrack( override fun equals(other: Any?) = this.hash == (other as TerrarumAudioMixerTrack).hash fun stop() { - printdbg("TerrarumAudioMixerTrack $name", "Stop music (mixertrack=${this.name}, musictrack=$currentTrack)") +// printdbg("TerrarumAudioMixerTrack $name", "Stop music (mixertrack=${this.name}, musictrack=$currentTrack)") // printStackTrace("TerrarumAudioMixerTrack $name") currentTrack?.reset() diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt index 24d17d90c..b0de544b2 100644 --- a/src/net/torvald/terrarum/gameactors/Actor.kt +++ b/src/net/torvald/terrarum/gameactors/Actor.kt @@ -181,10 +181,10 @@ abstract class Actor : Comparable, Runnable { open fun startAudio(music: MusicContainer, volume: TrackVolume = 1.0, doSomethingWithTrack: (TerrarumAudioMixerTrack) -> Unit = {}) { getTrackByAudio(music).let { if (it == null) { - printdbg(this, "cannot startAudio $music") +// printdbg(this, "cannot startAudio $music") } else { - printdbg(this, "startAudio $music") +// printdbg(this, "startAudio $music") it.trackingTarget = this it.currentTrack = music it.maxVolumeFun = { volume } diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt index 3276b8de2..0a38c07b5 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt @@ -91,7 +91,7 @@ class DroppedItem : ActorWithBody { actorValue.set(AVKey.FALLDAMPENMULT, 0.1) - printdbg(this, "DroppedItem with itemID '${itemID}'") +// printdbg(this, "DroppedItem with itemID '${itemID}'") physProp.ignorePlatform = false } diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/Pocketed.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/Pocketed.kt index 04fc3369e..85e96c2aa 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/Pocketed.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/Pocketed.kt @@ -1,11 +1,13 @@ package net.torvald.terrarum.modulebasegame.gameactors import net.torvald.terrarum.App +import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.ItemCodex import net.torvald.terrarum.gameactors.ActorValue import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID +import net.torvald.terrarum.printStackTrace /** * Created by minjaesong on 2016-01-15. @@ -42,6 +44,11 @@ interface Pocketed { item.effectOnUnequip(this as ActorWithBody) } + + if (this is IngamePlayer) { + printdbg(this, "UNEQUIP ITEM ${item.name}") + printStackTrace(this) + } } fun unequipItem(itemID: ItemID?) { diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt index 54bdd92bf..eae7addda 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/OreItemBase.kt @@ -144,6 +144,12 @@ class OreLead(originalID: ItemID) : OreItemBase(originalID, true) { itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(8,6) } } +class OreUranium(originalID: ItemID) : OreItemBase(originalID, true) { + override var originalName = "ITEM_ORE_URANINITE" + init { + itemImage = CommonResourcePool.getAsItemSheet("basegame.items").get(0,7) + } +} class GemQuartz(originalID: ItemID) : OreItemBase(originalID, true) { override var originalName = "ITEM_GEM_QUARTZ" diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt index f16e8ac52..d57164203 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt @@ -192,6 +192,8 @@ class UIIMEConfig(remoCon: UIRemoCon?) : UICanvas() { "ansi" -> getKeycapsANSI(this) "iso" -> getKeycapsISO(this) else -> throw IllegalArgumentException("Unknown physical layout: $layout") + // the JIS "Ro" key is not even recognised as a key by GLFW so JIS layout cannot be supported even if I wanted to + // besides, nobody in Japan types in Kana layout any more } keycaps.values.forEach { addUIitemAtHead(it) } diff --git a/work_files/graphics/items/basegame_items.kra b/work_files/graphics/items/basegame_items.kra index 76c3d539c..69b38c1b8 100644 --- a/work_files/graphics/items/basegame_items.kra +++ b/work_files/graphics/items/basegame_items.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e477292296b31a5cf5670539ba49a592968d82262c6781ced1ad8d94f870c94c -size 2074184 +oid sha256:2b649fc9663479b0a048ef8db4ff34d2b79e0bace76c02c6868cafa6619c018a +size 2115406 diff --git a/work_files/graphics/terrain/ore_mask_sample.kra b/work_files/graphics/terrain/ore_mask_sample.kra index ab390fa87..9ae76c6c0 100644 --- a/work_files/graphics/terrain/ore_mask_sample.kra +++ b/work_files/graphics/terrain/ore_mask_sample.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8ee4a969ffb7121fb73d7c861956e93777bb3447f8a1ae7ae5e57688873b5ac -size 1712780 +oid sha256:5491ed987c97791ff468513403663425e2f0dd6d1ad0ff9beb39847f9891cbac +size 2200172