… | |
… | |
16 | use List::Util qw(min max); |
16 | use List::Util qw(min max); |
17 | |
17 | |
18 | use Crossfire; |
18 | use Crossfire; |
19 | use Crossfire::MapWidget; |
19 | use Crossfire::MapWidget; |
20 | use File::Spec::Functions; |
20 | use File::Spec::Functions; |
|
|
21 | use File::Basename; |
|
|
22 | use File::Path; |
|
|
23 | use HTTP::Request::Common; |
|
|
24 | use Cwd 'abs_path'; |
|
|
25 | use strict; |
21 | |
26 | |
22 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall stack_find arch_is_wall arch_is_monster add_table_widget quick_msg def arch_is_exit map2abs); |
27 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb |
|
|
28 | fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall |
|
|
29 | stack_find arch_is_wall arch_is_monster add_table_widget quick_msg |
|
|
30 | def arch_is_exit map2abs exit_paths pseudohtml2txt arch_is_connector); |
|
|
31 | |
|
|
32 | sub pseudohtml2txt { |
|
|
33 | my ($html) = @_; |
|
|
34 | |
|
|
35 | $html =~ s/<br\s*?\/?>/\n/gsi; |
|
|
36 | $html =~ s/<b>(.*?)<\/b>/_\1_/gsi; |
|
|
37 | $html =~ s/<li>/\n* /gi; |
|
|
38 | $html =~ s/<\/?\s*li>//gi; |
|
|
39 | $html =~ s/<\/?\s*ul>//gi; |
|
|
40 | $html =~ s/>/>/g; |
|
|
41 | $html =~ s/</</g; |
|
|
42 | $html |
|
|
43 | } |
|
|
44 | |
|
|
45 | sub exit_paths { |
|
|
46 | my ($mappath, $map1path, $map2path) = @_; |
|
|
47 | $mappath = abs_path $mappath; |
|
|
48 | $map1path = abs_path $map1path; |
|
|
49 | $map2path = abs_path $map2path; |
|
|
50 | |
|
|
51 | if ( (substr $map1path, 0, length $mappath) eq $mappath |
|
|
52 | and (substr $map2path, 0, length $mappath) eq $mappath) { |
|
|
53 | substr $map1path, 0, length $mappath, ''; |
|
|
54 | substr $map2path, 0, length $mappath, ''; |
|
|
55 | |
|
|
56 | my ($v1, $d1, $f1) = File::Spec->splitpath ($map1path); |
|
|
57 | my ($v2, $d2, $f2) = File::Spec->splitpath ($map2path); |
|
|
58 | |
|
|
59 | my @di1 = File::Spec->splitdir ($d1); |
|
|
60 | my @di2 = File::Spec->splitdir ($d2); |
|
|
61 | |
|
|
62 | if ((defined $di1[1]) and (defined $di2[1]) and $di1[1] eq $di2[1]) { |
|
|
63 | my $m1 = File::Spec->abs2rel ($map1path, File::Spec->catdir (@di2)); |
|
|
64 | my $m2 = File::Spec->abs2rel ($map2path, File::Spec->catdir (@di1)); |
|
|
65 | return ($m1, $m2); |
|
|
66 | } else { |
|
|
67 | return ($map1path, $map2path); |
|
|
68 | } |
|
|
69 | } else { |
|
|
70 | return ('', ''); |
|
|
71 | } |
|
|
72 | } |
23 | |
73 | |
24 | sub map2abs { |
74 | sub map2abs { |
25 | my ($dest, $mape) = @_; |
75 | my ($dest, $mape) = @_; |
26 | |
76 | |
|
|
77 | #$dest = abs_path $dest; |
27 | my $dir; |
78 | my $dir; |
28 | if (File::Spec->file_name_is_absolute($dest)) { |
79 | if (File::Spec->file_name_is_absolute($dest)) { |
29 | $dir = catdir ($::CFG->{MAPDIR}, $dest); |
80 | $dir = catdir ($::MAPDIR, $dest); |
30 | } else { |
81 | } else { |
31 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
82 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
32 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
83 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
33 | } |
84 | } |
34 | return $dir; |
85 | return $dir; |
… | |
… | |
69 | |
120 | |
70 | sub fill_pb_from_arch { |
121 | sub fill_pb_from_arch { |
71 | my ($pb, $a) = @_; |
122 | my ($pb, $a) = @_; |
72 | |
123 | |
73 | my $o = $Crossfire::ARCH{$a->{_name}}; |
124 | my $o = $Crossfire::ARCH{$a->{_name}}; |
74 | my $face = $Crossfire::FACE{$a->{face} || $o->{face} || "blank.111"} |
125 | my $face = $Crossfire::FACE{$a->{face} || $o->{face} || "blank.111"}; |
|
|
126 | unless ($face) { |
|
|
127 | $face = $Crossfire::FACE{"blank.x11"} |
75 | or warn "no gfx found for arch '$a->{_name}' at ($x|$y)\n"; |
128 | or warn "no gfx found for arch '$a->{_name}'\n"; |
|
|
129 | } |
76 | |
130 | |
77 | $face or return; |
131 | $face or return; |
78 | |
132 | |
79 | $pb->fill (0x00000000); |
133 | $pb->fill (0x00000000); |
80 | $TILE->composite ($pb, |
134 | $TILE->composite ($pb, |
… | |
… | |
109 | } |
163 | } |
110 | |
164 | |
111 | sub arch_is_floor { |
165 | sub arch_is_floor { |
112 | my ($a) = @_; |
166 | my ($a) = @_; |
113 | my $ar = Crossfire::arch_attr $a; |
167 | my $ar = Crossfire::arch_attr $a; |
|
|
168 | return ( |
114 | return (substr $ar->{name}, 0, 5) eq 'Floor'; |
169 | (substr $ar->{name}, 0, 5) eq 'Floor' |
115 | #return $Crossfire::ARCH{$a->{_name}}->{is_floor}; |
170 | or (substr $ar->{name}, 0, 10) eq 'Shop Floor' |
|
|
171 | ) |
|
|
172 | } |
|
|
173 | |
|
|
174 | sub arch_is_connector { |
|
|
175 | my ($a) = @_; |
|
|
176 | my $ar = Crossfire::arch_attr $a; |
|
|
177 | my $has_connect_field = 0; |
|
|
178 | |
|
|
179 | TOP: for (@{$ar->{section}}) { |
|
|
180 | my $name = shift @$_; |
|
|
181 | my @r = @$_; |
|
|
182 | if ($name eq 'general') { |
|
|
183 | for (@r) { |
|
|
184 | my ($k, $s) = ($_->[0], $_->[1]); |
|
|
185 | if ($k eq 'connected' && $s->{name} eq 'connection') { |
|
|
186 | $has_connect_field = 1; |
|
|
187 | last TOP; |
|
|
188 | } |
|
|
189 | } |
|
|
190 | last TOP; |
|
|
191 | } |
|
|
192 | } |
|
|
193 | |
|
|
194 | return $has_connect_field; |
116 | } |
195 | } |
117 | |
196 | |
118 | sub arch_is_wall { |
197 | sub arch_is_wall { |
119 | my ($a) = @_; |
198 | my ($a) = @_; |
120 | my $ar = Crossfire::arch_attr $a; |
199 | my $ar = Crossfire::arch_attr $a; |
… | |
… | |
279 | } |
358 | } |
280 | |
359 | |
281 | return \@outstack; |
360 | return \@outstack; |
282 | } |
361 | } |
283 | |
362 | |
|
|
363 | sub upload { |
|
|
364 | my ($login, $password, $srcrep, $path, $rev, $mapdata) = @_; |
|
|
365 | require LWP::UserAgent; |
|
|
366 | my $ua = LWP::UserAgent->new ( |
|
|
367 | agent => "gcrossedit", |
|
|
368 | keep_alive => 1, |
|
|
369 | env_proxy => 1, |
|
|
370 | timeout => 30, |
|
|
371 | ); |
|
|
372 | require HTTP::Request::Common; |
|
|
373 | |
|
|
374 | my $res = $ua->post ( |
|
|
375 | $ENV{CFPLUS_UPLOAD}, |
|
|
376 | Content_Type => 'multipart/form-data', |
|
|
377 | Content => [ |
|
|
378 | path => $path, |
|
|
379 | mapdir => $srcrep, |
|
|
380 | map => $mapdata, |
|
|
381 | revision => $rev, |
|
|
382 | cf_login => $login, #ENV{CFPLUS_LOGIN}, |
|
|
383 | cf_password => $password, #ENV{CFPLUS_PASSWORD}, |
|
|
384 | comment => "", |
|
|
385 | ] |
|
|
386 | ); |
|
|
387 | |
|
|
388 | if ($res->is_error) { |
|
|
389 | # fatal condition |
|
|
390 | warn $res->status_line; |
|
|
391 | } else { |
|
|
392 | # script replies are marked as {{..}} |
|
|
393 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
394 | warn map "$_\n", @msgs; |
|
|
395 | } |
|
|
396 | } |
|
|
397 | |
284 | =head1 AUTHOR |
398 | =head1 AUTHOR |
285 | |
399 | |
286 | Marc Lehmann <schmorp@schmorp.de> |
400 | Marc Lehmann <schmorp@schmorp.de> |
287 | http://home.schmorp.de/ |
401 | http://home.schmorp.de/ |
288 | |
402 | |