noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-29 08:52:25 +01:00
Code Issues Activity

Monk QA: Lenses -> Soul Lens

Browse source 
Rename Eyes->Eye

Drop plural from quest text

The Eye is pink gemstone (morganite) as a nod to the Vance story the name probably came from.
This commit is contained in:
chris 2024-02-23 10:14:28 -05:00
parent 1dc14f92f6
commit 8f9f9963d9
16 changed files with 32 additions and 27 deletions

2
dat/Monk.des
View file

@ -313,7 +313,7 @@ STAIR:(73,09),up
# Altars
ALTAR:(20,09),chaos,altar
# Objects
OBJECT:'(',"lenses",(20,09),blessed,0,"The Eyes of the Overworld"
OBJECT:'(',"soul-lens",(20,09),blessed,0,"The Eye of the Overworld"
# Kaen.
MONSTER:'@',"Master Kaen",(20,10)

4
dat/data.base
View file

@ -3223,8 +3223,8 @@ eye of the aethiopica
the power to instantly open a portal to any other area of the
dungeon, allowing its invoker to travel quickly between
areas.
eyes of the overworld
... and finally there is "the Eyes of the Overworld". This
eye of the overworld
... and finally there is "the Eye of the Overworld". This
obscure artifact pushes the wearer's view sense into the
"overworld" -- another name for a segment of the Astral Plane.
Usually, there is nothing to be seen. However, the wearer

18
dat/quest.txt
View file

@ -4981,8 +4981,6 @@ the Planes of the Elements, to achieve this goal.
#
# Monk
#
# The quest artifact is "The Eyes of the Overworld", hence needs
# to be treated as plural by messages which use %o.
#
%Cc Mon 00001
You approach %H on the isolated path you have grown to
@ -5101,7 +5099,7 @@ canyon. There will be many chances for ambushes!"
"Remember your studies, and you will prevail!"
%E
%Cp Mon 00030
"Acquire and wear %o if you can. They will aid you
"Acquire and wear %o if you can. It will aid you
against %n."
%E
%Cp Mon 00031
@ -5179,9 +5177,9 @@ I will enjoy bringing your body back to him when I return!"
%E
%Cc Mon 00070
When you touch %o your mind is jolted with awareness and
understanding. You can now see why %n stole them, and risked
everything to keep them. Silently you vow not to let them consume
you as they did him.
understanding. You can now see why %n stole it, and risked
everything to keep it. Silently you vow not to let it consume
you as it did him.
You sense a message from %d. Though not verbal, you
get the impression that you must return to %l as soon
@ -5203,11 +5201,11 @@ to honor you, but your quest for the Amulet is more pressing. You have
done the %shood a great service and we will remember you for it."
"I know that %o is a great burden and temptation, but
I can not accept responsibilty for them again. I have failed in that charge
once already. You are far more capable that I, so you must keep them. They
I can not accept responsibilty for it again. I have failed in that charge
once already. You are far more capable that I, so you must keep it. They
will aid you with the rest of your quest."
"We hope to see you when your great quest is done. We will celebrate them."
"We hope to see you when your great quest is done. We will celebrate then."
"May %d ever guide your way."
%E
@ -5215,7 +5213,7 @@ will aid you with the rest of your quest."
%lC studies %o for a moment,
then returns his gaze to you.
"%oC must remain with you. Use them
"%oC must remain with you. Use it
as you resume your search for the Amulet.
%Z await your return through the magic portal
that brought you here."

2
include/artilist.h
View file

@ -2287,7 +2287,7 @@ A("The Magic Mirror of Merlin", MIRROR, (const char *)0,
NOINVOKE, (ARTI_SPEAK)
),
A("The Eyes of the Overworld", LENSES, (const char *)0,
A("The Eye of the Overworld", SOUL_LENS, (const char *)0,
2500L, MT_DEFAULT, MZ_DEFAULT, WT_DEFAULT,
A_NEUTRAL, PM_MONK, NON_PM, TIER_A, (ARTG_NOGEN|ARTG_NOWISH|ARTG_MAJOR),
NO_MONS(),

2
include/obj.h
View file

@ -1357,7 +1357,7 @@ struct obj {
/* helpers, simple enough to be macros */
#define is_plural(o) ((o)->quan > 1 || \
(o)->oartifact == ART_EYES_OF_THE_OVERWORLD)
(o)->oartifact == ART_EYE_OF_THE_OVERWORLD)
#define salve_target(otmp) (\
((otmp->oclass == ARMOR_CLASS || otmp->oclass == WEAPON_CLASS || is_weptool(otmp)) && otmp->spe < 0)\

2
include/vision.h
View file

@ -53,7 +53,7 @@ extern char *viz_rmax; /* max could see indices */
#define unshadowed_square(x,y) ((levl[x][y].lit && !(viz_array[y][x]&TEMP_DRKMASK)) || (!levl[x][y].lit && !(viz_array[y][x]&TEMP_LITMASK)))
#define xrayrange() ((Xray_vision ? 3 : -1) + ((Role_if(PM_MONK) && ublindf && ublindf->oartifact == ART_EYES_OF_THE_OVERWORLD) ? ((u.ulevel+1)/10) : 0)+ (u.sealsActive&SEAL_ORTHOS ? spiritDsize() + 1 : 0))
#define xrayrange() ((Xray_vision ? 3 : -1) + ((Role_if(PM_MONK) && ublindf && ublindf->oartifact == ART_EYE_OF_THE_OVERWORLD) ? ((u.ulevel+1)/10) : 0)+ (u.sealsActive&SEAL_ORTHOS ? spiritDsize() + 1 : 0))
#define xraydist() (xrayrange() < 0 ? -1 : xrayrange()*xrayrange())
/*

2
src/apply.c
View file

@ -5035,7 +5035,7 @@ coord *ccp;
You(cant_see_spot);
ccp->x = 0; ccp->y = 0;
return (res);
} else if (!couldsee(ccp->x, ccp->y)) { /* Eyes of the Overworld */
} else if (!couldsee(ccp->x, ccp->y)) { /* Eye of the Overworld */
You(cant_reach);
ccp->x = 0; ccp->y = 0;
return res;

2
src/artifact.c
View file

@ -324,7 +324,7 @@ hack_artifacts()
if (Role_if(PM_MONK)) {
artilist[ART_GRANDMASTER_S_ROBE].alignment = alignmnt;
artilist[ART_EYES_OF_THE_OVERWORLD].size = (&mons[urace.malenum])->msize;
artilist[ART_EYE_OF_THE_OVERWORLD].size = (&mons[urace.malenum])->msize;
}
if(Role_if(PM_PRIEST)){

2
src/cmd.c
View file

@ -904,7 +904,7 @@ use_reach_attack()
!canseemon(mtmp))) {
You("won't hit anything if you can't see that spot.");
return MOVE_CANCELLED;
} else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */
} else if (!couldsee(cc.x, cc.y)) { /* Eye of the Overworld */
You("can't reach that spot from here.");
return MOVE_CANCELLED;
}

4
src/do_name.c
View file

@ -765,6 +765,10 @@ const char *name;
obj->obj_color = CLR_BRIGHT_GREEN;
obj->oward = ELDER_SIGN;
}
else if(obj->oartifact == ART_EYE_OF_THE_OVERWORLD){
set_material_gm(obj, GEMSTONE);
obj->sub_material = MORGANITE;
}
else if(obj->oartifact == ART_IBITE_ARM){
obj->obj_color = CLR_BRIGHT_GREEN;
}

4
src/do_wear.c
View file

@ -1369,7 +1369,7 @@ register struct obj *otmp;
if (Punished) set_bc(0);
} else if (already_blind && !Blind) {
changed = TRUE;
/* "You are now wearing the Eyes of the Overworld." */
/* "You are now wearing the Eye of the Overworld." */
You("can see!");
}
if (changed) {
@ -1406,7 +1406,7 @@ register struct obj *otmp;
You("still cannot see.");
} else {
changed = TRUE; /* !was_blind */
/* "You were wearing the Eyes of the Overworld." */
/* "You were wearing the Eye of the Overworld." */
You_cant("see anything now!");
/* set ball&chain variables before the hero goes blind */
if (Punished) set_bc(0);

2
src/objnam.c
View file

@ -3429,7 +3429,7 @@ const char *oldstr;
(p = strstri(bp, " labelled ")) != 0 ||
(p = strstri(bp, " called ")) != 0) {
/* don't singularize these: */
if (!BSTRNCMPI(bp, p- 4, "Eyes of the Overworld", 21)
if (!BSTRNCMPI(bp, p- 4, "Eye of the Overworld", 20)
|| !BSTRNCMPI(bp, p-11, "Great Claws of Urdlen", 21)
|| !BSTRNCMPI(bp, p- 5, "Claws of the Revenancer", 23)
|| !BSTRNCMPI(bp, p-12, "Steel Scales of Kurtulmak", 25)

2
src/pager.c
View file

@ -681,7 +681,7 @@ lookat(x, y, buf, monbuf, shapebuff)
}
if (useemon && xraydist > 0 &&
distu(mtmp->mx, mtmp->my) <= xraydist) {
/* Eyes of the Overworld */
/* Eye of the Overworld */
Strcat(monbuf, "astral vision");
if (ways_seen-- > 1) Strcat(monbuf, ", ");
}

6
src/potion.c
View file

@ -227,7 +227,7 @@ boolean talk;
int eyecnt;
char buf[BUFSZ];
/* we need to probe ahead in case the Eyes of the Overworld
/* we need to probe ahead in case the Eye of the Overworld
are or will be overriding blindness */
u_could_see = !Blind;
Blinded = xtime ? 1L : 0L;
@ -253,7 +253,7 @@ boolean talk;
eyecnt = eyecount(youracedata);
Your(eyemsg, (eyecnt == 1) ? buf : makeplural(buf),
(eyecnt == 1) ? "itches" : "itch");
} else { /* Eyes of the Overworld */
} else { /* Eye of the Overworld */
Your(vismsg, "brighten",
Hallucination ? "sadder" : "normal");
}
@ -279,7 +279,7 @@ boolean talk;
eyecnt = eyecount(youracedata);
Your(eyemsg, (eyecnt == 1) ? buf : makeplural(buf),
(eyecnt == 1) ? "twitches" : "twitch");
} else { /* Eyes of the Overworld */
} else { /* Eye of the Overworld */
Your(vismsg, "dim",
Hallucination ? "happier" : "normal");
}

2
src/role.c
View file

@ -249,7 +249,7 @@ struct Role roles[] = {
PM_MONK, NON_PM, NON_PM,
PM_GRAND_MASTER, PM_ABBOT, PM_MASTER_KAEN,
NON_PM, NON_PM, NON_PM, NON_PM,
ART_EYES_OF_THE_OVERWORLD,
ART_EYE_OF_THE_OVERWORLD,
MA_HUMAN|MA_CLOCK|MA_ANIMAL|MA_DRAGON|MA_FEY, ROLE_MALE|ROLE_FEMALE |
ROLE_LAWFUL|ROLE_NEUTRAL|ROLE_CHAOTIC,
/* Str Int Wis Dex Con Cha */

3
util/lev_comp.y
View file

@ -975,8 +975,11 @@ object_desc : chance ':' object_c ',' o_name
else{
int token = get_object_id($5, $<i>3);
if (token == ERR)
{
yywarning(
"Illegal object name! Making random object.");
yywarning($5);
}
else
tmpobj[nobj]->id = token;
Free($5);