curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-13 23:26:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

radar code cleanup

Browse Source
This commit is contained in:
minjaesong
2023-11-02 00:36:16 +09:00
parent 47a7e55910
commit 8a1dfbeedd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/net/torvald/terrarum/modulebasegame/console/ExportMap2.kt
View File

@@ -8,6 +8,7 @@ import net.torvald.terrarum.console.ConsoleCommand
import net.torvald.terrarum.console.Echo import net.torvald.terrarum.console.Echo
import net.torvald.terrarum.console.EchoError import net.torvald.terrarum.console.EchoError
import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameitems.ItemID
import net.torvald.terrarum.gameitems.isOre
import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.serialise.toUint import net.torvald.terrarum.serialise.toUint
import net.torvald.terrarum.utils.RasterWriter import net.torvald.terrarum.utils.RasterWriter
@@ -26,11 +27,11 @@ import kotlin.math.sign
*/ */
internal object ExportMap2 : ConsoleCommand { internal object ExportMap2 : ConsoleCommand {
private fun getOreRCS(ore: ItemID) = private fun getRCS(item: ItemID) =
ItemCodex[OreCodex.oreProps.getOrElse(ore) { null }?.item]?.material?.rcs ?: MaterialCodex.nullMaterial.rcs if (item.isOre())
private fun getBlockRCS(block: ItemID) = ItemCodex[OreCodex.oreProps.getOrElse(item) { null }?.item]?.material?.rcs ?: MaterialCodex.nullMaterial.rcs
MaterialCodex.getOrDefault(BlockCodex.getOrNull(block)?.material).rcs else
MaterialCodex.getOrDefault(BlockCodex.getOrNull(item)?.material).rcs
private fun triangularRand(amp: Float) = (((Math.random() + Math.random()) - 1.0) * amp).toFloat() private fun triangularRand(amp: Float) = (((Math.random() + Math.random()) - 1.0) * amp).toFloat()
@@ -46,9 +47,6 @@ internal object ExportMap2 : ConsoleCommand {
} }
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
println("Air RCS: ${getBlockRCS(Block.AIR)}")
val world = (INGAME.world) val world = (INGAME.world)
if (args.size == 2) { if (args.size == 2) {
@@ -66,7 +64,7 @@ internal object ExportMap2 : ConsoleCommand {
val terr = world.getTileFromTerrain(x, y) val terr = world.getTileFromTerrain(x, y)
val ore = world.getTileFromOre(x, y).item val ore = world.getTileFromOre(x, y).item
val reflection0 = maxOf(getOreRCS(ore), getBlockRCS(terr)) val reflection0 = maxOf(getRCS(ore), getRCS(terr))
val reflection = reflection0 + triangularRand(strToRandAmp(reflection0.toFloat())) val reflection = reflection0 + triangularRand(strToRandAmp(reflection0.toFloat()))
val delta = (reflection - akku).coerceAtLeast(0f) val delta = (reflection - akku).coerceAtLeast(0f)