matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #165 from liquidcaesium/patch-1

Browse Source 
LCRY + PROT = LCRY + PHOT
This commit is contained in:
jacob1 2013-09-24 08:03:02 -07:00
commit bc6a380c4c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/elements/PROT.cpp
View File

@ -78,6 +78,12 @@ int Element_PROT::update(UPDATE_FUNC_ARGS)
{ {
parts[under>>8].life = 40+parts[under>>8].life; parts[under>>8].life = 40+parts[under>>8].life;
} }
//Powered LCRY reaction: PROT->PHOT
else if (((under&0xFF) == PT_LCRY) && (parts[under>>8].life > 5) && (1>(rand()%10))) {
parts[i].type = PT_PHOT;
parts[i].life *= 2;
parts[i].ctype = 0x3FFFFFFF;
}
else if ((under&0xFF) == PT_EXOT) else if ((under&0xFF) == PT_EXOT)
parts[under>>8].ctype = PT_PROT; parts[under>>8].ctype = PT_PROT;