diff --git a/client/src/redux/prop-types.ts b/client/src/redux/prop-types.ts index be8441b2f37..5855d66483e 100644 --- a/client/src/redux/prop-types.ts +++ b/client/src/redux/prop-types.ts @@ -111,6 +111,7 @@ export interface SceneCommand { export type Characters = | 'Alice' + | 'Amy' | 'Anna' | 'Bob' | 'Brian' @@ -120,6 +121,7 @@ export type Characters = | 'Linda' | 'Lisa' | 'Maria' + | 'Mark' | 'Sarah' | 'Sophie' | 'Tom'; diff --git a/client/src/templates/Challenges/components/scene/scene-assets.tsx b/client/src/templates/Challenges/components/scene/scene-assets.tsx index 3ce3472e6c9..bde9f6bee4a 100644 --- a/client/src/templates/Challenges/components/scene/scene-assets.tsx +++ b/client/src/templates/Challenges/components/scene/scene-assets.tsx @@ -20,17 +20,28 @@ const maria = `${characters}/maria`; const sarah = `${characters}/sarah`; const sophie = `${characters}/sophie`; const tom = `${characters}/tom`; +const mark = `${characters}/npc`; +const amy = `${characters}/npc`; export const characterAssets = { Alice: { base: `${alice}/base.png`, - brows: `${alice}/brows-normal.png`, + brows: `${alice}/brows-neutral.png`, eyesClosed: `${alice}/eyes-closed.png`, eyesOpen: `${alice}/eyes-open.png`, glasses: null, mouthClosed: `${alice}/mouth-smile.png`, mouthOpen: `${alice}/mouth-laugh.png` }, + Amy: { + base: `${amy}/girl.png`, + brows: `${amy}/girl.png`, + eyesClosed: `${amy}/girl.png`, + eyesOpen: `${amy}/girl.png`, + glasses: null, + mouthClosed: `${amy}/girl.png`, + mouthOpen: `${amy}/girl.png` + }, Anna: { base: `${anna}/base.png`, brows: `${anna}/brows-normal.png`, @@ -42,7 +53,7 @@ export const characterAssets = { }, Bob: { base: `${bob}/base.png`, - brows: `${bob}/brows-normal.png`, + brows: `${bob}/brows-neutral.png`, eyesClosed: `${bob}/eyes-closed.png`, eyesOpen: `${bob}/eyes-open.png`, glasses: null, @@ -60,7 +71,7 @@ export const characterAssets = { }, David: { base: `${david}/base.png`, - brows: `${david}/brows-normal.png`, + brows: `${david}/brows-neutral.png`, eyesClosed: `${david}/eyes-closed.png`, eyesOpen: `${david}/eyes-open.png`, glasses: null, @@ -78,7 +89,7 @@ export const characterAssets = { }, James: { base: `${james}/base.png`, - brows: `${james}/brows-normal.png`, + brows: `${james}/brows-neutral.png`, eyesClosed: `${james}/eyes-closed.png`, eyesOpen: `${james}/eyes-open.png`, glasses: `${james}/glasses.png`, @@ -87,7 +98,7 @@ export const characterAssets = { }, Linda: { base: `${linda}/base.png`, - brows: `${linda}/brows-normal.png`, + brows: `${linda}/brows-neutral.png`, eyesClosed: `${linda}/eyes-closed.png`, eyesOpen: `${linda}/eyes-open.png`, glasses: null, @@ -96,7 +107,7 @@ export const characterAssets = { }, Lisa: { base: `${lisa}/base.png`, - brows: `${lisa}/brows-normal.png`, + brows: `${lisa}/brows-neutral.png`, eyesClosed: `${lisa}/eyes-closed.png`, eyesOpen: `${lisa}/eyes-open.png`, glasses: null, @@ -112,6 +123,15 @@ export const characterAssets = { mouthClosed: `${maria}/mouth-smile.png`, mouthOpen: `${maria}/mouth-laugh.png` }, + Mark: { + base: `${mark}/boy.png`, + brows: `${mark}/boy.png`, + eyesClosed: `${mark}/boy.png`, + eyesOpen: `${mark}/boy.png`, + glasses: null, + mouthClosed: `${mark}/boy.png`, + mouthOpen: `${mark}/boy.png` + }, Sarah: { base: `${sarah}/base.png`, brows: `${sarah}/brows-normal.png`, diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-greetings-in-your-first-day-at-the-office/656cdab71161371dd6b0a401.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-greetings-in-your-first-day-at-the-office/656cdab71161371dd6b0a401.md index b971e955220..2ef8cb94175 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-greetings-in-your-first-day-at-the-office/656cdab71161371dd6b0a401.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-greetings-in-your-first-day-at-the-office/656cdab71161371dd6b0a401.md @@ -63,8 +63,8 @@ Which of the following sentences is correct? "audio": { "filename": "1.1-4.mp3", "startTime": 1, - "startTimestamp": 12.15, - "finishTimestamp": 16.02 + "startTimestamp": 9.1, + "finishTimestamp": 11.76 } }, "commands": [ @@ -76,16 +76,16 @@ Which of the following sentences is correct? { "character": "Sophie", "startTime": 1, - "finishTime": 4.55, + "finishTime": 3.66, "dialogue": { - "text": "Brian, this is Tom. He's our new graphic designer and he is from Texas.", + "text": "Tom, this is Brian. He's a web developer.", "align": "center" } }, { "character": "Sophie", "opacity": 0, - "startTime": 5.05 + "startTime": 4.16 } ] } diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/651dd5a46ffb500e3f2ce47b.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/651dd5a46ffb500e3f2ce47b.md index efa82311512..a9d3d76c2b2 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/651dd5a46ffb500e3f2ce47b.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/651dd5a46ffb500e3f2ce47b.md @@ -2,7 +2,6 @@ id: 651dd5a46ffb500e3f2ce47b title: "Dialogue 1: A Mobile Developer Joins the Team" challengeType: 21 -videoId: nLDychdBwUg dashedName: dialogue-a-mobile-developer-joins-the-team --- @@ -13,3 +12,131 @@ Watch the video above to understand the context of the upcoming lessons. # --assignment-- Watch the video + +# --scene-- + +```json +{ + "setup": { + "background": "company2-boardroom.png", + "characters": [ + { + "character": "Alice", + "position": { "x": -25, "y": 0, "z": 1 } + }, + { + "character": "Bob", + "position": { "x": 125, "y": 0, "z": 1 } + } + ], + "audio": { + "filename": "1.2-1.mp3", + "startTime": 1 + }, + "alwaysShowDialogue": true + }, + "commands": [ + { + "character": "Alice", + "position": { "x": 25, "y": 0, "z": 1 }, + "startTime": 0 + }, + { + "character": "Bob", + "position": { "x": 70, "y": 0, "z": 1 }, + "startTime": 0.5 + }, + { + "character": "Alice", + "startTime": 1.3, + "finishTime": 5.2, + "dialogue": { + "text": "Hi, everyone! My name is Alice, and I'm happy to be part of the team.", + "align": "left" + } + }, + { + "character": "Alice", + "startTime": 5.4, + "finishTime": 7.4, + "dialogue": { + "text": "I'm a programmer and I love creating software", + "align": "left" + } + }, + { + "character": "Alice", + "startTime": 7.4, + "finishTime": 9.9, + "dialogue": { + "text": "that helps people in their daily activities.", + "align": "left" + } + }, + { + "character": "Alice", + "startTime": 10.1, + "finishTime": 14.1, + "dialogue": { + "text": "In my previous job, I developed mobile apps for small businesses.", + "align": "left" + } + }, + { + "character": "Alice", + "startTime": 14.3, + "finishTime": 16.3, + "dialogue": { + "text": "I really want to collaborate with you", + "align": "left" + } + }, + { + "character": "Alice", + "startTime": 16.3, + "finishTime": 18.3, + "dialogue": { + "text": "and to contribute to our projects here at the company.", + "align": "left" + } + }, + { + "character": "Bob", + "startTime": 18.5, + "finishTime": 20.5, + "dialogue": { + "text": "It's nice to have you here, Alice.", + "align": "right" + } + }, + { + "character": "Bob", + "startTime": 20.6, + "finishTime": 23.3, + "dialogue": { + "text": "I'm Bob, the project manager. Welcome aboard.", + "align": "right" + } + }, + { + "character": "Bob", + "startTime": 23.8, + "finishTime": 26.8, + "dialogue": { + "text": "I'm sure your experience will be of great help to us.", + "align": "right" + } + }, + { + "character": "Bob", + "position": { "x": 125, "y": 0, "z": 1 }, + "startTime": 26.8 + }, + { + "character": "Alice", + "position": { "x": -25, "y": 0, "z": 1 }, + "startTime": 27.3 + } + ] +} +``` diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657b2296130e541911943345.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657b2296130e541911943345.md index 2cb704c3040..3a058e22a13 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657b2296130e541911943345.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657b2296130e541911943345.md @@ -3,7 +3,6 @@ id: 657b2296130e541911943345 title: Task 1 challengeType: 22 dashedName: task-1 -audioPath: curriculum/js-music-player/We-Are-Going-to-Make-it.mp3 --- + # --description-- Listen to the audio and answer the question. @@ -52,3 +52,56 @@ In this context, `me` does not refer to the listener, and `you` does not refer t ## --video-solution-- 1 + +# --scene-- + +```json +{ + "setup": { + "background": "company2-boardroom.png", + "characters": [ + { + "character": "Bob", + "position": {"x":50,"y":15,"z":1.2}, + "opacity": 0 + } + ], + "audio": { + "filename": "1.2-2.mp3", + "startTime": 1, + "startTimestamp": 0.00, + "finishTimestamp": 6.18 + } + }, + "commands": [ + { + "character": "Bob", + "opacity": 1, + "startTime": 0 + }, + { + "character": "Bob", + "startTime": 1, + "finishTime": 4.64, + "dialogue": { + "text": "All right team this is Alice's first day with us", + "align": "center" + } + }, + { + "character": "Bob", + "startTime": 4.64, + "finishTime": 7.18, + "dialogue": { + "text": "so please let me introduce you all to her.", + "align": "center" + } + }, + { + "character": "Bob", + "opacity": 0, + "startTime": 7.68 + } + ] +} +``` diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ca45e1fc9398243722c8c.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ca45e1fc9398243722c8c.md index c62a478c763..3a097c50ea2 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ca45e1fc9398243722c8c.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ca45e1fc9398243722c8c.md @@ -3,7 +3,6 @@ id: 657ca45e1fc9398243722c8c title: Task 28 challengeType: 19 dashedName: task-28 -audioPath: curriculum/js-music-player/We-Are-Going-to-Make-it.mp3 --- # --description-- @@ -45,3 +45,47 @@ This part of the phrase indicates the person to whom you should approach or cons ### --feedback-- Refers to the person who is an expert or the best in a particular field. + +# --scene-- + +```json +{ + "setup": { + "background": "company2-boardroom.png", + "characters": [ + { + "character": "Tom", + "position": { "x": 50, "y": 15, "z": 1.2 }, + "opacity": 0 + } + ], + "audio": { + "filename": "1.2-3.mp3", + "startTime": 1, + "startTimestamp": 29.12, + "finishTimestamp": 35.54 + } + }, + "commands": [ + { + "character": "Tom", + "opacity": 1, + "startTime": 0 + }, + { + "character": "Bob", + "startTime": 1, + "finishTime": 7.4, + "dialogue": { + "text": "Is there any specific area of design or development that you're interested in? He's your go-to guy for that.", + "align": "center" + } + }, + { + "character": "Tom", + "opacity": 0, + "startTime": 7.9 + } + ] +} +``` diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce469dc28f40f4b7ac75d.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce469dc28f40f4b7ac75d.md index 82346cc1153..9b8e1f2e810 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce469dc28f40f4b7ac75d.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce469dc28f40f4b7ac75d.md @@ -47,4 +47,4 @@ This question is about one person, so it should use `Is there` instead of `Are t ## --video-solution-- -4 +1 diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce691d6c57c107e650c5e.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce691d6c57c107e650c5e.md index 5bbc16182e8..9496097217f 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce691d6c57c107e650c5e.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce691d6c57c107e650c5e.md @@ -3,11 +3,11 @@ id: 657ce691d6c57c107e650c5e title: Task 61 challengeType: 19 dashedName: task-61 -audioPath: curriculum/js-music-player/We-Are-Going-to-Make-it.mp3 --- + # --description-- @@ -51,3 +51,65 @@ The conversation focuses on introducing Tom and his area of expertise, not depar ## --video-solution-- 2 + +# --scene-- + +```json +{ + "setup": { + "background": "company2-boardroom.png", + "characters": [ + { + "character": "Tom", + "position": { "x": 50, "y": 15, "z": 1.2 }, + "opacity": 0 + } + ], + "audio": { + "filename": "1.2-3.mp3", + "startTime": 1, + "startTimestamp": 26.14, + "finishTimestamp": 35.54 + } + }, + "commands": [ + { + "character": "Tom", + "opacity": 1, + "startTime": 0 + }, + { + "character": "Bob", + "startTime": 1, + "finishTime": 3.48, + "dialogue": { + "text": "This is Tom, our new graphic designer.", + "align": "center" + } + }, + { + "character": "Bob", + "startTime": 3.48, + "finishTime": 7.8, + "dialogue": { + "text": "Is there any specific area of design or development that you're interested in?", + "align": "center" + } + }, + { + "character": "Bob", + "startTime": 7.8, + "finishTime": 9.58, + "dialogue": { + "text": "He's your go-to guy for that.", + "align": "center" + } + }, + { + "character": "Tom", + "opacity": 0, + "startTime": 10.18 + } + ] +} +``` diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce738f6c4eb10e81fd937.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce738f6c4eb10e81fd937.md index 7bcfb320702..697d6ccc9ee 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce738f6c4eb10e81fd937.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657ce738f6c4eb10e81fd937.md @@ -3,8 +3,8 @@ id: 657ce738f6c4eb10e81fd937 title: Task 62 challengeType: 19 dashedName: task-62 -audioPath: curriculum/js-music-player/We-Are-Going-to-Make-it.mp3 --- + # --description-- @@ -43,3 +42,47 @@ Means many or a large amount, used to describe the quantity of something. ### --feedback-- Refers to discussing or speaking about something. + +# --scene-- + +```json +{ + "setup": { + "background": "interview-room3.png", + "characters": [ + { + "character": "James", + "position": { "x": 50, "y": 15, "z": 1.2 }, + "opacity": 0 + } + ], + "audio": { + "filename": "1.2-4.mp3", + "startTime": 1, + "startTimestamp": 16.14, + "finishTimestamp": 18.62 + } + }, + "commands": [ + { + "character": "James", + "opacity": 1, + "startTime": 0 + }, + { + "character": "James", + "startTime": 1, + "finishTime": 3.48, + "dialogue": { + "text": "Thank you, Sophie. We have a lot to talk about today", + "align": "center" + } + }, + { + "character": "James", + "opacity": 0, + "startTime": 3.98 + } + ] +} +``` diff --git a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657e421f8d8e9871a83cda7f.md b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657e421f8d8e9871a83cda7f.md index eb9976ebaf8..a8f2d2758ee 100644 --- a/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657e421f8d8e9871a83cda7f.md +++ b/curriculum/challenges/english/21-a2-english-for-developers/learn-introductions-in-an-online-team-meeting/657e421f8d8e9871a83cda7f.md @@ -3,8 +3,8 @@ id: 657e421f8d8e9871a83cda7f title: Task 82 challengeType: 22 dashedName: task-82 -audioPath: curriculum/js-music-player/We-Are-Going-to-Make-it.mp3 --- +