From 31d0ed57365887d3e9ef99328372b1de49aeb74b Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 12 Feb 2024 00:13:28 -0600 Subject: [PATCH] [jasper/project] Add assets --- project/.jasper/type_descriptors/B.int64;0 | 5 ++ .../net.drinkingtea.jasper.world.BgLayer;1 | 23 ++++++ .../net.drinkingtea.jasper.world.DocObjRef;1 | 16 +++++ ....drinkingtea.jasper.world.ObjectSetEntry;1 | 16 +++++ ...et.drinkingtea.jasper.world.PaletteCycle;1 | 1 - .../net.drinkingtea.jasper.world.TileDoc;1 | 35 +++++----- .../net.drinkingtea.jasper.world.TileStatic;1 | 24 +++++++ .../net.drinkingtea.jasper.world.WorldDoc;1 | 24 ++++--- ...net.drinkingtea.jasper.world.WorldObject;1 | 23 ++++-- ....drinkingtea.jasper.world.WorldObjectSet;1 | 4 +- ...net.drinkingtea.jasper.world.WorldStatic;1 | 66 +++--------------- ....drinkingtea.nostalgia.core.TileSheetSet;1 | 24 +++++++ ...kingtea.nostalgia.core.TileSheetSetEntry;1 | 23 ++++++ ....nostalgia.core.TileSheetSetEntrySection;1 | 16 +++++ project/Palettes/Logo.npal | 2 +- project/TileSheets/Chester.ng | Bin 296 -> 306 bytes project/TileSheets/Dirt.ng | Bin 147 -> 290 bytes project/TileSheets/NS_Logo.ng | Bin 225 -> 226 bytes project/WorldObjectSets/ChesterObjects.jwob | Bin 0 -> 794 bytes project/Worlds/Chester.jwld | Bin 1289 -> 1325 bytes 20 files changed, 215 insertions(+), 87 deletions(-) create mode 100644 project/.jasper/type_descriptors/B.int64;0 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.jasper.world.BgLayer;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.jasper.world.DocObjRef;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.jasper.world.ObjectSetEntry;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.jasper.world.TileStatic;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSet;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntry;1 create mode 100644 project/.jasper/type_descriptors/net.drinkingtea.nostalgia.core.TileSheetSetEntrySection;1 create mode 100644 project/WorldObjectSets/ChesterObjects.jwob 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 6f549522ceca62231e886053ded72f3b87bf903e..f362a0aaea2755736a53382271729ea811b0cee8 100644 GIT binary patch delta 79 zcmZ3%w25g#h^vV;KZg_(qmF(+VoqvFNoujab4F@$NotW^UO{4xFb79aetroHvpyG> VQ%+)DHVX?Q69XF1=b6|!6971n5s&}? delta 70 zcmdnQw1R0uh^etPKL-aBqmF(+VoqvFNoujab4F@$NotW^UO{4xBu7wwehCY+IG0mS VVqP{AlLG?~h)kqUPD0X8tE^6FM`xhHYNw7S>MqGe+!{xrqC3hksYk4VE ziO|+E2Ug_>GFKT;Z4{%rtvDKSroy35^l07Fy3V6a-0YO%gcW>JY=UO{4xI7d)^ehCW;Ba;Gy10w?y W1ET{215<+n0|%1=7%(w0aRC5oAr1Qg diff --git a/project/TileSheets/NS_Logo.ng b/project/TileSheets/NS_Logo.ng index b3f677a294a051237eb00fa605a6109610f11538..451cd5a5b84b5f89ec74f2667edf652fd4eaef09 100644 GIT binary patch delta 21 ccmaFJ_=s^r2&;)TKL^XiNIfQfrimSq07lvc_5c6? delta 20 bcmaFF_>gfz2&=I*KL^vqNIgdJiJg%ELC^)+ diff --git a/project/WorldObjectSets/ChesterObjects.jwob b/project/WorldObjectSets/ChesterObjects.jwob new file mode 100644 index 0000000000000000000000000000000000000000..bca55662cae358156f93d58155bb727644fe7a82 GIT binary patch literal 794 zcmc&yO-sW-5cRtG6=BaN%{EN~=BD0MDpc?wMK;}On>21pcKra!e|ILkVyL}}5Ekam z%bPbJH=-!lGT+Qa9%bof8qFY`MKVvaNM%waYgJ-0FBYQEU}M!)dSB_S1sT`U9H5Ke z+pbaZBfX2VhP7RSEkyAdFy5B+bEWY6;NeA>o;wIBhT?!d1&kq&F%po;*JHUM}p2^IQ61O64@yUay|CsB~ni0fUPji z(HvL{zq`^Fx;NR}4H=Oni4*gDvQ6THW5$)V@*DCPN!uNPd~)xLOs;maGq?+lGUQ_L z;hymT{-`z>?CD=>-?rQKWMRJrTQx9Tgc~AFbv#pd7eDiSK>Csn$lyeMS6jc;KIqTB E00JGm82|tP literal 0 HcmV?d00001 diff --git a/project/Worlds/Chester.jwld b/project/Worlds/Chester.jwld index 0c153276733a430aafc1269e066bf31107bc7242..f8b946aeedd8a891c7fdb3eaf6f75d6896c2b603 100644 GIT binary patch literal 1325 zcmd^9O;3a{5cS&ricQbL+Jdf?quxC1!Gi~52n$^oM7n_*4u=2kO!){dAtsw>HdzjB zX8LB{d((zT9>{3L6X8jRD=8h{-GB!ua3nc`Ags?P06bBRp z`^fAtWJ}v{ZOfjZYI(m?l~HAzsobpA8wMo}C9ge_bpF)(SaMm)%62|G&Q0X;~A z2SbuDYbEToj&%X(=OGvgJ3!k5bimhG7p<|sXX)979W~%I&eZKNhwc_8@nk*|#9^ha tfW=OA{Eqrc1f0T6_j+dcBfXDb(`@g4YQIivw!^=vJI)XMWN33izX5w)0`~v_ literal 1289 zcmeHG%WlIU5bV|diimU90gMgA*W7xj)JqRhR1qGD70b44tg5Q~?*-C+K~Ir_U?d)+ z9cFi5NFx;|hL#eDl@eG<3`pi`pp-JnF?FJ(%`0ho>kBir{k84S-m0P>X0N()tBTKI z>P+z-aX;vWG~aoKeB0UiVy#D;-3Bd7Yj)dhRo7heN&-JA0*qq?Lev;Ib(m9ZbR{%; z4(w5N)_Xfg^5Kt7nA4>(0vL4;*vUx{#1T-KV67{qX+_X6(o^ur&9g(ErFDZWNQ(o_ z%PFb*7?r=Epzv)Ne6epQALFMd{%f@12B+