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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.53 by root, Wed Mar 22 03:32:09 2006 UTC vs.
Revision 1.84 by root, Wed Feb 7 00:22:34 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
…		…
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	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 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	glacium => 260,
		231	blood => 544,
		232	;
		233
		234	# object as in "Object xxx", i.e. archetypes
76	sub normalize_object($) {	235	sub normalize_object($) {
77	my ($ob) = @_;	236	my ($ob) = @_;
78		237
		238	# convert material bitset to materialname, if possible
		239	if (exists $ob->{material}) {
		240	if (!$ob->{material}) {
		241	delete $ob->{material};
		242	} elsif (exists $ob->{materialname}) {
		243	if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
		244	delete $ob->{material};
		245	} else {
		246	warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
		247	delete $ob->{material}; # assume materilname is more specific and nuke material
		248	}
		249	} elsif (my $name = $MATERIAL{$ob->{material}}) {
		250	delete $ob->{material};
		251	$ob->{materialname} = $name;
		252	} else {
		253	warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
		254	}
		255	}
		256
		257	# nuke outdated or never supported fields
79	delete $ob->{$_} for qw(	258	delete @$ob{qw(
80	can_knockback can_parry can_impale can_cut can_dam_armour	259	can_knockback can_parry can_impale can_cut can_dam_armour
81	can_apply pass_thru can_pass_thru	260	can_apply pass_thru can_pass_thru
82	);	261	)};
83		262
84	for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {	263	if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
		264	if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
		265	if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
		266
		267	# convert movement strings to bitsets
		268	for my $attr (keys %FIELD_MOVEMENT) {
85	next unless exists $ob->{$attr};	269	next unless exists $ob->{$attr};
		270
		271	$ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
		272
86	next if $ob->{$attr} =~ /^\d+$/;	273	next if $ob->{$attr} =~ /^\d+$/;
87		274
88	my $flags = 0;	275	my $flags = 0;
89		276
90	# assume list	277	# assume list
…		…
107	}	294	}
108		295
109	$ob->{$attr} = $flags;	296	$ob->{$attr} = $flags;
110	}	297	}
111		298
		299	# convert outdated movement flags to new movement sets
112	if (defined (my $v = delete $ob->{no_pass})) {	300	if (defined (my $v = delete $ob->{no_pass})) {
113	$ob->{move_block} = $v ? MOVE_ALL : 0;	301	$ob->{move_block} = $v ? MOVE_ALL : 0;
114	}	302	}
115	if (defined (my $v = delete $ob->{slow_move})) {	303	if (defined (my $v = delete $ob->{slow_move})) {
116	$ob->{move_slow} \|= MOVE_WALK;	304	$ob->{move_slow} \|= MOVE_WALK;
117	$ob->{move_slow_penalty} = $v;	305	$ob->{move_slow_penalty} = $v;
118	}	306	}
119	if (defined (my $v = delete $ob->{walk_on})) {	307	if (defined (my $v = delete $ob->{walk_on})) {
		308	$ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
120	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_WALK	309	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_WALK
121	: $ob->{move_on} & ~MOVE_WALK;	310	: $ob->{move_on} & ~MOVE_WALK;
122	}	311	}
123	if (defined (my $v = delete $ob->{walk_off})) {	312	if (defined (my $v = delete $ob->{walk_off})) {
		313	$ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
124	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_WALK	314	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_WALK
125	: $ob->{move_off} & ~MOVE_WALK;	315	: $ob->{move_off} & ~MOVE_WALK;
126	}	316	}
127	if (defined (my $v = delete $ob->{fly_on})) {	317	if (defined (my $v = delete $ob->{fly_on})) {
		318	$ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
128	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_FLY_LOW	319	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_FLY_LOW
129	: $ob->{move_on} & ~MOVE_FLY_LOW;	320	: $ob->{move_on} & ~MOVE_FLY_LOW;
130	}	321	}
131	if (defined (my $v = delete $ob->{fly_off})) {	322	if (defined (my $v = delete $ob->{fly_off})) {
		323	$ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
132	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_FLY_LOW	324	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_FLY_LOW
133	: $ob->{move_off} & ~MOVE_FLY_LOW;	325	: $ob->{move_off} & ~MOVE_FLY_LOW;
134	}	326	}
135	if (defined (my $v = delete $ob->{flying})) {	327	if (defined (my $v = delete $ob->{flying})) {
		328	$ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
136	$ob->{move_type} = $v ? $ob->{move_type} \| MOVE_FLY_LOW	329	$ob->{move_type} = $v ? $ob->{move_type} \| MOVE_FLY_LOW
137	: $ob->{move_type} & ~MOVE_FLY_LOW;	330	: $ob->{move_type} & ~MOVE_FLY_LOW;
138	}	331	}
139		332
		333	# convert idiotic event_xxx things into objects
		334	while (my ($event, $subtype) = each %EVENT_TYPE) {
		335	if (exists $ob->{"event_${event}_plugin"}) {
		336	push @{$ob->{inventory}}, {
		337	_name => "event_$event",
		338	title => delete $ob->{"event_${event}_plugin"},
		339	slaying => delete $ob->{"event_${event}"},
		340	name => delete $ob->{"event_${event}_options"},
		341	};
		342	}
		343	}
		344
		345	# some archetypes had "+3" instead of the canonical "3", so fix
		346	$ob->{dam} *= 1 if exists $ob->{dam};
		347
140	$ob	348	$ob
141	}	349	}
142		350
		351	# arch as in "arch xxx", ie.. objects
143	sub normalize_arch($) {	352	sub normalize_arch($) {
144	my ($ob) = @_;	353	my ($ob) = @_;
145		354
146	normalize_object $ob;	355	normalize_object $ob;
147		356
…		…
174	delete $ob->{$k};	383	delete $ob->{$k};
175	}	384	}
176	}	385	}
177	}	386	}
178		387
		388	# a speciality for the editor
		389	if (exists $ob->{attack_movement}) {
		390	my $am = delete $ob->{attack_movement};
		391	$ob->{attack_movement_bits_0_3} = $am & 15;
		392	$ob->{attack_movement_bits_4_7} = $am & 240;
		393	}
		394
		395	$ob
		396	}
		397
		398	sub attr_thaw($) {
		399	my ($ob) = @_;
		400
		401	$ob->{attach} = from_json $ob->{attach}
		402	if exists $ob->{attach};
		403
		404	$ob
		405	}
		406
		407	sub attr_freeze($) {
		408	my ($ob) = @_;
		409
		410	$ob->{attach} = Crossfire::to_json $ob->{attach}
		411	if exists $ob->{attach};
		412
179	$ob	413	$ob
180	}	414	}
181		415
182	sub read_pak($) {	416	sub read_pak($) {
183	my ($path) = @_;	417	my ($path) = @_;
184		418
185	my %pak;	419	my %pak;
186		420
187	open my $fh, "<", $path	421	open my $fh, "<:raw:perlio", $path
188	or Carp::croak "$_[0]: $!";	422	or Carp::croak "$_[0]: $!";
189	binmode $fh;	423	binmode $fh;
190	while (<$fh>) {	424	while (<$fh>) {
191	my ($type, $id, $len, $path) = split;	425	my ($type, $id, $len, $path) = split;
192	$path =~ s/.*\///;	426	$path =~ s/.*\///;
…		…
194	}	428	}
195		429
196	\%pak	430	\%pak
197	}	431	}
198		432
199	sub read_arch($) {	433	sub read_arch($;$) {
200	my ($path) = @_;	434	my ($path, $toplevel) = @_;
201		435
202	my %arc;	436	my %arc;
203	my ($more, $prev);	437	my ($more, $prev);
		438	my $comment;
204		439
205	open my $fh, "<", $path	440	open my $fh, "<:raw:perlio:utf8", $path
206	or Carp::croak "$path: $!";	441	or Carp::croak "$path: $!";
207		442
208	binmode $fh;	443	# binmode $fh;
209		444
210	my $parse_block; $parse_block = sub {	445	my $parse_block; $parse_block = sub {
211	my %arc = @_;	446	my %arc = @_;
212		447
213	while (<$fh>) {	448	while (<$fh>) {
214	s/\s+$//;	449	s/\s+$//;
215	if (/^end$/i) {	450	if (/^end$/i) {
216	last;	451	last;
		452
217	} elsif (/^arch (\S+)$/) {	453	} elsif (/^arch (\S+)$/i) {
218	push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);	454	push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
		455
219	} elsif (/^lore$/) {	456	} elsif (/^lore$/i) {
220	while (<$fh>) {	457	while (<$fh>) {
221	last if /^endlore\s*$/i;	458	last if /^endlore\s*$/i;
222	$arc{lore} .= $_;	459	$arc{lore} .= $_;
223	}	460	}
224	} elsif (/^msg$/) {	461	} elsif (/^msg$/i) {
225	while (<$fh>) {	462	while (<$fh>) {
226	last if /^endmsg\s*$/i;	463	last if /^endmsg\s*$/i;
227	$arc{msg} .= $_;	464	$arc{msg} .= $_;
228	}	465	}
		466	} elsif (/^anim$/i) {
		467	while (<$fh>) {
		468	last if /^mina\s*$/i;
		469	chomp;
		470	push @{ $arc{anim} }, $_;
		471	}
229	} elsif (/^(\S+)\s(.)$/) {	472	} elsif (/^(\S+)\s(.)$/) {
230	$arc{lc $1} = $2;	473	$arc{lc $1} = $2;
231	} elsif (/^\s*($\|#)/) {	474	} elsif (/^\s*#/) {
		475	$arc{_comment} .= "$_\n";
		476
		477	} elsif (/^\s*$/) {
232	#	478	#
233	} else {	479	} else {
234	warn "$path: unparsable line '$_' in arch $arc{_name}";	480	warn "$path: unparsable line '$_' in arch $arc{_name}";
235	}	481	}
236	}	482	}
…		…
242	s/\s+$//;	488	s/\s+$//;
243	if (/^more$/i) {	489	if (/^more$/i) {
244	$more = $prev;	490	$more = $prev;
245	} elsif (/^object (\S+)$/i) {	491	} elsif (/^object (\S+)$/i) {
246	my $name = $1;	492	my $name = $1;
247	my $arc = normalize_object $parse_block->(_name => $name);	493	my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
		494	undef $comment;
		495	delete $arc{_comment} unless length $arc{_comment};
		496	$arc->{_atype} = 'object';
248		497
249	if ($more) {	498	if ($more) {
250	$more->{more} = $arc;	499	$more->{more} = $arc;
251	} else {	500	} else {
252	$arc{$name} = $arc;	501	$arc{$name} = $arc;
253	}	502	}
254	$prev = $arc;	503	$prev = $arc;
255	$more = undef;	504	$more = undef;
256	} elsif (/^arch (\S+)$/i) {	505	} elsif (/^arch (\S+)$/i) {
257	push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1);	506	my $name = $1;
		507	my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
		508	undef $comment;
		509	delete $arc{_comment} unless length $arc{_comment};
		510	$arc->{_atype} = 'arch';
		511
		512	if ($more) {
		513	$more->{more} = $arc;
		514	} else {
		515	push @{ $arc{arch} }, $arc;
		516	}
		517	$prev = $arc;
		518	$more = undef;
		519	} elsif ($toplevel && /^(\S+)\s+(.*)$/) {
		520	if ($1 eq "lev_array") {
		521	while (<$fh>) {
		522	last if /^endplst\s*$/;
		523	push @{$toplevel->{lev_array}}, $_+0;
		524	}
		525	} else {
		526	$toplevel->{$1} = $2;
		527	}
		528	} elsif (/^\s*#/) {
		529	$comment .= "$_\n";
258	} elsif (/^\s*($\|#)/) {	530	} elsif (/^\s*($\|#)/) {
259	#	531	#
260	} else {	532	} else {
261	warn "$path: unparseable top-level line '$_'";	533	die "$path: unparseable top-level line '$_'";
262	}	534	}
263	}	535	}
264		536
265	undef $parse_block; # work around bug in perl not freeing $fh etc.	537	undef $parse_block; # work around bug in perl not freeing $fh etc.
266		538
267	\%arc	539	\%arc
		540	}
		541
		542	sub archlist_to_string {
		543	my ($arch) = @_;
		544
		545	my $str;
		546
		547	my $append; $append = sub {
		548	my %a = %{$_[0]};
		549
		550	Crossfire::attr_freeze \%a;
		551	Crossfire::normalize_arch \%a;
		552
		553	# undo the bit-split we did before
		554	if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
		555	$a{attack_movement} = (delete $a{attack_movement_bits_0_3})
		556	\| (delete $a{attack_movement_bits_4_7});
		557	}
		558
		559	if (my $comment = delete $a{_comment}) {
		560	if ($comment =~ /[^\n\s#]/) {
		561	$str .= $comment;
		562	}
		563	}
		564
		565	$str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
		566
		567	my $inv = delete $a{inventory};
		568	my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
		569	my $anim = delete $a{anim};
		570
		571	my @kv;
		572
		573	for ($a{_name} eq "map"
		574	? @Crossfire::FIELD_ORDER_MAP
		575	: @Crossfire::FIELD_ORDER) {
		576	push @kv, [$_, delete $a{$_}]
		577	if exists $a{$_};
		578	}
		579
		580	for (sort keys %a) {
		581	next if /^_/; # ignore our _-keys
		582	push @kv, [$_, delete $a{$_}];
		583	}
		584
		585	for (@kv) {
		586	my ($k, $v) = @$_;
		587
		588	if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
		589	$v =~ s/\n$//;
		590	$str .= "$k\n$v\n$end\n";
		591	} elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
		592	if ($v & ~Crossfire::MOVE_ALL or !$v) {
		593	$str .= "$k $v\n";
		594
		595	} elsif ($v & Crossfire::MOVE_ALLBIT) {
		596	$str .= "$k all";
		597
		598	$str .= " -walk" unless $v & Crossfire::MOVE_WALK;
		599	$str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
		600	$str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
		601	$str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
		602	$str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
		603
		604	$str .= "\n";
		605
		606	} else {
		607	$str .= $k;
		608
		609	$str .= " walk" if $v & Crossfire::MOVE_WALK;
		610	$str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
		611	$str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
		612	$str .= " swim" if $v & Crossfire::MOVE_SWIM;
		613	$str .= " boat" if $v & Crossfire::MOVE_BOAT;
		614
		615	$str .= "\n";
		616	}
		617	} else {
		618	$str .= "$k $v\n";
		619	}
		620	}
		621
		622	if ($inv) {
		623	$append->($_) for @$inv;
		624	}
		625
		626	if ($a{_atype} eq 'object') {
		627	$str .= join "\n", "anim", @$anim, "mina\n"
		628	if $anim;
		629	}
		630
		631	$str .= "end\n";
		632
		633	if ($a{_atype} eq 'object') {
		634	if ($more) {
		635	$str .= "more\n";
		636	$append->($more) if $more;
		637	} else {
		638	$str .= "\n";
		639	}
		640	}
		641	};
		642
		643	for (@$arch) {
		644	$append->($_);
		645	}
		646
		647	$str
268	}	648	}
269		649
270	# put all archs into a hash with editor_face as it's key	650	# put all archs into a hash with editor_face as it's key
271	# NOTE: the arrays in the hash values are references to	651	# NOTE: the arrays in the hash values are references to
272	# the archs from $ARCH	652	# the archs from $ARCH
273	sub editor_archs {	653	sub editor_archs {
274	my %paths;	654	my %paths;
275		655
276	for (keys %ARCH) {	656	for (keys %ARCH) {
277	my $arch = $ARCH{$_};	657	my $arch = $ARCH{$_};
278	push @{$paths{$arch->{editor_folder}}}, \$arch;	658	push @{$paths{$arch->{editor_folder}}}, $arch;
279	}	659	}
280		660
281	\%paths	661	\%paths
282	}	662	}
283		663
…		…
293	my ($a) = @_;	673	my ($a) = @_;
294		674
295	my $o = $ARCH{$a->{_name}}	675	my $o = $ARCH{$a->{_name}}
296	or return;	676	or return;
297		677
298	my $face = $FACE{$a->{face} \|\| $o->{face} \|\| "blank.111"}	678	my $face = $FACE{$a->{face} \|\| $o->{face} \|\| "blank.111"};
		679	unless ($face) {
		680	$face = $FACE{"blank.x11"}
299	or (warn "no face data found for arch '$a->{_name}'"), return;	681	or (warn "no face data found for arch '$a->{_name}'"), return;
		682	}
300		683
301	if ($face->{w} > 1 \|\| $face->{h} > 1) {	684	if ($face->{w} > 1 \|\| $face->{h} > 1) {
302	# bigface	685	# bigface
303	return (0, 0, $face->{w} - 1, $face->{h} - 1);	686	return (0, 0, $face->{w} - 1, $face->{h} - 1);
304		687
…		…
348	my $type = $obj->{type} \|\| $arch->{type};	731	my $type = $obj->{type} \|\| $arch->{type};
349		732
350	if ($type > 0) {	733	if ($type > 0) {
351	$root = $Crossfire::Data::ATTR{$type};	734	$root = $Crossfire::Data::ATTR{$type};
352	} else {	735	} else {
		736	my %a = (%$arch, %$obj);
		737
		738	if ($a{is_floor} && !$a{alive}) {
		739	$root = $Crossfire::Data::TYPE{Floor};
		740	} elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
		741	$root = $Crossfire::Data::TYPE{"Monster & NPC"};
		742	} elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
		743	$root = $Crossfire::Data::TYPE{Wall};
		744	} elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
		745	$root = $Crossfire::Data::TYPE{"Weak Wall"};
		746	} else {
353	$root = $Crossfire::Data::TYPE{Misc};	747	$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	}	748	}
368	}	749	}
369		750
370	my @import = ($root);	751	my @import = ($root);
371		752
…		…
545	cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {	926	cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
546	$TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"	927	$TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
547	or die "$VARDIR/tilecache.png: $!";	928	or die "$VARDIR/tilecache.png: $!";
548	*FACE = $_[0];	929	*FACE = $_[0];
549	}, sub {	930	}, sub {
550	require File::Temp;
551
552	my $tile = read_pak "$LIB/crossfire.0";	931	my $tile = read_pak "$LIB/crossfire.0";
553		932
554	my %cache;	933	my %cache;
555		934
556	my $idx = 0;	935	my $idx = 0;
557		936
558	for my $name (sort keys %$tile) {	937	for my $name (sort keys %$tile) {
559	my ($fh, $filename) = File::Temp::tempfile ();	938	my $pb = new Gtk2::Gdk::PixbufLoader;
560	print $fh $tile->{$name};	939	$pb->write ($tile->{$name});
561	close $fh;	940	$pb->close;
562	my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename;	941	my $pb = $pb->get_pixbuf;
563	unlink $filename;
564		942
565	my $tile = $cache{$name} = {	943	my $tile = $cache{$name} = {
566	pb => $pb,	944	pb => $pb,
567	idx => $idx,	945	idx => $idx,
568	w => int $pb->get_width / TILESIZE,	946	w => int $pb->get_width / TILESIZE,
…		…
586	$pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);	964	$pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
587	}	965	}
588	}	966	}
589	}	967	}
590		968
591	$pb->save ("$VARDIR/tilecache.png", "png");	969	$pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
592		970
593	\%cache	971	\%cache
594	};	972	};
595	}	973	}
596		974

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.53 by root, Wed Mar 22 03:32:09 2006 UTC vs. Revision 1.84 by root, Wed Feb 7 00:22:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.53 by root, Wed Mar 22 03:32:09 2006 UTC vs.
Revision 1.84 by root, Wed Feb 7 00:22:34 2007 UTC