Merge branch 'master' of erinn.io:netsim

levels/01 Basics/level04.json

@@ -4,7 +4,7 @@
 			id:"Alice",
 			ports:1,
 			x:0.5,
-			y:0.2,
+			y:0.1,
 			player:true,
 			image:"imac"
 		},
@@ -28,7 +28,7 @@
 			id:"Router 1",
 			ports:3,
 			x:0.5,
-			y:0.4,
+			y:0.3,
 			image:"server",
 			script: deviceScripts.manualRouter,
 			rules:[
@@ -42,7 +42,7 @@
 			type:"ManualRouter",
 			ports:3,
 			x:0.35,
-			y:0.6,
+			y:0.5,
 			image:"server",
 			script: deviceScripts.manualRouter,
 			rules:[
@@ -56,7 +56,7 @@
 			type:"ManualRouter",
 			ports:3,
 			x:0.65,
-			y:0.6,
+			y:0.5,
 			image:"server",
 			script: deviceScripts.manualRouter,
 			rules:[

levels/01 Basics/level05.json

@@ -3,23 +3,24 @@
 		{
 			id:"Alice",
 			ports:1,
-			x:0.25,
-			y:0.55,
+			x:0.2,
+			y:0.6,
 			player:true
 		},
 		{
 			id:"Google",
+			image:"server",
 			ports:1,
-			x:0.75,
-			y:0.5,
+			x:0.8,
+			y:0.4,
                         script: deviceScripts.ping
 		},
 		{
 			id:"Home",
-			type:"Modem",
+			image:"router",
 			ports:2,
 			x:0.4,
-			y:0.5,
+			y:0.4,
                         script: deviceScripts.modem
 		}
 	],

levels/02 Spoofs/spoofs01.html

@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="../../includes/css/base.css" />
-<link rel="stylesheet" href="../../includes/css/style.css" />
 
 <h1>Spoofs Level 1</h1>
 

levels/02 Spoofs/spoofs01.json

@@ -2,28 +2,28 @@
 	devices:[
 		{
 			id:"Alice",
-			type:"NullComputer",
+                        image: "iphone-1",
 			ports:1,
 			x:0.5,
-			y:0.25,
+			y:0.2,
 			player:true
 		},
 		{
 			id:"Bob",
-			type:"NullComputer",
 			ports:1,
 			x:0.25,
 			y:0.75
 		},
 		{
 			id:"Carol",
-			type:"NullComputer",
+                        image: "macbook",
 			ports:1,
 			x:0.75,
 			y:0.75
 		},
 		{
 			id:"Router 1",
+                        image: "router",
 			ports:3,
 			x:0.5,
 			y:0.4,
@@ -36,6 +36,7 @@
 		},
 		{
 			id:"Router 2",
+                        image: "router",
 			ports:3,
 			x:0.35,
 			y:0.6,
@@ -48,6 +49,7 @@
 		},
 		{
 			id:"Router 3",
+                        image: "router",
 			ports:3,
 			x:0.65,
 			y:0.6,
@@ -135,5 +137,5 @@
 			}
 		}
 	],
-	nextLevel:"02 Spoofs/spoofs02.json"
+	nextLevel:7
 }

phaser.inc.php

@@ -33,6 +33,7 @@ function preload() {
 	game.load.image('monitor', 'includes/monitor.png');
 	game.load.image('packet', 'includes/circle.png');
 	game.load.image('server', 'includes/server.png');
+	game.load.image('router', 'includes/router.png');
 
 	game.load.image('reset', 'includes/ui/reset.png');
 	game.load.image('pause', 'includes/ui/pause.png');