diff --git a/.gradle/3.1/taskArtifacts/cache.properties b/.gradle/3.1/taskArtifacts/cache.properties
new file mode 100644
index 000000000..7e047e0c3
--- /dev/null
+++ b/.gradle/3.1/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Sat Dec 10 01:28:13 KST 2016
diff --git a/.gradle/3.1/taskArtifacts/cache.properties.lock b/.gradle/3.1/taskArtifacts/cache.properties.lock
new file mode 100644
index 000000000..596b2a0b4
Binary files /dev/null and b/.gradle/3.1/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/3.1/taskArtifacts/fileHashes.bin b/.gradle/3.1/taskArtifacts/fileHashes.bin
new file mode 100644
index 000000000..c0025b1bc
Binary files /dev/null and b/.gradle/3.1/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/3.1/taskArtifacts/fileSnapshots.bin b/.gradle/3.1/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 000000000..d68eb73b6
Binary files /dev/null and b/.gradle/3.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/3.1/taskArtifacts/taskArtifacts.bin b/.gradle/3.1/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 000000000..48a5ddab1
Binary files /dev/null and b/.gradle/3.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..05e52194d
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ab7a10c04..db0be7ae2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
+
\ No newline at end of file
diff --git a/.idea/modules/core/core.iml b/.idea/modules/core/core.iml
new file mode 100644
index 000000000..37e3c1c10
--- /dev/null
+++ b/.idea/modules/core/core.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/core/core_main.iml b/.idea/modules/core/core_main.iml
new file mode 100644
index 000000000..e359522f0
--- /dev/null
+++ b/.idea/modules/core/core_main.iml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/core/core_test.iml b/.idea/modules/core/core_test.iml
new file mode 100644
index 000000000..2b1481c19
--- /dev/null
+++ b/.idea/modules/core/core_test.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/desktop/desktop.iml b/.idea/modules/desktop/desktop.iml
new file mode 100644
index 000000000..992d895ef
--- /dev/null
+++ b/.idea/modules/desktop/desktop.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/desktop/desktop_main.iml b/.idea/modules/desktop/desktop_main.iml
new file mode 100644
index 000000000..459913766
--- /dev/null
+++ b/.idea/modules/desktop/desktop_main.iml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/desktop/desktop_test.iml b/.idea/modules/desktop/desktop_test.iml
new file mode 100644
index 000000000..5e3c5a218
--- /dev/null
+++ b/.idea/modules/desktop/desktop_test.iml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/terrarum_renewed.iml b/.idea/modules/terrarum_renewed.iml
new file mode 100644
index 000000000..10d7aff99
--- /dev/null
+++ b/.idea/modules/terrarum_renewed.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/terrarum_renewed_main.iml b/.idea/modules/terrarum_renewed_main.iml
new file mode 100644
index 000000000..6ee754441
--- /dev/null
+++ b/.idea/modules/terrarum_renewed_main.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/terrarum_renewed_test.iml b/.idea/modules/terrarum_renewed_test.iml
new file mode 100644
index 000000000..42ee7bb75
--- /dev/null
+++ b/.idea/modules/terrarum_renewed_test.iml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/assets/blur.vert b/assets/blur.vert
index e69de29bb..33069582f 100644
--- a/assets/blur.vert
+++ b/assets/blur.vert
@@ -0,0 +1,7 @@
+precision mediump float;
+
+attribute vec2 position;
+
+void main() {
+ gl_Position = vec4(position, 1, 1);
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..6ffa23784
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..1862730c9
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Dec 10 01:28:13 KST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 000000000..9aa616c27
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/lib/kotlin-reflect.jar b/lib/kotlin-reflect.jar
index f05f92a93..359ee1574 100755
Binary files a/lib/kotlin-reflect.jar and b/lib/kotlin-reflect.jar differ
diff --git a/lib/kotlin-runtime-sources.jar b/lib/kotlin-runtime-sources.jar
index 3daabbaab..1921787ba 100755
Binary files a/lib/kotlin-runtime-sources.jar and b/lib/kotlin-runtime-sources.jar differ
diff --git a/lib/kotlin-runtime.jar b/lib/kotlin-runtime.jar
index a76245308..75d3be145 100755
Binary files a/lib/kotlin-runtime.jar and b/lib/kotlin-runtime.jar differ
diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt
index f21fbf8c8..18da66684 100644
--- a/src/net/torvald/terrarum/DefaultConfig.kt
+++ b/src/net/torvald/terrarum/DefaultConfig.kt
@@ -55,6 +55,8 @@ object DefaultConfig {
jsonObject.addProperty("keyquicksel", Key.CAPS_LOCK) // pie menu
val keyquickselalt = JsonArray(); keyquickselalt.add(Key.BACKSPACE); keyquickselalt.add(Key.L_COMMAND); keyquickselalt.add(Key.L_CONTROL)
// Colemak, Workman and some typers use CapsLock as Backspace, Apple-JIS and HHKB has Control in place of CapsLock and often re-assigned to Command
+ // so these keys are treated as the same.
+ // FOR ~~FUCKS~~ERGONOMICS' SAKE DON'T USE CTRL AND ALT AS A KEY!
jsonObject.add("keyquickselalt", keyquickselalt)
jsonObject.addProperty("keyjump", Key.SPACE)
diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt
index d0757b0a4..c5ea71fa4 100644
--- a/src/net/torvald/terrarum/StateInGame.kt
+++ b/src/net/torvald/terrarum/StateInGame.kt
@@ -1,6 +1,7 @@
package net.torvald.terrarum
import net.torvald.imagefont.GameFontBase
+import net.torvald.random.HQRNG
import net.torvald.terrarum.audio.AudioResourceLibrary
import net.torvald.terrarum.concurrent.ThreadPool
import net.torvald.terrarum.gameactors.ActorHumanoid
@@ -59,9 +60,9 @@ constructor() : BasicGameState() {
lateinit var debugWindow: UIHandler
lateinit var notifier: UIHandler
- lateinit internal var playableActorWrapper: PlayableActorWrapper
+ lateinit internal var playableActorDelegate: PlayableActorDelegate
internal val player: ActorHumanoid // currently POSSESSED actor :)
- get() = playableActorWrapper.actor
+ get() = playableActorDelegate.actor
//private var GRADIENT_IMAGE: Image? = null
//private var skyBox: Rectangle? = null
@@ -74,9 +75,8 @@ constructor() : BasicGameState() {
val actorsDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT)
val uisDrawFrameBuffer = Image(Terrarum.WIDTH, Terrarum.HEIGHT)
- private lateinit var shader12BitCol: Shader
- private lateinit var shaderBlurH: Shader
- private lateinit var shaderBlurV: Shader
+ //private lateinit var shader12BitCol: Shader // grab LibGDX if you want some shader
+ //private lateinit var shaderBlur: Shader
private val useShader: Boolean = false
private val shaderProgram = 0
@@ -107,9 +107,8 @@ constructor() : BasicGameState() {
override fun enter(gc: GameContainer, sbg: StateBasedGame) {
// load things when the game entered this "state"
// load necessary shaders
- shader12BitCol = Shader.makeShader("./assets/4096.vrt", "./assets/4096.frg")
- shaderBlurH = Shader.makeShader("./assets/blurH.vrt", "./assets/blur.frg")
- shaderBlurV = Shader.makeShader("./assets/blurV.vrt", "./assets/blur.frg")
+ //shader12BitCol = Shader.makeShader("./assets/4096.vert", "./assets/4096.frag")
+ //shaderBlur = Shader.makeShader("./assets/blur.vert", "./assets/blur.frag")
// init map as chosen size
world = GameWorld(8192, 2048)
@@ -117,16 +116,15 @@ constructor() : BasicGameState() {
// generate terrain for the map
WorldGenerator.attachMap(world)
WorldGenerator.SEED = 0x51621D2
- //mapgenerator.setSeed(new HQRNG().nextLong());
+ //WorldGenerator.SEED = HQRNG().nextLong()
WorldGenerator.generateMap()
- RoguelikeRandomiser.seed = 0x540198
- //RoguelikeRandomiser.setSeed(new HQRNG().nextLong());
+ RoguelikeRandomiser.seed = HQRNG().nextLong()
// add new player and put it to actorContainer
- playableActorWrapper = PlayableActorWrapper(PlayerBuilderSigrid.create())
+ playableActorDelegate = PlayableActorDelegate(PlayerBuilderSigrid.create())
//player = PBCynthia.create()
//player.setNoClip(true);
addActor(player)
@@ -244,12 +242,12 @@ constructor() : BasicGameState() {
changePossession(Player.PLAYER_REF_ID) // TODO completely other behaviour?
}
- private fun changePossession(newActor: PlayableActorWrapper) {
+ private fun changePossession(newActor: PlayableActorDelegate) {
if (!hasActor(player)) {
throw IllegalArgumentException("No such actor in actorContainer: $newActor")
}
- playableActorWrapper = newActor
+ playableActorDelegate = newActor
WorldSimulator(world, player, UPDATE_DELTA)
}
@@ -258,7 +256,7 @@ constructor() : BasicGameState() {
throw IllegalArgumentException("No such actor in actorContainer: $refid")
}
- playableActorWrapper = PlayableActorWrapper(getActorByID(refid) as ActorHumanoid)
+ playableActorDelegate = PlayableActorDelegate(getActorByID(refid) as ActorHumanoid)
WorldSimulator(world, player, UPDATE_DELTA)
}
diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt
index 18a674cf9..e45139890 100644
--- a/src/net/torvald/terrarum/Terrarum.kt
+++ b/src/net/torvald/terrarum/Terrarum.kt
@@ -38,13 +38,13 @@ constructor(gamename: String) : StateBasedGame(gamename) {
joypadLabelStart = when (getConfigString("joypadlabelstyle")) {
"nwii" -> 0xE04B.toChar() // + mark
"logitech" -> 0xE05A.toChar() // number 10
- else -> 0xE042.toChar() // > mark (sonyps, msxb360, generic)
+ else -> 0xE042.toChar() // |> mark (sonyps, msxb360, generic)
}
joypadLableSelect = when (getConfigString("joypadlabelstyle")) {
"nwii" -> 0xE04D.toChar() // - mark
"logitech" -> 0xE059.toChar() // number 9
"sonyps" -> 0xE043.toChar() // solid rectangle
- "msxb360" -> 0xE041.toChar() // < mark
+ "msxb360" -> 0xE041.toChar() // <| mark
else -> 0xE043.toChar() // solid rectangle
}
@@ -142,7 +142,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
lateinit var appgc: AppGameContainer
var WIDTH = 1072
- var HEIGHT = 742 // IMAX ratio
+ var HEIGHT = 742 // IMAX ratiso
var VSYNC = true
val VSYNC_TRIGGER_THRESHOLD = 56
diff --git a/src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt b/src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt
index b5be5506b..4dee1c57f 100644
--- a/src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt
+++ b/src/net/torvald/terrarum/gameactors/PlayableActorDelegate.kt
@@ -6,10 +6,10 @@ import org.newdawn.slick.Input
/**
* A wrapper to support instant player changing (or possessing other NPCs maybe)
*
- * @param actor : here you 'snap in' the actor you wish to control
+ * @param actor : here you 'attach' the actor you wish to control
* Created by minjaesong on 16-10-23.
*/
-class PlayableActorWrapper(val actor: ActorHumanoid) {
+class PlayableActorDelegate(val actor: ActorHumanoid) {
init {
if (actor !is Controllable)
diff --git a/src/net/torvald/terrarum/virtualcomputer/assets/lua/TBASEXTN.lua b/src/net/torvald/terrarum/virtualcomputer/assets/lua/TBASEXTN.lua
new file mode 100644
index 000000000..cf16c66c2
--- /dev/null
+++ b/src/net/torvald/terrarum/virtualcomputer/assets/lua/TBASEXTN.lua
@@ -0,0 +1,34 @@
+-- TBASIC extension
+
+-- these are utilities. Do not touch these lines
+local __assert = _TBASIC.__assert
+local __assertlhand = _TBASIC.__assertlhand
+local __assertrhand = _TBASIC.__assertrhand
+local __checknumber = _TBASIC.__checknumber
+local __checkstring = _TBASIC.__checkstring
+local __readvar = _TBASIC.__readvar
+local __resolvevararg = _TBASIC.__resolvevarar
+local vararg = -13 -- magic
+-- end of utilities
+
+
+-- these are the sample code for defining your own words
+--[[
+-- actual function that does the job
+local function _fnupgoer(n)
+ print("Up-goer "..__checknumber(n).." goes up!")
+end
+
+-- add the word UPGOER to word list
+table.insert(_TBASIC._FNCTION, "UPGOER")
+-- add the actual function '_fnupgoer' and its number of arguments (1) to
+-- '_TBASIC.LUAFN'. 'UPGOER' part should match with the word you just
+-- inserted to _TBASIC._FNCTION.
+_TBASIC.LUAFN.UPGOER = {_fnupgoer, 1}
+]]
+
+
+-- little debugger's blessing
+local function _fnenableluatrace() _TBASIC.SHOWLUAERROR = true end
+table.insert(_TBASIC._FNCTION, "LUATRACEON")
+_TBASIC.LUAFN.LUATRACEON = {_fnenableluatrace, 0}