Merge pull request #7 from sebamarynissen/feature/plop

Allow growified residentials to be redeveloped

lib/api.js

@@ -64,16 +64,32 @@ exports.growify = async function(opts) {
 	opts = Object.assign(Object.create(baseOptions), opts);
 	let dbpf = open(opts.dbpf);
 
+	// Get the SimGrid with the ZoneData information because that needs to be 
+	// updated as well.
+	const ZoneData = 0x41800000;
+	let grid = dbpf.getSimGrid(FileType.SimGridSint8, ZoneData);
+
+	// Helper function that will update the zoneType in the SimGrid as well 
+	// when growifying.
+	function setType(lot, zoneType) {
+		lot.zoneType = zoneType;
+		for (let x = lot.minX; x <= lot.maxX; x++) {
+			for (let z = lot.minZ; z <= lot.maxZ; z++) {
+				grid.set(x, z, zoneType);
+			}
+		}
+	}
+
 	let rCount = 0, iCount = 0, aCount = 0;
 	for (let lot of dbpf.lotFile) {
 		if (opts.residential && lot.isPloppedResidential) {
-			lot.zoneType = opts.residential;
+			setType(lot, opts.residential);
 			rCount++;
 		} else if (opts.industrial && lot.isPloppedIndustrial) {
-			lot.zoneType = opts.industrial;
+			setType(lot, opts.industrial);
 			iCount++;
 		} else if (opts.agricultural && lot.isPloppedAgricultural) {
-			lot.zoneType = opts.agricultural;
+			setType(lot, opts.agricultural);
 			aCount++;
 		}
 	}

lib/building.js

@@ -12,29 +12,30 @@ const Type = require('./type');
 // Represents a single building from the building file.
 const Building = class Building extends Type(FileType.BuildingFile) {
 
-	// ## constructor()
-	constructor() {
+	// ## constructor(opts)
+	constructor(opts) {
 		super();
 		this.crc = 0x00000000;
 		this.mem = 0x00000000;
 		this.major = 0x0002;
 		this.minor = 0x0004;
 		this.zotWord = 0x0;
 		this.unknown1 = 0x00;
-		this.appearance = 0x04;
+		this.appearance = 0b00000101;
 		this.xMinTract = 0x00;
 		this.zMinTract = 0x00;
 		this.xMaxTract = 0x00;
 		this.zMaxTract = 0x00;
 		this.xTractSize = 0x0002;
 		this.zTractSize = 0x0002;
 		this.sgprops = [];
-		this.unknown2 = 0x01;
+		this.unknown2 = 0x00;
 		this.IID1 = this.IID = this.TID = this.GID = 0x00000000;
 		this.minZ = this.minY = this.minX = 0;
 		this.maxZ = this.maxY = this.maxX = 0;
 		this.orientation = 0x00;
-		this.scaffold = 0;
+		this.scaffold = 0x01;
+		Object.assign(this, opts);
 	}
 
 	// ## move(dx, dy, dz)
@@ -100,11 +101,13 @@ const Building = class Building extends Type(FileType.BuildingFile) {
 			prop.parse(rs);
 		}
 
-		this.unknown2 = rs.byte();
+		// There seems to be an error in the Wiki. The unknown byte should 
+		// come **after** the IID1, otherwise they're incorrect.
 		this.GID = rs.dword();
 		this.TID = rs.dword();
 		this.IID = rs.dword();
 		this.IID1 = rs.dword();
+		this.unknown2 = rs.byte();
 		this.minX = rs.float();
 		this.minY = rs.float();
 		this.minZ = rs.float();
@@ -158,11 +161,11 @@ const Building = class Building extends Type(FileType.BuildingFile) {
 		// Serialize the fixed remainder.
 		let two = Buffer.allocUnsafe(46);
 		ws = new WriteStream(two);
-		ws.byte(this.unknown2);
 		ws.dword(this.GID);
 		ws.dword(this.TID);
 		ws.dword(this.IID);
 		ws.dword(this.IID1);
+		ws.byte(this.unknown2);
 		ws.float(this.minX);
 		ws.float(this.minY);
 		ws.float(this.minZ);