[ViewVC] Diff of: cvs/deliantra/server/random

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.43 by root, Mon Sep 29 09:04:51 2008 UTC vs.
Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* placing treasure in maps, where appropriate. */	25	/* placing treasure in maps, where appropriate. */
40	#define LAST_OPTION 64 /* set this to the last real option, for random */	41	#define LAST_OPTION 64 /* set this to the last real option, for random */
41		42
42	#define NO_PASS_DOORS 0	43	#define NO_PASS_DOORS 0
43	#define PASS_DOORS 1	44	#define PASS_DOORS 1
44		45
		46	static object find_closest_monster (maptile map, int x, int y, random_map_params *RP);
		47	static object find_monster_in_room (maptile map, int x, int y, random_map_params *RP);
		48	static void find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP);
		49	static void find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP);
		50	static object place_chest (int treasureoptions, int x, int y, maptile map, maptile style_map, int n_treasures, random_map_params RP);
		51	static object *find_doors_in_room (maptile map, int x, int y, random_map_params *RP);
		52	static void lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP);
		53	static void find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP);
		54	static object *surround_by_doors (maptile map, char **layout, int x, int y, int opts);
		55
45	/* a macro to get a strongly centered random distribution,	56	/* a macro to get a strongly centered random distribution,
46	from 0 to x, centered at x/2 */	57	from 0 to x, centered at x/2 */
47	static int	58	static int
48	bc_random (int x)	59	bc_random (int x)
49	{	60	{
…		…
117	NO_PASS_DOORS is set. */	128	NO_PASS_DOORS is set. */
118	if (n_keys == 1)	129	if (n_keys == 1)
119	{	130	{
120	if (wall_blocked (map, x, y))	131	if (wall_blocked (map, x, y))
121	{	132	{
122	the_key->destroy (true);	133	the_key->destroy ();
123	return 0;	134	return 0;
124	}	135	}
125		136
126	the_keymaster = find_monster_in_room (map, x, y, RP);	137	the_keymaster = find_monster_in_room (map, x, y, RP);
127	if (!the_keymaster) /* if fail, find a spot to drop the key. */	138	if (!the_keymaster) /* if fail, find a spot to drop the key. */
…		…
143	keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);	154	keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
144	keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);	155	keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
145	keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);	156	keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
146	}	157	}
147		158
148	the_key->destroy (true);	159	the_key->destroy ();
149	return 1;	160	return 1;
150	}	161	}
151	}	162	}
152		163
153	if (the_keymaster)	164	if (the_keymaster)
…		…
322	}	333	}
323		334
324	/* put a chest into the map, near x and y, with the treasure style	335	/* put a chest into the map, near x and y, with the treasure style
325	determined (may be null, or may be a treasure list from lib/treasures,	336	determined (may be null, or may be a treasure list from lib/treasures,
326	if the global variable "treasurestyle" is set to that treasure list's name */	337	if the global variable "treasurestyle" is set to that treasure list's name */
327	object *	338	static object *
328	place_chest (int treasureoptions, int x, int y, maptile map, maptile style_map, int n_treasures, random_map_params *RP)	339	place_chest (int treasureoptions, int x, int y, maptile map, maptile style_map, int n_treasures, random_map_params *RP)
329	{	340	{
330	object the_chest = archetype::get (shstr_chest); / was "chest_2" */	341	object the_chest = archetype::get (shstr_chest); / was "chest_2" */
331		342
332	/* first, find a place to put the chest. */	343	/* first, find a place to put the chest. */
333	int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng	344	int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng
334	if (i == -1)	345	if (i == -1)
335	{	346	{
336	the_chest->destroy (true);	347	the_chest->destroy ();
337	return NULL;	348	return NULL;
338	}	349	}
339		350
340	int xl = x + freearr_x[i];	351	int xl = x + freearr_x[i];
341	int yl = y + freearr_y[i];	352	int yl = y + freearr_y[i];
…		…
355	if (tlist != NULL)	366	if (tlist != NULL)
356	for (ti = 0; ti < n_treasures; ti++)	367	for (ti = 0; ti < n_treasures; ti++)
357	{ /* use the treasure list */	368	{ /* use the treasure list */
358	object *new_treasure = style_map->pick_random_object (rmg_rndm);	369	object *new_treasure = style_map->pick_random_object (rmg_rndm);
359		370
360	insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);	371	insert_ob_in_ob (new_treasure->arch->instance (), the_chest);
361	}	372	}
362	else	373	else
363	{ /* use the style map */	374	{ /* use the style map */
364	the_chest->randomitems = tlist;	375	the_chest->randomitems = tlist;
365	the_chest->stats.hp = n_treasures;	376	the_chest->stats.hp = n_treasures;
…		…
409	the_chest->y = yl;	420	the_chest->y = yl;
410	insert_ob_in_map (the_chest, map, NULL, 0);	421	insert_ob_in_map (the_chest, map, NULL, 0);
411	return the_chest;	422	return the_chest;
412	}	423	}
413		424
414
415	/* finds the closest monster and returns him, regardless of doors	425	/* finds the closest monster and returns him, regardless of doors or walls */
416	or walls */	426	static object *
417	object *
418	find_closest_monster (maptile map, int x, int y, random_map_params RP)	427	find_closest_monster (maptile map, int x, int y, random_map_params RP)
419	{	428	{
420	int i;	429	int i;
421		430
422	for (i = 0; i < SIZEOFFREE; i++)	431	for (i = 0; i < SIZEOFFREE; i++)
…		…
440	return NULL;	449	return NULL;
441	}	450	}
442		451
443	/* both find_monster_in_room routines need to have access to this. */	452	/* both find_monster_in_room routines need to have access to this. */
444		453
445	object *theMonsterToFind;	454	static object *theMonsterToFind;
446		455
447	/* a recursive routine which will return a monster, eventually,if there is one.	456	/* a recursive routine which will return a monster, eventually,if there is one.
448	it does a check-off on the layout, converting 0's to 1's */	457	it does a check-off on the layout, converting 0's to 1's */
449		458	static object *
450	object *
451	find_monster_in_room_recursive (char *layout, maptile map, int x, int y, random_map_params *RP)	459	find_monster_in_room_recursive (char *layout, maptile map, int x, int y, random_map_params *RP)
452	{	460	{
453	int i, j;	461	int i, j;
454		462
455	/* if we've found a monster already, leave */	463	/* if we've found a monster already, leave */
…		…
491	return theMonsterToFind;	499	return theMonsterToFind;
492	}	500	}
493		501
494	/* sets up some data structures: the _recursive form does the	502	/* sets up some data structures: the _recursive form does the
495	real work. */	503	real work. */
496	object *	504	static object *
497	find_monster_in_room (maptile map, int x, int y, random_map_params RP)	505	find_monster_in_room (maptile map, int x, int y, random_map_params RP)
498	{	506	{
499	Layout layout2 (RP);	507	Layout layout2 (RP);
500		508
501	layout2->clear ();	509	layout2->clear ();
…		…
513		521
514	return theMonsterToFind;	522	return theMonsterToFind;
515	}	523	}
516		524
517	/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */	525	/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
518	int *room_free_spots_x;	526	static int *room_free_spots_x;
519	int *room_free_spots_y;	527	static int *room_free_spots_y;
520	int number_of_free_spots_in_room;	528	static int number_of_free_spots_in_room;
521		529
522	/* the workhorse routine, which finds the free spots in a room:	530	/* the workhorse routine, which finds the free spots in a room:
523	a datastructure of free points is set up, and a position chosen from	531	a datastructure of free points is set up, and a position chosen from
524	that datastructure. */	532	that datastructure. */
525	void	533	static void
526	find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP)	534	find_spot_in_room_recursive (char *layout, int x, int y, random_map_params RP)
527	{	535	{
528	int i, j;	536	int i, j;
529		537
530	/* bounds check x and y */	538	/* bounds check x and y */
…		…
548	find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);	556	find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
549		557
550	}	558	}
551		559
552	/* find a random non-blocked spot in this room to drop a key. */	560	/* find a random non-blocked spot in this room to drop a key. */
553	void	561	static void
554	find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP)	562	find_spot_in_room (maptile map, int x, int y, int kx, int ky, random_map_params RP)
555	{	563	{
556	char **layout2;	564	char **layout2;
557	int i, j;	565	int i, j;
558		566
…		…
591		599
592		600
593	/* searches the map for a spot with walls around it. The more	601	/* searches the map for a spot with walls around it. The more
594	walls the better, but it'll settle for 1 wall, or even 0, but	602	walls the better, but it'll settle for 1 wall, or even 0, but
595	it'll return 0 if no FREE spots are found.*/	603	it'll return 0 if no FREE spots are found.*/
596	void	604	static void
597	find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP)	605	find_enclosed_spot (maptile map, int cx, int cy, random_map_params RP)
598	{	606	{
599	int x, y;	607	int x, y;
600	int i;	608	int i;
601		609
…		…
666	*cx = -1;	674	*cx = -1;
667	*cy = -1;	675	*cy = -1;
668	}	676	}
669	}	677	}
670		678
671	void	679	static void
672	remove_monsters (int x, int y, maptile *map)	680	remove_monsters (int x, int y, maptile *map)
673	{	681	{
674	for (object *tmp = GET_MAP_OB (map, x, y); tmp; )	682	for (object *tmp = GET_MAP_OB (map, x, y); tmp; )
675	{	683	{
676	object *next = tmp->above;	684	object *next = tmp->above;
677		685
678	if (tmp->flag [FLAG_ALIVE])	686	if (tmp->flag [FLAG_ALIVE])
679	tmp->head_ ()->destroy (true);	687	tmp->head_ ()->destroy ();
680		688
681	tmp = next;	689	tmp = next;
682	}	690	}
683	}	691	}
684		692
685	/* surrounds the point x,y by doors, so as to enclose something, like	693	/* surrounds the point x,y by doors, so as to enclose something, like
686	a chest. It only goes as far as the 8 squares surrounding, and	694	a chest. It only goes as far as the 8 squares surrounding, and
687	it'll remove any monsters it finds.*/	695	it'll remove any monsters it finds.*/
688	object **	696	static object **
689	surround_by_doors (maptile map, char *layout, int x, int y, int opts)	697	surround_by_doors (maptile map, char *layout, int x, int y, int opts)
690	{	698	{
691	int i;	699	int i;
692	const char *doors[2];	700	const char *doors[2];
693	object **doorlist;	701	object **doorlist;
…		…
723	}	731	}
724		732
725	return doorlist;	733	return doorlist;
726	}	734	}
727		735
728
729	/* returns the first door in this square, or NULL if there isn't a door. */	736	/* returns the first door in this square, or NULL if there isn't a door. */
730	object *	737	static object *
731	door_in_square (maptile *map, int x, int y)	738	door_in_square (maptile *map, int x, int y)
732	{	739	{
733	object *tmp;
734
735	for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)	740	for (object *tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
736	if (tmp->type == DOOR \|\| tmp->type == LOCKED_DOOR)	741	if (tmp->type == DOOR \|\| tmp->type == LOCKED_DOOR)
737	return tmp;	742	return tmp;
		743
738	return NULL;	744	return NULL;
739	}	745	}
740		746
741	/* the workhorse routine, which finds the doors in a room */	747	/* the workhorse routine, which finds the doors in a room */
742	void	748	static void
743	find_doors_in_room_recursive (char *layout, maptile map, int x, int y, object *doorlist, int ndoors, random_map_params *RP)	749	find_doors_in_room_recursive (char *layout, maptile map, int x, int y, object *doorlist, int ndoors, random_map_params *RP)
744	{	750	{
745	int i, j;	751	int i, j;
746	object *door;	752	object *door;
747		753
…		…
782	doorlist, ndoors, RP);	788	doorlist, ndoors, RP);
783	}	789	}
784	}	790	}
785		791
786	/* find a random non-blocked spot in this room to drop a key. */	792	/* find a random non-blocked spot in this room to drop a key. */
787	object **	793	static object **
788	find_doors_in_room (maptile map, int x, int y, random_map_params RP)	794	find_doors_in_room (maptile map, int x, int y, random_map_params RP)
789	{	795	{
790	int i, j;	796	int i, j;
791	int ndoors = 0;	797	int ndoors = 0;
792		798
…		…
806	return doorlist;	812	return doorlist;
807	}	813	}
808		814
809	/* locks and/or hides all the doors in doorlist, or does nothing if	815	/* locks and/or hides all the doors in doorlist, or does nothing if
810	opts doesn't say to lock/hide doors. */	816	opts doesn't say to lock/hide doors. */
811	void	817	static void
812	lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP)	818	lock_and_hide_doors (object *doorlist, maptile map, int opts, random_map_params *RP)
813	{	819	{
814	object *door;	820	object *door;
815	int i;	821	int i;
816		822
…		…
824		830
825	door = doorlist[i];	831	door = doorlist[i];
826	new_door->face = door->face;	832	new_door->face = door->face;
827	new_door->x = door->x;	833	new_door->x = door->x;
828	new_door->y = door->y;	834	new_door->y = door->y;
829	door->destroy (true);	835	door->destroy ();
830	doorlist[i] = new_door;	836	doorlist[i] = new_door;
831	insert_ob_in_map (new_door, map, NULL, 0);	837	insert_ob_in_map (new_door, map, NULL, 0);
832	new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));	838	new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
833	keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);	839	keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
834	}	840	}
…		…
850	retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);	856	retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
851	retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);	857	retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
852		858
853	door->face = wallface->face;	859	door->face = wallface->face;
854		860
855	wallface->destroy (true);	861	wallface->destroy ();
856	}	862	}
857	}	863	}
858	}	864	}
859	}	865	}

Diff Legend

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

Comparing deliantra/server/random_maps/treasure.C (file contents): Revision 1.43 by root, Mon Sep 29 09:04:51 2008 UTC vs. Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC

Diff Legend

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.43 by root, Mon Sep 29 09:04:51 2008 UTC vs.
Revision 1.49 by root, Fri Mar 26 00:59:21 2010 UTC