From fc1ad0257310954725210939330fd543b2f3a662 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Tue, 10 Oct 2017 14:22:47 +0200
Subject: [PATCH] limits/reduction/marking provided for the new orbs. Also
 fixed Revolver to top at 6

---
 orbs.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/orbs.cpp b/orbs.cpp
index 96208784..7eb5a9bd 100644
--- a/orbs.cpp
+++ b/orbs.cpp
@@ -136,6 +136,8 @@ void reduceOrbPowers() {
   reduceOrbPower(itOrbRecall, 77);
   reduceOrbPower(itOrbBull, 120);
   reduceOrbPower(itOrbHorns, 77);
+  reduceOrbPower(itOrbLava, 80);
+  reduceOrbPower(itOrbMorph, 80);
   if(cwt.c->land != laWildWest)
     reduceOrbPower(itRevolver, 6);
   whirlwind::calcdirs(cwt.c); 
@@ -1230,7 +1232,7 @@ eItem targetRangedOrb(cell *c, orbAction a) {
 int orbcharges(eItem it) {
   switch(it) {
     case itRevolver: //pickup-key
-      return 6;
+      return 6 - items[itRevolver];
     case itOrbShield:
       return inv::on ? 30 : 20;
     case itOrbDiscord:
@@ -1292,6 +1294,13 @@ int orbcharges(eItem it) {
       return sphere ? 3 : 30;
     case itOrbDragon:
        return sphere ? 10 : 77;
+    
+    case itOrbMorph:
+      return 60;
+    
+    case itOrbLava:
+      return 50;
+       
     default:
       return 0;
     }
@@ -1309,8 +1318,8 @@ void makelava(cell *c, int i) {
   if(!pseudohept(c)) return;
   if(isPlayerOn(c)) return;
   if(c->wall == waFire && c->wparam < i)
-    c->wparam = i;
-  else makeflame(c, i, false);
+    c->wparam = i, orbused[itOrbLava] = true;
+  else if(makeflame(c, i, false)) orbused[itOrbLava] = true;
   }
 
 void orboflava(int i) {