diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index 66c4506a26..4c83703352 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -1409,9 +1409,11 @@ {"id":{"name":"spr_pauldron_spikes_left","path":"sprites/spr_pauldron_spikes_left/spr_pauldron_spikes_left.yy",},}, {"id":{"name":"spr_pauldron_spikes_right","path":"sprites/spr_pauldron_spikes_right/spr_pauldron_spikes_right.yy",},}, {"id":{"name":"spr_penitent_ui","path":"sprites/spr_penitent_ui/spr_penitent_ui.yy",},}, + {"id":{"name":"spr_pixel_book_page_highlight","path":"sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy",},}, {"id":{"name":"spr_pixel_button_left","path":"sprites/spr_pixel_button_left/spr_pixel_button_left.yy",},}, {"id":{"name":"spr_pixel_button_middle","path":"sprites/spr_pixel_button_middle/spr_pixel_button_middle.yy",},}, {"id":{"name":"spr_pixel_button_right","path":"sprites/spr_pixel_button_right/spr_pixel_button_right.yy",},}, + {"id":{"name":"spr_pixel_servo_book","path":"sprites/spr_pixel_servo_book/spr_pixel_servo_book.yy",},}, {"id":{"name":"spr_planet_screen","path":"sprites/spr_planet_screen/spr_planet_screen.yy",},}, {"id":{"name":"spr_planet_splash","path":"sprites/spr_planet_splash/spr_planet_splash.yy",},}, {"id":{"name":"spr_planets","path":"sprites/spr_planets/spr_planets.yy",},}, diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index 15011e9b8b..a3d6d55c50 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1619,16 +1619,16 @@ for(var company=0; company<10; company++){ } } -temp[59] = $"CLASSIFICATION: SECTOR LOGISTICAE#++++++++++DATE: {temp[30]}#++++++++AUTHOR: MASTER ADEPT {temp[31]}#++++++++++++RE: INTRODUCTORY MISSIVE#+++++RECIPIENT: CHAPTER MASTER {temp[32]}##++THOUGHT: {temp[33]}++##I see you have made it unscathed, your grace. Death comes with you as it should! The enemy is on the horizon. Thy chapter is mighty and only waits for your word to wreak havoc upon our enemies.##Your chapter contains-"; +temp[59] = $"CLASSIFICATION: SECTOR LOGISTICAE\n++++++++++DATE: {temp[30]}\n++++++++AUTHOR: MASTER ADEPT {temp[31]}\n++++++++++++RE: INTRODUCTORY MISSIVE\n+++++RECIPIENT: CHAPTER MASTER {temp[32]}\n\n++THOUGHT: {temp[33]}++\n\nI see you have made it unscathed, your grace. Death comes with you as it should! The enemy is on the horizon. Thy chapter is mighty and only waits for your word to wreak havoc upon our enemies.\n\nYour chapter contains-"; -temp[60] = $"{temp[59]}\n\n{temp[34]}\n\n{temp[35]}##{temp[36]}##{temp[37]}##{temp[38]}##{temp[39]}##{temp[40]}##{temp[41]}##{temp[42]}##{temp[43]}##{temp[44]}##{temp[45]}"; +temp[60] = $"{temp[59]}\n\n{temp[34]}\n\n{temp[35]}\n\n{temp[36]}\n\n{temp[37]}\n\n{temp[38]}\n\n{temp[39]}\n\n{temp[40]}\n\n{temp[41]}\n\n{temp[42]}\n\n{temp[43]}\n\n{temp[44]}\n\n{temp[45]}"; -temp[61]="\n\nYour armamentarium contains some spare equipment- \n"; +temp[61]=$"\n\nYour armamentarium contains some spare equipment- \n"; temp[61] += equipment_struct_to_string(obj_ini.equipment, true, true); -temp[62]="##Your fleet contains "; +temp[62]=$"\n\nYour fleet contains "; var bb=0,sk=0,glad=0,hunt=0,ships=0,bb_names=[],sk_names=[],glad_names=[],hunt_names=[]; @@ -1682,87 +1682,225 @@ if (hunt > 0) { } + +servo_data_book = { + sprite : spr_pixel_servo_book, + x : -500, + y : 500, + scale : 0.1, + pages : [], + animate_commands : [ + { + x_end : 310, + y_end : 500, + end_scale : 0.1, + move_time : 2, + }, + { + x_end : 310, + y_end : 30, + end_scale : 0.25, + move_time : 2, + } + ] +} // show_message(temp[61]); // show_message(temp[62]); // 61 : equipment // 62 : ships -var lol=240; +var lol=200; draw_set_font(fnt_small); -welcome_pages=string_height(string_hash_to_newline(string(temp[60])+string(temp[61])+string(temp[62]))); -welcome_pages-=260; -welcome_pages=(welcome_pages/lol)+1; -if (floor(welcome_pages)=1){ - for(var i=0; i<4000; i++){ - if (string_height(string_hash_to_newline(temp[65]))>260){ - lig=string_length(temp[65]); - temp[65]=string_delete(temp[65],lig,1); + _tally += _splits[i]+"\n"; + if (i == array_length(_splits)-1){ + array_push(servo_data_book.pages, _tally); + } } + } else { + array_push(servo_data_book.pages, _string); } } -remov=string_length(string(temp[65]))+1; - -if (welcome_pages>=2){ - temp[66]=string_delete(temp[66],1,remov); - for(var i=0; i<4000; i++){ - if (string_height(string_hash_to_newline(temp[66]))>lol){ - lig=string_length(temp[66]); - temp[66]=string_delete(temp[66],lig,1); - } + +for (var i=60;i<70;i++){ + if (temp[i] == ""){ + continue; } + new_servo_pages(temp[i]); } -remov=string_length(string(temp[65])+string(temp[66]))+1; -// show_message(remov); - -if (welcome_pages>=3){ - temp[67]=string_delete(temp[67],1,remov); - for(var i=0; i<4000; i++){ - if (string_height(string_hash_to_newline(temp[67]))>lol){ - lig=string_length(temp[67]); - temp[67]=string_delete(temp[67],lig,1); - } + + +with (servo_data_book){ + + animate_out = function(){ + animate_commands = [ + { + x_end : 310, + y_end : 500, + end_scale : 0.1, + move_time : 2, + }, + { + x_end : -500, + y_end : 500, + end_scale : 0.1, + move_time : 2, + }, + ]; + global.ui_click_lock = false; + obj_controller.menu = 0; } -} -remov=string_length(string(temp[65])+string(temp[66])+string(temp[67]))+1; - -if (welcome_pages<4) then temp[68]=""; -if (welcome_pages>=4){ - temp[68]=string_delete(temp[68],1,remov); - for(var i=0; i<4000; i++){ - if (string_height(string_hash_to_newline(temp[68]))>lol){ - lig=string_length(temp[68]); - temp[68]=string_delete(temp[68],lig,1); - } + + for (i=0;i=5){ - temp[69]=string_delete(temp[69],1,remov); - for(var i=0; i<4000; i++){ - if (string_height(string_hash_to_newline(temp[69]))>lol){ - lig=string_length(temp[69]); - temp[69]=string_delete(temp[69],lig,1); + command_count = 0; + current_command = false; + move_time = 0; + draw = function(){ + if (move_time = 0 && array_length(animate_commands) > 0){ + current_command = animate_commands[0]; + array_delete(animate_commands, 0, 1); + move_time = current_command.move_time*room_speed; + x_turn_move = (current_command.x_end - x)/move_time; + y_turn_move = (current_command.y_end - y)/move_time; + scale_change = (current_command.end_scale - scale)/move_time; + command_count++; + } else if (array_length(animate_commands) == 0 && move_time = 0){ + x_turn_move = 0; + y_turn_move = 0; + scale_change = 0; + } + draw_sprite_ext(spr_pixel_servo_book, 0, x, y, scale, scale, 0, c_white, 1); + + bookleft_page_loc = [(1000 * scale),1100*scale, 2000*scale, 2400*scale]; + bookright_page_loc = [(2000 * scale),1100*scale, 3000*scale, 2400*scale]; + + var rel_locations = [coord_relevative_positions(bookleft_page_loc,x,y), coord_relevative_positions(bookright_page_loc,x,y)]; + var _l_loc = rel_locations[0]; + var _r_loc = rel_locations[1]; + + if (obj_controller.menu == 500){ + + if (scr_hit(_l_loc)){ + draw_sprite_ext(spr_pixel_book_page_highlight, 0, x, y, scale, scale, 0, c_white, 1); + + } else if (scr_hit(_r_loc)){ + draw_sprite_ext(spr_pixel_book_page_highlight, 1, x, y, scale, scale, 0, c_white, 1); + } + draw_set_halign(fa_left); + draw_set_color(c_white); + draw_set_font(fnt_40k_14b); + draw_text_ext_transformed(_l_loc[0]+(280*scale), _l_loc[1] + (400*scale), "Read Chapter Breakdown",-1,680*scale, scale*4,scale*4,0); + draw_text_ext_transformed(_r_loc[0]+(280*scale), _r_loc[1] + (400*scale), "Start Commanding Chapter",-1, 680*scale, scale*4,scale*4,0); + if (point_and_click(_r_loc, , true)){ + animate_out(); + + } else if (point_and_click(_l_loc, , true)){ + show_debug_message("click l") + animate_commands = [ + { + x_end : -800*0.6, + y_end : -900*0.6, + end_scale : 0.6, + move_time : 2, + }, + ] + obj_controller.menu++; + } + + + } else if (obj_controller.menu > 500 && !array_length(animate_commands) && move_time == 0){ + var left_page = pages[0]; + var _double = (array_length(pages) >1); + if (_double){ + var right_page = pages[1]; + } + var draw_coords = [_l_loc[0]+(260*scale), _l_loc[1] + (150*scale)]; + var draw_coords_r = [_r_loc[0]+(150*scale), _r_loc[1] + (150*scale)]; + + var _final_y = 0; + var _final_i = 0; + var _final_y2 = 0; + var _final_i2 = 0; + for (var i=0;i<680*scale;i++){ + if (i<(680*scale)){ + if ((i*scale)<(scale*260)){ + var y_change = (power(i*0.0295, 2))*0.6; + _final_y = y_change; + _final_i = i; + } else { + var y_change = ((-(power((i-_final_i)*0.045, 2)))*0.5)+_final_y; + } + draw_sprite_part(left_page, 0, i, 0, 1, 1000, draw_coords[0]+i, draw_coords[1]-y_change); + if (_double){ + if ((i*scale)<(scale*170)){ + var y_change = (power(i*0.045, 2)*-0.6); + _final_y2 = y_change; + _final_i2 = i; + } else { + var y_change = (-(power((i-_final_i2)*0.0295, 2))*-0.6)+_final_y2; + } + draw_sprite_part(right_page, 0, i, 0, 1, 1000, draw_coords_r[0]+i, draw_coords_r[1]-y_change); + } + } + //draw_sprite_part(left_page, subimg, left, top, width, height, x, y)() + } + /*if (obj_controller.menu = 501){ + draw_text_ext(_l_loc[0]+(250*scale), _l_loc[1] + (150*scale), string_hash_to_newline(pages[0]), -1, 680*scale); + draw_text_ext(_r_loc[0]+(250*scale), _l_loc[1] + (150*scale), string_hash_to_newline(pages[1]), -1, 680*scale); + } else if (obj_controller.menu == 502){ + draw_text_ext(_l_loc[0]+(250*scale), _l_loc[1] + (150*scale), string_hash_to_newline(pages[2]), -1, 680*scale); + draw_text_ext(_r_loc[0]+(250*scale), _l_loc[1] + (150*scale), string_hash_to_newline(pages[3]), -1, 680*scale); + }*/ + if (scr_click_left(60, true)){ + obj_controller.menu++; + sprite_delete(left_page); + + if (_double){ + sprite_delete(right_page); + } + array_delete(pages,0,_double?2:1); + + if (!array_length(pages)){ + animate_out(); + } + } + } + x+=x_turn_move; + y+=y_turn_move; + scale+=scale_change; + if (move_time>0){ + move_time--; } } } -remov=string_length(string(temp[65])+string(temp[66])+string(temp[67])+string(temp[68])+string(temp[69]))+1; instance_create(0,0,obj_tooltip ); diff --git a/objects/obj_controller/Draw_64.gml b/objects/obj_controller/Draw_64.gml index 2fab4dfa21..968125d626 100644 --- a/objects/obj_controller/Draw_64.gml +++ b/objects/obj_controller/Draw_64.gml @@ -20,6 +20,24 @@ if (is_test_map==true){ var xx = 0; var yy = 0; +// ** Welcome menu ** +if (menu >= 500 && menu <= 510) { + //draw_sprite(spr_welcome_bg, 0, 0, 0); + // draw_sprite(spr_advisors,0,xx+16,yy+16); + scr_image("advisor/splash", 1, 16, 16, 310, 828); + + draw_set_halign(fa_left); + draw_set_color(0); + draw_set_font(fnt_40k_14); + draw_set_halign(fa_center); + draw_text(702, 695, $"{menu - 499} (Press Any Key)"); + draw_set_halign(fa_left); + +} +servo_data_book.draw(); + + + // Main UI if (!zoomed && !zui){ draw_sprite(spr_new_ui,menu==0,0,0); @@ -159,6 +177,14 @@ if (global.cheat_debug == true){ draw_text(1124, 7, string_hash_to_newline("DEBUG MODE")); } +if (menu == 20){ + if (trading==true){ + if ((diplomacy>1) && is_struct(trade_attempt)){ + trade_attempt.draw_trade_screen(); + } + } +} + function draw_line(x1, y1, y_slide, variable) { l_hei = 37; diff --git a/objects/obj_garbage_collector/Step_0.gml b/objects/obj_garbage_collector/Step_0.gml index 88117f46f7..973cb5e1fc 100644 --- a/objects/obj_garbage_collector/Step_0.gml +++ b/objects/obj_garbage_collector/Step_0.gml @@ -4,7 +4,7 @@ if (gc_timer > 0) { } else { - gc_timer = 50; // Default is every frame, so de-facto 1; + gc_timer = 50000; // Default is every frame, so de-facto 1; gc_collect(); wait_and_execute(0, function(){ diff --git a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml index 7cc3a51022..a4d3a6765d 100644 --- a/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml +++ b/scripts/scr_complex_colour_kit/scr_complex_colour_kit.gml @@ -1,6 +1,3 @@ -function coord_relevative_positions(coords, xx, yy){ - return [coords[0]+xx, coords[1]+yy,coords[2]+xx, coords[3]+yy]; -} enum eMarkings { RIGHTPAD, diff --git a/scripts/scr_controller_helpers/scr_controller_helpers.gml b/scripts/scr_controller_helpers/scr_controller_helpers.gml index 00c964a129..e8851e0291 100644 --- a/scripts/scr_controller_helpers/scr_controller_helpers.gml +++ b/scripts/scr_controller_helpers/scr_controller_helpers.gml @@ -34,14 +34,7 @@ function scr_menu_clear_up(specific_area_function) { if ((zoomed == 0) && (cooldown <= 0) && (menu >= 500) && (menu <= 510)) { if (mouse_y >= __view_get(e__VW.YView, 0) + 27) { - cooldown = 8000; - if ((menu >= 500) && (temp[menu - 434] == "")) { - menu = 0; - exit; - } - if ((menu < 503) && (menu != 0)) { - menu += 1; - } + global.ui_click_lock = true; } } diff --git a/scripts/scr_hit/scr_hit.gml b/scripts/scr_hit/scr_hit.gml index 0e6210750d..0bdfb45a3a 100644 --- a/scripts/scr_hit/scr_hit.gml +++ b/scripts/scr_hit/scr_hit.gml @@ -12,11 +12,19 @@ function scr_hit(x1=0, y1=0, x2=0, y2=0) { } +function coord_relevative_positions(coords, xx, yy){ + return [coords[0]+xx, coords[1]+yy,coords[2]+xx, coords[3]+yy]; +} + function scr_hit_relative(x1, relative = [0,0]){ var mouse_consts = return_mouse_consts(); return point_in_rectangle(mouse_consts[0],mouse_consts[1],relative[0] + x1[0],relative[1] + x1[1],relative[0] + x1[2],relative[1] + x1[3]); } +function point_and_click_relative(x1,relative = [0,0] ,cooldown = 60, lock_bypass = false){ + return point_and_click([relative[0] + x1[0],relative[1] + x1[1],relative[0] + x1[2],relative[1] + x1[3]],cooldown,lock_bypass); +} + /// @function point_and_click /// @description Returns true if left mouse button was clicked on the desired rectangle area. /// @param {array} rect x1, y1, x2, y2 array. diff --git a/scripts/scr_planetary_feature/scr_planetary_feature.gml b/scripts/scr_planetary_feature/scr_planetary_feature.gml index 81046481ca..f6d4706c0c 100644 --- a/scripts/scr_planetary_feature/scr_planetary_feature.gml +++ b/scripts/scr_planetary_feature/scr_planetary_feature.gml @@ -128,7 +128,7 @@ function NewPlanetFeature(feature_type, other_data={}) constructor{ break; case P_features.Cave_Network: player_hidden = 1; - cave_depth =irandom(3);//allow_multiple levels of caves, option to go deeper + cave_depth = irandom(3);//allow_multiple levels of caves, option to go deeper planet_display = "Unexplored Cave Network"; break; case P_features.Sororitas_Cathedral: diff --git a/scripts/scr_ui_advisors/scr_ui_advisors.gml b/scripts/scr_ui_advisors/scr_ui_advisors.gml index a0db5e8918..5181e7fc15 100644 --- a/scripts/scr_ui_advisors/scr_ui_advisors.gml +++ b/scripts/scr_ui_advisors/scr_ui_advisors.gml @@ -670,24 +670,7 @@ function scr_ui_advisors() { draw_sprite(spr_arrow, 0, xx + 217, yy + 32); } - // ** Welcome menu ** - if (menu >= 500 && menu <= 510) { - draw_sprite(spr_welcome_bg, 0, xx, yy); - // draw_sprite(spr_advisors,0,xx+16,yy+16); - scr_image("advisor/splash", 1, xx + 16, yy + 16, 310, 828); - draw_set_halign(fa_left); - draw_set_color(0); - draw_set_font(fnt_40k_14); - if (menu = 500) then draw_text_ext(xx + 370, yy + 72, string_hash_to_newline(string(temp[65])), -1, 660); - if (menu = 501) then draw_text_ext(xx + 370, yy + 72, string_hash_to_newline(string(temp[66])), -1, 660); - if (menu = 502) then draw_text_ext(xx + 370, yy + 72, string_hash_to_newline(string(temp[67])), -1, 660); - if (menu = 503) then draw_text_ext(xx + 370, yy + 72, string_hash_to_newline(string(temp[68])), -1, 660); - draw_set_halign(fa_center); - draw_text(xx + 702, yy + 695, $"{menu - 499} (Press Any Key)"); - draw_set_halign(fa_left); - - } if (menu = 1) and(managing = 0) { draw_set_alpha(1); diff --git a/sprites/spr_checker_texture/spr_checker_texture.yy b/sprites/spr_checker_texture/spr_checker_texture.yy index e0d8251c4f..3cb1256c79 100644 --- a/sprites/spr_checker_texture/spr_checker_texture.yy +++ b/sprites/spr_checker_texture/spr_checker_texture.yy @@ -33,7 +33,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":0, @@ -76,12 +82,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":180.0, + "seqWidth":180.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"58ee1e71-509f-4b0e-ab39-17c8da2a0687","path":"sprites/spr_checker_texture/spr_checker_texture.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"1e6e1650-2926-4786-b31b-bbc04b9c7746","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy index faa14d664a..7927be7296 100644 --- a/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy +++ b/sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy @@ -34,7 +34,13 @@ "resourceType":"GMNineSliceData", "resourceVersion":"2.0", "right":0, - "tileMode":[0,0,0,0,0,], + "tileMode":[ + 0, + 0, + 0, + 0, + 0, + ], "top":0, }, "origin":9, @@ -77,12 +83,16 @@ "playbackSpeedType":0, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":232.0, + "seqWidth":164.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b6ba8600-fb6b-4fa9-abc7-bdc2311eb79e","path":"sprites/spr_mk7_complex_knees/spr_mk7_complex_knees.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"7ea69ecd-f81f-42b8-ac71-b6987343efcb","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_pixel_book_page_highlight/b2fa8fe8-d578-4536-9b73-d27307ff7ee1.png b/sprites/spr_pixel_book_page_highlight/b2fa8fe8-d578-4536-9b73-d27307ff7ee1.png new file mode 100644 index 0000000000..0c03141435 Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/b2fa8fe8-d578-4536-9b73-d27307ff7ee1.png differ diff --git a/sprites/spr_pixel_book_page_highlight/ff33b9ca-cd77-419d-9726-8f86005a22e6.png b/sprites/spr_pixel_book_page_highlight/ff33b9ca-cd77-419d-9726-8f86005a22e6.png new file mode 100644 index 0000000000..b5e219f1b8 Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/ff33b9ca-cd77-419d-9726-8f86005a22e6.png differ diff --git a/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/35e396be-c8bb-46cc-9c62-2823941f9307.png b/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/35e396be-c8bb-46cc-9c62-2823941f9307.png new file mode 100644 index 0000000000..b42c5d0168 Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/35e396be-c8bb-46cc-9c62-2823941f9307.png differ diff --git a/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png b/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png new file mode 100644 index 0000000000..0c03141435 Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/layers/b2fa8fe8-d578-4536-9b73-d27307ff7ee1/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png differ diff --git a/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png b/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png new file mode 100644 index 0000000000..47f97eeb6a Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png differ diff --git a/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png b/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png new file mode 100644 index 0000000000..b5e219f1b8 Binary files /dev/null and b/sprites/spr_pixel_book_page_highlight/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/54d77c4a-f0ee-4053-b919-a71b0f425e0f.png differ diff --git a/sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy b/sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy new file mode 100644 index 0000000000..6c90738f1a --- /dev/null +++ b/sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy @@ -0,0 +1,97 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pixel_book_page_highlight", + "bboxMode":0, + "bbox_bottom":2181, + "bbox_left":1109, + "bbox_right":2951, + "bbox_top":1093, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"b2fa8fe8-d578-4536-9b73-d27307ff7ee1","name":"b2fa8fe8-d578-4536-9b73-d27307ff7ee1","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":3744, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"54d77c4a-f0ee-4053-b919-a71b0f425e0f","blendMode":0,"displayName":"Layer 1","isLocked":false,"name":"54d77c4a-f0ee-4053-b919-a71b0f425e0f","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + {"$GMImageLayer":"","%Name":"35e396be-c8bb-46cc-9c62-2823941f9307","blendMode":0,"displayName":"default","isLocked":false,"name":"35e396be-c8bb-46cc-9c62-2823941f9307","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":false,}, + ], + "name":"spr_pixel_book_page_highlight", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pixel_book_page_highlight", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":2.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_book_page_highlight", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":3744.0, + "seqWidth":4160.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"b2fa8fe8-d578-4536-9b73-d27307ff7ee1","path":"sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"b6535c79-132b-4fbf-b417-94e6ace7ade6","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","path":"sprites/spr_pixel_book_page_highlight/spr_pixel_book_page_highlight.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f4026023-d553-412a-8516-730bb41219bf","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":4160, +} \ No newline at end of file diff --git a/sprites/spr_pixel_servo_book/ff33b9ca-cd77-419d-9726-8f86005a22e6.png b/sprites/spr_pixel_servo_book/ff33b9ca-cd77-419d-9726-8f86005a22e6.png new file mode 100644 index 0000000000..91aeae9dcb Binary files /dev/null and b/sprites/spr_pixel_servo_book/ff33b9ca-cd77-419d-9726-8f86005a22e6.png differ diff --git a/sprites/spr_pixel_servo_book/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png b/sprites/spr_pixel_servo_book/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png new file mode 100644 index 0000000000..6d7a358e82 Binary files /dev/null and b/sprites/spr_pixel_servo_book/layers/ff33b9ca-cd77-419d-9726-8f86005a22e6/35e396be-c8bb-46cc-9c62-2823941f9307.png differ diff --git a/sprites/spr_pixel_servo_book/spr_pixel_servo_book.yy b/sprites/spr_pixel_servo_book/spr_pixel_servo_book.yy new file mode 100644 index 0000000000..eaea8af780 --- /dev/null +++ b/sprites/spr_pixel_servo_book/spr_pixel_servo_book.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_pixel_servo_book", + "bboxMode":0, + "bbox_bottom":3483, + "bbox_left":234, + "bbox_right":3925, + "bbox_top":234, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":3744, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"35e396be-c8bb-46cc-9c62-2823941f9307","blendMode":0,"displayName":"default","isLocked":false,"name":"35e396be-c8bb-46cc-9c62-2823941f9307","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_pixel_servo_book", + "nineSlice":null, + "origin":0, + "parent":{ + "name":"UI", + "path":"folders/Sprites/UI.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_pixel_servo_book", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_pixel_servo_book", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":3744.0, + "seqWidth":4160.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"ff33b9ca-cd77-419d-9726-8f86005a22e6","path":"sprites/spr_pixel_servo_book/spr_pixel_servo_book.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"f4026023-d553-412a-8516-730bb41219bf","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":0, + "yorigin":0, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":4160, +} \ No newline at end of file diff --git a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy index e4ced4a905..0bb769cfc1 100644 --- a/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy +++ b/sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_alpha", "bboxMode":0, "bbox_bottom":145, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"8d214563-cc0c-4310-a5c4-13f0a699a86f","path":"sprites/spr_psy_hood_alpha/spr_psy_hood_alpha.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"51ba9fd0-369a-4be7-b5c8-f8d75c8a38d9","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy index 7b04c905e4..adb3b5b37b 100644 --- a/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy +++ b/sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy @@ -1,5 +1,5 @@ { - "$GMSprite":"", + "$GMSprite":"v2", "%Name":"spr_psy_hood_alpha2", "bboxMode":0, "bbox_bottom":145, @@ -12,7 +12,7 @@ "edgeFiltering":false, "For3D":false, "frames":[ - {"$GMSpriteFrame":"","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + {"$GMSpriteFrame":"v1","%Name":"e8a1632c-8084-4d13-8d30-4732feda986c","name":"e8a1632c-8084-4d13-8d30-4732feda986c","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, ], "gridX":0, "gridY":0, @@ -70,9 +70,7 @@ "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"e8a1632c-8084-4d13-8d30-4732feda986c","path":"sprites/spr_psy_hood_alpha2/spr_psy_hood_alpha2.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"e9985ee2-2374-47e6-89f4-6a2b25a8ec5b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], "visibleRange":null, diff --git a/sprites/spr_ship_apoc/spr_ship_apoc.yy b/sprites/spr_ship_apoc/spr_ship_apoc.yy index 08ebbee5a5..d3f3356615 100644 --- a/sprites/spr_ship_apoc/spr_ship_apoc.yy +++ b/sprites/spr_ship_apoc/spr_ship_apoc.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"6dc6f331-41a9-44b7-a4c9-24ab7fe44bd0","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"0bee0e78-a619-4cda-9d54-12a929878829","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":80, "yorigin":45, diff --git a/sprites/spr_ship_nem/spr_ship_nem.yy b/sprites/spr_ship_nem/spr_ship_nem.yy index 4aee217c58..8e55215f6d 100644 --- a/sprites/spr_ship_nem/spr_ship_nem.yy +++ b/sprites/spr_ship_nem/spr_ship_nem.yy @@ -63,18 +63,19 @@ "playbackSpeedType":1, "resourceType":"GMSequence", "resourceVersion":"2.0", + "seqHeight":92.0, + "seqWidth":230.0, "showBackdrop":true, "showBackdropImage":false, "timeUnits":1, "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{"0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",},},"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"917f9e5a-3547-4828-b346-63dc57b3f0a1","path":"sprites/spr_ship_nem/spr_ship_nem.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"d9a533f1-3c83-49c3-9c5a-644d09d03580","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], - "visibleRange":{ - "x":0.0, - "y":0.0, - }, + "visibleRange":null, "volume":1.0, "xorigin":100, "yorigin":45,