curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 12:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

adopting Java 9/Kotlin 1.2

Browse Source
This commit is contained in:
minjaesong
2018-02-10 21:40:17 +09:00
parent 941d9fa107
commit 40423ede52
31 changed files with 326 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -84,11 +84,10 @@ object WeatherMixer {
if (KeyToggler.isOn(Input.Keys.F2)) {
val playerPosX = player.hitbox.centeredX
val playerPosY = player.hitbox.centeredY
kotlin.repeat(1) {
// 4 seems good
kotlin.repeat(7) {
val rainParticle = ParticleMegaRain(
playerPosX + HQRNG().nextInt(Terrarum.WIDTH) - Terrarum.HALFW,
playerPosY - Terrarum.HALFH
playerPosY - Terrarum.HEIGHT
)
Terrarum.ingame!!.addParticle(rainParticle)
}
@@ -229,13 +228,13 @@ object WeatherMixer {
var mixFrom: String?
try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString }
catch (e: NullPointerException) { mixFrom = null }
catch (e: IllegalStateException) { mixFrom = null }
var mixPercentage: Double?
try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble }
catch (e: NullPointerException) { mixPercentage = null }
catch (e: IllegalStateException) { mixPercentage = null }