Merge branch 'main' of https://github.com/DimitriTimoz/nuit-info-2024

DimitriTimoz · Dec 6, 2024 · cc3cb2a · cc3cb2a
2 parents 3a1c3fb + f48c61e
commit cc3cb2a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 2 deletions.
diff --git a/assets/kelp2.webp b/assets/kelp2.webp
diff --git a/assets/kelp3.png b/assets/kelp3.png
diff --git a/assets/kelp3.webp b/assets/kelp3.webp
diff --git a/assets/kelp4.png b/assets/kelp4.png
diff --git a/assets/kelp4.webp b/assets/kelp4.webp
diff --git a/assets/kelp5.png b/assets/kelp5.png
diff --git a/ground.js b/ground.js
@@ -3,6 +3,9 @@ let groundStuff = [];
 export async function initKelp(screen) {
     const kelpTexture = await PIXI.Assets.load('./assets/kelp.png');
     const kelpTexture2 = await PIXI.Assets.load('./assets/kelp2.png');
+    const kelpTexture3 = await PIXI.Assets.load('./assets/kelp3.png');
+    const kelpTexture4 = await PIXI.Assets.load('./assets/kelp4.png');
+    const kelpTexture5 = await PIXI.Assets.load('./assets/kelp5.png');
     const coralTexture = await PIXI.Assets.load('./assets/corail1.png');
     const coralTexture2 = await PIXI.Assets.load('./assets/corail2.png');
     const treesTexture = await PIXI.Assets.load('./assets/trees.png');
@@ -33,7 +36,23 @@ export async function initKelp(screen) {
         } else if (-20 <= heightmap[i] && heightmap[i] <= -10) {
             randomTexture = Math.random() > 0.5 ? coralTexture : coralTexture2;
         } else {
-            randomTexture = Math.random() > 0.5 ? kelpTexture : kelpTexture2;
+            switch (Math.floor(Math.random() * 5)) {
+                case 0:
+                    randomTexture = kelpTexture;
+                    break;
+                case 1:
+                    randomTexture = kelpTexture2;
+                    break;
+                case 2:
+                    randomTexture = kelpTexture3;
+                    break;
+                case 3:
+                    randomTexture = kelpTexture4;
+                    break;
+                case 4:
+                    randomTexture = kelpTexture5;
+                    break;
+            }
         }
         const stuff = new PIXI.Sprite(randomTexture);
         stuff.width = 40;

diff --git a/world.js b/world.js
@@ -2,7 +2,7 @@ export function drawWorld(screen, heightmap) {
     // Sky gradient
     const skyGradient = new PIXI.Graphics();
     skyGradient.beginFill(0x87CEEB)
-        .drawRect(0, -1000, heightmap.length * 20, 1000)
+        .drawRect(0, -1000, heightmap.length * 20, 2000)
         .endFill();
     screen.addChild(skyGradient);