diff options
| author | jacob1 <jfu614@gmail.com> | 2013-09-04 04:20:21 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-09-04 04:20:21 (GMT) |
| commit | 7d9fa1bfc7ae74ed04992a83662dd717d12112d8 (patch) | |
| tree | 29d9ab12d1e07a96d3ae08c1cee78821398bf0fc /src/simulation/Simulation.cpp | |
| parent | 6c4f63be3b003f55360e690c7bac9d3dd536408f (diff) | |
| download | powder-7d9fa1bfc7ae74ed04992a83662dd717d12112d8.zip powder-7d9fa1bfc7ae74ed04992a83662dd717d12112d8.tar.gz | |
new element: VIRS (also solid and gas virus states). Cured by SOAP (CURE element was not added)
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index abf107d..7d466a4 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2284,7 +2284,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) return 0; } } - if (((r&0xFF)==PT_VIBR || (r&0xFF)==PT_BVBR)) + else if (((r&0xFF)==PT_VIBR || (r&0xFF)==PT_BVBR)) { if ((elements[parts[i].type].Properties & TYPE_ENERGY)) { @@ -2307,7 +2307,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) if (y<ny && (pmap[y+1][x]&0xFF) == PT_CNCT) //check below CNCT for another CNCT return 0; } - else if(parts[i].type==PT_GBMB) + else if(parts[i].type == PT_GBMB) { if (parts[i].life>0) return 0; @@ -2967,11 +2967,14 @@ int Simulation::create_part(int p, int x, int y, int tv) parts[i].ctype = 0x47FFFF; break; case PT_DTEC: - parts[i].tmp2 = 2; - break; case PT_TSNS: parts[i].tmp2 = 2; break; + case PT_VIRS: + case PT_VRSS: + case PT_VRSG: + parts[i].pavg[1] = 250; + break; case PT_FIGH: { unsigned char fcount = 0; |