[ViewVC] Diff of: cvs/deliantra/maps/world/world_104

Comparing deliantra/maps/world/world_104_115.map (file contents):
Revision 1.42 by root, Sat Dec 13 21:51:58 2008 UTC vs.
Revision 1.48 by root, Mon Mar 23 06:22:21 2009 UTC

…		…
30	y 6	30	y 6
31	tag dungeons_hut_kjerring_exit+2+9	31	tag dungeons_hut_kjerring_exit+2+9
32	end	32	end
33	arch beach	33	arch beach
34	x 6	34	x 6
35	y 8	35	y 9
36	end	36	end
37	arch swall_1_1	37	arch swall_1_1
38	x 6
39	y 8
40	end
41	arch beach
42	x 6
43	y 9
44	end
45	arch swall_2_1_1
46	x 6	38	x 6
47	y 9	39	y 9
48	end	40	end
49	arch beach	41	arch beach
50	x 6	42	x 6
…		…
102	x 6	94	x 6
103	y 16	95	y 16
104	end	96	end
105	arch shallow_sea	97	arch shallow_sea
106	x 7	98	x 7
107	y 8	99	y 9
108	end	100	end
109	arch flagstone_0	101	arch flagstone_0
110	x 7	102	name safety buoy
111	y 8
112	end
113	arch shallow_sea
114	x 7	103	x 7
115	y 9	104	y 9
116	move_allow all	105	blocksview 0
117	move_slow swim walk
118	end	106	end
119	arch beach	107	arch beach
120	x 7	108	x 7
121	y 10	109	y 10
122	end	110	end
…		…
164	x 7	152	x 7
165	y 17	153	y 17
166	end	154	end
167	arch shallow_sea	155	arch shallow_sea
168	x 8	156	x 8
169	y 8	157	y 9
170	end	158	end
171	arch flagstone_0	159	arch flagstone_0
172	x 8	160	name safety buoy
173	y 8
174	end
175	arch shallow_sea
176	x 8	161	x 8
177	y 9	162	y 9
178	move_allow all	163	blocksview 0
179	move_slow swim walk
180	end	164	end
181	arch shallow_sea	165	arch shallow_sea
182	x 8	166	x 8
183	y 10	167	y 10
184	move_allow all	168	move_allow all
…		…
240	arch shallow_sea	224	arch shallow_sea
241	x 9	225	x 9
242	y 8	226	y 8
243	end	227	end
244	arch flagstone_0	228	arch flagstone_0
		229	name safety buoy
245	x 9	230	x 9
246	y 8	231	y 8
		232	blocksview 0
247	end	233	end
248	arch shallow_sea	234	arch shallow_sea
249	x 9	235	x 9
250	y 9	236	y 9
251	move_allow all	237	end
252	move_slow swim walk	238	arch flagstone_0
		239	name safety buoy
		240	x 9
		241	y 9
		242	blocksview 0
253	end	243	end
254	arch shallow_sea	244	arch shallow_sea
255	x 9	245	x 9
256	y 10	246	y 10
257	move_allow all	247	move_allow all
…		…
372	arch shallow_sea	362	arch shallow_sea
373	x 10	363	x 10
374	y 8	364	y 8
375	end	365	end
376	arch flagstone_0	366	arch flagstone_0
		367	name safety buoy
377	x 10	368	x 10
378	y 8	369	y 8
		370	blocksview 0
379	end	371	end
380	arch shallow_sea	372	arch shallow_sea
381	x 10	373	x 10
382	y 9	374	y 9
383	move_allow all	375	move_allow all
…		…
494	arch shallow_sea	486	arch shallow_sea
495	x 11	487	x 11
496	y 8	488	y 8
497	end	489	end
498	arch flagstone_0	490	arch flagstone_0
		491	name safety buoy
499	x 11	492	x 11
500	y 8	493	y 8
		494	blocksview 0
501	end	495	end
502	arch shallow_sea	496	arch shallow_sea
503	x 11	497	x 11
504	y 9	498	y 9
505	move_allow all	499	move_allow all
…		…
599	arch shallow_sea	593	arch shallow_sea
600	x 12	594	x 12
601	y 8	595	y 8
602	end	596	end
603	arch flagstone_0	597	arch flagstone_0
		598	name safety buoy
604	x 12	599	x 12
605	y 8	600	y 8
		601	blocksview 0
606	end	602	end
607	arch shallow_sea	603	arch shallow_sea
608	x 12	604	x 12
609	y 9	605	y 9
610	move_allow all	606	move_allow all
…		…
717	arch shallow_sea	713	arch shallow_sea
718	x 13	714	x 13
719	y 8	715	y 8
720	end	716	end
721	arch flagstone_0	717	arch flagstone_0
		718	name safety buoy
722	x 13	719	x 13
723	y 8	720	y 8
		721	blocksview 0
724	end	722	end
725	arch shallow_sea	723	arch shallow_sea
726	x 13	724	x 13
727	y 9	725	y 9
728	move_allow all	726	move_allow all
…		…
813	arch shallow_sea	811	arch shallow_sea
814	x 14	812	x 14
815	y 8	813	y 8
816	end	814	end
817	arch flagstone_0	815	arch flagstone_0
		816	name safety buoy
818	x 14	817	x 14
819	y 8	818	y 8
		819	blocksview 0
820	end	820	end
821	arch shallow_sea	821	arch shallow_sea
822	x 14	822	x 14
823	y 9	823	y 9
824	move_allow all	824	move_allow all
…		…
945	arch shallow_sea	945	arch shallow_sea
946	x 15	946	x 15
947	y 8	947	y 8
948	end	948	end
949	arch flagstone_0	949	arch flagstone_0
		950	name safety buoy
950	x 15	951	x 15
951	y 8	952	y 8
		953	blocksview 0
952	end	954	end
953	arch shallow_sea	955	arch shallow_sea
954	x 15	956	x 15
955	y 9	957	y 9
956	move_allow all	958	move_allow all
…		…
1066	arch shallow_sea	1068	arch shallow_sea
1067	x 16	1069	x 16
1068	y 8	1070	y 8
1069	end	1071	end
1070	arch flagstone_0	1072	arch flagstone_0
		1073	name safety buoy
1071	x 16	1074	x 16
1072	y 8	1075	y 8
		1076	blocksview 0
1073	end	1077	end
1074	arch shallow_sea	1078	arch shallow_sea
1075	x 16	1079	x 16
1076	y 9	1080	y 9
1077	move_allow all	1081	move_allow all
…		…
1418	arch shallow_sea	1422	arch shallow_sea
1419	x 17	1423	x 17
1420	y 8	1424	y 8
1421	end	1425	end
1422	arch flagstone_0	1426	arch flagstone_0
		1427	name safety buoy
1423	x 17	1428	x 17
1424	y 8	1429	y 8
		1430	blocksview 0
1425	end	1431	end
1426	arch shallow_sea	1432	arch shallow_sea
1427	x 17	1433	x 17
1428	y 9	1434	y 9
1429	move_allow all	1435	move_allow all
…		…
1792	arch shallow_sea	1798	arch shallow_sea
1793	x 18	1799	x 18
1794	y 8	1800	y 8
1795	end	1801	end
1796	arch flagstone_0	1802	arch flagstone_0
		1803	name safety buoy
1797	x 18	1804	x 18
1798	y 8	1805	y 8
		1806	blocksview 0
1799	end	1807	end
1800	arch shallow_sea	1808	arch shallow_sea
1801	x 18	1809	x 18
1802	y 9	1810	y 9
1803	move_allow all	1811	move_allow all
…		…
2124	arch shallow_sea	2132	arch shallow_sea
2125	x 19	2133	x 19
2126	y 8	2134	y 8
2127	end	2135	end
2128	arch flagstone_0	2136	arch flagstone_0
		2137	name safety buoy
2129	x 19	2138	x 19
2130	y 8	2139	y 8
		2140	blocksview 0
2131	end	2141	end
2132	arch shallow_sea	2142	arch shallow_sea
2133	x 19	2143	x 19
2134	y 9	2144	y 9
2135	move_allow all	2145	move_allow all
…		…
2381	arch shallow_sea	2391	arch shallow_sea
2382	x 20	2392	x 20
2383	y 8	2393	y 8
2384	end	2394	end
2385	arch flagstone_0	2395	arch flagstone_0
		2396	name safety buoy
2386	x 20	2397	x 20
2387	y 8	2398	y 8
		2399	blocksview 0
2388	end	2400	end
2389	arch shallow_sea	2401	arch shallow_sea
2390	x 20	2402	x 20
2391	y 9	2403	y 9
2392	move_allow all	2404	move_allow all
…		…
2632	arch shallow_sea	2644	arch shallow_sea
2633	x 21	2645	x 21
2634	y 8	2646	y 8
2635	end	2647	end
2636	arch flagstone_0	2648	arch flagstone_0
		2649	name safety buoy
2637	x 21	2650	x 21
2638	y 8	2651	y 8
		2652	blocksview 0
2639	end	2653	end
2640	arch shallow_sea	2654	arch shallow_sea
2641	x 21	2655	x 21
2642	y 9	2656	y 9
2643	move_allow all	2657	move_allow all
…		…
2774	arch grass	2788	arch grass
2775	elevation 1275	2789	elevation 1275
2776	x 21	2790	x 21
2777	y 36	2791	y 36
2778	end	2792	end
2779	arch house_2	2793	arch lamppost
2780	x 21	2794	x 21
2781	y 36	2795	y 36
2782	end	2796	end
2783	arch safe_ground	2797	arch safe_ground
2784	x 21	2798	x 21
…		…
2937	arch shallow_sea	2951	arch shallow_sea
2938	x 22	2952	x 22
2939	y 8	2953	y 8
2940	end	2954	end
2941	arch flagstone_0	2955	arch flagstone_0
		2956	name safety buoy
2942	x 22	2957	x 22
2943	y 8	2958	y 8
		2959	blocksview 0
2944	end	2960	end
2945	arch shallow_sea	2961	arch shallow_sea
2946	x 22	2962	x 22
2947	y 9	2963	y 9
2948	move_allow all	2964	move_allow all
…		…
3070	arch grass	3086	arch grass
3071	elevation 1275	3087	elevation 1275
3072	x 22	3088	x 22
3073	y 36	3089	y 36
3074	end	3090	end
3075	arch lamppost	3091	arch tree5
3076	x 22	3092	x 22
3077	y 36	3093	y 36
3078	end	3094	end
3079	arch safe_ground	3095	arch safe_ground
3080	x 22	3096	x 22
…		…
3218	arch shallow_sea	3234	arch shallow_sea
3219	x 23	3235	x 23
3220	y 8	3236	y 8
3221	end	3237	end
3222	arch flagstone_0	3238	arch flagstone_0
		3239	name safety buoy
3223	x 23	3240	x 23
3224	y 8	3241	y 8
		3242	blocksview 0
3225	end	3243	end
3226	arch shallow_sea	3244	arch shallow_sea
3227	x 23	3245	x 23
3228	y 9	3246	y 9
3229	move_allow all	3247	move_allow all
…		…
3327	arch grass	3345	arch grass
3328	elevation 1275	3346	elevation 1275
3329	x 23	3347	x 23
3330	y 34	3348	y 34
3331	end	3349	end
		3350	arch house_2
		3351	name Mike Miller's house
		3352	name_pl Mike Miller's house
		3353	slaying *scorn_houses_house3.1st+6+8
		3354	x 23
		3355	y 34
		3356	tag scorn_houses_house3.1st_exit+6+9
		3357	end
3332	arch safe_ground	3358	arch safe_ground
3333	x 23	3359	x 23
3334	y 35	3360	y 35
3335	end	3361	end
3336	arch grass	3362	arch grass
3337	elevation 1275	3363	elevation 1275
3338	x 23	3364	x 23
3339	y 35	3365	y 35
3340	end	3366	end
		3367	arch house_2
		3368	name Abandoned house
		3369	name_pl Abandoned house
		3370	slaying *scorn_houses_house3.2nd+5+9
		3371	x 23
		3372	y 35
		3373	tag scorn_houses_house3.2nd_exit+3+9
		3374	end
3341	arch safe_ground	3375	arch safe_ground
3342	x 23	3376	x 23
3343	y 36	3377	y 36
3344	end	3378	end
3345	arch grass	3379	arch grass
3346	elevation 1275	3380	elevation 1275
3347	x 23	3381	x 23
3348	y 36	3382	y 36
3349	end	3383	end
3350	arch house_2	3384	arch tree7
3351	x 23	3385	x 23
3352	y 36	3386	y 36
3353	end	3387	end
3354	arch safe_ground	3388	arch safe_ground
3355	x 23	3389	x 23
…		…
3494	arch shallow_sea	3528	arch shallow_sea
3495	x 24	3529	x 24
3496	y 8	3530	y 8
3497	end	3531	end
3498	arch flagstone_0	3532	arch flagstone_0
		3533	name safety buoy
3499	x 24	3534	x 24
3500	y 8	3535	y 8
		3536	blocksview 0
3501	end	3537	end
3502	arch shallow_sea	3538	arch shallow_sea
3503	x 24	3539	x 24
3504	y 9	3540	y 9
3505	move_allow all	3541	move_allow all
…		…
3618	arch grass	3654	arch grass
3619	elevation 1275	3655	elevation 1275
3620	x 24	3656	x 24
3621	y 34	3657	y 34
3622	end	3658	end
3623	arch house_2
3624	name Mike Miller's house
3625	name_pl Mike Miller's house
3626	slaying *scorn_houses_house3.1st+6+8
3627	x 24
3628	y 34
3629	tag scorn_houses_house3.1st_exit+6+9
3630	end
3631	arch safe_ground	3659	arch safe_ground
3632	x 24	3660	x 24
3633	y 35	3661	y 35
3634	end	3662	end
3635	arch grass	3663	arch grass
…		…
3648	arch grass	3676	arch grass
3649	elevation 1275	3677	elevation 1275
3650	x 24	3678	x 24
3651	y 36	3679	y 36
3652	end	3680	end
3653	arch house_2	3681	arch tree8
3654	x 24	3682	x 24
3655	y 36	3683	y 36
3656	end	3684	end
3657	arch safe_ground	3685	arch safe_ground
3658	x 24	3686	x 24
…		…
3792	arch shallow_sea	3820	arch shallow_sea
3793	x 25	3821	x 25
3794	y 8	3822	y 8
3795	end	3823	end
3796	arch flagstone_0	3824	arch flagstone_0
		3825	name safety buoy
3797	x 25	3826	x 25
3798	y 8	3827	y 8
		3828	blocksview 0
3799	end	3829	end
3800	arch shallow_sea	3830	arch shallow_sea
3801	x 25	3831	x 25
3802	y 9	3832	y 9
3803	move_allow all	3833	end
3804	move_slow swim walk	3834	arch flagstone_0
		3835	name safety buoy
		3836	x 25
		3837	y 9
		3838	blocksview 0
3805	end	3839	end
3806	arch shallow_sea	3840	arch shallow_sea
3807	x 25	3841	x 25
3808	y 10	3842	y 10
3809	move_allow all	3843	move_allow all
…		…
4070	x 25	4104	x 25
4071	y 49	4105	y 49
4072	end	4106	end
4073	arch shallow_sea	4107	arch shallow_sea
4074	x 26	4108	x 26
4075	y 8	4109	y 9
4076	end	4110	end
4077	arch flagstone_0	4111	arch flagstone_0
4078	x 26	4112	name safety buoy
4079	y 8
4080	end
4081	arch shallow_sea
4082	x 26	4113	x 26
4083	y 9	4114	y 9
4084	move_allow all	4115	blocksview 0
4085	move_slow swim walk
4086	end	4116	end
4087	arch shallow_sea	4117	arch shallow_sea
4088	x 26	4118	x 26
4089	y 10	4119	y 10
4090	move_allow all	4120	move_allow all
…		…
4195	arch grass	4225	arch grass
4196	elevation 1275	4226	elevation 1275
4197	x 26	4227	x 26
4198	y 34	4228	y 34
4199	end	4229	end
4200	arch house_2
4201	name Abandoned house
4202	name_pl Abandoned house
4203	slaying *scorn_houses_house3.2nd+5+9
4204	x 26
4205	y 34
4206	tag scorn_houses_house3.2nd_exit+3+9
4207	end
4208	arch safe_ground	4230	arch safe_ground
4209	x 26	4231	x 26
4210	y 35	4232	y 35
4211	end	4233	end
4212	arch grass	4234	arch grass
…		…
4373	x 26	4395	x 26
4374	y 49	4396	y 49
4375	end	4397	end
4376	arch shallow_sea	4398	arch shallow_sea
4377	x 27	4399	x 27
4378	y 8	4400	y 9
4379	end	4401	end
4380	arch flagstone_0	4402	arch flagstone_0
4381	x 27	4403	name safety buoy
4382	y 8
4383	end
4384	arch shallow_sea
4385	x 27	4404	x 27
4386	y 9	4405	y 9
4387	move_allow all	4406	blocksview 0
4388	move_slow swim walk
4389	end	4407	end
4390	arch shallow_sea	4408	arch shallow_sea
4391	x 27	4409	x 27
4392	y 10	4410	y 10
4393	move_allow all	4411	end
4394	move_slow swim walk	4412	arch flagstone_0
		4413	name safety buoy
		4414	x 27
		4415	y 10
		4416	blocksview 0
4395	end	4417	end
4396	arch shallow_sea	4418	arch shallow_sea
4397	x 27	4419	x 27
4398	y 11	4420	y 11
4399	move_allow all	4421	move_allow all
…		…
4628	x 27	4650	x 27
4629	y 49	4651	y 49
4630	end	4652	end
4631	arch shallow_sea	4653	arch shallow_sea
4632	x 28	4654	x 28
4633	y 8	4655	y 10
4634	end	4656	end
4635	arch flagstone_0	4657	arch flagstone_0
4636	x 28	4658	name safety buoy
4637	y 8
4638	end
4639	arch shallow_sea
4640	x 28
4641	y 9
4642	move_allow all
4643	move_slow swim walk
4644	end
4645	arch shallow_sea
4646	x 28	4659	x 28
4647	y 10	4660	y 10
4648	move_allow all	4661	blocksview 0
4649	move_slow swim walk
4650	end	4662	end
4651	arch shallow_sea	4663	arch shallow_sea
4652	x 28	4664	x 28
4653	y 11	4665	y 11
4654	move_allow all	4666	move_allow all
…		…
4903	x 28	4915	x 28
4904	y 49	4916	y 49
4905	end	4917	end
4906	arch shallow_sea	4918	arch shallow_sea
4907	x 29	4919	x 29
4908	y 8	4920	y 10
4909	end	4921	end
4910	arch flagstone_0	4922	arch flagstone_0
4911	x 29	4923	name safety buoy
4912	y 8
4913	end
4914	arch shallow_sea
4915	x 29
4916	y 9
4917	end
4918	arch flagstone_0
4919	x 29
4920	y 9
4921	end
4922	arch shallow_sea
4923	x 29	4924	x 29
4924	y 10	4925	y 10
4925	end	4926	blocksview 0
4926	arch flagstone_0
4927	x 29
4928	y 10
4929	end	4927	end
4930	arch shallow_sea	4928	arch shallow_sea
4931	x 29	4929	x 29
4932	y 11	4930	y 11
4933	end	4931	end
4934	arch flagstone_0	4932	arch flagstone_0
		4933	name safety buoy
4935	x 29	4934	x 29
4936	y 11	4935	y 11
		4936	blocksview 0
4937	end	4937	end
4938	arch shallow_sea	4938	arch shallow_sea
4939	x 29	4939	x 29
4940	y 12	4940	y 12
4941	end	4941	end
4942	arch flagstone_0	4942	arch flagstone_0
		4943	name safety buoy
4943	x 29	4944	x 29
4944	y 12	4945	y 12
		4946	blocksview 0
4945	end	4947	end
4946	arch beach	4948	arch beach
4947	x 29	4949	x 29
4948	y 13	4950	y 13
4949	end	4951	end
…		…
10526	@parse (\d+)	10528	@parse (\d+)
10527	@cond $state->{number} == $match->[0]	10529	@cond $state->{number} == $match->[0]
10528	@setstate guess	10530	@setstate guess
10529	@setstate number	10531	@setstate number
10530	@deltopic 1\|2\|3\|4\|5\|6\|7\|8\|9	10532	@deltopic 1\|2\|3\|4\|5\|6\|7\|8\|9
10531	@eval $who->pay_player (50 * 5)	10533	@eval $who->pay_player (1001005)
10532	Congrats, lad, here is your money!	10534	Congrats, lad, here is your money!
10533		10535
10534	@match *	10536	@match *
10535	@cond $state->{number}	10537	@cond $state->{number}
10536	@parse (\d+)	10538	@parse (\d+)
…		…
10550	@match *	10552	@match *
10551	@cond $state->{number}	10553	@cond $state->{number}
10552	Come on, lad, guess your number!	10554	Come on, lad, guess your number!
10553		10555
10554	@match start\|here is the money	10556	@match start\|here is the money
10555	@cond $who->pay_amount (50 * 2)	10557	@cond $who->pay_amount (1001002)
10556	@eval $state->{number} = 1 + int rand 9	10558	@eval $state->{number} = 1 + int rand 9
10557	@eval $state->{guess} = 0	10559	@eval $state->{guess} = 0
10558	@addtopic 1\|2\|3\|4\|5\|6\|7\|8\|9	10560	@addtopic 1\|2\|3\|4\|5\|6\|7\|8\|9
10559	Let me think of a number... Ok, give me your first guess!	10561	Let me think of a number... Ok, give me your first guess!
10560		10562
…		…
11403	elevation 7098	11405	elevation 7098
11404	x 49	11406	x 49
11405	y 36	11407	y 36
11406	end	11408	end
11407	arch fountain	11409	arch fountain
11408	name schmorp's pool	11410	name schmorp's and yuna's pool
11409	x 49	11411	x 49
11410	y 36	11412	y 36
11411	speed_left -41.599998	11413	speed_left -41.599998
11412	tag scorn	11414	tag scorn
11413	end	11415	end

Diff Legend

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

Comparing deliantra/maps/world/world_104_115.map (file contents): Revision 1.42 by root, Sat Dec 13 21:51:58 2008 UTC vs. Revision 1.48 by root, Mon Mar 23 06:22:21 2009 UTC

Diff Legend

Comparing deliantra/maps/world/world_104_115.map (file contents):
Revision 1.42 by root, Sat Dec 13 21:51:58 2008 UTC vs.
Revision 1.48 by root, Mon Mar 23 06:22:21 2009 UTC