[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.52 by root, Mon Mar 20 02:15:36 2006 UTC vs.
Revision 1.83 by root, Wed Feb 7 00:14:48 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.52 by root, Mon Mar 20 02:15:36 2006 UTC vs. Revision 1.83 by root, Wed Feb 7 00:14:48 2007 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.52 by root, Mon Mar 20 02:15:36 2006 UTC vs.
Revision 1.83 by root, Wed Feb 7 00:14:48 2007 UTC