diff --git a/doc/releases.txt b/doc/releases.txt index 7c7e027..3ef6c0d 100755 --- a/doc/releases.txt +++ b/doc/releases.txt @@ -10,6 +10,7 @@ to rec.games.mud.diku which originally announced CircleMUD as a publicly available MUD source code. tbaMUD Release history: +Version 2023 release: January, 2023 Version 2021 release: March, 2021 Version 2020 release: January, 2020 Version 2019 release: January, 2019 diff --git a/lib/misc/socials.new b/lib/misc/socials.new index c993418..d05ae0e 100644 --- a/lib/misc/socials.new +++ b/lib/misc/socials.new @@ -6109,7 +6109,7 @@ $n looks around for a victim to strangle. You throw yourself against $N's throat, trying to squeeze the life out. $n throws $mself after $N's throat. $n throws $mself after your throat, you try to defend yourself. -AARGH! They must have left... #&%@! +AARGH! They must have left... You put your hands around your throat and stop breathing. $n tries to strangle $mself, making a very strange noise and getting blue in the face. You strangle $M $t. diff --git a/lib/text/greetings b/lib/text/greetings index fd5a2d2..5bdc12a 100644 --- a/lib/text/greetings +++ b/lib/text/greetings @@ -1,5 +1,5 @@ T B A M U D - 2 0 2 1 + 2 0 2 3 Based on CircleMUD by Jeremy Elson and DikuMUD by Hans-Henrik Staerfeldt, Katja Nyboe, Tom Madsen, Michael Seifert, and Sebastian Hammer diff --git a/lib/text/help/help.hlp b/lib/text/help/help.hlp index ea6c6a1..d7b2eae 100644 --- a/lib/text/help/help.hlp +++ b/lib/text/help/help.hlp @@ -3312,7 +3312,7 @@ the earthquake spell. See also: WATERWALK, EARTHQUAKE #0 -FOLLOWERS +FOLLOWERS UNFOLLOW Usage: follow @@ -3350,7 +3350,7 @@ The 3rd number is liquid type from the following: value 1: Initial drink units. Must be 1 or greater. value 2: see below value 3: 0 for not poisoned. Otherwise, the number of hours until the poison - burns off? + burns off. value 2: The type of liquid in the drink-container, one of: @@ -9879,6 +9879,7 @@ tbalim test 61165 return toggle nohassle on +To list empty zones "show zone none" To setup test with zone 348 return saveall diff --git a/lib/world/wld/302.wld b/lib/world/wld/302.wld index a1841a4..28cc82b 100644 --- a/lib/world/wld/302.wld +++ b/lib/world/wld/302.wld @@ -1,6 +1,6 @@ #30200 -The Top Of The Greasepole~ - You've made it to the top! All you have to do now is get down... +The Top of the Greasepole~ +You've made it to the top! All you have to do now is get down. ~ 302 4 0 0 0 5 D5 @@ -9,6 +9,11 @@ It's a long slide down. ~ 0 -1 30192 E +pole greasepole~ + The pole still looks pretty bad, but it doesn't look quite as bad as before. + +~ +E info credits~ See zone description room for Campus. Zone 302 is linked to the following zones: @@ -48,11 +53,6 @@ Links: 64e to catacombs (Mobs Stay_Zone flags have all been disabled to allow free access between 301, 302 and 303. Please ensure that any entrances into the area are flagged nomob to keep them in. - Parna for TBAMud.) -~ -E -pole greasepole~ - The pole still looks pretty bad, but it doesn't look quite as bad as before. - ~ S #30201 @@ -71,13 +71,13 @@ D2 ~ 0 -1 30142 E -mail~ - Why are you trying to look at the mail, it's private! -~ -E hooks hook key keys~ Unfortunately you don't see any keys hanging off of any of the hooks. ~ +E +mail~ + Why are you trying to look at the mail, it's private! +~ S #30202 Main Office~ @@ -92,9 +92,10 @@ This way leads back to the reception desk. door~ 1 30103 30201 E -chair~ - The chair is not unusual in any way whatsoever. The chair is in excellent -condition. +filing cabinet files~ + Looking through the files you see that Wally World was originally slated to +have at least eleven levels but the designers got sick and tired of it and gave +up after just a few levels. ~ E desk~ @@ -102,10 +103,9 @@ desk~ excellent condition. ~ E -filing cabinet files~ - Looking through the files you see that Wally World was originally slated to -have at least eleven levels but the designers got sick and tired of it and gave -up after just a few levels. +chair~ + The chair is not unusual in any way whatsoever. The chair is in excellent +condition. ~ S #30203 @@ -230,14 +230,14 @@ You can't tell where this leads. door~ 1 -1 30210 E -door~ - The door on the west has the number 206 and the door on the east, 205. -~ -E floor carpet~ This is a nice, groovy, red patterned carpet which extends all the way down the hall. ~ +E +door~ + The door on the west has the number 206 and the door on the east, 205. +~ S #30209 Private Room 205~ @@ -300,15 +300,15 @@ You can't tell where this leads. door~ 1 -1 30213 E -door~ - The door on the west has the number 204 and the door on the east, 203 while -the door to the north has the number 201. -~ -E floor carpet~ This is a nice, groovy, red patterned carpet which extends all the way down the hall. ~ +E +door~ + The door on the west has the number 204 and the door on the east, 203 while +the door to the north has the number 201. +~ S #30212 Private Room 203~ @@ -388,14 +388,14 @@ You can't tell where this leads. door~ 1 -1 30217 E -door~ - The door on the west has the number 208 and the door on the east, 207. -~ -E floor carpet~ This is a nice, groovy, red patterned carpet which extends all the way down the hall. ~ +E +door~ + The door on the west has the number 208 and the door on the east, 207. +~ S #30216 Private Room 207~ @@ -458,15 +458,15 @@ You can't tell where this leads. door~ 1 -1 30220 E -door~ - The door on the west has the number 210 and the door on the east, 209 and the -door to the south has the number 202. -~ -E floor carpet~ This is a nice, groovy, red patterned carpet which extends all the way down the hall. ~ +E +door~ + The door on the west has the number 210 and the door on the east, 209 and the +door to the south has the number 202. +~ S #30219 Private Room 209~ @@ -654,14 +654,14 @@ The trapdoor leads up... beyond that, you aren't sure where it goes. trapdoor door~ 1 -1 30233 E +trapdoor~ + The trapdoor is neatly fastened with a small hook. +~ +E desk chair plush~ The desk and chairs are neatly arranged as if in preparation for an upcoming meeting or something of the sort. ~ -E -trapdoor~ - The trapdoor is neatly fastened with a small hook. -~ S #30229 Hallway~ @@ -770,13 +770,13 @@ A chute leads down from this room. ~ 0 -1 30235 E -chute~ - The chute is rather smooth and looks to be a fun ride. -~ -E grate~ Beyond the grate you can see the attic. ~ +E +chute~ + The chute is rather smooth and looks to be a fun ride. +~ S #30235 The Chute~ @@ -871,13 +871,13 @@ An exit from this hellhole. ~ 0 -1 30240 E -mess~ - Need you ask? -~ -E hell hole hellhole~ Never seen one before? ~ +E +mess~ + Need you ask? +~ S #30240 The Ghetto~ @@ -897,13 +897,13 @@ A run-down house lies to the west. ~ 0 -1 30239 E -house run-down~ - It's in bad shape. -~ -E overturned police policemobile mobile~ It is blocking the road quite nicely. Maybe it is meant to impede passage. ~ +E +house run-down~ + It's in bad shape. +~ S #30241 The Ghetto Intersection~ @@ -1344,16 +1344,16 @@ The auditorium is to the north. ~ 0 -1 30259 E -drab brown curtains curtain~ - They are just your average, everyday, drab brown curtains. +sturdy wooden plank planks~ + They are sturdy. They are wooden. They are planks. ~ E cords cord pulley pulleys~ Hey! It can make you look like you are flying! ~ E -sturdy wooden plank planks~ - They are sturdy. They are wooden. They are planks. +drab brown curtains curtain~ + They are just your average, everyday, drab brown curtains. ~ S #30262 @@ -1403,13 +1403,13 @@ It's the same stairwell. ~ 0 -1 30257 E -cobweb cobwebs web webs~ - Don't disturb them now! -~ -E huge stone door~ The huge stone door looks very inviting. ~ +E +cobweb cobwebs web webs~ + Don't disturb them now! +~ S #30265 The Grant Hall Clock~ @@ -1785,10 +1785,6 @@ It is too dark to tell. ~ 0 -1 30276 E -door~ - This door is covered with all types of non-magical sigils. -~ -E sigils~ The sigils seem to form some strange shapes: SSSSS @@ -1805,6 +1801,10 @@ sigils~ SSSSS I wonder what it could be? ~ +E +door~ + This door is covered with all types of non-magical sigils. +~ S #30281 A Classroom~ @@ -1851,13 +1851,13 @@ You are repulsed by this exit since the exit to the east is well lit. ~ 0 -1 30274 E -light~ - It's nice, warm, and inviting. -~ -E dark~ Are you mad? ~ +E +light~ + It's nice, warm, and inviting. +~ S #30283 The Exit~ @@ -1875,13 +1875,13 @@ Back into darkness, I don't think so! ~ 0 -1 30282 E -light~ - It's nice, warm, and inviting. -~ -E dark~ Are you mad? ~ +E +light~ + It's nice, warm, and inviting. +~ S #30284 Mob Chute A~ @@ -1916,10 +1916,6 @@ This is just an exit. ~ 0 -1 30106 E -door~ - This door is covered with all types of non-magical sigils. -~ -E sigils~ The sigils seem to form some strange shapes: MMM MMM OOO OOO !! @@ -1929,6 +1925,10 @@ sigils~ MM M MM OO OO OO OO MM MM OOO OOO !! ~ +E +door~ + This door is covered with all types of non-magical sigils. +~ S #30285 Mob Chute B~ diff --git a/lib/world/zon/302.zon b/lib/world/zon/302.zon index cd8ff3b..bdbb0d6 100644 --- a/lib/world/zon/302.zon +++ b/lib/world/zon/302.zon @@ -2,6 +2,8 @@ Matrix of C.A.W.~ Campus II~ 30200 30299 30 2 +R 0 30200 30112 -1 (a tam) +O 1 30112 99 30200 (a tam) M 0 30105 4 30284 (Security) E 1 30115 99 16 (a flashlight) M 0 30105 4 30284 (Security) @@ -32,8 +34,6 @@ M 0 30132 1 30284 (Chris) M 0 30137 1 30284 (Alex) M 0 30138 1 30284 (Steve) M 0 30145 10 30284 (a copy of Golden World) -R 0 30200 30112 -1 (a tam) -O 1 30112 99 30200 (a tam) M 0 30139 1 30245 (Bob the storekeeper) G 1 30136 99 -1 (a pale apple) G 1 30140 99 -1 (a can of PopCoke) diff --git a/lib/world/zon/4.zon b/lib/world/zon/4.zon index b3e1c35..ffa11d7 100644 --- a/lib/world/zon/4.zon +++ b/lib/world/zon/4.zon @@ -1,6 +1,6 @@ #4 -Unknown~ -Jade Forest~ +trunks shaoden~ +Rename~ 400 499 30 2 d 0 0 0 10 25 M 0 481 1 481 (Zachary) G 1 403 99 -1 (rawhide whip) diff --git a/lib/world/zon/6.zon b/lib/world/zon/6.zon index 9db35c2..2993a50 100644 --- a/lib/world/zon/6.zon +++ b/lib/world/zon/6.zon @@ -1,5 +1,5 @@ #6 -Unknown~ +q~ Sea of Souls~ 600 699 30 2 d 0 0 0 10 25 M 0 600 1 600 (a snail) diff --git a/src/constants.c b/src/constants.c index 50e50f9..c18f11f 100644 --- a/src/constants.c +++ b/src/constants.c @@ -24,7 +24,7 @@ * @todo cpp_extern isn't needed here (or anywhere) as the extern reserved word * works correctly with C compilers (at least in my Experience) * Jeremy Osborne 1/28/2008 */ -cpp_extern const char *tbamud_version = "tbaMUD 2021"; +cpp_extern const char *tbamud_version = "tbaMUD 2023"; /* strings corresponding to ordinals/bitvectors in structs.h */ /* (Note: strings for class definitions in class.c instead of here) */