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

code cleanup, shortening things

Browse Source 
Former-commit-id: d1c81cf3207fff4dd311e9b6c3beb04c194aebc5
Former-commit-id: 26f5042ba41cd577e681a22465435945434c864b
This commit is contained in:
Song Minjae
2016-12-17 14:16:42 +09:00
parent af8516be68
commit 56530a6041
24 changed files with 473 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/gameactors/Actor.kt
View File

@@ -2,7 +2,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.random.HQRNG
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.itemproperties.ItemPropCodex
import net.torvald.terrarum.itemproperties.ItemCodex
import org.newdawn.slick.GameContainer
/**
@@ -40,7 +40,7 @@ abstract class Actor : Comparable<Actor>, Runnable {
var ret: Int
do {
ret = HQRNG().nextInt().and(0x7FFFFFFF) // set new ID
} while (Terrarum.ingame.hasActor(ret) || ret < ItemPropCodex.ITEM_COUNT_MAX) // check for collision
} while (Terrarum.ingame.hasActor(ret) || ret < ItemCodex.ITEM_COUNT_MAX) // check for collision
return ret
}
}

8
src/net/torvald/terrarum/gameactors/ActorInventory.kt
View File

@@ -2,7 +2,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameitem.InventoryItem
import net.torvald.terrarum.itemproperties.ItemPropCodex
import net.torvald.terrarum.itemproperties.ItemCodex
import java.util.*
/**
@@ -51,7 +51,7 @@ class ActorInventory() {
}
}
fun add(itemID: Int, count: Int = 1) = add(ItemPropCodex[itemID], count)
fun add(itemID: Int, count: Int = 1) = add(ItemCodex[itemID], count)
fun add(item: InventoryItem, count: Int = 1) {
if (item.id == Player.PLAYER_REF_ID)
throw IllegalArgumentException("Attempted to put human player into the inventory.")
@@ -64,7 +64,7 @@ class ActorInventory() {
itemList.put(item, itemList[item] ?: 0 + count)
}
fun remove(itemID: Int, count: Int = 1) = remove(ItemPropCodex[itemID], count)
fun remove(itemID: Int, count: Int = 1) = remove(ItemCodex[itemID], count)
fun remove(item: InventoryItem, count: Int = 1) {
// check if the item does NOT exist
if (itemList[item] == null) {
@@ -84,7 +84,7 @@ class ActorInventory() {
fun contains(item: InventoryItem) = itemList.containsKey(item)
fun contains(itemID: Int) = itemList.containsKey(ItemPropCodex[itemID])
fun contains(itemID: Int) = itemList.containsKey(ItemCodex[itemID])
fun forEach(consumer: (InventoryItem, Int) -> Unit) = itemList.forEach(consumer)

20
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -5,10 +5,10 @@ import net.torvald.point.Point2d
import net.torvald.terrarum.*
import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.mapdrawer.MapDrawer
import net.torvald.terrarum.tileproperties.TilePropCodex
import net.torvald.terrarum.tileproperties.TileCodex
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.mapdrawer.MapDrawer.TILE_SIZE
import net.torvald.terrarum.tileproperties.TileNameCode
import net.torvald.terrarum.tileproperties.Tile
import net.torvald.terrarum.tileproperties.TileProp
import org.dyn4j.Epsilon
import org.dyn4j.geometry.Vector2
@@ -694,7 +694,7 @@ open class ActorWithBody : Actor() {
for (y in tyStart..tyEnd) {
for (x in txStart..txEnd) {
val tile = world.getTileFromTerrain(x, y)
if (TilePropCodex[tile].isSolid)
if (TileCodex[tile].isSolid)
return true
}
}
@@ -736,7 +736,7 @@ open class ActorWithBody : Actor() {
}
// evaluate
if (TilePropCodex[world.getTileFromTerrain(tileX, tileY)].isFluid) {
if (TileCodex[world.getTileFromTerrain(tileX, tileY)].isFluid) {
contactAreaCounter += 1
}
}
@@ -746,7 +746,7 @@ open class ActorWithBody : Actor() {
private fun setHorizontalFriction() {
val friction = if (isPlayerNoClip)
BASE_FRICTION * TilePropCodex[TileNameCode.STONE].friction.tileFrictionToMult()
BASE_FRICTION * TileCodex[Tile.STONE].friction.tileFrictionToMult()
else
BASE_FRICTION * bodyFriction.tileFrictionToMult()
@@ -773,7 +773,7 @@ open class ActorWithBody : Actor() {
private fun setVerticalFriction() {
val friction = if (isPlayerNoClip)
BASE_FRICTION * TilePropCodex[TileNameCode.STONE].friction.tileFrictionToMult()
BASE_FRICTION * TileCodex[Tile.STONE].friction.tileFrictionToMult()
else
BASE_FRICTION * bodyFriction.tileFrictionToMult()
@@ -833,8 +833,8 @@ open class ActorWithBody : Actor() {
get() {
var friction = 0
forEachFeetTile {
if (it?.friction ?: 4 > friction) // 4: friction of the air
friction = it?.friction ?: 4
if (it?.friction ?: TileCodex[Tile.AIR].friction > friction)
friction = it?.friction ?: TileCodex[Tile.AIR].friction
}
return friction
@@ -1021,7 +1021,7 @@ open class ActorWithBody : Actor() {
val tileProps = ArrayList<TileProp?>()
for (y in tilewiseHitbox.posY.toInt()..tilewiseHitbox.endPointY.toInt()) {
for (x in tilewiseHitbox.posX.toInt()..tilewiseHitbox.endPointX.toInt()) {
tileProps.add(TilePropCodex[world.getTileFromTerrain(x, y)])
tileProps.add(TileCodex[world.getTileFromTerrain(x, y)])
}
}
@@ -1048,7 +1048,7 @@ open class ActorWithBody : Actor() {
val y = nextHitbox.endPointY.plus(1.0).div(TILE_SIZE).floorInt()
for (x in tilewiseHitbox.posX.toInt()..tilewiseHitbox.endPointX.toInt()) {
tileProps.add(TilePropCodex[world.getTileFromTerrain(x, y)])
tileProps.add(TileCodex[world.getTileFromTerrain(x, y)])
}
return tileProps.forEach(consumer)

14
src/net/torvald/terrarum/gameactors/DroppedItem.kt
View File

@@ -1,8 +1,8 @@
package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameitem.InventoryItem
import net.torvald.terrarum.itemproperties.ItemPropCodex
import net.torvald.terrarum.tileproperties.TilePropCodex
import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.tileproperties.TileCodex
import org.newdawn.slick.GameContainer
import org.newdawn.slick.Graphics
@@ -12,17 +12,17 @@ import org.newdawn.slick.Graphics
class DroppedItem(private val item: InventoryItem) : ActorWithBody() {
init {
if (item.id >= ItemPropCodex.ITEM_COUNT_MAX)
if (item.id >= ItemCodex.ITEM_COUNT_MAX)
throw RuntimeException("Attempted to create DroppedItem actor of a real actor; the real actor must be dropped instead.")
isVisible = true
mass = if (item.id < TilePropCodex.TILE_UNIQUE_MAX)
TilePropCodex[item.id].density / 1000.0
mass = if (item.id < TileCodex.TILE_UNIQUE_MAX)
TileCodex[item.id].density / 1000.0
else
ItemPropCodex[item.id].mass
ItemCodex[item.id].mass
scale = ItemPropCodex[item.id].scale
scale = ItemCodex[item.id].scale
}
override fun update(gc: GameContainer, delta: Int) {

8
src/net/torvald/terrarum/gameactors/FixtureTikiTorch.kt
View File

@@ -1,8 +1,8 @@
package net.torvald.terrarum.gameactors
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.tileproperties.TileNameCode
import net.torvald.terrarum.tileproperties.TilePropCodex
import net.torvald.terrarum.tileproperties.Tile
import net.torvald.terrarum.tileproperties.TileCodex
import java.util.*
/**
@@ -11,7 +11,7 @@ import java.util.*
class FixtureTikiTorch : FixtureBase(), Luminous {
override var luminosity: Int
get() = TilePropCodex[TileNameCode.TORCH].luminosity
get() = TileCodex[Tile.TORCH].luminosity
set(value) {
throw UnsupportedOperationException()
}
@@ -35,6 +35,6 @@ class FixtureTikiTorch : FixtureBase(), Luminous {
actorValue[AVKey.BASEMASS] = 1.0
luminosity = TilePropCodex[TileNameCode.TORCH].luminosity
luminosity = TileCodex[Tile.TORCH].luminosity
}
}

4
src/net/torvald/terrarum/gameactors/PlayerBuilderSigrid.kt
View File

@@ -7,7 +7,7 @@ import com.google.gson.JsonObject
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameactors.faction.FactionFactory
import net.torvald.terrarum.gameitem.EquipPosition
import net.torvald.terrarum.itemproperties.ItemPropCodex
import net.torvald.terrarum.itemproperties.ItemCodex
import net.torvald.terrarum.mapdrawer.MapDrawer
import org.newdawn.slick.SlickException
import java.io.IOException
@@ -77,7 +77,7 @@ object PlayerBuilderSigrid {
// Test fill up inventory
p.inventory.add(16)
p.equipItem(ItemPropCodex[16])
p.equipItem(ItemCodex[16])