From d48da33db2a845bf47e568884c83e38c609104c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Wed, 24 Sep 2014 17:59:17 +0200
Subject: [PATCH] First attack doesn't work due to prototyping

---
 src/jsds.js        | 18 +++++++++---------
 src/jsds_crafty.js |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/jsds.js b/src/jsds.js
index ad57b99..0985479 100644
--- a/src/jsds.js
+++ b/src/jsds.js
@@ -7,24 +7,19 @@
 	 */
 	this.info = {"pname":  info["pname"]+"", "experience": info["experience"]*1, "race":info["race"]+"",
 		     "size":info["size"]*1};
-	console.log("Info ready");
 	this.attributes = {"body": attributes["body"]*1, "agility": attributes["agility"]*1,
 			   "spirit": attributes["spirit"]*1};
-	console.log("Attr ready");
 	this.properties = {"strength": properties["strength"]*1 , "hardness": info["hardness"]*1,
 			   "movement": info["movement"]*1, "skill": properties["skill"]*1,
 			   "mind": properties["mind"]*1, "aura": properties["aura"]*1};
-	console.log("Prop ready");
 	this.graphelement = Crafty.e("Creature").creature(this.info["pname"],drawinfo["x"],drawinfo["y"],
 							  drawinfo["w"],drawinfo["h"],drawinfo["col"]);
-	console.log("Graph ready");
-
+	
 	this.battle = {};
 	if(battle) {
 	    this.battle={"life": battle["life"], "defense": battle["defense"],"ini":battle["ini"],
 			 "walk": battle["walk"], "melee": battle["melee"], "shoot": battle["shoot"],
 			 "chant": battle["chant"], "shoot_chant": battle["shoot_chant"]};
-	    console.log("Battle ready");
 	}
 	else {
 	    this.battle["life"] = this.attributes.body + this.properties.strength + 10;
@@ -35,13 +30,16 @@
 	    this.battle["shoot"] = this.attributes.agility + this.properties.mind;
 	    this.battle["chant"] = this.attributes.spirit + this.properties.aura;
 	    this.battle["shoot_chant"] = this.attributes.spirit + this.properties.skill;
-	    console.log("Battle ready");
 	};
 	this.life = this.battle["life"]*1;
     };
     
-/*    Creature.prototype.attack(enem) {
-	return enem.*/
+    Creature.prototype.attack = function(enem) {
+	console.log("attack");
+	//console.log(this.cname+" greift "+enem.cname+" an!");
+	//console.log("Ergebnis: " + this.melee + ( this.melee > enem.defense? " > " : " < ") + enem.defense);
+    };
+    
 
     function Player(info,attributes,properties,drawinfo,battle){ // x,y,w,h,col) {
 	/* info: pname, cname,class, level, experience, race, size
@@ -63,6 +61,7 @@
 	this.battle.chant = this.battle.chant + this.extern.chant - this.extern.armor;
 	this.battle.shoot_chant = this.battle.chant + this.extern.chant - this.extern.armor;
     };
+    Player.prototype = new Creature();
     
     Player.prototype.printoutput = function() {
 	$('#output').empty();
@@ -78,6 +77,7 @@
 	 */
 	
 	Creature.apply(this,arguments);
+	this.info.cname=this.info.pname;
     };   
 
     Beast.prototype.printoutput = function() {
diff --git a/src/jsds_crafty.js b/src/jsds_crafty.js
index 51e16c5..98bc924 100644
--- a/src/jsds_crafty.js
+++ b/src/jsds_crafty.js
@@ -77,9 +77,11 @@
 			cur_sel.printoutput();
 			this.enableControl();
 		    };
-/*		    if(e.mouseButton === Crafty.mouseButtons.RIGHT) {
+		    if(e.mouseButton === Crafty.mouseButtons.RIGHT) {
+			console.log(player[this.id]);
+			console.log(cur_sel);
 			cur_sel.attack(player[this.id]);
- };*/
+		    };
 		});
 		
 		return this;