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.52 by root, Mon Mar 20 02:15:36 2006 UTC vs.
Revision 1.68 by elmex, Sun Jul 30 17:29:29 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.8';
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
… …
37 msg => "endmsg", 37 msg => "endmsg",
38 lore => "endlore", 38 lore => "endlore",
39 maplore => "endmaplore", 39 maplore => "endmaplore",
40); 40);
41 41
42# not used yet, maybe alphabetical is ok 42# movement bit type, PITA
43our %FIELD_MOVEMENT = map +($_ => undef),
44 qw(move_type move_block move_allow move_on move_off move_slow);
45
46# same as in server save routine, to (hopefully) be compatible
47# to the other editors.
48our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore
52 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55));
56
43our @FIELD_ORDER = (qw(name name_pl)); 57our @FIELD_ORDER = (qw(
58 elevation
59
60 name name_pl custom_name title race
61 slaying skill msg lore other_arch face
62 #todo-events
63 animation is_animated
64 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype attacktype
69
70 resist_physical resist_magic resist_fire resist_electricity
71 resist_cold resist_confusion resist_acid resist_drain
72 resist_weaponmagic resist_ghosthit resist_poison resist_slow
73 resist_paralyze resist_turn_undead resist_fear resist_cancellation
74 resist_deplete resist_death resist_chaos resist_counterspell
75 resist_godpower resist_holyword resist_blind resist_internal
76 resist_life_stealing resist_disease
77
78 path_attuned path_repelled path_denied material materialname
79 value carrying weight invisible state magic
80 last_heal last_sp last_grace last_eat
81 connected glow_radius randomitems npx_status npc_program
82 run_away pick_up container will_apply smoothlevel
83 current_weapon_script weapontype tooltype elevation client_type
84 item_power duration range
85 range_modifier duration_modifier dam_modifier gen_sp_armour
86 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
87
88 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
89 friendly generator is_thrown auto_apply treasure player sold see_invisible
90 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
91 splitting hitback startequip blocksview undead scared unaggressive
92 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
93 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
94 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
95 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
96 random_move only_attack confused stealth cursed damned see_anywhere
97 known_magical known_cursed can_use_skill been_applied has_ready_scroll
98 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
99 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
100 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
101 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
102
103 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105));
106
107our %EVENT_TYPE = (
108 apply => 1,
109 attack => 2,
110 death => 3,
111 drop => 4,
112 pickup => 5,
113 say => 6,
114 stop => 7,
115 time => 8,
116 throw => 9,
117 trigger => 10,
118 close => 11,
119 timer => 12,
120);
44 121
45sub MOVE_WALK (){ 0x01 } 122sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 123sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 124sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 125sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 126sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 127sub MOVE_BOAT (){ 0x10 }
128sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 131
53sub load_ref($) { 132sub load_ref($) {
54 my ($path) = @_; 133 my ($path) = @_;
55 134
56 open my $fh, "<", $path 135 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 136 or die "$path: $!";
58 binmode $fh;
59 local $/; 137 local $/;
60 138
61 Storable::thaw <$fh> 139 thaw <$fh>
62} 140}
63 141
64sub save_ref($$) { 142sub save_ref($$) {
65 my ($ref, $path) = @_; 143 my ($ref, $path) = @_;
66 144
67 open my $fh, ">", "$path~" 145 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 146 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 147 print $fh freeze $ref;
71 close $fh; 148 close $fh;
72 rename "$path~", $path 149 rename "$path~", $path
73 or die "$path: $!"; 150 or die "$path: $!";
74} 151}
75 152
153# object as in "Object xxx", i.e. archetypes
76sub normalize_object($) { 154sub normalize_object($) {
77 my ($ob) = @_; 155 my ($ob) = @_;
78 156
157 # nuke outdated or never supported fields
79 delete $ob->{$_} for qw( 158 delete $ob->{$_} for qw(
80 can_knockback can_parry can_impale can_cut can_dam_armour 159 can_knockback can_parry can_impale can_cut can_dam_armour
81 can_apply pass_thru can_pass_thru 160 can_apply pass_thru can_pass_thru
82 ); 161 );
83 162
84 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 163 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) {
85 next unless exists $ob->{$attr}; 165 next unless exists $ob->{$attr};
166
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
168
86 next if $ob->{$attr} =~ /^\d+$/; 169 next if $ob->{$attr} =~ /^\d+$/;
87 170
88 my $flags = 0; 171 my $flags = 0;
89 172
90 # assume list 173 # assume list
… …
107 } 190 }
108 191
109 $ob->{$attr} = $flags; 192 $ob->{$attr} = $flags;
110 } 193 }
111 194
195 # convert outdated movement flags to new movement sets
112 if (defined (my $v = delete $ob->{no_pass})) { 196 if (defined (my $v = delete $ob->{no_pass})) {
113 $ob->{move_block} = $v ? MOVE_ALL : 0; 197 $ob->{move_block} = $v ? MOVE_ALL : 0;
114 } 198 }
115 if (defined (my $v = delete $ob->{slow_move})) { 199 if (defined (my $v = delete $ob->{slow_move})) {
116 $ob->{move_slow} |= MOVE_WALK; 200 $ob->{move_slow} |= MOVE_WALK;
117 $ob->{move_slow_penalty} = $v; 201 $ob->{move_slow_penalty} = $v;
118 } 202 }
119 if (defined (my $v = delete $ob->{walk_on})) { 203 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
120 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 205 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
121 : $ob->{move_on} & ~MOVE_WALK; 206 : $ob->{move_on} & ~MOVE_WALK;
122 } 207 }
123 if (defined (my $v = delete $ob->{walk_off})) { 208 if (defined (my $v = delete $ob->{walk_off})) {
209 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
124 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
125 : $ob->{move_off} & ~MOVE_WALK; 211 : $ob->{move_off} & ~MOVE_WALK;
126 } 212 }
127 if (defined (my $v = delete $ob->{fly_on})) { 213 if (defined (my $v = delete $ob->{fly_on})) {
214 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
128 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 215 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
129 : $ob->{move_on} & ~MOVE_FLY_LOW; 216 : $ob->{move_on} & ~MOVE_FLY_LOW;
130 } 217 }
131 if (defined (my $v = delete $ob->{fly_off})) { 218 if (defined (my $v = delete $ob->{fly_off})) {
219 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
132 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 220 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
133 : $ob->{move_off} & ~MOVE_FLY_LOW; 221 : $ob->{move_off} & ~MOVE_FLY_LOW;
134 } 222 }
135 if (defined (my $v = delete $ob->{flying})) { 223 if (defined (my $v = delete $ob->{flying})) {
224 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
136 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 225 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
137 : $ob->{move_type} & ~MOVE_FLY_LOW; 226 : $ob->{move_type} & ~MOVE_FLY_LOW;
138 } 227 }
139 228
229 # convert idiotic event_xxx things into objects
230 while (my ($event, $subtype) = each %EVENT_TYPE) {
231 if (exists $ob->{"event_${event}_plugin"}) {
232 push @{$ob->{inventory}}, {
233 _name => "event_$event",
234 title => delete $ob->{"event_${event}_plugin"},
235 slaying => delete $ob->{"event_${event}"},
236 name => delete $ob->{"event_${event}_options"},
237 };
238 }
239 }
240
140 $ob 241 $ob
141} 242}
142 243
244# arch as in "arch xxx", ie.. objects
143sub normalize_arch($) { 245sub normalize_arch($) {
144 my ($ob) = @_; 246 my ($ob) = @_;
145 247
146 normalize_object $ob; 248 normalize_object $ob;
147 249
… …
174 delete $ob->{$k}; 276 delete $ob->{$k};
175 } 277 }
176 } 278 }
177 } 279 }
178 280
281 # a speciality for the editor
282 if (exists $ob->{attack_movement}) {
283 my $am = delete $ob->{attack_movement};
284 $ob->{attack_movement_bits_0_3} = $am & 15;
285 $ob->{attack_movement_bits_4_7} = $am & 240;
286 }
287
179 $ob 288 $ob
180} 289}
181 290
182sub read_pak($) { 291sub read_pak($) {
183 my ($path) = @_; 292 my ($path) = @_;
184 293
185 my %pak; 294 my %pak;
186 295
187 open my $fh, "<", $path 296 open my $fh, "<:raw:perlio", $path
188 or Carp::croak "$_[0]: $!"; 297 or Carp::croak "$_[0]: $!";
189 binmode $fh; 298 binmode $fh;
190 while (<$fh>) { 299 while (<$fh>) {
191 my ($type, $id, $len, $path) = split; 300 my ($type, $id, $len, $path) = split;
192 $path =~ s/.*\///; 301 $path =~ s/.*\///;
… …
194 } 303 }
195 304
196 \%pak 305 \%pak
197} 306}
198 307
199sub read_arch($) { 308sub read_arch($;$) {
200 my ($path) = @_; 309 my ($path, $toplevel) = @_;
201 310
202 my %arc; 311 my %arc;
203 my ($more, $prev); 312 my ($more, $prev);
204 313
205 open my $fh, "<", $path 314 open my $fh, "<:raw:perlio:utf8", $path
206 or Carp::croak "$path: $!"; 315 or Carp::croak "$path: $!";
207 316
208 binmode $fh; 317# binmode $fh;
209 318
210 my $parse_block; $parse_block = sub { 319 my $parse_block; $parse_block = sub {
211 my %arc = @_; 320 my %arc = @_;
212 321
213 while (<$fh>) { 322 while (<$fh>) {
214 s/\s+$//; 323 s/\s+$//;
215 if (/^end$/i) { 324 if (/^end$/i) {
216 last; 325 last;
217 } elsif (/^arch (\S+)$/) { 326 } elsif (/^arch (\S+)$/i) {
218 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
219 } elsif (/^lore$/) { 328 } elsif (/^lore$/i) {
220 while (<$fh>) { 329 while (<$fh>) {
221 last if /^endlore\s*$/i; 330 last if /^endlore\s*$/i;
222 $arc{lore} .= $_; 331 $arc{lore} .= $_;
223 } 332 }
224 } elsif (/^msg$/) { 333 } elsif (/^msg$/i) {
225 while (<$fh>) { 334 while (<$fh>) {
226 last if /^endmsg\s*$/i; 335 last if /^endmsg\s*$/i;
227 $arc{msg} .= $_; 336 $arc{msg} .= $_;
337 }
338 } elsif (/^anim$/i) {
339 while (<$fh>) {
340 last if /^mina\s*$/i;
341 chomp;
342 push @{ $arc{anim} }, $_;
228 } 343 }
229 } elsif (/^(\S+)\s*(.*)$/) { 344 } elsif (/^(\S+)\s*(.*)$/) {
230 $arc{lc $1} = $2; 345 $arc{lc $1} = $2;
231 } elsif (/^\s*($|#)/) { 346 } elsif (/^\s*($|#)/) {
232 # 347 #
… …
252 $arc{$name} = $arc; 367 $arc{$name} = $arc;
253 } 368 }
254 $prev = $arc; 369 $prev = $arc;
255 $more = undef; 370 $more = undef;
256 } elsif (/^arch (\S+)$/i) { 371 } elsif (/^arch (\S+)$/i) {
372 my $name = $1;
257 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 373 my $arc = normalize_arch $parse_block->(_name => $name);
374
375 if ($more) {
376 $more->{more} = $arc;
377 } else {
378 push @{ $arc{arch} }, $arc;
379 }
380 $prev = $arc;
381 $more = undef;
382 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
383 if ($1 eq "lev_array") {
384 while (<$fh>) {
385 last if /^endplst\s*$/;
386 push @{$toplevel->{lev_array}}, $_+0;
387 }
388 } else {
389 $toplevel->{$1} = $2;
390 }
258 } elsif (/^\s*($|#)/) { 391 } elsif (/^\s*($|#)/) {
259 # 392 #
260 } else { 393 } else {
261 warn "$path: unparseable top-level line '$_'"; 394 die "$path: unparseable top-level line '$_'";
262 } 395 }
263 } 396 }
264 397
265 undef $parse_block; # work around bug in perl not freeing $fh etc. 398 undef $parse_block; # work around bug in perl not freeing $fh etc.
266 399
… …
273sub editor_archs { 406sub editor_archs {
274 my %paths; 407 my %paths;
275 408
276 for (keys %ARCH) { 409 for (keys %ARCH) {
277 my $arch = $ARCH{$_}; 410 my $arch = $ARCH{$_};
278 push @{$paths{$arch->{editor_folder}}}, \$arch; 411 push @{$paths{$arch->{editor_folder}}}, $arch;
279 } 412 }
280 413
281 \%paths 414 \%paths
282} 415}
283 416
… …
348 my $type = $obj->{type} || $arch->{type}; 481 my $type = $obj->{type} || $arch->{type};
349 482
350 if ($type > 0) { 483 if ($type > 0) {
351 $root = $Crossfire::Data::ATTR{$type}; 484 $root = $Crossfire::Data::ATTR{$type};
352 } else { 485 } else {
486 my %a = (%$arch, %$obj);
487
488 if ($a{is_floor} && !$a{alive}) {
489 $root = $Crossfire::Data::TYPE{Floor};
490 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
491 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
492 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
493 $root = $Crossfire::Data::TYPE{Wall};
494 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
495 $root = $Crossfire::Data::TYPE{"Weak Wall"};
496 } else {
353 $root = $Crossfire::Data::TYPE{Misc}; 497 $root = $Crossfire::Data::TYPE{Misc};
354
355 type:
356 for (@Crossfire::Data::ATTR0) {
357 my $req = $_->{required}
358 or die "internal error: ATTR0 without 'required'";
359
360 keys %$req;
361 while (my ($k, $v) = each %$req) {
362 next type
363 unless $obj->{$k} == $v || $arch->{$k} == $v;
364 }
365
366 $root = $_;
367 } 498 }
368 } 499 }
369 500
370 my @import = ($root); 501 my @import = ($root);
371 502
… …
545 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 676 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 677 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547 or die "$VARDIR/tilecache.png: $!"; 678 or die "$VARDIR/tilecache.png: $!";
548 *FACE = $_[0]; 679 *FACE = $_[0];
549 }, sub { 680 }, sub {
550 require File::Temp;
551
552 my $tile = read_pak "$LIB/crossfire.0"; 681 my $tile = read_pak "$LIB/crossfire.0";
553 682
554 my %cache; 683 my %cache;
555 684
556 my $idx = 0; 685 my $idx = 0;
557 686
558 for my $name (sort keys %$tile) { 687 for my $name (sort keys %$tile) {
559 my ($fh, $filename) = File::Temp::tempfile (); 688 my $pb = new Gtk2::Gdk::PixbufLoader;
560 print $fh $tile->{$name}; 689 $pb->write ($tile->{$name});
561 close $fh; 690 $pb->close;
562 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 691 my $pb = $pb->get_pixbuf;
563 unlink $filename;
564 692
565 my $tile = $cache{$name} = { 693 my $tile = $cache{$name} = {
566 pb => $pb, 694 pb => $pb,
567 idx => $idx, 695 idx => $idx,
568 w => int $pb->get_width / TILESIZE, 696 w => int $pb->get_width / TILESIZE,
… …
586 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 714 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587 } 715 }
588 } 716 }
589 } 717 }
590 718
591 $pb->save ("$VARDIR/tilecache.png", "png"); 719 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592 720
593 \%cache 721 \%cache
594 }; 722 };
595} 723}
596 724

Diff Legend

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