diff --git a/project/.jasper/type_descriptors/B.int64;0 b/project/.jasper/type_descriptors/B.int64;0 new file mode 100644 index 0000000..5c2d9f4 --- /dev/null +++ b/project/.jasper/type_descriptors/B.int64;0 @@ -0,0 +1,5 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "length" : 8, + "primitiveType" : 1, + "typeName" : "B.int64" +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.BgLayer;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.BgLayer;1 new file mode 100644 index 0000000..e390697 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.BgLayer;1 @@ -0,0 +1,23 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "cbb", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "tiles", + "subscriptLevels" : 1, + "subscriptStack" : + [ + { + "subscriptType" : 4 + } + ], + "typeId" : "net.drinkingtea.jasper.world.TileStatic;1" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.jasper.world.BgLayer", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.DocObjRef;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.DocObjRef;1 new file mode 100644 index 0000000..20a45b1 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.DocObjRef;1 @@ -0,0 +1,16 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "world_object_set_id", + "typeId" : "B.uint64;0" + }, + { + "fieldName" : "world_object_id", + "typeId" : "B.uint32;0" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.jasper.world.DocObjRef", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.ObjectSetEntry;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.ObjectSetEntry;1 new file mode 100644 index 0000000..fa2af02 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.ObjectSetEntry;1 @@ -0,0 +1,16 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "path", + "typeId" : "net.drinkingtea.ox.BasicString#8#;1" + }, + { + "fieldName" : "id", + "typeId" : "B.uint64;0" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.jasper.world.ObjectSetEntry", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.PaletteCycle;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.PaletteCycle;1 index f45b84a..692ca9f 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.PaletteCycle;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.PaletteCycle;1 @@ -10,7 +10,6 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "typeId" : "B.uint16;0" } ], - "preloadable" : true, "primitiveType" : 5, "typeName" : "net.drinkingtea.jasper.world.PaletteCycle", "typeVersion" : 1 diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileDoc;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileDoc;1 index e2908ea..dd07682 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileDoc;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileDoc;1 @@ -2,31 +2,34 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "fieldList" : [ { - "fieldName" : "subsheet_id", - "typeId" : "B.int32;0" - }, - { - "fieldName" : "subsheet_path", - "typeId" : "net.drinkingtea.ox.BasicString#8#;1" + "fieldName" : "obj", + "typeId" : "net.drinkingtea.jasper.world.DocObjRef;1" }, { "fieldName" : "type", "typeId" : "B.uint8;0" }, { - "fieldName" : "layer_attachments", - "subscriptLevels" : 1, - "subscriptStack" : - [ - { - "length" : 4, - "subscriptType" : 3 - } - ], + "fieldName" : "pal_bank", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "top_layer_attachment", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "bottom_layer_attachment", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "left_layer_attachment", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "right_layer_attachment", "typeId" : "B.uint8;0" } ], - "preloadable" : true, "primitiveType" : 5, "typeName" : "net.drinkingtea.jasper.world.TileDoc", "typeVersion" : 1 diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileStatic;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileStatic;1 new file mode 100644 index 0000000..6e8dabb --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileStatic;1 @@ -0,0 +1,24 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "tileIdx", + "typeId" : "B.uint16;0" + }, + { + "fieldName" : "palBank", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "tileType", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "layerAttachments", + "typeId" : "B.uint8;0" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.jasper.world.TileStatic", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldDoc;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldDoc;1 index 66992d1..f25faea 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldDoc;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldDoc;1 @@ -2,11 +2,7 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "fieldList" : [ { - "fieldName" : "tilesheet", - "typeId" : "net.drinkingtea.ox.BasicString#8#;1" - }, - { - "fieldName" : "palettes", + "fieldName" : "object_sets", "subscriptLevels" : 1, "subscriptStack" : [ @@ -14,7 +10,19 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "subscriptType" : 4 } ], - "typeId" : "net.drinkingtea.ox.BasicString#8#;1" + "typeId" : "net.drinkingtea.jasper.world.ObjectSetEntry;1" + }, + { + "fieldName" : "object_set_id_idx", + "typeId" : "B.uint64;0" + }, + { + "fieldName" : "columns", + "typeId" : "B.int32;0" + }, + { + "fieldName" : "rows", + "typeId" : "B.int32;0" }, { "fieldName" : "tiles", @@ -22,7 +30,8 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "subscriptStack" : [ { - "subscriptType" : 4 + "length" : 3, + "subscriptType" : 3 }, { "subscriptType" : 4 @@ -34,7 +43,6 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "typeId" : "net.drinkingtea.jasper.world.TileDoc;1" } ], - "preloadable" : true, "primitiveType" : 5, "typeName" : "net.drinkingtea.jasper.world.WorldDoc", "typeVersion" : 1 diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObject;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObject;1 index 90c70b2..5bfaa16 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObject;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObject;1 @@ -3,7 +3,7 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ [ { "fieldName" : "id", - "typeId" : "B.int32;0" + "typeId" : "B.uint32;0" }, { "fieldName" : "name", @@ -14,15 +14,30 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "typeId" : "B.uint16;0" }, { - "fieldName" : "subsheetId", + "fieldName" : "subsheet_id", "typeId" : "B.int32;0" }, { - "fieldName" : "collisionMap", + "fieldName" : "collision_map", "typeId" : "B.uint32;0" + }, + { + "fieldName" : "object_type", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "ext1", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "ext2", + "typeId" : "B.uint8;0" + }, + { + "fieldName" : "ext3", + "typeId" : "B.uint8;0" } ], - "preloadable" : true, "primitiveType" : 5, "typeName" : "net.drinkingtea.jasper.world.WorldObject", "typeVersion" : 1 diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObjectSet;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObjectSet;1 index 8e5e1ba..ec51374 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObjectSet;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldObjectSet;1 @@ -2,8 +2,8 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "fieldList" : [ { - "fieldName" : "objIdIdx", - "typeId" : "B.int32;0" + "fieldName" : "obj_id_idx", + "typeId" : "B.uint32;0" }, { "fieldName" : "tilesheet", diff --git a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldStatic;1 b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldStatic;1 index 8b920a7..3a73fd9 100644 --- a/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldStatic;1 +++ b/project/.jasper/type_descriptors/net.drinkingtea.jasper.world.WorldStatic;1 @@ -2,8 +2,8 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "fieldList" : [ { - "fieldName" : "tilesheet", - "typeId" : "net.drinkingtea.ox.FileAddress;1" + "fieldName" : "tilesheets", + "typeId" : "net.drinkingtea.nostalgia.core.TileSheetSet;1" }, { "fieldName" : "palettes", @@ -14,71 +14,27 @@ O1;net.drinkingtea.ox.TypeDescriptor;1;{ "subscriptType" : 4 } ], - "typeId" : "net.drinkingtea.ox.FileAddress;1" + "typeId" : "net.drinkingtea.jasper.world.PaletteCycle;1" }, { "fieldName" : "columns", - "subscriptLevels" : 1, - "subscriptStack" : - [ - { - "subscriptType" : 4 - } - ], - "typeId" : "B.uint16;0" + "typeId" : "B.int16;0" }, { "fieldName" : "rows", + "typeId" : "B.int16;0" + }, + { + "fieldName" : "map", "subscriptLevels" : 1, "subscriptStack" : [ { - "subscriptType" : 4 + "length" : 3, + "subscriptType" : 3 } ], - "typeId" : "B.uint16;0" - }, - { - "fieldName" : "tileMapIdx", - "subscriptLevels" : 2, - "subscriptStack" : - [ - { - "subscriptType" : 4 - }, - { - "subscriptType" : 4 - } - ], - "typeId" : "B.uint16;0" - }, - { - "fieldName" : "tileType", - "subscriptLevels" : 2, - "subscriptStack" : - [ - { - "subscriptType" : 4 - }, - { - "subscriptType" : 4 - } - ], - "typeId" : "B.uint8;0" - }, - { - "fieldName" : "layerAttachments", - "subscriptLevels" : 2, - "subscriptStack" : - [ - { - "subscriptType" : 4 - }, - { - "subscriptType" : 4 - } - ], - "typeId" : "B.uint8;0" + "typeId" : "net.drinkingtea.jasper.world.BgLayer;1" } ], "preloadable" : true, diff --git a/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSet;1 b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSet;1 new file mode 100644 index 0000000..13ddc69 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSet;1 @@ -0,0 +1,24 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "bpp", + "typeId" : "B.int32;0" + }, + { + "fieldName" : "entries", + "subscriptLevels" : 1, + "subscriptStack" : + [ + { + "subscriptType" : 4 + } + ], + "typeId" : "net.drinkingtea.nostalgia.core.TileSheetSetEntry;1" + } + ], + "preloadable" : true, + "primitiveType" : 5, + "typeName" : "net.drinkingtea.nostalgia.core.TileSheetSet", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntry;1 b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntry;1 new file mode 100644 index 0000000..a80a1c0 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntry;1 @@ -0,0 +1,23 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "tilesheet", + "typeId" : "net.drinkingtea.ox.FileAddress;1" + }, + { + "fieldName" : "sections", + "subscriptLevels" : 1, + "subscriptStack" : + [ + { + "subscriptType" : 4 + } + ], + "typeId" : "net.drinkingtea.nostalgia.core.TileSheetSetEntrySection;1" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.nostalgia.core.TileSheetSetEntry", + "typeVersion" : 1 +} diff --git a/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntrySection;1 b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntrySection;1 new file mode 100644 index 0000000..09ac956 --- /dev/null +++ b/project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntrySection;1 @@ -0,0 +1,16 @@ +O1;net.drinkingtea.ox.TypeDescriptor;1;{ + "fieldList" : + [ + { + "fieldName" : "begin", + "typeId" : "B.int32;0" + }, + { + "fieldName" : "tiles", + "typeId" : "B.int32;0" + } + ], + "primitiveType" : 5, + "typeName" : "net.drinkingtea.nostalgia.core.TileSheetSetEntrySection", + "typeVersion" : 1 +} diff --git a/project/Palettes/Logo.npal b/project/Palettes/Logo.npal index d648dba..662b0e2 100644 --- a/project/Palettes/Logo.npal +++ b/project/Palettes/Logo.npal @@ -1 +1 @@ -K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;M2;net.drinkingtea.nostalgia.core.Palette;1;PÛ{³ÖQ„ \ No newline at end of file +K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;M2;net.drinkingtea.nostalgia.core.Palette;2;PÛ{³ÖQ„ \ No newline at end of file diff --git a/project/TileSheets/Chester.ng b/project/TileSheets/Chester.ng index 6f54952..f362a0a 100644 Binary files a/project/TileSheets/Chester.ng and b/project/TileSheets/Chester.ng differ diff --git a/project/TileSheets/Dirt.ng b/project/TileSheets/Dirt.ng index 54f1cd1..13e5408 100644 Binary files a/project/TileSheets/Dirt.ng and b/project/TileSheets/Dirt.ng differ diff --git a/project/TileSheets/NS_Logo.ng b/project/TileSheets/NS_Logo.ng index b3f677a..451cd5a 100644 Binary files a/project/TileSheets/NS_Logo.ng and b/project/TileSheets/NS_Logo.ng differ diff --git a/project/WorldObjectSets/ChesterObjects.jwob b/project/WorldObjectSets/ChesterObjects.jwob new file mode 100644 index 0000000..bca5566 Binary files /dev/null and b/project/WorldObjectSets/ChesterObjects.jwob differ diff --git a/project/Worlds/Chester.jwld b/project/Worlds/Chester.jwld index 0c15327..f8b946a 100644 Binary files a/project/Worlds/Chester.jwld and b/project/Worlds/Chester.jwld differ