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.70 by root, Sun Aug 27 16:33:19 2006 UTC vs.
Revision 1.139 by root, Tue Dec 22 09:52:36 2009 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.9'; 11our $VERSION = '1.29';
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" : File::Spec->tmpdir . "/crossfire"; 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
35 : File::Spec->tmpdir . "/deliantra";
39 36
40mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
41 38
42sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
43 41
44our %ARCH; 42our %ARCH;
43our %FACE; # face32
45our %FACE; 44our %FACEDATA;
46our $TILE; 45our $TILE;
47 46
48our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
49 msg => "endmsg", 48 msg => "endmsg",
50 lore => "endlore", 49 lore => "endlore",
… …
56 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);
57 56
58# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 58# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
60 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
64 unique template 64 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
66 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
67)); 67));
68 68
69our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
70 elevation 72 elevation
71 73
72 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
74 #todo-events 76 sound sound_destroy face animation is_animated
75 animation is_animated 77 magicmap smoothlevel smoothface
76 str dex con wis pow cha int 78 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul 80 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
88 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
89 91
90 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic 93 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
94 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range 98 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll 111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
114 117
115 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117)); 120));
118 121
… …
135sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
136sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
175 'x=' => sub { # toggle between off, + and -
176 my $cur = $_[0] >= $_[1];
177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] += $_[1];
182 }
183 } elsif ($cur) {
184 $_[0] -= $_[1];
185 } else {
186 $_[0] /= $_[1];
187 }
188
189 $_[0]
190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
193 ;
194
195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
201 my ($class, $string) = @_;
202
203 my $mask;
204 my $value;
205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
210 for (split /\s+/, lc $string) {
211 if (s/^-//) {
212 $mask |= $MOVE_TYPE{$_};
213 $value &= ~$MOVE_TYPE{$_};
214 } else {
215 $mask |= $MOVE_TYPE{$_};
216 $value |= $MOVE_TYPE{$_};
217 }
218 }
219 }
220
221 (bless [$mask, $value], $class)->normalise
222}
223
224sub Deliantra::MoveType::normalise {
225 my ($self) = @_;
226
227 if ($self->[0] & MOVE_ALL) {
228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
229 $self->[0] &= $mask;
230 $self->[1] &= $mask;
231 }
232
233 $self->[1] &= $self->[0];
234
235 $self
236}
237
238sub Deliantra::MoveType::as_string {
239 my ($self) = @_;
240
241 my @res;
242
243 my ($mask, $value) = @$self;
244
245 for (@Deliantra::MOVE_TYPE) {
246 my $bit = $Deliantra::MOVE_TYPE{$_};
247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
248 $mask &= ~$bit;
249 push @res, $value & $bit ? $_ : "-$_";
250 }
251 }
252
253 join " ", @res
254}
143 255
144sub load_ref($) { 256sub load_ref($) {
145 my ($path) = @_; 257 my ($path) = @_;
146 258
147 open my $fh, "<:raw:perlio", $path 259 open my $fh, "<:raw:perlio", $path
… …
160 close $fh; 272 close $fh;
161 rename "$path~", $path 273 rename "$path~", $path
162 or die "$path: $!"; 274 or die "$path: $!";
163} 275}
164 276
277my %attack_mask = (
278 physical => 0x00000001,
279 magic => 0x00000002,
280 fire => 0x00000004,
281 electricity => 0x00000008,
282 cold => 0x00000010,
283 confusion => 0x00000020,
284 acid => 0x00000040,
285 drain => 0x00000080,
286 weaponmagic => 0x00000100,
287 ghosthit => 0x00000200,
288 poison => 0x00000400,
289 slow => 0x00000800,
290 paralyze => 0x00001000,
291 turn_undead => 0x00002000,
292 fear => 0x00004000,
293 cancellation => 0x00008000,
294 deplete => 0x00010000,
295 death => 0x00020000,
296 chaos => 0x00040000,
297 counterspell => 0x00080000,
298 godpower => 0x00100000,
299 holyword => 0x00200000,
300 blind => 0x00400000,
301 internal => 0x00800000,
302 life_stealing => 0x01000000,
303 disease => 0x02000000,
304);
305
306sub _add_resist($$$) {
307 my ($ob, $mask, $value) = @_;
308
309 while (my ($k, $v) = each %attack_mask) {
310 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
311 }
312}
313
314my %MATERIAL = reverse
315 paper => 1,
316 iron => 2,
317 glass => 4,
318 leather => 8,
319 wood => 16,
320 organic => 32,
321 stone => 64,
322 cloth => 128,
323 adamant => 256,
324 liquid => 512,
325 tin => 1024,
326 bone => 2048,
327 ice => 4096,
328
329 # guesses
330 runestone => 12,
331 bronze => 18,
332 "ancient wood" => 20,
333 glass => 36,
334 marble => 66,
335 ice => 68,
336 stone => 70,
337 stone => 80,
338 cloth => 136,
339 ironwood => 144,
340 adamantium => 258,
341 glacium => 260,
342 blood => 544,
343;
344
165# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 346sub normalize_object($) {
167 my ($ob) = @_; 347 my ($ob) = @_;
168 348
349 delete $ob->{editable}; # deprecated
350
351 # convert material bitset to materialname, if possible
352 if (exists $ob->{material}) {
353 if (!$ob->{material}) {
354 delete $ob->{material};
355 } elsif (exists $ob->{materialname}) {
356 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
357 delete $ob->{material};
358 } else {
359 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
360 delete $ob->{material}; # assume materilname is more specific and nuke material
361 }
362 } elsif (my $name = $MATERIAL{$ob->{material}}) {
363 delete $ob->{material};
364 $ob->{materialname} = $name;
365 } else {
366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
367 }
368 }
369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
383
169 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 385 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
173 ); 388 )};
389
390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 393
175 # convert movement strings to bitsets 394 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
178 397
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
180
181 next if $ob->{$attr} =~ /^\d+$/;
182
183 my $flags = 0;
184
185 # assume list
186 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
187 $flags |= MOVE_WALK if $flag eq "walk";
188 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
189 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
190 $flags |= MOVE_FLYING if $flag eq "flying";
191 $flags |= MOVE_SWIM if $flag eq "swim";
192 $flags |= MOVE_BOAT if $flag eq "boat";
193 $flags |= MOVE_ALL if $flag eq "all";
194
195 $flags &= ~MOVE_WALK if $flag eq "-walk";
196 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
197 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
198 $flags &= ~MOVE_FLYING if $flag eq "-flying";
199 $flags &= ~MOVE_SWIM if $flag eq "-swim";
200 $flags &= ~MOVE_BOAT if $flag eq "-boat";
201 $flags &= ~MOVE_ALL if $flag eq "-all";
202 }
203
204 $ob->{$attr} = $flags;
205 } 399 }
206 400
207 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
208 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
209 $ob->{move_block} = $v ? MOVE_ALL : 0; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
210 } 404 }
211 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK; 406 $ob->{move_slow} += "walk";
213 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
214 } 408 }
215 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK;
219 } 411 }
220 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK;
224 } 414 }
225 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 } 417 }
230 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 } 420 }
235 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 } 423 }
240 424
241 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
248 name => delete $ob->{"event_${event}_options"}, 432 name => delete $ob->{"event_${event}_options"},
249 }; 433 };
250 } 434 }
251 } 435 }
252 436
437 # some archetypes had "+3" instead of the canonical "3", so fix
438 $ob->{dam} *= 1 if exists $ob->{dam};
439
253 $ob 440 $ob
254} 441}
255 442
256# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
257sub normalize_arch($) { 444sub normalize_arch($) {
258 my ($ob) = @_; 445 my ($ob) = @_;
259 446
260 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
261 450
262 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
263 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
264 453
265 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
301} 490}
302 491
303sub attr_thaw($) { 492sub attr_thaw($) {
304 my ($ob) = @_; 493 my ($ob) = @_;
305 494
306 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
307 if exists $ob->{attach}; 496 if exists $ob->{attach};
308 497
309 $ob 498 $ob
310} 499}
311 500
312sub attr_freeze($) { 501sub attr_freeze($) {
313 my ($ob) = @_; 502 my ($ob) = @_;
314 503
315 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
316 if exists $ob->{attach}; 505 if exists $ob->{attach};
317 506
318 $ob 507 $ob
319} 508}
320 509
… …
338sub read_arch($;$) { 527sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 528 my ($path, $toplevel) = @_;
340 529
341 my %arc; 530 my %arc;
342 my ($more, $prev); 531 my ($more, $prev);
532 my $comment;
343 533
344 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
345 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
346 536
347# binmode $fh; 537# binmode $fh;
348 538
349 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
351 541
352 while (<$fh>) { 542 while (<$fh>) {
353 s/\s+$//; 543 s/\s+$//;
354 if (/^end$/i) { 544 if (/^end$/i) {
355 last; 545 last;
546
356 } elsif (/^arch (\S+)$/i) { 547 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 548 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
549
358 } elsif (/^lore$/i) { 550 } elsif (/^lore$/i) {
359 while (<$fh>) { 551 while (<$fh>) {
360 last if /^endlore\s*$/i; 552 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 553 $arc{lore} .= $_;
362 } 554 }
… …
371 chomp; 563 chomp;
372 push @{ $arc{anim} }, $_; 564 push @{ $arc{anim} }, $_;
373 } 565 }
374 } elsif (/^(\S+)\s*(.*)$/) { 566 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 567 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 568 } elsif (/^\s*#/) {
569 $arc{_comment} .= "$_\n";
570
571 } elsif (/^\s*$/) {
377 # 572 #
378 } else { 573 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 574 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 575 }
381 } 576 }
… …
387 s/\s+$//; 582 s/\s+$//;
388 if (/^more$/i) { 583 if (/^more$/i) {
389 $more = $prev; 584 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 585 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 586 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 587 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
588 undef $comment;
589 delete $arc{_comment} unless length $arc{_comment};
590 $arc->{_atype} = 'object';
393 591
394 if ($more) { 592 if ($more) {
395 $more->{more} = $arc; 593 $more->{more} = $arc;
396 } else { 594 } else {
397 $arc{$name} = $arc; 595 $arc{$name} = $arc;
398 } 596 }
399 $prev = $arc; 597 $prev = $arc;
400 $more = undef; 598 $more = undef;
401 } elsif (/^arch (\S+)$/i) { 599 } elsif (/^arch (\S+)$/i) {
402 my $name = $1; 600 my $name = $1;
403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 601 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
602 undef $comment;
603 delete $arc{_comment} unless length $arc{_comment};
604 $arc->{_atype} = 'arch';
404 605
405 if ($more) { 606 if ($more) {
406 $more->{more} = $arc; 607 $more->{more} = $arc;
407 } else { 608 } else {
408 push @{ $arc{arch} }, $arc; 609 push @{ $arc{arch} }, $arc;
… …
416 push @{$toplevel->{lev_array}}, $_+0; 617 push @{$toplevel->{lev_array}}, $_+0;
417 } 618 }
418 } else { 619 } else {
419 $toplevel->{$1} = $2; 620 $toplevel->{$1} = $2;
420 } 621 }
622 } elsif (/^\s*#/) {
623 $comment .= "$_\n";
421 } elsif (/^\s*($|#)/) { 624 } elsif (/^\s*($|#)/) {
422 # 625 #
423 } else { 626 } else {
424 die "$path: unparseable top-level line '$_'"; 627 die "$path: unparseable top-level line '$_'";
425 } 628 }
426 } 629 }
427 630
428 undef $parse_block; # work around bug in perl not freeing $fh etc. 631 undef $parse_block; # work around bug in perl not freeing $fh etc.
429 632
430 \%arc 633 \%arc
634}
635
636sub archlist_to_string {
637 my ($arch) = @_;
638
639 my $str;
640
641 my $append; $append = sub {
642 my %a = %{$_[0]};
643
644 Deliantra::attr_freeze \%a;
645 Deliantra::normalize_arch \%a;
646
647 # undo the bit-split we did before
648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
650 | (delete $a{attack_movement_bits_4_7});
651 }
652
653 if (my $comment = delete $a{_comment}) {
654 if ($comment =~ /[^\n\s#]/) {
655 $str .= $comment;
656 }
657 }
658
659 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
660
661 my $inv = delete $a{inventory};
662 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
663 my $anim = delete $a{anim};
664
665 if ($a{_atype} eq 'object') {
666 $str .= join "\n", "anim", @$anim, "mina\n"
667 if $anim;
668 }
669
670 my @kv;
671
672 for ($a{_name} eq "map"
673 ? @Deliantra::FIELD_ORDER_MAP
674 : @Deliantra::FIELD_ORDER) {
675 push @kv, [$_, delete $a{$_}]
676 if exists $a{$_};
677 }
678
679 for (sort keys %a) {
680 next if /^_/; # ignore our _-keys
681 push @kv, [$_, delete $a{$_}];
682 }
683
684 for (@kv) {
685 my ($k, $v) = @$_;
686
687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
688 $v =~ s/\n$//;
689 $str .= "$k\n$v\n$end\n";
690 } else {
691 $str .= "$k $v\n";
692 }
693 }
694
695 if ($inv) {
696 $append->($_) for @$inv;
697 }
698
699 $str .= "end\n";
700
701 if ($a{_atype} eq 'object') {
702 if ($more) {
703 $str .= "more\n";
704 $append->($more) if $more;
705 } else {
706 $str .= "\n";
707 }
708 }
709 };
710
711 for (@$arch) {
712 $append->($_);
713 }
714
715 $str
431} 716}
432 717
433# put all archs into a hash with editor_face as it's key 718# put all archs into a hash with editor_face as it's key
434# NOTE: the arrays in the hash values are references to 719# NOTE: the arrays in the hash values are references to
435# the archs from $ARCH 720# the archs from $ARCH
… …
456 my ($a) = @_; 741 my ($a) = @_;
457 742
458 my $o = $ARCH{$a->{_name}} 743 my $o = $ARCH{$a->{_name}}
459 or return; 744 or return;
460 745
461 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 746 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
747 unless ($face) {
748 $face = $FACE{"blank.x11"}
462 or (warn "no face data found for arch '$a->{_name}'"), return; 749 or (warn "no face data found for arch '$a->{_name}'"), return;
750 }
463 751
464 if ($face->{w} > 1 || $face->{h} > 1) { 752 if ($face->{w} > 1 || $face->{h} > 1) {
465 # bigface 753 # bigface
466 return (0, 0, $face->{w} - 1, $face->{h} - 1); 754 return (0, 0, $face->{w} - 1, $face->{h} - 1);
467 755
… …
500=cut 788=cut
501 789
502sub arch_attr($) { 790sub arch_attr($) {
503 my ($obj) = @_; 791 my ($obj) = @_;
504 792
505 require Crossfire::Data; 793 require Deliantra::Data;
506 794
507 my $root; 795 my $root;
508 my $attr = { }; 796 my $attr = { };
509 797
510 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
511 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
512 800
513 if ($type > 0) { 801 if ($type > 0) {
514 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
515 } else { 803 } else {
516 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
517 805
518 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
519 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
520 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
521 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
522 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
523 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
524 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
525 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
526 } else { 814 } else {
527 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
528 } 816 }
529 } 817 }
530 818
531 my @import = ($root); 819 my @import = ($root);
532 820
533 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
534 unless $type == 116; 822 unless $type == 116;
535 823
536 my (%ignore); 824 my (%ignore);
537 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
538 826
539 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
540 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
541 832
542 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
543 for qw(name desc use); 834 for qw(name desc use);
544 835
545 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
555 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
556 } 847 }
557 } 848 }
558 } 849 }
559 850
851 # remove ignores for "root" type
852 for (map @{$_->[1]}, # section attributes
853 [general => ($root->{attr} || [])],
854 @{$root->{section} || []})
855 {
856 my ($k, $v) = @$_;
857 # skip fixed attributes, if they are ignored thats fine
858 next if $v->{type} eq 'fixed';
859
860 delete $ignore{$k}; # if the attributes are defined explicitly they
861 # should NOT be ignored. ignore should mainly
862 # hit imported/inherited attributes.
863 }
864
560 $attr->{section} = [ 865 $attr->{section} = [
561 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
562 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
563 868
564 [ 869 [
… …
566 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
567 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
568 @attr_order 873 @attr_order
569 ] 874 ]
570 }, 875 },
571
572 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
573 @section_order 877 @section_order
574 ]; 878 ];
575 879
576 $attr 880 $attr
577}
578
579sub arch_edit_sections {
580# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
581# edit_type = 0;
582# else if (edit_type != 0) {
583# // all flags from 'check_type' must be unset in this arch because they get recalculated now
584# edit_type &= ~check_type;
585# }
586#
587# }
588# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
589# getAttributeValue("alive", defarch) == 1 &&
590# (getAttributeValue("monster", defarch) == 1 ||
591# getAttributeValue("generator", defarch) == 1)) {
592# // Monster: monsters/npcs/generators
593# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
594# }
595# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
596# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
597# // Walls
598# edit_type |= IGUIConstants.TILE_EDIT_WALL;
599# }
600# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
601# getAttributeValue("connected", defarch) != 0) {
602# // Connected Objects
603# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
604# }
605# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
606# arch_type == 66 || arch_type == 41 || arch_type == 95) {
607# // Exit: teleporter/exit/trapdoors
608# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
609# }
610# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
611# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
612# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
613# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
614# arch_type == 124 || arch_type == 130)) {
615# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
616# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
617# }
618# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
619# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
620# arch_type == 91 || arch_type == 21 || arch_type == 24) {
621# // Door: door/special door/gates + keys
622# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
623# }
624# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
625# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
626# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
627# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
628# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
629# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
630# arch_type == 122 || arch_type == 3)) {
631# // Equipment: weapons/armour/wands/rods
632# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
633# }
634#
635# return(edit_type);
636#
637#
638} 881}
639 882
640sub cache_file($$&&) { 883sub cache_file($$&&) {
641 my ($src, $cache, $load, $create) = @_; 884 my ($src, $cache, $load, $create) = @_;
642 885
… …
692 }, sub { 935 }, sub {
693 read_arch "$LIB/archetypes" 936 read_arch "$LIB/archetypes"
694 }; 937 };
695} 938}
696 939
940sub construct_tilecache_pb {
941 my ($idx, $cache) = @_;
942
943 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
944
945 while (my ($name, $tile) = each %$cache) {
946 my $tpb = delete $tile->{pb};
947 my $ofs = $tile->{idx};
948
949 for my $x (0 .. $tile->{w} - 1) {
950 for my $y (0 .. $tile->{h} - 1) {
951 my $idx = $ofs + $x + $y * $tile->{w};
952 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
953 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
954 }
955 }
956 }
957
958 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
959
960 $cache
961}
962
963sub use_tilecache {
964 my ($face) = @_;
965 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
966 or die "$VARDIR/tilecache.png: $!";
967 *FACE = $_[0];
968}
969
697=item load_tilecache 970=item load_tilecache
698 971
699(Re-)Load %TILE and %FACE. 972(Re-)Load %TILE and %FACE.
700 973
701=cut 974=cut
702 975
703sub load_tilecache() { 976sub load_tilecache() {
704 require Gtk2; 977 require Gtk2;
705 978
706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 979 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
708 or die "$VARDIR/tilecache.png: $!";
709 *FACE = $_[0];
710 }, sub { 980 sub {
711 my $tile = read_pak "$LIB/crossfire.0";
712
713 my %cache; 981 my %cache;
982 my $facedata = Storable::retrieve "$LIB/facedata";
714 983
984 $facedata->{version} == 2
985 or die "$LIB/facedata: version mismatch, cannot proceed.";
986
987 my $faces = $facedata->{faceinfo};
715 my $idx = 0; 988 my $idx = 0;
716 989
717 for my $name (sort keys %$tile) { 990 for (sort keys %$faces) {
991 my ($face, $info) = ($_, $faces->{$_});
992
718 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
719 $pb->write ($tile->{$name}); 994 $pb->write ($info->{data32});
720 $pb->close; 995 $pb->close;
721 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
722 997
723 my $tile = $cache{$name} = { 998 my $tile = $cache{$face} = {
724 pb => $pb, 999 pb => $pb,
725 idx => $idx, 1000 idx => $idx,
726 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
727 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
728 }; 1003 };
729
730 1004
731 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
1006 }
1007
1008 construct_tilecache_pb $idx, \%cache;
1009
1010 \%cache
732 } 1011 };
733
734 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
735
736 while (my ($name, $tile) = each %cache) {
737 my $tpb = delete $tile->{pb};
738 my $ofs = $tile->{idx};
739
740 for my $x (0 .. $tile->{w} - 1) {
741 for my $y (0 .. $tile->{h} - 1) {
742 my $idx = $ofs + $x + $y * $tile->{w};
743 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
745 }
746 }
747 }
748
749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
750
751 \%cache
752 };
753} 1012}
1013
1014=back
754 1015
755=head1 AUTHOR 1016=head1 AUTHOR
756 1017
757 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
758 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
761 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
762 1023
763=cut 1024=cut
764 1025
7651 10261
1027

Diff Legend

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