… | |
… | |
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; |
21 | use Cwd 'abs_path'; |
24 | use Cwd 'abs_path'; |
|
|
25 | use strict; |
22 | |
26 | |
23 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb |
27 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb |
24 | fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall |
28 | fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall |
25 | stack_find arch_is_wall arch_is_monster add_table_widget quick_msg |
29 | stack_find arch_is_wall arch_is_monster add_table_widget quick_msg |
26 | def arch_is_exit map2abs exit_paths pseudohtml2txt arch_is_connector); |
30 | def arch_is_exit map2abs exit_paths pseudohtml2txt arch_is_connector); |
… | |
… | |
68 | } |
72 | } |
69 | |
73 | |
70 | sub map2abs { |
74 | sub map2abs { |
71 | my ($dest, $mape) = @_; |
75 | my ($dest, $mape) = @_; |
72 | |
76 | |
73 | $mappath = abs_path $mappath; |
77 | #$dest = abs_path $dest; |
74 | my $dir; |
78 | my $dir; |
75 | if (File::Spec->file_name_is_absolute($dest)) { |
79 | if (File::Spec->file_name_is_absolute($dest)) { |
76 | $dir = catdir ($::CFG->{MAPDIR}, $dest); |
80 | $dir = catdir ($::MAPDIR, $dest); |
77 | } else { |
81 | } else { |
78 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
82 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
79 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
83 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
80 | } |
84 | } |
81 | return $dir; |
85 | return $dir; |
… | |
… | |
116 | |
120 | |
117 | sub fill_pb_from_arch { |
121 | sub fill_pb_from_arch { |
118 | my ($pb, $a) = @_; |
122 | my ($pb, $a) = @_; |
119 | |
123 | |
120 | my $o = $Crossfire::ARCH{$a->{_name}}; |
124 | my $o = $Crossfire::ARCH{$a->{_name}}; |
121 | 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"} |
122 | 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 | } |
123 | |
130 | |
124 | $face or return; |
131 | $face or return; |
125 | |
132 | |
126 | $pb->fill (0x00000000); |
133 | $pb->fill (0x00000000); |
127 | $TILE->composite ($pb, |
134 | $TILE->composite ($pb, |
… | |
… | |
156 | } |
163 | } |
157 | |
164 | |
158 | sub arch_is_floor { |
165 | sub arch_is_floor { |
159 | my ($a) = @_; |
166 | my ($a) = @_; |
160 | my $ar = Crossfire::arch_attr $a; |
167 | my $ar = Crossfire::arch_attr $a; |
|
|
168 | return ( |
161 | return (substr $ar->{name}, 0, 5) eq 'Floor'; |
169 | (substr $ar->{name}, 0, 5) eq 'Floor' |
|
|
170 | or (substr $ar->{name}, 0, 10) eq 'Shop Floor' |
|
|
171 | ) |
162 | } |
172 | } |
163 | |
173 | |
164 | sub arch_is_connector { |
174 | sub arch_is_connector { |
165 | my ($a) = @_; |
175 | my ($a) = @_; |
166 | my $ar = Crossfire::arch_attr $a; |
176 | my $ar = Crossfire::arch_attr $a; |
… | |
… | |
348 | } |
358 | } |
349 | |
359 | |
350 | return \@outstack; |
360 | return \@outstack; |
351 | } |
361 | } |
352 | |
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 | |
353 | =head1 AUTHOR |
398 | =head1 AUTHOR |
354 | |
399 | |
355 | Marc Lehmann <schmorp@schmorp.de> |
400 | Marc Lehmann <schmorp@schmorp.de> |
356 | http://home.schmorp.de/ |
401 | http://home.schmorp.de/ |
357 | |
402 | |