diff --git a/03theempress.aseprite b/03theempress.aseprite index 6cf1fbe..9eac868 100644 Binary files a/03theempress.aseprite and b/03theempress.aseprite differ diff --git a/04theemperor.aseprite b/04theemperor.aseprite index 72e4f21..61cba67 100644 Binary files a/04theemperor.aseprite and b/04theemperor.aseprite differ diff --git a/05thehierophant.aseprite b/05thehierophant.aseprite index 4cda4f2..c394a35 100644 Binary files a/05thehierophant.aseprite and b/05thehierophant.aseprite differ diff --git a/06TheLovers.inc b/06TheLovers.inc index 9702528..8a36f5f 100644 --- a/06TheLovers.inc +++ b/06TheLovers.inc @@ -8,6 +8,17 @@ TheLovers: dw .BackgroundCopy dw .KeyArtTilesEnd - .KeyArtTiles dw .KeyArtTiles + dw .SpriteTilesEnd - .SpriteTiles + dw .SpriteTiles + dw .fInit + dw .fUpdate + dw .fDraw + +.fInit: ret +.fUpdate: ret +.fDraw: ret +.SpriteTiles: +.SpriteTilesEnd: ; original export script by gabriel reis, modified by shoofle diff --git a/06thelovers.aseprite b/06thelovers.aseprite index 3043256..95c9b88 100644 Binary files a/06thelovers.aseprite and b/06thelovers.aseprite differ diff --git a/curve_authoring.html b/curve_authoring.html index c576732..c822e36 100644 --- a/curve_authoring.html +++ b/curve_authoring.html @@ -23,7 +23,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + @@ -94,6 +94,8 @@ var text_output = null; var moving_point_index = -1; var the_list = []; + var current_viewport = {center: {x: 0, y: 0}, radius: {x: 176, y: 176}}; + var max_viewport = {center: {x: 0, y: 0}, radius: {x: 176, y:176}}; function length(dx, dy) {return Math.sqrt(dx*dx + dy*dy);} @@ -188,16 +190,12 @@ } const changetextarea = (event) => { let raw = event.target.value; - let stripped = raw.replace(/db [0-9]+,/, ""); - let pairs = stripped.matchAll(/ ?[0-9]+, ?[0-9]+/g); - let splits = pairs.map((x) => x[0].split(/,/)); + let points = splits.map(([a, b]) => { return {y: Number(a), x: Number(b)}; } ); - let numbers = splits.map(([a, b]) => { return {y: Number(a), x: Number(b)}; } ); - - the_list = [... numbers]; + the_list = [... points]; regenerate_svg_list(); regenerate_text_list(); @@ -292,6 +290,8 @@ if (event.key == 'd') { delete_radio.checked = true; } if (event.key == 'g') { move_radio.checked = true; } } + + } \ No newline at end of file diff --git a/source.zip b/source.zip index f809358..04554c1 100644 Binary files a/source.zip and b/source.zip differ