Up-in-the-Air – commitdiff

Clone
You can use Git to clone the repository via the web URL. Download snapshot (zip)
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 53cac66)
Update specific unlockable feather with more detailed texture
authorJulian Fietkau <git@fietkau.software>
Mon, 14 Oct 2024 04:26:00 +0000 (06:26 +0200)
committerJulian Fietkau <git@fietkau.software>
Mon, 14 Oct 2024 04:26:00 +0000 (06:26 +0200)
main.js patch | blob | history
textures/feather-ghost.png patch | blob | history

diff --git a/main.js b/main.js
index 3070eb0fdba04c79cc4d78c6af38c2c619aeb467..09a18667494aac6a3e9e0645080a25600c9fc754 100644 (file)
--- a/main.js
+++ b/main.js
@@ -175,7 +175,7 @@ game['fn'].loadAllAssets = (renderProgressCallback) => {
       if(unlockable == 'golden') {
         todoList['textures/feather-golden.png'] = 1027;
       } else if(unlockable == 'ghost') {
       if(unlockable == 'golden') {
         todoList['textures/feather-golden.png'] = 1027;
       } else if(unlockable == 'ghost') {
-        todoList['textures/feather-ghost.png'] = 1023;
+        todoList['textures/feather-ghost.png'] = 8810;
       } else {
         let unlock = game['fn'].unlockWithKey('NIbp2kW5' + unlockable + 'e2ZDFl5Y');
         if(unlock && unlock['type'] == 'feather') {
       } else {
         let unlock = game['fn'].unlockWithKey('NIbp2kW5' + unlockable + 'e2ZDFl5Y');
         if(unlock && unlock['type'] == 'feather') {
@@ -1410,9 +1410,6 @@ game['fn'].createFeather = () => {
     options.roughness = 0.5;
     options.metalness = 0.4;
   }
     options.roughness = 0.5;
     options.metalness = 0.4;
   }
-  if(game.settings['feather'] == 'ghost') {
-    options.opacity = 0.7;
-  }
   game.view.materials.feather = new THREE.MeshStandardMaterial(options);
   game.objects.feather = new THREE.Mesh(featherGeometry, game.view.materials.feather);
   game.objects.feather.rotation.order = 'ZXY';
   game.view.materials.feather = new THREE.MeshStandardMaterial(options);
   game.objects.feather = new THREE.Mesh(featherGeometry, game.view.materials.feather);
   game.objects.feather.rotation.order = 'ZXY';
diff --git a/textures/feather-ghost.png b/textures/feather-ghost.png
index 406abe76e83f208102e676f2e3709cdc1e3ba3e5..cda7c6fb4b1d889634923c88579882b9a0904f5e 100644 (file)
Binary files a/textures/feather-ghost.png and b/textures/feather-ghost.png differ