diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index bb4312f..30ef228 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -25,6 +25,7 @@ {"id":{"name":"draw_settings","path":"scripts/draw_settings/draw_settings.yy",},"order":3,}, {"id":{"name":"draw_circle_curve","path":"scripts/draw_circle_curve/draw_circle_curve.yy",},"order":2,}, {"id":{"name":"o_unit","path":"objects/o_unit/o_unit.yy",},"order":2,}, + {"id":{"name":"combat","path":"scripts/combat/combat.yy",},"order":13,}, {"id":{"name":"mod_negative","path":"scripts/mod_negative/mod_negative.yy",},"order":11,}, {"id":{"name":"draw_circle_width","path":"scripts/draw_circle_width/draw_circle_width.yy",},"order":3,}, {"id":{"name":"gcd","path":"scripts/gcd/gcd.yy",},"order":5,}, @@ -50,6 +51,7 @@ {"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":"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":"tag","path":"scripts/tag/tag.yy",},"order":6,}, {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,}, @@ -68,9 +70,11 @@ {"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_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":"st_moving","path":"scripts/st_moving/st_moving.yy",},"order":7,}, {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,}, ], @@ -108,6 +112,7 @@ {"folderPath":"folders/Scripts/util/drawing.yy","order":3,"resourceVersion":"1.0","name":"drawing","tags":[],"resourceType":"GMFolder",}, {"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",}, ], "AudioGroups": [ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index d11f35b..5b77676 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -3,3 +3,4 @@ var i; for (i=0; i them.data.spd.val+5)) { //DONT USE FIVE, OR ANY OF THIS + attacks++; + return true; + } + return false; +} + +action = { + effect: function(me, them) { + them.data.hp.val -= me.data.str.val; + return me.data.str.val; + } + //animation: new actionanim() + +} +hooks = {}; \ No newline at end of file diff --git a/eastern flames/objects/o_unit/Draw_0.gml b/eastern flames/objects/o_unit/Draw_0.gml index d3d2128..61afeff 100644 --- a/eastern flames/objects/o_unit/Draw_0.gml +++ b/eastern flames/objects/o_unit/Draw_0.gml @@ -1,10 +1,11 @@ draw_self(); drawstate(); -log(data); +//log(data); draw_set_color(c_red); draw_rectangle(x-ts.x/2, y-ts.y/2-1, - x-ts.x/2+(ts.x*(data.hp.val/data.hp.val)), + x-ts.x/2+(ts.x*(data.hp.val/data.hp.cap)), y-ts.y/2+1, false ); +draw_text(x, y-ts.y, data.hp.val); //draw_set_color(c_red); //draw_circle(x, y, 5, false); \ No newline at end of file diff --git a/eastern flames/scripts/array_contains_within/array_contains.yy b/eastern flames/scripts/array_contains_within/array_contains.yy new file mode 100644 index 0000000..e3d168a --- /dev/null +++ b/eastern flames/scripts/array_contains_within/array_contains.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "data", + "path": "folders/Scripts/util/data.yy", + }, + "resourceVersion": "1.0", + "name": "array_contains", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file diff --git a/eastern flames/scripts/array_contains_within/array_contains_within.gml b/eastern flames/scripts/array_contains_within/array_contains_within.gml new file mode 100644 index 0000000..f8a38ba --- /dev/null +++ b/eastern flames/scripts/array_contains_within/array_contains_within.gml @@ -0,0 +1,12 @@ +function array_contains_within(array, val) { + var i, j; + for (i=0; i",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"72a83b44-0ad0-4608-9c74-df5a743988f0","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ea35e997-c3b5-4156-9563-4027f6f9645a","path":"sprites/s_momiji/s_momiji.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_momiji","path":"sprites/s_momiji/s_momiji.yy",}, + "resourceVersion": "1.3", + "name": "s_momiji", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"722b53dd-20e3-491f-9203-55886718dd68","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "momiji", + "path": "folders/Sprites/momiji.yy", + }, + "resourceVersion": "1.0", + "name": "s_momiji", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file