started on fixes for 1.4

Author: mrkite

notes

@@ -0,0 +1,14 @@
+ChecksForMerge -> merge flag
+Grass -> grass flag
+Moss -> moss flag
+DrawFlipMode = 1 -> flip flag
+tileSolid -> solid flag
+tileBlockLight -> !transparent flag
+tileBrick -> brick flag
+tileMergeDirt -> dirt flag
+tileStone -> stone flag
+tileLargeFrames -> large flag
+tilePile -> pile flag
+tileLighted
+wallBlend -> blended wall
+wallLargeFrames -> large

res/header.json

@@ -1 +1 @@
-[{"name":"title","type":"s"},{"name":"seed","type":"s","min":179},{"name":"genVersion","type":"i64","min":179},{"name":"guid","type":"u8","num":16,"min":181},{"name":"worldID","type":"i32"},{"name":"left","type":"i32"},{"name":"right","type":"i32"},{"name":"top","type":"i32"},{"name":"bottom","type":"i32"},{"name":"tilesHigh","type":"i32"},{"name":"tilesWide","type":"i32"},{"name":"expert","min":112},{"name":"creationTime","type":"i64","min":141},{"name":"moonType","type":"u8"},{"name":"treeX","type":"i32","num":3},{"name":"treeStyle","type":"i32","num":4},{"name":"caveBackX","type":"i32","num":3},{"name":"caveBackStyle","type":"i32","num":4},{"name":"iceBackStyle","type":"i32"},{"name":"jungleBackStyle","type":"i32"},{"name":"hellBackStyle","type":"i32"},{"name":"spawnX","type":"i32"},{"name":"spawnY","type":"i32"},{"name":"groundLevel","type":"f64"},{"name":"rockLevel","type":"f64"},{"name":"gameTime","type":"f64"},{"name":"dayNight"},{"name":"moonPhase","type":"i32"},{"name":"bloodMoon"},{"name":"eclipse"},{"name":"dungeonX","type":"i32"},{"name":"dungeonY","type":"i32"},{"name":"crimson"},{"name":"killedBoss1"},{"name":"killedBoss2"},{"name":"killedBoss3"},{"name":"killedQueenBee"},{"name":"killedMechBoss1"},{"name":"killedMechBoss2"},{"name":"killedMechBoss3"},{"name":"killedMechBossAny"},{"name":"killedPlantBoss"},{"name":"killedGolemBoss"},{"name":"killedSlimeKing","min":118},{"name":"savedTinkerer"},{"name":"savedWizard"},{"name":"savedMechanic"},{"name":"killedGoblins"},{"name":"killedClown"},{"name":"killedFrost"},{"name":"killedPirates"},{"name":"smashedOrb"},{"name":"meteorSpawned"},{"name":"shadowOrbCount","type":"u8"},{"name":"altarsSmashed","type":"i32"},{"name":"hardMode"},{"name":"invasionDelay","type":"i32"},{"name":"invasionSize","type":"i32"},{"name":"invasionType","type":"i32"},{"name":"invasionX","type":"f64"},{"name":"slimeRainTime","type":"f64","min":118},{"name":"sundialCooldown","type":"u8","min":113},{"name":"isRaining"},{"name":"rainTime","type":"i32"},{"name":"maxRain","type":"f32"},{"name":"oreTier1","type":"i32"},{"name":"oreTier2","type":"i32"},{"name":"oreTier3","type":"i32"},{"name":"styles","type":"u8","num":8},{"name":"clouds","type":"i32"},{"name":"numClouds","type":"i16"},{"name":"windSpeed","type":"f32"},{"name":"numAnglers","type":"i32","min":95},{"name":"anglers","type":"s","relnum":"numAnglers","min":95},{"name":"savedAngler","min":99},{"name":"anglerQuest","type":"i32","min":101},{"name":"savedStylist","min":104},{"name":"savedTaxCollector","min":129},{"name":"invasionSizeStart","type":"i32","min":107},{"name":"cultistDelay","type":"i32","min":108},{"name":"numKilled","type":"i16","min":109},{"name":"killCount","type":"i32","relnum":"numKilled","min":109},{"name":"fastForwardTime","min":128},{"name":"downedFishron","min":131},{"name":"downedMartians","min":131},{"name":"downedAncientCultist","min":131},{"name":"downedMoonlord","min":131},{"name":"downedHalloweenKing","min":131},{"name":"downedHalloweenTree","min":131},{"name":"downedChristmasIceQueen","min":131},{"name":"downedChristmasSantank","min":131},{"name":"downedChristmasTree","min":131},{"name":"downedSolar","min":140},{"name":"downedVortex","min":140},{"name":"downedNebula","min":140},{"name":"downedStardust","min":140},{"name":"activeSolar","min":140},{"name":"activeVortex","min":140},{"name":"activeNebula","min":140},{"name":"activeStardust","min":140},{"name":"lunarApocalypse","min":140},{"name":"partyManual","min":170},{"name":"partyGenuine","min":170},{"name":"partyCooldown","type":"i32","min":170},{"name":"numPartiers","type":"i32","min":170},{"name":"partiers","type":"i32","min":170,"relnum":"numPartiers"},{"name":"sandstormHappening","min":174},{"name":"sandstormTimeLeft","type":"i32","min":174},{"name":"sandstormSeverity","type":"f32","min":174},{"name":"sandstormIntendedSeverity","type":"f32","min":174},{"name":"savedBartender","min":178},{"name":"downedDD2Invasion1","min":178},{"name":"downedDD2Invasion2","min":178},{"name":"downedDD2Invasion3","min":178}]
+[{"name":"title","type":"s"},{"name":"seed","type":"s","min":179},{"name":"genVersion","type":"i64","min":179},{"name":"guid","type":"u8","num":16,"min":181},{"name":"worldID","type":"i32"},{"name":"left","type":"i32"},{"name":"right","type":"i32"},{"name":"top","type":"i32"},{"name":"bottom","type":"i32"},{"name":"tilesHigh","type":"i32"},{"name":"tilesWide","type":"i32"},{"name":"gameMode","type":"i32","min":209},{"name":"drunkWorld","type":"b","min":222},{"name":"goodWorld","type":"b","min":227},{"name":"expert","type":"b","max":208,"min":112},{"name":"master","type":"b","min":208,"max":208},{"name":"creationTime","type":"i64","min":141},{"name":"moonType","type":"u8"},{"name":"treeX","type":"i32","num":3},{"name":"treeStyle","type":"i32","num":4},{"name":"caveBackX","type":"i32","num":3},{"name":"caveBackStyle","type":"i32","num":4},{"name":"iceBackStyle","type":"i32"},{"name":"jungleBackStyle","type":"i32"},{"name":"hellBackStyle","type":"i32"},{"name":"spawnX","type":"i32"},{"name":"spawnY","type":"i32"},{"name":"groundLevel","type":"f64"},{"name":"rockLevel","type":"f64"},{"name":"gameTIme","type":"f64"},{"name":"dayNight"},{"name":"moonPhase","type":"i32"},{"name":"bloodMoon"},{"name":"eclipse"},{"name":"dungeonX","type":"i32"},{"name":"dungeonY","type":"i32"},{"name":"crimson"},{"name":"killedBoss1"},{"name":"killedBoss2"},{"name":"killedBoss3"},{"name":"killedQueenBee"},{"name":"killedMechBoss1"},{"name":"killedMechBoss2"},{"name":"killedMechBoss3"},{"name":"killedMechBossAny"},{"name":"killedPlantBoss"},{"name":"killedGolemBoss"},{"name":"killedSlimeKing","min":118},{"name":"savedTinkerer"},{"name":"savedWizard"},{"name":"savedMechanic"},{"name":"killedGoblins","type":"b"},{"name":"killedClown","type":"b"},{"name":"killedFrost"},{"name":"killedPirates","type":"b"},{"name":"smashedOrb","type":"b"},{"name":"meteorSpawned","type":"b"},{"name":"shadowOrbCount","type":"u8"},{"name":"altarsSmashed","type":"i32"},{"name":"hardMode","type":"b"},{"name":"invasionDelay","type":"i32"},{"name":"invasionSize","type":"i32"},{"name":"invasionType","type":"i32"},{"name":"invasionX","type":"f64"},{"name":"slimeRainTime","type":"f64","min":118},{"name":"sundialCooldown","type":"u8","min":113},{"name":"isRaining","type":"b"},{"name":"rainTime","type":"i32"},{"name":"maxRain","type":"f32"},{"name":"oreTier1","type":"i32"},{"name":"oreTier2","type":"i32"},{"name":"oreTier3","type":"i32"},{"name":"styles","type":"u8","num":8},{"name":"clouds","type":"i32"},{"name":"numClouds","type":"i16"},{"name":"windSpeed","type":"f32"},{"name":"numAnglers","type":"i32","min":95},{"name":"anglers","type":"s","min":95,"relnum":"numAnglers"},{"name":"savedAngler","type":"b","min":99},{"name":"anglerQuest","type":"i32","min":101},{"name":"savedStylist","min":104},{"name":"savedTaxCollector","min":129},{"name":"savedGolfer","min":201},{"name":"invasionSizeStart","min":107,"type":"i32"},{"name":"cultistDelay","min":108,"type":"i32"},{"name":"numKilled","min":109,"type":"i16"},{"name":"killCount","min":109,"type":"i32","relnum":"numKilled"},{"name":"fastForwardTime","min":128},{"name":"downedFishron","min":131},{"name":"downedMartians","min":131},{"name":"downedAncientCultist","min":131},{"name":"downedMoonlord","min":131},{"name":"downedHalloweenKing","min":131},{"name":"downedHalloweenTree","min":131},{"name":"downedChristmasSantank","min":131},{"name":"downedChristmasTree","min":131},{"name":"downedSolar","min":140},{"name":"downedVortex","min":140},{"name":"downedNebula","min":140},{"name":"downedStardust","min":140},{"name":"activeSolar","min":140},{"name":"activeVortex","type":"b","min":140},{"name":"activeNebula","type":"b","min":140},{"name":"activeStardust","type":"b","min":140},{"name":"lunarApocalypse","min":140},{"name":"partyManual","type":"b","min":170},{"name":"partyGenuine","type":"b","min":170},{"name":"partyCooldown","type":"i32","min":170},{"name":"numPartiers","min":170,"type":"i32"},{"name":"partiers","min":170,"type":"i32","relnum":"numPartiers"},{"name":"sandstormHappening","min":174},{"name":"sandstormTimeLeft","min":174,"type":"i32"},{"name":"sandstormSeverity","type":"f32","min":174},{"name":"sandstormIntendedSeverity","type":"f32","min":174},{"name":"savedBartender","min":178},{"name":"downedDD2Invasion1","min":178},{"name":"downedDD2Invasion2","min":178},{"name":"downedDD2Invasion3","min":178},{"name":"style8","type":"u8","min":195},{"name":"style9","type":"u8","min":215},{"name":"styles10","type":"u8","num":3,"min":196},{"name":"combatBookWasUsed","min":204},{"name":"lanternNightCooldown","type":"i32","min":207},{"name":"lanternNightGenuine","min":207},{"name":"lanternNightManual","min":207},{"name":"lanternNightNextGenuine","min":207},{"name":"numTreeTop","type":"i32","min":211},{"name":"treeTops","type":"i32","relnum":"numTreeTop","min":211},{"name":"forceHalloween","min":211},{"name":"forceHalloween","min":212},{"name":"forceXMas","type":"b","min":212},{"name":"copper","type":"i32","min":216},{"name":"iron","type":"i32","min":216},{"name":"silver","type":"i32","min":216},{"name":"gold","min":216,"type":"i32"},{"name":"boughtCat","min":217},{"name":"boughtDog","min":217},{"name":"boughtBunny","min":217},{"name":"killedEmpressOfLight","min":223},{"name":"killedQueenSlime","min":223}]

res/items.json

@@ -35,7 +35,7 @@ class Tile {
 
 class World : public QObject, public QRunnable {
   static const int MinimumVersion = 88;
-  static const int HighestVersion = 194;
+  static const int HighestVersion = 228;
 
 
   Q_OBJECT

res/npcs.json

@@ -38,7 +38,8 @@ void WorldHeader::load(QSharedPointer<Handle> handle, int version) {
   data.clear();
   int num;
   for (auto const &field : fields) {
-    if (version >= field.minVersion) {
+    if (version >= field.minVersion &&
+        (field.maxVersion == 0 || version <= field.maxVersion)) {
       auto header = QSharedPointer<Header>(new Header());
       switch (field.type) {
         case Field::Type::BOOLEAN: header->setData(handle->r8()); break;
@@ -110,7 +111,7 @@ int WorldHeader::treeStyle(int x) const {
 WorldHeader::Field::Field(QJsonObject const &data) {
   name = data["name"].toString();
   QString t = data["type"].toString();
-  if (t.isNull()) type = Type::BOOLEAN;
+  if (t.isNull() || t == "b") type = Type::BOOLEAN;
   else if (t == "s") type = (data.contains("num") || data.contains("relnum")) ?
     Type::ARRAY_STRING : Type::STRING;
   else if (t == "u8") type = (data.contains("num")
@@ -124,10 +125,12 @@ WorldHeader::Field::Field(QJsonObject const &data) {
   else if (t == "f32") type = Type::FLOAT32;
   else if (t == "f64") type = Type::FLOAT64;
   else
-    throw InitException(QString("Invalid header type: %1").arg(type));
+    throw InitException(QString("Invalid header type: %1 on %2")
+                        .arg(t).arg(name));
   length = data["num"].toInt();
   dynamicLength = data["relnum"].toString();
   minVersion = data.contains("min") ? data["min"].toInt() : 88;
+  maxVersion = data.contains("max") ? data["max"].toInt() : 0;
 }
 
 static WorldHeader::Header Null;

res/tiles.json

@@ -67,7 +67,7 @@ class WorldHeader {
 
     QString name;
     Type type;
-    int length, minVersion;
+    int length, minVersion, maxVersion;
     QString dynamicLength;
   };