From 4a8e33a2d5d755fc3ccfd1e4c34521fe2eb83424 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 23 Apr 2018 12:14:29 +0200
Subject: [PATCH] better messages when dropping Dead Orbs impossible

---
 game.cpp        | 14 +++++++++++---
 language-pl.cpp |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/game.cpp b/game.cpp
index b3397358..fc72ea03 100644
--- a/game.cpp
+++ b/game.cpp
@@ -6815,9 +6815,9 @@ bool collectItem(cell *c2, bool telekinesis) {
   }
 
 void dropGreenStone(cell *c) {
-  if(!passable(c, NULL, P_MONSTER)) {
+  if(items[itGreenStone] && !passable(c, NULL, P_MONSTER)) {
     // NOTE: PL/CZ translations assume that itGreenStone is dropped to avoid extra forms!
-    addMessage("Cannot drop %the1 here!", itGreenStone);
+    addMessage(XLAT("Cannot drop %the1 here!", itGreenStone));
     return;
     }
   if(items[itGreenStone] && c->item == itNone) {
@@ -6834,7 +6834,15 @@ void dropGreenStone(cell *c) {
       }
     }
   else {
-    if(gold() >= 300)
+    if(items[itGreenStone] && c->item == itGreenStone)
+      addMessage(XLAT("You juggle the Dead Orbs."));
+    else if(items[itGreenStone] && c->item)
+      addMessage(XLAT("You give %the1 a grim look.", c->item));
+    else if(items[itGreenStone]) {
+      addMessage(XLAT("Cannot drop %the1 here!", itGreenStone));
+      return;
+      }
+    else if(gold() >= 300)
       addMessage(XLAT("You feel great, like a true treasure hunter."));
     else if(gold() >= 200)
       addMessage(XLAT("Your eyes shine like gems."));
diff --git a/language-pl.cpp b/language-pl.cpp
index 716a9dec..1c440dd2 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -6888,3 +6888,5 @@ S("fisheye", "rybie oko")
 S("paint pictures", "maluj obrazki")
 S("list of slides", "lista slajdów")
 S("back to the start menu", "powrót do menu startowego")
+S("You juggle the Dead Orbs.", "Żonglujesz Martwymi Sferami.")
+S("You give %the1 a grim look.", "Spoglądasz ponuro na %a1.")