Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

COV-0091: Hexgoto command; support for characters in realspace #53

Merged
merged 2 commits into from Jan 23, 2018
Merged

COV-0091: Hexgoto command; support for characters in realspace #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc36dd
COV-0091: Hexgoto command; support for characters in realspace
Jan 22, 2018
f635351
COV-0091: Revise macro
Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 36 additions & 11 deletions src/act_info.c
View file
Open in desktop
Expand Up @@ -132,6 +132,10 @@ void look_sky(CHAR_DATA * ch)
char buf2[4];
int starpos, sunpos, moonpos, moonphase, i, linenum;

if (ch->in_hex) {
return;
}

send_to_pager("You gaze up towards the heavens and see:\r\n", ch);

if (isModeratelyCloudy(getCloudCover(cell)))
Expand Down Expand Up @@ -1133,7 +1137,7 @@ void show_char_to_char(CHAR_DATA * list, CHAR_DATA * ch)
{
show_char_to_char_0(rch, ch);
}
else if (room_is_dark(ch->in_room) && IS_AFFECTED(ch, AFF_INFRARED) && !(!IS_NPC(rch) && IS_IMMORTAL(rch)))
else if (LOCATION_IS_DARK(ch) && IS_AFFECTED(ch, AFF_INFRARED) && !(!IS_NPC(rch) && IS_IMMORTAL(rch)))
{
set_char_color(AT_BLOOD, ch);
send_to_char("The red form of a living creature is here.\r\n", ch);
Expand Down Expand Up @@ -1278,14 +1282,17 @@ void do_look(CHAR_DATA * ch, const char *argument)
if (!check_blind(ch))
return;

if (!IS_NPC(ch)
&& !xIS_SET(ch->act, PLR_HOLYLIGHT) && !IS_AFFECTED(ch, AFF_TRUESIGHT) && room_is_dark(ch->in_room))
{
set_char_color(AT_DGREY, ch);
send_to_char("It is pitch black ... \r\n", ch);
if (!*argument || !str_cmp(argument, "auto"))
if (ch->in_room) {
if (!IS_NPC(ch)
&& !xIS_SET(ch->act, PLR_HOLYLIGHT)
&& !IS_AFFECTED(ch, AFF_TRUESIGHT)
&& room_is_dark(ch->in_room))
{
set_char_color(AT_DGREY, ch);
send_to_char("It is pitch black ... \n\r", ch);
show_char_to_char(ch->in_room->first_person, ch);
return;
return;
}
}

argument = one_argument(argument, arg1);
Expand All @@ -1296,6 +1303,12 @@ void do_look(CHAR_DATA * ch, const char *argument)
{
/* 'look' or 'look auto' */

if (ch->in_hex) {
navigate(ch);
hex_look(ch);
return;
}

set_char_color(AT_ROOM_NAME, ch);
send_to_char(ch->in_room->name, ch);
send_to_char("\r\n", ch);
Expand Down Expand Up @@ -1670,6 +1683,12 @@ void do_look(CHAR_DATA * ch, const char *argument)
send_to_char("You do not see that here.\r\n", ch);
}

void hex_look(CHAR_DATA * ch)
{
send_to_char("hex_look: Coming Soon...\r\n", ch);
return;
}

void show_race_line(CHAR_DATA * ch, CHAR_DATA * victim)
{
int feet, inches;
Expand Down Expand Up @@ -2107,7 +2126,7 @@ void do_exits(CHAR_DATA* ch, const char* argument)

if (!IS_NPC(ch)
&& !xIS_SET(ch->act, PLR_HOLYLIGHT)
&& !IS_AFFECTED(ch, AFF_TRUESIGHT) && !IS_AFFECTED(ch, AFF_INFRARED) && room_is_dark(ch->in_room))
&& !IS_AFFECTED(ch, AFF_TRUESIGHT) && !IS_AFFECTED(ch, AFF_INFRARED) && LOCATION_IS_DARK(ch))
{
set_char_color(AT_DGREY, ch);
send_to_char("It is pitch black ... \r\n", ch);
Expand Down Expand Up @@ -3983,7 +4002,10 @@ void do_commands(CHAR_DATA* ch, const char* argument)
for (hash = 0; hash < 126; hash++)
for (command = command_hash[hash]; command; command = command->next)
if (command->level < LEVEL_HERO
&& command->level <= get_trust(ch) && (command->name[0] != 'm' || command->name[1] != 'p'))
&& command->level <= get_trust(ch)
&& !(ch->in_hex && IS_SET(command->flags, CMD_FLAG_NO_MAP))
&& !(ch->in_room && IS_SET(command->flags, CMD_FLAG_NO_ROOM))
&& (command->name[0] != 'm' || command->name[1] != 'p'))
{
pager_printf(ch, "%-12s", command->name);
if (++col % 6 == 0)
Expand All @@ -3999,7 +4021,10 @@ void do_commands(CHAR_DATA* ch, const char* argument)
for (command = command_hash[hash]; command; command = command->next)
if (command->level < LEVEL_HERO
&& command->level <= get_trust(ch)
&& !str_prefix(argument, command->name) && (command->name[0] != 'm' || command->name[1] != 'p'))
&& !str_prefix(argument, command->name)
&& !(ch->in_hex && IS_SET(command->flags, CMD_FLAG_NO_MAP))
&& !(ch->in_room && IS_SET(command->flags, CMD_FLAG_NO_ROOM))
&& (command->name[0] != 'm' || command->name[1] != 'p'))
{
pager_printf(ch, "%-12s", command->name);
found = TRUE;
Expand Down
78 changes: 35 additions & 43 deletions src/act_move.c
View file
Open in desktop
Expand Up @@ -419,6 +419,9 @@ short encumbrance(CHAR_DATA * ch, short move)
*/
bool will_fall(CHAR_DATA * ch, int fall)
{
if (!ch->in_room)
return FALSE;

if (xIS_SET(ch->in_room->room_flags, ROOM_NOFLOOR)
&& CAN_GO(ch, DIR_DOWN)
&& (!IS_AFFECTED(ch, AFF_FLYING) || (ch->mount && !IS_AFFECTED(ch->mount, AFF_FLYING))))
Expand Down Expand Up @@ -1261,40 +1264,35 @@ EXIT_DATA *find_door(CHAR_DATA * ch, const char *arg, bool quiet)
return NULL;

pexit = NULL;
if (!str_cmp(arg, "n") || !str_cmp(arg, "north"))
door = 0;
else if (!str_cmp(arg, "e") || !str_cmp(arg, "east"))
door = 1;
else if (!str_cmp(arg, "s") || !str_cmp(arg, "south"))
door = 2;
else if (!str_cmp(arg, "w") || !str_cmp(arg, "west"))
door = 3;
else if (!str_cmp(arg, "u") || !str_cmp(arg, "up"))
door = 4;
else if (!str_cmp(arg, "d") || !str_cmp(arg, "down"))
door = 5;
else if (!str_cmp(arg, "ne") || !str_cmp(arg, "northeast"))
door = 6;
else if (!str_cmp(arg, "nw") || !str_cmp(arg, "northwest"))
door = 7;
else if (!str_cmp(arg, "se") || !str_cmp(arg, "southeast"))
door = 8;
else if (!str_cmp(arg, "sw") || !str_cmp(arg, "southwest"))
door = 9;
if (!str_cmp(arg, "n") || !str_cmp(arg, "north")) door = 0;
else if (!str_cmp(arg, "e") || !str_cmp(arg, "east")) door = 1;
else if (!str_cmp(arg, "s") || !str_cmp(arg, "south")) door = 2;
else if (!str_cmp(arg, "w") || !str_cmp(arg, "west")) door = 3;
else if (!str_cmp(arg, "u") || !str_cmp(arg, "up")) door = 4;
else if (!str_cmp(arg, "d") || !str_cmp(arg, "down")) door = 5;
else if (!str_cmp(arg, "ne") || !str_cmp(arg, "northeast")) door = 6;
else if (!str_cmp(arg, "nw") || !str_cmp(arg, "northwest")) door = 7;
else if (!str_cmp(arg, "se") || !str_cmp(arg, "southeast")) door = 8;
else if (!str_cmp(arg, "sw") || !str_cmp(arg, "southwest")) door = 9;
else
{
for (pexit = ch->in_room->first_exit; pexit; pexit = pexit->next)
{
if ((quiet || IS_SET(pexit->exit_info, EX_ISDOOR)) && pexit->keyword && nifty_is_name(arg, pexit->keyword))
return pexit;
/* We're loooking for a named exit, but obviously we don't want to
go searching for exits if you're out in RealSpace -- Shamus */

if (ch->in_room) {
for (pexit = ch->in_room->first_exit; pexit; pexit = pexit->next) {
if ((quiet || IS_SET(pexit->exit_info, EX_ISDOOR))
&& pexit->keyword
&& nifty_is_name(arg, pexit->keyword))
return pexit;
}
}
if (!quiet)
act(AT_PLAIN, "You see no $T here.", ch, NULL, arg, TO_CHAR);
return NULL;
}

if ((pexit = get_exit(ch->in_room, door)) == NULL)
{
if ((pexit = get_exit(ch->in_room, door)) == NULL) {
if (!quiet)
act(AT_PLAIN, "You see no $T here.", ch, NULL, arg, TO_CHAR);
return NULL;
Expand All @@ -1303,14 +1301,12 @@ EXIT_DATA *find_door(CHAR_DATA * ch, const char *arg, bool quiet)
if (quiet)
return pexit;

if (IS_SET(pexit->exit_info, EX_SECRET))
{
if (IS_SET(pexit->exit_info, EX_SECRET)) {
act(AT_PLAIN, "You see no $T here.", ch, NULL, arg, TO_CHAR);
return NULL;
}

if (!IS_SET(pexit->exit_info, EX_ISDOOR))
{
if (!IS_SET(pexit->exit_info, EX_ISDOOR)) {
send_to_char("You can't do that.\r\n", ch);
return NULL;
}
Expand Down Expand Up @@ -2022,19 +2018,17 @@ void do_stand(CHAR_DATA* ch, const char* argument)
return;
}

#if 0
if (ch->in_hex)
if (IS_WATER_SECT(ch->in_hex->terrain) && (ch->in_hex->elevation >= 2)) {
send_to_char("The water is too deep for you to stand on the bottom.\r\n",
ch);
return;
}

#if 0
if (!IS_NPC(ch))
if (ch->pcdata->speed != 0)
do_stop(ch, "\r\n");
#endif

/* Determine what arguments were passed, if any */

argument = one_argument(argument, arg1);
Expand All @@ -2053,8 +2047,7 @@ void do_stand(CHAR_DATA* ch, const char* argument)
old_obj = ch->furniture;

if ((arg1[0] != '\0') && (strcmp(arg1, "up"))){
/* obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch)); For hex map */
obj = get_obj_list(ch, argtarg, ch->in_room->first_content);
obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch));

if (obj == NULL) {
send_to_char("You don't see that here.\r\n", ch);
Expand Down Expand Up @@ -2299,8 +2292,7 @@ void do_sit(CHAR_DATA* ch, const char* argument)
old_obj = ch->furniture;

if (arg1[0] != '\0') {
/* obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch)); For hex map */
obj = get_obj_list(ch, argtarg, ch->in_room->first_content);
obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch));

if (obj == NULL) {
send_to_char("You don't see that here.\r\n", ch);
Expand Down Expand Up @@ -2588,8 +2580,7 @@ void do_rest(CHAR_DATA* ch, const char* argument)
old_obj = ch->furniture;

if (arg1[0] != '\0') {
/* obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch)); For hex map */
obj = get_obj_list(ch, argtarg, ch->in_room->first_content);
obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch));

if (obj == NULL) {
send_to_char("You don't see that here.\r\n", ch);
Expand Down Expand Up @@ -2893,8 +2884,7 @@ void do_sleep(CHAR_DATA* ch, const char* argument)
old_obj = ch->furniture;

if (arg1[0] != '\0') {
/* obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch)); For hex map */
obj = get_obj_list(ch, argtarg, ch->in_room->first_content);
obj = get_obj_list(ch, argtarg, FIRST_CONTENT(ch));

if (obj == NULL) {
send_to_char("You don't see that here.\r\n", ch);
Expand Down Expand Up @@ -3419,8 +3409,10 @@ ch_ret pullcheck(CHAR_DATA * ch, int pulse)
const char *tochar = NULL, *toroom = NULL, *objmsg = NULL;
const char *destrm = NULL, *destob = NULL, *dtxt = "somewhere";

if ((room = ch->in_room) == NULL)
{
if (ch->in_hex)
return rNONE;

if ((room = ch->in_room) == NULL) {
bug("%s: %s not in a room?!?", __func__, ch->name);
return rNONE;
}
Expand Down
24 changes: 10 additions & 14 deletions src/act_obj.c
View file
Open in desktop
Expand Up @@ -353,12 +353,10 @@ void do_get(CHAR_DATA* ch, const char* argument)
{
if (number <= 1 && str_cmp(arg1, "all") && str_prefix("all.", arg1))
{
/*
* 'get obj'
*/
obj = get_obj_list(ch, arg1, ch->in_room->first_content);
if (!obj)
{
/* 'get obj' */

obj = get_obj_list(ch, arg1, FIRST_CONTENT(ch));
if (!obj) {
act(AT_PLAIN, "I see no $T here.", ch, NULL, arg1, TO_CHAR);
return;
}
Expand Down Expand Up @@ -388,11 +386,11 @@ void do_get(CHAR_DATA* ch, const char* argument)
chk = arg1;
else
chk = &arg1[4];
/*
* 'get all' or 'get all.obj'
*/

/* 'get all' or 'get all.obj' */

found = FALSE;
for (obj = ch->in_room->last_content; obj; obj = obj_next)
for (obj = LAST_CONTENT(ch); obj; obj = obj_next)
{
obj_next = obj->prev_content;
if ((fAll || nifty_is_name(chk, obj->name)) && can_see_obj(ch, obj))
Expand Down Expand Up @@ -1021,12 +1019,10 @@ void do_drop(CHAR_DATA* ch, const char* argument)

ch->gold -= number;

for (obj = ch->in_room->first_content; obj; obj = obj_next)
{
for (obj = FIRST_CONTENT(ch); obj; obj = obj_next) {
obj_next = obj->next_content;

switch (obj->pIndexData->vnum)
{
switch (obj->pIndexData->vnum) {
case OBJ_VNUM_MONEY_ONE:
number += 1;
extract_obj(obj);
Expand Down
3 changes: 2 additions & 1 deletion src/act_wiz.c
View file
Open in desktop
Expand Up @@ -504,7 +504,8 @@ void do_wizhelp(CHAR_DATA* ch, const char* argument)
set_pager_color(AT_PLAIN, ch);
for (hash = 0; hash < 126; hash++)
for (cmd = command_hash[hash]; cmd; cmd = cmd->next)
if (cmd->level >= LEVEL_HERO && cmd->level <= get_trust(ch))
if ((cmd->level >= LEVEL_HERO) && (cmd->level <= get_trust(ch))
&& !(ch->in_hex && IS_SET(cmd->flags, CMD_FLAG_NO_MAP)))
{
pager_printf(ch, "%-12s", cmd->name);
if (++col % 6 == 0)
Expand Down
23 changes: 16 additions & 7 deletions src/build.c
View file
Open in desktop
Expand Up @@ -179,11 +179,12 @@ const char *const trap_flags[] = {
"r9", "r10", "r11", "r12", "r13", "r14", "r15"
};

const char *const cmd_flags[] = {
"possessed", "polymorphed", "watch", "retired", "noabort", "r5", "r6", "r7", "r8",
const char *const cmd_flags[] =
{
"no_possess", "no_map", "no_room", "no_mob", "no_speed",
"no_water", "watch", "retired", "no_abort",
"r9", "r10", "r11", "r12", "r13", "r14", "r15", "r16", "r17", "r18", "r19",
"r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r30"
"r31"
};

const char *const wear_locs[] = {
Expand Down Expand Up @@ -1059,7 +1060,10 @@ void do_goto(CHAR_DATA* ch, const char* argument)
if (ch->furniture)
do_stand(ch, "\r\n");

in_room = ch->in_room;
in_room = NULL;
if (ch->in_room)
in_room = ch->in_room;

if (ch->fighting)
stop_fighting(ch, TRUE);

Expand All @@ -1071,11 +1075,12 @@ void do_goto(CHAR_DATA* ch, const char* argument)
/* need to be ready for hexes! */
if (ch->in_room) {
ch->regoto = ch->in_room->vnum;
char_from_room(ch);
} else if (ch->in_hex) {
char_from_hex(ch);
}

char_from_room(ch);
if (ch->mount)
{
if (ch->mount) {
char_from_room(ch->mount);
char_to_room(ch->mount, location);
}
Expand All @@ -1088,8 +1093,12 @@ void do_goto(CHAR_DATA* ch, const char* argument)

do_look(ch, "auto");

if (in_room == NULL)
return;

if (ch->in_room == in_room)
return;

for (fch = in_room->first_person; fch; fch = fch_next)
{
fch_next = fch->next_in_room;
Expand Down
10 changes: 8 additions & 2 deletions src/comm.c
View file
Open in desktop
Expand Up @@ -3796,8 +3796,14 @@ void display_prompt(DESCRIPTOR_DATA * d)
break;

case 'r':
if (IS_IMMORTAL(och))
pstat = ch->in_room->vnum;
if (IS_IMMORTAL(och)) {
if (ch->in_room)
pstat = ch->in_room->vnum;
else if (ch->in_hex)
snprintf(pbuf, MAX_STRING_LENGTH, "%d, %d", ch->xhex, ch->yhex);
else
snprintf(pbuf, MAX_STRING_LENGTH, "&RERROR!&w");
}
break;

case 'F':
Expand Down