[escape-from-the-masters-lair] 5 new revisions pushed by DarkOppr...@gmail.com on 2011-04-19 08:42 GMT

1 view
Skip to first unread message

escape-from-th...@googlecode.com

unread,
Apr 19, 2011, 4:43:43 AM4/19/11
to escape-from-th...@googlegroups.com
5 new revisions:

Revision: 99ea4a42ee71
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 19:58:29 2011
Log: Fixed water and oil priority in item gen.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=99ea4a42ee71

Revision: bc872717831e
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 21:10:35 2011
Log: Added the icon/window icon.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=bc872717831e

Revision: 17fd5966d836
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 21:25:22 2011
Log: Added a description to the race template system.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=17fd5966d836

Revision: 20cf4ff0ca46
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Tue Apr 19 01:14:25 2011
Log: Added random startup selector.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=20cf4ff0ca46

Revision: 63ec1c068908
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Tue Apr 19 01:42:48 2011
Log: Began making all races truly unique.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=63ec1c068908

==============================================================================
Revision: 99ea4a42ee71
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 19:58:29 2011
Log: Fixed water and oil priority in item gen.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=99ea4a42ee71

Modified:
/Development/To Do.rtf
/Escape from the Master's Lair.layout.save
/creature.cpp
/dungeon_generation.cpp
/player_windows.cpp
/version.h

=======================================
--- /Development/To Do.rtf Mon Apr 18 18:50:18 2011
+++ /Development/To Do.rtf Mon Apr 18 19:58:29 2011
@@ -2,6 +2,8 @@
{\*\generator Msftedit
5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl240\slmult1\lang1033\strike\f0\fs22
-Implement drinking from fountains.\strike0\par
\strike -Handle anything left in the code in comments.\lang9\strike0\par
-Add random character selection stuff to game startup.\par
+-Finish making current races all unique.\par
+-Add race descriptions to race selection screen.\par
\par
AFTER BRANCH:\par
-Clean up the focused skills selection window. Letters should be in proper
order. All in one column.\par
=======================================
--- /Escape from the Master's Lair.layout.save Mon Apr 18 18:50:18 2011
+++ /Escape from the Master's Lair.layout.save Mon Apr 18 19:58:29 2011
@@ -38,10 +38,10 @@
<Cursor1 position="325" topLine="0" />
</File>
<File name="creature.cpp" open="0" top="0" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="15238" topLine="444" />
+ <Cursor1 position="9150" topLine="249" />
</File>
<File name="creature.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="10588" topLine="302" />
+ <Cursor1 position="4678" topLine="151" />
</File>
<File name="creature_alchemy.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3400" topLine="48" />
@@ -62,7 +62,7 @@
<Cursor1 position="3573" topLine="79" />
</File>
<File name="creature_other_stats.cpp" open="0" top="0" tabpos="4"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="8620" topLine="267" />
+ <Cursor1 position="8459" topLine="219" />
</File>
<File name="creature_save_load.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1018" topLine="18" />
@@ -74,7 +74,7 @@
<Cursor1 position="198" topLine="0" />
</File>
<File name="dungeon_generation.cpp" open="0" top="0" tabpos="6" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="31579" topLine="805" />
+ <Cursor1 position="29204" topLine="753" />
</File>
<File name="dungeon_location.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="235" topLine="0" />
@@ -89,7 +89,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="enumerations.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="6951" topLine="386" />
+ <Cursor1 position="6930" topLine="206" />
</File>
<File name="font.cpp" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1745" topLine="48" />
@@ -226,7 +226,7 @@
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="57480" topLine="1408" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
=======================================
--- /creature.cpp Mon Apr 18 18:50:18 2011
+++ /creature.cpp Mon Apr 18 19:58:29 2011
@@ -46,7 +46,7 @@
experience=0;
experience_max=300;

- thirst=THIRST_THIRSTY-500;
+ thirst=1000;

base_damage_melee_min=0;
base_damage_melee_max=0;
=======================================
--- /dungeon_generation.cpp Sun Apr 17 01:59:21 2011
+++ /dungeon_generation.cpp Mon Apr 18 19:58:29 2011
@@ -757,27 +757,12 @@

int random_item_template=0;

- if(amount_water_bottles==0){
-
random_item_template=random_range(0,templates.template_items[random_item_category].size()-1+templates.template_items[random_item_category].size()/4.0);
-
if(random_item_template>templates.template_items[random_item_category].size()-1){
+ if((amount_water_bottles==0 || amount_oil_bottles==0 ||
amount_water_bottles==1 || amount_oil_bottles==1) &&
random_item_category==ITEM_DRINK){
+ random_item_template=random_range(0,99);
+ if(random_item_template<50){
random_item_template=player.return_item_template("bottle
of water").index;
}
- }
- else if(amount_oil_bottles==0){
-
random_item_template=random_range(0,templates.template_items[random_item_category].size()-1+templates.template_items[random_item_category].size()/4.0);
-
if(random_item_template>templates.template_items[random_item_category].size()-1){
- random_item_template=player.return_item_template("bottle
of oil").index;
- }
- }
- else if(amount_water_bottles==1){
-
random_item_template=random_range(0,templates.template_items[random_item_category].size()-1+templates.template_items[random_item_category].size()/8.0);
-
if(random_item_template>templates.template_items[random_item_category].size()-1){
- random_item_template=player.return_item_template("bottle
of water").index;
- }
- }
- else if(amount_oil_bottles==1){
-
random_item_template=random_range(0,templates.template_items[random_item_category].size()-1+templates.template_items[random_item_category].size()/8.0);
-
if(random_item_template>templates.template_items[random_item_category].size()-1){
+ else{
random_item_template=player.return_item_template("bottle
of oil").index;
}
}
=======================================
--- /player_windows.cpp Mon Apr 18 18:50:18 2011
+++ /player_windows.cpp Mon Apr 18 19:58:29 2011
@@ -629,7 +629,7 @@
int lines_rendered=0;

//The maximum number of lines before a new column is started.
- int max_lines=35;
+ int max_lines=30;

//The current column.
int column=0;
=======================================
--- /version.h Mon Apr 18 18:50:18 2011
+++ /version.h Mon Apr 18 19:58:29 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2912;
- static const long REVISION = 16170;
+ static const long BUILD = 2920;
+ static const long REVISION = 16209;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6724;
- #define RC_FILEVERSION 0,2,2912,16170
- #define RC_FILEVERSION_STRING "0, 2, 2912, 16170\0"
- static const char FULLVERSION_STRING[] = "0.2.2912.16170";
+ static const long BUILDS_COUNT = 6752;
+ #define RC_FILEVERSION 0,2,2920,16209
+ #define RC_FILEVERSION_STRING "0, 2, 2920, 16209\0"
+ static const char FULLVERSION_STRING[] = "0.2.2920.16209";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 52;
+ static const long BUILD_HISTORY = 60;


}

==============================================================================
Revision: bc872717831e
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 21:10:35 2011
Log: Added the icon/window icon.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=bc872717831e

Added:
/Development/icon.xcf
/Escape from the Master's Lair.rc
/data/images/icon.bmp
/icon.ico
Modified:
/Escape from the Master's Lair.cbp
/Escape from the Master's Lair.layout.save
/game_window.cpp
/game_window.h
/version.h

=======================================
--- /dev/null
+++ /Development/icon.xcf Mon Apr 18 21:10:35 2011
@@ -0,0 +1,140 @@
+gimp xcf file
B B m G
+gimp-comment Created with GIMP gimp-image-grid (style
solid)
+(fgcolor (color-rgba 0.000000 0.000000 0.000000 1.000000))
+(bgcolor (color-rgba 1.000000 1.000000 1.000000 1.000000))
+(xspacing 32.000000)
+(yspacing 32.000000)
+(spacing-unit inches)
+(xoffset 0.000000)
+(yoffset 0.000000)
+(offset-unit inches)
+ ² W
Icon ÿ
+
+ [
o N a a a a a
+ a þ a a
+ a
+ a
+ a
+ ü aa
+
+ a
+ ü aa
+
+ a
+ ü aa
+
+ a
+ ü aa
+
+ c
+ a
+ ü aa
+
+ýçcç ç
+ a ü aa
+
+ýçc
+
+ a ü aa
+
+ýçc
+
+ a ü aa
+
+ýçc
+
+ a ü aa
+
+ýçc
+
+ a
+ ü aa
+
+þçc c
+ a
+ ü aa
+
+ýçcç ç
+ a
+ ü aa
+
+ýçc
+
+ a
+ ü aa
+
+ýçc
+
+ a
+ ü aa
+
+ýçc
+
+ a
+ ü aa
+
+ýçc
+
+ a
+ ü aa
+
+þçc c
+ a
+ ü aa
+
+ ç
+ a ü aa
+
+ a
+ ü aa
+
+
+ a þ a a
+ a þ a a
+ a a am N A A A A A ~ A þ A A ~ A ~ A ~ A
+ ü AA~ ~ A
+ ü AA~ ~ A
+ ü AA~ ~ A
+ ü AA~ ~ ^ ~ A
+ ü AA~ ~ýÜ^Ü Ü ~ A ü AA~ ~ýÜ^~ ~ A ü AA~ ~ýÜ^~ ~ A ü AA~ ~ýÜ^~ ~ A ü AA~ ~ýÜ^~ ~ A
+ ü AA~ ~þÜ^ ^ ~ A
+ ü AA~ ~ýÜ^Ü Ü ~ A
+ ü AA~ ~ýÜ^~ ~ A
+ ü AA~ ~ýÜ^~ ~ A
+ ü AA~ ~ýÜ^~ ~ A
+ ü AA~ ~ýÜ^~ ~ A
+ ü AA~ ~þÜ^ ^ ~ A
+ ü AA~ ~ Ü ~ A ü AA~ ~ A
+ ü AA~
+~ A þ A A ~ A þ A A ~ A A Am N t þ t t t
+ ü t t
+ ü t t
+ ü t t
+ ü t t W t
+ ü t týËWË Ë t ü t týËWt t ü t týËWt t ü t týËWt t ü t týËWt t
+ ü t tþËW W t
+ ü t týËWË Ë t
+ ü t týËWt t
+ ü t týËWt t
+ ü t týËWt t
+ ü t týËWt t
+ ü t tþËW W t
+ ü t t Ë t ü t t
+ ü t
+t þ t þ t m N ÿ ÿ ÿ ÿ ÿ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ ÿ ÿ ÿ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ
+ ÿ ÿ
+ ÿ ÿ ÿ ÿ ÿm
Background ÿ
+
+ þ
"
=======================================
--- /dev/null
+++ /Escape from the Master's Lair.rc Mon Apr 18 21:10:35 2011
@@ -0,0 +1,1 @@
+game_icon ICON "icon.ico"
=======================================
--- /dev/null
+++ /data/images/icon.bmp Mon Apr 18 21:10:35 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++ /icon.ico Mon Apr 18 21:10:35 2011
Binary file, no diff available.
=======================================
--- /Escape from the Master's Lair.cbp Mon Apr 18 02:59:47 2011
+++ /Escape from the Master's Lair.cbp Mon Apr 18 21:10:35 2011
@@ -103,6 +103,9 @@
<Add option="-static-libgcc" />
<Add option="-static-libstdc++" />
</Linker>
+ <Unit filename="Escape from the Master&apos;s Lair.rc">
+ <Option compilerVar="WINDRES" />
+ </Unit>
<Unit filename="MersenneTwister.h" />
<Unit filename="age_limits.h" />
<Unit filename="ai.h" />
=======================================
--- /Escape from the Master's Lair.layout.save Mon Apr 18 19:58:29 2011
+++ /Escape from the Master's Lair.layout.save Mon Apr 18 21:10:35 2011
@@ -109,11 +109,11 @@
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1777" topLine="60" />
</File>
- <File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="464" topLine="182" />
+ <File name="game_window.cpp" open="1" top="1" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="261" topLine="120" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="514" topLine="0" />
+ <Cursor1 position="524" topLine="0" />
</File>
<File name="grammar.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="798" topLine="18" />
@@ -131,7 +131,7 @@
<Cursor1 position="308" topLine="0" />
</File>
<File name="image.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="393" topLine="5" />
+ <Cursor1 position="17" topLine="0" />
</File>
<File name="image_data.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
@@ -226,7 +226,7 @@
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="player_windows.cpp" open="1" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="57480" topLine="1408" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
@@ -254,10 +254,10 @@
<Cursor1 position="236" topLine="0" />
</File>
<File name="render.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="11885" topLine="384" />
+ <Cursor1 position="408" topLine="0" />
</File>
<File name="render.h" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="648" topLine="16" />
+ <Cursor1 position="454" topLine="16" />
</File>
<File name="save_load.cpp" open="0" top="0" tabpos="9" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1774" topLine="55" />
=======================================
--- /game_window.cpp Fri Apr 15 17:11:18 2011
+++ /game_window.cpp Mon Apr 18 21:10:35 2011
@@ -6,6 +6,7 @@
#include "quit.h"
#include "pixels.h"
#include "save_load.h"
+#include "render.h"

#include <time.h>
#include <string>
@@ -16,6 +17,10 @@
SCREEN_BPP=32;

screen=NULL;
+
+ icon=NULL;
+
+ icon_colorkey=0;
}

bool Game_Window::initialize_opengl(){
@@ -101,6 +106,12 @@
//Attempt to center the window on the screen.
SDL_putenv("SDL_VIDEO_CENTERED=center");

+ //Set the window icon.
+ icon=SDL_LoadBMP("data/images/icon.bmp");
+ icon_colorkey=SDL_MapRGB(icon->format,0,0,0);
+ SDL_SetColorKey(icon,SDL_SRCCOLORKEY,icon_colorkey);
+ SDL_WM_SetIcon(icon,NULL);
+
if(!initialize_opengl()){
return false;
}
=======================================
--- /game_window.h Fri Apr 15 17:11:18 2011
+++ /game_window.h Mon Apr 18 21:10:35 2011
@@ -26,7 +26,11 @@

short SCREEN_BPP;

- SDL_Surface *screen;
+ SDL_Surface* screen;
+
+ SDL_Surface* icon;
+
+ Uint32 icon_colorkey;
};

#endif
=======================================
--- /version.h Mon Apr 18 19:58:29 2011
+++ /version.h Mon Apr 18 21:10:35 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2920;
- static const long REVISION = 16209;
+ static const long BUILD = 2928;
+ static const long REVISION = 16255;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6752;
- #define RC_FILEVERSION 0,2,2920,16209
- #define RC_FILEVERSION_STRING "0, 2, 2920, 16209\0"
- static const char FULLVERSION_STRING[] = "0.2.2920.16209";
+ static const long BUILDS_COUNT = 6817;
+ #define RC_FILEVERSION 0,2,2928,16255
+ #define RC_FILEVERSION_STRING "0, 2, 2928, 16255\0"
+ static const char FULLVERSION_STRING[] = "0.2.2928.16255";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 60;
+ static const long BUILD_HISTORY = 68;


}

==============================================================================
Revision: 17fd5966d836
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Mon Apr 18 21:25:22 2011
Log: Added a description to the race template system.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=17fd5966d836

Modified:
/data/templates/races
/player_windows.cpp
/race.cpp
/race.h
/templates.cpp
/version.h

=======================================
--- /data/templates/races Sun Apr 17 02:37:44 2011
+++ /data/templates/races Mon Apr 18 21:25:22 2011
@@ -429,6 +429,7 @@
//Armor skill penalty
<race>
name:human
+ description:a boring race<NEWLINE>this is a new line
appearance:@
color:white
weight:55
=======================================
--- /player_windows.cpp Mon Apr 18 19:58:29 2011
+++ /player_windows.cpp Mon Apr 18 21:25:22 2011
@@ -653,10 +653,20 @@

font_small.show(5+column*column_width,font_small.spacing_y*2+font_small.spacing_y*lines_rendered++,msg,render_color);
}

- if(get_race.length()>0 &&
atoi(get_race.c_str())<templates.template_races.size()){
- ss.clear();ss.str("");ss<<"Press [Enter] to continue
--> ";msg=ss.str();
-
font_small.show(option_screen_width-font_small.spacing_x*msg.length(),0,msg,COLOR_WHITE);
- }
+ int selected_race=-1;
+
+ if(get_race.length()>0){
+ selected_race=atoi(get_race.c_str());
+
+ if(selected_race<templates.template_races.size()){
+ ss.clear();ss.str("");ss<<"Press [Enter] to continue
--> ";msg=ss.str();
+
font_small.show(option_screen_width-font_small.spacing_x*msg.length(),0,msg,COLOR_WHITE);
+
+
ss.clear();ss.str("");ss<<templates.template_races[selected_race].description;msg=ss.str();
+
font_small.show(10,option_screen_height-font_small.spacing_y*5,msg,COLOR_WHITE);
+ }
+ }
+
ss.clear();ss.str("");ss<<" <-- Press [Escape] to go
back";msg=ss.str();
font_small.show(0,0,msg,COLOR_WHITE);
}
=======================================
--- /race.cpp Sun Apr 17 01:59:21 2011
+++ /race.cpp Mon Apr 18 21:25:22 2011
@@ -16,6 +16,8 @@

prefix_article="a";

+ description="";
+
ai_trait_flees=false;
ai_trait_uses_items=false;
ai_trait_wanders=true;
=======================================
--- /race.h Sun Apr 17 01:59:21 2011
+++ /race.h Mon Apr 18 21:25:22 2011
@@ -25,6 +25,9 @@
//The article ('a' or 'an') to be used before a single one of this
creature in a sentence.
std::string prefix_article;

+ //A description of the race.
+ std::string description;
+
//AI Traits:

bool ai_trait_flees;
=======================================
--- /templates.cpp Sun Apr 17 01:59:21 2011
+++ /templates.cpp Mon Apr 18 21:25:22 2011
@@ -540,6 +540,7 @@

string name="name:";
string prefix_article="prefix article:";
+ string description="description:";
string appearance="appearance:";
string color="color:";
string weight="weight:";
@@ -614,6 +615,18 @@
temp_race.prefix_article=" ";
}
}
+ //Description.
+ else if(icontains(line,description)){
+ //Clear the data name.
+ line.erase(0,description.length());
+
+ temp_race.description=line;
+ if(temp_race.description.length()==0){
+ temp_race.description=" ";
+ }
+
+ replace_all(temp_race.description,"<NEWLINE>","\xA");
+ }
//Appearance.
else if(icontains(line,appearance)){
//Clear the data name.
=======================================
--- /version.h Mon Apr 18 21:10:35 2011
+++ /version.h Mon Apr 18 21:25:22 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2928;
- static const long REVISION = 16255;
+ static const long BUILD = 2933;
+ static const long REVISION = 16278;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6817;
- #define RC_FILEVERSION 0,2,2928,16255
- #define RC_FILEVERSION_STRING "0, 2, 2928, 16255\0"
- static const char FULLVERSION_STRING[] = "0.2.2928.16255";
+ static const long BUILDS_COUNT = 6838;
+ #define RC_FILEVERSION 0,2,2933,16278
+ #define RC_FILEVERSION_STRING "0, 2, 2933, 16278\0"
+ static const char FULLVERSION_STRING[] = "0.2.2933.16278";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 68;
+ static const long BUILD_HISTORY = 73;


}

==============================================================================
Revision: 20cf4ff0ca46
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Tue Apr 19 01:14:25 2011
Log: Added random startup selector.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=20cf4ff0ca46

Added:
/player_start.cpp
Modified:
/Development/To Do.rtf
/Escape from the Master's Lair.cbp
/Escape from the Master's Lair.layout
/Escape from the Master's Lair.layout.save
/data/templates/races
/monster.cpp
/player.h
/player_windows.cpp
/version.h

=======================================
--- /dev/null
+++ /player_start.cpp Tue Apr 19 01:14:25 2011
@@ -0,0 +1,89 @@
+/* Copyright (c) 2011 Kevin Wells */
+/* Escape from the Master's Lair may be freely redistributed. See license
for details. */
+
+#include "player.h"
+#include "world.h"
+#include "player_starting_values.h"
+
+using namespace std;
+
+void Player::game_start_random_all(){
+ game_start_random_race();
+ game_start_random_skills();
+ game_start_random_items();
+}
+
+void Player::game_start_random_race(){
+ race=random_range(0,templates.template_races.size()-1);
+
+ get_race.clear();
+}
+
+void Player::game_start_random_skills(){
+ focused_skills[0]=-1;
+ focused_skills[1]=-1;
+ focused_skills[2]=-1;
+
+ //Set the player's focused skills randomly.
+ for(int i=0;i<3;){
+ //Choose a random skill.
+ ///short
random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_MAGIC_SUMMONING);
+ ///Disable some skills.
+ short random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_ARMOR);
+ while(random_skill==SKILL_SECURITY || random_skill==SKILL_STEALTH |
| random_skill==SKILL_FIGHTING || random_skill==SKILL_DODGING){
+ random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_ARMOR);
+ }
+ ///
+
+ //If the random skill is different from all of the focused skills.
+ if(random_skill!=focused_skills[0] &&
random_skill!=focused_skills[1] && random_skill!=focused_skills[2]){
+ focused_skills[i]=random_skill;
+ i++;
+ }
+ }
+
+ done_focusing_skills=true;
+}
+
+void Player::game_start_random_items(){
+ starting_items_gold=STARTING_ITEMS_GOLD;
+ starting_items.clear();
+
+ for(int i=0;i<100 && starting_items_gold>0;i++){
+ //Randomly select an item for purchase.
+ int random_item=random_range(0,available_starting_items.size()-1);
+
+ //Determine whether this item has already been purchased.
+ bool item_already_purchased=false;
+
+ for(int n=0;n<starting_items.size();n++){
+ if(random_item==starting_items[n]){
+ item_already_purchased=true;
+ break;
+ }
+ }
+
+ //If the item has not already been purchased.
+ if(!item_already_purchased){
+ //Determine the monetary value of the item.
+ int item_value=0;
+
+ item_template_data
item_template=return_item_template(available_starting_items[random_item]);
+
+
item_value=templates.template_items[item_template.category][item_template.index].monetary_value;
+
+ //If we have enough money for this item.
+ if(item_value<=starting_items_gold){
+ //Add the purchased item.
+ starting_items.push_back(random_item);
+
+ //Remove the item's value from the starting gold.
+ starting_items_gold-=item_value;
+ }
+ }
+ }
+
+ done_buying_start_items=true;
+
+ update_class_name();
+}
=======================================
--- /Development/To Do.rtf Mon Apr 18 19:58:29 2011
+++ /Development/To Do.rtf Tue Apr 19 01:14:25 2011
@@ -1,7 +1,7 @@
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\*\generator Msftedit
5.41.21.2510;}\viewkind4\uc1\pard\sa200\sl240\slmult1\lang1033\strike\f0\fs22
-Implement drinking from fountains.\strike0\par
\strike -Handle anything left in the code in comments.\lang9\strike0\par
--Add random character selection stuff to game startup.\par
+\strike -Add random character selection stuff to game startup.\strike0\par
-Finish making current races all unique.\par
-Add race descriptions to race selection screen.\par
\par
=======================================
--- /Escape from the Master's Lair.cbp Mon Apr 18 21:10:35 2011
+++ /Escape from the Master's Lair.cbp Tue Apr 19 01:14:25 2011
@@ -183,6 +183,7 @@
<Unit filename="player.cpp" />
<Unit filename="player.h" />
<Unit filename="player_scores.cpp" />
+ <Unit filename="player_start.cpp" />
<Unit filename="player_starting_values.h" />
<Unit filename="player_windows.cpp" />
<Unit filename="quit.cpp" />
=======================================
--- /Escape from the Master's Lair.layout Mon Apr 18 18:50:18 2011
+++ /Escape from the Master's Lair.layout Tue Apr 19 01:14:25 2011
@@ -38,10 +38,10 @@
<Cursor1 position="325" topLine="0" />
</File>
<File name="creature.cpp" open="0" top="0" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="15238" topLine="444" />
+ <Cursor1 position="16096" topLine="481" />
</File>
<File name="creature.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="10588" topLine="302" />
+ <Cursor1 position="4678" topLine="151" />
</File>
<File name="creature_alchemy.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3400" topLine="48" />
@@ -62,7 +62,7 @@
<Cursor1 position="3573" topLine="79" />
</File>
<File name="creature_other_stats.cpp" open="0" top="0" tabpos="4"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="8620" topLine="267" />
+ <Cursor1 position="8459" topLine="219" />
</File>
<File name="creature_save_load.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1018" topLine="18" />
@@ -74,7 +74,7 @@
<Cursor1 position="198" topLine="0" />
</File>
<File name="dungeon_generation.cpp" open="0" top="0" tabpos="6" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="31579" topLine="805" />
+ <Cursor1 position="29204" topLine="753" />
</File>
<File name="dungeon_location.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="235" topLine="0" />
@@ -89,7 +89,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="enumerations.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="6951" topLine="386" />
+ <Cursor1 position="6930" topLine="206" />
</File>
<File name="font.cpp" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1745" topLine="48" />
@@ -104,16 +104,16 @@
<Cursor1 position="818" topLine="29" />
</File>
<File name="game.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="5012" topLine="191" />
+ <Cursor1 position="2206" topLine="66" />
</File>
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1777" topLine="60" />
</File>
<File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="464" topLine="182" />
+ <Cursor1 position="3456" topLine="96" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="514" topLine="0" />
+ <Cursor1 position="553" topLine="0" />
</File>
<File name="grammar.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="798" topLine="18" />
@@ -131,7 +131,7 @@
<Cursor1 position="308" topLine="0" />
</File>
<File name="image.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="393" topLine="5" />
+ <Cursor1 position="17" topLine="0" />
</File>
<File name="image_data.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
@@ -226,8 +226,8 @@
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="57480" topLine="1408" />
+ <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="36480" topLine="1017" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
@@ -236,10 +236,10 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="race.cpp" open="0" top="0" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="339" topLine="0" />
+ <Cursor1 position="362" topLine="0" />
</File>
<File name="race.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="666" topLine="9" />
+ <Cursor1 position="678" topLine="3" />
</File>
<File name="random_chance.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="2427" topLine="76" />
@@ -254,10 +254,10 @@
<Cursor1 position="236" topLine="0" />
</File>
<File name="render.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="11885" topLine="384" />
+ <Cursor1 position="408" topLine="0" />
</File>
<File name="render.h" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="648" topLine="16" />
+ <Cursor1 position="454" topLine="16" />
</File>
<File name="save_load.cpp" open="0" top="0" tabpos="9" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1774" topLine="55" />
@@ -272,7 +272,7 @@
<Cursor1 position="242" topLine="0" />
</File>
<File name="templates.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="18289" topLine="135" />
+ <Cursor1 position="21479" topLine="125" />
</File>
<File name="templates.h" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="2465" topLine="70" />
=======================================
--- /Escape from the Master's Lair.layout.save Mon Apr 18 21:10:35 2011
+++ /Escape from the Master's Lair.layout.save Tue Apr 19 01:14:25 2011
@@ -38,7 +38,7 @@
<Cursor1 position="325" topLine="0" />
</File>
<File name="creature.cpp" open="0" top="0" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="9150" topLine="249" />
+ <Cursor1 position="16096" topLine="481" />
</File>
<File name="creature.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="4678" topLine="151" />
@@ -104,16 +104,16 @@
<Cursor1 position="818" topLine="29" />
</File>
<File name="game.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="5012" topLine="191" />
+ <Cursor1 position="1930" topLine="78" />
</File>
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1777" topLine="60" />
</File>
- <File name="game_window.cpp" open="1" top="1" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="261" topLine="120" />
+ <File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3456" topLine="96" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="524" topLine="0" />
+ <Cursor1 position="553" topLine="0" />
</File>
<File name="grammar.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="798" topLine="18" />
@@ -191,7 +191,7 @@
<Cursor1 position="255" topLine="0" />
</File>
<File name="monster.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="11064" topLine="303" />
+ <Cursor1 position="4027" topLine="83" />
</File>
<File name="monster.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1103" topLine="27" />
@@ -217,17 +217,20 @@
<File name="player.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="9326" topLine="286" />
</File>
- <File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4482" topLine="145" />
+ <File name="player.h" open="1" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="2128" topLine="64" />
</File>
<File name="player_scores.cpp" open="0" top="0" tabpos="5" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="6880" topLine="222" />
</File>
+ <File name="player_start.cpp" open="1" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="0" topLine="0" />
+ </File>
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="1" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="57480" topLine="1408" />
+ <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="36480" topLine="1017" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
@@ -236,10 +239,10 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="race.cpp" open="0" top="0" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="339" topLine="0" />
+ <Cursor1 position="362" topLine="0" />
</File>
<File name="race.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="666" topLine="9" />
+ <Cursor1 position="678" topLine="3" />
</File>
<File name="random_chance.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="2427" topLine="76" />
@@ -272,7 +275,7 @@
<Cursor1 position="242" topLine="0" />
</File>
<File name="templates.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="18289" topLine="135" />
+ <Cursor1 position="21479" topLine="125" />
</File>
<File name="templates.h" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="2465" topLine="70" />
@@ -302,7 +305,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="update.cpp" open="0" top="0" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="15835" topLine="352" />
+ <Cursor1 position="182" topLine="0" />
</File>
<File name="update.h" open="0" top="0" tabpos="11" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="249" topLine="0" />
=======================================
--- /data/templates/races Mon Apr 18 21:25:22 2011
+++ /data/templates/races Tue Apr 19 01:14:25 2011
@@ -9,16 +9,18 @@
//Slight melee damage penalty

<race>
- name:polar bear
+ name:brown bear
+ description:
appearance:B
- color:white
- weight:350
+ color:brown
+ weight:300
health:15
damage melee:-1,-2
</race>

<race>
name:black bear
+ description:
appearance:B
color:dark blue
weight:125
@@ -27,16 +29,18 @@
</race>

<race>
- name:brown bear
+ name:polar bear
+ description:
appearance:B
- color:brown
- weight:300
+ color:white
+ weight:350
health:15
damage melee:-1,-2
</race>

<race>
name:giant panda
+ description:
appearance:B
color:blue
weight:125
@@ -52,6 +56,7 @@

<race>
name:sewer rat
+ description:
appearance:r
color:dark brown
weight:0.5
@@ -61,6 +66,7 @@

<race>
name:giant rat
+ description:
appearance:r
color:dark gray
weight:0.5
@@ -70,6 +76,7 @@

<race>
name:groundhog
+ description:
appearance:r
color:brown
weight:0.5
@@ -79,6 +86,7 @@

<race>
name:mouse
+ description:
appearance:r
color:light gray
weight:0.02
@@ -93,6 +101,7 @@

<race>
name:puppy
+ description:
appearance:c
color:white
weight:300
@@ -101,6 +110,7 @@

<race>
name:dog
+ description:
appearance:c
color:white
weight:300
@@ -109,6 +119,7 @@

<race>
name:large dog
+ description:
appearance:c
color:white
weight:300
@@ -117,6 +128,7 @@

<race>
name:hell hound pup
+ description:
appearance:c
color:red
weight:300
@@ -125,6 +137,7 @@

<race>
name:hell hound
+ description:
appearance:c
color:red
weight:300
@@ -133,6 +146,7 @@

<race>
name:wolf cub
+ description:
appearance:c
color:gray
weight:300
@@ -141,6 +155,7 @@

<race>
name:wolf
+ description:
appearance:c
color:gray
weight:300
@@ -149,6 +164,7 @@

<race>
name:coyote
+ description:
appearance:c
color:payne's gray
weight:300
@@ -157,6 +173,7 @@

<race>
name:jackal
+ description:
appearance:c
color:brown
weight:300
@@ -165,6 +182,7 @@

<race>
name:fox
+ description:
appearance:c
color:sepia
weight:300
@@ -180,6 +198,7 @@

<race>
name:kitten
+ description:
appearance:f
color:blue
weight:300
@@ -190,6 +209,7 @@

<race>
name:housecat
+ description:
appearance:f
color:blue
weight:300
@@ -200,6 +220,7 @@

<race>
name:jaguar
+ description:
appearance:f
color:carrot orange
weight:300
@@ -210,6 +231,7 @@

<race>
name:lynx
+ description:
appearance:f
color:burnt sienna
weight:300
@@ -220,6 +242,7 @@

<race>
name:leopard
+ description:
appearance:f
color:pumpkin
weight:300
@@ -230,6 +253,7 @@

<race>
name:cougar
+ description:
appearance:f
color:sandy brown
weight:300
@@ -240,6 +264,7 @@

<race>
name:pink panther
+ description:
appearance:f
color:rose
weight:300
@@ -250,6 +275,7 @@

<race>
name:tiger
+ description:
appearance:f
color:orange
weight:300
@@ -260,6 +286,7 @@

<race>
name:lion
+ description:
appearance:f
color:burnt orange
weight:250
@@ -276,6 +303,7 @@

<race>
name:wild boar
+ description:
appearance:q
color:pale brown
weight:90
@@ -285,6 +313,7 @@

<race>
name:elephant
+ description:
prefix article:an
appearance:q
color:light gray
@@ -295,6 +324,7 @@

<race>
name:woolly mammoth
+ description:
appearance:q
color:gray
weight:4175
@@ -304,6 +334,7 @@

<race>
name:mastodon
+ description:
appearance:q
color:dark gray
weight:4175
@@ -313,6 +344,7 @@

<race>
name:yak
+ description:
appearance:q
color:brown
weight:4175
@@ -322,6 +354,7 @@

<race>
name:wumpus
+ description:
appearance:q
color:blue
weight:4175
@@ -331,6 +364,7 @@

<race>
name:buffalo
+ description:
appearance:q
color:dark brown
weight:1760
@@ -340,6 +374,7 @@

<race>
name:hippopotamus
+ description:
appearance:q
color:burnt sienna
weight:450
@@ -349,6 +384,7 @@

<race>
name:rhinoceros
+ description:
appearance:q
color:payne's gray
weight:850
@@ -365,6 +401,7 @@

<race>
name:valley orc
+ description:
prefix article:an
appearance:o
color:green
@@ -380,6 +417,7 @@

<race>
name:hill orc
+ description:
appearance:o
color:yellow
weight:55
@@ -394,6 +432,7 @@

<race>
name:cave orc
+ description:
appearance:o
color:gray
weight:55
@@ -408,6 +447,7 @@

<race>
name:Beoghan orc
+ description:
appearance:o
color:blue
weight:55
@@ -447,6 +487,7 @@
//Agility penalty
<race>
name:dwarf
+ description:
appearance:d
color:white
weight:55
@@ -468,6 +509,7 @@

<race>
name:wood elf
+ description:
appearance:e
color:pale brown
weight:55
@@ -482,6 +524,7 @@

<race>
name:high elf
+ description:
appearance:e
color:sandy brown
weight:55
@@ -496,6 +539,7 @@

<race>
name:night elf
+ description:
appearance:e
color:indigo
weight:55
@@ -510,6 +554,7 @@

<race>
name:cave elf
+ description:
appearance:e
color:light gray
weight:55
@@ -524,6 +569,7 @@

<race>
name:kokiri
+ description:
appearance:e
color:green
weight:55
@@ -538,6 +584,7 @@

<race>
name:grid bug
+ description:
appearance:x
color:purple
weight:0.07
=======================================
--- /monster.cpp Mon Apr 18 18:50:18 2011
+++ /monster.cpp Tue Apr 19 01:14:25 2011
@@ -95,8 +95,9 @@
//Set the monster's focused skills.
for(int i=0;i<3;){
//Choose a random skill.
- short
random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_MAGIC_SUMMONING);
+ ///short
random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_MAGIC_SUMMONING);
///Disable some skills.
+ short random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_ARMOR);
while(random_skill==SKILL_SECURITY || random_skill==SKILL_STEALTH |
| random_skill==SKILL_FIGHTING || random_skill==SKILL_DODGING){
random_skill=random_range(SKILL_BLADED_WEAPONS,SKILL_ARMOR);
}
=======================================
--- /player.h Mon Apr 18 18:50:18 2011
+++ /player.h Tue Apr 19 01:14:25 2011
@@ -136,6 +136,13 @@

void update_window_caption(int frame_rate,double ms_per_frame);

+ //Game startup choice helpers.
+
+ void game_start_random_all();
+ void game_start_random_race();
+ void game_start_random_skills();
+ void game_start_random_items();
+
//Handle the windows' input.
void handle_input_no_game();
void handle_input_get_name();
=======================================
--- /player_windows.cpp Mon Apr 18 21:25:22 2011
+++ /player_windows.cpp Tue Apr 19 01:14:25 2011
@@ -159,6 +159,14 @@
keystates[SDLK_RETURN]=NULL;
keystates[SDLK_KP_ENTER]=NULL;
}
+
+ else if(event.key.keysym.unicode>=(Uint16)'*'){
+ game_start_random_race();
+ }
+
+ else if(event.key.keysym.unicode>=(Uint16)'!'){
+ game_start_random_all();
+ }
}

void Player::handle_input_get_focused_skills(){
@@ -276,6 +284,14 @@
keystates[SDLK_RETURN]=NULL;
keystates[SDLK_KP_ENTER]=NULL;
}
+
+ else if(event.key.keysym.unicode>=(Uint16)'*'){
+ game_start_random_skills();
+ }
+
+ else if(event.key.keysym.unicode>=(Uint16)'!'){
+ game_start_random_all();
+ }
}

void Player::handle_input_get_starting_items(){
@@ -368,6 +384,14 @@
keystates[SDLK_RETURN]=NULL;
keystates[SDLK_KP_ENTER]=NULL;
}
+
+ else if(event.key.keysym.unicode>=(Uint16)'*'){
+ game_start_random_items();
+ }
+
+ else if(event.key.keysym.unicode>=(Uint16)'!'){
+ game_start_random_all();
+ }
}

void Player::handle_input_start_message(){
@@ -629,7 +653,7 @@
int lines_rendered=0;

//The maximum number of lines before a new column is started.
- int max_lines=30;
+ int max_lines=29;

//The current column.
int column=0;
@@ -663,9 +687,14 @@

font_small.show(option_screen_width-font_small.spacing_x*msg.length(),0,msg,COLOR_WHITE);


ss.clear();ss.str("");ss<<templates.template_races[selected_race].description;msg=ss.str();
-
font_small.show(10,option_screen_height-font_small.spacing_y*5,msg,COLOR_WHITE);
+
font_small.show(10,option_screen_height-font_small.spacing_y*6,msg,COLOR_WHITE);
}
}
+
+ ss.clear();ss.str("");ss<<"p - Pick a good race for me * -
Randomly choose a race";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y*2,msg,COLOR_WHITE);
+ ss.clear();ss.str("");ss<<"g - Pick a good character for me ! -
Randomly choose a character";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y,msg,COLOR_WHITE);

ss.clear();ss.str("");ss<<" <-- Press [Escape] to go
back";msg=ss.str();
font_small.show(0,0,msg,COLOR_WHITE);
@@ -896,6 +925,12 @@
ss.clear();ss.str("");ss<<"Press [Enter] to continue
--> ";msg=ss.str();

font_small.show(option_screen_width-font_small.spacing_x*msg.length(),0,msg,COLOR_WHITE);
}
+
+ ss.clear();ss.str("");ss<<"p - Pick a good race for me * -
Randomly choose a race";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y*2,msg,COLOR_WHITE);
+ ss.clear();ss.str("");ss<<"g - Pick a good character for me ! -
Randomly choose a character";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y,msg,COLOR_WHITE);
+
ss.clear();ss.str("");ss<<" <-- Press [Escape] to go
back";msg=ss.str();
font_small.show(0,0,msg,COLOR_WHITE);
}
@@ -979,6 +1014,12 @@

ss.clear();ss.str("");ss<<"Press [Enter] to continue
--> ";msg=ss.str();

font_small.show(option_screen_width-font_small.spacing_x*msg.length(),0,msg,COLOR_WHITE);
+
+ ss.clear();ss.str("");ss<<"p - Pick a good race for me * -
Randomly choose a race";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y*2,msg,COLOR_WHITE);
+ ss.clear();ss.str("");ss<<"g - Pick a good character for me ! -
Randomly choose a character";msg=ss.str();
+
font_small.show((option_screen_width-msg.length()*font_small.spacing_x)/2.0,option_screen_height-font_small.spacing_y,msg,COLOR_WHITE);
+
ss.clear();ss.str("");ss<<" <-- Press [Escape] to go
back";msg=ss.str();
font_small.show(0,0,msg,COLOR_WHITE);
}
@@ -1032,7 +1073,7 @@
ss.clear();ss.str("");ss<<"so you must take at least three with
you.";msg=ss.str();

font_small.show(40,75+font.spacing_y*2+font_small.spacing_y*15,msg,COLOR_WHITE);

- ss.clear();ss.str("");ss<<"Go forth, young ";ss<<class_name;ss<<", go
forth and achieve your destiny!";msg=ss.str();
+ ss.clear();ss.str("");ss<<"Go forth,
young ";ss<<templates.template_races[race].name;ss<<", go forth and achieve
your destiny!";msg=ss.str();

font_small.show(40,75+font.spacing_y*2+font_small.spacing_y*16,msg,COLOR_WHITE);

ss.clear();ss.str("");ss<<" <-- Press [Enter] to continue
--> ";msg=ss.str();
=======================================
--- /version.h Mon Apr 18 21:25:22 2011
+++ /version.h Tue Apr 19 01:14:25 2011
@@ -4,7 +4,7 @@
namespace AutoVersion{

//Date Version Types
- static const char DATE[] = "18";
+ static const char DATE[] = "19";
static const char MONTH[] = "04";
static const char YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.04";
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2933;
- static const long REVISION = 16278;
+ static const long BUILD = 2951;
+ static const long REVISION = 16375;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6838;
- #define RC_FILEVERSION 0,2,2933,16278
- #define RC_FILEVERSION_STRING "0, 2, 2933, 16278\0"
- static const char FULLVERSION_STRING[] = "0.2.2933.16278";
+ static const long BUILDS_COUNT = 6881;
+ #define RC_FILEVERSION 0,2,2951,16375
+ #define RC_FILEVERSION_STRING "0, 2, 2951, 16375\0"
+ static const char FULLVERSION_STRING[] = "0.2.2951.16375";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 73;
+ static const long BUILD_HISTORY = 91;


}

==============================================================================
Revision: 63ec1c068908
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Tue Apr 19 01:42:48 2011
Log: Began making all races truly unique.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=63ec1c068908

Modified:
/Development/To Do.rtf
/Escape from the Master's Lair.layout
/Escape from the Master's Lair.layout.save
/data/templates/races
/player_windows.cpp
/version.h

=======================================
--- /Development/To Do.rtf Tue Apr 19 01:14:25 2011
+++ /Development/To Do.rtf Tue Apr 19 01:42:48 2011
@@ -4,6 +4,7 @@
\strike -Add random character selection stuff to game startup.\strike0\par
-Finish making current races all unique.\par
-Add race descriptions to race selection screen.\par
+-Add smart startup choice thing.\par
\par
AFTER BRANCH:\par
-Clean up the focused skills selection window. Letters should be in proper
order. All in one column.\par
=======================================
--- /Escape from the Master's Lair.layout Tue Apr 19 01:14:25 2011
+++ /Escape from the Master's Lair.layout Tue Apr 19 01:42:48 2011
@@ -41,7 +41,7 @@
<Cursor1 position="16096" topLine="481" />
</File>
<File name="creature.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4678" topLine="151" />
+ <Cursor1 position="5133" topLine="325" />
</File>
<File name="creature_alchemy.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3400" topLine="48" />
@@ -88,8 +88,8 @@
<File name="effect.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="enumerations.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="6930" topLine="206" />
+ <File name="enumerations.h" open="1" top="1" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="5044" topLine="278" />
</File>
<File name="font.cpp" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1745" topLine="48" />
@@ -104,7 +104,7 @@
<Cursor1 position="818" topLine="29" />
</File>
<File name="game.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2206" topLine="66" />
+ <Cursor1 position="1930" topLine="78" />
</File>
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1777" topLine="60" />
@@ -191,7 +191,7 @@
<Cursor1 position="255" topLine="0" />
</File>
<File name="monster.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="11064" topLine="303" />
+ <Cursor1 position="4120" topLine="83" />
</File>
<File name="monster.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1103" topLine="27" />
@@ -218,16 +218,19 @@
<Cursor1 position="9326" topLine="286" />
</File>
<File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4482" topLine="145" />
+ <Cursor1 position="3579" topLine="40" />
</File>
<File name="player_scores.cpp" open="0" top="0" tabpos="5" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="6880" topLine="222" />
</File>
+ <File name="player_start.cpp" open="1" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="1786" topLine="42" />
+ </File>
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="36480" topLine="1017" />
+ <File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="12660" topLine="336" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
@@ -302,7 +305,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="update.cpp" open="0" top="0" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="15835" topLine="352" />
+ <Cursor1 position="182" topLine="0" />
</File>
<File name="update.h" open="0" top="0" tabpos="11" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="249" topLine="0" />
=======================================
--- /Escape from the Master's Lair.layout.save Tue Apr 19 01:14:25 2011
+++ /Escape from the Master's Lair.layout.save Tue Apr 19 01:42:48 2011
@@ -41,7 +41,7 @@
<Cursor1 position="16096" topLine="481" />
</File>
<File name="creature.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4678" topLine="151" />
+ <Cursor1 position="5133" topLine="325" />
</File>
<File name="creature_alchemy.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3400" topLine="48" />
@@ -89,7 +89,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="enumerations.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="6930" topLine="206" />
+ <Cursor1 position="3856" topLine="278" />
</File>
<File name="font.cpp" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1745" topLine="48" />
@@ -191,7 +191,7 @@
<Cursor1 position="255" topLine="0" />
</File>
<File name="monster.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4027" topLine="83" />
+ <Cursor1 position="4120" topLine="83" />
</File>
<File name="monster.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1103" topLine="27" />
@@ -217,20 +217,20 @@
<File name="player.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="9326" topLine="286" />
</File>
- <File name="player.h" open="1" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2128" topLine="64" />
+ <File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3579" topLine="40" />
</File>
<File name="player_scores.cpp" open="0" top="0" tabpos="5" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="6880" topLine="222" />
</File>
- <File name="player_start.cpp" open="1" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <File name="player_start.cpp" open="1" top="1" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="0" topLine="0" />
</File>
<File name="player_starting_values.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="196" topLine="0" />
</File>
- <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="36480" topLine="1017" />
+ <File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="8024" topLine="102" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
=======================================
--- /data/templates/races Tue Apr 19 01:14:25 2011
+++ /data/templates/races Tue Apr 19 01:42:48 2011
@@ -5,8 +5,6 @@
//************//
// B - bears: //
//************//
-//Health bonus
-//Slight melee damage penalty

<race>
name:brown bear
@@ -24,8 +22,8 @@
appearance:B
color:dark blue
weight:125
- health:15
- damage melee:-1,-2
+ health:30
+ damage melee:-2,-4
</race>

<race>
@@ -34,8 +32,10 @@
appearance:B
color:white
weight:350
- health:15
- damage melee:-1,-2
+ health:30
+ natural armor:5
+ damage melee:-2,-4
+ movement speed:1
</race>

<race>
@@ -44,60 +44,63 @@
appearance:B
color:blue
weight:125
- health:15
- damage melee:-1,-2
+ health:40
+ natural armor:6
+ damage melee:-2,-4
+ movement speed:2
</race>

//**************//
// r - rodents: //
//**************//
-//Slow
-//HP on levelup bonus

<race>
- name:sewer rat
+ name:mouse
description:
appearance:r
- color:dark brown
- weight:0.5
+ color:light gray
+ weight:0.02
levelup hp range:1,2
- movement speed:2
+ movement speed:1
</race>

<race>
- name:giant rat
+ name:groundhog
description:
appearance:r
- color:dark gray
+ color:brown
weight:0.5
- levelup hp range:1,2
+ levelup hp range:1,3
movement speed:2
</race>

<race>
- name:groundhog
+ name:sewer rat
description:
appearance:r
- color:brown
+ color:dark brown
weight:0.5
levelup hp range:1,2
- movement speed:2
+ movement speed:1
+ health:15
+ speed:50
</race>

<race>
- name:mouse
+ name:giant rat
description:
appearance:r
- color:light gray
- weight:0.02
+ color:dark gray
+ weight:0.5
levelup hp range:1,2
- movement speed:2
+ movement speed:1
+ health:30
+ speed:75
</race>

//**************//
// c - canines: //
//**************//
-//Unarmed bonus

<race>
name:puppy
@@ -105,7 +108,10 @@
appearance:c
color:white
weight:300
- unarmed:-50
+ unarmed:-25
+ bladed weapons:25
+ blunt weapons:25
+ stabbing weapons:25
</race>

<race>
@@ -115,6 +121,9 @@
color:white
weight:300
unarmed:-50
+ bladed weapons:50
+ blunt weapons:50
+ stabbing weapons:50
</race>

<race>
@@ -123,78 +132,89 @@
appearance:c
color:white
weight:300
- unarmed:-50
+ unarmed:-75
+ bladed weapons:75
+ blunt weapons:75
+ stabbing weapons:75
</race>

<race>
- name:hell hound pup
+ name:wolf cub
description:
appearance:c
- color:red
+ color:gray
weight:300
- unarmed:-50
+ health:15
+ armor:25
</race>

<race>
- name:hell hound
+ name:wolf
description:
appearance:c
- color:red
+ color:gray
weight:300
- unarmed:-50
+ health:30
+ armor:50
</race>

<race>
- name:wolf cub
+ name:coyote
description:
appearance:c
- color:gray
+ color:payne's gray
weight:300
- unarmed:-50
+ health:45
+ armor:65
</race>

<race>
- name:wolf
+ name:jackal
description:
appearance:c
- color:gray
+ color:brown
weight:300
unarmed:-50
+ health:30
+ armor:75
</race>

<race>
- name:coyote
+ name:fox
description:
appearance:c
- color:payne's gray
+ color:sepia
weight:300
unarmed:-50
+ health:30
+ bladed weapons:75
+ blunt weapons:75
+ stabbing weapons:75
</race>

<race>
- name:jackal
+ name:hell hound pup
description:
appearance:c
- color:brown
+ color:red
weight:300
- unarmed:-50
+ armor:-25
+ speed:25
</race>

<race>
- name:fox
+ name:hell hound
description:
appearance:c
- color:sepia
+ color:red
weight:300
- unarmed:-50
+ armor:-50
+ speed:50
</race>

//**************//
// f - felines: //
//**************//
-//Fast
-//Melee damage bonus
-//Health penalty

<race>
name:kitten
@@ -202,8 +222,7 @@
appearance:f
color:blue
weight:300
- damage melee:2,4
- movement speed:-2
+ damage melee:1,2
health:-25
</race>

@@ -214,8 +233,7 @@
color:blue
weight:300
damage melee:2,4
- movement speed:-2
- health:-25
+ health:-35
</race>

<race>
@@ -225,7 +243,7 @@
color:carrot orange
weight:300
damage melee:2,4
- movement speed:-2
+ movement speed:-1
health:-25
</race>

@@ -235,9 +253,9 @@
appearance:f
color:burnt sienna
weight:300
- damage melee:2,4
- movement speed:-2
- health:-25
+ damage melee:1,2
+ movement speed:-1
+ health:-20
</race>

<race>
@@ -246,9 +264,9 @@
appearance:f
color:pumpkin
weight:300
- damage melee:2,4
- movement speed:-2
- health:-25
+ unarmed:-25
+ movement speed:-1
+ health:-35
</race>

<race>
@@ -257,9 +275,9 @@
appearance:f
color:sandy brown
weight:300
- damage melee:2,4
- movement speed:-2
- health:-25
+ unarmed:-50
+ movement speed:-1
+ health:-40
</race>

<race>
@@ -268,9 +286,9 @@
appearance:f
color:rose
weight:300
- damage melee:2,4
- movement speed:-2
- health:-25
+ movement speed:-1
+ health:-15
+
</race>

<race>
@@ -279,9 +297,9 @@
appearance:f
color:orange
weight:300
- damage melee:2,4
- movement speed:-2
- health:-25
+ damage melee:1,2
+ movement speed:-1
+ health:-35
</race>

<race>
@@ -292,14 +310,12 @@
weight:250
damage melee:2,4
movement speed:-2
- health:-25
+ health:-40
</race>

//*****************//
// q - quadrupeds: //
//*****************//
-//Slow
-//Health bonus

<race>
name:wild boar
@@ -307,8 +323,8 @@
appearance:q
color:pale brown
weight:90
- health:15
- movement speed:2
+ health:-15
+ movement speed:-1
</race>

<race>
@@ -318,8 +334,8 @@
appearance:q
color:light gray
weight:4175
- health:15
- movement speed:2
+ health:40
+ movement speed:5
</race>

<race>
@@ -328,8 +344,8 @@
appearance:q
color:gray
weight:4175
- health:15
- movement speed:2
+ health:30
+ movement speed:3
</race>

<race>
@@ -339,7 +355,7 @@
color:dark gray
weight:4175
health:15
- movement speed:2
+ movement speed:1
</race>

<race>
@@ -348,6 +364,7 @@
appearance:q
color:brown
weight:4175
+ damage melee:1,2
health:15
movement speed:2
</race>
@@ -358,8 +375,9 @@
appearance:q
color:blue
weight:4175
- health:15
- movement speed:2
+ damage melee:2,4
+ health:30
+ movement speed:4
</race>

<race>
@@ -368,6 +386,7 @@
appearance:q
color:dark brown
weight:1760
+ unarmed:-25
health:15
movement speed:2
</race>
@@ -378,8 +397,9 @@
appearance:q
color:burnt sienna
weight:450
- health:15
- movement speed:2
+ unarmed:-50
+ health:25
+ movement speed:3
</race>

<race>
@@ -388,16 +408,13 @@
appearance:q
color:payne's gray
weight:850
- health:15
- movement speed:2
+ damage melee:1,1
+ health:-15
</race>

//***********//
// o - orcs: //
//***********//
-//Bladed weapons skill bonus
-//Slight melee damage bonus
-//Slight health penalty

<race>
name:valley orc
@@ -408,7 +425,7 @@
weight:55
bladed weapons:-50
damage melee:1,2
- health:-5
+ health:-15
<ai traits>
flees:1
uses items:1
@@ -421,9 +438,9 @@
appearance:o
color:yellow
weight:55
- bladed weapons:-50
+ bladed weapons:-75
damage melee:1,2
- health:-5
+ health:-10
<ai traits>
flees:1
uses items:1
@@ -436,9 +453,9 @@
appearance:o
color:gray
weight:55
- bladed weapons:-50
- damage melee:1,2
- health:-5
+ bladed weapons:-100
+ damage melee:1,3
+ health:-20
<ai traits>
flees:1
uses items:1
@@ -451,9 +468,9 @@
appearance:o
color:blue
weight:55
- bladed weapons:-50
- damage melee:1,2
- health:-5
+ bladed weapons:-125
+ damage melee:2,2
+ health:-25
<ai traits>
flees:1
uses items:1
@@ -464,36 +481,35 @@
// humanoids: //
//************//

-//Bladed weapons skill bonus
-//Slight melee damage bonus
-//Armor skill penalty
<race>
name:human
- description:a boring race<NEWLINE>this is a new line
+ description:Humans are somewhat adept at all forms of melee combat, but
are not very good ranged fighters.
appearance:@
color:white
weight:55
- bladed weapons:-50
+ bladed weapons:-25
+ blunt weapons:-25
+ stabbing weapons:-25
damage melee:1,2
- armor:50
+ damage ranged:-1,-1
+ launcher weapons:50
<ai traits>
flees:1
uses items:1
</ai traits>
</race>

-//Blunt weapons skill bonus
-//Natural armor
-//Agility penalty
<race>
name:dwarf
- description:
+ description:Dwarves are masters of blunt weapons and possess a naturally
tough skin.<NEWLINE>Unfortunately, they are not good with other forms of
melee weaponry, and they are not very agile.
appearance:d
color:white
weight:55
- blunt weapons:-50
+ blunt weapons:-100
natural armor:5
agility:-1
+ bladed weapons:75
+ stabbing weapons:75
<ai traits>
flees:1
uses items:1
@@ -503,9 +519,6 @@
//************//
// e - elves: //
//************//
-//Launcher weapons skill bonus
-//Slight ranged damage bonus
-//Slight levelup hp gain penalty.

<race>
name:wood elf
=======================================
--- /player_windows.cpp Tue Apr 19 01:14:25 2011
+++ /player_windows.cpp Tue Apr 19 01:42:48 2011
@@ -160,11 +160,11 @@
keystates[SDLK_KP_ENTER]=NULL;
}

- else if(event.key.keysym.unicode>=(Uint16)'*'){
+ else if(event.key.keysym.unicode==(Uint16)'*'){
game_start_random_race();
}

- else if(event.key.keysym.unicode>=(Uint16)'!'){
+ else if(event.key.keysym.unicode==(Uint16)'!'){
game_start_random_all();
}
}
@@ -285,11 +285,11 @@
keystates[SDLK_KP_ENTER]=NULL;
}

- else if(event.key.keysym.unicode>=(Uint16)'*'){
+ else if(event.key.keysym.unicode==(Uint16)'*'){
game_start_random_skills();
}

- else if(event.key.keysym.unicode>=(Uint16)'!'){
+ else if(event.key.keysym.unicode==(Uint16)'!'){
game_start_random_all();
}
}
@@ -385,11 +385,11 @@
keystates[SDLK_KP_ENTER]=NULL;
}

- else if(event.key.keysym.unicode>=(Uint16)'*'){
+ else if(event.key.keysym.unicode==(Uint16)'*'){
game_start_random_items();
}

- else if(event.key.keysym.unicode>=(Uint16)'!'){
+ else if(event.key.keysym.unicode==(Uint16)'!'){
game_start_random_all();
}
}
=======================================
--- /version.h Tue Apr 19 01:14:25 2011
+++ /version.h Tue Apr 19 01:42:48 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2951;
- static const long REVISION = 16375;
+ static const long BUILD = 2952;
+ static const long REVISION = 16376;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6881;
- #define RC_FILEVERSION 0,2,2951,16375
- #define RC_FILEVERSION_STRING "0, 2, 2951, 16375\0"
- static const char FULLVERSION_STRING[] = "0.2.2951.16375";
+ static const long BUILDS_COUNT = 6893;
+ #define RC_FILEVERSION 0,2,2952,16376
+ #define RC_FILEVERSION_STRING "0, 2, 2952, 16376\0"
+ static const char FULLVERSION_STRING[] = "0.2.2952.16376";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 91;
+ static const long BUILD_HISTORY = 92;


}
Reply all
Reply to author
Forward
0 new messages