ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/treasure.C
(Generate patch)

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.13 by root, Sun Dec 31 20:46:17 2006 UTC vs.
Revision 1.40 by root, Thu May 8 13:47:19 2008 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your 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 GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 22 */
24 23
25/* placing treasure in maps, where appropriate. */ 24/* placing treasure in maps, where appropriate. */
26
27
28 25
29#include <global.h> 26#include <global.h>
30#include <random_map.h> 27#include <random_map.h>
31#include <rproto.h> 28#include <rproto.h>
32 29
… …
43#define LAST_OPTION 64 /* set this to the last real option, for random */ 40#define LAST_OPTION 64 /* set this to the last real option, for random */
44 41
45#define NO_PASS_DOORS 0 42#define NO_PASS_DOORS 0
46#define PASS_DOORS 1 43#define PASS_DOORS 1
47 44
45/* a macro to get a strongly centered random distribution,
46 from 0 to x, centered at x/2 */
47static int
48bc_random (int x)
49{
50 return (rmg_rndm (x) + rmg_rndm (x) + rmg_rndm (x)) / 3;
51}
52
53static object *
54gen_key (const shstr &keycode)
55{
56 /* get a key and set its keycode */
57 object *key = archetype::get (shstr_key2);
58
59 key->slaying = keycode;
60 key->stats.food = 100;
61 key->speed_left = -1.f;
62 key->flag [FLAG_IS_USED_UP] = true;
63 key->set_speed (1.f / 300.f);
64
65 return key;
66}
67
68/* places keys in the map, preferably in something alive.
69 keycode is the key's code,
70 door_flag is either PASS_DOORS or NO_PASS_DOORS.
71 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
72 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
73 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
74
75 The idea is that you call keyplace on x,y where a door is, and it'll make
76 sure a key is placed on both sides of the door.
77*/
78static int
79keyplace (maptile *map, int x, int y, const shstr &keycode, int door_flag, int n_keys, random_map_params *RP)
80{
81 int i, j;
82 int kx = 0, ky = 0;
83 object *the_keymaster; /* the monster that gets the key. */
84 object *the_key = gen_key (keycode);
85
86 if (door_flag == PASS_DOORS)
87 {
88 int tries = 0;
89
90 the_keymaster = 0;
91 while (tries < 15 && !the_keymaster)
92 {
93 i = rmg_rndm (RP->Xsize - 2) + 1;
94 j = rmg_rndm (RP->Ysize - 2) + 1;
95 tries++;
96 the_keymaster = find_closest_monster (map, i, j, RP);
97 }
98
99 /* if we don't find a good keymaster, drop the key on the ground. */
100 if (!the_keymaster)
101 {
102 int freeindex;
103
104 freeindex = -1;
105 for (tries = 0; tries < 15 && freeindex == -1; tries++)
106 {
107 kx = rmg_rndm (RP->Xsize - 2) + 1;
108 ky = rmg_rndm (RP->Ysize - 2) + 1;
109 freeindex = find_free_spot (the_key, map, kx, ky, 1, SIZEOFFREE1 + 1);
110 }
111
112 // can freeindex ever be < 0?
113 if (freeindex >= 0)
114 {
115 kx += freearr_x [freeindex];
116 ky += freearr_y [freeindex];
117 }
118 }
119 }
120 else
121 { /* NO_PASS_DOORS --we have to work harder. */
122 /* don't try to keyplace if we're sitting on a blocked square and
123 NO_PASS_DOORS is set. */
124 if (n_keys == 1)
125 {
126 if (wall_blocked (map, x, y))
127 {
128 the_key->destroy ();
129 return 0;
130 }
131
132 the_keymaster = find_monster_in_room (map, x, y, RP);
133 if (!the_keymaster) /* if fail, find a spot to drop the key. */
134 find_spot_in_room (map, x, y, &kx, &ky, RP);
135 }
136 else
137 {
138 int sum = 0; /* count how many keys we actually place */
139
140 /* I'm lazy, so just try to place in all 4 directions. */
141 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
142 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
143 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
144 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
145
146 if (sum < 2) /* we might have made a disconnected map-place more keys. */
147 { /* diagonally this time. */
148 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
149 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
150 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
151 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
152 }
153
154 the_key->destroy ();
155 return 1;
156 }
157 }
158
159 if (the_keymaster)
160 the_keymaster->head_ ()->insert (the_key);
161 else
162 {
163 the_key->x = kx;
164 the_key->y = ky;
165 insert_ob_in_map (the_key, map, NULL, 0);
166 }
167
168 return 1;
169}
48 170
49/* returns true if square x,y has P_NO_PASS set, which is true for walls 171/* returns true if square x,y has P_NO_PASS set, which is true for walls
50 * and doors but not monsters. 172 * and doors but not monsters.
51 * This function is not map tile aware. 173 * This function is not map tile aware.
52 */ 174 */
53
54int 175int
55wall_blocked (maptile *m, int x, int y) 176wall_blocked (maptile *m, int x, int y)
56{ 177{
57 int r;
58
59 if (OUT_OF_REAL_MAP (m, x, y)) 178 if (OUT_OF_REAL_MAP (m, x, y))
60 return 1; 179 return 1;
180
181 m->at (x, y).update ();
61 r = GET_MAP_MOVE_BLOCK (m, x, y) & ~MOVE_BLOCK_DEFAULT; 182 return GET_MAP_MOVE_BLOCK (m, x, y) & MOVE_WALK;
62 return r;
63} 183}
64 184
65/* place treasures in the map, given the 185/* place treasures in the map, given the
66map, (required) 186map, (required)
67layout, (required) 187layout, (required)
68treasure style (may be empty or NULL, or "none" to cause no treasure.) 188treasure style (may be empty or NULL, or "none" to cause no treasure.)
69treasureoptions (may be 0 for random choices or positive) 189treasureoptions (may be 0 for random choices or positive)
70*/ 190*/
71
72void 191void
73place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP) 192place_treasure (maptile *map, char **layout, char *treasure_style, int treasureoptions, random_map_params *RP)
74{ 193{
75 char styledirname[1024]; 194 char styledirname[1024];
76 char stylefilepath[1024]; 195 char stylefilepath[1024];
… …
79 198
80 /* bail out if treasure isn't wanted. */ 199 /* bail out if treasure isn't wanted. */
81 if (treasure_style) 200 if (treasure_style)
82 if (!strcmp (treasure_style, "none")) 201 if (!strcmp (treasure_style, "none"))
83 return; 202 return;
203
84 if (treasureoptions <= 0) 204 if (treasureoptions <= 0)
85 treasureoptions = RANDOM () % (2 * LAST_OPTION); 205 treasureoptions = rmg_rndm (2 * LAST_OPTION);
86 206
87 /* filter out the mutually exclusive options */ 207 /* filter out the mutually exclusive options */
88 if ((treasureoptions & RICH) && (treasureoptions & SPARSE)) 208 if ((treasureoptions & RICH) && (treasureoptions & SPARSE))
89 { 209 {
90 if (RANDOM () % 2) 210 if (rmg_rndm (2))
91 treasureoptions -= 1; 211 treasureoptions -= 1;
92 else 212 else
93 treasureoptions -= 2; 213 treasureoptions -= 2;
94 } 214 }
95 215
96 /* pick the number of treasures */ 216 /* pick the number of treasures */
97 if (treasureoptions & SPARSE) 217 if (treasureoptions & SPARSE)
98 num_treasures = BC_RANDOM (RP->total_map_hp / 600 + RP->difficulty / 2 + 1); 218 num_treasures = bc_random (RP->total_map_hp / 600 + RP->difficulty / 2 + 1);
99 else if (treasureoptions & RICH) 219 else if (treasureoptions & RICH)
100 num_treasures = BC_RANDOM (RP->total_map_hp / 150 + 2 * RP->difficulty + 1); 220 num_treasures = bc_random (RP->total_map_hp / 150 + 2 * RP->difficulty + 1);
101 else 221 else
102 num_treasures = BC_RANDOM (RP->total_map_hp / 300 + RP->difficulty + 1); 222 num_treasures = bc_random (RP->total_map_hp / 300 + RP->difficulty + 1);
103 223
104 if (num_treasures <= 0) 224 if (num_treasures <= 0)
105 return; 225 return;
106 226
107 /* get the style map */ 227 /* get the style map */
108 sprintf (styledirname, "%s", "/styles/treasurestyles"); 228 sprintf (styledirname, "%s", "/styles/treasurestyles");
109 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style); 229 sprintf (stylefilepath, "%s/%s", styledirname, treasure_style);
110 style_map = find_style (styledirname, treasure_style, -1); 230 style_map = find_style (styledirname, treasure_style, -1);
111 231
232 if (!style_map)
233 {
234 LOG (llevError, "unable to load style map %s %s.\n", styledirname, treasure_style);
235 return;
236 }
237
112 /* all the treasure at one spot in the map. */ 238 /* all the treasure at one spot in the map. */
113 if (treasureoptions & CONCENTRATED) 239 if (treasureoptions & CONCENTRATED)
114 { 240 {
115
116 /* map_layout_style global, and is previously set */ 241 /* map_layout_style global, and is previously set */
117 switch (RP->map_layout_style) 242 switch (RP->map_layout_style)
118 { 243 {
119 case LAYOUT_ONION: 244 case LAYOUT_ONION:
120 case LAYOUT_SPIRAL: 245 case LAYOUT_SPIRAL:
… …
128 for (j = 0; j < RP->Ysize; j++) 253 for (j = 0; j < RP->Ysize; j++)
129 { 254 {
130 if (layout[i][j] == 'C' || layout[i][j] == '>') 255 if (layout[i][j] == 'C' || layout[i][j] == '>')
131 { 256 {
132 int tdiv = RP->symmetry_used; 257 int tdiv = RP->symmetry_used;
133 object **doorlist;
134 object *chest; 258 object *chest;
135 259
136 if (tdiv == 3) 260 if (tdiv == 3)
137 tdiv = 2; /* this symmetry uses a divisor of 2 */ 261 tdiv = 2; /* this symmetry uses a divisor of 2 */
262
138 /* don't put a chest on an exit. */ 263 /* don't put a chest on an exit. */
139 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP); 264 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures / tdiv, RP);
265
140 if (!chest) 266 if (!chest)
141 continue; /* if no chest was placed NEXT */ 267 continue; /* if no chest was placed NEXT */
268
142 if (treasureoptions & (DOORED | HIDDEN)) 269 if (treasureoptions & (DOORED | HIDDEN))
143 { 270 {
144 doorlist = find_doors_in_room (map, i, j, RP); 271 object **doorlist = find_doors_in_room (map, i, j, RP);
145 lock_and_hide_doors (doorlist, map, treasureoptions, RP); 272 lock_and_hide_doors (doorlist, map, treasureoptions, RP);
146 free (doorlist); 273 free (doorlist);
147 } 274 }
148 } 275 }
149 } 276 }
150 } 277 }
151 break; 278 break;
152 } 279 }
280
153 default: 281 default:
154 { 282 {
155 int i, j, tries; 283 int i, j, tries;
156 object *chest; 284 object *chest;
157 object **doorlist; 285 object **doorlist;
158 286
159 i = j = -1; 287 i = j = -1;
160 tries = 0; 288 tries = 0;
161 while (i == -1 && tries < 100) 289 while (i == -1 && tries < 100)
162 { 290 {
163 i = RANDOM () % (RP->Xsize - 2) + 1; 291 i = rmg_rndm (RP->Xsize - 2) + 1;
164 j = RANDOM () % (RP->Ysize - 2) + 1; 292 j = rmg_rndm (RP->Ysize - 2) + 1;
165 find_enclosed_spot (map, &i, &j, RP); 293 find_enclosed_spot (map, &i, &j, RP);
294
166 if (wall_blocked (map, i, j)) 295 if (wall_blocked (map, i, j))
167 i = -1; 296 i = -1;
297
168 tries++; 298 tries++;
169 } 299 }
300
170 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP); 301 chest = place_chest (treasureoptions, i, j, map, style_map, num_treasures, RP);
302
171 if (!chest) 303 if (!chest)
172 return; 304 return;
305
173 i = chest->x; 306 i = chest->x;
174 j = chest->y; 307 j = chest->y;
175 if (treasureoptions & (DOORED | HIDDEN)) 308 if (treasureoptions & (DOORED | HIDDEN))
176 { 309 {
177 doorlist = surround_by_doors (map, layout, i, j, treasureoptions); 310 doorlist = surround_by_doors (map, layout, i, j, treasureoptions);
… …
185 { /* DIFFUSE treasure layout */ 318 { /* DIFFUSE treasure layout */
186 int ti, i, j; 319 int ti, i, j;
187 320
188 for (ti = 0; ti < num_treasures; ti++) 321 for (ti = 0; ti < num_treasures; ti++)
189 { 322 {
190 i = RANDOM () % (RP->Xsize - 2) + 1; 323 i = rmg_rndm (RP->Xsize - 2) + 1;
191 j = RANDOM () % (RP->Ysize - 2) + 1; 324 j = rmg_rndm (RP->Ysize - 2) + 1;
192 place_chest (treasureoptions, i, j, map, style_map, 1, RP); 325 place_chest (treasureoptions, i, j, map, style_map, 1, RP);
193 } 326 }
194 } 327 }
195} 328}
196 329
197/* put a chest into the map, near x and y, with the treasure style 330/* put a chest into the map, near x and y, with the treasure style
198 determined (may be null, or may be a treasure list from lib/treasures, 331 determined (may be null, or may be a treasure list from lib/treasures,
199 if the global variable "treasurestyle" is set to that treasure list's name */ 332 if the global variable "treasurestyle" is set to that treasure list's name */
200
201object * 333object *
202place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP) 334place_chest (int treasureoptions, int x, int y, maptile *map, maptile *style_map, int n_treasures, random_map_params *RP)
203{ 335{
204 object *the_chest;
205 int i, xl, yl;
206
207 the_chest = get_archetype ("chest"); /* was "chest_2" */ 336 object *the_chest = archetype::get (shstr_chest); /* was "chest_2" */
208 337
209 /* first, find a place to put the chest. */ 338 /* first, find a place to put the chest. */
210 i = find_first_free_spot (the_chest, map, x, y); 339 int i = find_first_free_spot (the_chest, map, x, y); // this call uses the main rng
211 if (i == -1) 340 if (i == -1)
212 { 341 {
213 the_chest->destroy (); 342 the_chest->destroy ();
214 return NULL; 343 return NULL;
215 } 344 }
345
216 xl = x + freearr_x[i]; 346 int xl = x + freearr_x[i];
217 yl = y + freearr_y[i]; 347 int yl = y + freearr_y[i];
218 348
219 /* if the placement is blocked, return a fail. */ 349 /* if the placement is blocked, return a fail. */
220 if (wall_blocked (map, xl, yl)) 350 if (wall_blocked (map, xl, yl))
221 return 0; 351 return 0;
222 352
… …
229 treasurelist *tlist = find_treasurelist (RP->treasurestyle); 359 treasurelist *tlist = find_treasurelist (RP->treasurestyle);
230 360
231 if (tlist != NULL) 361 if (tlist != NULL)
232 for (ti = 0; ti < n_treasures; ti++) 362 for (ti = 0; ti < n_treasures; ti++)
233 { /* use the treasure list */ 363 { /* use the treasure list */
234 object *new_treasure = pick_random_object (style_map); 364 object *new_treasure = style_map->pick_random_object (rmg_rndm);
235 365
236 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest); 366 insert_ob_in_ob (arch_to_object (new_treasure->arch), the_chest);
237 } 367 }
238 else 368 else
239 { /* use the style map */ 369 { /* use the style map */
240 the_chest->randomitems = tlist; 370 the_chest->randomitems = tlist;
241 the_chest->stats.hp = n_treasures; 371 the_chest->stats.hp = n_treasures;
242 } 372 }
243#endif 373#endif
244 { /* neither style_map no treasure list given */ 374 { /* neither style_map no treasure list given */
245 treasurelist *tlist = find_treasurelist ("chest"); 375 treasurelist *tlist = treasurelist::find ("chest");
246 376
247 the_chest->randomitems = tlist; 377 the_chest->randomitems = tlist;
248 the_chest->stats.hp = n_treasures; 378 the_chest->stats.hp = n_treasures;
249 } 379 }
250 380
251 /* stick a trap in the chest if required */ 381 /* stick a trap in the chest if required */
252 if (treasureoptions & TRAPPED) 382 if (treasureoptions & TRAPPED)
253 { 383 {
254 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1); 384 maptile *trap_map = find_style ("/styles/trapstyles", "traps", -1);
255 object *the_trap;
256 385
257 if (trap_map) 386 if (trap_map)
258 { 387 {
259 the_trap = pick_random_object (trap_map); 388 object *the_trap = trap_map->pick_random_object (rmg_rndm);
389
260 the_trap->stats.Cha = 10 + RP->difficulty; 390 the_trap->stats.Cha = 10 + RP->difficulty;
261 the_trap->level = BC_RANDOM ((3 * RP->difficulty) / 2); 391 the_trap->level = bc_random ((3 * RP->difficulty) / 2);
392
262 if (the_trap) 393 if (the_trap)
263 { 394 {
264 object *new_trap; 395 object *new_trap = the_trap->arch->instance ();//TODO: why not clone?
265 396
266 new_trap = arch_to_object (the_trap->arch);
267 new_trap->copy_to (the_trap);
268 new_trap->x = x; 397 new_trap->x = x;
269 new_trap->y = y; 398 new_trap->y = y;
270 insert_ob_in_ob (new_trap, the_chest); 399 insert_ob_in_ob (new_trap, the_chest);
271 } 400 }
272 } 401 }
273 } 402 }
274 403
275 /* set the chest lock code, and call the keyplacer routine with 404 /* set the chest lock code, and call the keyplacer routine with
276 the lockcode. It's not worth bothering to lock the chest if 405 the lockcode. It's not worth bothering to lock the chest if
277 there's only 1 treasure.... */ 406 there's only 1 treasure.... */
278
279 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1) 407 if ((treasureoptions & KEYREQUIRED) && n_treasures > 1)
280 { 408 {
281 char keybuf[1024]; 409 the_chest->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
282
283 sprintf (keybuf, "%d", (int) RANDOM ());
284 the_chest->slaying = keybuf;
285 keyplace (map, x, y, keybuf, PASS_DOORS, 1, RP); 410 keyplace (map, x, y, the_chest->slaying, PASS_DOORS, 1, RP);
286 } 411 }
287 412
288 /* actually place the chest. */ 413 /* actually place the chest. */
289 the_chest->x = xl; 414 the_chest->x = xl;
290 the_chest->y = yl; 415 the_chest->y = yl;
… …
319 } 444 }
320 } 445 }
321 return NULL; 446 return NULL;
322} 447}
323 448
324
325
326/* places keys in the map, preferably in something alive.
327 keycode is the key's code,
328 door_flag is either PASS_DOORS or NO_PASS_DOORS.
329 NO_PASS_DOORS won't cross doors or walls to keyplace, PASS_DOORS will.
330 if n_keys is 1, it will place 1 key. if n_keys >1, it will place 2-4 keys:
331 it will place 2-4 keys regardless of what nkeys is provided nkeys > 1.
332
333 The idea is that you call keyplace on x,y where a door is, and it'll make
334 sure a key is placed on both sides of the door.
335*/
336
337int
338keyplace (maptile *map, int x, int y, char *keycode, int door_flag, int n_keys, random_map_params *RP)
339{
340 int i, j;
341 int kx, ky;
342 object *the_keymaster; /* the monster that gets the key. */
343 object *the_key;
344
345 /* get a key and set its keycode */
346 the_key = get_archetype ("key2");
347 the_key->slaying = keycode;
348
349 if (door_flag == PASS_DOORS)
350 {
351 int tries = 0;
352
353 the_keymaster = NULL;
354 while (tries < 15 && the_keymaster == NULL)
355 {
356 i = (RANDOM () % (RP->Xsize - 2)) + 1;
357 j = (RANDOM () % (RP->Ysize - 2)) + 1;
358 tries++;
359 the_keymaster = find_closest_monster (map, i, j, RP);
360 }
361 /* if we don't find a good keymaster, drop the key on the ground. */
362 if (the_keymaster == NULL)
363 {
364 int freeindex;
365
366 freeindex = -1;
367 for (tries = 0; tries < 15 && freeindex == -1; tries++)
368 {
369 kx = (RANDOM () % (RP->Xsize - 2)) + 1;
370 ky = (RANDOM () % (RP->Ysize - 2)) + 1;
371 freeindex = find_first_free_spot (the_key, map, kx, ky);
372 }
373 if (freeindex != -1)
374 {
375 kx += freearr_x[freeindex];
376 ky += freearr_y[freeindex];
377 }
378 }
379 }
380 else
381 { /* NO_PASS_DOORS --we have to work harder. */
382 /* don't try to keyplace if we're sitting on a blocked square and
383 NO_PASS_DOORS is set. */
384 if (n_keys == 1)
385 {
386 if (wall_blocked (map, x, y))
387 return 0;
388 the_keymaster = find_monster_in_room (map, x, y, RP);
389 if (the_keymaster == NULL) /* if fail, find a spot to drop the key. */
390 find_spot_in_room (map, x, y, &kx, &ky, RP);
391 }
392 else
393 {
394 int sum = 0; /* count how many keys we actually place */
395
396 /* I'm lazy, so just try to place in all 4 directions. */
397 sum += keyplace (map, x + 1, y, keycode, NO_PASS_DOORS, 1, RP);
398 sum += keyplace (map, x, y + 1, keycode, NO_PASS_DOORS, 1, RP);
399 sum += keyplace (map, x - 1, y, keycode, NO_PASS_DOORS, 1, RP);
400 sum += keyplace (map, x, y - 1, keycode, NO_PASS_DOORS, 1, RP);
401 if (sum < 2) /* we might have made a disconnected map-place more keys. */
402 { /* diagnoally this time. */
403 keyplace (map, x + 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
404 keyplace (map, x + 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
405 keyplace (map, x - 1, y + 1, keycode, NO_PASS_DOORS, 1, RP);
406 keyplace (map, x - 1, y - 1, keycode, NO_PASS_DOORS, 1, RP);
407 }
408 return 1;
409 }
410 }
411
412 if (the_keymaster == NULL)
413 {
414 the_key->x = kx;
415 the_key->y = ky;
416 insert_ob_in_map (the_key, map, NULL, 0);
417 return 1;
418 }
419
420 insert_ob_in_ob (the_key, the_keymaster);
421 return 1;
422}
423
424
425
426/* both find_monster_in_room routines need to have access to this. */ 449/* both find_monster_in_room routines need to have access to this. */
427 450
428object *theMonsterToFind; 451object *theMonsterToFind;
429 452
430/* a recursive routine which will return a monster, eventually,if there is one. 453/* a recursive routine which will return a monster, eventually,if there is one.
… …
462 return theMonsterToFind; 485 return theMonsterToFind;
463 } 486 }
464 } 487 }
465 488
466 /* now search all the 8 squares around recursively for a monster,in random order */ 489 /* now search all the 8 squares around recursively for a monster,in random order */
467 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 490 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
468 { 491 {
469 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 492 theMonsterToFind = find_monster_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
470 if (theMonsterToFind != NULL) 493 if (theMonsterToFind != NULL)
471 return theMonsterToFind; 494 return theMonsterToFind;
472 } 495 }
496
473 return theMonsterToFind; 497 return theMonsterToFind;
474} 498}
475
476 499
477/* sets up some data structures: the _recursive form does the 500/* sets up some data structures: the _recursive form does the
478 real work. */ 501 real work. */
479
480object * 502object *
481find_monster_in_room (maptile *map, int x, int y, random_map_params *RP) 503find_monster_in_room (maptile *map, int x, int y, random_map_params *RP)
482{ 504{
483 char **layout2; 505 Layout layout2 (RP);
484 int i, j; 506
507 layout2->clear ();
508
509 /* allocate and copy the layout, converting C to 0. */
510 for (int i = 0; i < layout2->w; i++)
511 for (int j = 0; j < layout2->h; j++)
512 if (wall_blocked (map, i, j))
513 layout2[i][j] = '#';
485 514
486 theMonsterToFind = 0; 515 theMonsterToFind = 0;
487 layout2 = (char **) calloc (sizeof (char *), RP->Xsize);
488 /* allocate and copy the layout, converting C to 0. */
489 for (i = 0; i < RP->Xsize; i++)
490 {
491 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
492 for (j = 0; j < RP->Ysize; j++)
493 {
494 if (wall_blocked (map, i, j))
495 layout2[i][j] = '#';
496 }
497 }
498 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP); 516 theMonsterToFind = find_monster_in_room_recursive (layout2, map, x, y, RP);
499 517
500 /* deallocate the temp. layout */ 518 layout2.free ();
501 for (i = 0; i < RP->Xsize; i++)
502 {
503 free (layout2[i]);
504 }
505 free (layout2);
506 519
507 return theMonsterToFind; 520 return theMonsterToFind;
508} 521}
509
510
511
512 522
513/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */ 523/* a datastructure needed by find_spot_in_room and find_spot_in_room_recursive */
514int *room_free_spots_x; 524int *room_free_spots_x;
515int *room_free_spots_y; 525int *room_free_spots_y;
516int number_of_free_spots_in_room; 526int number_of_free_spots_in_room;
517 527
518/* the workhorse routine, which finds the free spots in a room: 528/* the workhorse routine, which finds the free spots in a room:
519a datastructure of free points is set up, and a position chosen from 529a datastructure of free points is set up, and a position chosen from
520that datastructure. */ 530that datastructure. */
521
522void 531void
523find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP) 532find_spot_in_room_recursive (char **layout, int x, int y, random_map_params *RP)
524{ 533{
525 int i, j; 534 int i, j;
526 535
… …
537 /* check off this point */ 546 /* check off this point */
538 layout[x][y] = 1; 547 layout[x][y] = 1;
539 room_free_spots_x[number_of_free_spots_in_room] = x; 548 room_free_spots_x[number_of_free_spots_in_room] = x;
540 room_free_spots_y[number_of_free_spots_in_room] = y; 549 room_free_spots_y[number_of_free_spots_in_room] = y;
541 number_of_free_spots_in_room++; 550 number_of_free_spots_in_room++;
551
542 /* now search all the 8 squares around recursively for free spots,in random order */ 552 /* now search all the 8 squares around recursively for free spots,in random order */
543 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 553 for (i = rmg_rndm (8), j = 0; j < 8 && theMonsterToFind == NULL; i++, j++)
544 {
545 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP); 554 find_spot_in_room_recursive (layout, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], RP);
546 }
547 555
548} 556}
549 557
550/* find a random non-blocked spot in this room to drop a key. */ 558/* find a random non-blocked spot in this room to drop a key. */
551void 559void
… …
562 /* allocate and copy the layout, converting C to 0. */ 570 /* allocate and copy the layout, converting C to 0. */
563 for (i = 0; i < RP->Xsize; i++) 571 for (i = 0; i < RP->Xsize; i++)
564 { 572 {
565 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize); 573 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
566 for (j = 0; j < RP->Ysize; j++) 574 for (j = 0; j < RP->Ysize; j++)
567 {
568 if (wall_blocked (map, i, j)) 575 if (wall_blocked (map, i, j))
569 layout2[i][j] = '#'; 576 layout2[i][j] = '#';
570 }
571 } 577 }
572 578
573 /* setup num_free_spots and room_free_spots */ 579 /* setup num_free_spots and room_free_spots */
574 find_spot_in_room_recursive (layout2, x, y, RP); 580 find_spot_in_room_recursive (layout2, x, y, RP);
575 581
576 if (number_of_free_spots_in_room > 0) 582 if (number_of_free_spots_in_room > 0)
577 { 583 {
578 i = RANDOM () % number_of_free_spots_in_room; 584 i = rmg_rndm (number_of_free_spots_in_room);
579 *kx = room_free_spots_x[i]; 585 *kx = room_free_spots_x[i];
580 *ky = room_free_spots_y[i]; 586 *ky = room_free_spots_y[i];
581 } 587 }
582 588
583 /* deallocate the temp. layout */ 589 /* deallocate the temp. layout */
584 for (i = 0; i < RP->Xsize; i++) 590 for (i = 0; i < RP->Xsize; i++)
585 {
586 free (layout2[i]); 591 free (layout2[i]);
587 } 592
588 free (layout2); 593 free (layout2);
589 free (room_free_spots_x); 594 free (room_free_spots_x);
590 free (room_free_spots_y); 595 free (room_free_spots_y);
591} 596}
592 597
593 598
594/* searches the map for a spot with walls around it. The more 599/* searches the map for a spot with walls around it. The more
595 walls the better, but it'll settle for 1 wall, or even 0, but 600 walls the better, but it'll settle for 1 wall, or even 0, but
596 it'll return 0 if no FREE spots are found.*/ 601 it'll return 0 if no FREE spots are found.*/
597
598void 602void
599find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP) 603find_enclosed_spot (maptile *map, int *cx, int *cy, random_map_params *RP)
600{ 604{
601 int x, y; 605 int x, y;
602 int i; 606 int i;
… …
653 *cy = ly; 657 *cy = ly;
654 return; 658 return;
655 } 659 }
656 } 660 }
657 /* give up and return the closest free spot. */ 661 /* give up and return the closest free spot. */
658 i = find_first_free_spot (&archetype::find ("chest")->clone, map, x, y); 662 i = find_free_spot (archetype::find (shstr_chest), map, x, y, 1, SIZEOFFREE1 + 1);
659 if (i != -1 && i <= SIZEOFFREE1) 663
664 if (i != -1)
660 { 665 {
661 *cx = x + freearr_x[i]; 666 *cx = x + freearr_x[i];
662 *cy = y + freearr_y[i]; 667 *cy = y + freearr_y[i];
663 return; 668 }
669 else
664 } 670 {
665 /* indicate failure */ 671 /* indicate failure */
672 *cx = -1;
666 *cx = *cy = -1; 673 *cy = -1;
674 }
667} 675}
668
669 676
670void 677void
671remove_monsters (int x, int y, maptile *map) 678remove_monsters (int x, int y, maptile *map)
672{ 679{
673 object *tmp; 680 object *tmp;
674 681
675 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 682 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
676 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 683 if (QUERY_FLAG (tmp, FLAG_ALIVE))
677 { 684 {
678 if (tmp->head) 685 if (tmp->head)
679 tmp = tmp->head; 686 tmp = tmp->head;
680 tmp->remove (); 687 tmp->remove ();
… …
683 if (tmp == NULL) 690 if (tmp == NULL)
684 break; 691 break;
685 }; 692 };
686} 693}
687 694
688
689/* surrounds the point x,y by doors, so as to enclose something, like 695/* surrounds the point x,y by doors, so as to enclose something, like
690 a chest. It only goes as far as the 8 squares surrounding, and 696 a chest. It only goes as far as the 8 squares surrounding, and
691 it'll remove any monsters it finds.*/ 697 it'll remove any monsters it finds.*/
692
693object ** 698object **
694surround_by_doors (maptile *map, char **layout, int x, int y, int opts) 699surround_by_doors (maptile *map, char **layout, int x, int y, int opts)
695{ 700{
696 int i; 701 int i;
697 char *doors[2]; 702 const char *doors[2];
698 object **doorlist; 703 object **doorlist;
699 int ndoors_made = 0; 704 int ndoors_made = 0;
700 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */ 705 doorlist = (object **) calloc (9, sizeof (object *)); /* 9 doors so we can hold termination null */
701 706
702 /* this is a list we pick from, for horizontal and vertical doors */ 707 /* this is a list we pick from, for horizontal and vertical doors */
… …
714 /* place doors in all the 8 adjacent unblocked squares. */ 719 /* place doors in all the 8 adjacent unblocked squares. */
715 for (i = 1; i < 9; i++) 720 for (i = 1; i < 9; i++)
716 { 721 {
717 int x1 = x + freearr_x[i], y1 = y + freearr_y[i]; 722 int x1 = x + freearr_x[i], y1 = y + freearr_y[i];
718 723
719 if (!wall_blocked (map, x1, y1) || layout[x1][y1] == '>') 724 if (!wall_blocked (map, x1, y1) && layout[x1][y1] == '>')
720 { /* place a door */ 725 { /* place a door */
726 remove_monsters (x1, y1, map);
727
721 object *new_door = get_archetype ((freearr_x[i] == 0) ? doors[1] : doors[0]); 728 object *new_door = get_archetype (freearr_x[i] == 0 ? doors[1] : doors[0]);
722 729 map->insert (new_door, x1, y1);
723 new_door->x = x + freearr_x[i];
724 new_door->y = y + freearr_y[i];
725 remove_monsters (new_door->x, new_door->y, map);
726 insert_ob_in_map (new_door, map, NULL, 0);
727 doorlist[ndoors_made] = new_door; 730 doorlist[ndoors_made] = new_door;
728 ndoors_made++; 731 ndoors_made++;
729 } 732 }
730 } 733 }
734
731 return doorlist; 735 return doorlist;
732} 736}
733 737
734 738
735/* returns the first door in this square, or NULL if there isn't a door. */ 739/* returns the first door in this square, or NULL if there isn't a door. */
… …
741 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above) 745 for (tmp = GET_MAP_OB (map, x, y); tmp != NULL; tmp = tmp->above)
742 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR) 746 if (tmp->type == DOOR || tmp->type == LOCKED_DOOR)
743 return tmp; 747 return tmp;
744 return NULL; 748 return NULL;
745} 749}
746
747 750
748/* the workhorse routine, which finds the doors in a room */ 751/* the workhorse routine, which finds the doors in a room */
749void 752void
750find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP) 753find_doors_in_room_recursive (char **layout, maptile *map, int x, int y, object **doorlist, int *ndoors, random_map_params *RP)
751{ 754{
… …
766 layout[x][y] = 1; 769 layout[x][y] = 1;
767 door = door_in_square (map, x, y); 770 door = door_in_square (map, x, y);
768 if (door) 771 if (door)
769 { 772 {
770 doorlist[*ndoors] = door; 773 doorlist[*ndoors] = door;
774
771 if (*ndoors > 1022) /* eek! out of memory */ 775 if (*ndoors > 1022) /* eek! out of memory */
772 { 776 {
773 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n"); 777 LOG (llevError, "find_doors_in_room_recursive:Too many doors for memory allocated!\n");
774 return; 778 return;
775 } 779 }
… …
778 } 782 }
779 } 783 }
780 else 784 else
781 { 785 {
782 layout[x][y] = 1; 786 layout[x][y] = 1;
787
783 /* now search all the 8 squares around recursively for free spots,in random order */ 788 /* now search all the 8 squares around recursively for free spots,in random order */
784 for (i = RANDOM () % 8, j = 0; j < 8 && theMonsterToFind == NULL; i++, j++) 789 for (i = rmg_rndm (8), j = 0; j < 8 && !theMonsterToFind; i++, j++)
785 find_doors_in_room_recursive (layout, map, x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1], doorlist, ndoors, RP); 790 find_doors_in_room_recursive (layout, map,
791 x + freearr_x[i % 8 + 1], y + freearr_y[i % 8 + 1],
792 doorlist, ndoors, RP);
786 } 793 }
787} 794}
788 795
789/* find a random non-blocked spot in this room to drop a key. */ 796/* find a random non-blocked spot in this room to drop a key. */
790object ** 797object **
791find_doors_in_room (maptile *map, int x, int y, random_map_params *RP) 798find_doors_in_room (maptile *map, int x, int y, random_map_params *RP)
792{ 799{
793 char **layout2;
794 object **doorlist;
795 int i, j; 800 int i, j;
796 int ndoors = 0; 801 int ndoors = 0;
797 802
798 doorlist = (object **) calloc (sizeof (int), 1024); 803 object **doorlist = (object **)calloc (sizeof (int), 1024);
799 804
800 layout2 = (char **) calloc (sizeof (char *), RP->Xsize); 805 LayoutData layout2 (RP->Xsize, RP->Ysize);
806 layout2.clear ();
807
801 /* allocate and copy the layout, converting C to 0. */ 808 /* allocate and copy the layout, converting C to 0. */
802 for (i = 0; i < RP->Xsize; i++) 809 for (i = 0; i < RP->Xsize; i++)
803 {
804 layout2[i] = (char *) calloc (sizeof (char), RP->Ysize);
805 for (j = 0; j < RP->Ysize; j++) 810 for (j = 0; j < RP->Ysize; j++)
806 { 811 layout2[i][j] = wall_blocked (map, i, j) ? '#' : 0;
807 if (wall_blocked (map, i, j))
808 layout2[i][j] = '#';
809 }
810 }
811 812
812 /* setup num_free_spots and room_free_spots */ 813 /* setup num_free_spots and room_free_spots */
813 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP); 814 find_doors_in_room_recursive (layout2, map, x, y, doorlist, &ndoors, RP);
814 815
815 /* deallocate the temp. layout */
816 for (i = 0; i < RP->Xsize; i++)
817 free (layout2[i]);
818
819 free (layout2);
820 return doorlist; 816 return doorlist;
821} 817}
822
823
824 818
825/* locks and/or hides all the doors in doorlist, or does nothing if 819/* locks and/or hides all the doors in doorlist, or does nothing if
826 opts doesn't say to lock/hide doors. */ 820 opts doesn't say to lock/hide doors. */
827
828void 821void
829lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP) 822lock_and_hide_doors (object **doorlist, maptile *map, int opts, random_map_params *RP)
830{ 823{
831 object *door; 824 object *door;
832 int i; 825 int i;
… …
836 if (opts & DOORED) 829 if (opts & DOORED)
837 { 830 {
838 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 831 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++)
839 { 832 {
840 object *new_door = get_archetype ("locked_door1"); 833 object *new_door = get_archetype ("locked_door1");
841 char keybuf[1024];
842 834
843 door = doorlist[i]; 835 door = doorlist[i];
844 new_door->face = door->face; 836 new_door->face = door->face;
845 new_door->x = door->x; 837 new_door->x = door->x;
846 new_door->y = door->y; 838 new_door->y = door->y;
847 door->remove (); 839 door->remove ();
848 door->destroy (); 840 door->destroy ();
849 doorlist[i] = new_door; 841 doorlist[i] = new_door;
850 insert_ob_in_map (new_door, map, NULL, 0); 842 insert_ob_in_map (new_door, map, NULL, 0);
851 sprintf (keybuf, "%d", (int) RANDOM ()); 843 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
852 new_door->slaying = keybuf;
853 keyplace (map, new_door->x, new_door->y, keybuf, NO_PASS_DOORS, 2, RP); 844 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
854 } 845 }
855 } 846 }
856 847
857 /* change the faces of the doors and surrounding walls to hide them. */ 848 /* change the faces of the doors and surrounding walls to hide them. */
858 if (opts & HIDDEN) 849 if (opts & HIDDEN)
… …
867 { 858 {
868 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP); 859 retrofit_joined_wall (map, door->x - 1, door->y, 0, RP);
869 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP); 860 retrofit_joined_wall (map, door->x + 1, door->y, 0, RP);
870 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 861 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
871 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 862 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
863
872 door->face = wallface->face; 864 door->face = wallface->face;
865
873 if (!QUERY_FLAG (wallface, FLAG_REMOVED)) 866 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
874 wallface->remove (); 867 wallface->remove ();
868
875 wallface->destroy (); 869 wallface->destroy ();
876 } 870 }
877 } 871 }
878 } 872 }
879} 873}

Diff Legend

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