[ScryMUD] SVN Commit Info r975 - in trunk/mud/grrmud: Help server
svn-log at scrymud.net
svn-log at scrymud.net
Mon Mar 3 12:54:26 PST 2008
Author: kaj
Date: 2008-03-03 12:54:26 -0800 (Mon, 03 Mar 2008)
New Revision: 975
Modified:
trunk/mud/grrmud/Help/socials_1
trunk/mud/grrmud/server/gen_cmds.spec
trunk/mud/grrmud/server/social2.cc
trunk/mud/grrmud/server/social2.h
trunk/mud/grrmud/server/socials.cc
Log:
Added whee social (you shout out "WheEEeeEEeE"). Fixed minor socials typos.
Modified: trunk/mud/grrmud/Help/socials_1
===================================================================
--- trunk/mud/grrmud/Help/socials_1 2008-03-03 19:12:33 UTC (rev 974)
+++ trunk/mud/grrmud/Help/socials_1 2008-03-03 20:54:26 UTC (rev 975)
@@ -13,9 +13,9 @@
sob, weep, tremble, sweatdrop, shudder, whine, yawn
Silly:
-bonk, bounce, burp, doze, grunt, hum, insane, itch, jump, megawibble, nog,
-panic, punt, puke, shock, silly, splash, strut, wiggle, trout, twirl, tickle,
-climb, wibble, wiggletoes
+bonk, bounce, burp, climb, doze, grunt, hum, insane, itch, jump, megawibble,
+nog, panic, punt, puke, shock, silly, splash, strut, wiggle, trout, twirl,
+tickle, whee, wibble, wiggletoes
Romance:
dance, disco, flex, nibble, blush, lick, kiss, peck, nestle, swoon, smooch,
Modified: trunk/mud/grrmud/server/gen_cmds.spec
===================================================================
--- trunk/mud/grrmud/server/gen_cmds.spec 2008-03-03 19:12:33 UTC (rev 974)
+++ trunk/mud/grrmud/server/gen_cmds.spec 2008-03-03 20:54:26 UTC (rev 975)
@@ -1002,6 +1002,8 @@
weep(i, &(cooked_strs[1]), pc, (*(pc.getCurRoom()))); return 0;
where ~
return where(i, &(cooked_strs[1]), pc);
+whee socials ~
+whee(i, &(cooked_strs[1]), pc, (*(pc.getCurRoom()))); return 0;
whistle socials ~
whistle(i, &(cooked_strs[1]), pc, (*(pc.getCurRoom()))); return 0;
whimper socials ~
Modified: trunk/mud/grrmud/server/social2.cc
===================================================================
--- trunk/mud/grrmud/server/social2.cc 2008-03-03 19:12:33 UTC (rev 974)
+++ trunk/mud/grrmud/server/social2.cc 2008-03-03 20:54:26 UTC (rev 975)
@@ -3014,7 +3014,7 @@
else if (crit_ptr == &pc) {
show("You tap yourself on the shoulder"
" but all it does is confuse you.\n", pc);
- Sprintf(buf, "taps %s on the should and then spins around in cricles"
+ Sprintf(buf, "taps %s on the should and then spins around in circles"
" trying to catch up to %s.\n", get_himself_herself(pc),
get_himself_herself(pc));
emote(buf, pc, rm, TRUE);
@@ -3108,10 +3108,6 @@
pc.show("You curl up into a ball in your sleep.\n");
return;
}
- else if (pc.POS > POS_SIT){
- pc.show(NOT_IN_POSN);
- return;
- }
if (vict->Strlen()) {
critter* crit_ptr =
@@ -3148,7 +3144,7 @@
pc.show("Curls up in the corner.\n");
pc.emote("curls up in the corner.\n");
}//else
-}//zombie
+}//curl
void snuggle(int i_th, const String* vict, critter& pc, room& rm) {
String buf(100);
@@ -3193,7 +3189,7 @@
Sprintf(buf, "snuggles up under %s blanket.\n", get_his_her(pc));
pc.emote(buf);
}//else
-}//zombie
+}//snuggle
void gasp(int i_th, const String* vict, critter& pc, room& rm) {
String buf(100);
@@ -3204,10 +3200,6 @@
pc.show("You dream of drowning!\n");
return;
}
- else if (pc.POS > POS_SIT){
- pc.show(NOT_IN_POSN);
- return;
- }
if (vict->Strlen()) {
critter* crit_ptr =
@@ -3216,21 +3208,24 @@
if (!crit_ptr) pc.show("You don't see them here.\n");
else if (crit_ptr == &pc) {
pc.show("You gasp in atonishment at your own actions.\n");
- Sprintf(buf, "gasps in astonishment at %s own actions.\n", get_his_her(pc));
- emote(buf, pc, rm, TRUE);
+ Sprintf(buf, "gasps in astonishment at %s own actions.\n",
+ get_his_her(pc));
+ emote(buf, pc, rm, TRUE);
}//if targ and agg is same
else {
Sprintf(buf, "You gasp in astonishment at %S.\n",
name_of_crit(*crit_ptr, pc.SEE_BIT));
pc.show(buf);
- Sprintf(buf, "%S in astonishment at you.\n",
+ Sprintf(buf, "%S gasps in astonishment at you.\n",
name_of_crit(pc, crit_ptr->SEE_BIT));
buf.Cap();
crit_ptr->show(buf);
while ((ptr = cll.next())) {
if ((ptr != &pc) && (ptr != crit_ptr)) {
- Sprintf(buf, "%S gasps in astonishment at %S.\n", name_of_crit(pc, ptr->SEE_BIT), name_of_crit(*crit_ptr, ptr->SEE_BIT));
+ Sprintf(buf, "%S gasps in astonishment at %S.\n",
+ name_of_crit(pc, ptr->SEE_BIT),
+ name_of_crit(*crit_ptr, ptr->SEE_BIT));
buf.Cap();
ptr->show(buf);
}//if
@@ -3241,4 +3236,52 @@
pc.show("You gasp in astonishment.\n");
pc.emote("gasps in astonishment.\n");
}//else
-}//zombie
+}//gasp
+
+void whee(int i_th, const String* vict, critter& pc, room& rm) {
+ String buf(100);
+ Cell<critter*> cll(rm.getCrits());
+ critter* ptr;
+
+ if (pc.POS == POS_SLEEP) {
+ pc.show("Your dreams elicit a sleepy \"Whee\" to yourself!\n");
+ return;
+ }
+
+ if (vict->Strlen()) {
+ critter* crit_ptr = rm.haveCritNamed(i_th, vict, pc);
+
+ if (!crit_ptr) pc.show("You don't see that person here.\n");
+
+ else if (crit_ptr == &pc) { //at self
+ pc.show("You \"WheEeEEeeE\" at yourself.\n");
+ Sprintf(buf, "shouts \"WheEeEEeeE\" at %s.\n",
+ get_himself_herself(pc));
+ emote(buf, pc, rm, TRUE);
+ }//if targ and agg is same
+ else { //at someone else
+ Sprintf(buf, "You shout out \"WheEeEEeeE\" at %S.\n",
+ name_of_crit(*crit_ptr, pc.SEE_BIT));
+ pc.show(buf);
+ Sprintf(buf, "%S shouts \"WheEeEEeeE\" in your direction.\n",
+ name_of_crit(pc, crit_ptr->SEE_BIT));
+ buf.Cap();
+ crit_ptr->show(buf);
+
+ while ((ptr = cll.next())) { //show everyone else
+ if ((ptr != &pc) && (ptr != crit_ptr)) {
+ Sprintf(buf, "%S shouts \"WheEeEEeeE\" at %S.\n",
+ name_of_crit(pc, ptr->SEE_BIT),
+ name_of_crit(*crit_ptr, ptr->SEE_BIT));
+ buf.Cap();
+ ptr->show(buf);
+ }//if
+ }//while
+ }//else
+ }//if a victim
+ else {
+ //just plain "whee"
+ pc.show("You shout \"WheEeEEeeE\" for all the room to hear!\n");
+ pc.emote("shouts out \"WheEeEEeeE\"!\n");
+ }//else
+}//whee
Modified: trunk/mud/grrmud/server/social2.h
===================================================================
--- trunk/mud/grrmud/server/social2.h 2008-03-03 19:12:33 UTC (rev 974)
+++ trunk/mud/grrmud/server/social2.h 2008-03-03 20:54:26 UTC (rev 975)
@@ -100,4 +100,5 @@
void curl(int i_th, const String* vict, critter& pc, room& rm);
void snuggle(int i_th, const String* vict, critter& pc, room& rm);
void gasp(int i_th, const String* vict, critter& pc, room& rm);
+void whee(int i_th, const String* vict, critter& pc, room& rm);
#endif
Modified: trunk/mud/grrmud/server/socials.cc
===================================================================
--- trunk/mud/grrmud/server/socials.cc 2008-03-03 19:12:33 UTC (rev 974)
+++ trunk/mud/grrmud/server/socials.cc 2008-03-03 20:54:26 UTC (rev 975)
@@ -640,6 +640,10 @@
object* obj_ptr;
if(vict->Strlen()) {
+ if (pc.POS >= POS_SIT) {
+ pc.show("You can't jump from this position.\n");
+ return;
+ }
if( (obj_ptr=have_obj_named(pc.inv, i_th, vict, pc.SEE_BIT, rm)) ) {
Sprintf(buf, "You throw %S to the ground and start jumping up and down on it.\n",
@@ -1691,7 +1695,7 @@
emote(buf, pc, rm, TRUE);
}//if targ and agg is same
else {
- Sprintf(buf, "You ACK at spit at %S.\n",
+ Sprintf(buf, "You ACK and spit at %S.\n",
name_of_crit(*crit_ptr, pc.SEE_BIT));
show(buf, pc);
Sprintf(buf, "%S ACKS and spits at you! ACK! PTHHH!\n",
@@ -1732,7 +1736,7 @@
if (!crit_ptr)
show(DONT_SEE_PERSON, pc);
- else if (pc.POS > POS_SIT)
+ else if (pc.POS >= POS_SIT)
show(NOT_IN_POSN, pc);
else if (crit_ptr == &pc) {
show("You bounce around yourself and get dizzy.\n", pc);
@@ -1811,7 +1815,7 @@
}//if a victim
else {
show("You burp happily. BUUUUURP!\n", pc);
- emote("burps loud and happily.", pc, rm, TRUE);
+ emote("burps loudly and happily.", pc, rm, TRUE);
}//else
}//burp
More information about the ScryMUD
mailing list