Menu
▾
▴
[Havok-checkins] havokmud act.info.c,1.157,1.158 act.other.c,1.86,1.87 magic3.c,1.84,1.85
|
From: Anthony C. <dae...@us...> - 2004-04-18 02:09:43
|
Update of /cvsroot/havok/havokmud In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31030 Modified Files: act.info.c act.other.c magic3.c Log Message: more color changes, made whois get clan info from clanlist, fixed up enlightenment Index: magic3.c =================================================================== RCS file: /cvsroot/havok/havokmud/magic3.c,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** magic3.c 11 Apr 2004 23:47:39 -0000 1.84 --- magic3.c 18 Apr 2004 02:09:34 -0000 1.85 *************** *** 2792,2820 **** { struct affected_type af; ! if (!affected_by_spell(victim, SPELL_ENLIGHTENMENT) || ! !saves_spell(victim, SAVING_SPELL)) { ! ! if (affected_by_spell(victim, SPELL_FEEBLEMIND)) { ! send_to_char("They have already been enlightened!\n\r", ch); ! return; ! } ! send_to_char("You feel enlightened by the gods\n\r", victim); ! af.type = SPELL_ENLIGHTENMENT; ! af.duration = 24; ! af.modifier = 2; ! af.location = APPLY_INT; ! af.bitvector = 0; ! affect_to_char(victim, &af); ! af.type = SPELL_ENLIGHTENMENT; ! af.duration = 24; ! af.modifier = 2; ! af.location = APPLY_WIS; ! af.bitvector = 0; ! affect_to_char(victim, &af); ! } } --- 2792,2821 ---- { struct affected_type af; + + if (affected_by_spell(victim, SPELL_ENLIGHTENMENT)) { + send_to_char("You are already enlightened!\n\r", ch); + return; + } ! if (affected_by_spell(victim, SPELL_FEEBLEMIND)) { ! send_to_char("Your mind is too feeble to enlighten!\n\r", ch); ! return; ! } ! send_to_char("You feel enlightened by the gods\n\r", victim); ! af.type = SPELL_ENLIGHTENMENT; ! af.duration = 24; ! af.modifier = 2; ! af.location = APPLY_INT; ! af.bitvector = 0; ! affect_to_char(victim, &af); ! af.type = SPELL_ENLIGHTENMENT; ! af.duration = 24; ! af.modifier = 2; ! af.location = APPLY_WIS; ! af.bitvector = 0; ! affect_to_char(victim, &af); } Index: act.other.c =================================================================== RCS file: /cvsroot/havok/havokmud/act.other.c,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** act.other.c 17 Apr 2004 03:21:03 -0000 1.86 --- act.other.c 18 Apr 2004 02:09:34 -0000 1.87 *************** *** 1399,1406 **** * victim stronger?? */ - if ((GetMaxLevel(victim) - GetMaxLevel(ch)) > 8) { act("$N looks to be too strong to join you.", ! FALSE, ch, 0, victim, TO_CHAR); return; } --- 1399,1405 ---- * victim stronger?? */ if ((GetMaxLevel(victim) - GetMaxLevel(ch)) > 8) { act("$N looks to be too strong to join you.", ! FALSE, ch, 0, victim, TO_CHAR); return; } *************** *** 1412,1419 **** if ((GetMaxLevel(ch) - GetMaxLevel(victim)) > 8) { act("$N looks to be too puny and weak to join you.", ! FALSE, ch, 0, victim, TO_CHAR); return; } ! if (IS_IMMORTAL(ch) && !IS_IMMORTAL(victim)) { /* --- 1411,1418 ---- if ((GetMaxLevel(ch) - GetMaxLevel(victim)) > 8) { act("$N looks to be too puny and weak to join you.", ! FALSE, ch, 0, victim, TO_CHAR); return; } ! if (IS_IMMORTAL(ch) && !IS_IMMORTAL(victim)) { /* *************** *** 1511,1516 **** /* ! * victim stronger?? ! */ if ((GetMaxLevel(victim) - GetMaxLevel(ch)) > 8) { act("$N looks to be too strong to join you.", FALSE, --- 1510,1515 ---- /* ! * victim stronger?? ! */ if ((GetMaxLevel(victim) - GetMaxLevel(ch)) > 8) { act("$N looks to be too strong to join you.", FALSE, *************** *** 3327,3346 **** } } - } else if (!strcmp(type, "clan")) { - if (*field) { - if (ch->specials.clan) { - free(ch->specials.clan); - } - ch->specials.clan = strdup(field); - if (cmd == 280) { - write_char_extra(ch); - send_to_char("Clan Field set.\n\r", ch); - } - } else { - if (ch->specials.clan) { - free(ch->specials.clan); - } - send_to_char("Set Clan field to None.\n\r", ch); - } } else { send_to_char("Unknown type to set.\n\r", ch); --- 3326,3329 ---- *************** *** 3432,3441 **** * Display clan info */ ! if (finger->specials.clan == NULL) { ! sprintf(buf, "$c000BClan info : $c0007None\n\r"); ! } else { ! sprintf(buf, "$c000BClan info : $c0007%s\n\r", ! CAP(finger->specials.clan)); ! } send_to_char(buf, ch); --- 3415,3420 ---- * Display clan info */ ! sprintf(buf, "$c000BClan info : $c0007%s\n\r", ! clan_list[GET_CLAN(finger)].name); send_to_char(buf, ch); Index: act.info.c =================================================================== RCS file: /cvsroot/havok/havokmud/act.info.c,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** act.info.c 17 Apr 2004 03:05:54 -0000 1.157 --- act.info.c 18 Apr 2004 02:09:33 -0000 1.158 *************** *** 3144,3148 **** n = radix_head[i].next; while (n) { ! if (n->min_level <= GetMaxLevel(ch) && n->min_level >= LOW_IMMORTAL) { if (n->min_level == GetMaxLevel(ch)) { --- 3144,3148 ---- n = radix_head[i].next; while (n) { ! if (n->min_level <= GetMaxLevel(ch) && n->min_level >= LOW_IMMORTAL) { if (n->min_level == GetMaxLevel(ch)) { *************** *** 3927,3936 **** } ! sprintf(buf, "%-30s- %s ", PERS(person, ch), (person->in_room > -1 ? ! real_roomp(person->in_room)->name : "Nowhere")); if (GetMaxLevel(ch) >= LOW_IMMORTAL) { ! sprintf(buf + strlen(buf), "[%ld]", person->in_room); } strcpy(buf + strlen(buf), "\n\r"); --- 3927,3937 ---- } ! sprintf(buf, "$c000W%-30s$c000B- $c000Y%s ", PERS(person, ch), (person->in_room > -1 ? ! real_roomp(person->in_room)->name : "$c000RNowhere$c000w")); if (GetMaxLevel(ch) >= LOW_IMMORTAL) { ! sprintf(buf + strlen(buf), "$c000B[$c000W%ld$c000B]$c000w", ! person->in_room); } strcpy(buf + strlen(buf), "\n\r"); *************** *** 3950,3955 **** * object in a room */ ! sprintf(buf, "%-30s- %s [%d]\n\r", ! obj->short_description, real_roomp(obj->in_room)->name, obj->in_room); } else if (obj->carried_by != NULL) { --- 3951,3956 ---- * object in a room */ ! sprintf(buf, "$c000W%-30s$c000B- $c000Y%s $c000B[$c000W%d" ! "$c000B]$c000w\n\r", obj->short_description, real_roomp(obj->in_room)->name, obj->in_room); } else if (obj->carried_by != NULL) { *************** *** 3957,3962 **** * object carried by monster */ ! sprintf(buf, "%-30s- carried by %s\n\r", ! obj->short_description, numbered_person(ch, obj->carried_by)); } else if (obj->equipped_by != NULL) { --- 3958,3963 ---- * object carried by monster */ ! sprintf(buf, "$c000W%-30s$c000B- carried by: [$c000W%s$c000B]" ! "$c000w\n\r", obj->short_description, numbered_person(ch, obj->carried_by)); } else if (obj->equipped_by != NULL) { *************** *** 3964,3969 **** * object equipped by monster */ ! sprintf(buf, "%-30s- equipped by %s\n\r", ! obj->short_description, numbered_person(ch, obj->equipped_by)); } else if (obj->in_obj) { --- 3965,3970 ---- * object equipped by monster */ ! sprintf(buf, "$c000W%-30s$c000B- equipped by: [$c000W%s$c000B]" ! "$c000w\n\r", obj->short_description, numbered_person(ch, obj->equipped_by)); } else if (obj->in_obj) { *************** *** 3971,3979 **** * object in object */ ! sprintf(buf, "%-30s- in %s\n\r", obj->short_description, obj->in_obj->short_description); } else { ! sprintf(buf, "%-30s- god doesn't even know where...\n\r", ! obj->short_description); } if (*buf) { --- 3972,3980 ---- * object in object */ ! sprintf(buf, "$c000W%-30s$c000B- in: [$c000W%s$c000B]$c000w\n\r", obj->short_description, obj->in_obj->short_description); } else { ! sprintf(buf, "$c000W%-30s$c000B- $c000Rgod doesn't even know " ! "where...\n\r", obj->short_description); } if (*buf) { *************** *** 4015,4019 **** } else { init_string_block(&sb); ! append_to_string_block(&sb, "Players:\n\r--------\n\r"); for (d = descriptor_list; d; d = d->next) { --- 4016,4020 ---- } else { init_string_block(&sb); ! append_to_string_block(&sb, "$c000BPlayers:\n\r--------\n\r"); for (d = descriptor_list; d; d = d->next) { *************** *** 4025,4029 **** * If switched */ ! sprintf(buf, "%-20s - %s [%ld] In body of %s\n\r", d->original->player.name, real_roomp(d->character->in_room)->name, --- 4026,4032 ---- * If switched */ ! sprintf(buf, "$c000W%-20s $c000B- $c000Y%s " ! "$c000B[$c000W%ld$c000B] In body of: " ! "[$c000W%s$c000B]$c000w\n\r", d->original->player.name, real_roomp(d->character->in_room)->name, *************** *** 4031,4035 **** fname(d->character->player.name)); } else { ! sprintf(buf, "%-20s - %s [%ld]\n\r", d->character->player.name, real_roomp(d->character->in_room)->name, --- 4034,4039 ---- fname(d->character->player.name)); } else { ! sprintf(buf, "$c000W%-20s $c000B- $c000Y%s " ! "$c000B[$c000W%ld$c000B]$c000w\n\r", d->character->player.name, real_roomp(d->character->in_room)->name, |