diff options
| -rw-r--r-- | changes.txt | 3 | ||||
| -rw-r--r-- | lib/edit/f_info.txt | 19 | ||||
| -rw-r--r-- | lib/pref/font-win.prf | 6 | ||||
| -rw-r--r-- | lib/pref/graf-iso.prf | 6 | ||||
| -rw-r--r-- | lib/pref/graf-new.prf | 6 | ||||
| -rw-r--r-- | lib/pref/graf-xxx.prf | 6 | ||||
| -rw-r--r-- | src/cave.c | 2 |
7 files changed, 23 insertions, 25 deletions
diff --git a/changes.txt b/changes.txt index 36653aba..4aeef8a7 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,7 @@ T.o.M.E 2.3.8 (ah) -- +- Change "molten glass wall" to use a different internal code to + hopefully avoid clashes with modules such as Theme. T.o.M.E 2.3.7 (ah) diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt index d4285333..c0dc2e9a 100644 --- a/lib/edit/f_info.txt +++ b/lib/edit/f_info.txt @@ -627,6 +627,14 @@ E:1d1:40:NETHER F:ATTR_MULTI F:FLOOR | DONT_NOTICE_RUNNING | CAN_RUN +# A diggable glass wall. +N:103:molten glass wall +G:.:B +F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE +F:DONT_NOTICE_RUNNING +D:1:You tunnel into the molten glass wall... +D:2:a molten glass wall blocking your way + N:160:Void Jumpgate G:+:v F:FLOOR | REMEMBER | NOTICE | PERMANENT | CAN_RUN @@ -931,14 +939,3 @@ F:NO_WALK | CAN_PASS | NOTICE | SUPPORT_LIGHT F:DONT_NOTICE_RUNNING | TUNNELABLE D:1:You tunnel into the battlement. D:2:a hard stone battlement blocking your way - -# -# A diggable glass wall. -# -N:217:molten glass wall -G:.:B -F:NO_WALK | WALL | CAN_PASS | TUNNELABLE | NOTICE -F:DONT_NOTICE_RUNNING -D:1:You tunnel into the molten glass wall... -D:2:a molten glass wall blocking your way - diff --git a/lib/pref/font-win.prf b/lib/pref/font-win.prf index 60d2871c..1754d0f5 100644 --- a/lib/pref/font-win.prf +++ b/lib/pref/font-win.prf @@ -119,6 +119,9 @@ F:100:0x03/0x7F # nether mist F:102:0x0A/0x7F +# glass wall +F:103:0x0E/0x1F + # Underground Tunnel F:173:0x02/0x7F @@ -197,9 +200,6 @@ F:215:0x0E/0x7F # battlement F:216:0x01/0x7F -# glass wall -F:217:0x0E/0x1F - ##### Monster attr/char definitions ##### # Space monster diff --git a/lib/pref/graf-iso.prf b/lib/pref/graf-iso.prf index a97e5401..05bc8621 100644 --- a/lib/pref/graf-iso.prf +++ b/lib/pref/graf-iso.prf @@ -471,6 +471,9 @@ F:101:0x80:0xDE # nether mist F:102:0x80:0x80 +# molten glass wall +F:103:0x80:0xAE + # Void Jumpgate F:160:0x81:0x8C @@ -630,9 +633,6 @@ F:211:0x80:0x80 # dead small tree F:212:0x80:0x80 -# molten glass wall -F:217:0x80:0xAE - # something K:0:0x80:0x80 diff --git a/lib/pref/graf-new.prf b/lib/pref/graf-new.prf index 384221b8..ca806ca7 100644 --- a/lib/pref/graf-new.prf +++ b/lib/pref/graf-new.prf @@ -433,6 +433,9 @@ F:101:0xC3/0x9E # nether mist F:102:0xC3/0x9F +# molten glass wall +F:103:0xC0/0x9F + # Void Jumpgate F:160:0x91/0x84 @@ -580,9 +583,6 @@ F:214:0x80/0x81 # glacial wall F:215:0xC5/0x92 -# molten glass wall -F:217:0xC0/0x9F - # Skeleton G:M:1:0xC6/0x91 diff --git a/lib/pref/graf-xxx.prf b/lib/pref/graf-xxx.prf index 9174a40a..bea696d9 100644 --- a/lib/pref/graf-xxx.prf +++ b/lib/pref/graf-xxx.prf @@ -479,6 +479,9 @@ F:101:0xCB/0x87 # nether mist F:102:0xC5/0x8C +# molten glass wall +F:103:0xD0/0x89 + # Between gate F:160:0x8A/0x9D @@ -614,9 +617,6 @@ F:214:0x80/0x80 # glacial wall F:215:0xD0/0x88 -# molten glass wall -F:217:0xD0/0x89 - # something K:0:0x80/0x80 @@ -4885,7 +4885,7 @@ void place_floor_convert_glass(int y, int x) { place_floor(y, x); - if (cave[y][x].feat == 188) cave[y][x].feat = 217; + if (cave[y][x].feat == 188) cave[y][x].feat = 103; } /* |