Remove ID_FULL/ID_PLAIN activations

We need to change 'Eriril' and I'm not sure how much sense the new
activation makes. It'll have to do.

6 files changed, 4 insertions, 29 deletions

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 8e9c44ef..643fc954 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -2795,7 +2795,7 @@ F:SLAY_EVIL
 F:SPELL_CONTAIN
 F:WIELD_CAST
 F:WIS
-a:ID_PLAIN
+a:DETECT_ALL
 D:The radiant golden staff of an Istari of legend, this wizard's companion 
 D:grants keen sight and the knowledge of many hidden things.
 
diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index 7fb0539a..b416a069 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -2803,7 +2803,7 @@ F:SLAY_EVIL
 F:SPELL_CONTAIN
 F:WIELD_CAST
 F:WIS
-a:ID_PLAIN
+a:DETECT_ALL
 D:The radiant golden staff of an Istari of legend, this wizard's companion 
 D:grants keen sight and the knowledge of many hidden things.
 
diff --git a/src/cmd6.cc b/src/cmd6.cc
index cf6ac8e9..a69b3db5 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -6058,27 +6058,6 @@ const char *activation_aux(object_type * o_ptr, bool_ doit, int item)
 			break;
 		}
 
-	case ACT_ID_FULL:
-		{
-			if (!doit) return "identify true every 750 turns";
-			msg_print("It glows yellow...");
-			identify_fully();
-
-			o_ptr->timeout = 750;
-
-			break;
-		}
-
-	case ACT_ID_PLAIN:
-		{
-			if (!doit) return "identify spell every 10 turns";
-			if (!ident_spell()) break;
-
-			o_ptr->timeout = 10;
-
-			break;
-		}
-
 	case ACT_RUNE_EXPLO:
 		{
 			if (!doit) return "explosive rune every 200 turns";
diff --git a/src/defines.h b/src/defines.h
index 08993ac2..744ef44f 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -809,8 +809,6 @@
 #define ACT_MAP_LIGHT           112
 #define ACT_DETECT_ALL          113
 #define ACT_DETECT_XTRA         114
-#define ACT_ID_FULL             115
-#define ACT_ID_PLAIN            116
 #define ACT_RUNE_EXPLO          117
 #define ACT_RUNE_PROT           118
 #define ACT_SATIATE             119
diff --git a/src/init1.cc b/src/init1.cc
index 9d7070a6..dd5365b8 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -404,8 +404,8 @@ static const char *activation_names[] =
 	"MAP_LIGHT",            /*  112*/
 	"DETECT_ALL",           /*  113*/
 	"DETECT_XTRA",          /*  114*/
-	"ID_FULL",              /*  115*/
-	"ID_PLAIN",             /*  116*/
+	"XXX115",               /*  115*/
+	"XXX116",               /*  116*/
 	"RUNE_EXPLO",           /*  117*/
 	"RUNE_PROT",            /*  118*/
 	"SATIATE",              /*  119*/
diff --git a/src/object2.cc b/src/object2.cc
index 1509dacc..fb87d37a 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -1024,8 +1024,6 @@ s32b flag_cost(object_type const *o_ptr, int plusses)
 		else if (type == ACT_MAP_LIGHT) total += 500;
 		else if (type == ACT_DETECT_ALL) total += 1000;
 		else if (type == ACT_DETECT_XTRA) total += 12500;
-		else if (type == ACT_ID_FULL) total += 10000;
-		else if (type == ACT_ID_PLAIN) total += 1250;
 		else if (type == ACT_RUNE_EXPLO) total += 4000;
 		else if (type == ACT_RUNE_PROT) total += 10000;
 		else if (type == ACT_SATIATE) total += 2000;