From 5c644f0789e4ccb9212244b5e6d16e0d2d076cfa Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Sun, 29 Jan 2017 20:48:55 +0900
Subject: [PATCH] more renaming things

Former-commit-id: 80e29fc17e431e350d8d4860273ec42bc4ad67df
Former-commit-id: d70546a097d66ade94de93b4be157b7c9637e98f
---
 src/net/torvald/terrarum/StateInGame.kt         |  4 ++--
 src/net/torvald/terrarum/console/AVTracker.kt   |  2 +-
 .../torvald/terrarum/console/Authenticator.kt   | 17 +++++++++++++++++
 src/net/torvald/terrarum/gameactors/Actor.kt    |  2 +-
 .../terrarum/gameactors/ActorWithSprite.kt      |  9 ++++++---
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt
index 9ffed88bd..bd8c6578f 100644
--- a/src/net/torvald/terrarum/StateInGame.kt
+++ b/src/net/torvald/terrarum/StateInGame.kt
@@ -300,8 +300,8 @@ constructor() : BasicGameState() {
     private fun setAppTitle() {
         Terrarum.appgc.setTitle(
                 Terrarum.NAME +
-                " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})" +
-                " — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M")
+                " — F: ${Terrarum.appgc.fps} (${Terrarum.TARGET_INTERNAL_FPS})")
+                //" — M: ${Terrarum.memInUse}M / ${Terrarum.memTotal}M / ${Terrarum.memXmx}M")
     }
 
     override fun render(gc: GameContainer, sbg: StateBasedGame, gwin: Graphics) {
diff --git a/src/net/torvald/terrarum/console/AVTracker.kt b/src/net/torvald/terrarum/console/AVTracker.kt
index da57ad653..053d29844 100644
--- a/src/net/torvald/terrarum/console/AVTracker.kt
+++ b/src/net/torvald/terrarum/console/AVTracker.kt
@@ -18,7 +18,7 @@ object AVTracker : ConsoleCommand {
             try {
                 val actorID = args[1].toInt()
 
-                if (Terrarum.ingame.hasActor(actorID)) {
+                if (Terrarum.ingame.theGameHasActor(actorID)) {
                     jPanelInstances.add(ActorValueTracker(Terrarum.ingame.getActorByID(actorID)))
                 }
                 else {
diff --git a/src/net/torvald/terrarum/console/Authenticator.kt b/src/net/torvald/terrarum/console/Authenticator.kt
index 5f3057239..2c8fe1222 100644
--- a/src/net/torvald/terrarum/console/Authenticator.kt
+++ b/src/net/torvald/terrarum/console/Authenticator.kt
@@ -5,6 +5,23 @@ import net.torvald.terrarum.ui.ConsoleWindow
 import org.apache.commons.codec.digest.DigestUtils
 
 /**
+ *
+ * Password setting rules:
+ *
+ * For each releases new password should be set. The new password must:
+ *      - start with next alphabet of previous password
+ *          if previous password started with Z, the new password must start with A
+ *      - be a name appear in the Legend of Zelda series which officially released by Nintendo
+ *      - be lowercase
+ *      - BE CRACKABLE (crackstation.net)
+ *
+ * Example passwords would be:
+ *  aryll -> biggoron -> ciela -> ... -> linebeck -> midna -> navi -> ...
+ *
+ * Notes:
+ *      do NOT put plaintext anywhere in the code (except for comments maybe)
+ *      must use SHA-256
+ *
  * Created by minjaesong on 16-02-19.
  */
 internal object Authenticator : ConsoleCommand {
diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt
index 6f80946a7..eeb98c3db 100644
--- a/src/net/torvald/terrarum/gameactors/Actor.kt
+++ b/src/net/torvald/terrarum/gameactors/Actor.kt
@@ -40,7 +40,7 @@ abstract class Actor(val renderOrder: ActorOrder) : Comparable<Actor>, Runnable
      */
     fun generateUniqueReferenceID(): Int {
         fun checkForCollision(value: Int) =
-                Terrarum.ingame.hasActor(value) ||
+                Terrarum.ingame.theGameHasActor(value) ||
                 value < ItemCodex.ITEM_COUNT_MAX ||
                 value < when (renderOrder) {
                     ActorOrder.BEHIND -> ItemCodex.ITEM_COUNT_MAX
diff --git a/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt b/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt
index 96730d33f..e6e955bae 100644
--- a/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt
+++ b/src/net/torvald/terrarum/gameactors/ActorWithSprite.kt
@@ -65,7 +65,7 @@ open class ActorWithSprite(renderOrder: ActorOrder, val immobileBody: Boolean =
         )
 
     /**
-     * TODO external force? do we need this? we have moveDelta
+     * Elevators/Movingwalks/etc.: edit hitbox manually!
      *
      * Velocity vector for newtonian sim.
      * Acceleration: used in code like:
@@ -506,9 +506,12 @@ open class ActorWithSprite(renderOrder: ActorOrder, val immobileBody: Boolean =
                 }
             }
             // axis X
-            if (isTouchingSide(nextHitbox, COLLIDING_LEFT) || isTouchingSide(nextHitbox, COLLIDING_RIGHT)
-                && moveDelta.x != 0.0) { // check right and left
+            if (isTouchingSide(nextHitbox, COLLIDING_LEFT) || isTouchingSide(nextHitbox, COLLIDING_RIGHT)) { // check right and left
                 // the actor is hitting the wall
+
+                // FIXME balls are stuck in this
+                if (referenceID != 321321321)
+                    println("$this trying to reflectX")
                 hitAndReflectX()
             }
         }