Merge pull request #722 from GregoryLundberg/GL_unique_items

Unique items: don't be a pig

data/core/macros/items.cfg

@@ -261,11 +261,19 @@
 #enddef
 
 #define OBJ_POTION_HOLY X Y ID
-    {PICKUPPABLE_ITEM {ID} {X} {Y} side=1 items/holy-water.png
+    {PICKUPPABLE_ITEM {ID} {X} {Y} (
+        side=1
+        [has_attack]
+            range=melee
+            [not]
+                type=arcane
+            [/not]
+        [/has_attack]
+    ) items/holy-water.png
     _"Sprinkling this water on melee weapons grants them the <i>arcane</i> damage type until the end of the current scenario. Should $unit.name use it?"
     _"holy water^Take it"
     _"holy water^Leave it"
-    _"I am not suited to the use of this item! Let another take it." (
+    _"$unit.name has no need for this Holy Water! Let another take it." (
         [object]
             name= _ "Holy Water"
             image=items/holy-water.png
@@ -494,7 +502,18 @@
 #enddef
 
 #define OBJ_TRIDENT_STORM X Y ID
-    {PICKUPPABLE_ITEM {ID} {X} {Y} race=merman items/storm-trident.png _"Should $unit.name pick up the trident?" _"storm trident^Take it" _"storm trident^Leave it" _"Only the mermen can use this item!" (
+    {PICKUPPABLE_ITEM {ID} {X} {Y} (
+        race=merman
+        [not]
+            [has_attack]
+                name="storm trident"
+            [/has_attack]
+        [/not]
+    ) items/storm-trident.png
+    _"Should $unit.name pick up the trident?"
+    _"storm trident^Take it"
+    _"storm trident^Leave it"
+    _"$unit.name cannot use this Storm Trident! Let one of the merfolk who can wield it have it." (
         [object]
             name= _ "Storm Trident"
             image=items/storm-trident.png