diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index 9b3c10086..6390b6adf 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -115,7 +115,7 @@ static int update(UPDATE_FUNC_ARGS) parts[ID(r)].tmp2 += 5; parts[ID(r)].life = 1000; break; - case PT_RSST: + case PT_RSST: //Destroy RSST if(!rx && !ry) { sim->kill_part(ID(r)); diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp index e3fbf493b..1c4f6d6dd 100644 --- a/src/simulation/elements/GLOW.cpp +++ b/src/simulation/elements/GLOW.cpp @@ -66,7 +66,7 @@ static int update(UPDATE_FUNC_ARGS) parts[ID(r)].life = 10; return 1; } - else if (TYP(r) == PT_GEL) + else if (TYP(r) == PT_GEL) //GLOW + GEL = RSST { sim->kill_part(i); sim->part_change_type(ID(r),x+rx,y+ry,PT_RSST); diff --git a/src/simulation/elements/GRVT.cpp b/src/simulation/elements/GRVT.cpp index 0eab88ba3..b6dd2a9c1 100644 --- a/src/simulation/elements/GRVT.cpp +++ b/src/simulation/elements/GRVT.cpp @@ -62,6 +62,7 @@ static int update(UPDATE_FUNC_ARGS) int under = pmap[y][x]; int utype = TYP(under); + //Randomly kill GRVT inside RSSS if((utype == PT_RSSS) && sim->rng.chance(1, 5)) { sim->kill_part(i); diff --git a/src/simulation/elements/NEUT.cpp b/src/simulation/elements/NEUT.cpp index 1652e4fda..183adecfe 100644 --- a/src/simulation/elements/NEUT.cpp +++ b/src/simulation/elements/NEUT.cpp @@ -172,7 +172,7 @@ static int update(UPDATE_FUNC_ARGS) ct_under = parts[ID(r)].ctype; tmp_under = parts[ID(r)].tmp; - //If there's a correct ctype set, use it + //If there's a correct ctype set, liquefy into it if(ct_under > 0 && ct_under < PT_NUM) { sim->create_part(ID(r), x, y, ct_under); @@ -182,7 +182,7 @@ static int update(UPDATE_FUNC_ARGS) parts[ID(r)].ctype = tmp_under; } else - sim->part_change_type(ID(r), x, y, PT_RSST); + sim->part_change_type(ID(r), x, y, PT_RSST); //Default to RSST if no ctype sim->kill_part(i); diff --git a/src/simulation/elements/PHOT.cpp b/src/simulation/elements/PHOT.cpp index 7fae3824d..2c6d0289a 100644 --- a/src/simulation/elements/PHOT.cpp +++ b/src/simulation/elements/PHOT.cpp @@ -114,7 +114,7 @@ static int update(UPDATE_FUNC_ARGS) ct_under = parts[ID(r)].ctype; tmp_under = parts[ID(r)].tmp; - //If there's a correct ctype set, use it + //If there's a correct ctype set, solidify RSST into it if(ct_under > 0 && ct_under < PT_NUM) { sim->create_part(ID(r), x, y, ct_under); @@ -124,7 +124,7 @@ static int update(UPDATE_FUNC_ARGS) parts[ID(r)].ctype = tmp_under; } else - sim->part_change_type(ID(r), x, y, PT_RSSS); + sim->part_change_type(ID(r), x, y, PT_RSSS); //Default to RSSS if no ctype sim->kill_part(i); diff --git a/src/simulation/elements/PROT.cpp b/src/simulation/elements/PROT.cpp index 2b915eec2..c161d9808 100644 --- a/src/simulation/elements/PROT.cpp +++ b/src/simulation/elements/PROT.cpp @@ -101,7 +101,7 @@ static int update(UPDATE_FUNC_ARGS) else change = 0.0f; parts[uID].temp = restrict_flt(parts[uID].temp + change, MIN_TEMP, MAX_TEMP); break; - case PT_RSSS: + case PT_RSSS: //Destroy RSSS { sim->kill_part(uID); sim->kill_part(i); diff --git a/src/simulation/elements/RSSS.cpp b/src/simulation/elements/RSSS.cpp index 3dbe14502..7ca3fd424 100644 --- a/src/simulation/elements/RSSS.cpp +++ b/src/simulation/elements/RSSS.cpp @@ -48,6 +48,7 @@ void Element::Element_RSSS() static int update(UPDATE_FUNC_ARGS) { + //Block air like TTAN sim->air->bmap_blockair[y/CELL][x/CELL] = 1; sim->air->bmap_blockairh[y/CELL][x/CELL] = 0x8; diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp index b1d9d41c8..896e3f206 100644 --- a/src/simulation/elements/SPRK.cpp +++ b/src/simulation/elements/SPRK.cpp @@ -69,7 +69,7 @@ static int update(UPDATE_FUNC_ARGS) parts[i].life = 54; else if (ct == PT_SWCH) parts[i].life = 14; - else if (ct == PT_RSST) + else if (ct == PT_RSST) //RSST disappears at the end of its spark cycle { sim->kill_part(i); return 1;