From 3a2ea8629d3ba27e381540a09b6e64d31aaa10db Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 25 Dec 2019 23:08:41 +0100
Subject: [PATCH] dead Ivy counting

---
 attack.cpp     | 12 +++++++++---
 monstergen.cpp |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/attack.cpp b/attack.cpp
index 7e1b9653..26594497 100644
--- a/attack.cpp
+++ b/attack.cpp
@@ -216,7 +216,7 @@ EX void killIvy(cell *c, eMonster who) {
   c->monst = moIvyDead; // NEWYEARFIX
   for(int i=0; i<c->type; i++) if(c->move(i))
     if(isIvy(c->move(i)) && c->move(i)->mondir == c->c.spin(i))
-      killIvy(c->move(i), who);
+      killIvy(c->move(i), who), kills[moIvyDead]++;
   }
 
 EX void prespill(cell* c, eWall t, int rad, cell *from) {
@@ -396,7 +396,9 @@ EX void killMutantIvy(cell *c, eMonster who) {
   }
 
 EX bignum ivy_total() {
-  return kills[moMutant] + kills[moFriendlyIvy] + clearing::imputed;
+  return kills[moMutant] + kills[moFriendlyIvy] +
+    kills[moIvyRoot] + kills[moIvyHead] + kills[moIvyBranch] + kills[moIvyWait] + kills[moIvyDead]
+     + clearing::imputed;
   }
 
 EX void killMonster(cell *c, eMonster who, flagtype deathflags IS(0)) {
@@ -446,7 +448,7 @@ EX void killMonster(cell *c, eMonster who, flagtype deathflags IS(0)) {
   if(m == moHunterGuard) m = moHunterDog;
   if(m == moHunterChanging) m = moHunterDog;
   if(m == moWolfMoved) m = moWolf;
-  if(!isBulletType(m)) kills[m]++;
+  if(!isBulletType(m) && m != moIvyDead) kills[m]++;
 
   if(saved_tortoise_on(c)) c->item = itNone;
 
@@ -704,9 +706,13 @@ EX void killMonster(cell *c, eMonster who, flagtype deathflags IS(0)) {
   if(isIvy(c)) {
     pcount = 0;
     eMonster m = c->monst;
+    bignum s = ivy_total() - 1;
     /*if((m == moIvyBranch || m == moIvyHead) && c->move(c->mondir)->monst == moIvyRoot)
       ivynext(c, moIvyNext); */
     killIvy(c, who);
+    s = ivy_total() - s;
+    if(s > bignum(1) && vid.bubbles_special)
+      drawBubble(c, 0xFFFF00, s.get_str(100), .5);
     if(m == moIvyBranch || m == moIvyHead || m == moIvyNext) {
       int qty = 0;
       cell *c2 = c->move(c->mondir);
diff --git a/monstergen.cpp b/monstergen.cpp
index afcbafc2..6592106a 100644
--- a/monstergen.cpp
+++ b/monstergen.cpp
@@ -38,6 +38,7 @@ EX int buildIvy(cell *c, int children, int minleaf) {
   leaf += leafchild;
   if(leaf < minleaf) {
     if(child) killIvy(child, moNone);
+    dynamicval<int> k(kills[moIvyDead]);
     killIvy(c, moNone);
     return 0;
     }