summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-09-24 15:03:02 (GMT)
committer jacob1 <jfu614@gmail.com>2013-09-24 15:03:02 (GMT)
commitbc6a380c4c98e9c55d5d33c49c06d31b2ce6a07d (patch)
treebe62266f62b98286e0eae83c90104bfc05183516 /src/simulation
parent13309379f94a8085cce13edbc8e873bec9aeac2b (diff)
parenta376b72b36713852095dc7c9d2316005a306a5cd (diff)
downloadpowder-bc6a380c4c98e9c55d5d33c49c06d31b2ce6a07d.zip
powder-bc6a380c4c98e9c55d5d33c49c06d31b2ce6a07d.tar.gz
Merge pull request #165 from liquidcaesium/patch-1
LCRY + PROT = LCRY + PHOT
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/elements/PROT.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/simulation/elements/PROT.cpp b/src/simulation/elements/PROT.cpp
index ff68eb7..21e757c 100644
--- a/src/simulation/elements/PROT.cpp
+++ b/src/simulation/elements/PROT.cpp
@@ -78,6 +78,12 @@ int Element_PROT::update(UPDATE_FUNC_ARGS)
{
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)
parts[under>>8].ctype = PT_PROT;