From 8730324a836869dd2375373f611e031472b0a051 Mon Sep 17 00:00:00 2001
From: logsol
Date: Mon, 3 Mar 2014 02:47:23 +0100
Subject: [PATCH] added rube knife, quickstart in menu lobby, cleaned up the
lobby code a bit
---
app/Game/Client/GameObjects/Doll.js | 3 +-
app/Game/Client/Loader/Level.js | 6 +-
app/Game/Client/Networker.js | 2 +-
static/html/index.html | 213 +------------
static/js/menu.js | 274 ++++++++++++++++
static/objects/rube/knife | 297 ++++++++++++++++++
.../rube/knife-backups/knife-scriptLog.rs | 100 ++++++
static/objects/rube/knife.json | 288 +++++++++++++++++
8 files changed, 968 insertions(+), 215 deletions(-)
create mode 100644 static/js/menu.js
create mode 100644 static/objects/rube/knife
create mode 100644 static/objects/rube/knife-backups/knife-scriptLog.rs
create mode 100644 static/objects/rube/knife.json
diff --git a/app/Game/Client/GameObjects/Doll.js b/app/Game/Client/GameObjects/Doll.js
index 1d02130..cce2bf6 100755
--- a/app/Game/Client/GameObjects/Doll.js
+++ b/app/Game/Client/GameObjects/Doll.js
@@ -65,7 +65,8 @@ function (Parent, Settings, Nc, Exception) {
Settings.GRAPHICS_PATH
+ Settings.GRAPHICS_SUBPATH_CHARACTERS
+ this.characterName
- + "/Animation/WithArms/ChuckAnimations0"
+ + "/Animation/WithoutArms/ChuckAnimationsWithoutArms0"
+ //+ "/Animation/WithoutArms/ChuckAnimations0"
+ padF(i)
+ ".png"
);
diff --git a/app/Game/Client/Loader/Level.js b/app/Game/Client/Loader/Level.js
index 25de1e8..9eb5f8f 100755
--- a/app/Game/Client/Loader/Level.js
+++ b/app/Game/Client/Loader/Level.js
@@ -56,19 +56,21 @@ function (Parent, Settings, Nc, PIXI) {
}
var characterNames = ["Chuck"];
- var animationSets = ["WithArms"]; // FIXME add WithoutArms
+ var animationSets = ["WithoutArms"];//, "WithArms"];
+ var addition = "";
for (var i = 0; i < characterNames.length; i++) {
var characterName = characterNames[i];
for (var j = 1; j <= 126; j++) {
for (var k = 0; k < animationSets.length; k++) {
var animationSet = animationSets[k];
+ addition = animationSet == "WithoutArms" ? "WithoutArms" : "";
paths.push(
Settings.GRAPHICS_PATH
+ Settings.GRAPHICS_SUBPATH_CHARACTERS
+ characterName
+ "/Animation/"
+ animationSet
- + "/ChuckAnimations0"
+ + "/ChuckAnimations" + addition + "0"
+ padF(j)
+ ".png"
);
diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js
index dbf7d8a..3608a5c 100755
--- a/app/Game/Client/Networker.js
+++ b/app/Game/Client/Networker.js
@@ -72,7 +72,7 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) {
}
Networker.prototype.onJoinError = function(options) {
- alert(options.message);
+ // alert(options.message);
window.location.href = "/";
};
diff --git a/static/html/index.html b/static/html/index.html
index 70127b6..06038d3 100644
--- a/static/html/index.html
+++ b/static/html/index.html
@@ -75,219 +75,10 @@
+
-
-
+