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

wooden pickaxe adjustments

Browse Source
This commit is contained in:
minjaesong
2023-10-12 19:54:16 +09:00
parent 58fa1dd56c
commit d8abec381b
11 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/gameworld/GameWorld.kt
View File

@@ -650,7 +650,7 @@ open class GameWorld(
//println("[GameWorld] accumulated damage: ${terrainDamages[addr]}")
// remove tile from the world
if (terrainDamages[addr] ?: 0f >= BlockCodex[getTileFromTerrain(x, y)].strength) {
if ((terrainDamages[addr] ?: 0f) >= BlockCodex[getTileFromTerrain(x, y)].strength) {
val tileBroke = getTileFromTerrain(x, y)
setTileTerrain(x, y, Block.AIR, false)
terrainDamages.remove(addr)

2
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilder.kt
View File

@@ -14,7 +14,7 @@ object PlayerBuilder {
val world = (Terrarum.ingame!! as TerrarumIngame).world
val p: Actor = IngamePlayer("lol", "lol_glow", world.worldTime.TIME_T)
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
InjectCreatureRaw(p.actorValue, "basegame", "CreaturePlayer.json")
// attach sprite

2
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderCynthia.kt
View File

@@ -17,7 +17,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
val p: HumanoidNPC = HumanoidNPC(
NullAI(),
-589141658L) // random value thrown
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
InjectCreatureRaw(p.actorValue, "basegame", "CreaturePlayer.json")
p.actorValue[AVKey.__PLAYER_QUICKSLOTSEL] = 0

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

@@ -35,7 +35,7 @@ object PlayerBuilderSigrid {
p.actorValue[AVKey.SCALEBUFF] = 1.0 // Constant 1.0 for player, meant to be used by random mobs
/**
* fixed value, or 'base value', from creature strength of Dwarf Fortress.
* Human race uses 1000. (see CreatureHuman.json)
* Human race uses 1000. (see CreaturePlayer.json)
*/
p.actorValue[AVKey.STRENGTH] = 1414 // this is test character, after all.
p.actorValue[AVKey.ENCUMBRANCE] = 1000

2
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderTestSubject1.kt
View File

@@ -14,7 +14,7 @@ object PlayerBuilderTestSubject1 {
ModMgr.getGdxFile("basegame", "sprites/test_sprite_glow.properties").path(),
-589141658L // random value thrown
)
InjectCreatureRaw(p.actorValue, "basegame", "CreatureHuman.json")
InjectCreatureRaw(p.actorValue, "basegame", "CreaturePlayer.json")
p.actorValue[AVKey.__PLAYER_QUICKSLOTSEL] = 0

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

@@ -241,4 +241,31 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) {
override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
}
/**
* Created by minjaesong on 2023-10-12.
*/
class PickaxeWood(originalID: ItemID) : GameItem(originalID) {
internal constructor() : this("-uninitialised-")
override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL
override val isDynamic = true
override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(8,4)
init {
equipPosition = GameItem.EquipPosition.HAND_GRIP
maxDurability = (TOOL_DURABILITY_BASE * material.enduranceMod).roundToInt()
durability = maxDurability.toFloat()
tags.add("PICK")
originalName = "ITEM_PICK_WOOD"
}
override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this)
}

27
src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt
View File

@@ -197,6 +197,33 @@ class SledgehammerSteel(originalID: ItemID) : GameItem(originalID) {
originalName = "ITEM_SLEDGEHAMMER_STEEL"
}
override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
if (SledgehammerCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)
}
/**
* Created by minjaesong on 2023-10-12.
*/
class SledgehammerWood(originalID: ItemID) : GameItem(originalID) {
internal constructor() : this("-uninitialised-")
override var baseToolSize: Double? = BASE_MASS_AND_SIZE
override var inventoryCategory = Category.TOOL
override val isDynamic = true
override val materialId = "WOOD"
override var baseMass = material.density.toDouble() / MaterialCodex["IRON"].density * BASE_MASS_AND_SIZE
override val itemImage: TextureRegion
get() = CommonResourcePool.getAsItemSheet("basegame.items").get(10,4)
init {
equipPosition = GameItem.EquipPosition.HAND_GRIP
maxDurability = (TOOL_DURABILITY_BASE * material.enduranceMod).roundToInt()
durability = maxDurability.toFloat()
tags.add("SLEDGEHAMMER")
originalName = "ITEM_WOODEN_MALLET"
}
override fun startPrimaryUse(actor: ActorWithBody, delta: Float) =
if (SledgehammerCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L
override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = SledgehammerCore.endPrimaryUse(actor, delta, this)