diff --git a/lib/text/wizlist b/lib/text/wizlist index 4f4c7e4..f4137c5 100644 --- a/lib/text/wizlist +++ b/lib/text/wizlist @@ -4,11 +4,9 @@ Implementors ~~~~~~~~~~~~ - Detta Rumble Greater Gods ~~~~~~~~~~~~ - Zizazat Gods ~~~~ diff --git a/lib/world/mob/292.mob b/lib/world/mob/292.mob index 06ee03c..121f5cb 100644 --- a/lib/world/mob/292.mob +++ b/lib/world/mob/292.mob @@ -198,6 +198,20 @@ reason why Kell is so successful. Myrama is truly marvelous! 50 2500 8 8 2 E +#29215 +herbalist shopkeeper~ +the Herbalist~ +The herbalist is here, reading to her plants. +~ + The herbalist is an ancient woman, but she still seems spry and sharp-minded +when it comes to plants. You've no doubt this woman is an expert in her field. + +~ +188426 0 0 0 0 0 0 0 500 E +23 13 -3 4d4+230 3d3+3 +230 52900 +8 8 2 +E #29216 lawyer~ the Lawyer~ diff --git a/lib/world/mob/30.mob b/lib/world/mob/30.mob index 173fc22..d1ddd00 100644 --- a/lib/world/mob/30.mob +++ b/lib/world/mob/30.mob @@ -530,6 +530,32 @@ A small, quick, loyal beagle is here. 8 8 0 BareHandAttack: 4 E +#3093 +rottweiler pets~ +the rottweiler~ +A large, loyal rottweiler is here. +~ + The rottweiler looks like a strong, fierce fighter. +~ +16398 0 0 0 0 0 0 0 0 E +3 19 8 0d0+30 1d2+0 +30 900 +8 8 0 +BareHandAttack: 4 +E +#3094 +wolf pets~ +the wolf~ +A large, trained wolf is here. +~ + The wolf looks like a strong, fearless fighter. +~ +16398 0 0 0 0 0 0 0 0 E +4 19 7 0d0+40 1d2+0 +40 1600 +8 8 0 +BareHandAttack: 4 +E #3095 cryogenicist cryo~ the cryogenicist~ diff --git a/lib/world/mob/7.mob b/lib/world/mob/7.mob index 409e692..5146bd9 100644 --- a/lib/world/mob/7.mob +++ b/lib/world/mob/7.mob @@ -124,6 +124,19 @@ A guard is standing watch here. 8 8 1 BareHandAttack: 10 E +#709 +woodswoman~ +a woodswoman~ +A woodswoman is looking for a woodsman to nag. +~ + She looks upset about something. +~ +72 0 0 0 8192 0 0 0 0 E +7 18 5 1d1+70 1d2+1 +70 4900 +8 8 2 +BareHandAttack: 8 +E #710 messenger~ a messenger~ diff --git a/lib/world/obj/38.obj b/lib/world/obj/38.obj index 9a3a715..1448f5a 100644 --- a/lib/world/obj/38.obj +++ b/lib/world/obj/38.obj @@ -16,7 +16,7 @@ A #3801 secret safe~ a secret safe~ -It's a secret safe.~ +.A hidden safe.~ ~ 15 0 0 0 0 0 0 0 0 0 0 0 0 100 5 -1 0 diff --git a/lib/world/trg/38.trg b/lib/world/trg/38.trg index eaaf85a..d7ab1ff 100644 --- a/lib/world/trg/38.trg +++ b/lib/world/trg/38.trg @@ -1,34 +1,34 @@ -#3800 -Rat Hiss~ -0 ab 20 -~ -%echo% The rat chews on an iron object. -wait 5 s -%echo% The rat stops and starts hissing. -wait 5 s -%echo% The rat continues to chew. -~ -#3801 -unlimited fountain~ -1 j 100 -~ -otransform 3801 -%echo% The ring refills itself! -~ -#3802 -Backstabber~ -1 j 100 -~ -%echo% You feel like you could walk right up beind a Cityguard without him noticing! -~ -#3804 -Slaive Attack~ -0 g 100 -~ -wait 10s -%echoaround% The carcass rises up and plants his dagger in %actor.name%'s back! -%send% %actor% The corpse of Slaive rises up and plants his dagger in your back! -%damage% %actor% 100 -attack %actor% -~ -$~ +#3800 +Rat Hiss~ +0 ab 20 +~ +%echo% The rat chews on an iron object. +wait 5 s +%echo% The rat stops and starts hissing. +wait 5 s +%echo% The rat continues to chew. +~ +#3801 +unlimited fountain~ +1 j 100 +~ +otransform 3801 +%echo% The ring refills itself! +~ +#3802 +Backstabber~ +1 j 100 +~ +%echo% You feel like you could walk right up beind a Cityguard without him noticing! +~ +#3804 +Slaive Attack~ +0 g 100 +~ +wait 10s +%echoaround% %actor% The carcass rises up and plants his dagger in %actor.name%'s back! +%send% %actor% The corpse of Slaive rises up and plants his dagger in your back! +%damage% %actor% 100 +mkill %actor% +~ +$~ diff --git a/lib/world/wld/0.wld b/lib/world/wld/0.wld index b38172e..46fdd00 100644 --- a/lib/world/wld/0.wld +++ b/lib/world/wld/0.wld @@ -568,19 +568,58 @@ D2 ~ 0 0 33 E -Catcher Rye~ - The mark of the immature man is that he wants to die nobly for a cause, -while the mark of the mature man is that he wants to live humbly for one. ---Wilhelm Stekel +.test~ +can you see this with look around? +~ +E +july4~ + On July 4, 1776, we claimed our independence from England and Democracy was +born. Every day thousands leave their homeland to come to the "land of the +free and the home of the brave" so they can begin their American Dream. The +United States is truly a diverse nation made up of dynamic people. Each year +on July 4, Americans celebrate that freedom and indepen-dence with barbecues, +picnics, and family ga-therings. Through the Internet we are learning about +and communicat-ing with people of different nations, with different languages +and different races throughout the world. Bringing the world closer with +understanding and knowledge can only benefit all nations. We invite all +nations to celebrate with Americans online this Fourth of July. Happy +Birthday, America! +~ +E +oath~ + I do solemnly swear that I will support and defend the Constitution of the +United States against all enemies, foreign and domestic, and to bear true faith +and allegiance to the same that I take this obligation freely, without any +mental reservation or purpose of evasion, and that I will well and faithfully +discharge the duties of the office upon which I am about to enter. +~ +E +builder~ + +There is one timeless way of building. + +It is thousands of years old, and the same today as it has always been. + + The great traditional buildings of the past, the villages and tents and +temples in which man feels at home, have always been made by people who were +very close to the center of this way. It is not possible to make great +buildings, or great towns, beautiful places, places where you feel yourself, +places where you feel alive, except by following this way. And, as you will +see, this way will lead anyone who looks for it to buildings which are +themselves as ancient in their form, as the trees and hills, and as our faces +are. + --The Timeless Way of Building +~ +E +war~ + War is an ugly thing, but not the ugliest of things. The decayed and +degraded state of moral and patriotic feeling which thinks that nothing is +worth war is much worse. The person who has nothing for which he is willing to +fight, nothing which is more important than his own personal safety, is a +miserable creature and has no chance of being free unless made and kept so by +the exertions of better men than himself. - ...you'll find that you're not the first person who was ever confused and -frighteneed and even sickened by human behavior. You're by no means alone on -that score, you'll be excited and stimulated to know. Many, many men have been -just as troubled morally and spiritually as you are right now. Happily, some -of them kept records of their troubles. You'll learn from them-if you want to. -Just as someday, if you have something to offer, someone will learn something -from you. It's a beautiful reciprocal arrangement. ---The Catcher in the Rye +John Stuart Mill ~ E old glory flag~ @@ -613,58 +652,19 @@ or daughter-I am proud. My name is Old Glory-long may I wave. Dear God, long may I wave. ~ E -war~ - War is an ugly thing, but not the ugliest of things. The decayed and -degraded state of moral and patriotic feeling which thinks that nothing is -worth war is much worse. The person who has nothing for which he is willing to -fight, nothing which is more important than his own personal safety, is a -miserable creature and has no chance of being free unless made and kept so by -the exertions of better men than himself. +Catcher Rye~ + The mark of the immature man is that he wants to die nobly for a cause, +while the mark of the mature man is that he wants to live humbly for one. +--Wilhelm Stekel -John Stuart Mill -~ -E -builder~ - -There is one timeless way of building. - -It is thousands of years old, and the same today as it has always been. - - The great traditional buildings of the past, the villages and tents and -temples in which man feels at home, have always been made by people who were -very close to the center of this way. It is not possible to make great -buildings, or great towns, beautiful places, places where you feel yourself, -places where you feel alive, except by following this way. And, as you will -see, this way will lead anyone who looks for it to buildings which are -themselves as ancient in their form, as the trees and hills, and as our faces -are. - --The Timeless Way of Building -~ -E -oath~ - I do solemnly swear that I will support and defend the Constitution of the -United States against all enemies, foreign and domestic, and to bear true faith -and allegiance to the same that I take this obligation freely, without any -mental reservation or purpose of evasion, and that I will well and faithfully -discharge the duties of the office upon which I am about to enter. -~ -E -july4~ - On July 4, 1776, we claimed our independence from England and Democracy was -born. Every day thousands leave their homeland to come to the "land of the -free and the home of the brave" so they can begin their American Dream. The -United States is truly a diverse nation made up of dynamic people. Each year -on July 4, Americans celebrate that freedom and indepen-dence with barbecues, -picnics, and family ga-therings. Through the Internet we are learning about -and communicat-ing with people of different nations, with different languages -and different races throughout the world. Bringing the world closer with -understanding and knowledge can only benefit all nations. We invite all -nations to celebrate with Americans online this Fourth of July. Happy -Birthday, America! -~ -E -.test~ -can you see this with look around? + ...you'll find that you're not the first person who was ever confused and +frighteneed and even sickened by human behavior. You're by no means alone on +that score, you'll be excited and stimulated to know. Many, many men have been +just as troubled morally and spiritually as you are right now. Happily, some +of them kept records of their troubles. You'll learn from them-if you want to. +Just as someday, if you have something to offer, someone will learn something +from you. It's a beautiful reciprocal arrangement. +--The Catcher in the Rye ~ S T 1217 @@ -697,7 +697,7 @@ S The Prison Cell Corridor~ This long hallway is barely wide enough for two people to walk abreast. Along the Northern wall are steel doors spaced a few feet apart while the -southern wall is of cynder block construction. +southern wall is of cinder block construction. ~ 0 0 0 0 0 0 D1 @@ -854,14 +854,14 @@ D2 ~ 0 0 98 E -sky winds~ - Cold winds plunge ceaselessly at you from the dark, cloudless sky. -~ -E floor~ The stone floor is the same shade of grey as the sky and is completely plain and unscratched. It is probably too hard for anything to leave as much as a scratch on it. ~ +E +sky winds~ + Cold winds plunge ceaselessly at you from the dark, cloudless sky. +~ S $~ diff --git a/lib/world/wld/303.wld b/lib/world/wld/303.wld index e5f81ce..a96f09f 100644 --- a/lib/world/wld/303.wld +++ b/lib/world/wld/303.wld @@ -41,17 +41,17 @@ Thank Bob, the hallway is still to the west of here. ~ 0 -1 30299 E -bars bar ceiling~ - The bars hanging from the ceiling look quite sturdy and it looks like you -could swing on them rather easily... If you were coordinated that is. -~ -E sep~ This is Someone Else's Problem. The only way that you are able to spot it is by jumping around and looking like an idiot as you try and avert your eyes so that it can be seen. Unfortunately, seeing it doesn't help. It looks like some sort of Italian Bistro... Rather strange actually. ~ +E +bars bar ceiling~ + The bars hanging from the ceiling look quite sturdy and it looks like you +could swing on them rather easily... If you were coordinated that is. +~ S #30302 Hallway~ @@ -79,14 +79,14 @@ it. ~ 0 -1 30303 E +erp! erp~ + Get it... Elephants Ride Porcupines! ... ERP! +~ +E martian~ It's just a joke, you are supposed to smile at the obscure gag hidden in it. It's almost like saying the Elephants Ride Porcupines! ~ -E -erp! erp~ - Get it... Elephants Ride Porcupines! ... ERP! -~ S #30303 Smithville~ @@ -149,12 +149,8 @@ S T 30300 #30306 Really Narrow Stairwell, Part I~ - This stairwell is just wide enough for one person at a time. If I knew how -to make it so that characters could only attack a creature one at a time, I -just might do so... But I didn't so feel lucky. It is quite a tight fit -trying to navigate the stairs though. The fact that there is an exit to the -west blocked by a door doesn't help. The fact that the only other way out is -to go up. Not coincidentally, that doesn't help either. + This stairwell is just wide enough for one person at a time. A door lies to +the west. ~ 303 13 0 0 0 0 D3 @@ -233,16 +229,16 @@ The bedroom is to the south. ~ 0 -1 30310 E +couch rocking chair~ + The flowery pattern makes you recoil in disgust, but other than that it seems +to be a normal piece of furniture. +~ +E coffee table~ As you look at the coffee table, you notice a copy of the really rude Madonna book... No wait, that was just censored by the Builders. We are allowing none of that smut here. You are disgusted by the flowery pattern on the table. ~ -E -couch rocking chair~ - The flowery pattern makes you recoil in disgust, but other than that it seems -to be a normal piece of furniture. -~ S #30310 Bedroom~ @@ -262,9 +258,8 @@ The balcony is to the east. ~ 0 -1 30311 E -bed~ - You feel sleepy as you look towards this, maybe ... Nope, none of those -thoughts here! +dresser~ + Too bad none of the clothes in here fit you at all. ~ E night-table~ @@ -273,8 +268,9 @@ space underneath. The thing that makes it different is that the drawer is empty and the top and empty space are just that. Empty. ~ E -dresser~ - Too bad none of the clothes in here fit you at all. +bed~ + You feel sleepy as you look towards this, maybe ... Nope, none of those +thoughts here! ~ S #30311 @@ -297,9 +293,10 @@ This leads back to a bedroom. ~ 0 -1 30310 E -cows horses pigs pig cow horse~ - These are normal farm animals. You aren't quite sure what farm they are on -though. +frgos~ + No, this isn't a spelling mistake! It's just a neat little creature that you +have never seen before and will probably never see again after this. After all, +this is an illusion, or something, isn't it? ~ E dogs cats cat dog~ @@ -307,10 +304,9 @@ dogs cats cat dog~ they are where they are. ~ E -frgos~ - No, this isn't a spelling mistake! It's just a neat little creature that you -have never seen before and will probably never see again after this. After all, -this is an illusion, or something, isn't it? +cows horses pigs pig cow horse~ + These are normal farm animals. You aren't quite sure what farm they are on +though. ~ S #30312 @@ -384,9 +380,10 @@ The hallway leads away from here to the south. ~ 0 -1 30313 E -computer accessories~ - This is so large and incomprehensible that you simply do not understand it. - +pictures snow boats walls~ + The pictures cover the walls completely and you find it difficult to see any +of the wall whatsoever between the pictures of snowscapes that you don't +recognize and boats that you would love to own. ~ E cds cd cassettes cassette~ @@ -394,10 +391,9 @@ cds cd cassettes cassette~ african tribal music to the latest from Neil Young. ~ E -pictures snow boats walls~ - The pictures cover the walls completely and you find it difficult to see any -of the wall whatsoever between the pictures of snowscapes that you don't -recognize and boats that you would love to own. +computer accessories~ + This is so large and incomprehensible that you simply do not understand it. + ~ S #30315 @@ -460,9 +456,13 @@ The hallway extends to the east. ~ 0 -1 30315 E -stock certificates~ - They all seem to be immensely valuable but with your awful luck, you can't -seem to pry any of them from the walls. +news newspapers~ + It's only the business sections, and they are old. Type NEWS for a more +updated edition. +~ +E +pizza box~ + It's about 3 weeks old and seems to be growing mould.... Yech. ~ E furniture~ @@ -470,13 +470,9 @@ furniture~ as the table of the future. ~ E -pizza box~ - It's about 3 weeks old and seems to be growing mould.... Yech. -~ -E -news newspapers~ - It's only the business sections, and they are old. Type NEWS for a more -updated edition. +stock certificates~ + They all seem to be immensely valuable but with your awful luck, you can't +seem to pry any of them from the walls. ~ S #30318 @@ -493,15 +489,15 @@ The hallway is directly to your north. ~ 0 -1 30315 E -posters john lennon beatles~ - The majority of the posters in this room deal with John Lennon but there are -a few of Ringo and George also. -~ -E paul~ Wait... There's one of Paul... See it? The one with all the darts stuck in it. ~ +E +posters john lennon beatles~ + The majority of the posters in this room deal with John Lennon but there are +a few of Ringo and George also. +~ S #30319 Common Room~ @@ -523,9 +519,8 @@ way through. door~ 2 0 -1 E -door~ - The door seems to be permanently closed and there does not seem to be a way -through. +chair chairs couch couches~ + You don't see any such thing. Read the description. ~ E fridge stove tv~ @@ -533,8 +528,9 @@ fridge stove tv~ this magnitude. ~ E -chair chairs couch couches~ - You don't see any such thing. Read the description. +door~ + The door seems to be permanently closed and there does not seem to be a way +through. ~ S #30320 @@ -705,13 +701,13 @@ Well, it's the hallway you entered from... Or is it? ~ 0 -1 30320 E -round circle circular curves curve~ - Yes, it's round. -~ -E letter number lettering numbering order~ You aren't too sure that there is an order to the lettering scheme. ~ +E +round circle circular curves curve~ + Yes, it's round. +~ S #30327 Lecture Hall "A"~ @@ -726,13 +722,13 @@ Well, it's the hallway you entered from... Or is it? ~ 0 -1 30321 E -round circle circular curves curve~ - Yes, it's round. -~ -E letter number lettering numbering order~ You aren't too sure that there is an order to the lettering scheme. ~ +E +round circle circular curves curve~ + Yes, it's round. +~ S #30328 Lecture Hall "D"~ @@ -747,13 +743,13 @@ Well, it's the hallway you entered from... Or is it? ~ 0 -1 30323 E -round circle circular curves curve~ - Yes, it's round. -~ -E letter number lettering numbering order~ You aren't too sure that there is an order to the lettering scheme. ~ +E +round circle circular curves curve~ + Yes, it's round. +~ S #30329 Lecture Hall "C"~ @@ -768,13 +764,13 @@ Well, it's the hallway you entered from... Or is it? ~ 0 -1 30324 E -round circle circular curves curve~ - Yes, it's round. -~ -E letter number lettering numbering order~ You aren't too sure that there is an order to the lettering scheme. ~ +E +round circle circular curves curve~ + Yes, it's round. +~ S #30330 Hallway~ diff --git a/src/act.wizard.c b/src/act.wizard.c index 3c129f9..9c6b462 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -1326,12 +1326,12 @@ ACMD(do_load) send_to_char(ch, "Usage: load < obj | mob > \r\n"); return; } - if (!is_number(buf2) || !is_number(buf3)) { + if (!is_number(buf2)) { send_to_char(ch, "That is not a number.\r\n"); return; } - if (atoi(buf3) > 0 ) { + if (atoi(buf3) > 0 && atoi(buf3) <= 100) { n = atoi(buf3); } else { n = 1; diff --git a/src/modify.c b/src/modify.c index 8b70018..a289adc 100644 --- a/src/modify.c +++ b/src/modify.c @@ -402,7 +402,7 @@ void page_string(struct descriptor_data *d, char *str, int keep_internal) if (!str || !*str) return; - if ((GET_PAGE_LENGTH(d->character) < 5 || GET_PAGE_LENGTH(d->character) > 255)) + if ((GET_PAGE_LENGTH(d->character) < 5 || GET_PAGE_LENGTH(d->character) > 254)) GET_PAGE_LENGTH(d->character) = PAGE_LENGTH; d->showstr_count = count_pages(str, d->character); CREATE(d->showstr_vector, char *, d->showstr_count); diff --git a/src/structs.h b/src/structs.h index eae9519..1c41fd4 100644 --- a/src/structs.h +++ b/src/structs.h @@ -488,11 +488,10 @@ #define MAX_RAW_INPUT_LENGTH 1024 /* Max size of *raw* input */ #define MAX_MESSAGES 60 #define MAX_NAME_LENGTH 20 -/* ** MAX_PWD_LENGTH changed from 10 to 30 for ascii test - Sam ** */ #define MAX_PWD_LENGTH 30 #define MAX_TITLE_LENGTH 80 #define HOST_LENGTH 40 -#define PLR_DESC_LENGTH 2048 +#define PLR_DESC_LENGTH 4096 #define MAX_SKILLS 200 #define MAX_AFFECT 32 #define MAX_OBJ_AFFECT 6 /* Used in obj_file_elem */