Skip to content

Commit 2ee37d3

Browse files
k21971k21971
committed
Revert "Fix: artifact rings have a fixed material."
This reverts commit 8b2a9e0. There's a better way to do this, coming in the next commit.
1 parent 8b2a9e0 commit 2ee37d3

File tree

4 files changed

+68
-76
lines changed

4 files changed

+68
-76
lines changed

Diff for: ‎doc/evilhack-changelog.md

-1
Original file line numberDiff line numberDiff line change
@@ -3369,5 +3369,4 @@ The following changes to date are:
33693369
- Fix: unique monsters are not bound by maximum hit point value in grow_up()
33703370
- Fix: Infidels couldn't drop cursed loadstones
33713371
- Fix: misbehavior by #adjust
3372-
- Fix: artifact rings have a fixed material
33733372

Diff for: ‎src/o_init.c

-5
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,6 @@ int *lo_p, *hi_p; /* output: range that item belongs among */
211211
*hi_p = i - 1;
212212
break;
213213
case RING_CLASS:
214-
/* rings of free action and invisibility have
215-
the only fixed descriptions/materials */
216-
if (otyp >= RIN_ADORNMENT && otyp <= RIN_PROTECTION_FROM_SHAPE_CHAN)
217-
*lo_p = RIN_ADORNMENT, *hi_p = RIN_PROTECTION_FROM_SHAPE_CHAN;
218-
break;
219214
case WAND_CLASS:
220215
case VENOM_CLASS:
221216
/* entire class */

Diff for: ‎src/objects.c

+8-10
Original file line numberDiff line numberDiff line change
@@ -663,26 +663,24 @@ RING("cold resistance", "brass",
663663
COLD_RES, 150, 1, 0, 4, COPPER, HI_COPPER),
664664
RING("shock resistance", "copper",
665665
SHOCK_RES, 150, 1, 0, 3, COPPER, HI_COPPER),
666+
RING("free action", "twisted",
667+
FREE_ACTION, 200, 1, 0, 6, METAL, HI_METAL),
666668
RING("slow digestion", "steel",
667669
SLOW_DIGESTION, 200, 1, 0, 8, METAL, HI_METAL),
668670
RING("teleportation", "silver",
669671
TELEPORT, 200, 1, 0, 3, SILVER, HI_SILVER),
670-
RING("teleport control", "wire",
671-
TELEPORT_CONTROL, 300, 1, 0, 3, METAL, HI_METAL),
672+
RING("teleport control", "gold",
673+
TELEPORT_CONTROL, 300, 1, 0, 3, GOLD, HI_GOLD),
672674
RING("polymorph", "ivory",
673675
POLYMORPH, 300, 1, 0, 4, BONE, CLR_WHITE),
674-
RING("polymorph control", "twisted",
675-
POLYMORPH_CONTROL, 300, 1, 0, 8, METAL, HI_METAL),
676+
RING("polymorph control", "emerald",
677+
POLYMORPH_CONTROL, 300, 1, 0, 8, GEMSTONE, CLR_BRIGHT_GREEN),
678+
RING("invisibility", "wire",
679+
INVIS, 150, 1, 0, 5, METAL, HI_METAL),
676680
RING("see invisible", "engagement",
677681
SEE_INVIS, 150, 1, 0, 5, GOLD, HI_METAL),
678682
RING("protection from shape changers", "shiny",
679683
PROT_FROM_SHAPE_CHANGERS, 100, 1, 0, 5, PLATINUM, CLR_BRIGHT_CYAN),
680-
/* free action and invisibility are removed from random material/type
681-
selection */
682-
RING("free action", "emerald",
683-
FREE_ACTION, 200, 1, 0, 6, GEMSTONE, CLR_BRIGHT_GREEN),
684-
RING("invisibility", "gold",
685-
INVIS, 150, 1, 0, 5, GOLD, HI_GOLD),
686684
#undef RING
687685

688686
/* amulets ... - THE Amulet comes last because it is special */

Diff for: ‎win/share/objects.txt

+60-60
Original file line numberDiff line numberDiff line change
@@ -3999,7 +3999,26 @@ Z = (195, 195, 195)
39993999
................
40004000
................
40014001
}
4002-
# tile 209 (steel / slow digestion)
4002+
# tile 209 (twisted / free action)
4003+
{
4004+
................
4005+
................
4006+
................
4007+
................
4008+
................
4009+
................
4010+
.....APPBP......
4011+
....PPAAAAP.....
4012+
....PAA..APA....
4013+
....PA....BA....
4014+
....BPA..APA....
4015+
.....APBPPAA....
4016+
......AAAAA.....
4017+
................
4018+
................
4019+
................
4020+
}
4021+
# tile 210 (steel / slow digestion)
40034022
{
40044023
................
40054024
................
@@ -4018,7 +4037,7 @@ Z = (195, 195, 195)
40184037
................
40194038
................
40204039
}
4021-
# tile 210 (silver / teleportation)
4040+
# tile 211 (silver / teleportation)
40224041
{
40234042
................
40244043
................
@@ -4037,26 +4056,26 @@ Z = (195, 195, 195)
40374056
................
40384057
................
40394058
}
4040-
# tile 211 (wire / teleport control)
4059+
# tile 212 (gold / teleport control)
40414060
{
40424061
................
40434062
................
40444063
................
40454064
................
40464065
................
40474066
................
4048-
.....PPPPP......
4049-
....PPAAAPP.....
4050-
....PAA...PA....
4051-
....PA.....PA...
4052-
....PA.....PA...
4053-
....PAAPPPPA....
4054-
.....PPPAAA.....
4055-
......AA........
4067+
.....LHHHL......
4068+
....LHAAAHL.....
4069+
....HAA..AHA....
4070+
....HA....HA....
4071+
....LHA..HLA....
4072+
.....LHHHLAA....
4073+
......AAAAA.....
4074+
................
40564075
................
40574076
................
40584077
}
4059-
# tile 212 (ivory / polymorph)
4078+
# tile 213 (ivory / polymorph)
40604079
{
40614080
................
40624081
................
@@ -4075,26 +4094,45 @@ Z = (195, 195, 195)
40754094
................
40764095
................
40774096
}
4078-
# tile 213 (twisted / polymorph control)
4097+
# tile 214 (emerald / polymorph control)
40794098
{
40804099
................
4100+
................
4101+
................
4102+
................
4103+
.....PGFFPA.....
4104+
.....FGFFFA.....
4105+
.....AFFFA......
4106+
.....OCECNA.....
4107+
....OOAAAONA....
4108+
....OAA...OA....
4109+
....NOA..ONA....
4110+
.....ONONOAA....
4111+
......AAAAA.....
4112+
................
4113+
................
4114+
................
4115+
}
4116+
# tile 215 (wire / invisibility)
4117+
{
40814118
................
40824119
................
40834120
................
40844121
................
40854122
................
4086-
.....APPBP......
4087-
....PPAAAAP.....
4088-
....PAA..APA....
4089-
....PA....BA....
4090-
....BPA..APA....
4091-
.....APBPPAA....
4092-
......AAAAA.....
40934123
................
4124+
.....PPPPP......
4125+
....PPAAAPP.....
4126+
....PAA...PA....
4127+
....PA.....PA...
4128+
....PA.....PA...
4129+
....PAAPPPPA....
4130+
.....PPPAAA.....
4131+
......AA........
40944132
................
40954133
................
40964134
}
4097-
# tile 214 (engagement / see invisible)
4135+
# tile 216 (engagement / see invisible)
40984136
{
40994137
................
41004138
................
@@ -4113,7 +4151,7 @@ Z = (195, 195, 195)
41134151
................
41144152
................
41154153
}
4116-
# tile 215 (shiny / protection from shape changers)
4154+
# tile 217 (shiny / protection from shape changers)
41174155
{
41184156
................
41194157
................
@@ -4132,44 +4170,6 @@ Z = (195, 195, 195)
41324170
................
41334171
................
41344172
}
4135-
# tile 216 (emerald / free action)
4136-
{
4137-
................
4138-
................
4139-
................
4140-
................
4141-
.....PGFFPA.....
4142-
.....FGFFFA.....
4143-
.....AFFFA......
4144-
.....OCECNA.....
4145-
....OOAAAONA....
4146-
....OAA...OA....
4147-
....NOA..ONA....
4148-
.....ONONOAA....
4149-
......AAAAA.....
4150-
................
4151-
................
4152-
................
4153-
}
4154-
# tile 217 (gold / invisibility)
4155-
{
4156-
................
4157-
................
4158-
................
4159-
................
4160-
................
4161-
................
4162-
.....LHHHL......
4163-
....LHAAAHL.....
4164-
....HAA..AHA....
4165-
....HA....HA....
4166-
....LHA..HLA....
4167-
.....LHHHLAA....
4168-
......AAAAA.....
4169-
................
4170-
................
4171-
................
4172-
}
41734173
# tile 218 (circular / amulet of ESP)
41744174
{
41754175
................

0 commit comments

Comments
 (0)