Merge pull request #22 from GamerMan7799/dev

Update master to V3.0b

Author: GamerMan7799

battle.h

@@ -3,7 +3,7 @@
 /*
 Made By: Patrick J. Rye
 Purpose: A header to hold all the functions related to battling, levelling up and player stats.
-Current Revision: 2.3.1
+Current Revision: 3.0.1
 Change Log---------------------------------------------------------------------------------------------------------------------------------------------------
 Date		Revision	Changed By		Changes
 ------  	---------   ------------	---------------------------------------------------------------------------------------------------------------------
@@ -65,6 +65,16 @@ Date		Revision	Changed By		Changes
 2015/03/06	2.3.1		Patrick Rye		-Changed system("pause") to getchar();
 										-Added more pauses.
 =============================================================================================================================================================
+2015/03/06	3.0			Patrick Rye		-Added chance for stun.
+										-Redid monster levelling.
+										-Redid health calculation.
+										-Redid damage calculation.
+										-Added some variability to attack damage.
+=============================================================================================================================================================
+2015/03/09	3.0.1		Patrick Rye		-Changed some text to better reflect certain changes.
+										-The less health something has the less damage it will do.
+										-Nerffered attack damage a bit.
+=============================================================================================================================================================					
 */
 
 /*
@@ -79,7 +89,7 @@ For Stat Arrays
 /*********************************************************************************************************/
 /*A quick note on the base stats, a stat cannot be lower than 6, as a modifier might reduce the value by 5 points.
   The base stat point should also add up to be 100. */
-int MonsterBaseStats[5] = {25,25,10,25,15}; //A base array for the monsters 
+int MonsterBaseStats[5] = {20,20,20,20,20}; //A base array for the monsters 
 const int ZombieBaseStats[5] = {25,25,10,25,15};
 const int SkeletonBaseStats[5] = {35,18,6,35,6};
 const int WitchBaseStats[5] = {15,15,20,20,30};
@@ -101,13 +111,53 @@ int PlayerStats[5] = {5,5,5,5,5};
 int intBattleLevel = 1;
 bool blBattleDebugMode = false;
 /*********************************************************************************************************/
+void SetBattleDebugMode(bool isDebug) {blBattleDebugMode = isDebug;}
+/*********************************************************************************************************/
+
+
+
+bool StunCheck(int intAttackerLuck, int intDefenderLuck)
+{
+	if (intDefenderLuck < intAttackerLuck) {if(rand()% 101 < (intAttackerLuck - intDefenderLuck) / 3) {return true;}}
+	return false;
+}
+
+float DamageHealthPercent(int CurrentHealth, int MaximumHealth)
+{
+	/*Function that returns a percentage value that will be multiplied by the damage.
+	  The value will vary with health so that the less health something has
+	  The less damage it will do.
+	  The max value it return is about 1.01 or something similar, the min value
+	  is about 0.64 */
+	
+	float HealthPercent = CurrentHealth / MaximumHealth;
+	float TempValue = 0;
+	TempValue -= 0.8981 * pow(HealthPercent, 3);
+	TempValue += 1.297 * pow(HealthPercent, 2);
+	TempValue -= 0.0358 * HealthPercent;
+	TempValue += 0.64;
+	return TempValue;
+}
+
+string HitName()
+{
+	/*Outputs a string that represents an attack,
+	   for example rather than just "hit" over and over,
+	   you could get "stabbed" "hit"*/
+	const string HitStringArray[5] = {"hit","stabbed","cut","slashed","damaged"};
+	string TempString;
+	TempString = HitStringArray[rand() % 5];
+	if (TempString != "") {return TempString;}
+	return "hit";
+}
 
 bool MonsterAttack(int MonsterDamage, double MonsterMuli, bool ishealing)
 {
 	//Holds stuff for when monster attacks.
 	//Only returns true if player died.
 	//Is in its own function so I can call it a couple of different places.
 	cout<<endl;
+	MonsterDamage = floor(MonsterDamage * DamageHealthPercent(MonsterHealth[0],MonsterHealth[1])); //Reduce damage based on health.
 	if (ishealing) {floor(MonsterDamage /= 2);} //if player is healing reduce damage.
 	if (MonsterDamage != 0)
 	{
@@ -126,10 +176,11 @@ bool PlayerAttack(int PlayerDamage, double PlayerMuli)
 	//Only returns true if monster died.
 	//Is in its own function so I can call it a couple of different places.
 	cout<<endl;
+	PlayerDamage = floor(PlayerDamage * DamageHealthPercent(PlayerHealth[0],PlayerHealth[1])); //Reduce damage based on health.
 	if (PlayerDamage != 0)
 	{
 		if (PlayerMuli > 1){cout<<"You got a crit on the "<<MonsterName<<"! ";}
-		cout<<"You hit the "<<MonsterName<<" for "<<PlayerDamage<<".";
+		cout<<"You "<<HitName()<<" the "<<MonsterName<<" for "<<PlayerDamage<<".";
 	}
 	else {cout<<"The "<<MonsterName<<" dodged your attack.";}
 	MonsterHealth[0] -= PlayerDamage;
@@ -179,18 +230,33 @@ int CalculateHealth(int HealthLevel, int ConsStat)
 {
 	//A simple function for calculating health.
 	//In its own function so future changes will be changed everywhere.
-	return floor((23*((5.25+0.5625*HealthLevel+0.00375*pow(HealthLevel,2))+(1+0.066*HealthLevel)*(ConsStat/16))));
+	double HealthTemp = 0;
+	HealthTemp = (0.9722 * pow(HealthLevel, 2) )+( 0.4167 * HealthLevel) + 48.611;
+	HealthTemp += 23.979*exp(0.01414 * ConsStat);
+	return floor(HealthTemp);
 }
 
 int CalculateDamage(int DamageLevel, int StrStat, int DefStat)
 {
-	//A simple function for calculating damage
+	//A simple function for calculating damage.
 	//In its own function so future changes will be changed everywhere.
-	return floor(((((2 * (DamageLevel/5) + 2) * ((10*DamageLevel)/DefStat))*(StrStat))+5));
+	int DamageTemp = 0;
+	int intMinDamage = floor((MonsterHealth[1]+PlayerHealth[1])/20) + 1;
+	StrStat += rand() % DamageLevel;
+	DefStat += rand() % DamageLevel;
+	if (DefStat > StrStat) {return intMinDamage;}
+	else if (DefStat == StrStat) {return intMinDamage + rand() % (DamageLevel *2);}
+	else
+	{
+		DamageTemp = floor((StrStat - DefStat)*1.75);
+		DamageTemp += intMinDamage;
+		DamageTemp += rand() % (DamageLevel *2);
+		return DamageTemp;
+	}
+	
+	return intMinDamage;
 }
 
-void SetBattleDebugMode(bool isDebug) {blBattleDebugMode = isDebug;}
-
 void RandomMonster()
 {
 	//Generates a number 0 - 4 representing the location of a monster in the monster name array
@@ -301,6 +367,31 @@ void RandomMonsterModifier()
 //End of random monster modifier.	
 }
 
+void LevelUpMonster()
+{
+	//Function to level up the monster.
+	int StatUpgradeChance[5] = {0,0,0,0,0};
+	int intStatPoints = (intBattleLevel - 1) *5; //How many stat points the monster gets.
+	int intRandomStatChoice = 0;
+	
+	StatUpgradeChance[0] = MonsterBaseStats[0];
+	for (int i = 0; i < 5; i++) {MonsterStats[i] = MonsterBaseStats[i];}
+	for (int i = 1; i < 5; i++) {StatUpgradeChance[i] = StatUpgradeChance[i - 1] + MonsterBaseStats[i];}
+	for (int i = 0; i < intStatPoints; i++) //Random place points in the different stats.
+	{
+		intRandomStatChoice = rand() % 101;
+		if (intRandomStatChoice < StatUpgradeChance[0]) {MonsterStats[0] += 1;}
+		else if (intRandomStatChoice < StatUpgradeChance[1]) {MonsterStats[1] += 1;}
+		else if (intRandomStatChoice < StatUpgradeChance[2]) {MonsterStats[2] += 1;}
+		else if (intRandomStatChoice < StatUpgradeChance[3]) {MonsterStats[3] += 1;}
+		else {MonsterStats[4] += 1;}
+	}
+	if (blBattleDebugMode) {for(int i = 0; i < 5; i++ ) {cout<<endl<<MonsterStats[i];}}
+	//Recalculate healths and re-heal them
+    MonsterHealth[1] = floor(CalculateHealth(intBattleLevel,MonsterStats[1])/2);
+    MonsterHealth[0] = MonsterHealth[1];
+}
+
 void LevelUpFunction()
 {
 	//Holds function for levelling up.
@@ -387,13 +478,8 @@ char BattleScene()
     double douPlayerHealAmount;
 	char chrPlayerBattleChoice;
 
-	//Recalculate all of the stats needed.
-    //Update monster stats to new level.
-	for (int i=0; i<5; i++) {MonsterStats[i] = floor(((intBattleLevel-1)*4+MonsterBaseStats[i]));/*cout<<endl<<MonsterStats[i];*/ /*Debugging line*/}
+	LevelUpMonster();
 
-    //Recalculate healths and re-heal them
-    MonsterHealth[1] = floor(CalculateHealth(intBattleLevel,MonsterStats[1])/3);
-    MonsterHealth[0] = MonsterHealth[1];
     //Recalculate amount player heals for.
     douPlayerHealAmount = floor(PlayerHealth[1]/10);
     BattleGoto:
@@ -447,16 +533,25 @@ char BattleScene()
 				//Monster attacks first.
 				blPlayerDead = MonsterAttack(intMonsterDamage,douMonsterDamageMuli,false);
 				if (blPlayerDead) {return 'F';}
-				blMonsterDead = PlayerAttack(intPlayerDamage,douPlayerDamageMuli);
-				if (blMonsterDead) {return 'T';}
+				if (!StunCheck(MonsterStats[4],PlayerStats[4]))
+				{
+					blMonsterDead = PlayerAttack(intPlayerDamage,douPlayerDamageMuli);
+					if (blMonsterDead) {return 'T';}
+				}
+				else {cout<<endl<<"You were stunned and unable to attack.";}
 			}
 			else 
 			{
 				//Player attacks first.
 				blMonsterDead = PlayerAttack(intPlayerDamage,douPlayerDamageMuli);
 				if (blMonsterDead) {return 'T';}
-				blPlayerDead = MonsterAttack(intMonsterDamage,douMonsterDamageMuli,false);
-				if (blPlayerDead) {return 'F';}				
+				if (!StunCheck(PlayerStats[4],MonsterStats[4]))
+				{
+					blPlayerDead = MonsterAttack(intMonsterDamage,douMonsterDamageMuli,false);
+					if (blPlayerDead) {return 'F';}		
+				}
+				else {cout<<endl<<"The "<<MonsterName<<" was stunned by your hit and unable to attack.";}
+		
 			}
             cout<<endl;
 			getchar();
@@ -471,8 +566,12 @@ char BattleScene()
 				blPlayerDead = MonsterAttack(intMonsterDamage,douMonsterDamageMuli,true);
 				if (blPlayerDead) {return 'F';}
 
-				if (PlayerHealth[0]+douPlayerHealAmount > PlayerHealth[1]) {PlayerHealth[0]=PlayerHealth[1];}
-				else {PlayerHealth[0] += douPlayerHealAmount;}
+				if (!StunCheck(MonsterStats[4],PlayerStats[4]))
+				{
+					if (PlayerHealth[0]+douPlayerHealAmount > PlayerHealth[1]) {PlayerHealth[0]=PlayerHealth[1];}
+					else {PlayerHealth[0] += douPlayerHealAmount;}
+				}
+				else {cout<<endl<<"You were stunned and unable to heal.";}
 			}
 			else
 			{
@@ -566,7 +665,7 @@ char PlayerInitialize()
 	cout<<"In this game there are five stats that effect different elements of the game.";
 	cout<<endl<<"Strength (STR) - Effects how much damage you do when you attack."<<endl;
 	cout<<"Constitution (CONS) - Effects how much health you have."<<endl;
-	cout<<"Dexterity (DEX) - Effects if your chance to dodge."<<endl;
+	cout<<"Dexterity (DEX) - Effects if your chance to dodge, and if you attack first."<<endl;
 	cout<<"Defence (DEF) - Effects how much damage you take."<<endl;
 	cout<<"Luck (LUK) - The random chance things will go your way, with dodges, crits, and rare modifiers that appear on monsters."<<endl;
 	int intSkillPointsLeft = 100;

main.cpp

@@ -29,7 +29,7 @@ For more information, please refer to <http://unlicense.org>
 /*
 Made By: Patrick J. Rye
 Purpose: A game I made as an attempt to teach myself c++, just super basic, but going to try to keep improving it as my knowledge increases.
-Current Revision: 2.5ß
+Current Revision: 3.0b
 Change Log---------------------------------------------------------------------------------------------------------------------------------------------------
 Date		Revision	Changed By		Changes
 ------  	---------   ------------	---------------------------------------------------------------------------------------------------------------------
@@ -89,6 +89,10 @@ Date		Revision	Changed By		Changes
 										-Changed change log date format from MM/DD/YY to YYYY/MM/DD because I like it better.
 										-Added better opening message.
 										-Replaced all system("pause") with getchar();
+=============================================================================================================================================================
+2015/03/06	3.0b		Patrick Rye		-Redid some calculations in battle.h
+										-Added better winning message.
+										-Added spells.h does nothing currently just for testing.
 =============================================================================================================================================================	
 */
 
@@ -106,6 +110,7 @@ Date		Revision	Changed By		Changes
 #include "basic.h" //Functions that are simple and won't need to be changed very often.
 #include "battle.h" //Functions that deal with battling, levelling up and making a player.
 #include "rooms.h" //Functions that deal with generating a dungeon.
+//#include "spells.h" //Functions that deal with spells and magic, a possible future addition.
 /*********************************************************************************************************/
 using namespace std;
 Dungeon d; //Define the dungeon class as 'd' so I can use functions in there anywhere later in the code.
@@ -114,8 +119,9 @@ Dungeon d; //Define the dungeon class as 'd' so I can use functions in there any
 int intMainLevel; //The level of the dungeon.
 int intLevelStart = 1; //The level that the game starts at. Will be 1 unless loading from a save.
 bool blDebugMode = false; //If game is in debug mode or not, effects if player has access to debug commands.
-const string CurrentVerison = "2.5ß"; //The current version of this program, stored in a save file later on.
+const string CurrentVerison = "3.0b"; //The current version of this program, stored in a save file later on.
 /*********************************************************************************************************/
+//Some constant string for different messages that appear as large ASCII text.
 const string OpeningMessage[16] = {"                                                             \n",
 								   ",--.   ,--.       ,--.                                       \n",
 								   "|  |   |  | ,---. |  | ,---. ,---. ,--,--,--. ,---.          \n",
@@ -132,6 +138,14 @@ const string OpeningMessage[16] = {"
 								   "|  .-.  |'-.  .-''-.  .-'' ,-.  || .--'|     /| .-. :|  .--' \n",
 								   "|  | |  |  |  |    |  |  \\ '-'  |\\ `--.|  \\  \\\\   --.|  |    \n",
 								   "`--' `--'  `--'    `--'   `--`--' `---'`--'`--'`----'`--'    \n"};
+
+const string WinningMessage[6] = {"__   __            _    _ _       _ _ \n",
+								 "\\ \\ / /           | |  | (_)     | | |\n",
+								 " \\ V /___  _   _  | |  | |_ _ __ | | |\n",
+								 "  \\ // _ \\| | | | | |/\\| | | '_ \\| | |\n",
+								 "  | | (_) | |_| | \\  /\\  / | | | |_|_|\n",
+								 "  \\_/\\___/ \\__,_|  \\/  \\/|_|_| |_(_|_)\n"};
+
 /*********************************************************************************************************/
 //These functions have to be up here as functions in save.h use them.
 //These values are used to pass values to the save header so that they may be saved.
@@ -237,7 +251,7 @@ int main()
 	//End of FOR levels.
 	}
 	cout << string(50, '\n');
-	cout<<"You win!!";
+	for (int i = 0; i < 6; i++) {cout<<WinningMessage[i];}
 	getchar();
 	return 0;
 //End of main