From cee11b8e22466970717240404cb8b9d5ae300117 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 4 Jan 2018 21:52:49 +0100
Subject: [PATCH] messages when attacking Raiders and passive Jellies

---
 flags.cpp       | 3 +++
 game.cpp        | 4 ++++
 language-pl.cpp | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/flags.cpp b/flags.cpp
index ba07ae62..71c33a3a 100644
--- a/flags.cpp
+++ b/flags.cpp
@@ -735,3 +735,6 @@ bool generateAll(eLand l) {
     l == laCaves || l == laCA;
   }
 
+bool isRaider(eMonster m) {
+  return m == moPair || m == moMonk || m == moCrusher || m == moAltDemon || m == moHexDemon;
+  }
diff --git a/game.cpp b/game.cpp
index 46f48465..117644f8 100644
--- a/game.cpp
+++ b/game.cpp
@@ -7454,6 +7454,10 @@ bool movepcto(int d, int subdir, bool checkonly) {
           addMessage(XLAT("You cannot defeat the Greater Demon yet!"));
         else if(c2->monst == moDraugr)
           addMessage(XLAT("Your mundane weapon cannot hurt %the1!", c2->monst));
+        else if(isRaider(c2->monst))
+          addMessage(XLAT("You cannot attack Raiders directly!"));
+        else if(isSwitch(c2->monst))
+          addMessage(XLAT("You cannot attack Jellies in their wall form!"));
         else
           addMessage(XLAT("For some reason... cannot attack!"));
         return false;
diff --git a/language-pl.cpp b/language-pl.cpp
index 56ba823d..20e1d513 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -6553,6 +6553,8 @@ S("Blue Raiders have a powerful attack which takes two turns to complete, and al
   "ogłoszony przez dłuższy czas. Ten atak jest w stanie zniszczyć innych Najeźdźców, gdy ich trafi."
   )
 
+S("You cannot attack Raiders directly!", "Nie możesz atakować Najeźdźców bezpośrednio!")
+
 Orb("Slaying", "Pogromu")
 
 S("This Orb lets you defeat Raiders and other tough single-cell monsters in melee.",
@@ -6583,5 +6585,7 @@ S("This orb lets you pass through walls (one cell wide), and also through as lon
   "Ta Sfera pozwala Ci przechodzić przez ściany (o szerokości jednego pola), a także przez potwory, o ile "
   "nie zaatakują one w trakcie ruchu.")
 
+S("You cannot attack Jellies in their wall form!", "Nie możesz atakować Galarety w formie ściany!")
+
 #undef Orb