| … | |
… | |
| 10 | |
10 | |
| 11 | my $timer = Event->timer (interval => 0.2, parked => 1, data => cf::WF_AUTOCANCEL, cb => sub { |
11 | my $timer = Event->timer (interval => 0.2, parked => 1, data => cf::WF_AUTOCANCEL, cb => sub { |
| 12 | cf::sync_job { |
12 | cf::sync_job { |
| 13 | while (my ($name, $v) = each %follow) { |
13 | while (my ($name, $v) = each %follow) { |
| 14 | my ($target, $his, $mine) = @$v; |
14 | my ($target, $his, $mine) = @$v; |
| 15 | my ($who, $other) = (cf::player::find $name, cf::player::find $target); |
15 | my ($who, $other) = (cf::player::find_active $name, cf::player::find_active $target); |
| 16 | |
16 | |
| 17 | if ($who && $other && $other->ob->map) { |
17 | if ($who && $other && $other->ob->map) { |
| 18 | my ($map, $x, $y) = ($other->ob->map, $other->ob->x, $other->ob->y); |
18 | my ($map, $x, $y) = ($other->ob->map->path, $other->ob->x, $other->ob->y); |
| 19 | |
19 | |
| 20 | if ($map ne $his->[0] || $x != $his->[1] || $y != $his->[2]) { |
20 | if ($map ne $his->[0] || $x != $his->[1] || $y != $his->[2]) { |
| 21 | @$mine = @$his; |
21 | @$mine = @$his; |
| 22 | @$his = ($map, $x, $y); |
22 | @$his = ($map, $x, $y); |
| 23 | } |
23 | } |
| 24 | |
24 | |
| 25 | my $map; |
25 | my $map; |
| 26 | |
26 | |
| 27 | if ($map = cf::map::find_map $mine->[0] |
27 | if ($map = cf::map::find $mine->[0] |
|
|
28 | and $map =~ /^\// # short-gap fix |
| 28 | and !grep $_->flag (cf::FLAG_UNIQUE) && $_->flag (cf::FLAG_IS_FLOOR), |
29 | and !grep +($_->flag (cf::FLAG_UNIQUE) || $_->type == cf::SHOP_FLOOR) && $_->flag (cf::FLAG_IS_FLOOR), |
| 29 | $map->at ($mine->[1], $mine->[2])) { |
30 | $map->at ($mine->[1], $mine->[2])) { |
| 30 | $who->ob->goto_map (@$mine); |
31 | $who->ob->goto (@$mine); |
| 31 | } else { |
32 | } else { |
| 32 | delete $follow{$name}; |
33 | delete $follow{$name}; |
| 33 | $who->ob->message ("You can't follow $target anymore!"); |
34 | $who->ob->message ("You can't follow $target anymore!"); |
| 34 | } |
35 | } |
| 35 | } else { |
36 | } else { |
| … | |
… | |
| 46 | my ($who, $args) = @_; |
47 | my ($who, $args) = @_; |
| 47 | |
48 | |
| 48 | my $name = $who->name; |
49 | my $name = $who->name; |
| 49 | |
50 | |
| 50 | if ($args ne "" && $name ne $args) { |
51 | if ($args ne "" && $name ne $args) { |
| 51 | if (my $other = cf::player::find $args) { |
52 | if (my $other = cf::player::find_active $args) { |
| 52 | if ($other->ob->map->path eq $who->map->path |
53 | if ($other->ob->map == $who->map |
| 53 | && abs ($other->ob->x - $who->x) <= 1 |
54 | && abs ($other->ob->x - $who->x) <= 1 |
| 54 | && abs ($other->ob->y - $who->y) <= 1) { |
55 | && abs ($other->ob->y - $who->y) <= 1) { |
| 55 | $who->message ("Following player '$args', to stop, type: 'follow"); |
56 | $who->message ("Following player '$args', to stop, type: 'follow"); |
| 56 | $other->ob->message ("$name is now following your every step..."); |
57 | $other->ob->message ("$name is now following your every step..."); |
| 57 | $follow{$name} = [ |
58 | $follow{$name} = [ |
