ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.51 by root, Mon Mar 20 01:15:10 2006 UTC vs.
Revision 1.77 by root, Tue Nov 7 22:40:26 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.95';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable; 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
37 msg => "endmsg", 51 msg => "endmsg",
38 lore => "endlore", 52 lore => "endlore",
39 maplore => "endmaplore", 53 maplore => "endmaplore",
40); 54);
41 55
42# not used yet, maybe alphabetical is ok 56# movement bit type, PITA
57our %FIELD_MOVEMENT = map +($_ => undef),
58 qw(move_type move_block move_allow move_on move_off move_slow);
59
60# same as in server save routine, to (hopefully) be compatible
61# to the other editors.
62our @FIELD_ORDER_MAP = (qw(
63 name attach swap_time reset_timeout fixed_resettime difficulty region
64 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore
66 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69));
70
43our @FIELD_ORDER = (qw(name name_pl)); 71our @FIELD_ORDER = (qw(
72 elevation
73
74 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face
76 #todo-events
77 animation is_animated
78 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype
83
84 resist_physical resist_magic resist_fire resist_electricity
85 resist_cold resist_confusion resist_acid resist_drain
86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
88 resist_deplete resist_death resist_chaos resist_counterspell
89 resist_godpower resist_holyword resist_blind resist_internal
90 resist_life_stealing resist_disease
91
92 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program
96 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour
100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
101
102 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
103 friendly generator is_thrown auto_apply treasure player sold see_invisible
104 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
105 splitting hitback startequip blocksview undead scared unaggressive
106 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
107 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
108 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
109 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
110 random_move only_attack confused stealth cursed damned see_anywhere
111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116
117 body_range body_arm body_torso body_head body_neck body_skill
118 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119));
120
121our %EVENT_TYPE = (
122 apply => 1,
123 attack => 2,
124 death => 3,
125 drop => 4,
126 pickup => 5,
127 say => 6,
128 stop => 7,
129 time => 8,
130 throw => 9,
131 trigger => 10,
132 close => 11,
133 timer => 12,
134);
44 135
45sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 141sub MOVE_BOAT (){ 0x10 }
142sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 145
53sub load_ref($) { 146sub load_ref($) {
54 my ($path) = @_; 147 my ($path) = @_;
55 148
56 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 150 or die "$path: $!";
58 binmode $fh;
59 local $/; 151 local $/;
60 152
61 Storable::thaw <$fh> 153 thaw <$fh>
62} 154}
63 155
64sub save_ref($$) { 156sub save_ref($$) {
65 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
66 158
67 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 160 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 161 print $fh freeze $ref;
71 close $fh; 162 close $fh;
72 rename "$path~", $path 163 rename "$path~", $path
73 or die "$path: $!"; 164 or die "$path: $!";
74} 165}
75 166
167my %attack_mask = (
168 physical => 0x00000001,
169 magic => 0x00000002,
170 fire => 0x00000004,
171 electricity => 0x00000008,
172 cold => 0x00000010,
173 confusion => 0x00000020,
174 acid => 0x00000040,
175 drain => 0x00000080,
176 weaponmagic => 0x00000100,
177 ghosthit => 0x00000200,
178 poison => 0x00000400,
179 slow => 0x00000800,
180 paralyze => 0x00001000,
181 turn_undead => 0x00002000,
182 fear => 0x00004000,
183 cancellation => 0x00008000,
184 deplete => 0x00010000,
185 death => 0x00020000,
186 chaos => 0x00040000,
187 counterspell => 0x00080000,
188 godpower => 0x00100000,
189 holyword => 0x00200000,
190 blind => 0x00400000,
191 internal => 0x00800000,
192 life_stealing => 0x01000000,
193 disease => 0x02000000,
194);
195
196sub _add_resist($$$) {
197 my ($ob, $mask, $value) = @_;
198
199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 }
202}
203
204# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) {
206 my ($ob) = @_;
207
208 # nuke outdated or never supported fields
209 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru
212 )};
213
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217
218 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr};
221
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
223
224 next if $ob->{$attr} =~ /^\d+$/;
225
226 my $flags = 0;
227
228 # assume list
229 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
230 $flags |= MOVE_WALK if $flag eq "walk";
231 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
232 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
233 $flags |= MOVE_FLYING if $flag eq "flying";
234 $flags |= MOVE_SWIM if $flag eq "swim";
235 $flags |= MOVE_BOAT if $flag eq "boat";
236 $flags |= MOVE_ALL if $flag eq "all";
237
238 $flags &= ~MOVE_WALK if $flag eq "-walk";
239 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
240 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
241 $flags &= ~MOVE_FLYING if $flag eq "-flying";
242 $flags &= ~MOVE_SWIM if $flag eq "-swim";
243 $flags &= ~MOVE_BOAT if $flag eq "-boat";
244 $flags &= ~MOVE_ALL if $flag eq "-all";
245 }
246
247 $ob->{$attr} = $flags;
248 }
249
250 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0;
253 }
254 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK;
256 $ob->{move_slow_penalty} = $v;
257 }
258 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 }
263 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 }
268 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 }
273 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 }
278 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 }
283
284 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) {
287 push @{$ob->{inventory}}, {
288 _name => "event_$event",
289 title => delete $ob->{"event_${event}_plugin"},
290 slaying => delete $ob->{"event_${event}"},
291 name => delete $ob->{"event_${event}_options"},
292 };
293 }
294 }
295
296 # some archetypes had "+3" instead of the canonical "3", so fix
297 $ob->{dam} *= 1 if exists $ob->{dam};
298
299 $ob
300}
301
302# arch as in "arch xxx", ie.. objects
76sub normalize_arch($) { 303sub normalize_arch($) {
77 my ($ob) = @_; 304 my ($ob) = @_;
78 305
306 normalize_object $ob;
307
79 my $arch = $ARCH{$ob->{_name}} 308 my $arch = $ARCH{$ob->{_name}}
80 or (warn "$ob->{_name}: no such archetype", return $ob); 309 or (warn "$ob->{_name}: no such archetype", return $ob);
81
82 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru
85 );
86 310
87 if ($arch->{type} == 22) { # map 311 if ($arch->{type} == 22) { # map
88 my %normalize = ( 312 my %normalize = (
89 "enter_x" => "hp", 313 "enter_x" => "hp",
90 "enter_y" => "sp", 314 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 324 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 325 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 326 $ob->{$k2} = $v;
103 } 327 }
104 } 328 }
105 } 329 } else {
106
107 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
108 next unless exists $ob->{$attr};
109 next if $ob->{$attr} =~ /^\d+$/;
110
111 my $flags = 0;
112
113 # assume list
114 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
115 $flags |= MOVE_WALK if $flag eq "walk";
116 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
117 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
118 $flags |= MOVE_FLYING if $flag eq "flying";
119 $flags |= MOVE_SWIM if $flag eq "swim";
120 $flags |= MOVE_BOAT if $flag eq "boat";
121 $flags |= MOVE_ALL if $flag eq "all";
122
123 $flags &= ~MOVE_WALK if $flag eq "-walk";
124 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
125 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
126 $flags &= ~MOVE_FLYING if $flag eq "-flying";
127 $flags &= ~MOVE_SWIM if $flag eq "-swim";
128 $flags &= ~MOVE_BOAT if $flag eq "-boat";
129 $flags &= ~MOVE_ALL if $flag eq "-all";
130 }
131
132 $ob->{$attr} = $flags;
133 }
134
135 if (defined (my $v = delete $ob->{no_pass})) {
136 $ob->{move_block} = $v ? MOVE_ALL : 0;
137 }
138 if (defined (my $v = delete $ob->{slow_move})) {
139 $ob->{move_slow} |= MOVE_WALK;
140 $ob->{move_slow_penalty} = $v;
141 }
142 if (defined (my $v = delete $ob->{walk_on})) {
143 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
144 : $ob->{move_on} & ~MOVE_WALK;
145 }
146 if (defined (my $v = delete $ob->{walk_off})) {
147 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
148 : $ob->{move_off} & ~MOVE_WALK;
149 }
150 if (defined (my $v = delete $ob->{fly_on})) {
151 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
152 : $ob->{move_on} & ~MOVE_FLY_LOW;
153 }
154 if (defined (my $v = delete $ob->{fly_off})) {
155 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
156 : $ob->{move_off} & ~MOVE_FLY_LOW;
157 }
158 if (defined (my $v = delete $ob->{flying})) {
159 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
160 : $ob->{move_type} & ~MOVE_FLY_LOW;
161 }
162
163 # if value matches archetype default, delete 330 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 331 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 332 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 333 next if $k eq "_name";
167 delete $ob->{$k}; 334 delete $ob->{$k};
168 } 335 }
336 }
169 } 337 }
338
339 # a speciality for the editor
340 if (exists $ob->{attack_movement}) {
341 my $am = delete $ob->{attack_movement};
342 $ob->{attack_movement_bits_0_3} = $am & 15;
343 $ob->{attack_movement_bits_4_7} = $am & 240;
344 }
345
346 $ob
347}
348
349sub attr_thaw($) {
350 my ($ob) = @_;
351
352 $ob->{attach} = from_json $ob->{attach}
353 if exists $ob->{attach};
354
355 $ob
356}
357
358sub attr_freeze($) {
359 my ($ob) = @_;
360
361 $ob->{attach} = Crossfire::to_json $ob->{attach}
362 if exists $ob->{attach};
170 363
171 $ob 364 $ob
172} 365}
173 366
174sub read_pak($) { 367sub read_pak($) {
175 my ($path) = @_; 368 my ($path) = @_;
176 369
177 my %pak; 370 my %pak;
178 371
179 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
180 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
181 binmode $fh; 374 binmode $fh;
182 while (<$fh>) { 375 while (<$fh>) {
183 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
184 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
186 } 379 }
187 380
188 \%pak 381 \%pak
189} 382}
190 383
191sub read_arch($) { 384sub read_arch($;$) {
192 my ($path) = @_; 385 my ($path, $toplevel) = @_;
193 386
194 my %arc; 387 my %arc;
195 my ($more, $prev); 388 my ($more, $prev);
196 389
197 open my $fh, "<", $path 390 open my $fh, "<:raw:perlio:utf8", $path
198 or Carp::croak "$path: $!"; 391 or Carp::croak "$path: $!";
199 392
200 binmode $fh; 393# binmode $fh;
201 394
202 my $parse_block; $parse_block = sub { 395 my $parse_block; $parse_block = sub {
203 my %arc = @_; 396 my %arc = @_;
204 397
205 while (<$fh>) { 398 while (<$fh>) {
206 s/\s+$//; 399 s/\s+$//;
207 if (/^end$/i) { 400 if (/^end$/i) {
208 last; 401 last;
209 } elsif (/^arch (\S+)$/) { 402 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 404 } elsif (/^lore$/i) {
212 while (<$fh>) { 405 while (<$fh>) {
213 last if /^endlore\s*$/i; 406 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 407 $arc{lore} .= $_;
215 } 408 }
216 } elsif (/^msg$/) { 409 } elsif (/^msg$/i) {
217 while (<$fh>) { 410 while (<$fh>) {
218 last if /^endmsg\s*$/i; 411 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 412 $arc{msg} .= $_;
413 }
414 } elsif (/^anim$/i) {
415 while (<$fh>) {
416 last if /^mina\s*$/i;
417 chomp;
418 push @{ $arc{anim} }, $_;
220 } 419 }
221 } elsif (/^(\S+)\s*(.*)$/) { 420 } elsif (/^(\S+)\s*(.*)$/) {
222 $arc{lc $1} = $2; 421 $arc{lc $1} = $2;
223 } elsif (/^\s*($|#)/) { 422 } elsif (/^\s*($|#)/) {
224 # 423 #
… …
234 s/\s+$//; 433 s/\s+$//;
235 if (/^more$/i) { 434 if (/^more$/i) {
236 $more = $prev; 435 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 436 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 437 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
439 $arc->{_atype} = 'object';
240 440
241 if ($more) { 441 if ($more) {
242 $more->{more} = $arc; 442 $more->{more} = $arc;
243 } else { 443 } else {
244 $arc{$name} = $arc; 444 $arc{$name} = $arc;
245 } 445 }
246 $prev = $arc; 446 $prev = $arc;
247 $more = undef; 447 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 448 } elsif (/^arch (\S+)$/i) {
449 my $name = $1;
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
451 $arc->{_atype} = 'arch';
452
453 if ($more) {
454 $more->{more} = $arc;
455 } else {
456 push @{ $arc{arch} }, $arc;
457 }
458 $prev = $arc;
459 $more = undef;
460 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
461 if ($1 eq "lev_array") {
462 while (<$fh>) {
463 last if /^endplst\s*$/;
464 push @{$toplevel->{lev_array}}, $_+0;
465 }
466 } else {
467 $toplevel->{$1} = $2;
468 }
250 } elsif (/^\s*($|#)/) { 469 } elsif (/^\s*($|#)/) {
251 # 470 #
252 } else { 471 } else {
253 warn "$path: unparseable top-level line '$_'"; 472 die "$path: unparseable top-level line '$_'";
254 } 473 }
255 } 474 }
256 475
257 undef $parse_block; # work around bug in perl not freeing $fh etc. 476 undef $parse_block; # work around bug in perl not freeing $fh etc.
258 477
259 \%arc 478 \%arc
479}
480
481sub archlist_to_string {
482 my ($arch) = @_;
483
484 my $str;
485
486 my $append; $append = sub {
487 my %a = %{$_[0]};
488
489 Crossfire::attr_freeze \%a;
490 Crossfire::normalize_arch \%a;
491
492 # undo the bit-split we did before
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7});
496 }
497
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499
500 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim};
503
504 my @kv;
505
506 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_};
511 }
512
513 for (sort keys %a) {
514 next if /^_/; # ignore our _-keys
515 push @kv, [$_, delete $a{$_}];
516 }
517
518 for (@kv) {
519 my ($k, $v) = @$_;
520
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else {
551 $str .= "$k $v\n";
552 }
553 }
554
555 if ($inv) {
556 $append->($_) for @$inv;
557 }
558
559 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n"
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n";
568 $append->($more) if $more;
569 }
570 };
571
572 for (@$arch) {
573 $append->($_);
574 }
575
576 $str
260} 577}
261 578
262# put all archs into a hash with editor_face as it's key 579# put all archs into a hash with editor_face as it's key
263# NOTE: the arrays in the hash values are references to 580# NOTE: the arrays in the hash values are references to
264# the archs from $ARCH 581# the archs from $ARCH
265sub editor_archs { 582sub editor_archs {
266 my %paths; 583 my %paths;
267 584
268 for (keys %ARCH) { 585 for (keys %ARCH) {
269 my $arch = $ARCH{$_}; 586 my $arch = $ARCH{$_};
270 push @{$paths{$arch->{editor_folder}}}, \$arch; 587 push @{$paths{$arch->{editor_folder}}}, $arch;
271 } 588 }
272 589
273 \%paths 590 \%paths
274} 591}
275 592
… …
340 my $type = $obj->{type} || $arch->{type}; 657 my $type = $obj->{type} || $arch->{type};
341 658
342 if ($type > 0) { 659 if ($type > 0) {
343 $root = $Crossfire::Data::ATTR{$type}; 660 $root = $Crossfire::Data::ATTR{$type};
344 } else { 661 } else {
662 my %a = (%$arch, %$obj);
663
664 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"};
672 } else {
345 $root = $Crossfire::Data::TYPE{Misc}; 673 $root = $Crossfire::Data::TYPE{Misc};
346
347 type:
348 for (@Crossfire::Data::ATTR0) {
349 my $req = $_->{required}
350 or die "internal error: ATTR0 without 'required'";
351
352 keys %$req;
353 while (my ($k, $v) = each %$req) {
354 next type
355 unless $obj->{$k} == $v || $arch->{$k} == $v;
356 }
357
358 $root = $_;
359 } 674 }
360 } 675 }
361 676
362 my @import = ($root); 677 my @import = ($root);
363 678
… …
537 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
538 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
539 or die "$VARDIR/tilecache.png: $!"; 854 or die "$VARDIR/tilecache.png: $!";
540 *FACE = $_[0]; 855 *FACE = $_[0];
541 }, sub { 856 }, sub {
542 require File::Temp;
543
544 my $tile = read_pak "$LIB/crossfire.0"; 857 my $tile = read_pak "$LIB/crossfire.0";
545 858
546 my %cache; 859 my %cache;
547 860
548 my $idx = 0; 861 my $idx = 0;
549 862
550 for my $name (sort keys %$tile) { 863 for my $name (sort keys %$tile) {
551 my ($fh, $filename) = File::Temp::tempfile (); 864 my $pb = new Gtk2::Gdk::PixbufLoader;
552 print $fh $tile->{$name}; 865 $pb->write ($tile->{$name});
553 close $fh; 866 $pb->close;
554 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 867 my $pb = $pb->get_pixbuf;
555 unlink $filename;
556 868
557 my $tile = $cache{$name} = { 869 my $tile = $cache{$name} = {
558 pb => $pb, 870 pb => $pb,
559 idx => $idx, 871 idx => $idx,
560 w => int $pb->get_width / TILESIZE, 872 w => int $pb->get_width / TILESIZE,
… …
578 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
579 } 891 }
580 } 892 }
581 } 893 }
582 894
583 $pb->save ("$VARDIR/tilecache.png", "png"); 895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
584 896
585 \%cache 897 \%cache
586 }; 898 };
587} 899}
588 900

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines