[ScryMUD] SVN Commit Info r841 - trunk/mud/grrmud/server
scrymud at wanfear.com
scrymud at wanfear.com
Sun Jul 9 18:10:18 PDT 2006
Author: eroper
Date: 2006-07-09 18:10:16 -0700 (Sun, 09 Jul 2006)
New Revision: 841
Modified:
trunk/mud/grrmud/server/command5.cc
trunk/mud/grrmud/server/const.cc
trunk/mud/grrmud/server/skills.cc
trunk/mud/grrmud/server/social2.cc
trunk/mud/grrmud/server/socials.cc
trunk/mud/grrmud/server/translations.spec
Log:
Fixes: MUD-323 MUD-324 MUD-325 MUD-332 MUD-338
------------------------------------------------------------------------------
* Lowered construction pause to 2 miniticks (from 4)
* Sages are now significantly less likely to fail constructing and brewing.
When they do fail, they don't lose the parts.
* Fixed a missing newline on the IMM's version of recho.
* Blink, trout social no longer have an extra newline
* Standing, sitting, resting, meditating no longer produce excessive newlines.
* No longer required to stand before nodding or waving.
* No longer an excessive newline on the "... can't seem to remember..."
messages.
Modified: trunk/mud/grrmud/server/command5.cc
===================================================================
--- trunk/mud/grrmud/server/command5.cc 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/command5.cc 2006-07-10 01:10:16 UTC (rev 841)
@@ -2687,7 +2687,7 @@
while ((ptr = cll.next())) {
if (ptr->isImmort() && (ptr->getImmLevel() >= pc.getImmLevel())) {
- Sprintf(buf2, "[%S] %S", pc.getName(), msg);
+ Sprintf(buf2, "[%S] %S\n", pc.getName(), msg);
show(buf2, *ptr);
}
else {
Modified: trunk/mud/grrmud/server/const.cc
===================================================================
--- trunk/mud/grrmud/server/const.cc 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/const.cc 2006-07-10 01:10:16 UTC (rev 841)
@@ -531,7 +531,7 @@
const char* LOST_CONCENTRATION_MSG_SELF =
"You lost your concentration.\n";
const char* LOST_CONCENTRATION_MSG_OTHER =
- "can't seem to remember how it goes.\n";
+ "can't seem to remember how it goes.";
const char* SPELL_ONLY_ON_SELF_MSG = "You can't use this spell on others.\n";
const char* HUH_MSG = "Huh??\n";
Modified: trunk/mud/grrmud/server/skills.cc
===================================================================
--- trunk/mud/grrmud/server/skills.cc 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/skills.cc 2006-07-10 01:10:16 UTC (rev 841)
@@ -924,6 +924,7 @@
String buf(100);
object* toolbox, *ptr, *item1, *item2, *item3, *item4, *item5;
Cell<object*> cll;
+ short do_lose_contents = FALSE;
// log("In construct.\n");
item1 = item2 = item3 = item4 = item5 = NULL;
@@ -1060,69 +1061,79 @@
int targ_num = ptr->COMPONENT_TARG;
// NOTE: Can't use ptr after this, because it might be deleted!!!
- if (item1) {
- toolbox->loseInv(item1);
- drop_eq_effects(*item1, pc, FALSE, FALSE);
- recursive_init_unload(*item1, 0);
- if (item1->isModified()) {
- delete item1;
- item1 = NULL;
- }//if
- }//if
-
- if (item2) {
- toolbox->loseInv(item2);
- drop_eq_effects(*item2, pc, FALSE, FALSE);
- recursive_init_unload(*item2, 0);
- if (item2->isModified()) {
- delete item2;
- item2 = NULL;
- }//if
- }//if
-
- if (item3) {
- toolbox->loseInv(item3);
- drop_eq_effects(*item3, pc, FALSE, FALSE);
- recursive_init_unload(*item3, 0);
- if (item3->isModified()) {
- delete item3;
- item3 = NULL;
- }//if
- }//if
-
- if (item4) {
- toolbox->loseInv(item4);
- drop_eq_effects(*item4, pc, FALSE, FALSE);
- recursive_init_unload(*item4, 0);
- if (item4->isModified()) {
- delete item4;
- item4 = NULL;
- }//if
- }//if
-
- if (item5) {
- toolbox->loseInv(item5);
- drop_eq_effects(*item5, pc, FALSE, FALSE);
- recursive_init_unload(*item5, 0);
- if (item5->isModified()) {
- delete item5;
- item5 = NULL;
- }//if
- }//if
-
if (skill_did_hit(pc, CONSTRUCT_SKILL_NUM, pc)) {
- toolbox->gainInv(&(obj_list[targ_num]));
- recursive_init_loads(obj_list[targ_num], 0);
- Sprintf(buf, "You have successfully constructed %S in %S.\n",
- obj_list[targ_num].getLongName(),
- toolbox->getLongName());
- show(buf, pc);
+ toolbox->gainInv(&(obj_list[targ_num]));
+ recursive_init_loads(obj_list[targ_num], 0);
+ Sprintf(buf, "You have successfully constructed %S in %S.\n",
+ obj_list[targ_num].getLongName(),
+ toolbox->getLongName());
+ show(buf, pc);
+ do_lose_contents = TRUE;
}//if skill_did_hit, ie if pc knew it well enuf not to fail
else {
- show("You fiddle with your components, but all you can seem to", pc);
- show(" do is bugger them up completely.\n", pc);
+ if ( pc.isSage() ) {
+ show("You fiddle around for a bit without success.\n", pc);
+ do_lose_contents = FALSE;
+ } else {
+ show("You fiddle with your components, but all you can seem to", pc);
+ show(" do is bugger them up completely.\n", pc);
+ do_lose_contents = TRUE;
+ }
}//else
- pc.PAUSE += 4;
+
+ if ( do_lose_contents ) {
+ if (item1) {
+ toolbox->loseInv(item1);
+ drop_eq_effects(*item1, pc, FALSE, FALSE);
+ recursive_init_unload(*item1, 0);
+ if (item1->isModified()) {
+ delete item1;
+ item1 = NULL;
+ }//if
+ }//if
+
+ if (item2) {
+ toolbox->loseInv(item2);
+ drop_eq_effects(*item2, pc, FALSE, FALSE);
+ recursive_init_unload(*item2, 0);
+ if (item2->isModified()) {
+ delete item2;
+ item2 = NULL;
+ }//if
+ }//if
+
+ if (item3) {
+ toolbox->loseInv(item3);
+ drop_eq_effects(*item3, pc, FALSE, FALSE);
+ recursive_init_unload(*item3, 0);
+ if (item3->isModified()) {
+ delete item3;
+ item3 = NULL;
+ }//if
+ }//if
+
+ if (item4) {
+ toolbox->loseInv(item4);
+ drop_eq_effects(*item4, pc, FALSE, FALSE);
+ recursive_init_unload(*item4, 0);
+ if (item4->isModified()) {
+ delete item4;
+ item4 = NULL;
+ }//if
+ }//if
+
+ if (item5) {
+ toolbox->loseInv(item5);
+ drop_eq_effects(*item5, pc, FALSE, FALSE);
+ recursive_init_unload(*item5, 0);
+ if (item5->isModified()) {
+ delete item5;
+ item5 = NULL;
+ }//if
+ }//if
+ }//do_lose_contents
+
+ pc.PAUSE += 2;
return 0;
}//construct()
@@ -1132,6 +1143,7 @@
String buf(100);
object* cauldron, *ptr, *item1, *item2, *item3, *item4, *item5;
Cell<object*> cll;
+ short do_lose_contents = FALSE;
// log("In concoct.\n");
if (!pc.pc && !do_mob) //no ordering pets to do yer dirty-work
@@ -1268,69 +1280,80 @@
/* have all items, and levels are compatable */
- if (item1) {
- cauldron->loseInv(item1);
- drop_eq_effects(*item1, pc, FALSE);
- recursive_init_unload(*item1, 0);
- if (item1->isModified()) {
- delete item1;
- item1 = NULL;
- }//if
- }//if
-
- if (item2) {
- cauldron->loseInv(item2);
- drop_eq_effects(*item2, pc, FALSE);
- recursive_init_unload(*item2, 0);
- if (item2->isModified()) {
- delete item2;
- item2 = NULL;
- }//if
- }//if
-
- if (item3) {
- cauldron->loseInv(item3);
- drop_eq_effects(*item3, pc, FALSE);
- recursive_init_unload(*item3, 0);
- if (item3->isModified()) {
- delete item3;
- item3 = NULL;
- }//if
- }//if
-
- if (item4) {
- cauldron->loseInv(item4);
- drop_eq_effects(*item4, pc, FALSE);
- recursive_init_unload(*item4, 0);
- if (item4->isModified()) {
- delete item4;
- item4 = NULL;
- }//if
- }//if
-
- if (item5) {
- cauldron->loseInv(item5);
- drop_eq_effects(*item5, pc, FALSE);
- recursive_init_unload(*item5, 0);
- if (item5->isModified()) {
- delete item5;
- item5 = NULL;
- }//if
- }//if
-
if (skill_did_hit(pc, BREW_SKILL_NUM, pc)) {
pc.gainInv(&(obj_list[targ_num]));
recursive_init_loads(obj_list[targ_num], 0);
Sprintf(buf, "You have successfully brewed %S.\n",
&(obj_list[targ_num].short_desc));
show(buf, pc);
+ do_lose_contents = TRUE;
}//if skill_did_hit, ie if pc knew it well enuf not to fail
else {
- show("You try to remember the recipe, but you must have", pc);
- show(" forgotten something because this stuff stinks and your ", pc);
- show("ingredients are ruined!!\n", pc);
+ if ( pc.isSage() ) {
+ show("You must have the recipe a little off, perhaps", pc);
+ show(" you should try again.\n", pc);
+ do_lose_contents = FALSE;
+ } else {
+ show("You try to remember the recipe, but you must have", pc);
+ show(" forgotten something because this stuff stinks and your ", pc);
+ show("ingredients are ruined!!\n", pc);
+ do_lose_contents = TRUE;
+ }
}//else
- pc.PAUSE += 4;
+
+ if ( do_lose_contents ) {
+ if (item1) {
+ cauldron->loseInv(item1);
+ drop_eq_effects(*item1, pc, FALSE);
+ recursive_init_unload(*item1, 0);
+ if (item1->isModified()) {
+ delete item1;
+ item1 = NULL;
+ }//if
+ }//if
+
+ if (item2) {
+ cauldron->loseInv(item2);
+ drop_eq_effects(*item2, pc, FALSE);
+ recursive_init_unload(*item2, 0);
+ if (item2->isModified()) {
+ delete item2;
+ item2 = NULL;
+ }//if
+ }//if
+
+ if (item3) {
+ cauldron->loseInv(item3);
+ drop_eq_effects(*item3, pc, FALSE);
+ recursive_init_unload(*item3, 0);
+ if (item3->isModified()) {
+ delete item3;
+ item3 = NULL;
+ }//if
+ }//if
+
+ if (item4) {
+ cauldron->loseInv(item4);
+ drop_eq_effects(*item4, pc, FALSE);
+ recursive_init_unload(*item4, 0);
+ if (item4->isModified()) {
+ delete item4;
+ item4 = NULL;
+ }//if
+ }//if
+
+ if (item5) {
+ cauldron->loseInv(item5);
+ drop_eq_effects(*item5, pc, FALSE);
+ recursive_init_unload(*item5, 0);
+ if (item5->isModified()) {
+ delete item5;
+ item5 = NULL;
+ }//if
+ }//if
+ }// do_lose_contents
+
+ pc.PAUSE += 2;
return 0;
}//concoct()
@@ -1563,9 +1586,13 @@
}
}//else
- if ((spell_num == CONSTRUCT_SKILL_NUM) || (spell_num == BREW_SKILL_NUM))
- return (d(1, 100) < d(1, (percent_lrnd * 2 + 2 * (agg.DEX + agg.INT))));
-
+ if ((spell_num == CONSTRUCT_SKILL_NUM) || (spell_num == BREW_SKILL_NUM)) {
+ if ( agg.isSage() ) {
+ return ( d(1, 75) < d(1, (percent_lrnd*2 + 2*(agg.getDEX(TRUE) + agg.INT))));
+ } else {
+ return (d(1, 100) < d(1, (percent_lrnd * 2 + 2 * (agg.getDEX(TRUE) + agg.INT))));
+ }
+ }
else if ((spell_num == BODYSLAM_SKILL_NUM) ||
(spell_num == HURL_SKILL_NUM))
return (d(1, vict.CRIT_WT_CARRIED) < d(1, percent_lrnd + agg.STR * 10));
Modified: trunk/mud/grrmud/server/social2.cc
===================================================================
--- trunk/mud/grrmud/server/social2.cc 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/social2.cc 2006-07-10 01:10:16 UTC (rev 841)
@@ -1853,7 +1853,7 @@
show("You are not in a position to do that.\n", pc);
else if (crit_ptr == &pc) {
show("You slap yourself silly with a wet trout!\n", pc);
- Sprintf(buf, "slaps %s silly with a wet trout! Doh.\n",
+ Sprintf(buf, "slaps %s silly with a wet trout! Doh.",
get_himself_herself(pc));
emote(buf, pc, rm, TRUE);
}//if targ and agg is same
@@ -2770,7 +2770,7 @@
else if (crit_ptr == &pc) {
show("You blink.\n",
pc);
- Sprintf(buf, "blinks.\n");
+ Sprintf(buf, "blinks.");
emote(buf, pc, rm, TRUE);
}//if targ and agg is same
else {
@@ -2795,7 +2795,7 @@
}//if a victim
else { //change these next two lines
show("You blink in disbelief.\n", pc);
- emote("blinks in disbelief.\n", pc, rm, TRUE);
+ emote("blinks in disbelief.", pc, rm, TRUE);
}//else
}//blink
Modified: trunk/mud/grrmud/server/socials.cc
===================================================================
--- trunk/mud/grrmud/server/socials.cc 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/socials.cc 2006-07-10 01:10:16 UTC (rev 841)
@@ -2446,7 +2446,7 @@
if (!crit_ptr)
show(DONT_SEE_PERSON, pc);
- else if (pc.POS > POS_SIT)
+ else if (pc.POS > POS_REST)
show(NOT_IN_POSN, pc);
else if (crit_ptr == &pc) {
show("You nod to yourself.\n", pc);
Modified: trunk/mud/grrmud/server/translations.spec
===================================================================
--- trunk/mud/grrmud/server/translations.spec 2006-07-09 10:54:09 UTC (rev 840)
+++ trunk/mud/grrmud/server/translations.spec 2006-07-10 01:10:16 UTC (rev 841)
@@ -732,9 +732,9 @@
~
CS_REST_EMOTE
- eng "sits down to take a breather.\n"
- spa "se sienta para tomar un respiro.\n"
- ser "seda na zemlju da se malo odmori.\n"
+ eng "sits down to take a breather."
+ spa "se sienta para tomar un respiro."
+ ser "seda na zemlju da se malo odmori."
~
CS_REST_FIGHTING
@@ -756,9 +756,9 @@
~
CS_SIT_EMOTE
- eng "sits down.\n"
- spa "se sienta.\n"
- ser "seda na zemlju.\n"
+ eng "sits down."
+ spa "se sienta."
+ ser "seda na zemlju."
~
CS_SIT_FIGHTING
@@ -845,9 +845,9 @@
~
CS_STAND_EMOTE
- eng "stands up.\n"
- spa "se para.\n"
- ser "ustaje.\n"
+ eng "stands up."
+ spa "se para."
+ ser "ustaje."
~
CS_NO_STAND
@@ -878,9 +878,9 @@
~
CS_EMOTE_SLEEP
- eng "goes to sleep.\n"
- spa "se va a dormir.\n"
- ser "leze da spava.\n"
+ eng "goes to sleep."
+ spa "se va a dormir."
+ ser "leze da spava."
~
CS_CANT_SLEEP
@@ -908,9 +908,9 @@
~
CS_MED_EMOTE
- eng "goes into a trance.\n"
- spa "se mete en un trance.\n"
- ser "pada u trans.\n"
+ eng "goes into a trance."
+ spa "se mete en un trance."
+ ser "pada u trans."
~
CS_MED_NO_CONCENTRATE
@@ -1561,4 +1561,4 @@
spa "ha llegado desde el %S.\n"
ser "je stigao sa %S.\n"
fre "est arrive du %S.\n"
- ~
\ No newline at end of file
+ ~
More information about the ScryMUD
mailing list