Update lessons up to lesson040

ESova · Apr 25, 2016 · 25f2622 · 25f2622
1 parent 3134300
commit 25f2622
Show file tree

Hide file tree

Showing 46 changed files with 37 additions and 36 deletions.
diff --git a/gitter-cli.log b/gitter-cli.log
@@ -0,0 +1,2 @@
+{"level":"info","message":"Joined room: codingamigos/chat","timestamp":"2016-04-14T18:07:47.357Z"}
+{"level":"info","message":"Joined room: codingamigos/chat","timestamp":"2016-04-14T18:18:38.898Z"}
diff --git a/lesson029/slides.rs.json b/lesson029/slides.rs.json
@@ -8,9 +8,9 @@
     "buildType('fence', x, y)",
     "this.build.fence (x, y)",
     "this.buildXY('fence', x, y)"
-  
+
   ],
-  "answer": [10]
+  "answer": [2]
 },{
   "type": "challenge",
   "time": "0:29",

diff --git a/030/description.en.md → lesson030/description.en.md b/030/description.en.md → lesson030/description.en.md
diff --git a/030/description.rs.md → lesson030/description.rs.md b/030/description.rs.md → lesson030/description.rs.md
diff --git a/030/slides.en.json → lesson030/slides.en.json b/030/slides.en.json → lesson030/slides.en.json
diff --git a/030/slides.rs.json → lesson030/slides.rs.json b/030/slides.rs.json → lesson030/slides.rs.json
@@ -10,11 +10,11 @@
     "x,y",
     "x,z"
   ],
-  "answer": [10]
+  "answer": [2]
 },{
   "type": "challenge",
   "time": "0:43",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/031/description.en.md → lesson031/description.en.md b/031/description.en.md → lesson031/description.en.md
diff --git a/031/description.rs.md → lesson031/description.rs.md b/031/description.rs.md → lesson031/description.rs.md
diff --git a/031/slides.en.json → lesson031/slides.en.json b/031/slides.en.json → lesson031/slides.en.json
diff --git a/031/slides.rs.json → lesson031/slides.rs.json b/031/slides.rs.json → lesson031/slides.rs.json
@@ -6,16 +6,16 @@
   "question": "U kojim primerima će naš heroj reći “Hey”?
 ",
   "options": [
-    "if (2+2===4){ this.say(“Hey”)}",
-    "if (2+3===5){ this.say(“Hey”)}",
-    "if (2+2=4){ this.say(“Hey”)}",
-    "if (2+3=4){ this.say(“Hey”)}"
+    "if (2+2===4){ this.say('Hey')}",
+    "if (2+3===5){ this.say('Hey')}",
+    "if (2+2=4){ this.say('Hey')}",
+    "if (2+3=4){ this.say('Hey')}"
   ],
-  "answer": [9,10]
+  "answer": [0,1]
 },{
   "type": "challenge",
   "time": "3:20",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/032/description.en.md → lesson032/description.en.md b/032/description.en.md → lesson032/description.en.md
diff --git a/032/description.rs.md → lesson032/description.rs.md b/032/description.rs.md → lesson032/description.rs.md
diff --git a/032/slides.en.json → lesson032/slides.en.json b/032/slides.en.json → lesson032/slides.en.json
diff --git a/032/slides.rs.json → lesson032/slides.rs.json b/032/slides.rs.json → lesson032/slides.rs.json
@@ -6,15 +6,15 @@
   "question": "Za koji iskaz će nam program ispisati true?",
   "options": [
     "5 === 5",
-    "“Five” === 5",
-    "“Five” === “Five”",
-    "5 != 5"
+    "'Five' === 5",
+    "'Five' === 'Five'",
+    "5 != 'Five'"
   ],
-  "answer": [0,1,2]
+  "answer": [0,2,3]
 },{
   "type": "challenge",
   "time": "2:57",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/033/description.en.md → lesson033/description.en.md b/033/description.en.md → lesson033/description.en.md
diff --git a/033/description.rs.md → lesson033/description.rs.md b/033/description.rs.md → lesson033/description.rs.md
diff --git a/033/slides.en.json → lesson033/slides.en.json b/033/slides.en.json → lesson033/slides.en.json
diff --git a/033/slides.rs.json → lesson033/slides.rs.json b/033/slides.rs.json → lesson033/slides.rs.json
@@ -8,13 +8,13 @@
     "While-If",
     "If-then",
     "If-else",
-    
+
   ],
   "answer": [2]
 },{
   "type": "challenge",
   "time": "2:31",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/034/description.en.md → lesson034/description.en.md b/034/description.en.md → lesson034/description.en.md
diff --git a/034/description.rs.md → lesson034/description.rs.md b/034/description.rs.md → lesson034/description.rs.md
diff --git a/034/slides.en.json → lesson034/slides.en.json b/034/slides.en.json → lesson034/slides.en.json
diff --git a/034/slides.rs.json → lesson034/slides.rs.json b/034/slides.rs.json → lesson034/slides.rs.json
@@ -8,13 +8,13 @@
     "petlju",
     "findNearestEnemy",
     "attack(enemy)",
-    
+
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "1:30",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/035/description.en.md → lesson035/description.en.md b/035/description.en.md → lesson035/description.en.md
diff --git a/035/description.rs.md → lesson035/description.rs.md b/035/description.rs.md → lesson035/description.rs.md
diff --git a/035/slides.en.json → lesson035/slides.en.json b/035/slides.en.json → lesson035/slides.en.json
diff --git a/035/slides.rs.json → lesson035/slides.rs.json b/035/slides.rs.json → lesson035/slides.rs.json
@@ -8,13 +8,13 @@
     "enemy",
     "rightEnemy",
     "EnemyRight",
-    
+
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "1:11",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/036/description.en.md → lesson036/description.en.md b/036/description.en.md → lesson036/description.en.md
diff --git a/036/description.rs.md → lesson036/description.rs.md b/036/description.rs.md → lesson036/description.rs.md
diff --git a/036/slides.en.json → lesson036/slides.en.json b/036/slides.en.json → lesson036/slides.en.json
diff --git a/036/slides.rs.json → lesson036/slides.rs.json b/036/slides.rs.json → lesson036/slides.rs.json
@@ -3,18 +3,18 @@
 "slides": [{
   "type": "question",
   "time": "2:58",
-  "question": "U kom primeru će naš heroj izgovoriti “I don’t see an enemy”?",
+  "question": "U kom primeru će naš heroj izgovoriti 'I don’t see an enemy'? (enemy postoji)",
   "options": [
     "If (enemy) { this.attack(enemy) }",
-    "If (!enemy) { this.say(“I don’t see an enemy”)) }",
-    "If (enemy) { this.attack(enemy) } else { this.say(“I don’t see an enemy”) }",
+    "If (enemy) { this.say('I don’t see an enemy')) }",
+    "If (enemy) { this.attack(enemy) } else { this.say('I don’t see an enemy') }",
     "If (enemy) { this.attack(enemy) } else { this.moveXY(x,y) }"
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "1:24",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/037/description.en.md → lesson037/description.en.md b/037/description.en.md → lesson037/description.en.md
diff --git a/037/description.rs.md → lesson037/description.rs.md b/037/description.rs.md → lesson037/description.rs.md
diff --git a/037/slides.en.json → lesson037/slides.en.json b/037/slides.en.json → lesson037/slides.en.json
diff --git a/037/slides.rs.json → lesson037/slides.rs.json b/037/slides.rs.json → lesson037/slides.rs.json
@@ -7,13 +7,13 @@
   "options": [
     "Odmah na početku",
     "Kada nema više neprijatelja",
-    
+
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "2:02",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/038/description.en.md → lesson038/description.en.md b/038/description.en.md → lesson038/description.en.md
diff --git a/038/description.rs.md → lesson038/description.rs.md b/038/description.rs.md → lesson038/description.rs.md
diff --git a/038/slides.en.json → lesson038/slides.en.json b/038/slides.en.json → lesson038/slides.en.json
diff --git a/038/slides.rs.json → lesson038/slides.rs.json b/038/slides.rs.json → lesson038/slides.rs.json
@@ -3,17 +3,17 @@
 "slides": [{
   "type": "question",
   "time": "2:00",
-  "question": "Koji napad je jači?",
+  "question": "Kojom vrstom udarca možemo da pobedimo više najprijatelja?",
   "options": [
     "this.attack(enemy) ",
     "this.cleave(enemy)",
-    
+
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "2:00",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"

diff --git a/039/description.en.md → lesson039/description.en.md b/039/description.en.md → lesson039/description.en.md
diff --git a/039/description.rs.md → lesson039/description.rs.md b/039/description.rs.md → lesson039/description.rs.md
diff --git a/039/slides.en.json → lesson039/slides.en.json b/039/slides.en.json → lesson039/slides.en.json
diff --git a/039/slides.rs.json → lesson039/slides.rs.json b/039/slides.rs.json → lesson039/slides.rs.json
@@ -7,14 +7,14 @@
   "options": [
     "5 != 5",
     "6 < 7",
-    "x =2; x > 15",
-    "y =7; y ===  “seven”"
+    "x = 2; x > 15",
+    "y = 7; y === 'seven'"
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "7:38",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "https://gist.github.com/",
     "title": "Dopunite svoj gist"

diff --git a/040/description.en.md → lesson040/description.en.md b/040/description.en.md → lesson040/description.en.md
diff --git a/040/description.rs.md → lesson040/description.rs.md b/040/description.rs.md → lesson040/description.rs.md
diff --git a/040/slides.en.json → lesson040/slides.en.json b/040/slides.en.json → lesson040/slides.en.json
diff --git a/040/slides.rs.json → lesson040/slides.rs.json b/040/slides.rs.json → lesson040/slides.rs.json
@@ -6,14 +6,13 @@
   "question": "Protiv koga smo se borili u današnjoj lekciji?",
   "options": [
     "kompjutera",
-    "drugih igrača",
-
+    "drugih igrača"
   ],
   "answer": [1]
 },{
   "type": "challenge",
   "time": "2:18 ",
-  "text": "Challenge - what should they do after they click the link",
+  "text": "Igrajte Code Combat i naučite nove trikove",
   "link": {
     "url": "http://codecombat.com/play/forest",
     "title": "Igrajte sada"