cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Backports Bay/Neb random map optimizations.

Browse Source
This commit is contained in:
Chompstation Bot
2021-09-27 18:23:26 +00:00
parent cfad19ad15
commit 1b244b5de5
4 changed files with 207 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
code/modules/random_map/_random_map_setup.dm
View File

@@ -3,6 +3,7 @@
-This controls the amount of sand turf it will create in the caves, I assume it controls the amount of minerals and undeground minerals aswell
*/
<<<<<<< HEAD
#define MIN_SURFACE_COUNT 75
#define MIN_RARE_COUNT 50
#define MIN_DEEP_COUNT 25
@@ -12,12 +13,42 @@
#define RESOURCE_MID_MIN 0.5
#define RESOURCE_LOW_MAX 0.5
#define RESOURCE_LOW_MIN 0
||||||| parent of 569e369789... Merge pull request #11614 from VOREStation/upstream-merge-8299
#define MIN_SURFACE_COUNT 500
#define MIN_RARE_COUNT 200
#define MIN_DEEP_COUNT 100
#define RESOURCE_HIGH_MAX 4
#define RESOURCE_HIGH_MIN 2
#define RESOURCE_MID_MAX 3
#define RESOURCE_MID_MIN 1
#define RESOURCE_LOW_MAX 1
#define RESOURCE_LOW_MIN 0
=======
#define MIN_SURFACE_COUNT 500
#define MIN_RARE_COUNT 200
#define MIN_DEEP_COUNT 100
#define RESOURCE_HIGH_MAX 4
#define RESOURCE_HIGH_MIN 2
#define RESOURCE_MID_MAX 3
#define RESOURCE_MID_MIN 1
#define RESOURCE_LOW_MAX 1
#define RESOURCE_LOW_MIN 0
>>>>>>> 569e369789... Merge pull request #11614 from VOREStation/upstream-merge-8299
#define FLOOR_CHAR 0
#define WALL_CHAR 1
#define DOOR_CHAR 2
#define EMPTY_CHAR 3
#define ROOM_TEMP_CHAR 4
#define MONSTER_CHAR 5
#define ARTIFACT_TURF_CHAR 6
#define ARTIFACT_CHAR 7
#define FLOOR_CHAR 0
#define WALL_CHAR 1
#define DOOR_CHAR 2
#define EMPTY_CHAR 3
#define ROOM_TEMP_CHAR 4
#define MONSTER_CHAR 5
#define ARTIFACT_TURF_CHAR 6
#define ARTIFACT_CHAR 7
#define TRANSLATE_COORD(X,Y) ((((Y) - 1) * limit_x) + (X))
#define TRANSLATE_AND_VERIFY_COORD(X,Y) TRANSLATE_AND_VERIFY_COORD_MLEN(X,Y,map.len)
#define TRANSLATE_AND_VERIFY_COORD_MLEN(X,Y,LEN) \
tmp_cell = TRANSLATE_COORD(X,Y);\
if (tmp_cell < 1 || tmp_cell > LEN) {\
tmp_cell = null;\
}