[escape-from-the-masters-lair] push by DarkOppr...@gmail.com - Not a lot. on 2011-04-17 09:37 GMT
escape-from-th...@googlecode.com
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Sun Apr 17 02:37:44 2011
Log: Not a lot.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=e9f19ea9ba6e
Modified:
/Development/To Do.rtf
/Escape from the Master's Lair.layout
/data/templates/races
/data/templates/starting_equipment
/player.cpp
/player_windows.cpp
/render.cpp
/update.cpp
/version.h
=======================================
--- /Development/To Do.rtf Sun Apr 17 01:59:21 2011
+++ /Development/To Do.rtf Sun Apr 17 02:37:44 2011
@@ -6,6 +6,7 @@
-Add the highscores list.\par
-Handle anything left in the code in comments.\lang9\par
-Make sure everything displays nicely with different resolutions.\par
+-Add random character selection stuff to game startup.\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 Sat Apr 16 21:44:48 2011
+++ /Escape from the Master's Lair.layout Sun Apr 17 02:37:44 2011
@@ -8,7 +8,7 @@
<Cursor1 position="364" topLine="0" />
</File>
<File name="ai.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="36" topLine="0" />
+ <Cursor1 position="347" topLine="0" />
</File>
<File name="ai_keys.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="707" topLine="13" />
@@ -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="999" topLine="24" />
+ <Cursor1 position="756" topLine="18" />
</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="3704" topLine="109" />
+ <Cursor1 position="2035" topLine="63" />
</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" />
@@ -50,7 +50,7 @@
<Cursor1 position="620" topLine="6" />
</File>
<File name="creature_combat.cpp" open="0" top="0" tabpos="7" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="3034" topLine="64" />
+ <Cursor1 position="312" topLine="0" />
</File>
<File name="creature_commands.cpp" open="0" top="0" tabpos="7" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="5518" topLine="144" />
@@ -65,16 +65,16 @@
<Cursor1 position="2518" topLine="56" />
</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="3482" topLine="150" />
+ <Cursor1 position="776" topLine="18" />
</File>
<File name="creature_skills.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4380" topLine="126" />
+ <Cursor1 position="2009" topLine="97" />
</File>
<File name="dungeon.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="140" topLine="0" />
+ <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="31279" topLine="798" />
+ <Cursor1 position="31579" topLine="805" />
</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" />
@@ -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="1" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4831" topLine="276" />
+ <File name="enumerations.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="835" topLine="36" />
</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="2207" topLine="80" />
+ <Cursor1 position="5012" topLine="191" />
</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" />
@@ -115,6 +115,12 @@
<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" />
</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" />
+ </File>
+ <File name="grammar.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="347" topLine="0" />
+ </File>
<File name="image.cpp" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="308" topLine="0" />
</File>
@@ -134,16 +140,16 @@
<Cursor1 position="6386" topLine="6" />
</File>
<File name="item_combat.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="10469" topLine="79" />
+ <Cursor1 position="358" topLine="0" />
</File>
<File name="item_save_load.cpp" open="0" top="0" tabpos="14" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3653" topLine="162" />
</File>
<File name="item_template.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="232" topLine="0" />
+ <Cursor1 position="255" topLine="0" />
</File>
<File name="item_template.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="296" topLine="0" />
+ <Cursor1 position="460" topLine="0" />
</File>
<File name="level.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="2385" topLine="185" />
@@ -164,7 +170,7 @@
<Cursor1 position="198" topLine="0" />
</File>
<File name="material_properties.cpp" open="0" top="0" tabpos="1"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="390" topLine="12" />
+ <Cursor1 position="2245" topLine="54" />
</File>
<File name="material_properties.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="476" topLine="3" />
@@ -179,13 +185,13 @@
<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="2427" topLine="60" />
+ <Cursor1 position="424" topLine="30" />
</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="313" topLine="31" />
</File>
- <File name="monster_ai.cpp" open="1" top="1" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2051" topLine="56" />
+ <File name="monster_ai.cpp" open="0" top="0" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="1896" topLine="52" />
</File>
<File name="monster_ai_states.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1747" topLine="33" />
@@ -203,19 +209,19 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="player.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="5081" topLine="179" />
+ <Cursor1 position="972" topLine="48" />
</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="3010" topLine="97" />
+ <Cursor1 position="5158" topLine="163" />
</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="3462" topLine="112" />
+ <Cursor1 position="5136" topLine="156" />
</File>
- <File name="player_starting_gold.h" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="180" topLine="0" />
+ <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="39449" topLine="1090" />
+ <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="43104" topLine="1163" />
</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" />
@@ -223,11 +229,11 @@
<File name="quit.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="race.cpp" open="1" top="0" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="401" topLine="0" />
+ <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" />
</File>
- <File name="race.h" open="1" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="18" topLine="0" />
+ <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" />
</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="4101" topLine="164" />
@@ -241,8 +247,8 @@
<File name="random_number_generator.h" open="0" top="0" tabpos="0"
split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="236" topLine="0" />
</File>
- <File name="render.cpp" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2853" topLine="72" />
+ <File name="render.cpp" open="1" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="11885" topLine="384" />
</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" />
@@ -260,13 +266,13 @@
<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="25599" topLine="420" />
+ <Cursor1 position="6792" topLine="42" />
</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="207" topLine="0" />
+ <Cursor1 position="2465" topLine="70" />
</File>
<File name="templates_strings.cpp" open="0" top="0" tabpos="6" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="7031" topLine="288" />
+ <Cursor1 position="6855" topLine="288" />
</File>
<File name="tile.cpp" open="0" top="0" tabpos="5" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="3899" topLine="96" />
@@ -289,8 +295,8 @@
<File name="tooltip.h" open="0" top="0" tabpos="15" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="update.cpp" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="20220" topLine="441" />
+ <File name="update.cpp" open="1" top="1" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="5434" topLine="136" />
</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 Sun Apr 17 01:59:21 2011
+++ /data/templates/races Sun Apr 17 02:37:44 2011
@@ -241,7 +241,7 @@
<race>
name:pink panther
appearance:f
- color:pink
+ color:rose
weight:300
damage melee:2,4
movement speed:-2
=======================================
--- /data/templates/starting_equipment Sun Apr 17 01:59:21 2011
+++ /data/templates/starting_equipment Sun Apr 17 02:37:44 2011
@@ -24,22 +24,6 @@
</weapon>
</item>
- <item category:weapon>
- <DO NOT SPAWN>
- name:simple wooden short sword
- plural name:simple wooden short swords
- writing:
- appearance:)
- stackable:0
- size:1.5
- color:wood
- material:wood
- <weapon>
- governing weapon skill:bladed weapons
- weapon category:short blades
- </weapon>
- </item>
-
<item category:weapon>
<DO NOT SPAWN>
name:simple wooden long sword
=======================================
--- /player.cpp Sun Apr 17 01:59:21 2011
+++ /player.cpp Sun Apr 17 02:37:44 2011
@@ -51,8 +51,6 @@
available_starting_items.push_back("simple wooden dagger");
- available_starting_items.push_back("simple wooden short sword");
-
available_starting_items.push_back("simple wooden long sword");
available_starting_items.push_back("simple wooden axe");
=======================================
--- /player_windows.cpp Sun Apr 17 01:59:21 2011
+++ /player_windows.cpp Sun Apr 17 02:37:44 2011
@@ -1172,10 +1172,10 @@
ss.clear();ss.str("");ss<<"Death Certificate";msg=ss.str();
font.show((option_screen_width-msg.length()*font.spacing_x)/2.0,80,msg,font_color);
- ss.clear();ss.str("");ss<<"I, Aesop Thanatos, Clerk of the Department
of Adventurer Reclamations";msg=ss.str();
- font_small.show(240,95+font.spacing_y,msg,font_color);
-
- ss.clear();ss.str("");ss<<"in the Lair of Loathing, it being an office
of record, do hereby certify that the records in my";msg=ss.str();
+ ss.clear();ss.str("");ss<<"I, Aesop Thanatos, Clerk of the Department
of Adventurer Reclamations in the Lair of Loathing,";msg=ss.str();
+ font_small.show(50,95+font.spacing_y,msg,font_color);
+
+ ss.clear();ss.str("");ss<<"it being an office of record, do hereby
certify that the records in my";msg=ss.str();
font_small.show(50,95+font.spacing_y+font_small.spacing_y,msg,font_color);
ss.clear();ss.str("");ss<<"office show that ";ss<<name;ss<<" died
at ";ss<<end_time;ss<<" on dungeon level ";ss<<current_level+1;ss<<",
having reached, at the highest,";msg=ss.str();
=======================================
--- /render.cpp Fri Apr 15 17:11:18 2011
+++ /render.cpp Sun Apr 17 02:37:44 2011
@@ -396,10 +396,10 @@
new_color=color_shorts_to_doubles(176,224,230);
break;
case COLOR_BLOOD:
- new_color=color_shorts_to_doubles(203,65,11);
+ new_color=color_shorts_to_doubles(244,60,22);
break;
case COLOR_BLOOD_DRIED:
- new_color=color_shorts_to_doubles(203,100,59);
+ new_color=color_shorts_to_doubles(203,65,11);
break;
}
=======================================
--- /update.cpp Sat Apr 16 07:21:30 2011
+++ /update.cpp Sun Apr 17 02:37:44 2011
@@ -143,10 +143,10 @@
if(random_range(0,99)<75){
///Maybe this should be based on the creature's size.
if(random_range(0,99)<30){
-
vector_levels[current_level].draw_circle_covering(vector_levels[current_level].monsters[i].x,vector_levels[current_level].monsters[i].y,random_range(4,5),COVERING_BLOOD_LOTS,60);
+
vector_levels[current_level].draw_circle_covering(vector_levels[current_level].monsters[i].x,vector_levels[current_level].monsters[i].y,random_range(3,3),COVERING_BLOOD_LOTS,60);
}
else{
-
vector_levels[current_level].draw_circle_covering(vector_levels[current_level].monsters[i].x,vector_levels[current_level].monsters[i].y,random_range(3,4),COVERING_BLOOD_LITTLE,60);
+
vector_levels[current_level].draw_circle_covering(vector_levels[current_level].monsters[i].x,vector_levels[current_level].monsters[i].y,random_range(3,3),COVERING_BLOOD_LITTLE,60);
}
}
=======================================
--- /version.h Sun Apr 17 01:59:21 2011
+++ /version.h Sun Apr 17 02:37:44 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 2;
- static const long BUILD = 2862;
- static const long REVISION = 15882;
+ static const long BUILD = 2867;
+ static const long REVISION = 15916;
//Miscellaneous Version Types
- static const long BUILDS_COUNT = 6602;
- #define RC_FILEVERSION 0,2,2862,15882
- #define RC_FILEVERSION_STRING "0, 2, 2862, 15882\0"
- static const char FULLVERSION_STRING[] = "0.2.2862.15882";
+ static const long BUILDS_COUNT = 6616;
+ #define RC_FILEVERSION 0,2,2867,15916
+ #define RC_FILEVERSION_STRING "0, 2, 2867, 15916\0"
+ static const char FULLVERSION_STRING[] = "0.2.2867.15916";
//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 2;
+ static const long BUILD_HISTORY = 7;
}