From c8bfdff2bd84c8f9d2d093424130321b7f2e884e Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Wed, 24 Aug 2022 20:15:55 -0400
Subject: [PATCH] Removed formatting changes
---
src/art/webgl/art.js | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js
index b69d17a433e..d84de114fb5 100644
--- a/src/art/webgl/art.js
+++ b/src/art/webgl/art.js
@@ -1838,14 +1838,16 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
if (Math.random() < (slave.trust + 100) / 200) {
// trusting slave - happy animations
faceAnimList.push("expressionsHappy", "expressionsHappyCheerful", "expressionsHappyDelighted", "expressionsHappyFriendly", "expressionsHappySweet");
- } else {
+ }
+ else {
// fearful slave - fear/sad animations
faceAnimList.push("expressionsFear", "expressionsFearAlarm", "expressionsFearAnticipation", "expressionsFearFrightened", "expressionsSadConfused", "expressionsSadOffended", "expressionsSadDejected", "expressionsSadIll");
}
if (Math.random() < (slave.devotion + 100) / 200) {
// devoted slave - seductive animations
faceAnimList.push("expressionsSeductiveDesire", "expressionsSeductiveLoving");
- } else {
+ }
+ else {
// hateful slave - angry animations
faceAnimList.push("expressionsAngerFierce", "expressionsAngerGrumpy", "expressionsAngerSnarl");
}
@@ -1868,7 +1870,8 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
if (App.Art.artSize === 1) {
animLength[i] = (Math.random() * 0.5) + 0.5;
animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS;
- } else {
+ }
+ else {
animLength[i] = (Math.random() * 4) + 2;
animDelay[i] = (Math.floor(Math.random() * 25) + 5) * V.animFPS;
}
@@ -2041,13 +2044,16 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
if (currentAnim[i] === "headBendLeft" || currentAnim[i] === "headTwistLeft") {
if (eyeMoveReciprocal) {
morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]);
- } else {
+ }
+ else {
morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]);
}
- } else {
+ }
+ else {
if (eyeMoveReciprocal) {
morphs.push(["eyesLookLeft", getAnimState(animPower[i] * 0.75)]);
- } else {
+ }
+ else {
morphs.push(["eyesLookRight", getAnimState(animPower[i] * 0.75)]);
}
}
@@ -2058,7 +2064,8 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
morphs.push(["headBendBackwards", getAnimState(animPower[i] * 0.15)]);
if (eyeMoveReciprocal) {
morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]);
- } else {
+ }
+ else {
morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]);
}
break;
@@ -2066,7 +2073,8 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
morphs.push(["headBendForward", getAnimState(animPower[i] * 0.25)]);
if (eyeMoveReciprocal) {
morphs.push(["eyesLookUp", getAnimState(animPower[i] * 0.5)]);
- } else {
+ }
+ else {
morphs.push(["eyesLookDown", getAnimState(animPower[i] * 0.5)]);
}
break;
@@ -2083,7 +2091,8 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
case 0: // pose
if (App.Art.artSize === 1) {
animDelay[i] = (Math.floor(Math.random() * 4) + 1) * V.animFPS;
- } else {
+ }
+ else {
animDelay[i] = (Math.floor(Math.random() * 10) + 10) * V.animFPS;
}
break;
@@ -2103,9 +2112,11 @@ App.Art.getAnimState = function(slave, scene, p, morphs, isAnimTick) {
}
animFrame[i]++;
}
- } else if (animState[i] === -1.0 && animFrame[i] > 0) { // end of anim track
+ }
+ else if (animState[i] === -1.0 && animFrame[i] > 0) { // end of anim track
currentAnim[i] = "";
- } else {
+ }
+ else {
animFrame[i]++;
}
}
--
GitLab