diff --git a/Scribble.yyp b/Scribble.yyp index 5e5665268..172f1a97f 100644 --- a/Scribble.yyp +++ b/Scribble.yyp @@ -8,6 +8,7 @@ {"id":{"name":"obj_test_anim_wave","path":"objects/obj_test_anim_wave/obj_test_anim_wave.yy",},"order":1,}, {"id":{"name":"scribble_anim_rainbow","path":"scripts/scribble_anim_rainbow/scribble_anim_rainbow.yy",},"order":3,}, {"id":{"name":"obj_test_bezier_arabic","path":"objects/obj_test_bezier_arabic/obj_test_bezier_arabic.yy",},"order":3,}, + {"id":{"name":"obj_test_is_animated","path":"objects/obj_test_is_animated/obj_test_is_animated.yy",},"order":4,}, {"id":{"name":"obj_test_hebrew_hyphenated","path":"objects/obj_test_hebrew_hyphenated/obj_test_hebrew_hyphenated.yy",},"order":1,}, {"id":{"name":"obj_test_pages_with_typist","path":"objects/obj_test_pages_with_typist/obj_test_pages_with_typist.yy",},"order":2,}, {"id":{"name":"__scribble_class_element","path":"scripts/__scribble_class_element/__scribble_class_element.yy",},"order":1,}, @@ -44,6 +45,7 @@ {"id":{"name":"obj_test_combine_and_scale","path":"objects/obj_test_combine_and_scale/obj_test_combine_and_scale.yy",},"order":3,}, {"id":{"name":"example_dialogue_set_name","path":"scripts/example_dialogue_set_name/example_dialogue_set_name.yy",},"order":5,}, {"id":{"name":"obj_test_newline_left_trim","path":"objects/obj_test_newline_left_trim/obj_test_newline_left_trim.yy",},"order":9,}, + {"id":{"name":"spr_static_coin","path":"sprites/spr_static_coin/spr_static_coin.yy",},"order":7,}, {"id":{"name":"__scribble_gen_4_build_words","path":"scripts/__scribble_gen_4_build_words/__scribble_gen_4_build_words.yy",},"order":5,}, {"id":{"name":"spr_portrait","path":"sprites/spr_portrait/spr_portrait.yy",},"order":4,}, {"id":{"name":"obj_test_typewriter_delay_plus_sound_per_char","path":"objects/obj_test_typewriter_delay_plus_sound_per_char/obj_test_typewriter_delay_plus_sound_per_char.yy",},"order":12,}, diff --git a/objects/obj_test_is_animated/Draw_0.gml b/objects/obj_test_is_animated/Draw_0.gml new file mode 100644 index 000000000..fe6df0c77 --- /dev/null +++ b/objects/obj_test_is_animated/Draw_0.gml @@ -0,0 +1,29 @@ +var _x = 10; +var _y = 10; + +var _element = scribble("This is some static text that is not animated.", 0); +_element.draw(_x, _y); +draw_text(_x + _element.get_width() + 20, _y, ".is_animated() = " + string(_element.is_animated())); +_y += _element.get_height() + 10; + +var _element = scribble("This is some text with an animated in-line sprite [spr_coin]", 0); +_element.draw(_x, _y); +draw_text(_x + _element.get_width() + 20, _y, ".is_animated() = " + string(_element.is_animated())); +_y += _element.get_height() + 10; + +var _element = scribble("This is some text with two non-animated in-line sprite [spr_coin,0,0] [spr_static_coin]", 0); +_element.draw(_x, _y); +draw_text(_x + _element.get_width() + 20, _y, ".is_animated() = " + string(_element.is_animated())); +_y += _element.get_height() + 10; + +var _element = scribble("[rainbow]This is some rainbow text (which is an animation)", 0); +_element.draw(_x, _y); +draw_text(_x + _element.get_width() + 20, _y, ".is_animated() = " + string(_element.is_animated())); +_y += _element.get_height() + 10; + +var _element = scribble("[cycle, 200, 140, 190, 150]This is some colour-cycling text (which is an animation)", 0); +_element.draw(_x, _y); +draw_text(_x + _element.get_width() + 20, _y, ".is_animated() = " + string(_element.is_animated())); +_y += _element.get_height() + 10; + +scribble_anim_reset(); diff --git a/objects/obj_test_is_animated/obj_test_is_animated.yy b/objects/obj_test_is_animated/obj_test_is_animated.yy new file mode 100644 index 000000000..b2acc2542 --- /dev/null +++ b/objects/obj_test_is_animated/obj_test_is_animated.yy @@ -0,0 +1,33 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Getters", + "path": "folders/Test Cases/Getters.yy", + }, + "resourceVersion": "1.0", + "name": "obj_test_is_animated", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/rooms/rm_test/rm_test.yy b/rooms/rm_test/rm_test.yy index 95798e54a..10797e70f 100644 --- a/rooms/rm_test/rm_test.yy +++ b/rooms/rm_test/rm_test.yy @@ -14,7 +14,7 @@ ], "layers": [ {"instances":[ - {"properties":[],"isDnd":false,"objectId":{"name":"obj_test_draw_text_scribble","path":"objects/obj_test_draw_text_scribble/obj_test_draw_text_scribble.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_6D184FEF","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_test_is_animated","path":"objects/obj_test_is_animated/obj_test_is_animated.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":32.0,"y":32.0,"resourceVersion":"1.0","name":"inst_8B0962E","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Example","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4288702270,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -22,7 +22,7 @@ "creationCodeFile": "", "inheritCode": false, "instanceCreationOrder": [ - {"name":"inst_6D184FEF","path":"rooms/rm_test/rm_test.yy",}, + {"name":"inst_8B0962E","path":"rooms/rm_test/rm_test.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, diff --git a/sprites/spr_coin/spr_coin.yy b/sprites/spr_coin/spr_coin.yy index 72cfbbc20..a6cb968dd 100644 --- a/sprites/spr_coin/spr_coin.yy +++ b/sprites/spr_coin/spr_coin.yy @@ -72,7 +72,7 @@ "eventStubScript": null, "parent": {"name":"spr_coin","path":"sprites/spr_coin/spr_coin.yy",}, "resourceVersion": "1.4", - "name": "", + "name": "spr_coin", "tags": [], "resourceType": "GMSequence", }, diff --git a/sprites/spr_large_coin/spr_large_coin.yy b/sprites/spr_large_coin/spr_large_coin.yy index 7e802e960..3157a8612 100644 --- a/sprites/spr_large_coin/spr_large_coin.yy +++ b/sprites/spr_large_coin/spr_large_coin.yy @@ -50,10 +50,10 @@ "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"8d0321ee-4303-4b64-9177-f4ffd46e47cf","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4e4d7e94-b090-4fe1-9ddc-2e9b8d5f14ae","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"75616b5e-8b2b-478f-a7ff-d1991969a1dc","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4e4d7e94-b090-4fe1-9ddc-2e9b8d5f14ae","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"2dbfa111-638a-4920-a845-0892c8aad258","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"58545a18-7ff2-4e1f-b49f-ea6a18fa5cfa","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"9ae87b4f-b859-4e1b-9810-8fab5ec43974","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"62793700-91fa-44c1-a8ef-54ef48353efd","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - {"id":"99703bf3-7cd2-44da-932a-79b1418f7f43","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dd4a9069-8704-44e0-96e7-673d3402403e","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"97aef61e-cf81-47f3-a435-e192a4ec9f01","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"62793700-91fa-44c1-a8ef-54ef48353efd","path":"sprites/spr_large_coin/spr_large_coin.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"2b597f2a-61e1-41db-8e64-a7656b701899","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dd4a9069-8704-44e0-96e7-673d3402403e","path":"sprites/spr_large_coin/spr_large_coin.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":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, ], "visibleRange": null, diff --git a/sprites/spr_static_coin/afebdf59-d1cb-407e-9399-c5ba9ecd658f.png b/sprites/spr_static_coin/afebdf59-d1cb-407e-9399-c5ba9ecd658f.png new file mode 100644 index 000000000..032c4a1ce Binary files /dev/null and b/sprites/spr_static_coin/afebdf59-d1cb-407e-9399-c5ba9ecd658f.png differ diff --git a/sprites/spr_static_coin/layers/afebdf59-d1cb-407e-9399-c5ba9ecd658f/34d0e64c-e2b6-4c34-aca4-42d9f6d96e24.png b/sprites/spr_static_coin/layers/afebdf59-d1cb-407e-9399-c5ba9ecd658f/34d0e64c-e2b6-4c34-aca4-42d9f6d96e24.png new file mode 100644 index 000000000..032c4a1ce Binary files /dev/null and b/sprites/spr_static_coin/layers/afebdf59-d1cb-407e-9399-c5ba9ecd658f/34d0e64c-e2b6-4c34-aca4-42d9f6d96e24.png differ diff --git a/sprites/spr_static_coin/spr_static_coin.yy b/sprites/spr_static_coin/spr_static_coin.yy new file mode 100644 index 000000000..a0caa5e2c --- /dev/null +++ b/sprites/spr_static_coin/spr_static_coin.yy @@ -0,0 +1,79 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 4, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 1, + "bbox_right": 14, + "bbox_top": 1, + "bbox_bottom": 14, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 16, + "height": 16, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"afebdf59-d1cb-407e-9399-c5ba9ecd658f","path":"sprites/spr_static_coin/spr_static_coin.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"afebdf59-d1cb-407e-9399-c5ba9ecd658f","path":"sprites/spr_static_coin/spr_static_coin.yy",},"LayerId":{"name":"34d0e64c-e2b6-4c34-aca4-42d9f6d96e24","path":"sprites/spr_static_coin/spr_static_coin.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_static_coin","path":"sprites/spr_static_coin/spr_static_coin.yy",},"resourceVersion":"1.0","name":"afebdf59-d1cb-407e-9399-c5ba9ecd658f","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_static_coin","path":"sprites/spr_static_coin/spr_static_coin.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 6.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":"0cdc5d38-827f-413f-9de8-ac0c6f2c13c6","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"afebdf59-d1cb-407e-9399-c5ba9ecd658f","path":"sprites/spr_static_coin/spr_static_coin.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":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1920, + "backdropHeight": 1080, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 8, + "yorigin": 8, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_static_coin","path":"sprites/spr_static_coin/spr_static_coin.yy",}, + "resourceVersion": "1.4", + "name": "spr_static_coin", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"34d0e64c-e2b6-4c34-aca4-42d9f6d96e24","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "spr_static_coin", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file