From c12595d5481271a528c1dfe79d70a683d24741a8 Mon Sep 17 00:00:00 2001
From: "falc@null.net" <falc@null.net>
Date: Sat, 29 Oct 2016 03:57:32 +0200
Subject: [PATCH] Mix it, fam

---
 Assets/MapCreation.js       | 28 ----------------------------
 Assets/MapCreation.js.meta  | 12 ------------
 Assets/TurnManagerScript.cs |  8 ++++++++
 Assets/UnitBehaviour.cs     |  2 +-
 4 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 Assets/MapCreation.js
 delete mode 100644 Assets/MapCreation.js.meta

diff --git a/Assets/MapCreation.js b/Assets/MapCreation.js
deleted file mode 100644
index d07643f..0000000
--- a/Assets/MapCreation.js
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma strict
-
-	public var vs : int = 20;
-	public var hs : int = 40;
-	public var matrix : int[,]; //0 significa zona habitable
-								//dif de 0 zona no habitable
-	public var basic_floor : GameObject;
-	public var nhabitable_floor : GameObject;
-
-function Start () {
-	var basic_floor_instance : GameObject;
-	for(var i : int = 0; i < vs; i++){
-		for(var j : int = 0; j < hs; j++){
-		    if(matrix[i,j]==0) basic_floor_instance = Instantiate(basic_floor, Vector3(i,-0.5,j), Quaternion.identity);
-		    else basic_floor_instance = Instantiate(nhabitable_floor, Vector3(i,0.5,j), Quaternion.identity);
-	    }
-    }
-}
-
-function Update () {
-	
-}
-
-function setMatrix(new_floor : int[,], x : int, z : int){
-	matrix = new_floor;
-	vs = x;
-	hs = z;
-}
\ No newline at end of file
diff --git a/Assets/MapCreation.js.meta b/Assets/MapCreation.js.meta
deleted file mode 100644
index aff0eb0..0000000
--- a/Assets/MapCreation.js.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 2b1e029f45d9d8349b5a1df7a70eebdd
-timeCreated: 1477742960
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs
index d436c9e..1148849 100644
--- a/Assets/TurnManagerScript.cs
+++ b/Assets/TurnManagerScript.cs
@@ -62,6 +62,14 @@ public class TurnManagerScript : MonoBehaviour {
 		act (c);
 	}
 
+	void attack(int i, int j, params int[] altParams ) {
+	
+	}
+
+	void attackRange (int i, int j, int k, int l, params int[] altParams ) {
+	
+	}
+
 	void changeTeam (int newTeam) {
 		actualPlayer = newTeam;
 		//actualNumChars = charList [actualPlayer].Count;
diff --git a/Assets/UnitBehaviour.cs b/Assets/UnitBehaviour.cs
index 8f88953..fb0e809 100644
--- a/Assets/UnitBehaviour.cs
+++ b/Assets/UnitBehaviour.cs
@@ -97,7 +97,7 @@ public class UnitBehaviour : MonoBehaviour {
 		if (attackHit ())
 			attack = attackDamage;
 		if (criticalHit ())
-			attack = Mathf.CeilToInt(attack * 1.5);
+			attack = Mathf.CeilToInt(attack * 1.5f);
 		return attack;
 	}