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

Make conversion of PHOT to ELEC using BIZR, and enrichment of DEUT with ELEC, work better

Browse Source
This commit is contained in:
jacksonmj 2012-10-27 00:51:01 +01:00
parent 9b4f710e28
commit 9a0ca32372
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/simulation/Simulation.cpp
View File

@ -2017,6 +2017,7 @@ void Simulation::init_can_move()
//whol eats anar
can_move[PT_ANAR][PT_WHOL] = 1;
can_move[PT_ANAR][PT_NWHL] = 1;
can_move[PT_ELEC][PT_DEUT] = 1;
can_move[PT_THDR][PT_THDR] = 2;
can_move[PT_EMBR][PT_EMBR] = 2;
}
@ -2185,6 +2186,11 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
if (temp_bin > 25) temp_bin = 25;
parts[i].ctype = 0x1F << temp_bin;
}
if (((r&0xFF)==PT_BIZR || (r&0xFF)==PT_BIZRG || (r&0xFF)==PT_BIZRS) && parts[i].type==PT_PHOT)
{
part_change_type(i, x, y, PT_ELEC);
parts[i].ctype = 0;
}
return 1;
}
//else e=1 , we are trying to swap the particles, return 0 no swap/move, 1 is still overlap/move, because the swap takes place later
@ -2218,6 +2224,14 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
kill_part(i);
return 0;
}
if ((r&0xFF)==PT_DEUT && parts[i].type==PT_ELEC)
{
if(parts[r>>8].life < 6000)
parts[r>>8].life += 1;
parts[r>>8].temp = 0;
kill_part(i);
return 0;
}
if (parts[i].type==PT_CNCT && y<ny && (pmap[y+1][x]&0xFF)==PT_CNCT)//check below CNCT for another CNCT
return 0;
@ -3687,7 +3701,9 @@ void Simulation::update_particles_i(int start, int inc)
rt = r&0xFF;
if (rt&&elements[rt].HeatConduct&&(rt!=PT_HSWC||parts[r>>8].life==10)
&&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG))
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG)))
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG))
&&(t!=PT_ELEC||rt!=PT_DEUT)
&&(t!=PT_DEUT||rt!=PT_ELEC))
{
surround_hconduct[j] = r>>8;
#ifdef REALISTIC

1
src/simulation/elements/ELEC.cpp
View File

@ -123,7 +123,6 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS)
if(parts[r>>8].life < 6000)
parts[r>>8].life += 1;
parts[r>>8].temp = 0;
parts[i].temp = 0;
sim->kill_part(i);
return 1;
}