Merge remote-tracking branch 'origin/master'

Zookeepers Trial/Assets/Art/maps/creation.png.meta

 fileFormatVersion: 2
-guid: 8349f9df539e16045bf2f5eb8352e1b3
-timeCreated: 1478723836
+guid: 04e47696ea2d3b54cbd7164b5cd1a9e4
+timeCreated: 1478919162
 licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}

Zookeepers Trial/Assets/Scripts/characterCreation/chooseCharLook.cs

@@ -7,21 +7,27 @@ public class ChooseCharLook : MonoBehaviour {
 	public Sprite[] headOptions;
 	public Sprite[] faceOptions;
 	public Sprite[] legOptions;
-	public float hue;
+	public float red;
+	public float green;
+	public float blue;
 	private int curHead;
 	private int curFace;
 	private int curLegs;
+	private setAppearance playerLooks;
 	// note: bodies do not go here, this is character customization
 
 	void Start () {
+		playerLooks = GameObject.Find ("CharacterDisplay").GetComponent<setAppearance>(); // Access setAppearance object from characterDisplay
 		curHead = 0;
 		curFace = 0;
 		curLegs = 0;
+		red = 128;
+		green = 128;
+		blue = 128;
 		updateLooks ();
 	}
 
 	public void updateLooks(){
-		setAppearance playerLooks = GameObject.Find ("CharacterDisplay").GetComponent<setAppearance>(); // Access setAppearance object from characterDisplay
 		playerLooks.setFace(faceOptions[curFace]);
 		playerLooks.setHead(headOptions[curHead]);
 		playerLooks.setLegs(legOptions[curLegs]);
@@ -55,7 +61,19 @@ public class ChooseCharLook : MonoBehaviour {
 		updateLooks ();
 	}
 
-	public void setHue(){
+	public void setRed(float newValue){
+		red = (newValue);
+		playerLooks.addColor (red, green, blue);
+	}
+
+	public void setGreen(float newValue){
+		green = (newValue);
+		playerLooks.addColor (red, green, blue);
+	}
+
+	public void setBlue(float newValue){
+		blue = (newValue);
+		playerLooks.addColor (red, green, blue);
 	}
 
 }

Zookeepers Trial/Assets/Scripts/characterCreation/setAppearance.cs

@@ -8,27 +8,47 @@ public class setAppearance : MonoBehaviour {
 	private Sprite curFace;
 	private Sprite curHead;
 	private Sprite curLegs;
+	private float curRed;
+	private float curGreen;
+	private float curBlue;
 
-	private GameObject head;
-	private GameObject face;
-	private GameObject body;
-	private GameObject legR; // looking AT the player right
-	private GameObject legL; // looking AT the player left
-	private GameObject arm;
+	private SpriteRenderer head;
+	private SpriteRenderer face;
+	private SpriteRenderer body;
+	private SpriteRenderer legR; // looking AT the player right
+	private SpriteRenderer legL; // looking AT the player left
+	private SpriteRenderer arm;
+	private SpriteRenderer forearm;
 
 
 	void Awake() {
-		face = transform.FindChild("face").gameObject;
-		head = transform.FindChild("head").gameObject;
-		legR = transform.FindChild("legR").gameObject;
-		legL = transform.FindChild("legL").gameObject;
+		face = transform.FindChild("face").gameObject.GetComponent<SpriteRenderer> ();
+		body = transform.FindChild("body").gameObject.GetComponent<SpriteRenderer> ();
+		head = transform.FindChild("head").gameObject.GetComponent<SpriteRenderer> ();
+		arm = transform.FindChild("arm").gameObject.GetComponent<SpriteRenderer> ();
+		forearm = transform.FindChild("forearm").gameObject.GetComponent<SpriteRenderer> ();
+		legR = transform.FindChild("legR").gameObject.GetComponent<SpriteRenderer> ();
+		legL = transform.FindChild("legL").gameObject.GetComponent<SpriteRenderer> ();
 	}
 
 	public void refresh(){
-		face.GetComponent<SpriteRenderer> ().sprite = curFace;
-		head.GetComponent<SpriteRenderer> ().sprite = curHead;
-		legR.GetComponent<SpriteRenderer> ().sprite = curLegs; // two legs, do twice
-		legL.GetComponent<SpriteRenderer> ().sprite = curLegs;
+		face.sprite = curFace;
+		head.sprite = curHead;
+		legR.sprite = curLegs; // two legs, do twice
+		legL.sprite = curLegs;
+	}
+
+	public void addColor(float red, float green, float blue){
+		// Don't change face color
+		curRed = red;
+		curGreen = green;
+		curBlue = blue;
+		head.color = new Color(red,green,blue,1);
+		body.color = new Color(red,green,blue,1);
+		legR.color = new Color(red,green,blue,1);
+		legL.color = new Color(red,green,blue,1);
+		arm.color = new Color(red,green,blue,1);
+		forearm.color = new Color(red,green,blue,1);
 	}
 
 	public void setFace(Sprite newFace){