curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 02:54:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

replacing min/max usage with kotlin's

Browse Source
This commit is contained in:
minjaesong
2023-07-11 01:54:46 +09:00
parent d96b7d1b84
commit 79f19120f2
66 changed files with 308 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/torvald/terrarum/modulebasegame/magiccontroller/TheMagicLanguage.kt
View File

@@ -2,6 +2,7 @@ package net.torvald.terrarum.modulebasegame.magiccontroller
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.Actor
import kotlin.math.min
/**
* "Data Type" describing magical force
@@ -33,13 +34,13 @@ class TheMagicLanguage(vm: TheMagicMachine) {
if (power >= 0) {
// pour out positive power without inversion; result is positive power
if (value >= 0) {
val value = minOf(power, value)
val value = min(power, value)
other.pourIn(value)
power -= value
}
// pour out positive power with inversion; result is negative power
else {
val value = minOf(-power, value)
val value = min(-power, value)
other.pourIn(value)
power += value
}
@@ -47,12 +48,12 @@ class TheMagicLanguage(vm: TheMagicMachine) {
else {
// pour out negative power without inversion; result is negative power
if (value < 0) {
val value = minOf(power, value)
val value = min(power, value)
other.pourIn(-value)
}
// pour out negative power with inversion; result is positive power
else {
val value = minOf(-power, value)
val value = min(-power, value)
other.pourIn(-value)
}
}