summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2018-03-25 20:07:30 +0200
committerBardur Arantsson <bardur@scientician.net>2018-03-25 20:07:30 +0200
commitd31f2723aeb285e06f28237f1a7fe8e1cef7ce73 (patch)
tree5b09f66eef346c2252b4e58327de575ee8291a05
parentf058dadf4edcc37a35456657efb8a219ac526aba (diff)
Remove Stone of Lore activation
- Since the item is rendered useless in the ToME module, we replace it with a +25 level OOD random item. - In Theme, the Stone of Lore (Key of Orthanc) still serves a purpose, so we leave it, but just remove the activation.
-rw-r--r--lib/edit/a_info.txt19
-rw-r--r--lib/edit/s_orc.map11
-rw-r--r--lib/mods/theme/edit/a_info.txt12
-rw-r--r--src/cmd6.cc59
-rw-r--r--src/defines.h1
-rw-r--r--src/init1.cc2
6 files changed, 8 insertions, 96 deletions
diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index c1ab7fa1..56eeb7bb 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -381,25 +381,6 @@ D:wields it. It is rumoured that it may even protect the wearer from
D:the passing of time.
-# This artifact has a low artifact level to prevent it being worthless for
-# chars with poor magic skills.
-
-# The Stone of Lore
-
-N:15:of Lore
-I:39:106:0
-W:15:12:15:20000
-P:0:1d1:0:0:0
-F:ACTIVATE
-F:EASY_USE
-F:INSTA_ART
-F:LITE1
-F:SPECIAL_GENE
-a:STONE_LORE
-D:A great emerald that fills your mind with images of knowledge and dreadful
-D:understanding as you stare into its depths.
-
-
# The Multi-Hued Dragon Scale Mail 'Razorback'
N:16:'Razorback'
diff --git a/lib/edit/s_orc.map b/lib/edit/s_orc.map
index 48913e02..54f1c89a 100644
--- a/lib/edit/s_orc.map
+++ b/lib/edit/s_orc.map
@@ -53,13 +53,8 @@ F:9:1:0:*75:*55
# Random monster (upto 3 levels ood)
F:-:1:0:*38
-# Random object (upto 7 levels ood)
-F:=:1:0:0:*42
-
-### Guaranteed Items
-
-# The stone of lore
-F:1:1:0:0:0:0:15
+# Random object (upto 25 levels ood)
+F:=:1:0:0:*60
### Level Design
D:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -67,7 +62,7 @@ D:Xa.......................ccccccccc.......................aX
D:X.lllllllllllllllllllllllllllllllllllllllllllllllllllllll.X
D:X.l......................ccccccccc.....g.g..............l.X
D:X.l.XXXXXXXXXXXXXXXXXXXXXXXXX.XXXXXXXXXXDXXXXXXXXXXXXXX.l.X
-D:X.l.Xa.......efX1Xfe.......aX.X.aaa.D.gX.XacbdddccjjjaX.l.X
+D:X.l.Xa.......efX=Xfe.......aX.X.aaa.D.gX.XacbdddccjjjaX.l.X
D:X.l.D........efG.Gfe........D.D.bbb.XXXX.XcfbcbcbbjjeeX.l.X
D:X.l.X........efX.Xfe........X.X.bbb.D.gX.XfbbgdcbdbjjjX.l.X
D:X.l.XXXXXX...efG.Gfe...XXXXXX.X.bbb.XXXX.XebdcfbdccejjX.l.X
diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index 5d2e4bdf..24925254 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -412,17 +412,13 @@ N:15:of Orthanc
I:39:106:0
W:15:12:15:20000
P:0:1d1:0:0:0
-F:ACTIVATE
-F:EASY_USE
F:INSTA_ART
F:LITE1
F:SPECIAL_GENE
-a:STONE_LORE
-D:The key to the tower of Saruman, which fills your mind
-D:with images of knowledge and dreadful understanding. It
-D:is not a regular key - it is a perfectly round stone
-D:that is meant to fit into a hole. It can be used to
-D:light your way in the dungeon as well.
+D:The key to the tower of Saruman. It is not a regular
+D:key - it is a perfectly round stone that is meant
+D:to fit into a hole. It can be used to light your
+D:way in the dungeon as well.
# The Multi-Hued Dragon Scale Mail 'Lothronfaun'
diff --git a/src/cmd6.cc b/src/cmd6.cc
index 0077fb29..bf6d224f 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -5203,65 +5203,6 @@ const char *activation_aux(object_type * o_ptr, bool_ doit, int item)
}
- /* The Stone of Lore is perilous, for the sake of game balance. */
- case ACT_STONE_LORE:
- {
- if (!doit) return "perilous identify every turn";
- msg_print("The stone reveals hidden mysteries...");
- if (!ident_spell()) break;
-
- if (p_ptr->has_ability(AB_PERFECT_CASTING))
- {
- /* Sufficient mana */
- if (20 <= p_ptr->csp)
- {
- /* Use some mana */
- p_ptr->csp -= 20;
- }
-
- /* Over-exert the player */
- else
- {
- int oops = 20 - p_ptr->csp;
-
- /* No mana left */
- p_ptr->csp = 0;
- p_ptr->csp_frac = 0;
-
- /* Message */
- msg_print("You are too weak to control the stone!");
-
- /* Hack -- Bypass free action */
- set_paralyzed(randint(5 * oops + 1));
-
- /* Confusing. */
- set_confused(p_ptr->confused +
- randint(5 * oops + 1));
- }
-
- /* Redraw mana */
- p_ptr->redraw |= (PR_FRAME);
- }
-
- take_hit(damroll(1, 12), "perilous secrets");
-
- /* Confusing. */
- if (rand_int(5) == 0)
- {
- set_confused(p_ptr->confused + randint(10));
- }
-
- /* Exercise a little care... */
- if (rand_int(20) == 0)
- {
- take_hit(damroll(4, 10), "perilous secrets");
- }
-
- o_ptr->timeout = 1;
-
- break;
- }
-
case ACT_RAZORBACK:
{
if (!doit) return "star ball (150) every 1000 turns";
diff --git a/src/defines.h b/src/defines.h
index f301f78a..050a4f4f 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -744,7 +744,6 @@
#define ACT_NENYA 40
#define ACT_VILYA 41
#define ACT_POWER 42
-#define ACT_STONE_LORE 43
#define ACT_RAZORBACK 44
#define ACT_BLADETURNER 45
#define ACT_MEDIATOR 46
diff --git a/src/init1.cc b/src/init1.cc
index 6114f47e..1ffd0541 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -332,7 +332,7 @@ static const char *activation_names[] =
"NENYA", /* 40*/
"VILYA", /* 41*/
"POWER", /* 42*/
- "STONE_LORE", /* 43*/
+ "XXX43",
"RAZORBACK", /* 44*/
"BLADETURNER", /* 45*/
"MEDIATOR", /* 46*/