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.50 by root, Mon Mar 20 01:12:23 2006 UTC vs.
Revision 1.62 by root, Tue Mar 28 14:44:52 2006 UTC

… …
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, "<", $path
57 or die "$path: $!"; 136 or die "$path: $!";
58 binmode $fh; 137 binmode $fh;
59 local $/; 138 local $/;
60 139
61 Storable::thaw <$fh> 140 thaw <$fh>
62} 141}
63 142
64sub save_ref($$) { 143sub save_ref($$) {
65 my ($ref, $path) = @_; 144 my ($ref, $path) = @_;
66 145
67 open my $fh, ">", "$path~" 146 open my $fh, ">", "$path~"
68 or die "$path~: $!"; 147 or die "$path~: $!";
69 binmode $fh; 148 binmode $fh;
70 print $fh Storable::freeze $ref; 149 print $fh freeze $ref;
71 close $fh; 150 close $fh;
72 rename "$path~", $path 151 rename "$path~", $path
73 or die "$path: $!"; 152 or die "$path: $!";
74} 153}
75 154
155# object as in "Object xxx", i.e. archetypes
76sub normalize_arch($) { 156sub normalize_object($) {
77 my ($ob) = @_; 157 my ($ob) = @_;
78 158
79 my $arch = $ARCH{$ob->{_name}} 159 # nuke outdated or never supported fields
80 or (warn "$ob->{_name}: no such archetype", return $ob);
81
82 delete $ob->{$_} for qw( 160 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour 161 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru 162 can_apply pass_thru can_pass_thru
85 ); 163 );
164
165 # convert movement strings to bitsets
166 for my $attr (keys %FIELD_MOVEMENT) {
167 next unless exists $ob->{$attr};
168
169 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
170
171 next if $ob->{$attr} =~ /^\d+$/;
172
173 my $flags = 0;
174
175 # assume list
176 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
177 $flags |= MOVE_WALK if $flag eq "walk";
178 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
179 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
180 $flags |= MOVE_FLYING if $flag eq "flying";
181 $flags |= MOVE_SWIM if $flag eq "swim";
182 $flags |= MOVE_BOAT if $flag eq "boat";
183 $flags |= MOVE_ALL if $flag eq "all";
184
185 $flags &= ~MOVE_WALK if $flag eq "-walk";
186 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
187 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
188 $flags &= ~MOVE_FLYING if $flag eq "-flying";
189 $flags &= ~MOVE_SWIM if $flag eq "-swim";
190 $flags &= ~MOVE_BOAT if $flag eq "-boat";
191 $flags &= ~MOVE_ALL if $flag eq "-all";
192 }
193
194 $ob->{$attr} = $flags;
195 }
196
197 # convert outdated movement flags to new movement sets
198 if (defined (my $v = delete $ob->{no_pass})) {
199 $ob->{move_block} = $v ? MOVE_ALL : 0;
200 }
201 if (defined (my $v = delete $ob->{slow_move})) {
202 $ob->{move_slow} |= MOVE_WALK;
203 $ob->{move_slow_penalty} = $v;
204 }
205 if (defined (my $v = delete $ob->{walk_on})) {
206 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
207 : $ob->{move_on} & ~MOVE_WALK;
208 }
209 if (defined (my $v = delete $ob->{walk_off})) {
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK;
212 }
213 if (defined (my $v = delete $ob->{fly_on})) {
214 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
215 : $ob->{move_on} & ~MOVE_FLY_LOW;
216 }
217 if (defined (my $v = delete $ob->{fly_off})) {
218 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
219 : $ob->{move_off} & ~MOVE_FLY_LOW;
220 }
221 if (defined (my $v = delete $ob->{flying})) {
222 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
223 : $ob->{move_type} & ~MOVE_FLY_LOW;
224 }
225
226 # convert idiotic event_xxx things into objects
227 while (my ($event, $subtype) = each %EVENT_TYPE) {
228 if (exists $ob->{"event_${event}_plugin"}) {
229 push @{$ob->{inventory}}, {
230 _name => "event_$event",
231 title => delete $ob->{"event_${event}_plugin"},
232 slaying => delete $ob->{"event_${event}"},
233 name => delete $ob->{"event_${event}_options"},
234 };
235 }
236 }
237
238 $ob
239}
240
241# arch as in "arch xxx", ie.. objects
242sub normalize_arch($) {
243 my ($ob) = @_;
244
245 normalize_object $ob;
246
247 my $arch = $ARCH{$ob->{_name}}
248 or (warn "$ob->{_name}: no such archetype", return $ob);
86 249
87 if ($arch->{type} == 22) { # map 250 if ($arch->{type} == 22) { # map
88 my %normalize = ( 251 my %normalize = (
89 "enter_x" => "hp", 252 "enter_x" => "hp",
90 "enter_y" => "sp", 253 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 263 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 264 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 265 $ob->{$k2} = $v;
103 } 266 }
104 } 267 }
105 } 268 } 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 269 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 270 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 271 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 272 next if $k eq "_name";
167 delete $ob->{$k}; 273 delete $ob->{$k};
168 } 274 }
275 }
276 }
277
278 # a speciality for the editor
279 if (exists $ob->{attack_movement}) {
280 my $am = delete $ob->{attack_movement};
281 $ob->{attack_movement_bits_0_3} = $am & 15;
282 $ob->{attack_movement_bits_4_7} = $am & 240;
169 } 283 }
170 284
171 $ob 285 $ob
172} 286}
173 287
… …
204 318
205 while (<$fh>) { 319 while (<$fh>) {
206 s/\s+$//; 320 s/\s+$//;
207 if (/^end$/i) { 321 if (/^end$/i) {
208 last; 322 last;
209 } elsif (/^arch (\S+)$/) { 323 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 324 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 325 } elsif (/^lore$/i) {
212 while (<$fh>) { 326 while (<$fh>) {
213 last if /^endlore\s*$/i; 327 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 328 $arc{lore} .= $_;
215 } 329 }
216 } elsif (/^msg$/) { 330 } elsif (/^msg$/i) {
217 while (<$fh>) { 331 while (<$fh>) {
218 last if /^endmsg\s*$/i; 332 last if /^endmsg\s*$/i;
219 $arc{msg} .= $_; 333 $arc{msg} .= $_;
220 } 334 }
221 } elsif (/^(\S+)\s*(.*)$/) { 335 } elsif (/^(\S+)\s*(.*)$/) {
… …
234 s/\s+$//; 348 s/\s+$//;
235 if (/^more$/i) { 349 if (/^more$/i) {
236 $more = $prev; 350 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 351 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 352 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 353 my $arc = normalize_object $parse_block->(_name => $name);
240 354
241 if ($more) { 355 if ($more) {
242 $more->{more} = $arc; 356 $more->{more} = $arc;
243 } else { 357 } else {
244 $arc{$name} = $arc; 358 $arc{$name} = $arc;
245 } 359 }
246 $prev = $arc; 360 $prev = $arc;
247 $more = undef; 361 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 362 } elsif (/^arch (\S+)$/i) {
363 my $name = $1;
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 364 my $arc = normalize_arch $parse_block->(_name => $name);
365
366 if ($more) {
367 $more->{more} = $arc;
368 } else {
369 push @{ $arc{arch} }, $arc;
370 }
371 $prev = $arc;
372 $more = undef;
250 } elsif (/^\s*($|#)/) { 373 } elsif (/^\s*($|#)/) {
251 # 374 #
252 } else { 375 } else {
253 warn "$path: unparseable top-level line '$_'"; 376 warn "$path: unparseable top-level line '$_'";
254 } 377 }
… …
265sub editor_archs { 388sub editor_archs {
266 my %paths; 389 my %paths;
267 390
268 for (keys %ARCH) { 391 for (keys %ARCH) {
269 my $arch = $ARCH{$_}; 392 my $arch = $ARCH{$_};
270 push @{$paths{$arch->{editor_folder}}}, \$arch; 393 push @{$paths{$arch->{editor_folder}}}, $arch;
271 } 394 }
272 395
273 \%paths 396 \%paths
274} 397}
275 398
… …
340 my $type = $obj->{type} || $arch->{type}; 463 my $type = $obj->{type} || $arch->{type};
341 464
342 if ($type > 0) { 465 if ($type > 0) {
343 $root = $Crossfire::Data::ATTR{$type}; 466 $root = $Crossfire::Data::ATTR{$type};
344 } else { 467 } else {
468 my %a = (%$arch, %$obj);
469
470 if ($a{is_floor} && !$a{alive}) {
471 $root = $Crossfire::Data::TYPE{Floor};
472 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
473 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
474 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
475 $root = $Crossfire::Data::TYPE{Wall};
476 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
477 $root = $Crossfire::Data::TYPE{"Weak Wall"};
478 } else {
345 $root = $Crossfire::Data::TYPE{Misc}; 479 $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 } 480 }
360 } 481 }
361 482
362 my @import = ($root); 483 my @import = ($root);
363 484
… …
469} 590}
470 591
471sub cache_file($$&&) { 592sub cache_file($$&&) {
472 my ($src, $cache, $load, $create) = @_; 593 my ($src, $cache, $load, $create) = @_;
473 594
474 warn "<@_>\n";#d#
475
476 my ($size, $mtime) = (stat $src)[7,9] 595 my ($size, $mtime) = (stat $src)[7,9]
477 or Carp::croak "$src: $!"; 596 or Carp::croak "$src: $!";
478 597
479 if (-e $cache) { 598 if (-e $cache) {
480 my $ref = eval { load_ref $cache }; 599 my $ref = eval { load_ref $cache };
… …
539 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 658 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
540 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 659 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
541 or die "$VARDIR/tilecache.png: $!"; 660 or die "$VARDIR/tilecache.png: $!";
542 *FACE = $_[0]; 661 *FACE = $_[0];
543 }, sub { 662 }, sub {
544 require File::Temp;
545
546 my $tile = read_pak "$LIB/crossfire.0"; 663 my $tile = read_pak "$LIB/crossfire.0";
547 664
548 my %cache; 665 my %cache;
549 666
550 my $idx = 0; 667 my $idx = 0;
551 668
552 for my $name (sort keys %$tile) { 669 for my $name (sort keys %$tile) {
553 my ($fh, $filename) = File::Temp::tempfile (); 670 my $pb = new Gtk2::Gdk::PixbufLoader;
554 print $fh $tile->{$name}; 671 $pb->write ($tile->{$name});
555 close $fh; 672 $pb->close;
556 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 673 my $pb = $pb->get_pixbuf;
557 unlink $filename;
558 674
559 my $tile = $cache{$name} = { 675 my $tile = $cache{$name} = {
560 pb => $pb, 676 pb => $pb,
561 idx => $idx, 677 idx => $idx,
562 w => int $pb->get_width / TILESIZE, 678 w => int $pb->get_width / TILESIZE,
… …
580 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 696 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
581 } 697 }
582 } 698 }
583 } 699 }
584 700
585 $pb->save ("$VARDIR/tilecache.png", "png"); 701 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
586 702
587 \%cache 703 \%cache
588 }; 704 };
589} 705}
590 706

Diff Legend

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