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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.51 by root, Mon Mar 20 01:15:10 2006 UTC vs.
Revision 1.82 by root, Tue Feb 6 23:53:26 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
		220	# object as in "Object xxx", i.e. archetypes
		221	sub normalize_object($) {
		222	my ($ob) = @_;
		223
		224	# convert material bitset to materialname, if possible
		225	if (exists $ob->{material}) {
		226	if (!$ob->{material}) {
		227	delete $ob->{material};
		228	} elsif (exists $ob->{materialname}) {
		229	if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
		230	delete $ob->{material};
		231	} else {
		232	warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
		233	delete $ob->{material}; # assume materilname is more specific and nuke material
		234	}
		235	} else {
		236	if (my $name = $MATERIAL{$ob->{material}}) {
		237	delete $ob->{material};
		238	$ob->{materialname} = $name;
		239	}
		240	}
		241	}
		242
		243	# nuke outdated or never supported fields
		244	delete @$ob{qw(
		245	can_knockback can_parry can_impale can_cut can_dam_armour
		246	can_apply pass_thru can_pass_thru
		247	)};
		248
		249	if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
		250	if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
		251	if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
		252
		253	# convert movement strings to bitsets
		254	for my $attr (keys %FIELD_MOVEMENT) {
		255	next unless exists $ob->{$attr};
		256
		257	$ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
		258
		259	next if $ob->{$attr} =~ /^\d+$/;
		260
		261	my $flags = 0;
		262
		263	# assume list
		264	for my $flag (map lc, split /\s+/, $ob->{$attr}) {
		265	$flags \|= MOVE_WALK if $flag eq "walk";
		266	$flags \|= MOVE_FLY_LOW if $flag eq "fly_low";
		267	$flags \|= MOVE_FLY_HIGH if $flag eq "fly_high";
		268	$flags \|= MOVE_FLYING if $flag eq "flying";
		269	$flags \|= MOVE_SWIM if $flag eq "swim";
		270	$flags \|= MOVE_BOAT if $flag eq "boat";
		271	$flags \|= MOVE_ALL if $flag eq "all";
		272
		273	$flags &= ~MOVE_WALK if $flag eq "-walk";
		274	$flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
		275	$flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
		276	$flags &= ~MOVE_FLYING if $flag eq "-flying";
		277	$flags &= ~MOVE_SWIM if $flag eq "-swim";
		278	$flags &= ~MOVE_BOAT if $flag eq "-boat";
		279	$flags &= ~MOVE_ALL if $flag eq "-all";
		280	}
		281
		282	$ob->{$attr} = $flags;
		283	}
		284
		285	# convert outdated movement flags to new movement sets
		286	if (defined (my $v = delete $ob->{no_pass})) {
		287	$ob->{move_block} = $v ? MOVE_ALL : 0;
		288	}
		289	if (defined (my $v = delete $ob->{slow_move})) {
		290	$ob->{move_slow} \|= MOVE_WALK;
		291	$ob->{move_slow_penalty} = $v;
		292	}
		293	if (defined (my $v = delete $ob->{walk_on})) {
		294	$ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
		295	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_WALK
		296	: $ob->{move_on} & ~MOVE_WALK;
		297	}
		298	if (defined (my $v = delete $ob->{walk_off})) {
		299	$ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
		300	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_WALK
		301	: $ob->{move_off} & ~MOVE_WALK;
		302	}
		303	if (defined (my $v = delete $ob->{fly_on})) {
		304	$ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
		305	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_FLY_LOW
		306	: $ob->{move_on} & ~MOVE_FLY_LOW;
		307	}
		308	if (defined (my $v = delete $ob->{fly_off})) {
		309	$ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
		310	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_FLY_LOW
		311	: $ob->{move_off} & ~MOVE_FLY_LOW;
		312	}
		313	if (defined (my $v = delete $ob->{flying})) {
		314	$ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
		315	$ob->{move_type} = $v ? $ob->{move_type} \| MOVE_FLY_LOW
		316	: $ob->{move_type} & ~MOVE_FLY_LOW;
		317	}
		318
		319	# convert idiotic event_xxx things into objects
		320	while (my ($event, $subtype) = each %EVENT_TYPE) {
		321	if (exists $ob->{"event_${event}_plugin"}) {
		322	push @{$ob->{inventory}}, {
		323	_name => "event_$event",
		324	title => delete $ob->{"event_${event}_plugin"},
		325	slaying => delete $ob->{"event_${event}"},
		326	name => delete $ob->{"event_${event}_options"},
		327	};
		328	}
		329	}
		330
		331	# some archetypes had "+3" instead of the canonical "3", so fix
		332	$ob->{dam} *= 1 if exists $ob->{dam};
		333
		334	$ob
		335	}
		336
		337	# arch as in "arch xxx", ie.. objects
76	sub normalize_arch($) {	338	sub normalize_arch($) {
77	my ($ob) = @_;	339	my ($ob) = @_;
78		340
		341	normalize_object $ob;
		342
79	my $arch = $ARCH{$ob->{_name}}	343	my $arch = $ARCH{$ob->{_name}}
80	or (warn "$ob->{_name}: no such archetype", return $ob);	344	or (warn "$ob->{_name}: no such archetype", return $ob);
81
82	delete $ob->{$_} for qw(
83	can_knockback can_parry can_impale can_cut can_dam_armour
84	can_apply pass_thru can_pass_thru
85	);
86		345
87	if ($arch->{type} == 22) { # map	346	if ($arch->{type} == 22) { # map
88	my %normalize = (	347	my %normalize = (
89	"enter_x" => "hp",	348	"enter_x" => "hp",
90	"enter_y" => "sp",	349	"enter_y" => "sp",
…		…
100	while (my ($k2, $k1) = each %normalize) {	359	while (my ($k2, $k1) = each %normalize) {
101	if (defined (my $v = delete $ob->{$k1})) {	360	if (defined (my $v = delete $ob->{$k1})) {
102	$ob->{$k2} = $v;	361	$ob->{$k2} = $v;
103	}	362	}
104	}	363	}
105	}	364	} else {
106
107	for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
108	next unless exists $ob->{$attr};
109	next if $ob->{$attr} =~ /^\d+$/;
110
111	my $flags = 0;
112
113	# assume list
114	for my $flag (map lc, split /\s+/, $ob->{$attr}) {
115	$flags \|= MOVE_WALK if $flag eq "walk";
116	$flags \|= MOVE_FLY_LOW if $flag eq "fly_low";
117	$flags \|= MOVE_FLY_HIGH if $flag eq "fly_high";
118	$flags \|= MOVE_FLYING if $flag eq "flying";
119	$flags \|= MOVE_SWIM if $flag eq "swim";
120	$flags \|= MOVE_BOAT if $flag eq "boat";
121	$flags \|= MOVE_ALL if $flag eq "all";
122
123	$flags &= ~MOVE_WALK if $flag eq "-walk";
124	$flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
125	$flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
126	$flags &= ~MOVE_FLYING if $flag eq "-flying";
127	$flags &= ~MOVE_SWIM if $flag eq "-swim";
128	$flags &= ~MOVE_BOAT if $flag eq "-boat";
129	$flags &= ~MOVE_ALL if $flag eq "-all";
130	}
131
132	$ob->{$attr} = $flags;
133	}
134
135	if (defined (my $v = delete $ob->{no_pass})) {
136	$ob->{move_block} = $v ? MOVE_ALL : 0;
137	}
138	if (defined (my $v = delete $ob->{slow_move})) {
139	$ob->{move_slow} \|= MOVE_WALK;
140	$ob->{move_slow_penalty} = $v;
141	}
142	if (defined (my $v = delete $ob->{walk_on})) {
143	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_WALK
144	: $ob->{move_on} & ~MOVE_WALK;
145	}
146	if (defined (my $v = delete $ob->{walk_off})) {
147	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_WALK
148	: $ob->{move_off} & ~MOVE_WALK;
149	}
150	if (defined (my $v = delete $ob->{fly_on})) {
151	$ob->{move_on} = $v ? $ob->{move_on} \| MOVE_FLY_LOW
152	: $ob->{move_on} & ~MOVE_FLY_LOW;
153	}
154	if (defined (my $v = delete $ob->{fly_off})) {
155	$ob->{move_off} = $v ? $ob->{move_off} \| MOVE_FLY_LOW
156	: $ob->{move_off} & ~MOVE_FLY_LOW;
157	}
158	if (defined (my $v = delete $ob->{flying})) {
159	$ob->{move_type} = $v ? $ob->{move_type} \| MOVE_FLY_LOW
160	: $ob->{move_type} & ~MOVE_FLY_LOW;
161	}
162
163	# if value matches archetype default, delete	365	# if value matches archetype default, delete
164	while (my ($k, $v) = each %$ob) {	366	while (my ($k, $v) = each %$ob) {
165	if (exists $arch->{$k} and $arch->{$k} eq $v) {	367	if (exists $arch->{$k} and $arch->{$k} eq $v) {
166	next if $k eq "_name";	368	next if $k eq "_name";
167	delete $ob->{$k};	369	delete $ob->{$k};
168	}	370	}
		371	}
169	}	372	}
		373
		374	# a speciality for the editor
		375	if (exists $ob->{attack_movement}) {
		376	my $am = delete $ob->{attack_movement};
		377	$ob->{attack_movement_bits_0_3} = $am & 15;
		378	$ob->{attack_movement_bits_4_7} = $am & 240;
		379	}
		380
		381	$ob
		382	}
		383
		384	sub attr_thaw($) {
		385	my ($ob) = @_;
		386
		387	$ob->{attach} = from_json $ob->{attach}
		388	if exists $ob->{attach};
		389
		390	$ob
		391	}
		392
		393	sub attr_freeze($) {
		394	my ($ob) = @_;
		395
		396	$ob->{attach} = Crossfire::to_json $ob->{attach}
		397	if exists $ob->{attach};
170		398
171	$ob	399	$ob
172	}	400	}
173		401
174	sub read_pak($) {	402	sub read_pak($) {
175	my ($path) = @_;	403	my ($path) = @_;
176		404
177	my %pak;	405	my %pak;
178		406
179	open my $fh, "<", $path	407	open my $fh, "<:raw:perlio", $path
180	or Carp::croak "$_[0]: $!";	408	or Carp::croak "$_[0]: $!";
181	binmode $fh;	409	binmode $fh;
182	while (<$fh>) {	410	while (<$fh>) {
183	my ($type, $id, $len, $path) = split;	411	my ($type, $id, $len, $path) = split;
184	$path =~ s/.*\///;	412	$path =~ s/.*\///;
…		…
186	}	414	}
187		415
188	\%pak	416	\%pak
189	}	417	}
190		418
191	sub read_arch($) {	419	sub read_arch($;$) {
192	my ($path) = @_;	420	my ($path, $toplevel) = @_;
193		421
194	my %arc;	422	my %arc;
195	my ($more, $prev);	423	my ($more, $prev);
		424	my $comment;
196		425
197	open my $fh, "<", $path	426	open my $fh, "<:raw:perlio:utf8", $path
198	or Carp::croak "$path: $!";	427	or Carp::croak "$path: $!";
199		428
200	binmode $fh;	429	# binmode $fh;
201		430
202	my $parse_block; $parse_block = sub {	431	my $parse_block; $parse_block = sub {
203	my %arc = @_;	432	my %arc = @_;
204		433
205	while (<$fh>) {	434	while (<$fh>) {
206	s/\s+$//;	435	s/\s+$//;
207	if (/^end$/i) {	436	if (/^end$/i) {
208	last;	437	last;
		438
209	} elsif (/^arch (\S+)$/) {	439	} elsif (/^arch (\S+)$/i) {
210	push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1);	440	push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
		441
211	} elsif (/^lore$/) {	442	} elsif (/^lore$/i) {
212	while (<$fh>) {	443	while (<$fh>) {
213	last if /^endlore\s*$/i;	444	last if /^endlore\s*$/i;
214	$arc{lore} .= $_;	445	$arc{lore} .= $_;
215	}	446	}
216	} elsif (/^msg$/) {	447	} elsif (/^msg$/i) {
217	while (<$fh>) {	448	while (<$fh>) {
218	last if /^endmsg\s*$/i;	449	last if /^endmsg\s*$/i;
219	$arc{msg} .= $_;	450	$arc{msg} .= $_;
220	}	451	}
		452	} elsif (/^anim$/i) {
		453	while (<$fh>) {
		454	last if /^mina\s*$/i;
		455	chomp;
		456	push @{ $arc{anim} }, $_;
		457	}
221	} elsif (/^(\S+)\s(.)$/) {	458	} elsif (/^(\S+)\s(.)$/) {
222	$arc{lc $1} = $2;	459	$arc{lc $1} = $2;
223	} elsif (/^\s*($\|#)/) {	460	} elsif (/^\s*#/) {
		461	$arc{_comment} .= "$_\n";
		462
		463	} elsif (/^\s*$/) {
224	#	464	#
225	} else {	465	} else {
226	warn "$path: unparsable line '$_' in arch $arc{_name}";	466	warn "$path: unparsable line '$_' in arch $arc{_name}";
227	}	467	}
228	}	468	}
…		…
234	s/\s+$//;	474	s/\s+$//;
235	if (/^more$/i) {	475	if (/^more$/i) {
236	$more = $prev;	476	$more = $prev;
237	} elsif (/^object (\S+)$/i) {	477	} elsif (/^object (\S+)$/i) {
238	my $name = $1;	478	my $name = $1;
239	my $arc = $parse_block->(_name => $name);	479	my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
		480	undef $comment;
		481	delete $arc{_comment} unless length $arc{_comment};
		482	$arc->{_atype} = 'object';
240		483
241	if ($more) {	484	if ($more) {
242	$more->{more} = $arc;	485	$more->{more} = $arc;
243	} else {	486	} else {
244	$arc{$name} = $arc;	487	$arc{$name} = $arc;
245	}	488	}
246	$prev = $arc;	489	$prev = $arc;
247	$more = undef;	490	$more = undef;
248	} elsif (/^arch (\S+)$/i) {	491	} elsif (/^arch (\S+)$/i) {
249	push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1);	492	my $name = $1;
		493	my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
		494	undef $comment;
		495	delete $arc{_comment} unless length $arc{_comment};
		496	$arc->{_atype} = 'arch';
		497
		498	if ($more) {
		499	$more->{more} = $arc;
		500	} else {
		501	push @{ $arc{arch} }, $arc;
		502	}
		503	$prev = $arc;
		504	$more = undef;
		505	} elsif ($toplevel && /^(\S+)\s+(.*)$/) {
		506	if ($1 eq "lev_array") {
		507	while (<$fh>) {
		508	last if /^endplst\s*$/;
		509	push @{$toplevel->{lev_array}}, $_+0;
		510	}
		511	} else {
		512	$toplevel->{$1} = $2;
		513	}
		514	} elsif (/^\s*#/) {
		515	$comment .= "$_\n";
250	} elsif (/^\s*($\|#)/) {	516	} elsif (/^\s*($\|#)/) {
251	#	517	#
252	} else {	518	} else {
253	warn "$path: unparseable top-level line '$_'";	519	die "$path: unparseable top-level line '$_'";
254	}	520	}
255	}	521	}
256		522
257	undef $parse_block; # work around bug in perl not freeing $fh etc.	523	undef $parse_block; # work around bug in perl not freeing $fh etc.
258		524
259	\%arc	525	\%arc
		526	}
		527
		528	sub archlist_to_string {
		529	my ($arch) = @_;
		530
		531	my $str;
		532
		533	my $append; $append = sub {
		534	my %a = %{$_[0]};
		535
		536	Crossfire::attr_freeze \%a;
		537	Crossfire::normalize_arch \%a;
		538
		539	# undo the bit-split we did before
		540	if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
		541	$a{attack_movement} = (delete $a{attack_movement_bits_0_3})
		542	\| (delete $a{attack_movement_bits_4_7});
		543	}
		544
		545	if (my $comment = delete $a{_comment}) {
		546	if ($comment =~ /[^\n\s#]/) {
		547	$str .= $comment;
		548	}
		549	}
		550
		551	$str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
		552
		553	my $inv = delete $a{inventory};
		554	my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
		555	my $anim = delete $a{anim};
		556
		557	my @kv;
		558
		559	for ($a{_name} eq "map"
		560	? @Crossfire::FIELD_ORDER_MAP
		561	: @Crossfire::FIELD_ORDER) {
		562	push @kv, [$_, delete $a{$_}]
		563	if exists $a{$_};
		564	}
		565
		566	for (sort keys %a) {
		567	next if /^_/; # ignore our _-keys
		568	push @kv, [$_, delete $a{$_}];
		569	}
		570
		571	for (@kv) {
		572	my ($k, $v) = @$_;
		573
		574	if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
		575	$v =~ s/\n$//;
		576	$str .= "$k\n$v\n$end\n";
		577	} elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
		578	if ($v & ~Crossfire::MOVE_ALL or !$v) {
		579	$str .= "$k $v\n";
		580
		581	} elsif ($v & Crossfire::MOVE_ALLBIT) {
		582	$str .= "$k all";
		583
		584	$str .= " -walk" unless $v & Crossfire::MOVE_WALK;
		585	$str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
		586	$str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
		587	$str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
		588	$str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
		589
		590	$str .= "\n";
		591
		592	} else {
		593	$str .= $k;
		594
		595	$str .= " walk" if $v & Crossfire::MOVE_WALK;
		596	$str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
		597	$str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
		598	$str .= " swim" if $v & Crossfire::MOVE_SWIM;
		599	$str .= " boat" if $v & Crossfire::MOVE_BOAT;
		600
		601	$str .= "\n";
		602	}
		603	} else {
		604	$str .= "$k $v\n";
		605	}
		606	}
		607
		608	if ($inv) {
		609	$append->($_) for @$inv;
		610	}
		611
		612	if ($a{_atype} eq 'object') {
		613	$str .= join "\n", "anim", @$anim, "mina\n"
		614	if $anim;
		615	}
		616
		617	$str .= "end\n";
		618
		619	if ($a{_atype} eq 'object') {
		620	if ($more) {
		621	$str .= "more\n";
		622	$append->($more) if $more;
		623	} else {
		624	$str .= "\n";
		625	}
		626	}
		627	};
		628
		629	for (@$arch) {
		630	$append->($_);
		631	}
		632
		633	$str
260	}	634	}
261		635
262	# put all archs into a hash with editor_face as it's key	636	# put all archs into a hash with editor_face as it's key
263	# NOTE: the arrays in the hash values are references to	637	# NOTE: the arrays in the hash values are references to
264	# the archs from $ARCH	638	# the archs from $ARCH
265	sub editor_archs {	639	sub editor_archs {
266	my %paths;	640	my %paths;
267		641
268	for (keys %ARCH) {	642	for (keys %ARCH) {
269	my $arch = $ARCH{$_};	643	my $arch = $ARCH{$_};
270	push @{$paths{$arch->{editor_folder}}}, \$arch;	644	push @{$paths{$arch->{editor_folder}}}, $arch;
271	}	645	}
272		646
273	\%paths	647	\%paths
274	}	648	}
275		649
…		…
285	my ($a) = @_;	659	my ($a) = @_;
286		660
287	my $o = $ARCH{$a->{_name}}	661	my $o = $ARCH{$a->{_name}}
288	or return;	662	or return;
289		663
290	my $face = $FACE{$a->{face} \|\| $o->{face} \|\| "blank.111"}	664	my $face = $FACE{$a->{face} \|\| $o->{face} \|\| "blank.111"};
		665	unless ($face) {
		666	$face = $FACE{"blank.x11"}
291	or (warn "no face data found for arch '$a->{_name}'"), return;	667	or (warn "no face data found for arch '$a->{_name}'"), return;
		668	}
292		669
293	if ($face->{w} > 1 \|\| $face->{h} > 1) {	670	if ($face->{w} > 1 \|\| $face->{h} > 1) {
294	# bigface	671	# bigface
295	return (0, 0, $face->{w} - 1, $face->{h} - 1);	672	return (0, 0, $face->{w} - 1, $face->{h} - 1);
296		673
…		…
340	my $type = $obj->{type} \|\| $arch->{type};	717	my $type = $obj->{type} \|\| $arch->{type};
341		718
342	if ($type > 0) {	719	if ($type > 0) {
343	$root = $Crossfire::Data::ATTR{$type};	720	$root = $Crossfire::Data::ATTR{$type};
344	} else {	721	} else {
		722	my %a = (%$arch, %$obj);
		723
		724	if ($a{is_floor} && !$a{alive}) {
		725	$root = $Crossfire::Data::TYPE{Floor};
		726	} elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
		727	$root = $Crossfire::Data::TYPE{"Monster & NPC"};
		728	} elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
		729	$root = $Crossfire::Data::TYPE{Wall};
		730	} elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
		731	$root = $Crossfire::Data::TYPE{"Weak Wall"};
		732	} else {
345	$root = $Crossfire::Data::TYPE{Misc};	733	$root = $Crossfire::Data::TYPE{Misc};
346
347	type:
348	for (@Crossfire::Data::ATTR0) {
349	my $req = $_->{required}
350	or die "internal error: ATTR0 without 'required'";
351
352	keys %$req;
353	while (my ($k, $v) = each %$req) {
354	next type
355	unless $obj->{$k} == $v \|\| $arch->{$k} == $v;
356	}
357
358	$root = $_;
359	}	734	}
360	}	735	}
361		736
362	my @import = ($root);	737	my @import = ($root);
363		738
…		…
537	cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {	912	cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
538	$TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"	913	$TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
539	or die "$VARDIR/tilecache.png: $!";	914	or die "$VARDIR/tilecache.png: $!";
540	*FACE = $_[0];	915	*FACE = $_[0];
541	}, sub {	916	}, sub {
542	require File::Temp;
543
544	my $tile = read_pak "$LIB/crossfire.0";	917	my $tile = read_pak "$LIB/crossfire.0";
545		918
546	my %cache;	919	my %cache;
547		920
548	my $idx = 0;	921	my $idx = 0;
549		922
550	for my $name (sort keys %$tile) {	923	for my $name (sort keys %$tile) {
551	my ($fh, $filename) = File::Temp::tempfile ();	924	my $pb = new Gtk2::Gdk::PixbufLoader;
552	print $fh $tile->{$name};	925	$pb->write ($tile->{$name});
553	close $fh;	926	$pb->close;
554	my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename;	927	my $pb = $pb->get_pixbuf;
555	unlink $filename;
556		928
557	my $tile = $cache{$name} = {	929	my $tile = $cache{$name} = {
558	pb => $pb,	930	pb => $pb,
559	idx => $idx,	931	idx => $idx,
560	w => int $pb->get_width / TILESIZE,	932	w => int $pb->get_width / TILESIZE,
…		…
578	$pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);	950	$pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
579	}	951	}
580	}	952	}
581	}	953	}
582		954
583	$pb->save ("$VARDIR/tilecache.png", "png");	955	$pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
584		956
585	\%cache	957	\%cache
586	};	958	};
587	}	959	}
588		960

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.51 by root, Mon Mar 20 01:15:10 2006 UTC vs. Revision 1.82 by root, Tue Feb 6 23:53:26 2007 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.51 by root, Mon Mar 20 01:15:10 2006 UTC vs.
Revision 1.82 by root, Tue Feb 6 23:53:26 2007 UTC