Merge branch 'espruino:master' into sleeplogbuxfix

Author: RKBoss6

apps/f9lander/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Add lightning
 0.03: Convert Yes/No On/Off in settings to checkboxes
 0.04: Minor code improvements
+0.05: Add a random time (Day, Night, Sunset), and a setting to toggle on or off

apps/f9lander/README.md

@@ -31,3 +31,5 @@ Marko Kl. B.
 ![](f9lander_screenshot2.png)
 
 ![](f9lander_screenshot3.png)
+
+![](f9Lander_screenshot4.png)

apps/f9lander/app.js

@@ -47,8 +47,10 @@ var exploded = false;
 var nExplosions = 0;
 //var landed = false;
 var lightning = 0;
+var timeOfDay=0;
 
-var settings = require("Storage").readJSON('f9settings.json', 1) || {};
+var settings = require("Storage").readJSON('f9settings.json', 1) || {
+};
 
 const gravity = 4;
 const dt = 0.1;
@@ -83,6 +85,12 @@ function drawFalcon(x, y, throttle, angle) {
   }
 }
 
+function getRandomInt(min, max) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min)) + min;
+}
+
 function drawLightning() {
   var c = {x:cloudOffs+50, y:30};
   var dx = c.x-booster.x;
@@ -98,15 +106,45 @@ function drawBG() {
     Bangle.buzz(200);
     return;
   }
-  g.setBgColor(0.2, 0.2, 1).clear();
-  g.setColor(0, 0, 1).fillRect(0, g.getHeight()-oceanHeight, g.getWidth()-1, g.getHeight()-1);
-  g.setColor(0.5, 0.5, 1).fillCircle(cloudOffs+34, 30, 15).fillCircle(cloudOffs+60, 35, 20).fillCircle(cloudOffs+75, 20, 10);
-  g.setColor(1, 1, 0).fillCircle(g.getWidth(), 0, 20);
+  
+  
+    
+  if(timeOfDay==0){
+    //day 
+    g.setBgColor(0.2, 0.2, 1).clear();
+    
+    g.setColor(0.5, 0.5, 1).fillCircle(cloudOffs+34, 30, 15).fillCircle(cloudOffs+60, 35, 20).fillCircle(cloudOffs+75, 20, 10);
+    g.setColor(1, 1, 0).fillCircle(g.getWidth(), 0, 20);
+    g.setColor(0, 0, 1).fillRect(0, g.getHeight()-oceanHeight, g.getWidth()-1, g.getHeight()-1);
+
+  }else if(timeOfDay==1){
+    //sunset
+    g.setBgColor(1, 0.5, 0.2).clear();
+    g.setColor(0.5, 0.5, 1).fillCircle(cloudOffs+34, 30, 15).fillCircle(cloudOffs+60, 35, 20).fillCircle(cloudOffs+75, 20, 10);
+      g.setColor(1, 0.3, 0).fillCircle(g.getWidth(), 0, 20);
+    g.setColor(0, 0, 1).fillRect(0, g.getHeight()-oceanHeight, g.getWidth()-1, g.getHeight()-1);
+
+  }else{
+    //night
+    g.setBgColor(0, 0, 0).clear();
+    g.setColor(0.5, 0.5, 1).fillCircle(cloudOffs+34, 30, 15).fillCircle(cloudOffs+60, 35, 20).fillCircle(cloudOffs+75, 20, 10);
+    g.setColor(1, 1, 1).fillCircle(g.getWidth(), 0, 20);
+    g.setColor(0, 0, 0.3).fillRect(0, g.getHeight()-oceanHeight, g.getWidth()-1, g.getHeight()-1);
+
+  }
+
+  
+  
   g.setColor(1, 1, 1).drawImage(droneShip, droneX, g.getHeight()-oceanHeight-1);
 }
 
 function showFuel() {
-  g.setColor(0, 0, 0).setFont("4x6:2").setFontAlign(-1, -1, 0).drawString("Fuel: "+Math.abs(booster.fuel).toFixed(0), 4, 4);
+  if(timeOfDay==2){
+    g.setColor(1, 1, 1)
+  }else{
+    g.setColor(0, 0, 0)
+  }
+ g.setFont("4x6:2").setFontAlign(-1, -1, 0).drawString("Fuel: "+Math.abs(booster.fuel).toFixed(0), 4, 4);
 }
 
 function renderScreen(input) {
@@ -128,7 +166,12 @@ function getInputs() {
 }
 
 function epilogue(str) {
-  g.setFont("Vector", 24).setFontAlign(0, 0, 0).setColor(0, 0, 0).drawString(str, g.getWidth()/2, g.getHeight()/2).flip();
+  if(timeOfDay==2){
+    g.setColor(1, 1, 1)
+  }else{
+    g.setColor(0, 0, 0)
+  }
+  g.setFont("Vector", 24).setFontAlign(0, 0, 0).drawString(str, g.getWidth()/2, g.getHeight()/2).flip();
   g.setFont("Vector", 16).drawString("<= again      exit =>", g.getWidth()/2, g.getHeight()/2+20);
   clearInterval(stepInterval);
   Bangle.on("swipe", (d) => { if (d>0) load(); else load('f9lander.app.js'); });
@@ -168,10 +211,19 @@ function gameStep() {
   }
 }
 
+if(settings.timeChange){
+  timeOfDay=getRandomInt(0,3)
+}
+
 var stepInterval;
 Bangle.setLCDTimeout(0);
 renderScreen({angle:0, throttle:0});
-g.setFont("Vector", 24).setFontAlign(0, 0, 0).setColor(0, 0, 0).drawString("Swipe to start", g.getWidth()/2, g.getHeight()/2);
+if(timeOfDay==2){
+  g.setColor(1, 1, 1)
+}else{
+  g.setColor(0, 0, 0)
+}
+g.setFont("Vector", 24).setFontAlign(0, 0, 0).drawString("Swipe to start", g.getWidth()/2, g.getHeight()/2);
 Bangle.on("swipe", () => {
   stepInterval = setInterval(gameStep, Math.floor(1000*dt));
   Bangle.removeListener("swipe");

apps/f9lander/f9Lander_screenshot4.png

@@ -1,10 +1,10 @@
 { "id": "f9lander",
   "name": "Falcon9 Lander",
   "shortName":"F9lander",
-  "version": "0.04",
-  "description": "Land a rocket booster",
+  "version": "0.05",
+  "description": "Land a rocket booster by tilting the watch",
   "icon": "f9lander.png",
-  "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" }],
+  "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" },{ "url":"f9Lander_screenshot4.png" }],
   "readme": "README.md",
   "tags": "game",
   "supports" : ["BANGLEJS", "BANGLEJS2"],

apps/f9lander/f9lander_screenshot4.png

@@ -7,6 +7,7 @@
   // initialize with default settings...
   let settings = {
     'lightning': false,
+    'timeChange':false
   }
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
@@ -23,11 +24,15 @@
     }
   }
   const menu = {
-    '': { 'title': 'OpenWind' },
+    '': { 'title': 'F9 Lander' },
     '< Back': back,
     'Lightning': {
       value: !!settings.lightning,
       onchange: save('lightning'),
+    },
+    'Time Change': {
+      value: !!settings.timeChange,
+      onchange: save('timeChange'),
     }
   }
   E.showMenu(menu);

apps/f9lander/metadata.json

@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Added tapfix.boot.js to make double-tap detection work on faster taps

apps/f9lander/settings.js

@@ -2,7 +2,7 @@
   "id": "webaisummit",
   "name": "WebAI Summit app",
   "shortName": "WebAI",
-  "version": "0.01",
+  "version": "0.02",
   "description": "App/config preinstalled onto watches for the Web AI Summit 2025",
   "icon": "app.png",
   "type": "clock",
@@ -18,6 +18,7 @@
     {"name":"webaisummit.wid.js","url":"widget.js"},
     {"name":"webaisummit.img","url":"app-icon.js","evaluate":true},
     {"name":"webaisummit.app.js","url":"app.js"},
-    {"name":"welcome.app.js","url":"welcome.js"}
+    {"name":"welcome.app.js","url":"welcome.js"},
+    {"name":"tapfix.boot.js","url":"tapfix.js"}
   ]
 }