Moon phase checking bugfix

Makefile

@@ -2,8 +2,8 @@
 # WARNINGS will spam hundreds of warnings, mostly safe, if turned on
 # DEBUG is best turned on if you plan to debug in gdb -- please do!
 # PROFILE is for use with gprof or a similar program -- don't bother generally
-#WARNINGS = -Wall
-DEBUG = -g
+#WARNINGS = -Wall -Wextra -Wno-switch -Wno-sign-compare -Wno-missing-braces -Wno-unused-parameter -Wno-char-subscripts
+DEBUG = -g3 -ggdb
 #PROFILE = -pg
 
 ODIR = obj
@@ -14,7 +14,7 @@ TARGET = cataclysm
 OS  = $(shell uname -o)
 CXX = g++
 
-CFLAGS = $(WARNINGS) $(DEBUG) $(PROFILE)
+CFLAGS = $(WARNINGS) $(DEBUG) $(PROFILE) --std=c++0x
 
 ifeq ($(OS), Msys)
 LDFLAGS = -static -lpdcurses

Makefile.Windows

@@ -11,12 +11,13 @@ DDIR = .deps
 
 TARGET = cataclysm.exe
 
-CXX = i486-mingw32-g++
+CXX = /usr/local/mingw/bin/i386-mingw32-g++
 
-LINKER = i486-mingw32-ld
+LINKER = /usr/local/mingw/bin/i386-mingw32-ld
 LINKERFLAGS = -Wl,-stack,12000000,-subsystem,windows
 
-CFLAGS = $(WARNINGS) $(DEBUG) $(PROFILE)
+CFLAGS = -O1 -std=gnu++0x
+#CFLAGS = $(WARNINGS) $(DEBUG) $(PROFILE)
 
 LDFLAGS = -static -lgdi32
 

action.cpp

@@ -0,0 +1,166 @@
+#include "game.h"
+#include "keypress.h"
+#include <fstream>
+
+action_id look_up_action(std::string ident);
+
+void game::load_keyboard_settings()
+{
+ std::ifstream fin;
+ fin.open("data/keymap.txt");
+ if (!fin) { // It doesn't exist
+  std::ofstream fout;
+  fout.open("data/keymap.txt");
+  fout << default_keymap_txt();
+  fout.close();
+  fin.open("data/keymap.txt");
+ }
+ if (!fin) { // Still can't open it--probably bad permissions
+  debugmsg("Can't open data/keymap.txt.  This may be a permissions issue.");
+  return;
+ }
+ while (!fin.eof()) {
+  std::string id;
+  fin >> id;
+  if (id == "")
+   getline(fin, id); // Empty line, chomp it
+  else if (id[0] != '#') {
+   action_id act = look_up_action(id);
+   if (act == ACTION_NULL)
+    debugmsg("\
+Warning!  data/keymap.txt contains an unknown action, \"%s\"\n\
+Fix data/keymap.txt at your next chance!", id.c_str());
+   else {
+    while (fin.peek() != '\n' && !fin.eof()) {
+     char ch;
+     fin >> ch;
+     if (keymap.find(ch) != keymap.end())
+      debugmsg("\
+Warning!  '%c' assigned twice in the keymap!\n\
+%s is being ignored.\n\
+Fix data/keymap.txt at your next chance!", ch, id.c_str());
+     else
+      keymap[ ch ] = act;
+    }
+   }
+  } else {
+   getline(fin, id); // Clear the whole line
+  }
+ }
+}
+
+action_id look_up_action(std::string ident)
+{
+ if (ident == "pause")
+  return ACTION_PAUSE;
+ if (ident == "move_n")
+  return ACTION_MOVE_N;
+ if (ident == "move_ne")
+  return ACTION_MOVE_NE;
+ if (ident == "move_e")
+  return ACTION_MOVE_E;
+ if (ident == "move_se")
+  return ACTION_MOVE_SE;
+ if (ident == "move_s")
+  return ACTION_MOVE_S;
+ if (ident == "move_sw")
+  return ACTION_MOVE_SW;
+ if (ident == "move_w")
+  return ACTION_MOVE_W;
+ if (ident == "move_nw")
+  return ACTION_MOVE_NW;
+ if (ident == "move_down")
+  return ACTION_MOVE_DOWN;
+ if (ident == "move_up")
+  return ACTION_MOVE_UP;
+ if (ident == "open")
+  return ACTION_OPEN;
+ if (ident == "close")
+  return ACTION_CLOSE;
+ if (ident == "smash")
+  return ACTION_SMASH;
+ if (ident == "examine")
+  return ACTION_EXAMINE;
+ if (ident == "pickup")
+  return ACTION_PICKUP;
+ if (ident == "butcher")
+  return ACTION_BUTCHER;
+ if (ident == "chat")
+  return ACTION_CHAT;
+ if (ident == "look")
+  return ACTION_LOOK;
+ if (ident == "look_surroundings")
+  return ACTION_LOOK_SURROUNDINGS;
+ if (ident == "inventory")
+  return ACTION_INVENTORY;
+ if (ident == "organize")
+  return ACTION_ORGANIZE;
+ if (ident == "apply")
+  return ACTION_USE;
+ if (ident == "wear")
+  return ACTION_WEAR;
+ if (ident == "take_off")
+  return ACTION_TAKE_OFF;
+ if (ident == "eat")
+  return ACTION_EAT;
+ if (ident == "read")
+  return ACTION_READ;
+ if (ident == "wield")
+  return ACTION_WIELD;
+ if (ident == "pick_style")
+  return ACTION_PICK_STYLE;
+ if (ident == "reload")
+  return ACTION_RELOAD;
+ if (ident == "unload")
+  return ACTION_UNLOAD;
+ if (ident == "throw")
+  return ACTION_THROW;
+ if (ident == "fire")
+  return ACTION_FIRE;
+ if (ident == "fire_burst")
+  return ACTION_FIRE_BURST;
+ if (ident == "drop")
+  return ACTION_DROP;
+ if (ident == "drop_adj")
+  return ACTION_DIR_DROP;
+ if (ident == "bionics")
+  return ACTION_BIONICS;
+ if (ident == "wait")
+  return ACTION_WAIT;
+ if (ident == "craft")
+  return ACTION_CRAFT;
+ if (ident == "construct")
+  return ACTION_CONSTRUCT;
+ if (ident == "sleep")
+  return ACTION_SLEEP;
+ if (ident == "safemode")
+  return ACTION_TOGGLE_SAFEMODE;
+ if (ident == "autosafe")
+  return ACTION_TOGGLE_AUTOSAFE;
+ if (ident == "ignore_enemy")
+  return ACTION_IGNORE_ENEMY;
+ if (ident == "save")
+  return ACTION_SAVE;
+ if (ident == "quit")
+  return ACTION_QUIT;
+ if (ident == "player_data")
+  return ACTION_PL_INFO;
+ if (ident == "map")
+  return ACTION_MAP;
+ if (ident == "missions")
+  return ACTION_MISSIONS;
+ if (ident == "factions")
+  return ACTION_FACTIONS;
+ if (ident == "morale")
+  return ACTION_MORALE;
+ if (ident == "help")
+  return ACTION_HELP;
+ if (ident == "debug")
+  return ACTION_DEBUG;
+ if (ident == "debug_scent")
+  return ACTION_DISPLAY_SCENT;
+ if (ident == "debug_mode")
+  return ACTION_TOGGLE_DEBUGMON;
+
+ return ACTION_NULL;
+}

action.h

@@ -0,0 +1,70 @@
+#ifndef _ACTION_H_
+#define _ACTION_H_
+
+enum action_id {
+ACTION_NULL = 0,
+// Movement
+ACTION_PAUSE,
+ACTION_MOVE_N,
+ACTION_MOVE_NE,
+ACTION_MOVE_E,
+ACTION_MOVE_SE,
+ACTION_MOVE_S,
+ACTION_MOVE_SW,
+ACTION_MOVE_W,
+ACTION_MOVE_NW,
+ACTION_MOVE_DOWN,
+ACTION_MOVE_UP,
+// Environment Interaction
+ACTION_OPEN,
+ACTION_CLOSE,
+ACTION_SMASH,
+ACTION_EXAMINE,
+ACTION_PICKUP,
+ACTION_BUTCHER,
+ACTION_CHAT,
+ACTION_LOOK,
+ACTION_LOOK_SURROUNDINGS,
+// Inventory Interaction (including quasi-inventories like bionics)
+ACTION_INVENTORY,
+ACTION_ORGANIZE,
+ACTION_USE,
+ACTION_WEAR,
+ACTION_TAKE_OFF,
+ACTION_EAT,
+ACTION_READ,
+ACTION_WIELD,
+ACTION_PICK_STYLE,
+ACTION_RELOAD,
+ACTION_UNLOAD,
+ACTION_THROW,
+ACTION_FIRE,
+ACTION_FIRE_BURST,
+ACTION_DROP,
+ACTION_DIR_DROP,
+ACTION_BIONICS,
+// Long-term / special actions
+ACTION_WAIT,
+ACTION_CRAFT,
+ACTION_CONSTRUCT,
+ACTION_SLEEP,
+ACTION_TOGGLE_SAFEMODE,
+ACTION_TOGGLE_AUTOSAFE,
+ACTION_IGNORE_ENEMY,
+ACTION_SAVE,
+ACTION_QUIT,
+// Info Screens
+ACTION_PL_INFO,
+ACTION_MAP,
+ACTION_MISSIONS,
+ACTION_FACTIONS,
+ACTION_MORALE,
+ACTION_HELP,
+// Debug Functions
+ACTION_DEBUG,
+ACTION_DISPLAY_SCENT,
+ACTION_TOGGLE_DEBUGMON,
+NUM_ACTIONS
+};
+
+#endif

addiction.h

@@ -103,7 +103,7 @@ void addict_effect(game *g, addiction &add)
   g->u.moves -= move_pen;
   g->u.int_cur--;
   g->u.str_cur--;
-  if (in >= 20 || int(g->turn) % (100 - in * 5) == 0)
+  if (g->u.stim > -100 && (in >= 20 || int(g->turn) % (100 - in * 5) == 0))
    g->u.stim--;
   if (rng(0, 150) <= in)
    g->u.health--;

artifact.cpp

@@ -64,6 +64,7 @@ It may have unknown powers; use 'a' to activate them.";
 
 // Wielded effects first
   while (!good_effects.empty() && !bad_effects.empty() &&
+         num_good < 3 && num_bad < 3 &&
          (num_good < 1 || num_bad < 1 || one_in(num_good + 1) ||
           one_in(num_bad + 1) || value > 1)) {
    if (value < 1 && one_in(2)) { // Good
@@ -87,6 +88,7 @@ It may have unknown powers; use 'a' to activate them.";
   good_effects = fill_good_passive();
   bad_effects = fill_bad_passive();
   while (one_in(2) && !good_effects.empty() && !bad_effects.empty() &&
+         num_good < 3 && num_bad < 3 &&
          ((num_good > 2 && one_in(num_good + 1)) || num_bad < 1 ||
           one_in(num_bad + 1) || value > 1)) {
    if (value < 1 && one_in(3)) { // Good
@@ -111,6 +113,7 @@ It may have unknown powers; use 'a' to activate them.";
   std::vector<art_effect_active> good_a_effects = fill_good_active();
   std::vector<art_effect_active> bad_a_effects = fill_bad_active();
   while (!good_a_effects.empty() && !bad_a_effects.empty() &&
+         num_good < 3 && num_bad < 3 && 
          ((num_bad > 0 && num_good == 0) || !one_in(3 - num_good) ||
           !one_in(3 - num_bad))) {
    if (!one_in(3)) { // Good effect
@@ -218,6 +221,7 @@ It may have unknown powers; use 'a' to activate them.";
   std::vector<art_effect_passive> bad_effects = fill_bad_passive();
 
   while (!good_effects.empty() && !bad_effects.empty() &&
+         num_good < 3 && num_bad < 3 &&
          (num_good < 1 || one_in(num_good * 2) || value > 1 ||
           (num_bad < 3 && !one_in(3 - num_bad)))) {
    if (value < 1 && one_in(2)) { // Good effect

bionics.cpp

@@ -200,7 +200,7 @@ void player::activate_bionic(int b, game *g)
  case bio_lighter:
   g->draw();
   mvprintw(0, 0, "Torch in which direction?");
-  get_direction(dirx, diry, input());
+  get_direction(g, dirx, diry, input());
   if (dirx == -2) {
    g->add_msg("Invalid direction.");
    power_level += bionics[bio_lighter].power_cost;
@@ -252,7 +252,7 @@ void player::activate_bionic(int b, game *g)
  case bio_emp:
   g->draw();
   mvprintw(0, 0, "Fire EMP in which direction?");
-  get_direction(dirx, diry, input());
+  get_direction(g, dirx, diry, input());
   if (dirx == -2) {
    g->add_msg("Invalid direction.");
    power_level += bionics[bio_emp].power_cost;
@@ -337,7 +337,7 @@ void player::activate_bionic(int b, game *g)
  case bio_lockpick:
   g->draw();
   mvprintw(0, 0, "Unlock in which direction?");
-  get_direction(dirx, diry, input());
+  get_direction(g, dirx, diry, input());
   if (dirx == -2) {
    g->add_msg("Invalid direction.");
    power_level += bionics[bio_lockpick].power_cost;
@@ -432,6 +432,9 @@ charge mechanism, which must be installed from another CBM.");
    ch = getch();
   while (ch != 'q' && ch != '\n' && ch != KEY_ESCAPE);
   if (ch == '\n') {
+   practice(sk_electronics, (100 - chance_of_success) * 1.5);
+   practice(sk_firstaid, (100 - chance_of_success) * 1.0);
+   practice(sk_mechanics, (100 - chance_of_success) * 0.5);
    int success = chance_of_success - rng(1, 100);
    if (success > 0) {
     g->add_msg("Successfully installed batteries.");
@@ -496,6 +499,9 @@ charge mechanism, which must be installed from another CBM.");
  } while (ch != '\n' && ch != 'q' && ch != KEY_ESCAPE);
 
  if (ch == '\n') {
+  practice(sk_electronics, (100 - chance_of_success) * 1.5);
+  practice(sk_firstaid, (100 - chance_of_success) * 1.0);
+  practice(sk_mechanics, (100 - chance_of_success) * 0.5);
   bionic_id id = type->options[selection];
   int success = chance_of_success - rng(1, 100);
   if (success > 0) {

bionics.h

@@ -23,7 +23,6 @@ bio_ads, bio_ods, bio_scent_mask,bio_scent_vision, bio_cloak, bio_painkiller, bi
  bio_heatsink, bio_resonator, bio_time_freeze, bio_teleport, bio_blood_anal,
  bio_blood_filter, bio_alarm,
 bio_evap, bio_lighter, bio_claws, bio_blaster, bio_laser, bio_emp,
-// TODO: fingerhack
  bio_hydraulics, bio_water_extractor, bio_magnet, bio_fingerhack, bio_lockpick,
 bio_ground_sonar,
 max_bio_start,

calendar.cpp

@@ -218,7 +218,7 @@ moon_phase calendar::moon()
 {
  int phase = day / (DAYS_IN_SEASON / 4);
  //phase %= 4;   Redundant?
- if (phase = 3)
+ if (phase == 3)
   return MOON_HALF;
  else
   return moon_phase(phase);