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.80 by root, Tue Feb 6 22:08:14 2007 UTC vs.
Revision 1.143 by root, Wed Oct 6 01:53:51 2010 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.96'; 11our $VERSION = '1.30';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 29use JSON::XS qw(decode_json encode_json);
25 30
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
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
37 32
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 55 qw(move_type move_block move_allow move_on move_off move_slow);
59 56
60# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 58# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
64 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
66 unique template 65 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
68 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
69)); 68));
70 69
71our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
72 elevation 73 elevation
73 74
74 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
76 #todo-events 77 sound sound_destroy face animation is_animated
77 animation is_animated 78 magicmap glyph smoothlevel smoothface
78 str dex con wis pow cha int 79 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 81 exp perm_exp expmul
81 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
82 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
91 92
92 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 94 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 99 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
111 known_magical known_cursed can_use_skill been_applied has_ready_scroll 112 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 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 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 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 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
116 118
117 body_range body_arm body_torso body_head body_neck body_skill 119 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 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
119)); 121));
120 122
… …
131 trigger => 10, 133 trigger => 10,
132 close => 11, 134 close => 11,
133 timer => 12, 135 timer => 12,
134); 136);
135 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
136sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
137sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 166sub MOVE_ALL (){ 0x10000 } # very special value
167
168our %MOVE_TYPE = (
169 walk => MOVE_WALK,
170 fly_low => MOVE_FLY_LOW,
171 fly_high => MOVE_FLY_HIGH,
172 flying => MOVE_FLYING,
173 swim => MOVE_SWIM,
174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
176 all => MOVE_ALL,
177);
178
179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
180
181{
182 package Deliantra::MoveType;
183
184 use overload
185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
186 '""' => \&as_string,
187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
193 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
196 'x=' => sub { # toggle between off, + and -
197 my $cur = $_[0] >= $_[1];
198 if (!defined $cur) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
202 $_[0] += $_[1];
203 }
204 } elsif ($cur) {
205 $_[0] -= $_[1];
206 } else {
207 $_[0] /= $_[1];
208 }
209
210 $_[0]
211 },
212 'eq' => sub { "$_[0]" eq "$_[1]" },
213 'ne' => sub { "$_[0]" ne "$_[1]" },
214 ;
215
216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
222 my ($class, $string) = @_;
223
224 my $mask;
225 my $value;
226
227 if ($string =~ /^\s*\d+\s*$/) {
228 $mask = MOVE_ALL;
229 $value = $string+0;
230 } else {
231 for (split /\s+/, lc $string) {
232 if (s/^-//) {
233 $mask |= $MOVE_TYPE{$_};
234 $value &= ~$MOVE_TYPE{$_};
235 } else {
236 $mask |= $MOVE_TYPE{$_};
237 $value |= $MOVE_TYPE{$_};
238 }
239 }
240 }
241
242 (bless [$mask, $value], $class)->normalise
243}
244
245sub Deliantra::MoveType::normalise {
246 my ($self) = @_;
247
248 if ($self->[0] & MOVE_ALL) {
249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
250 $self->[0] &= $mask;
251 $self->[1] &= $mask;
252 }
253
254 $self->[1] &= $self->[0];
255
256 $self
257}
258
259sub Deliantra::MoveType::as_string {
260 my ($self) = @_;
261
262 my @res;
263
264 my ($mask, $value) = @$self;
265
266 for (@Deliantra::MOVE_TYPE) {
267 my $bit = $Deliantra::MOVE_TYPE{$_};
268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
269 $mask &= ~$bit;
270 push @res, $value & $bit ? $_ : "-$_";
271 }
272 }
273
274 join " ", @res
275}
145 276
146sub load_ref($) { 277sub load_ref($) {
147 my ($path) = @_; 278 my ($path) = @_;
148 279
149 open my $fh, "<:raw:perlio", $path 280 open my $fh, "<:raw:perlio", $path
… …
199 while (my ($k, $v) = each %attack_mask) { 330 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 331 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 } 332 }
202} 333}
203 334
335my %MATERIAL = reverse
336 paper => 1,
337 iron => 2,
338 glass => 4,
339 leather => 8,
340 wood => 16,
341 organic => 32,
342 stone => 64,
343 cloth => 128,
344 adamant => 256,
345 liquid => 512,
346 tin => 1024,
347 bone => 2048,
348 ice => 4096,
349
350 # guesses
351 runestone => 12,
352 bronze => 18,
353 "ancient wood" => 20,
354 glass => 36,
355 marble => 66,
356 ice => 68,
357 stone => 70,
358 stone => 80,
359 cloth => 136,
360 ironwood => 144,
361 adamantium => 258,
362 glacium => 260,
363 blood => 544,
364;
365
204# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
205sub normalize_object($) { 367sub normalize_object($) {
206 my ($ob) = @_; 368 my ($ob) = @_;
207 369
370 delete $ob->{editable}; # deprecated
371
372 # convert material bitset to materialname, if possible
373 if (exists $ob->{material}) {
374 if (!$ob->{material}) {
375 delete $ob->{material};
376 } elsif (exists $ob->{materialname}) {
377 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
378 delete $ob->{material};
379 } else {
380 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
381 delete $ob->{material}; # assume materilname is more specific and nuke material
382 }
383 } elsif (my $name = $MATERIAL{$ob->{material}}) {
384 delete $ob->{material};
385 $ob->{materialname} = $name;
386 } else {
387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
388 }
389 }
390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
402 # color_fg is used as default for magicmap if magicmap does not exist
403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
404
208 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
209 delete @$ob{qw( 406 delete @$ob{qw(
210 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
211 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
212 )}; 409 )};
213 410
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217 414
218 # convert movement strings to bitsets 415 # convert movement strings to bitsets
219 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
220 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
221 418
222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
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 } 420 }
249 421
250 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
251 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
252 $ob->{move_block} = $v ? MOVE_ALL : 0; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
253 } 425 }
254 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
255 $ob->{move_slow} |= MOVE_WALK; 427 $ob->{move_slow} += "walk";
256 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
257 } 429 }
258 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
261 : $ob->{move_on} & ~MOVE_WALK;
262 } 432 }
263 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
266 : $ob->{move_off} & ~MOVE_WALK;
267 } 435 }
268 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
271 : $ob->{move_on} & ~MOVE_FLY_LOW;
272 } 438 }
273 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
276 : $ob->{move_off} & ~MOVE_FLY_LOW;
277 } 441 }
278 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
281 : $ob->{move_type} & ~MOVE_FLY_LOW;
282 } 444 }
283 445
284 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
302# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
303sub normalize_arch($) { 465sub normalize_arch($) {
304 my ($ob) = @_; 466 my ($ob) = @_;
305 467
306 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
307 471
308 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
309 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
310 474
311 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
347} 511}
348 512
349sub attr_thaw($) { 513sub attr_thaw($) {
350 my ($ob) = @_; 514 my ($ob) = @_;
351 515
352 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
353 if exists $ob->{attach}; 517 if exists $ob->{attach};
354 518
355 $ob 519 $ob
356} 520}
357 521
358sub attr_freeze($) { 522sub attr_freeze($) {
359 my ($ob) = @_; 523 my ($ob) = @_;
360 524
361 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
362 if exists $ob->{attach}; 526 if exists $ob->{attach};
363 527
364 $ob 528 $ob
365} 529}
366 530
… …
386 550
387 my %arc; 551 my %arc;
388 my ($more, $prev); 552 my ($more, $prev);
389 my $comment; 553 my $comment;
390 554
391 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
392 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
393 557
394# binmode $fh; 558# binmode $fh;
395 559
396 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
421 push @{ $arc{anim} }, $_; 585 push @{ $arc{anim} }, $_;
422 } 586 }
423 } elsif (/^(\S+)\s*(.*)$/) { 587 } elsif (/^(\S+)\s*(.*)$/) {
424 $arc{lc $1} = $2; 588 $arc{lc $1} = $2;
425 } elsif (/^\s*#/) { 589 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_; 590 $arc{_comment} .= "$_\n";
427 591
428 } elsif (/^\s*$/) { 592 } elsif (/^\s*$/) {
429 # 593 #
430 } else { 594 } else {
431 warn "$path: unparsable line '$_' in arch $arc{_name}"; 595 warn "$path: unparsable line '$_' in arch $arc{_name}";
… …
437 601
438 while (<$fh>) { 602 while (<$fh>) {
439 s/\s+$//; 603 s/\s+$//;
440 if (/^more$/i) { 604 if (/^more$/i) {
441 $more = $prev; 605 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
444 } elsif (/^object (\S+)$/i) { 606 } elsif (/^object (\S+)$/i) {
445 my $name = $1; 607 my $name = $1;
446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment); 608 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
609 undef $comment;
447 delete $arc{_comment} unless length $arc{_comment}; 610 delete $arc{_comment} unless length $arc{_comment};
448 $arc->{_atype} = 'object'; 611 $arc->{_atype} = 'object';
449 612
450 if ($more) { 613 if ($more) {
451 $more->{more} = $arc; 614 $more->{more} = $arc;
… …
455 $prev = $arc; 618 $prev = $arc;
456 $more = undef; 619 $more = undef;
457 } elsif (/^arch (\S+)$/i) { 620 } elsif (/^arch (\S+)$/i) {
458 my $name = $1; 621 my $name = $1;
459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment); 622 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
623 undef $comment;
460 delete $arc{_comment} unless length $arc{_comment}; 624 delete $arc{_comment} unless length $arc{_comment};
461 $arc->{_atype} = 'arch'; 625 $arc->{_atype} = 'arch';
462 626
463 if ($more) { 627 if ($more) {
464 $more->{more} = $arc; 628 $more->{more} = $arc;
… …
474 push @{$toplevel->{lev_array}}, $_+0; 638 push @{$toplevel->{lev_array}}, $_+0;
475 } 639 }
476 } else { 640 } else {
477 $toplevel->{$1} = $2; 641 $toplevel->{$1} = $2;
478 } 642 }
643 } elsif (/^\s*#/) {
644 $comment .= "$_\n";
479 } elsif (/^\s*($|#)/) { 645 } elsif (/^\s*($|#)/) {
480 # 646 #
481 } else { 647 } else {
482 die "$path: unparseable top-level line '$_'"; 648 die "$path: unparseable top-level line '$_'";
483 } 649 }
… …
494 my $str; 660 my $str;
495 661
496 my $append; $append = sub { 662 my $append; $append = sub {
497 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
498 664
499 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
500 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
501 667
502 # undo the bit-split we did before 668 # undo the bit-split we did before
503 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
504 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
505 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
506 } 672 }
507 673
674 if (my $comment = delete $a{_comment}) {
675 if ($comment =~ /[^\n\s#]/) {
676 $str .= $comment;
677 }
678 }
679
508 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 680 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
509 681
510 my $inv = delete $a{inventory}; 682 my $inv = delete $a{inventory};
511 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 683 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
512 my $anim = delete $a{anim}; 684 my $anim = delete $a{anim};
513 685
686 if ($a{_atype} eq 'object') {
687 $str .= join "\n", "anim", @$anim, "mina\n"
688 if $anim;
689 }
690
514 my @kv; 691 my @kv;
515 692
516 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
517 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
518 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
519 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
520 if exists $a{$_}; 697 if exists $a{$_};
521 } 698 }
522 699
523 for (sort keys %a) { 700 for (sort keys %a) {
… …
526 } 703 }
527 704
528 for (@kv) { 705 for (@kv) {
529 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
530 707
531 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
532 $v =~ s/\n$//; 709 $v =~ s/\n$//;
533 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
534 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
535 if ($v & ~Crossfire::MOVE_ALL or !$v) {
536 $str .= "$k $v\n";
537
538 } elsif ($v & Crossfire::MOVE_ALLBIT) {
539 $str .= "$k all";
540
541 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
542 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
543 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
544 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
545 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
546
547 $str .= "\n";
548
549 } else {
550 $str .= $k;
551
552 $str .= " walk" if $v & Crossfire::MOVE_WALK;
553 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
554 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
555 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
556 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
557
558 $str .= "\n";
559 }
560 } else { 711 } else {
561 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
562 } 713 }
563 } 714 }
564 715
565 if ($inv) { 716 if ($inv) {
566 $append->($_) for @$inv; 717 $append->($_) for @$inv;
567 } 718 }
568 719
720 $str .= "end\n";
721
569 if ($a{_atype} eq 'object') { 722 if ($a{_atype} eq 'object') {
570 $str .= join "\n", "anim", @$anim, "mina\n" 723 if ($more) {
571 if $anim;
572 }
573
574 $str .= "end\n";
575
576 if (($a{_atype} eq 'object') && $more) {
577 $str .= "\nmore\n"; 724 $str .= "more\n";
578 $append->($more) if $more; 725 $append->($more) if $more;
726 } else {
727 $str .= "\n";
728 }
579 } 729 }
580 }; 730 };
581 731
582 for (@$arch) { 732 for (@$arch) {
583 $append->($_); 733 $append->($_);
… …
659=cut 809=cut
660 810
661sub arch_attr($) { 811sub arch_attr($) {
662 my ($obj) = @_; 812 my ($obj) = @_;
663 813
664 require Crossfire::Data; 814 require Deliantra::Data;
665 815
666 my $root; 816 my $root;
667 my $attr = { }; 817 my $attr = { };
668 818
669 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
670 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
671 821
672 if ($type > 0) { 822 if ($type > 0) {
673 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
674 } else { 824 } else {
675 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
676 826
677 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
678 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
679 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
680 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
681 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
682 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
683 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
684 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
685 } else { 835 } else {
686 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
687 } 837 }
688 } 838 }
689 839
840 my (%ignore);
690 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
691 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
692 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
693 unless $type == 116; 863 unless $type == 116;
694 864
695 my (%ignore);
696 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
697 866
867 # @import = root, imported, default
698 while (my $type = shift @import) { 868 while (my $type = pop @import) {
699 push @import, @{$type->{import} || []};
700
701 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
702 for qw(name desc use); 870 for qw(name desc use);
703
704 for (@{$type->{ignore} || []}) {
705 $ignore{$_}++ for ref $_ ? @$_ : $_;
706 }
707 871
708 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
709 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
710 push @section_order, $name; 874 push @section_order, $name;
711 for (@$attr) { 875 for (@$attr) {
712 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
713 push @attr_order, $k; 877 push @attr_order, $k;
714 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
715 }
716 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
717 } 896 }
718 897
719 $attr->{section} = [ 898 $attr->{section} = [
720 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
721 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
725 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
726 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
727 @attr_order 906 @attr_order
728 ] 907 ]
729 }, 908 },
730
731 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
732 @section_order 910 @section_order
733 ]; 911 ];
734 912
735 $attr 913 $attr
736}
737
738sub arch_edit_sections {
739# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
740# edit_type = 0;
741# else if (edit_type != 0) {
742# // all flags from 'check_type' must be unset in this arch because they get recalculated now
743# edit_type &= ~check_type;
744# }
745#
746# }
747# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
748# getAttributeValue("alive", defarch) == 1 &&
749# (getAttributeValue("monster", defarch) == 1 ||
750# getAttributeValue("generator", defarch) == 1)) {
751# // Monster: monsters/npcs/generators
752# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
755# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
756# // Walls
757# edit_type |= IGUIConstants.TILE_EDIT_WALL;
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
760# getAttributeValue("connected", defarch) != 0) {
761# // Connected Objects
762# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
763# }
764# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
765# arch_type == 66 || arch_type == 41 || arch_type == 95) {
766# // Exit: teleporter/exit/trapdoors
767# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
768# }
769# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
770# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
771# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
772# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
773# arch_type == 124 || arch_type == 130)) {
774# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
775# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
776# }
777# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
778# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
779# arch_type == 91 || arch_type == 21 || arch_type == 24) {
780# // Door: door/special door/gates + keys
781# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
782# }
783# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
784# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
785# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
786# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
787# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
788# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
789# arch_type == 122 || arch_type == 3)) {
790# // Equipment: weapons/armour/wands/rods
791# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
792# }
793#
794# return(edit_type);
795#
796#
797} 914}
798 915
799sub cache_file($$&&) { 916sub cache_file($$&&) {
800 my ($src, $cache, $load, $create) = @_; 917 my ($src, $cache, $load, $create) = @_;
801 918
… …
851 }, sub { 968 }, sub {
852 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
853 }; 970 };
854} 971}
855 972
973sub construct_tilecache_pb {
974 my ($idx, $cache) = @_;
975
976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
977
978 while (my ($name, $tile) = each %$cache) {
979 my $tpb = delete $tile->{pb};
980 my $ofs = $tile->{idx};
981
982 for my $x (0 .. $tile->{w} - 1) {
983 for my $y (0 .. $tile->{h} - 1) {
984 my $idx = $ofs + $x + $y * $tile->{w};
985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
987 }
988 }
989 }
990
991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
992
993 $cache
994}
995
996sub use_tilecache {
997 my ($face) = @_;
998 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
999 or die "$VARDIR/tilecache.png: $!";
1000 *FACE = $_[0];
1001}
1002
856=item load_tilecache 1003=item load_tilecache
857 1004
858(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
859 1006
860=cut 1007=cut
861 1008
862sub load_tilecache() { 1009sub load_tilecache() {
863 require Gtk2; 1010 require Gtk2;
864 1011
865 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
866 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
867 or die "$VARDIR/tilecache.png: $!";
868 *FACE = $_[0];
869 }, sub { 1013 sub {
870 my $tile = read_pak "$LIB/crossfire.0";
871
872 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/facedata";
873 1016
1017 $facedata->{version} == 2
1018 or die "$LIB/facedata: version mismatch, cannot proceed.";
1019
1020 my $faces = $facedata->{faceinfo};
874 my $idx = 0; 1021 my $idx = 0;
875 1022
876 for my $name (sort keys %$tile) { 1023 for (sort keys %$faces) {
1024 my ($face, $info) = ($_, $faces->{$_});
1025
877 my $pb = new Gtk2::Gdk::PixbufLoader; 1026 my $pb = new Gtk2::Gdk::PixbufLoader;
878 $pb->write ($tile->{$name}); 1027 $pb->write ($info->{data32});
879 $pb->close; 1028 $pb->close;
880 my $pb = $pb->get_pixbuf; 1029 my $pb = $pb->get_pixbuf;
881 1030
882 my $tile = $cache{$name} = { 1031 my $tile = $cache{$face} = {
883 pb => $pb, 1032 pb => $pb,
884 idx => $idx, 1033 idx => $idx,
885 w => int $pb->get_width / TILESIZE, 1034 w => int $pb->get_width / TILESIZE,
886 h => int $pb->get_height / TILESIZE, 1035 h => int $pb->get_height / TILESIZE,
887 }; 1036 };
888
889 1037
890 $idx += $tile->{w} * $tile->{h}; 1038 $idx += $tile->{w} * $tile->{h};
1039 }
1040
1041 construct_tilecache_pb $idx, \%cache;
1042
1043 \%cache
891 } 1044 };
892
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
894
895 while (my ($name, $tile) = each %cache) {
896 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx};
898
899 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
904 }
905 }
906 }
907
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
909
910 \%cache
911 };
912} 1045}
1046
1047=back
913 1048
914=head1 AUTHOR 1049=head1 AUTHOR
915 1050
916 Marc Lehmann <schmorp@schmorp.de> 1051 Marc Lehmann <schmorp@schmorp.de>
917 http://home.schmorp.de/ 1052 http://home.schmorp.de/
… …
920 http://www.ta-sa.org/ 1055 http://www.ta-sa.org/
921 1056
922=cut 1057=cut
923 1058
9241 10591
1060

Diff Legend

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