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

Comparing deliantra/server/random_maps/special.C (file contents):
Revision 1.15 by root, Mon Jan 15 15:54:19 2007 UTC vs.
Revision 1.26 by root, Thu Nov 8 19:43:25 2007 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 *
5 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
7 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
8 7 *
9 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
10 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
11 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
12 (at your option) any later version. 11 * (at your option) any later version.
13 12 *
14 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,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details. 16 * GNU General Public License for more details.
18 17 *
19 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
20 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
22 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 The authors can be reached via e-mail at <crossfire@schmorp.de>
24*/ 22 */
25 23
26/* Specials in this file: 24/* Specials in this file:
27 included maps */ 25 included maps */
28 26
29#include <global.h> 27#include <global.h>
… …
119 117
120 /* search a bit for a completely free spot. */ 118 /* search a bit for a completely free spot. */
121 for (tries = 0; tries < 20; tries++) 119 for (tries = 0; tries < 20; tries++)
122 { 120 {
123 /* pick a random location in the layout */ 121 /* pick a random location in the layout */
124 i = RANDOM () % (map->width - xsize - 2) + 1; 122 i = rndm (map->width - xsize - 2) + 1;
125 j = RANDOM () % (map->height - ysize - 2) + 1; 123 j = rndm (map->height - ysize - 2) + 1;
126 is_occupied = 0; 124 is_occupied = 0;
127 for (l = i; l < i + xsize; l++) 125 for (l = i; l < i + xsize; l++)
128 for (m = j; m < j + ysize; m++) 126 for (m = j; m < j + ysize; m++)
129 is_occupied |= layout[l][m]; 127 is_occupied |= layout[l][m];
130 if (!is_occupied) 128 if (!is_occupied)
… …
137 if (is_occupied) 135 if (is_occupied)
138 { /* failure, try a relaxed placer. */ 136 { /* failure, try a relaxed placer. */
139 /* pick a random location in the layout */ 137 /* pick a random location in the layout */
140 for (tries = 0; tries < 10; tries++) 138 for (tries = 0; tries < 10; tries++)
141 { 139 {
142 i = RANDOM () % (map->width - xsize - 2) + 1; 140 i = rndm (map->width - xsize - 2) + 1;
143 j = RANDOM () % (map->height - ysize - 2) + 1; 141 j = rndm (map->height - ysize - 2) + 1;
144 is_occupied = 0; 142 is_occupied = 0;
145 for (l = i; l < i + xsize; l++) 143 for (l = i; l < i + xsize; l++)
146 for (m = j; m < j + ysize; m++) 144 for (m = j; m < j + ysize; m++)
147 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<') 145 if (layout[l][m] == 'C' || layout[l][m] == '>' || layout[l][m] == '<')
148 is_occupied |= 1; 146 is_occupied |= 1;
… …
159void 157void
160place_fountain_with_specials (maptile *map) 158place_fountain_with_specials (maptile *map)
161{ 159{
162 int ix, iy, i = -1, tries = 0; 160 int ix, iy, i = -1, tries = 0;
163 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1); 161 maptile *fountain_style = find_style ("/styles/misc", "fountains", -1);
162
163 if (!fountain_style)
164 {
165 LOG (llevError, "unable to load stylemap /styles/misc fountains\n");
166 return;
167 }
168
164 object *fountain = get_archetype ("fountain"); 169 object *fountain = get_archetype ("fountain");
165 object *potion = object::create (); 170 object *potion = object::create ();
166 171
167 pick_random_object (fountain_style)->copy_to (potion); 172 fountain_style->pick_random_object ()->copy_to (potion);
168 173
169 while (i < 0 && tries < 10) 174 while (i < 0 && tries < 10)
170 { 175 {
171 ix = RANDOM () % (map->width - 2) + 1; 176 ix = rndm (map->width - 2) + 1;
172 iy = RANDOM () % (map->height - 2) + 1; 177 iy = rndm (map->height - 2) + 1;
173 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1); 178 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1);
174 tries++; 179 tries++;
175 } 180 }
176 181
177 if (i == -1) 182 if (i == -1)
… …
187 SET_FLAG (potion, FLAG_NO_PICK); 192 SET_FLAG (potion, FLAG_NO_PICK);
188 SET_FLAG (potion, FLAG_IDENTIFIED); 193 SET_FLAG (potion, FLAG_IDENTIFIED);
189 potion->name = potion->name_pl = "fountain"; 194 potion->name = potion->name_pl = "fountain";
190 potion->x = ix; 195 potion->x = ix;
191 potion->y = iy; 196 potion->y = iy;
192 potion->material = M_ADAMANT; 197 potion->materialname = "adamantium";
193 fountain->x = ix; 198 fountain->x = ix;
194 fountain->y = iy; 199 fountain->y = iy;
195 insert_ob_in_map (fountain, map, NULL, 0); 200 insert_ob_in_map (fountain, map, NULL, 0);
196 insert_ob_in_map (potion, map, NULL, 0); 201 insert_ob_in_map (potion, map, NULL, 0);
197} 202}
198 203
199void 204void
200place_special_exit (maptile *map, int hole_type, random_map_params *RP) 205place_special_exit (maptile *map, int hole_type, random_map_params *RP)
201{ 206{
202 int ix, iy, i = -1; 207 int ix, iy, i = -1;
208 char buf[16384];
203 char buf[16384], *style, *decor, *mon; 209 const char *style, *decor, *mon;
204 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1); 210 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1);
205 int g_xsize, g_ysize; 211 int g_xsize, g_ysize;
206 212
213 if (!exit_style)
214 {
215 LOG (llevError, "unabel to load stylemap /styles/misc obscure_exits\n");
216 return;
217 }
218
207 object *the_exit = object::create (); 219 object *the_exit = object::create ();
208 220
209 if (!exit_style) 221 if (!exit_style)
210 return; 222 return;
211 223
212 pick_random_object (exit_style)->copy_to (the_exit); 224 exit_style->pick_random_object ()->copy_to (the_exit);
213 225
214 while (i < 0) 226 // put an upper bound here, just in case
227 for (int repeat = 8192; --repeat; )
215 { 228 {
216 ix = RANDOM () % (map->width - 2) + 1; 229 ix = rndm (map->width - 2) + 1;
217 iy = RANDOM () % (map->height - 2) + 1; 230 iy = rndm (map->height - 2) + 1;
231
218 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1); 232 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1);
219 } 233 if (i >= 0)
220 234 {
221 ix += freearr_x[i]; 235 ix += freearr_x[i];
222 iy += freearr_y[i]; 236 iy += freearr_y[i];
237 break;
238 }
239 }
240
223 the_exit->x = ix; 241 the_exit->x = ix;
224 the_exit->y = iy; 242 the_exit->y = iy;
225 243
226 if (!hole_type) 244 if (!hole_type)
227 hole_type = RANDOM () % NR_OF_HOLE_TYPES + 1; 245 hole_type = rndm (NR_OF_HOLE_TYPES) + 1;
228 246
229 switch (hole_type) 247 switch (hole_type)
230 { 248 {
231 case GLORY_HOLE: /* treasures */ 249 case GLORY_HOLE: /* treasures */
232 { 250 {
233 g_xsize = RANDOM () % 3 + 4 + RP->difficulty / 4; 251 g_xsize = rndm (3) + 4 + RP->difficulty / 4;
234 g_ysize = RANDOM () % 3 + 4 + RP->difficulty / 4; 252 g_ysize = rndm (3) + 4 + RP->difficulty / 4;
235 style = "onion"; 253 style = "onion";
236 decor = "wealth2"; 254 decor = "wealth2";
237 mon = "none"; 255 mon = "none";
238 break; 256 break;
239 } 257 }
240 258
241 case ORC_ZONE: /* hole with orcs in it. */ 259 case ORC_ZONE: /* hole with orcs in it. */
242 { 260 {
243 g_xsize = RANDOM () % 3 + 4 + RP->difficulty / 4; 261 g_xsize = rndm (3) + 4 + RP->difficulty / 4;
244 g_ysize = RANDOM () % 3 + 4 + RP->difficulty / 4; 262 g_ysize = rndm (3) + 4 + RP->difficulty / 4;
245 style = "onion"; 263 style = "onion";
246 decor = "wealth2"; 264 decor = "wealth2";
247 mon = "orc"; 265 mon = "orc";
248 break; 266 break;
249 } 267 }
250 268
251 case MINING_ZONE: /* hole with orcs in it. */ 269 case MINING_ZONE: /* hole with orcs in it. */
252 { 270 {
253 g_xsize = RANDOM () % 9 + 4 + RP->difficulty / 4; 271 g_xsize = rndm (9) + 4 + RP->difficulty / 4;
254 g_ysize = RANDOM () % 9 + 4 + RP->difficulty / 4; 272 g_ysize = rndm (9) + 4 + RP->difficulty / 4;
255 style = "maze"; 273 style = "maze";
256 decor = "minerals2"; 274 decor = "minerals2";
257 mon = "none"; 275 mon = "none";
258 break; 276 break;
259 } 277 }
… …
288{ 306{
289 maptile *special_map; 307 maptile *special_map;
290 int ix, iy; /* map insertion locatons */ 308 int ix, iy; /* map insertion locatons */
291 int special_type; /* type of special to make */ 309 int special_type; /* type of special to make */
292 310
293
294 special_type = RANDOM () % NUM_OF_SPECIAL_TYPES; 311 special_type = rndm (NUM_OF_SPECIAL_TYPES);
312
295 switch (special_type) 313 switch (special_type)
296 { 314 {
297 315 case SPECIAL_SUBMAP:
298 /* includes a special map into the random map being made. */ 316 /* includes a special map into the random map being made. */
299 case SPECIAL_SUBMAP:
300 {
301 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty); 317 special_map = find_style ("/styles/specialmaps", 0, RP->difficulty);
318
302 if (special_map == NULL) 319 if (!special_map)
303 return; 320 return;
304 321
305 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height)) 322 if (find_spot_for_submap (map, layout, &ix, &iy, special_map->width, special_map->height))
306 include_map_in_map (map, special_map, ix, iy); 323 include_map_in_map (map, special_map, ix, iy);
324
307 break; 325 break;
308 }
309 326
327 case SPECIAL_FOUNTAIN:
310 /* Make a special fountain: an unpickable potion disguised as 328 /* Make a special fountain: an unpickable potion disguised as
311 a fountain, or rather, colocated with a fountain. */ 329 a fountain, or rather, colocated with a fountain. */
312 case SPECIAL_FOUNTAIN:
313 {
314 place_fountain_with_specials (map); 330 place_fountain_with_specials (map);
315 break; 331 break;
316 }
317 332
333 case SPECIAL_EXIT:
318 /* Make an exit to another random map, e.g. a gloryhole. */ 334 /* Make an exit to another random map, e.g. a gloryhole. */
319 case SPECIAL_EXIT:
320 {
321 place_special_exit (map, 0, RP); 335 place_special_exit (map, 0, RP);
322 break; 336 break;
323 }
324 } 337 }
325 338
326} 339}

Diff Legend

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