mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-15 04:44:00 +02:00
Code Issues Projects Releases Wiki Activity

VIBR explosion bound fixing (#980)

Browse Source
This commit is contained in:
jm211
2024-12-13 23:49:16 -05:00
committed by GitHub
parent 6e43882a0e
commit 0ad91f74f2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/simulation/elements/VIBR.cpp
View File

@@ -46,6 +46,9 @@ void Element::Element_VIBR()
Graphics = &Element_VIBR_graphics;
}
constexpr int orbit_rx[8] = { -1, 0, 1, 1, 1, 0, -1, -1 };
constexpr int orbit_ry[8] = { -1, -1, -1, 0, 1, 1, 1, 0 };
int Element_VIBR_update(UPDATE_FUNC_ARGS)
{
auto &sd = SimulationData::CRef();
@@ -85,9 +88,9 @@ int Element_VIBR_update(UPDATE_FUNC_ARGS)
rndstore = sim->rng.gen();
if (parts[i].life < 300)
{
auto rx = rndstore%3-1;
auto ry = (rndstore>>2)%3-1;
rndstore = rndstore >> 4;
auto rx = orbit_rx[rndstore & 7];
auto ry = orbit_ry[rndstore & 7];
rndstore = rndstore >> 3;
auto r = pmap[y+ry][x+rx];
if (TYP(r) && TYP(r) != PT_BREC && (elements[TYP(r)].Properties&PROP_CONDUCTS) && !parts[ID(r)].life)
{
@@ -114,19 +117,17 @@ int Element_VIBR_update(UPDATE_FUNC_ARGS)
if (!parts[i].tmp2)
{
rndstore = sim->rng.gen();
int index = sim->create_part(-3,x+((rndstore>>4)&3)-1,y+((rndstore>>6)&3)-1,PT_ELEC);
int index = sim->create_part(-3, x + (orbit_rx[rndstore & 7]), y + (orbit_ry[rndstore & 7]), PT_ELEC);
if (index != -1)
parts[index].temp = 7000;
index = sim->create_part(-3,x+((rndstore>>8)&3)-1,y+((rndstore>>10)&3)-1,PT_PHOT);
index = sim->create_part(-3, x + (orbit_rx[(rndstore >> 3) & 7]), y + (orbit_ry[(rndstore >> 3) & 7]), PT_PHOT);
if (index != -1)
parts[index].temp = 7000;
int rx = ((rndstore>>12)&3)-1;
rndstore = sim->rng.gen();
index = sim->create_part(-1,x+rx-1,y+rndstore%3-1,PT_BREC);
index = sim->create_part(-1, x + (orbit_rx[(rndstore >> 6) & 7]), y + (orbit_ry[(rndstore >> 6) & 7]), PT_BREC);
if (index != -1)
parts[index].temp = 7000;
sim->create_part(i, x, y, PT_EXOT);
parts[i].tmp2 = (rndstore>>2)%1000;
parts[i].tmp2 = (rndstore >> 9) % 1000;
parts[i].temp=9000;
sim->pv[y/CELL][x/CELL] += 50;