Whales / Cataclysm

A post-apocalyptic roguelike.
cataclysmrl.blogspot.com
Other
323 stars 89 forks source link

No stacking of crafting goes_bad consumables #66

Open ashlander opened 11 years ago

ashlander commented 11 years ago

After coocking some meat, i got used several inventory letters for each coocked meat Game has stacks limit, so owning "Hoarder" makes each letter real value.

Made changes for myself.

git rev-parse HEAD 16331bba196c5ce53eaa6cf3ffd8d083b34ca8da

diff --git a/item.cpp b/item.cpp
index 140d474..b2c4350 100644
--- a/item.cpp
+++ b/item.cpp
@@ -167,10 +167,12 @@ bool item::invlet_is_okay()

 bool item::stacks_with(item rhs)
 {
+ bool iscrafting = (goes_bad() && abs(bday - rhs.bday) < 200); // 20 min for crafting
+
  bool stacks = (type   == rhs.type   && damage  == rhs.damage  &&
                 active == rhs.active && charges == rhs.charges &&
                 contents.size() == rhs.contents.size() &&
-                (!goes_bad() || bday == rhs.bday));
+                (!goes_bad() || bday == rhs.bday || iscrafting));

  if ((corpse == NULL && rhs.corpse != NULL) ||
      (corpse != NULL && rhs.corpse == NULL)   )
ashlander commented 11 years ago

Have read forums, life is out there :). But really good work and good game.