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

forgot to make changes to picaxes

Browse Source
This commit is contained in:
minjaesong
2021-10-04 14:27:24 +09:00
parent e0fbc54839
commit dc0b5029f2
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/mods/basegame/creatures/CreatureHuman.json
View File

@@ -23,7 +23,7 @@
"encumbrance": 1000, "encumbrance": 1000,
"basedefence": 100, "basedefence": 100,
"basereach": 56, "basereach": 84,
"toolsize": 15, "toolsize": 15,

2
assets/mods/basegame/creatures/CreatureWerebeastBase.json
View File

@@ -23,7 +23,7 @@
"encumbrance": 10000, "encumbrance": 10000,
"basedefence": 100, "basedefence": 100,
"basereach": 114, "basereach": 180,
"toolsize": 40, "toolsize": 40,

10
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
View File

@@ -1,11 +1,7 @@
package net.torvald.terrarum.modulebasegame.gameactors package net.torvald.terrarum.modulebasegame.gameactors
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.WireCodex import net.torvald.terrarum.WireCodex
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.faction.FactionFactory
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
/** /**
* Created by minjaesong on 2016-02-03. * Created by minjaesong on 2016-02-03.
@@ -13,7 +9,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
object PlayerBuilderSigrid { object PlayerBuilderSigrid {
operator fun invoke(): IngamePlayer { /*operator fun invoke(): IngamePlayer {
val p = IngamePlayer("lol", "lol_glow", - 9223372036854775807L) // XD val p = IngamePlayer("lol", "lol_glow", - 9223372036854775807L) // XD
//p.referenceID = 0x51621D // the only constant of this procedural universe //p.referenceID = 0x51621D // the only constant of this procedural universe
@@ -41,7 +37,7 @@ object PlayerBuilderSigrid {
p.actorValue[AVKey.STRENGTH] = 1414 // this is test character, after all. p.actorValue[AVKey.STRENGTH] = 1414 // this is test character, after all.
p.actorValue[AVKey.ENCUMBRANCE] = 1000 p.actorValue[AVKey.ENCUMBRANCE] = 1000
p.actorValue[AVKey.BASEHEIGHT] = 46 p.actorValue[AVKey.BASEHEIGHT] = 46
p.actorValue[AVKey.BASEREACH] = 50 p.actorValue[AVKey.BASEREACH] = 84
p.actorValue[AVKey.NAME] = "Sigrid" p.actorValue[AVKey.NAME] = "Sigrid"
@@ -72,7 +68,7 @@ object PlayerBuilderSigrid {
return p return p
} }*/
fun fillTestInventory(inventory: ActorInventory) { fun fillTestInventory(inventory: ActorInventory) {

7
src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
View File

@@ -8,6 +8,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
import net.torvald.terrarum.gameitem.GameItem import net.torvald.terrarum.gameitem.GameItem
import net.torvald.terrarum.gameitem.ItemID import net.torvald.terrarum.gameitem.ItemID
import net.torvald.terrarum.gameitem.inInteractableRange
import net.torvald.terrarum.itemproperties.Calculate import net.torvald.terrarum.itemproperties.Calculate
import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem
import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.BASE_MASS_AND_SIZE import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.BASE_MASS_AND_SIZE
@@ -18,7 +19,7 @@ import kotlin.math.roundToInt
* Created by minjaesong on 2019-03-10. * Created by minjaesong on 2019-03-10.
*/ */
object PickaxeCore { object PickaxeCore {
fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean { fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem) = inInteractableRange(actor) {
val mouseTileX = Terrarum.mouseTileX val mouseTileX = Terrarum.mouseTileX
val mouseTileY = Terrarum.mouseTileY val mouseTileY = Terrarum.mouseTileY
@@ -39,7 +40,7 @@ object PickaxeCore {
// return false if here's no tile // return false if here's no tile
if (Block.AIR == (INGAME.world).getTileFromTerrain(mouseTileX, mouseTileY)) if (Block.AIR == (INGAME.world).getTileFromTerrain(mouseTileX, mouseTileY))
return false return@inInteractableRange false
// filter passed, do the job // filter passed, do the job
val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!!
@@ -54,7 +55,7 @@ object PickaxeCore {
} }
} }
return true true
} }
fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean { fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {