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

fixed wrong package, fixed wrong creation date

Browse Source 
Former-commit-id: 8a2a91a5252347b5184f62ec0f7009292fbb01bb
Former-commit-id: b31eaddf7596c8393c9a032e8897ef3f1a8234fd
This commit is contained in:
Song Minjae
2016-10-26 00:37:49 +09:00
parent cd4c9d5b34
commit 413603de6f
20 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -3,7 +3,7 @@ package net.torvald.terrarum
import net.torvald.imagefont.GameFontBase
import net.torvald.terrarum.audio.AudioResourceLibrary
import net.torvald.terrarum.concurrent.ThreadPool
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameactors.*
import net.torvald.terrarum.console.Authenticator
import net.torvald.terrarum.console.CommandDict

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

@@ -6,7 +6,7 @@ import net.torvald.terrarum.itemproperties.ItemPropCodex
import org.newdawn.slick.GameContainer
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 15-12-31.
*/
abstract class Actor : Comparable<Actor>, Runnable {

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

@@ -16,7 +16,7 @@ import org.newdawn.slick.Graphics
/**
* Base class for every actor that has physical (or echo) body. This includes furnishings, paintings, gadgets, etc.
*
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-01-13.
*/
open class ActorWithBody : Actor(), Visible {

2
src/net/torvald/terrarum/gameactors/AnyPlayer.kt
View File

@@ -1,6 +1,6 @@
package net.torvald.terrarum.gameactors
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import org.newdawn.slick.Input
/**

2
src/net/torvald/terrarum/gameactors/CanBeAnItem.kt
View File

@@ -3,7 +3,7 @@ package net.torvald.terrarum.gameactors
import net.torvald.terrarum.gameitem.InventoryItem
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-01-31.
*/
interface CanBeAnItem {

2
src/net/torvald/terrarum/gameactors/Controllable.kt
View File

@@ -6,7 +6,7 @@ import org.newdawn.slick.Input
/**
* Actors that has movement controlled by Keyboard or AI
*
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 15-12-31.
*/
interface Controllable {

2
src/net/torvald/terrarum/gameactors/CreatureBuilder.kt
View File

@@ -9,7 +9,7 @@ import org.newdawn.slick.SlickException
import java.io.IOException
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-02-05.
*/
object CreatureBuilder {

2
src/net/torvald/terrarum/gameactors/CreatureRawInjector.kt
View File

@@ -4,7 +4,7 @@ import net.torvald.JsonFetcher
import net.torvald.random.Fudge3
import net.torvald.terrarum.langpack.Lang
import com.google.gson.JsonObject
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import org.newdawn.slick.SlickException
import java.io.IOException
import java.security.SecureRandom

2
src/net/torvald/terrarum/gameactors/Factionable.kt
View File

@@ -4,7 +4,7 @@ import net.torvald.terrarum.gameactors.faction.Faction
import java.util.*
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-02-15.
*/
interface Factionable {

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

@@ -1,6 +1,6 @@
package net.torvald.terrarum.gameactors
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameitem.InventoryItem
import org.luaj.vm2.Globals
import org.luaj.vm2.LoadState
@@ -15,7 +15,7 @@ import java.io.InputStreamReader
import java.io.Reader
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-01-31.
*/
open class HumanoidNPC(aiFile: String, born: GameDate) : ActorHumanoid(born), AIControlled, CanBeAnItem {

2
src/net/torvald/terrarum/gameactors/LandHolder.kt
View File

@@ -3,7 +3,7 @@ package net.torvald.terrarum.gameactors
import java.util.*
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-02-20.
*/
interface LandHolder {

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

@@ -1,9 +1,7 @@
package net.torvald.terrarum.gameactors
import java.util.*
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-02-19.
*/
interface Luminous {

2
src/net/torvald/terrarum/gameactors/PhysTestBall.kt
View File

@@ -6,7 +6,7 @@ import org.newdawn.slick.GameContainer
import org.newdawn.slick.Graphics
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-03-05.
*/
class PhysTestBall : ActorWithBody() {

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

@@ -6,7 +6,7 @@ import net.torvald.terrarum.gamecontroller.EnumKeyFunc
import net.torvald.terrarum.gamecontroller.KeyMap
import net.torvald.terrarum.mapdrawer.MapDrawer
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.ui.UIQuickBar
import org.dyn4j.geometry.Vector2
import org.lwjgl.input.Controller
@@ -19,7 +19,7 @@ import java.util.*
/**
* Game player (YOU!)
*
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 15-12-31.
*/
class Player(born: GameDate) : ActorHumanoid(born) {

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

@@ -5,7 +5,7 @@ import org.newdawn.slick.SlickException
import java.io.IOException
/**
* Created by minjaesong on 16-03-15.
* Created by minjaesong on 16-02-03.
*/
object PlayerBuilder {
private val JSONPATH = "./assets/raw/"

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.gameactors
import net.torvald.spriteanimation.SpriteAnimation
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.mapdrawer.MapDrawer
/**

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

@@ -4,14 +4,14 @@ import net.torvald.JsonFetcher
import net.torvald.terrarum.gameactors.faction.Faction
import net.torvald.spriteanimation.SpriteAnimation
import com.google.gson.JsonObject
import net.torvald.terrarum.console.ActorHumanoid
import net.torvald.terrarum.gameactors.ActorHumanoid
import net.torvald.terrarum.gameactors.faction.FactionFactory
import net.torvald.terrarum.mapdrawer.MapDrawer
import org.newdawn.slick.SlickException
import java.io.IOException
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-02-03.
*/
object PlayerBuilderSigrid {

2
src/net/torvald/terrarum/gameactors/Pocketed.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.gameactors
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-01-15.
*/
interface Pocketed {

2
src/net/torvald/terrarum/gameactors/Visible.kt
View File

@@ -4,7 +4,7 @@ import org.newdawn.slick.GameContainer
import org.newdawn.slick.Graphics
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-01-25.
*/
interface Visible {
val hitbox: Hitbox

2
src/net/torvald/terrarum/gameactors/ai/ActorAI.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.gameactors.ai
/**
* Created by minjaesong on 16-03-14.
* Created by minjaesong on 16-03-02.
*/
interface ActorAI {
}