Merge remote-tracking branch 'Rebmiami/paper' into playtest-june2025

Author: jacob1

src/simulation/Simulation.cpp

@@ -1144,6 +1144,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
@@ -1192,8 +1200,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 && !IsHeatInsulator(parts[ID(r)]) && 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))
@@ -2390,7 +2398,8 @@ void Simulation::UpdateParticles(int start, int end)
 						        || (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_FILT && rt == PT_HSWC && parts[ID(r)].tmp == 1)
+						        || (t == PT_PHOT && rt == PT_PAPR))
 							continue;
 
 						surround_hconduct[j] = ID(r);
@@ -3270,9 +3279,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/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 elements pass through unmarked PAPR
+        if (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/CRAY.cpp

@@ -1,5 +1,6 @@
 #include "simulation/ElementCommon.h"
 #include "FILT.h"
+#include "PAPR.h"
 
 static int update(UPDATE_FUNC_ARGS);
 static bool ctypeDraw(CTYPEDRAW_FUNC_ARGS);
@@ -122,6 +123,21 @@ static int update(UPDATE_FUNC_ARGS)
 								else if (colored==0xFF000000)
 									colored = 0;
 								parts[ID(r)].life = 4;
+							} else if (TYP(r) == PT_PAPR) {
+								if (TYP(parts[i].ctype == PT_COAL) || TYP(parts[i].ctype) == PT_BCOL) {
+									sim->parts[ID(r)].life = 1;
+									if (colored)
+										sim->parts[ID(r)].dcolour = colored;
+									else
+										sim->parts[ID(r)].dcolour = MARK_COLOR_COAL;
+									if(!--partsRemaining)
+										docontinue = 0;
+								} else if (TYP(parts[i].ctype == PT_SOAP)) {
+									sim->parts[ID(r)].life = 0;
+									sim->parts[ID(r)].dcolour = 0x00000000;
+									if(!--partsRemaining)
+										docontinue = 0;
+								}
 							} else if (TYP(r) == PT_CRAY || nostop) {
 								docontinue = 1;
 							} else if(destroy && r && (TYP(r) != PT_DMND)) {

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:

src/simulation/elements/FIRE.cpp

@@ -197,6 +197,11 @@ int Element_FIRE_update(UPDATE_FUNC_ARGS)
 						}
 					}
 				}
+				// Make paper burn more reliably
+				if (rt == PT_PAPR && t != PT_PHOT)
+				{
+					parts[ID(r)].temp += 4;
+				}
 
 				if (t == PT_LAVA)
 				{

src/simulation/elements/NEUT.cpp

@@ -194,6 +194,11 @@ static int update(UPDATE_FUNC_ARGS)
 			case PT_BASE:
 				if (parts[ID(r)].temp > (50 + 273.15) && sim->rng.chance(1, 35))
 					sim->create_part(ID(r), x+rx, y+ry, PT_LRBD);
+			case PT_PAPR:
+				if (sim->rng.chance(1, 20))
+				{
+					sim->create_part(ID(r), x+rx, y+ry, PT_INVIS);
+				}
 				break;
 			default:
 				break;