diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 374763b..6794fda 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -1,11 +1,9 @@ { "resources": [ - {"id":{"name":"c_loadstageone","path":"scripts/c_loadstageone/c_loadstageone.yy",},"order":20,}, {"id":{"name":"draw_sprite_at","path":"scripts/draw_sprite_at/draw_sprite_at.yy",},"order":8,}, {"id":{"name":"c_inheritunit","path":"scripts/c_inheritunit/c_inheritunit.yy",},"order":5,}, {"id":{"name":"vertex_format_create_simple","path":"scripts/vertex_format_create_simple/vertex_format_create_simple.yy",},"order":5,}, {"id":{"name":"array_sum","path":"scripts/array_sum/array_sum.yy",},"order":7,}, - {"id":{"name":"c_doenemyai","path":"scripts/c_doenemyai/c_doenemyai.yy",},"order":23,}, {"id":{"name":"clampneg","path":"scripts/clampneg/clampneg.yy",},"order":8,}, {"id":{"name":"array_remove","path":"scripts/array_remove/array_remove.yy",},"order":6,}, {"id":{"name":"lerp_angle","path":"scripts/lerp_angle/lerp_angle.yy",},"order":9,}, @@ -14,16 +12,13 @@ {"id":{"name":"vlambeer","path":"scripts/vlambeer/vlambeer.yy",},"order":1,}, {"id":{"name":"x_unitsetup","path":"scripts/x_unitsetup/x_unitsetup.yy",},"order":0,}, {"id":{"name":"x_skillstuff","path":"scripts/x_skillstuff/x_skillstuff.yy",},"order":12,}, - {"id":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"order":1,}, {"id":{"name":"c_decolor","path":"scripts/c_decolor/c_decolor.yy",},"order":10,}, {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":0,}, {"id":{"name":"easing","path":"scripts/easing/easing.yy",},"order":4,}, {"id":{"name":"bint_sort","path":"scripts/bint_sort/bint_sort.yy",},"order":0,}, {"id":{"name":"vec2","path":"scripts/vec2/vec2.yy",},"order":0,}, {"id":{"name":"array_insert_array","path":"scripts/array_insert_array/array_insert_array.yy",},"order":5,}, - {"id":{"name":"c_tiledist","path":"scripts/c_tiledist/c_tiledist.yy",},"order":24,}, {"id":{"name":"draw_percent","path":"scripts/draw_percent/draw_percent.yy",},"order":6,}, - {"id":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"order":2,}, {"id":{"name":"o_flash","path":"objects/o_flash/o_flash.yy",},"order":0,}, {"id":{"name":"tiledata","path":"scripts/tiledata/tiledata.yy",},"order":4,}, {"id":{"name":"deep_copy","path":"scripts/deep_copy/deep_copy.yy",},"order":10,}, @@ -64,12 +59,10 @@ {"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,}, {"id":{"name":"collision_line_width","path":"scripts/collision_line_width/collision_line_width.yy",},"order":9,}, {"id":{"name":"draw_rectangle_width","path":"scripts/draw_rectangle_width/draw_rectangle_width.yy",},"order":7,}, - {"id":{"name":"x_units","path":"scripts/x_units/x_units.yy",},"order":19,}, {"id":{"name":"c_2dto3d","path":"scripts/c_2dto3d/c_2dto3d.yy",},"order":20,}, {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":1,}, {"id":{"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},"order":0,}, {"id":{"name":"dir2hv","path":"scripts/dir2hv/dir2hv.yy",},"order":2,}, - {"id":{"name":"s_null","path":"sprites/s_null/s_null.yy",},"order":4,}, {"id":{"name":"tag","path":"scripts/tag/tag.yy",},"order":6,}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,}, {"id":{"name":"c_selectunit","path":"scripts/c_selectunit/c_selectunit.yy",},"order":9,}, @@ -87,19 +80,15 @@ {"id":{"name":"point_me","path":"scripts/point_me/point_me.yy",},"order":15,}, {"id":{"name":"draw_hitbox","path":"scripts/draw_hitbox/draw_hitbox.yy",},"order":4,}, {"id":{"name":"ARTICULATOR","path":"objects/ARTICULATOR/ARTICULATOR.yy",},"order":0,}, - {"id":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"order":0,}, {"id":{"name":"draw_outline","path":"scripts/draw_outline/draw_outline.yy",},"order":5,}, {"id":{"name":"distabs","path":"scripts/distabs/distabs.yy",},"order":11,}, {"id":{"name":"nam","path":"scripts/nam/nam.yy",},"order":13,}, - {"id":{"name":"c_dewait","path":"scripts/c_dewait/c_dewait.yy",},"order":21,}, {"id":{"name":"c_resetbattlevar","path":"scripts/c_resetbattlevar/c_resetbattlevar.yy",},"order":14,}, {"id":{"name":"array_find_index","path":"scripts/array_find_index/array_find_index.yy",},"order":1,}, {"id":{"name":"array_greatest","path":"scripts/array_greatest/array_greatest.yy",},"order":4,}, {"id":{"name":"c_null","path":"scripts/c_null/c_null.yy",},"order":4,}, {"id":{"name":"array_contains_within","path":"scripts/array_contains_within/array_contains_within.yy",},"order":19,}, - {"id":{"name":"c_passableeval","path":"scripts/c_passableeval/c_passableeval.yy",},"order":25,}, {"id":{"name":"st_moving","path":"scripts/st_moving/st_moving.yy",},"order":7,}, - {"id":{"name":"c_deleteunit","path":"scripts/c_deleteunit/c_deleteunit.yy",},"order":22,}, {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,}, ], "Options": [ @@ -137,7 +126,6 @@ {"folderPath":"folders/Scripts/util/drawing/vlambeer.yy","order":1,"resourceVersion":"1.0","name":"vlambeer","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Scripts/util.yy","order":1,"resourceVersion":"1.0","name":"util","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/momiji.yy","order":2,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Sprites/wabbit.yy","order":3,"resourceVersion":"1.0","name":"wabbit","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Scripts/3d.yy","order":19,"resourceVersion":"1.0","name":"3d","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ @@ -147,12 +135,8 @@ {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [ - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"grass.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"koakuma.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index aacc877..4ae2987 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -1,13 +1,14 @@ -//c_addunit(un.chara, ARMY.US); -//c_addunit(un.kris, ARMY.THEM); +c_addunit(un.chara, ARMY.US); +c_addunit(un.kris, ARMY.THEM); var i; /*for (i=0; i= 0 { } } } - -var i; -for (i=0; i dude.pos.x { - var guy = c_gettile(target.pos.x-1, target.pos.y); - } - if target.pos.y < dude.pos.y { - var guy = c_gettile(target.pos.x, target.pos.y+1); - } else if target.pos.y > dude.pos.y { - var guy = c_gettile(target.pos.x, target.pos.y-1); - } - if guy != noone { - if guy.passable && !c_containsunit(guy.x, guy.y) { - c_moveunit(target, guy); - } - } - c_loadmarkings(); - } - target.waiting = true; - break; - case AI.WAITER: - target.waiting = true; - break; - case AI.ESCAPER: - target.waiting = true; - break; - } - c_loadmarkings(); -} - -function c_findnearestunit(alignment) { - var lowest = new vec2(99, 99); - var lowestunit = noone; - for (i=0; i guy.x + guy.y) { - lowest = guy; - lowestunit = global.units[alignment][i]; - } - } - return lowestunit; -} \ No newline at end of file diff --git a/eastern flames/scripts/c_doenemyai/c_doenemyai.yy b/eastern flames/scripts/c_doenemyai/c_doenemyai.yy deleted file mode 100644 index c7222f4..0000000 --- a/eastern flames/scripts/c_doenemyai/c_doenemyai.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, - "resourceVersion": "1.0", - "name": "c_doenemyai", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/eastern flames/scripts/c_inheritunit/c_inheritunit.gml b/eastern flames/scripts/c_inheritunit/c_inheritunit.gml index 88c1321..5f8ffb9 100644 --- a/eastern flames/scripts/c_inheritunit/c_inheritunit.gml +++ b/eastern flames/scripts/c_inheritunit/c_inheritunit.gml @@ -1,11 +1,9 @@ -function c_inheritunit(x, y, unit_, alignment) { +function c_inheritunit(x, y, unit_) { var chump = instance_create(-10, -10, o_unit); chump.data = unit_; chump.pos.x = x; chump.pos.y = y; chump.sprite_index = unit_.idle; array_push(global.map[x][y].contents, chump); - array_push(global.units[alignment], chump); - chump.alignment = alignment; return chump; } \ No newline at end of file diff --git a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml b/eastern flames/scripts/c_loadstageone/c_loadstageone.gml deleted file mode 100644 index 611900c..0000000 --- a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml +++ /dev/null @@ -1,50 +0,0 @@ -function c_loadstageone() { - /*var chara = c_inheritunit(8, 5, un.chara, ARMY.US); - c_addweapon(chara, wp.knife, true); - c_addweapon(chara, wp[$"iron sword"], true); - var kris = c_inheritunit(10, 5, un.kris, ARMY.THEM); - c_addweapon(kris, wp[$"iron sword"], true, true);*/ - var momiji = c_inheritunit(5, 9, un.momiji, ARMY.US); - c_addweapon(momiji, wp[$"iron sword"], true); - var nitori = c_inheritunit(4, 10, un.nitori, ARMY.US); - c_addweapon(nitori, wp[$"iron sword"], true); - - - bunny = c_inheritunit(19, 3, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(17, 2, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - - var bunny = c_inheritunit(8, 2, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(10, 3, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(12, 4, un.bunny, ARMY.THEM); - - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(9, 10, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(10, 8, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(12, 10, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(13, 7, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - - bunny = c_inheritunit(16, 12, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - - bunny = c_inheritunit(16, 5, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(17, 6, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(18, 7, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - - bunny = c_inheritunit(19, 13, un.bunny, ARMY.THEM); - c_addweapon(bunny, wp[$"iron sword"], true); - - - var reisen = c_inheritunit(19, 1, un[$"rei'sen"], true, ARMY.THEM); - c_addweapon(reisen, wp[$"iron sword"], true); -} \ No newline at end of file diff --git a/eastern flames/scripts/c_loadstageone/c_loadstageone.yy b/eastern flames/scripts/c_loadstageone/c_loadstageone.yy deleted file mode 100644 index 29d7357..0000000 --- a/eastern flames/scripts/c_loadstageone/c_loadstageone.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, - "resourceVersion": "1.0", - "name": "c_loadstageone", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/eastern flames/scripts/c_passableeval/c_passableeval.gml b/eastern flames/scripts/c_passableeval/c_passableeval.gml deleted file mode 100644 index 502bc38..0000000 --- a/eastern flames/scripts/c_passableeval/c_passableeval.gml +++ /dev/null @@ -1,27 +0,0 @@ -function c_passableeval() { - /*var i, j; - for (i=0; i mov*ts.x { if !stop { x += hspd*ts.x; @@ -25,25 +25,23 @@ function st_moving() { while !remainingmov { hspd = 0; vspd = 0; - x = linear_approach(x, returnpos.x*ts.x+16, 1); - y = linear_approach(y, returnpos.y*ts.y+16, 1); - log(x, returnpos.x*ts.x); - log(y, returnpos.y*ts.y); + x = linear_approach(x, pos.x*ts.x+16, 1); + y = linear_approach(y, pos.y*ts.y+16, 1); + log(x, pos.x*ts.x); + log(y, pos.y*ts.y); var remainingmov = mov+1 - ( - abs(x+hspd-16-returnpos.x*ts.x)/ts.x + - abs(y+vspd-16-returnpos.y*ts.y)/ts.y + abs(x+hspd-16-pos.x*ts.x)/ts.x + + abs(y+vspd-16-pos.y*ts.y)/ts.y ); //log("oob, " + string(remainingmov)); /*} else { log("not oob!");*/ + } - var dude = c_gettile(x, y, true); - pos.x = dude.x; - pos.y = dude.y; prevremainingmov = remainingmov; c_decolor_all(c_red); c_decolor_all(c_green); - var guy = c_gettile(pos.x, pos.y); + var guy = c_gettile(x, y, true); c_colortile(guy.x, guy.y, c_green); //log("selecting"); //var rng = [1]; @@ -71,12 +69,12 @@ function st_moving() { break; default: sprite_index = data.idle; - //image_xscale = -1; + image_xscale = -1; break; } - if hitting != noone && stop c_colortile(hitting.x, hitting.y, c_red); if hitting != noone && select && stop { + c_colortile(hitting.x, hitting.y, c_red); log("found one"); log(hitting.contents, hitting.x, hitting.y); var i; @@ -86,7 +84,6 @@ function st_moving() { if hitting.contents[i].object_index = o_unit { log("is unit"); log("found two"); - c_moveunit(id, c_gettile(x, y, true)); c_generatecombatstack([id, hitting.contents[i]]); } } @@ -94,7 +91,6 @@ function st_moving() { } } if back { - c_moveunit(id, c_gettile(returnpos.x, returnpos.y)); c_deselectunit(id); } if dir == DIR.NONE && select { @@ -102,17 +98,17 @@ function st_moving() { waiting = true; c_deselectunit(id); } - /*if x < (returnpos.x-mov)*ts.x { - x = (returnpos.x-mov)*ts.x; - } else if x > (returnpos.x+mov+1)*ts.x { - x = (returnpos.x+mov+1)*ts.x; + /*if x < (pos.x-mov)*ts.x { + x = (pos.x-mov)*ts.x; + } else if x > (pos.x+mov+1)*ts.x { + x = (pos.x+mov+1)*ts.x; } else { x += hspd*ts.x; } - if y < (returnpos.y-mov)*ts.y { - y = (returnpos.y-mov)*ts.y; - } else if y > (returnpos.y+mov+1)*ts.y { - y = (returnpos.y+mov+1)*ts.y; + if y < (pos.y-mov)*ts.y { + y = (pos.y-mov)*ts.y; + } else if y > (pos.y+mov+1)*ts.y { + y = (pos.y+mov+1)*ts.y; } else { y += vspd*ts.y; }*/ @@ -128,10 +124,10 @@ function st_movingdraw() { for (j=-mov; j<=mov; j++) { if abs(i)+abs(j) <= mov { draw_rectangle( - (returnpos.x+i)*ts.x, - (returnpos.y+j)*ts.y, - (returnpos.x+i+1)*ts.x, - (returnpos.y+j+1)*ts.y, false + (pos.x+i)*ts.x, + (pos.y+j)*ts.y, + (pos.x+i+1)*ts.x, + (pos.y+j+1)*ts.y, false ); } } diff --git a/eastern flames/scripts/stat/stat.gml b/eastern flames/scripts/stat/stat.gml index 1e4f630..6d8cb8a 100644 --- a/eastern flames/scripts/stat/stat.gml +++ b/eastern flames/scripts/stat/stat.gml @@ -40,20 +40,10 @@ function divide(val1, val2) { function modulo(val1, val2) { return val1 % val2; } -function set(val1, val2) { - return val2; -} -function andop(val1, val2) { - return val1 & val2; -} -function orop(val1, val2) { - return val1 | val2; -} nu stat("hp", "health", "vitality"); nu stat("str", "strength", "physical power"); nu stat("def", "defense", "physical defense"); nu stat("spd", "speed", "avoid and follow-up"); nu stat("hit", "hit rate", "chance to hit"); -nu stat("mov", "movement", "distance travelable"); -nu stat("rng", "range", "distance attackable"); \ No newline at end of file +nu stat("mov", "movement", "distance travelable"); \ No newline at end of file diff --git a/eastern flames/scripts/tiledata/tiledata.gml b/eastern flames/scripts/tiledata/tiledata.gml index c128afd..a0cc322 100644 --- a/eastern flames/scripts/tiledata/tiledata.gml +++ b/eastern flames/scripts/tiledata/tiledata.gml @@ -1,21 +1,20 @@ -var forest123456 = function() {return new tiledata(u, u, [c_lime], [new statmod(st.def, 5, add)])} -var block1234567 = function() {return new tiledata(false, u, [c_black])} -global.map = c_mapgen([ -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), block1234567()], -[block1234567(), block1234567(), block1234567(), forest123456(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), new tiledata(), new tiledata(), new tiledata(), block1234567()], -[block1234567(), block1234567(), block1234567(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -[block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), forest123456(), new tiledata(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], -]); //i simply dont care +global.map = [ +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(u, u, [c_lime], [new statmod(st.def, 5, add)]), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +[new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()], +]; //i simply dont care function c_informtiles() { for (i=0; i",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f2d26103-4ee1-49c5-b182-7f7aa4fc3d79","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"fcfd88f7-4dda-4029-9ade-613bbf86fbda","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 26, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",}, - "resourceVersion": "1.3", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"41ae40ee-057b-472b-8e54-931d7024c3e1","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_bunnydown/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png b/eastern flames/sprites/s_bunnydown/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png deleted file mode 100644 index b37241a..0000000 Binary files a/eastern flames/sprites/s_bunnydown/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/2fc72996-411a-4de8-a6e8-572f6a23a542.png b/eastern flames/sprites/s_bunnydown/2fc72996-411a-4de8-a6e8-572f6a23a542.png deleted file mode 100644 index 83e1522..0000000 Binary files a/eastern flames/sprites/s_bunnydown/2fc72996-411a-4de8-a6e8-572f6a23a542.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/49f9c411-29fc-4fe2-bf12-b4b25b738deb.png b/eastern flames/sprites/s_bunnydown/49f9c411-29fc-4fe2-bf12-b4b25b738deb.png deleted file mode 100644 index 37ecfd4..0000000 Binary files a/eastern flames/sprites/s_bunnydown/49f9c411-29fc-4fe2-bf12-b4b25b738deb.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/4a81b7e0-ce3c-4fbe-91f3-81a338577488.png b/eastern flames/sprites/s_bunnydown/4a81b7e0-ce3c-4fbe-91f3-81a338577488.png deleted file mode 100644 index 3d7ba23..0000000 Binary files a/eastern flames/sprites/s_bunnydown/4a81b7e0-ce3c-4fbe-91f3-81a338577488.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png b/eastern flames/sprites/s_bunnydown/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png deleted file mode 100644 index 2c3ac1d..0000000 Binary files a/eastern flames/sprites/s_bunnydown/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce.png b/eastern flames/sprites/s_bunnydown/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce.png deleted file mode 100644 index 8d9ae5f..0000000 Binary files a/eastern flames/sprites/s_bunnydown/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/cd9229d8-8d46-4209-9f07-2216fa577e0a.png b/eastern flames/sprites/s_bunnydown/cd9229d8-8d46-4209-9f07-2216fa577e0a.png deleted file mode 100644 index a3682f1..0000000 Binary files a/eastern flames/sprites/s_bunnydown/cd9229d8-8d46-4209-9f07-2216fa577e0a.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/d644c81e-715e-4fbc-8144-b444664d1dc1.png b/eastern flames/sprites/s_bunnydown/d644c81e-715e-4fbc-8144-b444664d1dc1.png deleted file mode 100644 index f4a3ea5..0000000 Binary files a/eastern flames/sprites/s_bunnydown/d644c81e-715e-4fbc-8144-b444664d1dc1.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/efb539c4-bf62-47a5-adfe-258968605a7b.png b/eastern flames/sprites/s_bunnydown/efb539c4-bf62-47a5-adfe-258968605a7b.png deleted file mode 100644 index 9f59c41..0000000 Binary files a/eastern flames/sprites/s_bunnydown/efb539c4-bf62-47a5-adfe-258968605a7b.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/efd7f485-d2c2-4b41-b717-e010162b948e.png b/eastern flames/sprites/s_bunnydown/efd7f485-d2c2-4b41-b717-e010162b948e.png deleted file mode 100644 index 2149e51..0000000 Binary files a/eastern flames/sprites/s_bunnydown/efd7f485-d2c2-4b41-b717-e010162b948e.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnydown/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index b37241a..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png b/eastern flames/sprites/s_bunnydown/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png deleted file mode 100644 index 83e1522..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/49f9c411-29fc-4fe2-bf12-b4b25b738deb/f4e20572-94c5-4bf4-ab32-778812896a79.png b/eastern flames/sprites/s_bunnydown/layers/49f9c411-29fc-4fe2-bf12-b4b25b738deb/f4e20572-94c5-4bf4-ab32-778812896a79.png deleted file mode 100644 index 37ecfd4..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/49f9c411-29fc-4fe2-bf12-b4b25b738deb/f4e20572-94c5-4bf4-ab32-778812896a79.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/4a81b7e0-ce3c-4fbe-91f3-81a338577488/f4e20572-94c5-4bf4-ab32-778812896a79.png b/eastern flames/sprites/s_bunnydown/layers/4a81b7e0-ce3c-4fbe-91f3-81a338577488/f4e20572-94c5-4bf4-ab32-778812896a79.png deleted file mode 100644 index 3d7ba23..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/4a81b7e0-ce3c-4fbe-91f3-81a338577488/f4e20572-94c5-4bf4-ab32-778812896a79.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnydown/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index 2c3ac1d..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce/f4e20572-94c5-4bf4-ab32-778812896a79.png b/eastern flames/sprites/s_bunnydown/layers/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce/f4e20572-94c5-4bf4-ab32-778812896a79.png deleted file mode 100644 index 8d9ae5f..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce/f4e20572-94c5-4bf4-ab32-778812896a79.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnydown/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index f4a3ea5..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/efb539c4-bf62-47a5-adfe-258968605a7b/f4e20572-94c5-4bf4-ab32-778812896a79.png b/eastern flames/sprites/s_bunnydown/layers/efb539c4-bf62-47a5-adfe-258968605a7b/f4e20572-94c5-4bf4-ab32-778812896a79.png deleted file mode 100644 index 9f59c41..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/efb539c4-bf62-47a5-adfe-258968605a7b/f4e20572-94c5-4bf4-ab32-778812896a79.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnydown/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index 2149e51..0000000 Binary files a/eastern flames/sprites/s_bunnydown/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnydown/s_bunny.yy b/eastern flames/sprites/s_bunnydown/s_bunny.yy deleted file mode 100644 index 9a7242c..0000000 --- a/eastern flames/sprites/s_bunnydown/s_bunny.yy +++ /dev/null @@ -1,83 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 9, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 23, - "bbox_top": 4, - "bbox_bottom": 25, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":{"name":"41ae40ee-057b-472b-8e54-931d7024c3e1","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"3dd62a23-5717-4dea-8293-e040e3692654","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":{"name":"41ae40ee-057b-472b-8e54-931d7024c3e1","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"624f27ee-735c-42f2-8125-1d87c2a672fd","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f2d26103-4ee1-49c5-b182-7f7aa4fc3d79","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"fcfd88f7-4dda-4029-9ade-613bbf86fbda","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 26, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",}, - "resourceVersion": "1.3", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"41ae40ee-057b-472b-8e54-931d7024c3e1","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_bunnydown/s_bunnydown.yy b/eastern flames/sprites/s_bunnydown/s_bunnydown.yy deleted file mode 100644 index b07666a..0000000 --- a/eastern flames/sprites/s_bunnydown/s_bunnydown.yy +++ /dev/null @@ -1,91 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 9, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 23, - "bbox_top": 5, - "bbox_bottom": 27, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"49f9c411-29fc-4fe2-bf12-b4b25b738deb","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"49f9c411-29fc-4fe2-bf12-b4b25b738deb","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":{"name":"f4e20572-94c5-4bf4-ab32-778812896a79","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"49f9c411-29fc-4fe2-bf12-b4b25b738deb","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":{"name":"f4e20572-94c5-4bf4-ab32-778812896a79","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"efb539c4-bf62-47a5-adfe-258968605a7b","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"efb539c4-bf62-47a5-adfe-258968605a7b","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":{"name":"f4e20572-94c5-4bf4-ab32-778812896a79","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"efb539c4-bf62-47a5-adfe-258968605a7b","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"4a81b7e0-ce3c-4fbe-91f3-81a338577488","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"4a81b7e0-ce3c-4fbe-91f3-81a338577488","path":"sprites/s_bunnydown/s_bunnydown.yy",},"LayerId":{"name":"f4e20572-94c5-4bf4-ab32-778812896a79","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","name":"4a81b7e0-ce3c-4fbe-91f3-81a338577488","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 4.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"192f9dd3-d859-4694-bad6-40d6744f4c32","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"49f9c411-29fc-4fe2-bf12-b4b25b738deb","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"febcd1b3-f346-417f-82ff-c2a263537217","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c4cbc6b9-6abb-4a29-9da5-17002dc6d1ce","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"70c341e1-de19-43a7-ba70-84dd8a73bad2","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"efb539c4-bf62-47a5-adfe-258968605a7b","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"e04298f2-0cc8-4cc3-965c-2aa2327810b3","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4a81b7e0-ce3c-4fbe-91f3-81a338577488","path":"sprites/s_bunnydown/s_bunnydown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 27, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunnydown","path":"sprites/s_bunnydown/s_bunnydown.yy",}, - "resourceVersion": "1.3", - "name": "s_bunnydown", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f4e20572-94c5-4bf4-ab32-778812896a79","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunnydown", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_bunnydown/s_bunnyup.yy b/eastern flames/sprites/s_bunnydown/s_bunnyup.yy deleted file mode 100644 index cb039bb..0000000 --- a/eastern flames/sprites/s_bunnydown/s_bunnyup.yy +++ /dev/null @@ -1,91 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 9, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 20, - "bbox_top": 6, - "bbox_bottom": 27, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"d644c81e-715e-4fbc-8144-b444664d1dc1","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"efd7f485-d2c2-4b41-b717-e010162b948e","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 4.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a393c028-e51a-4a74-94e8-9584d41155a4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"d4c0dcd3-b56e-4229-94ec-eb6f92877d30","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"afa37cc5-8496-4f5f-8001-3821a967a75a","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"7f9a8eaa-01bb-4a44-b367-bd58f5add23e","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 26, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",}, - "resourceVersion": "1.3", - "name": "s_bunnyup", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunnyup", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_bunnyup/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png b/eastern flames/sprites/s_bunnyup/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png deleted file mode 100644 index b37241a..0000000 Binary files a/eastern flames/sprites/s_bunnyup/0f2bb038-aea4-44d9-bf96-5f80e62e7b50.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/2fc72996-411a-4de8-a6e8-572f6a23a542.png b/eastern flames/sprites/s_bunnyup/2fc72996-411a-4de8-a6e8-572f6a23a542.png deleted file mode 100644 index 83e1522..0000000 Binary files a/eastern flames/sprites/s_bunnyup/2fc72996-411a-4de8-a6e8-572f6a23a542.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png b/eastern flames/sprites/s_bunnyup/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png deleted file mode 100644 index 2c3ac1d..0000000 Binary files a/eastern flames/sprites/s_bunnyup/aa81cdfa-4408-470d-8092-8c5caccfc5c1.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/cd9229d8-8d46-4209-9f07-2216fa577e0a.png b/eastern flames/sprites/s_bunnyup/cd9229d8-8d46-4209-9f07-2216fa577e0a.png deleted file mode 100644 index a3682f1..0000000 Binary files a/eastern flames/sprites/s_bunnyup/cd9229d8-8d46-4209-9f07-2216fa577e0a.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/d644c81e-715e-4fbc-8144-b444664d1dc1.png b/eastern flames/sprites/s_bunnyup/d644c81e-715e-4fbc-8144-b444664d1dc1.png deleted file mode 100644 index f4a3ea5..0000000 Binary files a/eastern flames/sprites/s_bunnyup/d644c81e-715e-4fbc-8144-b444664d1dc1.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/efd7f485-d2c2-4b41-b717-e010162b948e.png b/eastern flames/sprites/s_bunnyup/efd7f485-d2c2-4b41-b717-e010162b948e.png deleted file mode 100644 index 2149e51..0000000 Binary files a/eastern flames/sprites/s_bunnyup/efd7f485-d2c2-4b41-b717-e010162b948e.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnyup/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index b37241a..0000000 Binary files a/eastern flames/sprites/s_bunnyup/layers/0f2bb038-aea4-44d9-bf96-5f80e62e7b50/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png b/eastern flames/sprites/s_bunnyup/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png deleted file mode 100644 index 83e1522..0000000 Binary files a/eastern flames/sprites/s_bunnyup/layers/2fc72996-411a-4de8-a6e8-572f6a23a542/28dafbbf-fc59-4e3a-9ad7-9fb6cfa6ace9.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnyup/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index 2c3ac1d..0000000 Binary files a/eastern flames/sprites/s_bunnyup/layers/aa81cdfa-4408-470d-8092-8c5caccfc5c1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnyup/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index f4a3ea5..0000000 Binary files a/eastern flames/sprites/s_bunnyup/layers/d644c81e-715e-4fbc-8144-b444664d1dc1/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png b/eastern flames/sprites/s_bunnyup/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png deleted file mode 100644 index 2149e51..0000000 Binary files a/eastern flames/sprites/s_bunnyup/layers/efd7f485-d2c2-4b41-b717-e010162b948e/50a5fcba-68cf-4109-bbc6-7251f9345fe4.png and /dev/null differ diff --git a/eastern flames/sprites/s_bunnyup/s_bunny.yy b/eastern flames/sprites/s_bunnyup/s_bunny.yy deleted file mode 100644 index 9a7242c..0000000 --- a/eastern flames/sprites/s_bunnyup/s_bunny.yy +++ /dev/null @@ -1,83 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 9, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 6, - "bbox_right": 23, - "bbox_top": 4, - "bbox_bottom": 25, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":{"name":"41ae40ee-057b-472b-8e54-931d7024c3e1","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"3dd62a23-5717-4dea-8293-e040e3692654","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"LayerId":{"name":"41ae40ee-057b-472b-8e54-931d7024c3e1","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","name":"624f27ee-735c-42f2-8125-1d87c2a672fd","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 2.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"f2d26103-4ee1-49c5-b182-7f7aa4fc3d79","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3dd62a23-5717-4dea-8293-e040e3692654","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"fcfd88f7-4dda-4029-9ade-613bbf86fbda","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"624f27ee-735c-42f2-8125-1d87c2a672fd","path":"sprites/s_bunny/s_bunny.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 26, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunny","path":"sprites/s_bunny/s_bunny.yy",}, - "resourceVersion": "1.3", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"41ae40ee-057b-472b-8e54-931d7024c3e1","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunny", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_bunnyup/s_bunnyup.yy b/eastern flames/sprites/s_bunnyup/s_bunnyup.yy deleted file mode 100644 index 5c48ca4..0000000 --- a/eastern flames/sprites/s_bunnyup/s_bunnyup.yy +++ /dev/null @@ -1,91 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 9, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 7, - "bbox_right": 20, - "bbox_top": 6, - "bbox_bottom": 27, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"d644c81e-715e-4fbc-8144-b444664d1dc1","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"efd7f485-d2c2-4b41-b717-e010162b948e","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"LayerId":{"name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 4.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"a393c028-e51a-4a74-94e8-9584d41155a4","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d644c81e-715e-4fbc-8144-b444664d1dc1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"d4c0dcd3-b56e-4229-94ec-eb6f92877d30","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"efd7f485-d2c2-4b41-b717-e010162b948e","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"afa37cc5-8496-4f5f-8001-3821a967a75a","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"aa81cdfa-4408-470d-8092-8c5caccfc5c1","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"7f9a8eaa-01bb-4a44-b367-bd58f5add23e","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0f2bb038-aea4-44d9-bf96-5f80e62e7b50","path":"sprites/s_bunnyup/s_bunnyup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 27, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_bunnyup","path":"sprites/s_bunnyup/s_bunnyup.yy",}, - "resourceVersion": "1.3", - "name": "s_bunnyup", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"50a5fcba-68cf-4109-bbc6-7251f9345fe4","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "wabbit", - "path": "folders/Sprites/wabbit.yy", - }, - "resourceVersion": "1.0", - "name": "s_bunnyup", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file diff --git a/eastern flames/sprites/s_null/61c007f0-e08f-41d8-92d6-f285d96bdaa1.png b/eastern flames/sprites/s_null/61c007f0-e08f-41d8-92d6-f285d96bdaa1.png deleted file mode 100644 index a3682f1..0000000 Binary files a/eastern flames/sprites/s_null/61c007f0-e08f-41d8-92d6-f285d96bdaa1.png and /dev/null differ diff --git a/eastern flames/sprites/s_null/layers/61c007f0-e08f-41d8-92d6-f285d96bdaa1/930721df-2e54-47c8-b579-0673b0744eb6.png b/eastern flames/sprites/s_null/layers/61c007f0-e08f-41d8-92d6-f285d96bdaa1/930721df-2e54-47c8-b579-0673b0744eb6.png deleted file mode 100644 index a3682f1..0000000 Binary files a/eastern flames/sprites/s_null/layers/61c007f0-e08f-41d8-92d6-f285d96bdaa1/930721df-2e54-47c8-b579-0673b0744eb6.png and /dev/null differ diff --git a/eastern flames/sprites/s_null/s_null.yy b/eastern flames/sprites/s_null/s_null.yy deleted file mode 100644 index a007c54..0000000 --- a/eastern flames/sprites/s_null/s_null.yy +++ /dev/null @@ -1,79 +0,0 @@ -{ - "bboxMode": 0, - "collisionKind": 0, - "type": 0, - "origin": 4, - "preMultiplyAlpha": false, - "edgeFiltering": false, - "collisionTolerance": 0, - "swfPrecision": 2.525, - "bbox_left": 0, - "bbox_right": 0, - "bbox_top": 0, - "bbox_bottom": 0, - "HTile": false, - "VTile": false, - "For3D": false, - "width": 32, - "height": 32, - "textureGroupId": { - "name": "Default", - "path": "texturegroups/Default", - }, - "swatchColours": null, - "gridX": 0, - "gridY": 0, - "frames": [ - {"compositeImage":{"FrameId":{"name":"61c007f0-e08f-41d8-92d6-f285d96bdaa1","path":"sprites/s_null/s_null.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"61c007f0-e08f-41d8-92d6-f285d96bdaa1","path":"sprites/s_null/s_null.yy",},"LayerId":{"name":"930721df-2e54-47c8-b579-0673b0744eb6","path":"sprites/s_null/s_null.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"s_null","path":"sprites/s_null/s_null.yy",},"resourceVersion":"1.0","name":"61c007f0-e08f-41d8-92d6-f285d96bdaa1","tags":[],"resourceType":"GMSpriteFrame",}, - ], - "sequence": { - "spriteId": {"name":"s_null","path":"sprites/s_null/s_null.yy",}, - "timeUnits": 1, - "playback": 1, - "playbackSpeed": 30.0, - "playbackSpeedType": 0, - "autoRecord": true, - "volume": 1.0, - "length": 1.0, - "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"38585925-4278-4e9d-9c0d-e5df9b72d7ec","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"61c007f0-e08f-41d8-92d6-f285d96bdaa1","path":"sprites/s_null/s_null.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, - ], - "visibleRange": null, - "lockOrigin": false, - "showBackdrop": true, - "showBackdropImage": false, - "backdropImagePath": "", - "backdropImageOpacity": 0.5, - "backdropWidth": 1366, - "backdropHeight": 768, - "backdropXOffset": 0.0, - "backdropYOffset": 0.0, - "xorigin": 16, - "yorigin": 16, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_null","path":"sprites/s_null/s_null.yy",}, - "resourceVersion": "1.3", - "name": "s_null", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"930721df-2e54-47c8-b579-0673b0744eb6","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", - }, - "resourceVersion": "1.0", - "name": "s_null", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file