Merge remote-tracking branch 'Rebmiami/paper' into alkali

Author: jacob1

src/lua/LuaSimulation.cpp

@@ -872,7 +872,7 @@ static int resetTemp(lua_State *L)
 	bool onlyConductors = luaL_optint(L, 1, 0);
 	for (int i = 0; i < sim->parts.lastActiveIndex; i++)
 	{
-		if (sim->parts[i].type && (elements[sim->parts[i].type].HeatConduct || !onlyConductors))
+		if (sim->parts[i].type && (!onlyConductors || !sim->IsHeatInsulator(sim->parts[i])))
 		{
 			sim->parts[i].temp = elements[sim->parts[i].type].DefaultProperties.temp;
 		}

src/simulation/Air.cpp

@@ -436,7 +436,7 @@ void Air::ApproximateBlockAirMaps()
 			}
 		}
 		// mostly accurate insulator blocking, besides checking GEL
-		else if ((type == PT_HSWC && sim.parts[i].life != 10) || elements[type].HeatConduct <= (sim.rng()%250))
+		else if (sim.IsHeatInsulator(sim.parts[i]) || elements[type].HeatConduct <= (sim.rng()%250))
 		{
 			int x = ((int)(sim.parts[i].x+0.5f))/CELL, y = ((int)(sim.parts[i].y+0.5f))/CELL;
 			if (InBounds(x, y) && !(bmap_blockairh[y][x]&0x8))

src/simulation/Simulation.cpp

@@ -1143,6 +1143,14 @@ int Simulation::eval_move(int pt, int nx, int ny, unsigned *rr) const
 					return 0;
 			}
 			break;
+		case PT_PAPR:
+			// BCOL can always pass through PAPR in order to color it
+			// Most elements are blocked by marked PAPR, except for certified "weird" elements where it's inverse
+			if ((pt == PT_BCOL) || (!parts[ID(r)].life != !(pt != PT_H2 && pt != PT_ANAR && pt != PT_BIZR && pt != PT_BIZRG)))
+				result = 2;
+			else
+				result = 0;
+			break;
 		default:
 			// This should never happen
 			// If it were to happen, try_move would interpret a 3 as a 1
@@ -1191,8 +1199,8 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
 		{
 			if (rt == PT_COAL || rt == PT_BCOL)
 				parts[ID(r)].temp = parts[i].temp;
-
-			if (rt < PT_NUM && elements[rt].HeatConduct && (rt!=PT_HSWC||parts[ID(r)].life==10) && rt!=PT_FILT)
+      
+			if (rt < PT_NUM && !IsHeatInsulator(parts[ID(r)]) && rt != PT_FILT && rt != PT_PAPR)
 				parts[i].temp = parts[ID(r)].temp = restrict_flt((parts[ID(r)].temp+parts[i].temp)/2, MIN_TEMP, MAX_TEMP);
 		}
 		else if ((parts[i].type==PT_NEUT || parts[i].type==PT_ELEC) && (rt==PT_CLNE || rt==PT_PCLN || rt==PT_BCLN || rt==PT_PBCN))
@@ -2198,6 +2206,11 @@ Simulation::PlanMoveResult Simulation::PlanMove(Sim &sim, int i, int x, int y)
 template
 Simulation::PlanMoveResult Simulation::PlanMove<false, const Simulation>(const Simulation &sim, int i, int x, int y);
 
+bool Simulation::IsHeatInsulator(Particle p) const
+{
+	return SimulationData::CRef().elements[p.type].HeatConduct == 0 || (p.type == PT_HSWC && p.life != 10) || ((p.type == PT_PIPE || p.type == PT_PPIP) && (p.tmp & PFLAG_CAN_CONDUCT) == 0);
+}
+
 void Simulation::UpdateParticles(int start, int end)
 {
 	//the main particle loop function, goes over all particles.
@@ -2355,7 +2368,7 @@ void Simulation::UpdateParticles(int start, int end)
 				//heat transfer code
 				auto h_count = 0;
 				bool cond;
-				cond = t && (t!=PT_HSWC||parts[i].life==10) && rng.chance(int(elements[t].HeatConduct*gel_scale), 250);
+				cond = t && !IsHeatInsulator(parts[i]) && rng.chance(int(elements[t].HeatConduct*gel_scale), 250);
 
 				if (cond)
 				{
@@ -2372,24 +2385,44 @@ void Simulation::UpdateParticles(int start, int end)
 					{
 						surround_hconduct[j] = i;
 						auto r = surround[j];
+
 						if (!r)
 							continue;
+
 						auto rt = TYP(r);
-						if (rt && elements[rt].HeatConduct && (rt!=PT_HSWC||parts[ID(r)].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))
-						        && (t!=PT_ELEC||rt!=PT_DEUT)
-						        && (t!=PT_DEUT||rt!=PT_ELEC)
-						        && (t!=PT_HSWC || rt!=PT_FILT || parts[i].tmp != 1)
-						        && (t!=PT_FILT || rt!=PT_HSWC || parts[ID(r)].tmp != 1))
+
+						if (!rt || IsHeatInsulator(parts[ID(r)])
+						        || (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))
+						        || (t == PT_ELEC && rt == PT_DEUT)
+						        || (t == PT_DEUT && rt == PT_ELEC)
+						        || (t == PT_HSWC && rt == PT_FILT && parts[i].tmp == 1)
+						        || (t == PT_FILT && rt == PT_HSWC && parts[ID(r)].tmp == 1)
+						        || (t == PT_PHOT && rt == PT_PAPR))
+							continue;
+
+						surround_hconduct[j] = ID(r);
+						c_heat += parts[ID(r)].temp;
+
+						if ((rt == PT_PIPE || rt == PT_PPIP) && parts[ID(r)].ctype != 0)
+						{
+							c_heat += parts[ID(r)].temp; // double count the particle to account for the heat capacity of both the PIPE/PPIP and its contents
+						}
+
+						h_count++;
+
+						if ((rt == PT_PIPE || rt == PT_PPIP) && parts[ID(r)].ctype != 0)
 						{
-							surround_hconduct[j] = ID(r);
-							c_heat += parts[ID(r)].temp;
-							h_count++;
+							h_count++; // double count the particle to account for the heat capacity of both the PIPE/PPIP and its contents
 						}
 					}
 					float pt = R_TEMP;
-					pt = (c_heat+parts[i].temp)/(h_count+1);
+
+					if ((t == PT_PIPE || t == PT_PPIP) && parts[i].ctype != 0)
+						pt = (c_heat+parts[i].temp*2.0f)/(h_count+2); // double count the particle to account for the heat capacity of both the PIPE/PPIP and its contents
+					else
+						pt = (c_heat+parts[i].temp)/(h_count+1);
+
 					pt = parts[i].temp = restrict_flt(pt, MIN_TEMP, MAX_TEMP);
 					for (auto j=0; j<8; j++)
 					{
@@ -3237,9 +3270,9 @@ void Simulation::RecalcFreeParticles(bool do_life_dec)
 					photons[y][x] = PMAP(i, t);
 				else
 				{
-					// Particles are sometimes allowed to go inside INVS and FILT
+					// Particles are sometimes allowed to go inside INVS, FILT, and PAPR
 					// To make particles collide correctly when inside these elements, these elements must not overwrite an existing pmap entry from particles inside them
-					if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT))
+					if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT && t != PT_PAPR))
 						pmap[y][x] = PMAP(i, t);
 					// (there are a few exceptions, including energy particles - currently no limit on stacking those)
 					if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH && t!=PT_PLSM)

src/simulation/Simulation.h

@@ -199,6 +199,7 @@ class Simulation : public RenderableSimulation
 	int is_wire_off(int x, int y);
 	void set_emap(int x, int y);
 	int parts_avg(int ci, int ni, int t);
+	bool IsHeatInsulator(Particle) const;
 	void UpdateParticles(int start, int end); // Dispatches an update to the range [start, end).
 	void SimulateGoL();
 	void RecalcFreeParticles(bool do_life_dec);

src/simulation/SimulationData.cpp

@@ -182,6 +182,10 @@ void SimulationData::init_can_move()
 		//SAWD cannot be displaced by other powders
 		if (elements[movingType].Properties & TYPE_PART)
 			can_move[movingType][PT_SAWD] = 0;
+
+		// Let most non-solids pass through unmarked PAPR
+        if (elements[movingType].Properties & (TYPE_GAS | TYPE_PART | TYPE_LIQUID) && (movingType != PT_FIRE && movingType != PT_SAWD))
+            can_move[movingType][PT_PAPR] = 3;
 	}
 
 	for (destinationType = 0; destinationType < PT_NUM; destinationType++)
@@ -211,6 +215,7 @@ void SimulationData::init_can_move()
 	can_move[PT_ELEC][PT_EXOT] = 2;
 	can_move[PT_ELEC][PT_GLOW] = 2;
 	can_move[PT_PHOT][PT_LCRY] = 3; //varies according to LCRY life
+	can_move[PT_PHOT][PT_PAPR] = 3; //varies according to PAPR life
 	can_move[PT_PHOT][PT_GPMP] = 3;
 
 	can_move[PT_PHOT][PT_BIZR] = 2;
@@ -230,6 +235,9 @@ void SimulationData::init_can_move()
 	can_move[PT_TRON][PT_SWCH] = 3;
 	can_move[PT_ELEC][PT_RSST] = 2;
 	can_move[PT_ELEC][PT_RSSS] = 2;
+	
+	can_move[PT_MWAX][PT_SAWD] = 0;
+	can_move[PT_SAWD][PT_MWAX] = 0;
 }
 
 const CustomGOLData *SimulationData::GetCustomGOLByRule(int rule) const

src/simulation/elements/ACID.cpp

@@ -98,6 +98,19 @@ static int update(UPDATE_FUNC_ARGS)
 								sim->part_change_type(ID(r), x + rx, y + ry, PT_H2);
 								break;
 
+							case PT_PAPR:
+								if (sim->rng.chance(1, 2))
+								{
+									sim->create_part(ID(r), x + rx, y + ry, PT_COAL);
+									parts[ID(r)].tmp = sim->rng.between(1, 39);
+								}
+								else
+								{
+									sim->create_part(ID(r), x + rx, y + ry, PT_WTRV);
+									parts[ID(r)].temp = parts[i].temp;
+								}
+								break;
+
 							default:
 								sim->kill_part(ID(r));
 								break;

src/simulation/elements/ARAY.cpp

@@ -165,6 +165,32 @@ static int update(UPDATE_FUNC_ARGS)
 								{
 									parts[r].life = 10;
 								}
+							}
+							else if (rt == PT_PAPR)
+							{
+								// In reading/writing state?
+								if (parts[r].tmp)
+								{
+									if (parts[r].tmp & 0x10) // Reading state
+									{
+										// End reading state early
+										parts[r].tmp = 0;
+										if (parts[r].life)
+										{
+											break;
+										}
+									}
+									else // Writing state
+									{
+										parts[r].life = 1;
+										parts[r].dcolour = 0xFF1A2222;
+									}
+								}
+								else
+								{
+									// Enter writing state
+									parts[r].tmp = 0x03;
+								}
 							// this if prevents BRAY from stopping on certain materials
 							}
 							else if (rt != PT_INWR && (rt != PT_SPRK || parts[r].ctype != PT_INWR) && rt != PT_ARAY && rt != PT_WIFI && !(rt == PT_SWCH && parts[r].life >= 10))
@@ -189,7 +215,7 @@ static int update(UPDATE_FUNC_ARGS)
 									parts[r].dcolour = 0xFF000000;
 							//this if prevents red BRAY from stopping on certain materials
 							}
-							else if (rt==PT_STOR || rt==PT_INWR || (rt==PT_SPRK && parts[r].ctype==PT_INWR) || rt==PT_ARAY || rt==PT_WIFI || rt==PT_FILT || (rt==PT_SWCH && parts[r].life>=10))
+							else if (rt==PT_STOR || rt==PT_INWR || (rt==PT_SPRK && parts[r].ctype==PT_INWR) || rt==PT_ARAY || rt==PT_WIFI || rt==PT_FILT || (rt==PT_SWCH && parts[r].life>=10) || rt==PT_PAPR)
 							{
 								if (rt == PT_STOR)
 								{
@@ -201,6 +227,32 @@ static int update(UPDATE_FUNC_ARGS)
 									isBlackDeco = (parts[r].dcolour==0xFF000000);
 									parts[r].life = 2;
 								}
+								else if (rt == PT_PAPR)
+								{
+									// In reading/writing state?
+									if (parts[r].tmp)
+									{
+										if (parts[r].tmp & 0x10) // Reading state
+										{
+											// End reading state early
+											parts[r].tmp = 0;
+											if (parts[r].life)
+											{
+												break;
+											}
+										}
+										else // Writing state
+										{
+											parts[r].life = 0;
+											parts[r].dcolour = 0;
+										}
+									}
+									else
+									{
+										// Enter reading state
+										parts[r].tmp = 0x13;
+									}
+								}
 								docontinue = 1;
 							}
 							else

src/simulation/elements/C5.cpp

@@ -49,8 +49,6 @@ void Element::Element_C5()
 
 static int update(UPDATE_FUNC_ARGS)
 {
-	auto &sd = SimulationData::CRef();
-	auto &elements = sd.elements;
 	for (auto rx = -2; rx <= 2; rx++)
 	{
 		for (auto ry = -2; ry <= 2; ry++)
@@ -60,7 +58,7 @@ static int update(UPDATE_FUNC_ARGS)
 				auto r = pmap[y+ry][x+rx];
 				if (!r)
 					continue;
-				if ((TYP(r)!=PT_C5 && parts[ID(r)].temp<100 && elements[TYP(r)].HeatConduct && (TYP(r)!=PT_HSWC||parts[ID(r)].life==10)) || TYP(r)==PT_CFLM)
+				if ((TYP(r)!=PT_C5 && parts[ID(r)].temp<100 && !sim->IsHeatInsulator(parts[ID(r)])) || TYP(r)==PT_CFLM)
 				{
 					if (sim->rng.chance(1, 6))
 					{

src/simulation/elements/DEST.cpp

@@ -87,7 +87,7 @@ static int update(UPDATE_FUNC_ARGS)
 		if (parts[i].life<=0)
 			parts[i].life=1;
 	}
-	else if (elements[rt].HeatConduct)
+	else if (!sim->IsHeatInsulator(parts[ID(r)]))
 		parts[ID(r)].temp = MAX_TEMP;
 	parts[i].temp=MAX_TEMP;
 	sim->pv[y/CELL][x/CELL]+=80.0f;

src/simulation/elements/ELEC.cpp

@@ -126,6 +126,14 @@ static int update(UPDATE_FUNC_ARGS)
 					return 1;
 				}
 				break;
+			case PT_PAPR:
+				if (sim->rng.chance(1, 20))
+				{
+					int dcolour = parts[ID(r)].dcolour;
+					sim->create_part(ID(r), x+rx, y+ry, PT_LCRY);
+					parts[ID(r)].dcolour = dcolour;
+				}
+				break;
 			case PT_NONE: //seems to speed up ELEC even if it isn't used
 				break;
 			default: