Add DNA2 difficulties.

Conflicts:
	code/game/dna/dna2.dm
	code/game/gamemodes/setupgame.dm
This commit is contained in:
Rob Nelson
2014-01-20 00:59:53 -05:00
committed by ZomgPonies
parent 268836dd33
commit 04ab4903c6
2 changed files with 17 additions and 13 deletions
+4
View File
@@ -10,7 +10,11 @@
#define DNA_ON_LOWERBOUND 2
#define DNA_ON_UPPERBOUND 3
// Define block bounds (off-low,off-high,on-low,on-high)
// Used in setupgame.dm
#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
#define DNA_HARDER_BOUNDS list(1,3049,3050,4095)
#define DNA_HARD_BOUNDS list(1,3490,3500,4095)
// Defines which values mean "on" or "off".
// This is to make some of the more OP superpowers a larger PITA to activate,
+13 -13
View File
@@ -24,14 +24,14 @@
numsToAssign += i
testing("Assigning DNA blocks:")
message_admins("Assigning DNA blocks:")
// Standard muts
BLINDBLOCK = getAssignedBlock("BLIND", numsToAssign)
DEAFBLOCK = getAssignedBlock("DEAF", numsToAssign)
HULKBLOCK = getAssignedBlock("HULK", numsToAssign)
TELEBLOCK = getAssignedBlock("TELE", numsToAssign)
FIREBLOCK = getAssignedBlock("FIRE", numsToAssign)
XRAYBLOCK = getAssignedBlock("XRAY", numsToAssign)
HULKBLOCK = getAssignedBlock("HULK", numsToAssign, DNA_HARD_BOUNDS)
TELEBLOCK = getAssignedBlock("TELE", numsToAssign, DNA_HARD_BOUNDS)
FIREBLOCK = getAssignedBlock("FIRE", numsToAssign, DNA_HARDER_BOUNDS)
XRAYBLOCK = getAssignedBlock("XRAY", numsToAssign, DNA_HARDER_BOUNDS)
CLUMSYBLOCK = getAssignedBlock("CLUMSY", numsToAssign)
FAKEBLOCK = getAssignedBlock("FAKE", numsToAssign)
COUGHBLOCK = getAssignedBlock("COUGH", numsToAssign)
@@ -42,16 +42,16 @@
// Bay muts
HEADACHEBLOCK = getAssignedBlock("HEADACHE", numsToAssign)
NOBREATHBLOCK = getAssignedBlock("NOBREATH", numsToAssign)
REMOTEVIEWBLOCK = getAssignedBlock("REMOTEVIEW", numsToAssign)
REGENERATEBLOCK = getAssignedBlock("REGENERATE", numsToAssign)
INCREASERUNBLOCK = getAssignedBlock("INCREASERUN", numsToAssign)
REMOTETALKBLOCK = getAssignedBlock("REMOTETALK", numsToAssign)
MORPHBLOCK = getAssignedBlock("MORPH", numsToAssign)
NOBREATHBLOCK = getAssignedBlock("NOBREATH", numsToAssign, DNA_HARD_BOUNDS)
REMOTEVIEWBLOCK = getAssignedBlock("REMOTEVIEW", numsToAssign, DNA_HARDER_BOUNDS)
REGENERATEBLOCK = getAssignedBlock("REGENERATE", numsToAssign, DNA_HARDER_BOUNDS)
INCREASERUNBLOCK = getAssignedBlock("INCREASERUN", numsToAssign, DNA_HARDER_BOUNDS)
REMOTETALKBLOCK = getAssignedBlock("REMOTETALK", numsToAssign, DNA_HARDER_BOUNDS)
MORPHBLOCK = getAssignedBlock("MORPH", numsToAssign, DNA_HARDER_BOUNDS)
HALLUCINATIONBLOCK = getAssignedBlock("HALLUCINATION", numsToAssign)
NOPRINTSBLOCK = getAssignedBlock("NOPRINTS", numsToAssign)
NOPRINTSBLOCK = getAssignedBlock("NOPRINTS", numsToAssign, DNA_HARD_BOUNDS)
SHOCKIMMUNITYBLOCK = getAssignedBlock("SHOCKIMMUNITY", numsToAssign)
SMALLSIZEBLOCK = getAssignedBlock("SMALLSIZE", numsToAssign)
SMALLSIZEBLOCK = getAssignedBlock("SMALLSIZE", numsToAssign, DNA_HARD_BOUNDS)
// HIDDEN MUTATIONS / SUPERPOWERS INITIALIZTION