Merge branch 'master' of https://github.com/hamin/YourFace

Conflicts:
	css/master.css
	public/client.coffee
	public/client.js

css/master.css

@@ -1,3 +1,5 @@
+body{ overflow: hidden;}
+
 .playingField {
 	border-style: solid;
 	border-color: green;

public/client.coffee

@@ -46,19 +46,34 @@ updateDivPosition = (divName,newPosition) ->
   console.log "newPosition = #{newPosition}"
   $(".#{divName}").offset left: newPosition
 
-shoot = (position) ->
-	++bulletNum
-	bullets.push bulletNum
-	bulletName = "b#{bulletNum}"
-	console.log "shoot bitch shoot! bulletName=#{bulletName} x: #{position.x} y: #{position.y}"
-	$("#playingField").append "<div id='#{bulletName}' class='bullet'></div>"
-	$("##{bulletName}").offset left: position.x, top: position.y
-	$("##{bulletName}").animate {top: (position.y - 915) }, 400, () ->
-    $("##{bulletName}").remove() if $("##{bulletName}").offset().top is 8
-
 
-#client = new Faye.Client "http://192.168.201.92:3000/faye"	      
-client = new Faye.Client "http://localhost:3000/faye"
+shoot = (position, isOpp) ->
+   ++bulletNum
+   bullets.push bulletNum
+   bulletName = "b#{bulletNum}"
+   console.log "shoot bitch shoot! bulletName=#{bulletName} x: #{position.x} y: #{position.y}"
+   $("#playingField").append "<div id='#{bulletName}' class='bullet'></div>"
+
+   $("##{bulletName}").offset left: position.x, top: position.y
+   sign = -1
+   sign = 1 if isOpp is true
+   $("##{bulletName}").animate {top: (position.y + sign*915) }, 400, () ->
+     i = bullets.indexOf bulletName
+     bullets.splice i
+
+     # If it hits opponent remove the field and do some stuff
+     oppTop = $('.opponent').offset().top
+     oppLeft = $('.opponent').offset().left
+     oppWidth = oppLeft + $('.opponent').width()
+     if $("##{bulletName}").offset().left in [oppLeft..oppWidth]
+       console.log("BOOM!!!!")
+
+     # If it leaves playing field remove the bullet
+     if ( isOpp is true && $("##{bulletName}").offset().top > 800 ) or ( isOpp is false && $("##{bulletName}").offset().top < 8 )
+       $("##{bulletName}").remove()
+
+client = new Faye.Client "http://192.168.201.92:3000/faye"        
+# client = new Faye.Client "http://localhost:3000/faye"
 
 client.subscribe "/yourface", (message) ->
   if clientId < 0
@@ -76,9 +91,12 @@ $(document).ready () ->
 	client.subscribe "/opponentPos", (message) ->
     if message.oppClientId isnt clientId
       updateDivPosition "opponent", message.curLeftPos
-
-
-  # Arrow Button Bindings 
+
+  client.subscribe "/fire", (message) ->
+    if message.oppClientId isnt clientId
+      shoot {x: message.x, y: message.y}, true    
+
+  # Arrow Button Bindings
 	$('body').keydown (event) ->
 	  console.log "keyCode #{event.keyCode}"
 	  curLeftPos = $(".me").offset().left
@@ -91,8 +109,9 @@ $(document).ready () ->
 	  # right
 	  if event.keyCode is 39 	
       updateDivPosition "me", curLeftPos + offset
-    if event.keyCode is 32
-      console.log "about to shoot"
-      shoot x: curLeftPos+50, y: curTopPos-15
+    if event.keyCode is 16
+      shoot {x: curLeftPos+50, y: curTopPos-15}, false
+      oppY = $('.opponent').offset().top + $('.opponent').height()
+      client.publish '/fire', x: curLeftPos+50, y: oppY, oppClientId: clientId
 
     client.publish "/opponentPos", {curLeftPos: $(".me").offset().left, oppClientId: clientId}