From ffcee12acf3fe3f972f322c18b3203212682205d Mon Sep 17 00:00:00 2001
From: tom <tom@ground-control>
Date: Thu, 7 May 2015 12:35:15 -0500
Subject: woo! detection is implemented albeit shitty

---
 src/creature.cpp | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'src/creature.cpp')

diff --git a/src/creature.cpp b/src/creature.cpp
index 9d50291..ae3122b 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -9,30 +9,29 @@ Creature::Creature(Window m, std::string s)
 
 	int zy = rand()%800;
 	int zx = rand()%1200;
-	y=zy;
-	x=zx;
+	y=yT=zy;
+	x=xT=zx;
 	//std::cout << x << ' ' <<  y << std::endl;
-	
+
 	//For the test resource
-	xT=yT=300;
+	//xT=yT=300;
 }
 
 void Creature::Behavior()
 {
 	hp--;
-  	//Detection
-
-
-  	//Priorities
+  //Detection
 
-  	//Action
-  	this->Action();
+  //Priorities
+	this->Priority();
+  //Action
+  this->Action();
 }
 
 void Creature::Action()
 {
 	//std::cout << (sqrt(((x-xT)^2)+((y-yT)^2));
-	if((sqrt(((x-xT)^2)+((y-yT)^2)))<2)
+	if(sqrt(pow(x-xT,2)+pow(y-yT,2))<2)
 		return; //eat//reproduce//etc;
 
 	if(x==xT)
@@ -76,7 +75,7 @@ void Creature::Action()
 		}
 	}
 
-	/*	
+	/*
 	else
 	{
 		int z = rand()%2;
@@ -98,6 +97,21 @@ void Creature::Action()
 	*/
 }
 
+void Creature::Priority()
+{
+	int i;
+	for(i=0;i<K.size();i++)
+	{
+		std::cout << K[i].t;
+		if(K[i].t==2)
+		{
+			xT = K[i].x;
+			yT = K[i].y;
+			std::cout << xT << "IN\n";
+		}
+	}
+}
+
 Location Creature::getLocation()
 {
 	Location L(x,y,1);
-- 
cgit v1.2.3


From c63d77ddddb69ef0f641d90a8c3922fdc356224c Mon Sep 17 00:00:00 2001
From: dakjos <dsojka@siu.edu>
Date: Thu, 7 May 2015 19:53:39 -0500
Subject: Some variable names changed and many comments made so I understand
 what the fuck is going on

---
 src/creature.cpp | 131 ++++++++++++++++++++++++-------------------------------
 1 file changed, 56 insertions(+), 75 deletions(-)

(limited to 'src/creature.cpp')

diff --git a/src/creature.cpp b/src/creature.cpp
index ae3122b..ef3d6c1 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -1,119 +1,100 @@
 #include "creature.hpp"
 
-Creature::Creature(Window m, std::string s)
+Creature::Creature(Window m, std::string s) //Constructor
 {
 	texture = loadTexture(s, m);
 	renderer = m.getRenderer();
-	hp = 100;
-	hu = 0;
+	health = 100;
+	hunger = 0;
 
-	int zy = rand()%800;
-	int zx = rand()%1200;
-	y=yT=zy;
-	x=xT=zx;
-	//std::cout << x << ' ' <<  y << std::endl;
-
-	//For the test resource
-	//xT=yT=300;
+	//initializes random start coordinates for creature, target position is equivalent to it's position
+	int yStart = rand()%800;
+	int xStart = rand()%1200;
+	yPosition=yTarget=yStart;
+	xPosition=xTarget=xStart;
 }
 
 void Creature::Behavior()
 {
-	hp--;
+	health--; //Decrements health each time a behavior is executed
   //Detection
+	this->Priority(); //Checks which action has priority (doesn't really do this right now)
+  this->Action(); //Does action
+}
 
-  //Priorities
-	this->Priority();
-  //Action
-  this->Action();
+void Creature::Priority()
+{
+	//Traverses location vector, if object at [i] is resource (2), then creature's target coordinates are set
+	int i;
+	for(i=0;i<location.size();i++)
+	{
+		std::cout << location[i].type;
+		if(location[i].type==2)
+		{
+			xTarget = location[i].x;
+			yTarget = location[i].y;
+			std::cout << xTarget << "IN\n";
+		}
+	}
 }
 
 void Creature::Action()
 {
-	//std::cout << (sqrt(((x-xT)^2)+((y-yT)^2));
-	if(sqrt(pow(x-xT,2)+pow(y-yT,2))<2)
-		return; //eat//reproduce//etc;
+	//If the distance is too small, do something?
+	if(sqrt(pow(xPosition - xTarget, 2) + pow(yPosition - yTarget, 2)) < 2)
+		return; //<--- eat action should be here
 
-	if(x==xT)
+	//Makes moves towards target coordinates
+	if(xPosition==xTarget)
 	{
-		if(y<yT)
-			y++;
+		if(yPosition<yTarget)
+			yPosition++;
 		else
-			y--;
+			yPosition--;
 	}
-	else if(y==yT)
+
+	else if(yPosition==yTarget)
 	{
-		if(x<xT)
-			x++;
+		if(xPosition<xTarget)
+			xPosition++;
 		else
-			x--;
+			xPosition--;
 	}
-	else if(x<xT)
-	{
-		if(y<yT)
-		{
-			x++;
-			y++;
-		}
-		else
-		{
-			x++;
-			y--;
-		}
-	}
-	else if (x>xT)
+
+	else if(xPosition<xTarget)
 	{
-		if(y<yT)
+		if(yPosition<yTarget)
 		{
-			x--;
-			y++;
+			xPosition++;
+			yPosition++;
 		}
+
 		else
 		{
-			x--;
-			y--;
+			xPosition++;
+			yPosition--;
 		}
 	}
 
-	/*
-	else
+	else if (xPosition>xTarget)
 	{
-		int z = rand()%2;
-		if(z)
-		{
-			if(x<xT)
-				x++;
-			else
-				x--;
-		}
-		else
+		if(yPosition<yTarget)
 		{
-			if(y<yT)
-				y++;
-			else
-				y--;
+			xPosition--;
+			yPosition++;
 		}
-	}
-	*/
-}
 
-void Creature::Priority()
-{
-	int i;
-	for(i=0;i<K.size();i++)
-	{
-		std::cout << K[i].t;
-		if(K[i].t==2)
+		else
 		{
-			xT = K[i].x;
-			yT = K[i].y;
-			std::cout << xT << "IN\n";
+			xPosition--;
+			yPosition--;
 		}
 	}
 }
 
 Location Creature::getLocation()
 {
-	Location L(x,y,1);
+	//returns location vector of creatures position coordinates
+	Location L(xPosition, yPosition, 1);
 	return L;
 }
-- 
cgit v1.2.3


From 8c5121486a0e5d94ae5e5ee67370a31530cf8b6f Mon Sep 17 00:00:00 2001
From: tom <tom@ground-control>
Date: Fri, 8 May 2015 08:23:06 -0500
Subject: fixed some comments and cleaned around

---
 src/creature.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/creature.cpp')

diff --git a/src/creature.cpp b/src/creature.cpp
index ef3d6c1..5c3bb8e 100644
--- a/src/creature.cpp
+++ b/src/creature.cpp
@@ -8,16 +8,13 @@ Creature::Creature(Window m, std::string s) //Constructor
 	hunger = 0;
 
 	//initializes random start coordinates for creature, target position is equivalent to it's position
-	int yStart = rand()%800;
-	int xStart = rand()%1200;
-	yPosition=yTarget=yStart;
-	xPosition=xTarget=xStart;
+	yPosition=yTarget=rand()%800;
+	xPosition=xTarget=rand()%1200;
 }
 
 void Creature::Behavior()
 {
 	health--; //Decrements health each time a behavior is executed
-  //Detection
 	this->Priority(); //Checks which action has priority (doesn't really do this right now)
   this->Action(); //Does action
 }
@@ -28,19 +25,17 @@ void Creature::Priority()
 	int i;
 	for(i=0;i<location.size();i++)
 	{
-		std::cout << location[i].type;
 		if(location[i].type==2)
 		{
 			xTarget = location[i].x;
 			yTarget = location[i].y;
-			std::cout << xTarget << "IN\n";
 		}
 	}
 }
 
 void Creature::Action()
 {
-	//If the distance is too small, do something?
+	//If the distance is close, will return an bool
 	if(sqrt(pow(xPosition - xTarget, 2) + pow(yPosition - yTarget, 2)) < 2)
 		return; //<--- eat action should be here
 
@@ -94,7 +89,7 @@ void Creature::Action()
 
 Location Creature::getLocation()
 {
-	//returns location vector of creatures position coordinates
+	//returns location object of the specific creature
 	Location L(xPosition, yPosition, 1);
 	return L;
 }
-- 
cgit v1.2.3