From 73095d881908a8c84ae9e7fdd6dd805f467ef5f3 Mon Sep 17 00:00:00 2001
From: Manuel Herrmann <it@icetruck.de>
Date: Sun, 27 Sep 2015 22:57:07 +0200
Subject: [PATCH] castle fixup and pathfinder next try
---
.../view/signups/game1/js/character.js | 14 +++++++-------
.../signups/game1/maps/castle_entrance.svg | Bin 591669 -> 592690 bytes
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/registration-system/view/signups/game1/js/character.js b/registration-system/view/signups/game1/js/character.js
index 12f8d7f..32f3cfe 100644
--- a/registration-system/view/signups/game1/js/character.js
+++ b/registration-system/view/signups/game1/js/character.js
@@ -119,7 +119,7 @@ Char.prototype.physics = function() {
var x = this.translation[0];
var y = this.translation[1];
var self = this;
- if (!this.pathFinder.canWalkOn(x-x%5, y-y%5)) {
+ if (!this.pathFinder.canWalkOn(x, y)) {
var queue = [[x-x%5, y-y%5, null, null]];
function recoverWalkable() {
@@ -165,7 +165,7 @@ Char.prototype.physics = function() {
this.moveTarget.shift();
} else {
var stuckFixer = 0;
- do {
+ //do {
var v = Vec.add(Vec.flipSign(this.translation), this.moveTarget[0]);
var d = Vec.length(v);
@@ -173,19 +173,19 @@ Char.prototype.physics = function() {
var n = Vec.mul(v, 1 / d); // normalized
v = Vec.mul(n, this.maxSpeed + stuckFixer);
}
- stuckFixer += 0.5;
+ /* stuckFixer += 0.5;
if (stuckFixer >= 4.0) {
this.setMoveTarget(this.translation[0], this.translation[1]);
return;
- }
+ }*/
var nextPosition = (d < g_smallValue) ? this.moveTarget[0] : Vec.add(this.translation, v);
- } while (!this.pathFinder.canWalkOn(nextPosition[0], nextPosition[1]));
+ //} while (!this.pathFinder.canWalkOn(nextPosition[0], nextPosition[1]));
- if (stuckFixer >= 3.0)
+ /*if (stuckFixer >= 3.0)
this.setMoveTarget(this.translation[0], this.translation[1]);
- else
+ else*/
Vec.assign(this.translation, nextPosition);
}
diff --git a/registration-system/view/signups/game1/maps/castle_entrance.svg b/registration-system/view/signups/game1/maps/castle_entrance.svg
index 74e53f5af29869c0b26ddce63be61f23aab08dbf..409b8064661271c4c49e9d3016b552fc4d73b311 100644
GIT binary patch
delta 1550
zcmbW1&ubGw6vx?VZ6_@vwiH3IPD2He%{V*1b|w-JB87St!Gj<*^$@LXX~h~32JE3H
zf3-CuSkapY3;qDvgMWh1tBUsQ!AsRj#o~`ivb)))jT9Fi?7r`t@6No>zI}D8|7E%V
z`F+sI6&7g1BZQOb1u(M!oL~Wf3%64gE2=p4so6CPdJbsiVM&-scc98u7`-@|9~wWO
z%@=cNDX}kv?<+Gn3kDn++?fT(ofa*mc{d080Qb!L9N4>GOVYS}sxUe{HkGj^o-$${
zq#Y8Ro(HcTfDX^}mVu2H8?82W*l4rS9`u&sv4QTf@u7U-axqJ=U{u@7KVn{#0XIw6
z;cio0Z0|GgKf*qfS%#;&t`sH<=L#d0`s(e-d2_bSiYGtAL&4%QywR2P6JEtnZSs4v
z0(;D(HP~U^e1ctO=>zC=Y|#?jW7b#TM5)#rgobnJONbIeFrkXMLTc=5%_zzv;z}%;
z<Q!!LW;W}36cbM}hBDz@B2%puE{Qbm)>bK<$ixOE;$|ZE&^+?ws8(eS!g7vkrPe%p
zZ*5Kd7#Cg(sUb8uHe49Dk<DMV#I#a&>oise>#_wJpE}lKd7`p9Jhs1uTr@*p;A6tD
z<WjgoYb>eY8YzZ}WUeJn6txYbm@A@PZa1z7@dNf1zIE<BNM$1`XIA0PMk>_WQjfZV
z6Rag8-oL0=Oi_2@cGP;j1(hwJa70Q?p|DL*SQ99gcf&RqYC?q)uQI7zM}0k!pjN>W
z9XrzN^0u%%41TV{wRYn;shoMX3Ug7fr+>lUo3cUoA6QHxDOG2~XFm3QLZmAg!;EoX
zZI1$vhQophKlS=_FcywS45E^WxmBm5R2#nPr>=BD4a<@X>Mw{q+>IlW*i91}J{9)g
u$ozOn8fiqw|4$kRD;=MX5ZrW9-_2c6PwZ<+ecMp+v^Di(L*i&#YV9u~k&X-i
delta 627
zcmZvYPiqrV6vdgBKXc!-Mo~gB8$;+uO~!dM^Jd<pMn$C?7tK~sB&4C8YPG~!v~CoG
zWM?(R+=3e=APPZ5kwFmgE4Xq~KY_HC6baIeZ;V1TUO1a`&i!%Ud)=9Sdw=@X28nwt
zTW@qpvrCk)OUTmtIYW01ml=-8Y1wG}>sN19D=W2Pb+wdZuI=hJXXD{oDQ5~t_bg9v
zEVsz4Vusiv=ao2fgn>$%OieD<{Ds9pQVi3HoJ^c~<}gb{`}VN5Tv_#({adwp*~CvR
zk`C)_@=TdHb@Ie~wHWxpwOTXNAyP4^xKu(aDW!&)4xF9ED?K%pp1HA7srtcM(a^bN
zdUD*HhEG4hah&U^8Xiy}gX=w2#byI8;@&2daqcS|3!i_1y9dV^oJ9=z^8YfrJCMeY
z_aKG0H%Sr~wqXh{#pncXy#b1Y9jN2`KD13c`d%~dFnN{Wj-3^jZZn7H3)0}GZDk9V
zE<Dci7T0ZIa1q|wh0n?_wlaf-7%dK&FTTURi1{#lJb;1vr|^W*5|#&W;n7k0W6TWS
zDKz*Sc6kys+}nafBjpC3-i7`6AVI&4xQB5gNtdE1g-2AnJrez1cnP%subaX%8twlC
Dk1)wu
--
GitLab