Merge pull request #35 from GamerMan7799/dev

Update Master to V1.4c

Author: GamerMan7799

README.md

@@ -21,7 +21,7 @@ You must go through 10 randomly generated dungeons fighting monsters along the w
 
 During each battle you may 'Attack' in which case you and the monster both trade blows. You can 'Heal' for 10% of you maxmium health and the monster does less damage or exit the game.
 
-On each level you are trying to get the the down stairs which is represented by "<". While the player is a "@". Doors are "$" currently they don't do anything special, but that will likely change in a furture verison.
+On each level you are trying to get the the down stairs which is represented by "<". While the player is a "@". Doors are "$" & "!" "$" doors are unlocked and can just be walked through. "!" howvere are locked. You can currently try to break down the door if your strength is greater than 60, pick the lock if your Luck is greater than 60. Or you can use keys which can be found after defeating some monsters.
 
 Like I said there is not a lot to the game as of right now but that is partly why I'm putting the game here so I can get feedback and ideas on how to improve the game.
 

basic.h

@@ -4,7 +4,7 @@
 /*
 Made By: Patrick J. Rye
 Purpose: A header to hold functions that are pretty basic and likely won't change very often or at all.
-Current Revision: 1.0.3
+Current Revision: 2.0
 Change Log---------------------------------------------------------------------------------------------------------------------------------------------------
 Date		Revision	Changed By		Changes
 ------  	---------   ------------	---------------------------------------------------------------------------------------------------------------------
@@ -24,7 +24,9 @@ Date		Revision	Changed By		Changes
 =============================================================================================================================================================	
 2015/03/17	1.0.2		Patrick Rye 	-Added key amount to stat
 										-Grammar & spelling fixes.
-=============================================================================================================================================================	
+=============================================================================================================================================================
+2015/07/07	2.0			Patrick Rye		-Changed cout to printf.
+=============================================================================================================================================================
 */
 
 /*********************************************************************************************************/
@@ -501,8 +503,8 @@ char CharConvertToUpper(char chrCheck)
 	return converted;
 }
 
-inline void ShowOpeningMessage() {for (unsigned char i = 0; i < 16; i++){cout<<OpeningMessage[i];}}
+inline void ShowOpeningMessage() {for (unsigned char i = 0; i < 16; i++){printf("%s",OpeningMessage[i].c_str());}}
 
-inline void ShowWinningMessage() {for (unsigned char i = 0; i < 6; i++) {cout<<WinningMessage[i];}}
+inline void ShowWinningMessage() {for (unsigned char i = 0; i < 6; i++) {printf("%s",WinningMessage[i].c_str());}}
 
 #endif //If header was already called load nothing

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: 1.1.2
+Current Revision: 1.1.3
 Change Log---------------------------------------------------------------------------------------------------------------------------------------------------
 Date		Revision	Changed By		Changes
 ------  	---------   ------------	---------------------------------------------------------------------------------------------------------------------
@@ -32,6 +32,8 @@ Date		Revision	Changed By		Changes
 =============================================================================================================================================================
 2015/04/17	1.1.2		Patrick Rye		-Added more comments
 										-Added ability to get monster name.
+=============================================================================================================================================================
+2015/04/25	1.1.3		Patrick Rye		-Fixed some small bugs.
 =============================================================================================================================================================										
 */
 /*********************************************************************************************************/
@@ -884,6 +886,7 @@ char PlayerInitialize()
 	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;
 	unsigned char intSkillPointsLeft = 100;
+	StatsGoto:
 	cout<<"You have "<< (int)intSkillPointsLeft <<" points to spend however you desire on these five stats, however each stat must have at least 1 point."<<endl;
 	do 
 	{
@@ -896,6 +899,11 @@ char PlayerInitialize()
 		}
 		intStr = floor(intStr);
 	}while (intStr < 1);
+	if (intStr >= intSkillPointsLeft)
+	{
+		cout<<"\nYou used too many points please try again!\n";
+		goto StatsGoto;
+	}
 	intSkillPointsLeft -= intStr;
 	//A check to see if they put too many points into a stat
 	//Since each stat must have at least 1 point
@@ -916,6 +924,11 @@ char PlayerInitialize()
 		}
 		intCons = floor(intCons);
 	}while (intCons <1);
+	if (intCons >= intSkillPointsLeft)
+	{
+		cout<<"\nYou used too many points please try again!\n";
+		goto StatsGoto;
+	}
 	intSkillPointsLeft -= intCons;
 	if(intSkillPointsLeft < 3)
 	{
@@ -934,6 +947,11 @@ char PlayerInitialize()
 		}
 		intDef = floor(intDef);
 	}while (intDef <1);
+	if (intDef >= intSkillPointsLeft)
+	{
+		cout<<"\nYou used too many points please try again!\n";
+		goto StatsGoto;
+	}
 	intSkillPointsLeft -= intDef;
 	if(intSkillPointsLeft < 2)
 	{
@@ -952,6 +970,11 @@ char PlayerInitialize()
 		}
 		intDex = floor(intDex);
 	}while (intDex < 1);
+	if (intDex >= intSkillPointsLeft)
+	{
+		cout<<"\nYou used too many points please try again!\n";
+		goto StatsGoto;
+	}
 	intSkillPointsLeft -= intDex;
 	if(intSkillPointsLeft < 1)
 	{

main.cpp

@@ -1,7 +1,7 @@
 /*
 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: 1.2c
+Current Revision: 1.4c
 Change Log---------------------------------------------------------------------------------------------------------------------------------------------------
 Date		Revision	Changed By		Changes
 ------  	---------   ------------	---------------------------------------------------------------------------------------------------------------------
@@ -21,6 +21,12 @@ Date		Revision	Changed By		Changes
 										-Implemented mana system.
 =============================================================================================================================================================
 2015/03/18	1.2c		Patrick Rye		-Removed unneeded libraries.
+=============================================================================================================================================================
+2015/04/25	1.3c		Patrick Rye		-Attempted to correct my misunderstanding of how headers work, broke everything had to revert back.
+										-Keeping record of attempt for future reference
+=============================================================================================================================================================
+2015/07/06	1.4c		Patrick Rye		-Added locked doors.
+										-Added Keys which can be found randomly on some monsters
 =============================================================================================================================================================				
 */
 
@@ -44,7 +50,7 @@ Dungeon d; //Define the dungeon class as 'd' so I can use functions in there any
 unsigned char intMainLevel = 1; //The level of the dungeon.
 unsigned char 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 = "1.2c"; //The current version of this program, stored in a save file later on.
+const string CurrentVerison = "1.4c"; //The current version of this program, stored in a save file later on.
 /*********************************************************************************************************/
 //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.