PennMUSH Community

Changeset 1146

Show
Ignore:
Timestamp:
11/16/07 07:41:07 (9 months ago)
Author:
shawnw
Message:

#5546: @*tport

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/game/txt/hlp/penncmd.hlp

    r1097 r1146  
    356356  in its new location. 
    357357 
    358 See also: @tel, ACTION LISTS 
     358  %0 is the object causing the teleport, and %1 is the old location 
     359  of the teleported object. 
     360 
     361See also: @tel, ACTION LISTS, @tport, @otport, @oxtport 
    359362& @atrchown 
    360363  @atrchown <object>/<attribute> = <new_owner>. 
    …… 
    25642567  is teleported to. If you want to set a message that will be shown 
    25652568  to the room that the object is teleported OUT of, use @oxtport. 
     2569 
     2570  %0 is the object causing the teleport, and %1 is the old location 
     2571  of the teleported object. 
    25662572 
    25672573  If the =<message> part is omitted, the message will be reset. 
    …… 
    33043310  @teleport[/silent][/inside] [<object>=] <room>.  
    33053311 
    3306   Teleports <object> to <room>.  <object> must be a thing; if you do not 
    3307   supply a thing, the object is assumed to be yourself. The destination 
    3308   must be either JUMP_OK or controlled by you, and you must either 
    3309   control <object> or <object>'s current location. Also, the destination, 
    3310   if a room, cannot be teleport-locked against <object>. Mortals cannot 
    3311   teleport HEAVY objects. If the target room has a drop-to, <object> 
    3312   will go to the drop-to room instead.  
     3312  Teleports <object> to <room>.  <object> must be a thing; if you do 
     3313  not supply a thing, the object is assumed to be yourself. The 
     3314  destination must be either JUMP_OK or controlled by you, and you 
     3315  must either control <object> or <object>'s current location. Also, 
     3316  the destination, if a room, cannot be teleport-locked against 
     3317  <object>. Mortals cannot teleport HEAVY objects. If the target room 
     3318  has a drop-to, <object> will go to the drop-to room instead. 
    33133319 
    33143320  Privileged players who teleport a player to another player send them 
    3315   to the location of the target, unless the /inside switch is used, 
    3316   in which case they are sent to the inventory of the target. 
     3321  to the location of the target, unless the /inside switch is used, in 
     3322  which case they are sent to the inventory of the target. 
    33173323 
    33183324  Teleportation from a room can be stopped by setting the NO_TEL flag. 
    3319   Royalty and Wizards can _always_ teleport to any location, regardless 
    3320   of NO_TEL or teleport locks. 
    3321  
    3322   Teleportation triggers the @oxtport/@tport/@otport/@atport attributes, 
    3323   unless <room> is an exit or the /silent switch is given. 
    3324  
    3325   As a special case, using "home" as the <room> teleports the object 
    3326   to its home. 
     3325  Royalty and Wizards can _always_ teleport to any location, 
     3326  regardless of NO_TEL or teleport locks. 
     3327 
     3328  Teleportation triggers the @oxtport/@tport/@otport/@atport 
     3329  attributes, unless <room> is an exit or the /silent switch is 
     3330  given. With @oxtport, %0 is the dbref of the object causing the 
     3331  dbref. The others, in addition to %0, get the former location of the 
     3332  object that was teleported passed in %1. 
     3333 
     3334  As a special case, using "home" as the <room> has the same effect as 
     3335  the home command, and does not act like a normal teleport. 
    33273336 
    33283337See also: JUMP_OK, NO_TEL, @oxtport, @tport, @otport, @atport, @lock 
    …… 
    33313340 
    33323341  Sets the <message> shown to <object> when <object> is teleported. 
     3342 
     3343  %0 is the object causing the teleport, and %1 is the old location 
     3344  of the teleported object. 
     3345 
     3346See also: @otport, @atport, @oxtport 
    33333347& @trigger 
    33343348  @trigger <object>/<attribute> [=<value 0>,<val. 1>,...,<val 9>] 

  • 1.8.3/branches/devel/src/wiz.c

    r1066 r1146  
    451451        && !inside) { 
    452452      if (!silent && loc != Location(destination)) 
    453         did_it(victim, victim, NULL, NULL, "OXTPORT", NULL, NULL, loc); 
     453        did_it_with(victim, victim, NULL, NULL, "OXTPORT", NULL, NULL, loc, 
     454                    player, NOTHING, NA_INTER_HEAR); 
    454455      safe_tel(victim, Location(destination), silent); 
    455456      if (!silent && loc != Location(destination)) 
    456         did_it(victim, victim, "TPORT", NULL, "OTPORT", NULL, "ATPORT", 
    457                Location(destination)); 
     457        did_it_with(victim, victim, "TPORT", NULL, "OTPORT", NULL, "ATPORT", 
     458                    Location(destination), player, loc, NA_INTER_HEAR); 
    458459      return; 
    459460    } 
    …… 
    539540              (!Fixed(Owner(victim)) && !Fixed(player)))) { 
    540541        if (!silent && loc != destination) 
    541           did_it(victim, victim, NULL, NULL, "OXTPORT", NULL, NULL, loc); 
     542          did_it_with(victim, victim, NULL, NULL, "OXTPORT", NULL, NULL, loc, 
     543                      player, NOTHING, NA_INTER_HEAR); 
    542544        safe_tel(victim, destination, silent); 
    543545        if (!silent && loc != destination) 
    544           did_it(victim, victim, "TPORT", NULL, "OTPORT", NULL, "ATPORT", 
    545                  destination); 
     546          did_it_with(victim, victim, "TPORT", NULL, "OTPORT", NULL, "ATPORT", 
     547                      destination, player, loc, NA_INTER_HEAR); 
    546548        if ((victim != player) && !(Puppet(victim) && 
    547549                                    (Owner(victim) == Owner(player)))) {