kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Jun 14 2008] - Rumble

Browse Source 
Made immortals immune to blinding.
  Fixed bug in qedit where quest completion would try to load an object with vnum NOTHING. (thanks Jamdog)
  Fixed log when builder tries to edit a zone without permission.
This commit is contained in:
Rumble
2008-06-14 02:29:33 +00:00
parent 107c3b2811
commit 36768f40bc
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@@ -3,6 +3,10 @@ help, find any bugs, or have ideas for improvement please stop by TBA at
telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble
tbaMUD 3.56 tbaMUD 3.56
[Jun 14 2008] - Rumble
Made immortals immune to blinding.
Fixed bug in qedit where quest completion would try to load an object with vnum NOTHING. (thanks Jamdog)
Fixed log when builder tries to edit a zone without permission.
[Jun 12 2008] - Rumble [Jun 12 2008] - Rumble
Fixed toggle quest to toggle correctly. Fixed toggle quest to toggle correctly.
Fixed bug in dg find_replacement to call text_processed at the beginning, regardless of whether something matching the variable is found or not. (thanks Laoris) Fixed bug in dg find_replacement to call text_processed at the beginning, regardless of whether something matching the variable is found or not. (thanks Laoris)

10
src/act.informative.c
View File

@@ -321,7 +321,7 @@ static void list_one_char(struct char_data *i, struct char_data *ch)
if (AFF_FLAGGED(i, AFF_SANCTUARY)) if (AFF_FLAGGED(i, AFF_SANCTUARY))
act("...$e glows with a bright light!", FALSE, i, 0, ch, TO_VICT); act("...$e glows with a bright light!", FALSE, i, 0, ch, TO_VICT);
if (AFF_FLAGGED(i, AFF_BLIND)) if (AFF_FLAGGED(i, AFF_BLIND) && GET_LEVEL(i) < LVL_IMMORT)
act("...$e is groping around blindly!", FALSE, i, 0, ch, TO_VICT); act("...$e is groping around blindly!", FALSE, i, 0, ch, TO_VICT);
return; return;
@@ -426,7 +426,7 @@ ACMD(do_exits)
{ {
int door, len = 0; int door, len = 0;
if (AFF_FLAGGED(ch, AFF_BLIND)) { if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT) {
send_to_char(ch, "You can't see a damned thing, you're blind!\r\n"); send_to_char(ch, "You can't see a damned thing, you're blind!\r\n");
return; return;
} }
@@ -468,7 +468,7 @@ void look_at_room(struct char_data *ch, int ignore_brief)
if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) { if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) {
send_to_char(ch, "It is pitch black...\r\n"); send_to_char(ch, "It is pitch black...\r\n");
return; return;
} else if (AFF_FLAGGED(ch, AFF_BLIND)) { } else if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT) {
send_to_char(ch, "You see nothing but infinite darkness...\r\n"); send_to_char(ch, "You see nothing but infinite darkness...\r\n");
return; return;
} }
@@ -690,7 +690,7 @@ ACMD(do_look)
if (GET_POS(ch) < POS_SLEEPING) if (GET_POS(ch) < POS_SLEEPING)
send_to_char(ch, "You can't see anything but stars!\r\n"); send_to_char(ch, "You can't see anything but stars!\r\n");
else if (AFF_FLAGGED(ch, AFF_BLIND)) else if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT)
send_to_char(ch, "You can't see a damned thing, you're blind!\r\n"); send_to_char(ch, "You can't see a damned thing, you're blind!\r\n");
else if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) { else if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) {
send_to_char(ch, "It is pitch black...\r\n"); send_to_char(ch, "It is pitch black...\r\n");
@@ -866,7 +866,7 @@ ACMD(do_score)
if (GET_COND(ch, THIRST) == 0) if (GET_COND(ch, THIRST) == 0)
send_to_char(ch, "You are thirsty.\r\n"); send_to_char(ch, "You are thirsty.\r\n");
if (AFF_FLAGGED(ch, AFF_BLIND)) if (AFF_FLAGGED(ch, AFF_BLIND) && GET_LEVEL(ch) < LVL_IMMORT)
send_to_char(ch, "You have been blinded!\r\n"); send_to_char(ch, "You have been blinded!\r\n");
if (AFF_FLAGGED(ch, AFF_INVISIBLE)) if (AFF_FLAGGED(ch, AFF_INVISIBLE))

2
src/magic.c
View File

@@ -353,7 +353,7 @@ void mag_affects(int level, struct char_data *ch, struct char_data *victim,
break; break;
case SPELL_BLINDNESS: case SPELL_BLINDNESS:
if (MOB_FLAGGED(victim,MOB_NOBLIND) || mag_savingthrow(victim, savetype, 0)) { if (MOB_FLAGGED(victim, MOB_NOBLIND) || GET_LEVEL(victim) >= LVL_IMMORT || mag_savingthrow(victim, savetype, 0)) {
send_to_char(ch, "You fail.\r\n"); send_to_char(ch, "You fail.\r\n");
return; return;
} }

2
src/oasis.c
View File

@@ -294,7 +294,7 @@ void send_cannot_edit(struct char_data *ch, zone_vnum zone)
send_to_char(ch, "You do not have permission to edit zone %d. Try zone %d.\r\n", zone, GET_OLC_ZONE(ch)); send_to_char(ch, "You do not have permission to edit zone %d. Try zone %d.\r\n", zone, GET_OLC_ZONE(ch));
sprintf(buf, "OLC: %s tried to edit zone %d (allowed zone %d).", GET_NAME(ch), zone, GET_OLC_ZONE(ch)); sprintf(buf, "OLC: %s tried to edit zone %d (allowed zone %d).", GET_NAME(ch), zone, GET_OLC_ZONE(ch));
} else { } else {
send_to_char(ch, "You do not have permission to edit zone %d.\r\n", GET_OLC_ZONE(ch)); send_to_char(ch, "You do not have permission to edit zone %d.\r\n", zone);
sprintf(buf, "OLC: %s tried to edit zone %d.", GET_NAME(ch), zone); sprintf(buf, "OLC: %s tried to edit zone %d.", GET_NAME(ch), zone);
} }
mudlog(BRF, LVL_IMPL, TRUE, buf); mudlog(BRF, LVL_IMPL, TRUE, buf);

10
src/quest.c
View File

@@ -305,17 +305,17 @@ void generic_complete_quest(struct char_data *ch)
"You have been awarded %d experience points for your service.\r\n", "You have been awarded %d experience points for your service.\r\n",
QST_EXP(rnum)); QST_EXP(rnum));
} }
if (QST_OBJ(rnum)) { if (QST_OBJ(rnum) && QST_OBJ(rnum) != NOTHING) {
if (real_object(QST_OBJ(rnum))) { if (real_object(QST_OBJ(rnum)) != NOTHING) {
if ((new_obj = create_obj()) != NULL) { if ((new_obj = create_obj()) != NULL) {
new_obj = read_object((QST_OBJ(rnum)),VIRTUAL); if ((new_obj = read_object((QST_OBJ(rnum)),VIRTUAL)) != NULL) {
obj_to_char(new_obj, ch); obj_to_char(new_obj, ch);
send_to_char(ch, send_to_char(ch, "You have been presented with %s%s for your service.\r\n",
"You have been presented with %s%s for your service.\r\n",
GET_OBJ_SHORT(new_obj), CCNRM(ch, C_NRM)); GET_OBJ_SHORT(new_obj), CCNRM(ch, C_NRM));
} }
} }
} }
}
if (!IS_SET(QST_FLAGS(rnum), AQ_REPEATABLE)) if (!IS_SET(QST_FLAGS(rnum), AQ_REPEATABLE))
add_completed_quest(ch, vnum); add_completed_quest(ch, vnum);
clear_quest(ch); clear_quest(ch);

3
src/utils.h
View File

@@ -671,7 +671,8 @@ void char_from_furniture(struct char_data *ch);
/** Defines if there is enough light for sub to see in. */ /** Defines if there is enough light for sub to see in. */
#define LIGHT_OK(sub) (!AFF_FLAGGED(sub, AFF_BLIND) && \ #define LIGHT_OK(sub) (!AFF_FLAGGED(sub, AFF_BLIND) && \
(IS_LIGHT(IN_ROOM(sub)) || AFF_FLAGGED((sub), AFF_INFRAVISION))) (IS_LIGHT(IN_ROOM(sub)) || AFF_FLAGGED((sub), AFF_INFRAVISION) || \
GET_LEVEL(sub) >= LVL_IMMORT))
/** Defines if sub character can see the invisible obj character. */ /** Defines if sub character can see the invisible obj character. */
#define INVIS_OK(sub, obj) \ #define INVIS_OK(sub, obj) \