Rewrote map saving; entire map is stored in memory

Author: Whales

Makefile

@@ -3,9 +3,9 @@
 # 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 -Wextra -Wno-switch -Wno-sign-compare -Wno-missing-braces -Wno-unused-parameter -Wno-char-subscripts
-#DEBUG = -g
+DEBUG = -g
 #PROFILE = -pg
-OTHERS = -O3
+#OTHERS = -O3
 
 ODIR = obj
 DDIR = .deps

artifact.cpp

@@ -6,8 +6,8 @@
 
 std::vector<art_effect_passive> fill_good_passive();
 std::vector<art_effect_passive> fill_bad_passive();
-std::vector<art_effect_active> fill_good_active();
-std::vector<art_effect_active> fill_bad_active();
+std::vector<art_effect_active>  fill_good_active();
+std::vector<art_effect_active>  fill_bad_active();
 
 std::string artifact_name(std::string type);
 
@@ -108,24 +108,27 @@ It may have unknown powers; use 'a' to activate them.";
 // Finally, activated effects; not necessarily good or bad
   num_good = 0;
   num_bad = 0;
+  value = 0;
   art->def_charges = 0;
   art->max_charges = 0;
   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
+         num_good < 3 && num_bad < 3 &&
+         (value > 3 || (num_bad > 0 && num_good == 0) ||
+          !one_in(3 - num_good) || !one_in(3 - num_bad))) {
+   if (!one_in(3) && value <= 1) { // Good effect
     int index = rng(0, good_a_effects.size() - 1);
     active_tmp = good_a_effects[index];
     good_a_effects.erase(good_a_effects.begin() + index);
     num_good++;
+    value += active_effect_cost[active_tmp];
    } else { // Bad effect
     int index = rng(0, bad_a_effects.size() - 1);
     active_tmp = bad_a_effects[index];
     bad_a_effects.erase(bad_a_effects.begin() + index);
     num_bad++;
+    value += active_effect_cost[active_tmp];
    }
    art->effects_activated.push_back(active_tmp);
    art->max_charges += rng(1, 3);
@@ -134,6 +137,8 @@ It may have unknown powers; use 'a' to activate them.";
 // If we have charges, pick a recharge mechanism
   if (art->max_charges > 0)
    art->charge_type = art_charge( rng(ARTC_NULL + 1, NUM_ARTCS - 1) );
+  if (one_in(8) && num_bad + num_good >= 4)
+   art->charge_type = ARTC_NULL; // 1 in 8 chance that it can't recharge!
 
   art->id = itypes.size();
   itypes.push_back(art);
@@ -245,6 +250,119 @@ It may have unknown powers; use 'a' to activate them.";
  }
 }
 
+itype* game::new_natural_artifact(artifact_natural_property prop)
+{
+// Natural artifacts are always tools.
+ it_artifact_tool *art = new it_artifact_tool();
+// Pick a form
+ artifact_natural_shape shape =
+               artifact_natural_shape(rng(ARTSHAPE_NULL + 1, ARTSHAPE_MAX - 1));
+ artifact_shape_datum *shape_data = &(artifact_shape_data[shape]);
+// Pick a property
+ artifact_natural_property property = (prop > ARTPROP_NULL ? prop :
+             artifact_natural_property(rng(ARTPROP_NULL + 1, ARTPROP_MAX - 1)));
+ artifact_property_datum *property_data = &(artifact_property_data[property]);
+
+ art->sym = ':';
+ art->color = c_yellow;
+ art->m1 = STONE;
+ art->m2 = MNULL;
+ art->volume = rng(shape_data->volume_min, shape_data->volume_max);
+ art->weight = rng(shape_data->weight_min, shape_data->weight_max);
+ art->melee_dam = 0;
+ art->melee_cut = 0;
+ art->m_to_hit = 0;
+ art->item_flags = 0;
+
+ art->name = property_data->name + " " + shape_data->name;
+ std::stringstream desc;
+ desc << "This " << shape_data->desc << " " << property_data->desc << ".";
+ art->description = desc.str();
+// Add line breaks to the description as necessary
+ size_t pos = 76;
+ while (art->description.length() - pos >= 76) {
+  pos = art->description.find_last_of(' ', pos);
+  if (pos == std::string::npos)
+   pos = art->description.length();
+  else {
+   art->description[pos] = '\n';
+   pos += 76;
+  }
+ }
+
+// Three possibilities: good passive + bad passive, good active + bad active,
+// and bad passive + good active
+ bool good_passive = false, bad_passive = false,
+      good_active  = false, bad_active  = false;
+ switch (rng(1, 3)) {
+  case 1:
+   good_passive = true;
+   bad_passive  = true;
+   break;
+  case 2:
+   good_active = true;
+   bad_active  = true;
+   break;
+  case 3:
+   bad_passive = true;
+   good_active = true;
+   break;
+ }
+
+ int value_to_reach = 0; // This is slowly incremented, allowing for better arts
+ int value = 0;
+ art_effect_passive aep_good = AEP_NULL, aep_bad = AEP_NULL;
+ art_effect_active  aea_good = AEA_NULL, aea_bad = AEA_NULL;
+
+ do {
+  if (good_passive) {
+   aep_good = property_data->passive_good[ rng(0, 3) ];
+   if (aep_good == AEP_NULL || one_in(4))
+    aep_good = art_effect_passive(rng(AEP_NULL + 1, AEP_SPLIT - 1));
+  }
+  if (bad_passive) {
+   aep_bad = property_data->passive_bad[ rng(0, 3) ];
+   if (aep_bad == AEP_NULL || one_in(4))
+    aep_bad = art_effect_passive(rng(AEP_SPLIT + 1, NUM_AEAS - 1));
+  }
+  if (good_active) {
+   aea_good = property_data->active_good[ rng(0, 3) ];
+   if (aea_good == AEA_NULL || one_in(4))
+    aea_good = art_effect_active(rng(AEA_NULL + 1, AEA_SPLIT - 1));
+  }
+  if (bad_active) {
+   aea_bad = property_data->active_bad[ rng(0, 3) ];
+   if (aea_bad == AEA_NULL || one_in(4))
+    aea_bad = art_effect_active(rng(AEA_SPLIT + 1, NUM_AEAS - 1));
+  }
+
+  value = passive_effect_cost[aep_good] + passive_effect_cost[aep_bad] +
+          active_effect_cost[aea_good] +  active_effect_cost[aea_bad];
+  value_to_reach++; // Yes, it is intentional that this is 1 the first check
+ } while (value > value_to_reach);
+
+ if (aep_good != AEP_NULL)
+  art->effects_carried.push_back(aep_good);
+ if (aep_bad != AEP_NULL)
+  art->effects_carried.push_back(aep_bad);
+ if (aea_good != AEA_NULL)
+  art->effects_activated.push_back(aea_good);
+ if (aea_bad != AEA_NULL)
+  art->effects_activated.push_back(aea_bad);
+
+// Natural artifacts ALWAYS can recharge
+// (When "implanting" them in a mundane item, this ability may be lost
+ if (!art->effects_activated.empty()) {
+  art->max_charges = rng(1, 4);
+  art->def_charges = art->max_charges;
+  art->charge_type = art_charge( rng(ARTC_NULL + 1, NUM_ARTCS - 1) );
+ }
+
+ art->id = itypes.size();
+ itypes.push_back(art);
+ return art;
+}
+
 std::vector<art_effect_passive> fill_good_passive()
 {
  std::vector<art_effect_passive> ret;
@@ -494,6 +612,14 @@ void game::add_artifact_messages(std::vector<art_effect_passive> effects)
     add_msg("Your mental state feels protected.");
     break;
 
+   case AEP_RESIST_ELECTRICITY:
+    add_msg("You feel insulated.");
+    break;
+
+   case AEP_CARRY_MORE:
+    add_msg("Your back feels strengthened.");
+    break;
+
    case AEP_HUNGER:
     add_msg("You feel hungry.");
     break;
@@ -521,6 +647,18 @@ void game::add_artifact_messages(std::vector<art_effect_passive> effects)
    case AEP_ATTENTION:
     add_msg("You feel an otherworldly attention upon you...");
     break;
+
+   case AEP_FORCE_TELEPORT:
+    add_msg("You feel a force pulling you inwards.");
+    break;
+
+   case AEP_MOVEMENT_NOISE:
+    add_msg("You hear a rattling noise coming from inside yourself.");
+    break;
+
+   case AEP_BAD_WEATHER:
+    add_msg("You feel storms coming.");
+    break;
   }
  }
 

artifact.h

@@ -21,6 +21,9 @@ enum art_effect_passive {
  AEP_EXTINGUISH, // May extinguish nearby flames
  AEP_GLOW, // Four-tile light source
  AEP_PSYSHIELD, // Protection from stare attacks
+ AEP_RESIST_ELECTRICITY, // Protection from electricity
+ AEP_CARRY_MORE, // Increases carrying capacity by 200
+ AEP_SAP_LIFE, // Killing non-zombie monsters may heal you
 // Splits good from bad
  AEP_SPLIT,
 // Bad
@@ -38,12 +41,17 @@ enum art_effect_passive {
  AEP_INT_DOWN, // Int - 3
  AEP_ALL_DOWN, // All stats - 2
  AEP_SPEED_DOWN, // -20 speed
+ AEP_FORCE_TELEPORT, // Occasionally force a teleport
+ AEP_MOVEMENT_NOISE, // Makes noise when you move
+ AEP_BAD_WEATHER, // More likely to experience bad weather
+ AEP_SICK, // Decreases health
 
  NUM_AEPS
 };
 
 enum art_effect_active {
  AEA_NULL = 0,
+
  AEA_STORM, // Emits shock fields
  AEA_FIREBALL, // Targeted
  AEA_ADRENALINE, // Adrenaline rush
@@ -56,6 +64,10 @@ enum art_effect_active {
  AEA_CONFUSED, // Confuses all monsters in view
  AEA_ENTRANCE, // Chance to make nearby monsters friendly
  AEA_BUGS, // Chance to summon friendly insects
+ AEA_TELEPORT, // Teleports you
+ AEA_LIGHT, // Temporary light source
+ AEA_GROWTH, // Grow plants, a la triffid queen
+ AEA_HURTALL, // Hurts all monsters!
 
  AEA_SPLIT, // Split between good and bad
 
@@ -66,6 +78,13 @@ enum art_effect_active {
  AEA_FIRESTORM, // Spreads minor fire all around you
  AEA_ATTENTION, // Attention from sub-prime denizens
  AEA_TELEGLOW, // Teleglow disease
+ AEA_NOISE, // Loud noise
+ AEA_SCREAM, // Noise & morale penalty
+ AEA_DIM, // Darkens the sky slowly
+ AEA_FLASH, // Flashbang
+ AEA_VOMIT, // User vomits
+ AEA_SHADOWS, // Summon shadow creatures
+
  NUM_AEAS
 };
 
@@ -78,4 +97,51 @@ enum art_charge
  ARTC_HP,    // Drains HP to recharge
  NUM_ARTCS
 };
+
+enum artifact_natural_shape
+{
+ ARTSHAPE_NULL,
+ ARTSHAPE_SPHERE,
+ ARTSHAPE_ROD,
+ ARTSHAPE_TEARDROP,
+ ARTSHAPE_LAMP,
+ ARTSHAPE_SNAKE,
+ ARTSHAPE_DISC,
+ ARTSHAPE_BEADS,
+ ARTSHAPE_NAPKIN,
+ ARTSHAPE_URCHIN,
+ ARTSHAPE_JELLY,
+ ARTSHAPE_SPIRAL,
+ ARTSHAPE_PIN,
+ ARTSHAPE_TUBE,
+ ARTSHAPE_PYRAMID,
+ ARTSHAPE_CRYSTAL,
+ ARTSHAPE_KNOT,
+ ARTSHAPE_CRESCENT,
+ ARTSHAPE_MAX
+};
+
+enum artifact_natural_property
+{
+ ARTPROP_NULL,
+ ARTPROP_WRIGGLING, //
+ ARTPROP_GLOWING, //
+ ARTPROP_HUMMING, //
+ ARTPROP_MOVING, //
+ ARTPROP_WHISPERING, //
+ ARTPROP_BREATHING, //
+ ARTPROP_DEAD, //
+ ARTPROP_ITCHY, //
+ ARTPROP_GLITTERING, //
+ ARTPROP_ELECTRIC, //
+ ARTPROP_SLIMY, //
+ ARTPROP_ENGRAVED, //
+ ARTPROP_CRACKLING, //
+ ARTPROP_WARM, //
+ ARTPROP_RATTLING, //
+ ARTPROP_SCALED,
+ ARTPROP_FRACTAL,
+ ARTPROP_MAX
+};
+
 #endif