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

materials rebalancing

Browse Source
This commit is contained in:
minjaesong
2023-11-30 13:51:09 +09:00
parent a8e1f235f4
commit 84ab32f4c1
4 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/itemproperties/Calculate.kt
View File

@@ -22,11 +22,11 @@ object Calculate {
* TODO Newtons as unit?
*/
@JvmStatic fun pickaxePower(actor: ActorWithBody, material: Material?): Float {
return (16.0 * (material?.forceMod?.toDouble() ?: 1.0).sqrt() * (actor.avStrength / 1000.0)).toFloat()
return (4.0 * (material?.forceMod?.toDouble() ?: 0.0) * (actor.avStrength / 1000.0)).toFloat()
}
@JvmStatic fun hatchetPower(actor: ActorWithBody, material: Material?): Float {
return (1.0 * (material?.forceMod?.toDouble() ?: 1.0).sqrt() * (actor.avStrength / 1000.0)).toFloat()
return (1.0 * (material?.forceMod?.toDouble() ?: 0.0) * (actor.avStrength / 1000.0)).toFloat()
}
private val fallDamageDampenMult = (32.0 / 1176.0).sqr()

4
src/net/torvald/terrarum/itemproperties/Material.kt
View File

@@ -19,7 +19,7 @@ class Material {
var thermalConductivity: Float = 10f // watts per metre-kelven
var forceMod: Int = 1 // arbitrary unit. See Pickaxe_Power.xlsx
var forceMod: Float = 1f // arbitrary unit. See Pickaxe_Power.xlsx
var enduranceMod: Float = 1f // multiplier. Copper as 1.0
//var armourMod: Float // multiplier. Copper as 1.0
@@ -69,7 +69,7 @@ class MaterialCodex {
val prop = Material()
prop.strength = it.intVal("tens")
prop.density = it.intVal("dsty")
prop.forceMod = it.intVal("fmod")
prop.forceMod = it.floatVal("fmod")
prop.enduranceMod = it.floatVal("endurance")
prop.thermalConductivity = it.floatVal("tcond")
prop.identifier = it.get("idst").toUpperCase()