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.35 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.47 by root, Tue Apr 13 02:52:31 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 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/* Specials in this file: 25/* Specials in this file:
… …
75 if (!tmp->is_head ()) 76 if (!tmp->is_head ())
76 continue; 77 continue;
77 78
78 object *new_ob = tmp->deep_clone (); 79 object *new_ob = tmp->deep_clone ();
79 80
80 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 81 if (tmp->flag [FLAG_IS_LINKED])
81 add_button_link (new_ob, dest_map, tmp->path_attuned); 82 new_ob->add_link (dest_map, tmp->find_link ()->id);
82 83
83 dest_map->insert (new_ob, x + i, y + j, 0, INS_NO_MERGE | INS_NO_WALK_ON); 84 dest_map->insert (new_ob, x + i, y + j, 0, INS_NO_MERGE | INS_NO_WALK_ON);
84 } 85 }
85} 86}
86 87
… …
161 162
162 while (i < 0 && tries < 10) 163 while (i < 0 && tries < 10)
163 { 164 {
164 ix = rmg_rndm (map->width - 2) + 1; 165 ix = rmg_rndm (map->width - 2) + 1;
165 iy = rmg_rndm (map->height - 2) + 1; 166 iy = rmg_rndm (map->height - 2) + 1;
166 i = find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1); 167 i = rmg_find_free_spot (fountain, map, ix, iy, 1, SIZEOFFREE1 + 1);
167 tries++; 168 tries++;
168 } 169 }
169 170
170 if (i == -1) 171 if (i == -1)
171 { /* can't place fountain */ 172 { /* can't place fountain */
… …
175 } 176 }
176 177
177 ix += freearr_x[i]; 178 ix += freearr_x[i];
178 iy += freearr_y[i]; 179 iy += freearr_y[i];
179 potion->face = fountain->face; 180 potion->face = fountain->face;
180 SET_FLAG (potion, FLAG_NO_PICK); 181 potion->set_flag (FLAG_NO_PICK);
181 SET_FLAG (potion, FLAG_IDENTIFIED); 182 potion->set_flag (FLAG_IDENTIFIED);
182 potion->name = potion->name_pl = "fountain"; 183 potion->name = potion->name_pl = shstr_fountain;
183 potion->x = ix; 184 potion->x = ix;
184 potion->y = iy; 185 potion->y = iy;
185 potion->materialname = "adamantium"; 186 potion->material = name_to_material (shstr_adamantium);
186 fountain->x = ix; 187 fountain->x = ix;
187 fountain->y = iy; 188 fountain->y = iy;
188 insert_ob_in_map (fountain, map, NULL, 0); 189 insert_ob_in_map (fountain, map, NULL, 0);
189 insert_ob_in_map (potion, map, NULL, 0); 190 insert_ob_in_map (potion, map, NULL, 0);
190} 191}
191 192
192static void 193static void
193place_special_exit (maptile *map, int hole_type, random_map_params *RP) 194place_special_exit (maptile *map, int hole_type, random_map_params *RP)
194{ 195{
195 int ix, iy, i = -1; 196 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", RP->difficulty);
197 if (!exit_style)
198 {
199 LOG (llevError, "unable to load stylemap /styles/misc obscure_exits\n");
200 return;
201 }
202
203 if (!exit_style)
204 return;
205
206 object *the_exit = exit_style->pick_random_object (rmg_rndm)->clone ();
207
208 // put an upper bound here, just in case
209 for (int repeat = 8192; --repeat; )
210 {
211 int ix = rmg_rndm (1, map->width - 2);
212 int iy = rmg_rndm (1, map->height - 2);
213
214 int i = rmg_find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1);
215 if (i >= 0)
216 {
217 the_exit->x = ix + freearr_x[i];
218 the_exit->y = iy + freearr_y[i];
219 break;
220 }
221 }
222
223 if (!hole_type)
224 hole_type = rmg_rndm (NR_OF_HOLE_TYPES) + 1;
225
196 char buf[16384]; 226 char buf[16384];
197 const char *style, *decor, *mon; 227 const char *style, *decor, *mon;
198 maptile *exit_style = find_style ("/styles/misc", "obscure_exits", -1);
199 int g_xsize, g_ysize; 228 int g_xsize, g_ysize;
200
201 if (!exit_style)
202 {
203 LOG (llevError, "unable to load stylemap /styles/misc obscure_exits\n");
204 return;
205 }
206
207 if (!exit_style)
208 return;
209
210 object *the_exit = exit_style->pick_random_object (rmg_rndm)->clone ();
211
212 // put an upper bound here, just in case
213 for (int repeat = 8192; --repeat; )
214 {
215 ix = rmg_rndm (1, map->width - 2);
216 iy = rmg_rndm (1, map->height - 2);
217
218 i = find_free_spot (the_exit, map, ix, iy, 1, SIZEOFFREE1 + 1);
219 if (i >= 0)
220 {
221 ix += freearr_x[i];
222 iy += freearr_y[i];
223 break;
224 }
225 }
226
227 the_exit->x = ix;
228 the_exit->y = iy;
229
230 if (!hole_type)
231 hole_type = rmg_rndm (NR_OF_HOLE_TYPES) + 1;
232 229
233 switch (hole_type) 230 switch (hole_type)
234 { 231 {
235 case GLORY_HOLE: /* treasures */ 232 case GLORY_HOLE: /* treasures */
236 { 233 {
… …
263 } 260 }
264 261
265 default: /* undefined */ 262 default: /* undefined */
266 LOG (llevError, "place_special_exit: undefined hole type %d\n", hole_type); 263 LOG (llevError, "place_special_exit: undefined hole type %d\n", hole_type);
267 return; 264 return;
268 break;
269 } 265 }
270 266
271 /* Need to be at least this size, otherwise the load 267 /* Need to be at least this size, otherwise the load
272 * code will generate new size values which are too large. 268 * code will generate new size values which are too large.
273 */ 269 */
274 if (g_xsize < MIN_RANDOM_MAP_SIZE) g_xsize = MIN_RANDOM_MAP_SIZE; 270 max_it (g_xsize, MIN_RANDOM_MAP_SIZE);
275 if (g_ysize < MIN_RANDOM_MAP_SIZE) g_ysize = MIN_RANDOM_MAP_SIZE; 271 max_it (g_ysize, MIN_RANDOM_MAP_SIZE);
276 272
277 write_parameters_to_string (buf, g_xsize, g_ysize, RP->wallstyle, RP->floorstyle, mon, 273 {
278 "none", style, decor, "none", RP->exitstyle, 0, 0, 0, 274 random_map_params &rp = *new random_map_params; // for zero_intiialised to work...
279 RMOPT_WALLS_ONLY, 0, 0, 1, RP->dungeon_level, RP->dungeon_level, 275
280 RP->difficulty, RP->difficulty, -1, 1, 0, 0, 0, 0, RP->difficulty_increase); 276 rp.xsize = g_xsize;
281 the_exit->slaying = "/!"; 277 rp.ysize = g_ysize;
278
279 assign (rp.wallstyle , RP->wallstyle);
280 assign (rp.floorstyle , RP->floorstyle);
281 assign (rp.monsterstyle , mon);
282 assign (rp.treasurestyle, "none");
283 assign (rp.layoutstyle , style);
284 assign (rp.decorstyle , decor);
285 assign (rp.exitstyle , RP->exitstyle);
286
287 rp.layoutoptions1 = RMOPT_WALLS_ONLY;
288 rp.symmetry = SYMMETRY_NONE;
289 rp.dungeon_depth = RP->dungeon_level;
290 rp.dungeon_level = RP->dungeon_level;
291 rp.difficulty = RP->difficulty;
292 rp.difficulty_given = RP->difficulty;
293 rp.difficulty_increase = RP->difficulty_increase;
294 rp.decoroptions = -1;
295 rp.orientation = 1;
296 rp.random_seed = RP->random_seed ^ 0xdeadbeef;
297 rp.region = RP->region;
298
299 write_map_parameters_to_string (buf, &rp);
300 delete &rp;
301 }
302
303 the_exit->slaying = shstr_random_map_exit;
282 the_exit->msg = buf; 304 the_exit->msg = buf;
283 305
284 insert_ob_in_map (the_exit, map, NULL, 0); 306 insert_ob_in_map (the_exit, map, NULL, 0);
285} 307}
286 308
… …
315 place_fountain_with_specials (map); 337 place_fountain_with_specials (map);
316 break; 338 break;
317 339
318 case SPECIAL_EXIT: 340 case SPECIAL_EXIT:
319 /* Make an exit to another random map, e.g. a gloryhole. */ 341 /* Make an exit to another random map, e.g. a gloryhole. */
320 place_special_exit (map, 0, RP); 342 //place_special_exit (map, 0, RP);
343 place_special_exit (map, GLORY_HOLE, RP);
321 break; 344 break;
322 } 345 }
323} 346}
324 347

Diff Legend

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