Lmoe merge dda

BetterFont/FONTDATA

@@ -0,0 +1,3 @@
+Fixedsys TTF v5.00c
+17
+32

BetterFont/InstallReadme.txt

@@ -0,0 +1 @@
+Install this Font package and copy FONTDATA to your Cataclysm Data folder for a better resolution and improved font package.

CataclysmWin.cbp

@@ -47,6 +47,7 @@
 		<Unit filename="debug.h" />
 		<Unit filename="defense.cpp" />
 		<Unit filename="dialogue.h" />
+		<Unit filename="disease.cpp" />
 		<Unit filename="disease.h" />
 		<Unit filename="enums.h" />
 		<Unit filename="event.cpp" />
@@ -59,6 +60,8 @@
 		<Unit filename="game.h" />
 		<Unit filename="gamemode.cpp" />
 		<Unit filename="gamemode.h" />
+		<Unit filename="graffiti.cpp" />
+		<Unit filename="graffiti.h" />
 		<Unit filename="help.cpp" />
 		<Unit filename="icon.rc">
 			<Option compilerVar="WINDRES" />
@@ -134,6 +137,9 @@
 		<Unit filename="posix_time.cpp" />
 		<Unit filename="posix_time.h" />
 		<Unit filename="ranged.cpp" />
+		<Unit filename="resource.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
 		<Unit filename="rng.cpp" />
 		<Unit filename="rng.h" />
 		<Unit filename="settlement.cpp" />

DEVELOPER_FAQ.txt

@@ -11,7 +11,7 @@
  5) Some items, like tools or food, also take an iuse::function reference.
     Edit iuse.h and include the function in the class declaration; then edit
     iuse.cpp and define your function.  Functions may be shared among different
-    item types.  
+    item types.
 
 1.2 Adding a monster
  1) Edit mtype.h.  Change the enum mon_id and insert a unique identifier for
@@ -36,8 +36,30 @@
  7) Just like attacks, some monsters may have a special function called when
     they die.  This works the same as attacks, but the relevent files are
     mondeath.h and mondeath.cpp.
+1.3 Adding structures to the map
+  Most "regular" buildings are spawned in cities (large clusters of buildings which are located rather close to each other).
+  In file omdata.h in the enum oter_id structure define names (code identifiers) for your building.
+  If you want your building to be displayed at overmap in different orientations, you should add 4 identifiers for each orientation (south, east, west and north correspondingly).
+  In the same file in structure const oter_t oterlist[num_ter_types]
+  we should define how these buildings will be displayed, how much they obscure vision and which extras set they have. For example:
+      {"mil. surplus",  '^',	c_white,	5, build_extras, false, false},
+      {"mil. surplus",  '>',	c_white,	5, build_extras, false, false},
+      {"mil. surplus",  'v',	c_white,	5, build_extras, false, false},
+      {"mil. surplus",  '<',	c_white,	5, build_extras, false, false}
+  Comments at the beginning of this structure are rather useful.
+  In the file mapgen.cpp find the subroutine called draw_map(...);
+    there you should find a huge variant operator ("switch")
+    where you should put your code defining the new building by adding new case-statement.
+  This should be mentioned that most buildings are built on the square SEEX*2 x SEEY*2 tiles.
+  If you want your building to be spawned not only in city limits
+     you should refer to structures in file omdata.h
+     (starting from the line #define OMSPEC_FREQ 7).
+     These structures are commented in source code. Add new identifier in enum omspec_id structure before
+     NUM_OMSPECS and then add a record in const overmap_special overmap_specials[NUM_OMSPECS] array. For example:
+         {ot_toxic_dump,	   0,  5, 15, -1, mcat_null, 0, 0, 0, 0, &omspec_place::wilderness,0}
+  The comments given in source code to structure struct overmap_special explains the meaning of these constants in the example above.
+
 
-
 	FAQ
 Q: What the heck is up with the map objects?
 

README.md

@@ -1,7 +1,13 @@
-Cataclysm Mod
-============
-Yet Another Darkling Wolf Cataclysm Mod (YADWCM)
+Cataclysm: Dark Days Ahead
+==========================
+You emerge from the shelter into the dim light of an overcast day, and look around for the first time since the disaster.
 
-This is the github for my constantly updating, frequently buggy, Cataclysm Mod.
-Pull requests for new features or bugfixes are welcome, although I'm probably more likely to notice if you poke me on the forum or via email.
-To make suggestions or post bug reports, check out my thread over on the Cataclysm forums at: http://whalesdev.com/forums/index.php?topic=1389.0
+The world as you knew it is gone. A ruined world stands in its place, full of nightmares come to life. Nothing can ever go back to the way it was, before the Cataclysm, but you have to be strong. You have to survive. You have to persevere. If you don't, death will be one of the better outcomes.
+
+Above your head, storm clouds gather, and the rain stings and hisses against your skin. You shoulder your backpack, and start walking. The world has gone to hell, but you get the sinking feeling that there are darker days ahead.
+
+Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While some have described it as a "zombie game", there's far more to Cataclysm than that. Struggle to survive in a harsh, persistant, procedurally generated world. Scavenge the remnants of a dead civilization for for food, equipment, or, if you're lucky, a vehicle with a full tank of gas to get you the hell out of Dodge. Fight to defeat or escape from a wide variety of powerful monstrosities, from zombies to giant insects to killer robots and things far stranger and deadlier, and against the others like yourself, that want what you have...
+
+Build the tools and defenses you will need to overcome the challenges you face, from a strongly fortified lair full of customized firearms and surrounded by pits and landmines, to a mobile, gasoline powered blade spinning fortress of death, tearing apart anything stupid enough to get in the way. And finally, improve! Learn skills to help you survive, acquire mind-bending mutations, and convert your own body into a cybernetic masterpiece.
+
+Make no mistake - there is no other game quite like Cataclysm. How long can you survive?

action.cpp

@@ -111,6 +111,24 @@ std::string action_ident(action_id act)
    return "move_down";
   case ACTION_MOVE_UP:
    return "move_up";
+  case ACTION_CENTER:
+   return "center";
+  case ACTION_SHIFT_N:
+   return "shift_n";
+  case ACTION_SHIFT_NE:
+   return "shift_ne";
+  case ACTION_SHIFT_E:
+   return "shift_e";
+  case ACTION_SHIFT_SE:
+   return "shift_se";
+  case ACTION_SHIFT_S:
+   return "shift_s";
+  case ACTION_SHIFT_SW:
+   return "shift_sw";
+  case ACTION_SHIFT_W:
+   return "shift_w";
+  case ACTION_SHIFT_NW:
+   return "shift_nw";
   case ACTION_OPEN:
    return "open";
   case ACTION_CLOSE:
@@ -129,8 +147,12 @@ std::string action_ident(action_id act)
    return "look";
   case ACTION_PEEK:
    return "peek";
+  case ACTION_LIST_ITEMS:
+   return "listitems";
   case ACTION_INVENTORY:
    return "inventory";
+  case ACTION_COMPARE:
+   return "compare";
   case ACTION_ORGANIZE:
    return "organize";
   case ACTION_USE:
@@ -247,6 +269,24 @@ std::string action_name(action_id act)
    return "Descend Stairs";
   case ACTION_MOVE_UP:
    return "Ascend Stairs";
+  case ACTION_CENTER:
+   return "Center View";
+  case ACTION_SHIFT_N:
+   return "Move View North";
+  case ACTION_SHIFT_NE:
+   return "Move View Northeast";
+  case ACTION_SHIFT_E:
+   return "Move View East";
+  case ACTION_SHIFT_SE:
+   return "Move View Southeast";
+  case ACTION_SHIFT_S:
+   return "Move View South";
+  case ACTION_SHIFT_SW:
+   return "Move View Southwest";
+  case ACTION_SHIFT_W:
+   return "Move View West";
+  case ACTION_SHIFT_NW:
+   return "Move View Northwest";
   case ACTION_OPEN:
    return "Open Door";
   case ACTION_CLOSE:
@@ -265,8 +305,12 @@ std::string action_name(action_id act)
    return "Look Around";
   case ACTION_PEEK:
    return "Peek Around Corners";
+  case ACTION_LIST_ITEMS:
+   return "List all items around the player";
   case ACTION_INVENTORY:
    return "Open Inventory";
+  case ACTION_COMPARE:
+   return "Compare two Items";
   case ACTION_ORGANIZE:
    return "Swap Inventory Letters";
   case ACTION_USE:

action.h

@@ -15,6 +15,16 @@ ACTION_MOVE_W,
 ACTION_MOVE_NW,
 ACTION_MOVE_DOWN,
 ACTION_MOVE_UP,
+// Shift view
+ACTION_CENTER,
+ACTION_SHIFT_N,
+ACTION_SHIFT_NE,
+ACTION_SHIFT_E,
+ACTION_SHIFT_SE,
+ACTION_SHIFT_S,
+ACTION_SHIFT_SW,
+ACTION_SHIFT_W,
+ACTION_SHIFT_NW,
 // Environment Interaction
 ACTION_OPEN,
 ACTION_CLOSE,
@@ -25,8 +35,10 @@ ACTION_BUTCHER,
 ACTION_CHAT,
 ACTION_LOOK,
 ACTION_PEEK,
+ACTION_LIST_ITEMS,
 // Inventory Interaction (including quasi-inventories like bionics)
 ACTION_INVENTORY,
+ACTION_COMPARE,
 ACTION_ORGANIZE,
 ACTION_USE,
 ACTION_USE_WIELDED,

bodypart.cpp

@@ -58,16 +58,16 @@ std::string encumb_text(body_part bp)
 
 body_part random_body_part()
 {
- int rn = rng(0, 30);
+ int rn = rng(0, 100);
  if (rn == 0)
   return bp_eyes;
- if (rn <= 2)
+ if (rn <= 1)
   return bp_mouth;
- if (rn <= 6)
+ if (rn <= 7)
   return bp_head;
- if (rn <= 12)
+ if (rn <= 28)
   return bp_legs;
- if (rn <= 20)
+ if (rn <= 50)
   return bp_arms;
  return bp_torso;
 }

catacurse.cpp

@@ -658,21 +658,21 @@ int start_color(void)
 {
  colorpairs=new pairs[50];
  windowsPalette=new RGBQUAD[16];     //Colors in the struct are BGR!! not RGB!!
- windowsPalette[0]= BGR(0,0,0);
- windowsPalette[1]= BGR(0, 0, 196);
- windowsPalette[2]= BGR(0,196,0);
- windowsPalette[3]= BGR(30,180,196);
- windowsPalette[4]= BGR(196, 0, 0);
- windowsPalette[5]= BGR(180, 0, 196);
- windowsPalette[6]= BGR(200, 170, 0);
- windowsPalette[7]= BGR(196, 196, 196);
- windowsPalette[8]= BGR(96, 96, 96);
- windowsPalette[9]= BGR(64, 64, 255);
- windowsPalette[10]= BGR(0, 240, 0);
- windowsPalette[11]= BGR(0, 255, 255);
- windowsPalette[12]= BGR(255, 20, 20);
- windowsPalette[13]= BGR(240, 0, 255);
- windowsPalette[14]= BGR(255, 240, 0);
+ windowsPalette[0]= BGR(0,0,0); //Oddzball - Black
+ windowsPalette[1]= BGR(0, 0, 255); //Oddzball - Red
+ windowsPalette[2]= BGR(0,100,0); //Oddzball- Green
+ windowsPalette[3]= BGR(23,51,92); //Oddzball- Brown??? -Made Darker
+ windowsPalette[4]= BGR(150, 0, 0); //Oddzball-Blue
+ windowsPalette[5]= BGR(98, 58, 139); //Oddzball-Pink? -Made Purple
+ windowsPalette[6]= BGR(180, 150, 0); //Oddzball-Cyan
+ windowsPalette[7]= BGR(196, 196, 196);//Oddzball-Gray
+ windowsPalette[8]= BGR(77, 77, 77);//Oddzball-Dark Gray -Made Darker Gray
+ windowsPalette[9]= BGR(150, 150, 255); //Oddzball-Light Red/Salmon? -Made Lighter red
+ windowsPalette[10]= BGR(0, 255, 0); //Oddzball-Bright Green
+ windowsPalette[11]= BGR(0, 255, 255); //Oddzball-Yellow
+ windowsPalette[12]= BGR(255, 100, 100); //Oddzball-Dark Blue? -Made Light Blue
+ windowsPalette[13]= BGR(240, 0, 255); //Oddzball- Pink
+ windowsPalette[14]= BGR(255, 240, 0); //Oddzball -Light Cyan?
  windowsPalette[15]= BGR(255, 255, 255);
  return SetDIBColorTable(backbuffer, 0, 16, windowsPalette);
 };

catacurse.h

@@ -15,6 +15,7 @@ typedef unsigned int u_int32_t;
 #define __UNDERSCORE	0x00000200	/* Added characters are underscored. */ //<---------not used
 #define __REVERSE	0x00000400	/* Added characters are reverse             //<---------not used
 					   video. */
+
 #define __BLINK		0x00000800	/* Added characters are blinking. */
 #define __DIM		0x00001000	/* Added characters are dim. */             //<---------not used
 #define __BOLD		0x00002000	/* Added characters are bold. */