swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-03 03:15:55 -04:00
Code Issues Projects Releases Wiki Activity

Fixed issue with bartender doing the wrong animations based on the direction they are facing after moving.

Browse Source
This commit is contained in:
Cekis
2016-03-04 06:32:23 +01:00
parent f12e2d1206
commit d49af87dac
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/npc/bartender/base.java
+6 -6
View File
@@ -234,9 +234,12 @@ public class base extends script.base_script
if (rand(0, 10) < 4)
{
bartenderMove(self);
playBarAnimation(self);
}
else {
playBarAnimation(self);
}
}
playBarAnimation(self);
messageTo(self, "handleTick", null, rand(15f, 30f), false);
return SCRIPT_CONTINUE;
}
@@ -273,9 +276,7 @@ public class base extends script.base_script
if (hasObjVar(self, VAR_LOC_BASE + "." + locationName + ".heading"))
{
float yaw = getFloatObjVar(self, VAR_LOC_BASE + "." + locationName + ".heading");
location here = getLocation(self);
boolean faceBar = true;
location faceLoc = null;
switch (rand(1, 2))
{
case 1:
@@ -289,6 +290,7 @@ public class base extends script.base_script
faceBar = false;
break;
}
setObjVar(self,"facingBar",faceBar);
playBarAnimation(self);
}
removeLocationTarget(locationName);
@@ -303,7 +305,7 @@ public class base extends script.base_script
return;
}
String anim = "check_wrist_device";
if (getYaw(self) == getFloatObjVar(self, "heading"))
if (getBooleanObjVar(self,"facingBar"))
{
int tidx = rand(0, ANIMS_TOWARD.length - 1);
anim = ANIMS_TOWARD[tidx];
@@ -394,8 +396,6 @@ public class base extends script.base_script
}
if (there != null)
{
// clean up past locations
//cleanDestinations(self);
int now = getGameTime();
float heading = (heading1 + heading2) / 2f;
setObjVar(self, VAR_LOC_BASE + "." + now + ".location", there);