From b6ff49fb8f52ec65e30c678fb65796e8b4ee9229 Mon Sep 17 00:00:00 2001 From: Cort Date: Thu, 24 Aug 2023 09:56:59 +0800 Subject: [PATCH] Added 2 more conditions challenges --- public/js/worlds/extra/challenges_basic.js | 6 + .../challenges_basic/conditions-8b.json | 97 +++++++++++++ .../challenges_basic/conditions-9b.json | 133 ++++++++++++++++++ 3 files changed, 236 insertions(+) create mode 100644 public/worlds/challenges_basic/conditions-8b.json create mode 100644 public/worlds/challenges_basic/conditions-9b.json diff --git a/public/js/worlds/extra/challenges_basic.js b/public/js/worlds/extra/challenges_basic.js index 8e41ff5..27a0275 100644 --- a/public/js/worlds/extra/challenges_basic.js +++ b/public/js/worlds/extra/challenges_basic.js @@ -64,7 +64,9 @@ var challenges_basic = new function() { ['Condition: Color 6', 'worlds/challenges_basic/conditions-6.json?v=4f834e54'], ['Condition: Color 7', 'worlds/challenges_basic/conditions-7.json?v=86502bb0'], ['Condition: Color 8', 'worlds/challenges_basic/conditions-8.json?v=8ad2c418'], + ['Condition: Color 8b', 'worlds/challenges_basic/conditions-8b.json?v=4aad9762'], ['Condition: Color 9', 'worlds/challenges_basic/conditions-9.json?v=3702a992'], + ['Condition: Color 9b', 'worlds/challenges_basic/conditions-9b.json?v=ac0bedb2'], ['Condition: Color 10', 'worlds/challenges_basic/conditions-10.json?v=87b48a99'], ['Condition: Color 11', 'worlds/challenges_basic/conditions-11.json?v=85e3052e'], ['Condition: Color 12', 'worlds/challenges_basic/conditions-12.json?v=6d42f222'], @@ -783,8 +785,12 @@ var challenges_basic = new function() { self.renderIntersectOne(delta, 'worldBaseObject_box0', 'CHOCOLATE'); } else if (self.options.jsonFile.includes('conditions-8.json')) { self.renderIntersectOne(delta, 'worldBaseObject_box0', 'BANANA'); + } else if (self.options.jsonFile.includes('conditions-8b.json')) { + self.renderIntersectOne(delta, 'worldBaseObject_box0', 'SALTED CARAMEL'); } else if (self.options.jsonFile.includes('conditions-9.json')) { self.renderIntersectOne(delta, 'worldBaseObject_box0', 'AVOCADO'); + } else if (self.options.jsonFile.includes('conditions-9b.json')) { + self.renderIntersectOne(delta, 'worldBaseObject_box0', 'BLUEBERRY'); } else if (self.options.jsonFile.includes('conditions-10.json')) { self.renderIntersectOne(delta, 'worldBaseObject_box0', 'VANILLA'); } else if (self.options.jsonFile.includes('conditions-11.json')) { diff --git a/public/worlds/challenges_basic/conditions-8b.json b/public/worlds/challenges_basic/conditions-8b.json new file mode 100644 index 0000000..4f574d5 --- /dev/null +++ b/public/worlds/challenges_basic/conditions-8b.json @@ -0,0 +1,97 @@ +{ + "worldName": "custom", + "options": { + "imageURL": "https://files.aposteriori.com.sg/get/6f9tFT9tXt.png", + "groundType": "box", + "length": 100, + "width": 100, + "uScale": 1, + "vScale": 1, + "imageScale": 2, + "timer": "none", + "timerDuration": 60, + "timerEnd": "continue", + "wall": true, + "wallHeight": 7.7, + "wallThickness": 4.5, + "wallColor": "#1A1A1A", + "groundFriction": 1, + "wallFriction": 0.1, + "groundRestitution": 0, + "wallRestitution": 0.1, + "restartAnimationOnRun": false, + "objects": [ + { + "type": "box", + "position": "randchoiceA([-25,50,12.5],[0,75,12.5],[25,50,12.5],[0,25,12.5])", + "rotationMode": "degrees", + "rotation": [ + 0, + 0, + 0 + ], + "animationMode": "none", + "animationKeys": [], + "size": [ + 25, + 25, + 25 + ], + "modelURL": "", + "modelScale": 10, + "modelAnimation": "None", + "color": "#00ff007c", + "imageType": "repeat", + "imageURL": "", + "uScale": 1, + "vScale": 1, + "physicsOptions": "false", + "magnetic": false, + "laserDetection": null, + "ultrasonicDetection": null, + "receiveShadows": false, + "castShadows": false, + "isPickable": true + }, + { + "type": "box", + "position": "randchoiceA([0,50,0.05],[0,50,0.05],[0,50,0.05],[0,25,0.05])", + "rotationMode": "degrees", + "rotation": [ + 0, + 0, + 0 + ], + "animationMode": "none", + "animationKeys": [], + "size": [ + 25, + 25, + 0.1 + ], + "modelURL": "", + "modelScale": 10, + "modelAnimation": "None", + "color": "randchoiceA(#f00,#ff0,#0f0,#00f)", + "imageType": "repeat", + "imageURL": "", + "uScale": 1, + "vScale": 1, + "physicsOptions": "false", + "magnetic": false, + "laserDetection": null, + "ultrasonicDetection": null, + "receiveShadows": false, + "castShadows": false, + "isPickable": true + } + ], + "startPos": "center", + "startPosXYZStr": "", + "startRotStr": "", + "startPosXYZ": null, + "startRot": null, + "arenaStartPosXYZ": null, + "arenaStartRot": null + } +} diff --git a/public/worlds/challenges_basic/conditions-9b.json b/public/worlds/challenges_basic/conditions-9b.json new file mode 100644 index 0000000..20cc710 --- /dev/null +++ b/public/worlds/challenges_basic/conditions-9b.json @@ -0,0 +1,133 @@ +{ + "worldName": "custom", + "options": { + "imageURL": "https://files.aposteriori.com.sg/get/6f9tFT9tXt.png", + "groundType": "box", + "length": 100, + "width": 100, + "uScale": 1, + "vScale": 1, + "imageScale": 2, + "timer": "none", + "timerDuration": 60, + "timerEnd": "continue", + "wall": true, + "wallHeight": 7.7, + "wallThickness": 4.5, + "wallColor": "#1A1A1A", + "groundFriction": 1, + "wallFriction": 0.1, + "groundRestitution": 0, + "wallRestitution": 0.1, + "restartAnimationOnRun": false, + "objects": [ + { + "type": "box", + "position": "randchoiceA([-75,0,12.5],[0,50,12.5],[25,0,12.5],[-50,0,12.5],[0,25,12.5],[75,0,12.5])", + "rotationMode": "degrees", + "rotation": [ + 0, + 0, + 0 + ], + "animationMode": "none", + "animationKeys": [], + "size": [ + 25, + 25, + 25 + ], + "modelURL": "", + "modelScale": 10, + "modelAnimation": "None", + "color": "#00ff007c", + "imageType": "repeat", + "imageURL": "", + "uScale": 1, + "vScale": 1, + "physicsOptions": "false", + "magnetic": false, + "laserDetection": null, + "ultrasonicDetection": null, + "receiveShadows": false, + "castShadows": false, + "isPickable": true + }, + { + "type": "box", + "position": [ + 0, + 0, + 0.05 + ], + "rotationMode": "degrees", + "rotation": [ + 0, + 0, + 0 + ], + "animationMode": "none", + "animationKeys": [], + "size": [ + 25, + 25, + 0.1 + ], + "modelURL": "", + "modelScale": 10, + "modelAnimation": "None", + "color": "randchoiceA(#f00,#ff0,#0f0,#f00,#ff0,#0f0)", + "imageType": "repeat", + "imageURL": "", + "uScale": 1, + "vScale": 1, + "physicsOptions": "false", + "magnetic": false, + "laserDetection": null, + "ultrasonicDetection": null, + "receiveShadows": false, + "castShadows": false, + "isPickable": true + }, + { + "type": "box", + "position": "randchoiceA([-75,0,0.05],[0,50,0.05],[25,0,0.05],[-50,0,0.05],[0,25,0.05],[75,0,0.05])", + "rotationMode": "degrees", + "rotation": [ + 0, + 0, + 0 + ], + "animationMode": "none", + "animationKeys": [], + "size": [ + 25, + 25, + 0.1 + ], + "modelURL": "", + "modelScale": 10, + "modelAnimation": "None", + "color": "#00f", + "imageType": "repeat", + "imageURL": "", + "uScale": 1, + "vScale": 1, + "physicsOptions": "false", + "magnetic": false, + "laserDetection": null, + "ultrasonicDetection": null, + "receiveShadows": false, + "castShadows": false, + "isPickable": true + } + ], + "startPos": "center", + "startPosXYZStr": "", + "startRotStr": "", + "startPosXYZ": null, + "startRot": null, + "arenaStartPosXYZ": null, + "arenaStartRot": null + } +}