diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53cb036c21632659e461ceec1c54a0a36778dda8..8064061a64772bfa2221f3e5c00909bf9d73e7b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: # precompiled / assets # the URLs are the same as inside the game, change both if updating WEBGL_NAME: "WebGL art assets" - WEBGL_URL: "https://mega.nz/folder/78BhSATS#fTwcdWVtrxpo11by0bmtDg" + WEBGL_URL: "https://mega.nz/folder/rtAzEYTS#5a5KO_rqq_BB8eqtOuhEow" RENDER_NAME: "Rendered imagepack (outdated)" RENDER_URL: "https://mega.nz/file/upoAlBaZ#EbZ5wCixxZxBhMN_ireJTXt0SIPOywO2JW9XzTIPhe0" diff --git a/src/art/webgl/art.js b/src/art/webgl/art.js index e05c3816598e9f1e949d5d83f3e31c9e6c6409ff..03848de1715364112474febeb920e7d9117e7310 100644 --- a/src/art/webgl/art.js +++ b/src/art/webgl/art.js @@ -716,7 +716,7 @@ App.Art.applyMorphs = function(slave, scene) { if (slave.trust < 0) { morphs.push(["expressionsFear", Math.abs(slave.trust)/100]); - } else if (slave.devotion > 0) { + } else { morphs.push(["expressionsHappy", slave.trust/100]); } diff --git a/src/gui/options/options.js b/src/gui/options/options.js index 625b40f2872da6fafab0910610b7ad8fc9ab1f46..6a7cffa56466401ecea9bf75c8667f54f845626a 100644 --- a/src/gui/options/options.js +++ b/src/gui/options/options.js @@ -1111,7 +1111,7 @@ App.UI.artOptions = function() { options.addOption("Clothing erection bulges are", "showClothingErection") .addValue("Enabled", true).on().addValue("Disabled", false).off(); } else if (V.imageChoice === 4) { - options.addComment(`<a href='https://mega.nz/folder/78BhSATS#fTwcdWVtrxpo11by0bmtDg' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is. + options.addComment(`<a href='https://mega.nz/folder/rtAzEYTS#5a5KO_rqq_BB8eqtOuhEow' target='_blank'> Download the WebGL art assets</a> and place the 'webgl' folder into the resources/ folder where this HTML file is. Then <b>refresh</b> the page. Create the resources folder if it does not exist. <span class="warning">(Android/MacOS not supported)</span>`);