diff --git a/eastern flames/datafiles/credits.txt b/eastern flames/datafiles/credits.txt deleted file mode 100644 index 84c007b..0000000 --- a/eastern flames/datafiles/credits.txt +++ /dev/null @@ -1,9 +0,0 @@ -CREDITS: -Aeon - code, numbers, mapstuff, japanese -Bakaretsu - 2d art -Bread Man - 3d support -Luyuu - chillin -Megapig9001 - concept, mapstuff, english, japanese -Muzilana - music -SolarisSect - ultra chillin -Vinyis - 3d, 3d art \ No newline at end of file diff --git a/eastern flames/datafiles/readme.txt b/eastern flames/datafiles/readme.txt deleted file mode 100644 index 05fcee9..0000000 --- a/eastern flames/datafiles/readme.txt +++ /dev/null @@ -1,12 +0,0 @@ -hello! -it's fire emblem. if you don't know what entails, consider yourself lucky. -controls: -wasd/arrows: move camera or selected character -left click/enter/space: advance, select -right click/esc/q: back, deselect -shift: aim attack - -you can click on a weapon's name in your inventory to change it. -you've gotta hold shift to do anything with your guy (including wait) so, uh, don't forget. i cut out a submenu or two from vanilla emblem. - -- aeon \ No newline at end of file diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 36b7606..cbd4a31 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -56,7 +56,6 @@ {"id":{"name":"camera_reset","path":"scripts/camera_reset/camera_reset.yy",},"order":0,}, {"id":{"name":"s_bunnyface","path":"sprites/s_bunnyface/s_bunnyface.yy",},"order":7,}, {"id":{"name":"o_unit","path":"objects/o_unit/o_unit.yy",},"order":2,}, - {"id":{"name":"c_changealignment","path":"scripts/c_changealignment/c_changealignment.yy",},"order":35,}, {"id":{"name":"s_rabbittalk","path":"sprites/s_rabbittalk/s_rabbittalk.yy",},"order":4,}, {"id":{"name":"combat","path":"scripts/combat/combat.yy",},"order":13,}, {"id":{"name":"mod_negative","path":"scripts/mod_negative/mod_negative.yy",},"order":11,}, @@ -78,7 +77,6 @@ {"id":{"name":"s_robotalk","path":"sprites/s_robotalk/s_robotalk.yy",},"order":6,}, {"id":{"name":"txt_","path":"scripts/txt_/txt_.yy",},"order":0,}, {"id":{"name":"ft_chiaro","path":"fonts/ft_chiaro/ft_chiaro.yy",},"order":1,}, - {"id":{"name":"s_black","path":"sprites/s_black/s_black.yy",},"order":11,}, {"id":{"name":"Model","path":"scripts/Model/Model.yy",},"order":2,}, {"id":{"name":"s_title","path":"sprites/s_title/s_title.yy",},"order":9,}, {"id":{"name":"c_gettile","path":"scripts/c_gettile/c_gettile.yy",},"order":11,}, @@ -239,8 +237,6 @@ {"CopyToMask":-1,"filePath":"datafiles/forestbattle","resourceVersion":"1.0","name":"forestbattle.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/plainsbattle","resourceVersion":"1.0","name":"plainsbattle.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"readme.txt","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"credits.txt","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 c67fb71..c2f12d8 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -1,4 +1,3 @@ -draw_set_font(ft_chiaro); //c_addunit(un.chara, ARMY.US); //c_addunit(un.kris, ARMY.THEM); var i; diff --git a/eastern flames/objects/o_damage/Draw_0.gml b/eastern flames/objects/o_damage/Draw_0.gml index 154b656..f207c1b 100644 --- a/eastern flames/objects/o_damage/Draw_0.gml +++ b/eastern flames/objects/o_damage/Draw_0.gml @@ -1,4 +1,3 @@ -//if ARTICULATOR.waiting cpp(); draw_set_color(c_black); //draw_set_alpha(0.25); diff --git a/eastern flames/objects/o_unit/Draw_0.gml b/eastern flames/objects/o_unit/Draw_0.gml index 8ed95a0..275ce9d 100644 --- a/eastern flames/objects/o_unit/Draw_0.gml +++ b/eastern flames/objects/o_unit/Draw_0.gml @@ -17,14 +17,12 @@ x = tempx; y = tempy; //log(data); draw_set_color(c_red); -draw_rectangle(0-ts.x/2, 0-sprite_height+5, +draw_rectangle(0-ts.x/2, 0-sprite_height-1, 0-ts.x/2+(ts.x*(data.hp.val/data.hp.cap)), - 0-sprite_height+7, false + 0-sprite_height+1, false ); -draw_set_halign(fa_center); -draw_text(0, -6-sprite_height-20, data.hp.val); +draw_text(5, -6-sprite_height-6, data.hp.val); //draw_set_color(c_red); -draw_set_halign(fa_left); //draw_circle(x, y, 5, false); matrix_set(matrix_world,worldMat); \ No newline at end of file diff --git a/eastern flames/scripts/c_changealignment/c_changealignment.gml b/eastern flames/scripts/c_changealignment/c_changealignment.gml deleted file mode 100644 index 9cadb6e..0000000 --- a/eastern flames/scripts/c_changealignment/c_changealignment.gml +++ /dev/null @@ -1,5 +0,0 @@ -function c_changealignment(unitobject, alignment) { - //array_remove(global.units[unitobject.alignment], unitobject); - unitobject.alignment = alignment; - array_push(global.units[alignment], unitobject); -} \ No newline at end of file diff --git a/eastern flames/scripts/c_changealignment/c_changealignment.yy b/eastern flames/scripts/c_changealignment/c_changealignment.yy deleted file mode 100644 index 3b67a90..0000000 --- a/eastern flames/scripts/c_changealignment/c_changealignment.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Scripts", - "path": "folders/Scripts.yy", - }, - "resourceVersion": "1.0", - "name": "c_changealignment", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/eastern flames/scripts/c_input/c_input.gml b/eastern flames/scripts/c_input/c_input.gml index 51c293f..f0e90c1 100644 --- a/eastern flames/scripts/c_input/c_input.gml +++ b/eastern flames/scripts/c_input/c_input.gml @@ -9,7 +9,7 @@ function c_input() { upp = keyboard_check_pressed(ord("W")) + keyboard_check_pressed(vk_up); rightp = keyboard_check_pressed(ord("D")) + keyboard_check_pressed(vk_right); - select = mouse_check_button_pressed(mb_left) + keyboard_check_pressed(vk_enter) + keyboard_check_pressed(vk_space); + select = mouse_check_button_pressed(mb_left) + keyboard_check_pressed(vk_enter); back = mouse_check_button_pressed(mb_right) + keyboard_check_pressed(vk_escape) + keyboard_check_pressed(ord("Q")); stop = keyboard_check(vk_shift); } \ 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 index b559fcf..54001a0 100644 --- a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml +++ b/eastern flames/scripts/c_loadstageone/c_loadstageone.gml @@ -15,7 +15,7 @@ function c_loadstageone() { c_addweapon(nitori, wp[$"Healgun"], true); - /*var bunny = c_inheritunit(19, 3, un[$"Bunny Buddy"], ARMY.THEM); + var bunny = c_inheritunit(19, 3, un[$"Bunny Buddy"], ARMY.THEM); c_addweapon(bunny, wp[$"Bayonet"], true); bunny = c_inheritunit(17, 2, un[$"Final Bunny"], ARMY.THEM); c_addweapon(bunny, wp[$"Bayonet"], true); @@ -49,7 +49,7 @@ function c_loadstageone() { c_addweapon(bunny, wp[$"Bayonet"], true); bunny = c_inheritunit(19, 13, un[$"Sneaky Bunny"], ARMY.THEM); - c_addweapon(bunny, wp[$"Lunar Machete"], true);*/ + c_addweapon(bunny, wp[$"Lunar Machete"], true); var reisen = c_inheritunit(19, 1, un[$"Rei'sen"], ARMY.THEM); diff --git a/eastern flames/scripts/c_moveunit/c_moveunit.gml b/eastern flames/scripts/c_moveunit/c_moveunit.gml index 06dc12b..5d965e8 100644 --- a/eastern flames/scripts/c_moveunit/c_moveunit.gml +++ b/eastern flames/scripts/c_moveunit/c_moveunit.gml @@ -5,5 +5,5 @@ function c_moveunit(targetunit, destination) { array_push(destination.contents, targetunit); targetunit.pos.x = destination.x; targetunit.pos.y = destination.y; - theguy.event(targetunit); + theguy.event(); } \ No newline at end of file diff --git a/eastern flames/scripts/c_selectunit/c_selectunit.gml b/eastern flames/scripts/c_selectunit/c_selectunit.gml index 89c03b2..b88a153 100644 --- a/eastern flames/scripts/c_selectunit/c_selectunit.gml +++ b/eastern flames/scripts/c_selectunit/c_selectunit.gml @@ -18,8 +18,7 @@ function c_selectunit(unitobject) { } function c_deselectunit(unitobject) { - if ARTICULATOR.selectedunit != unitobject return false; - if unitobject == noone return false; + if ARTICULATOR.selectedunit != unitobject return false unitobject.sprite_index = unitobject.data.idle; state = st_standing; drawstate = c_null; diff --git a/eastern flames/scripts/st_control/st_control.gml b/eastern flames/scripts/st_control/st_control.gml index 47e3811..772fe66 100644 --- a/eastern flames/scripts/st_control/st_control.gml +++ b/eastern flames/scripts/st_control/st_control.gml @@ -73,9 +73,6 @@ function st_control() { } c_dewait(global.turn); //global.turn = (global.turn+1)%2; - hoveredunit = noone; - c_deselectunit(selectedunit); - waiting = 60; k = 0; global.turn = ARMY.THEM; log("TURN " + string(global.turn)); diff --git a/eastern flames/scripts/st_enemyturn/st_enemyturn.gml b/eastern flames/scripts/st_enemyturn/st_enemyturn.gml index 506fec5..6c36ce0 100644 --- a/eastern flames/scripts/st_enemyturn/st_enemyturn.gml +++ b/eastern flames/scripts/st_enemyturn/st_enemyturn.gml @@ -29,10 +29,8 @@ function st_enemyturn() { if done { c_dewait(global.turn); k = 0; - c_deselectunit(selectedunit); state = st_control; global.turn = ARMY.US; - done = false; } //} } \ No newline at end of file diff --git a/eastern flames/scripts/st_moving/st_moving.gml b/eastern flames/scripts/st_moving/st_moving.gml index 4d12fc1..0870019 100644 --- a/eastern flames/scripts/st_moving/st_moving.gml +++ b/eastern flames/scripts/st_moving/st_moving.gml @@ -137,8 +137,6 @@ function st_moving() { if hitting.contents[i].alignment != alignment ^^ !data.str.val { c_moveunit(id, c_gettile(pos.x, pos.y)); c_generatecombatstack([id, hitting.contents[i]]); - waiting = true; - c_deselectunit(id); } } } @@ -149,7 +147,7 @@ function st_moving() { c_moveunit(id, c_gettile(returnpos.x, returnpos.y)); c_deselectunit(id); } - if dir == DIR.NONE && select && stop { + if dir == DIR.NONE && select && stop && ARTICULATOR.hoveredunit == id{ c_moveunit(id, c_gettile(x, y, true)); waiting = true; c_deselectunit(id); diff --git a/eastern flames/scripts/tiledata/tiledata.gml b/eastern flames/scripts/tiledata/tiledata.gml index 76c4ad3..f478937 100644 --- a/eastern flames/scripts/tiledata/tiledata.gml +++ b/eastern flames/scripts/tiledata/tiledata.gml @@ -1,47 +1,24 @@ global.gotaya = false; global.gottkn = false; -var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 2, add)])} +var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 5, add)])} var block1234567 = function() {return new tiledata(false, u, [])} var recruit__aya = function() {return new tiledata(u, u, u, u, function(unitobject) { if unitobject.alignment == ARMY.US { switch unitobject.data.name { case "Momiji": + textbox_create(txt_momijiyaya); if !global.gotaya { - textbox_create(txt_momijiyaya); global.gotaya = true; - c_changealignment(global.units[2][0], ARMY.US); } break; } - - } -})} -var recruit__tkn = function() {return new tiledata(u, u, u, [new statmod(st.def, 2, add)], function(unitobject) { - if unitobject.alignment == ARMY.US { - switch unitobject.data.name { - case "Momiji": - if !global.gottkn { - textbox_create(txt_momijiytkn); - global.gottkn = true; - c_changealignment(global.units[2][1], ARMY.US); - } - break; - case "Nitori": - if !global.gottkn { - textbox_create(txt_nitoriytkn); - global.gottkn = true; - c_changealignment(global.units[2][1], ARMY.US); - } - break; - } - } })} 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(), recruit__aya(), 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(), recruit__aya(), new tiledata(), recruit__aya(), 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(), recruit__aya(), 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(), 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()], @@ -50,8 +27,8 @@ global.map = c_mapgen([ [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(), recruit__tkn(), 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(), recruit__tkn(), new tiledata(), recruit__tkn(), new tiledata(), 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(), 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 function c_informtiles() { for (i=0; i",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"9299d4cc-30a3-4272-a80b-4144f441295c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"654cfe64-38d8-4f2f-8288-abece37e91fb","path":"sprites/s_black/s_black.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": 320, - "yorigin": 320, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"s_black","path":"sprites/s_black/s_black.yy",}, - "resourceVersion": "1.3", - "name": "s_black", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f17d5509-18e0-4bb7-bccd-954afee52892","tags":[],"resourceType":"GMImageLayer",}, - ], - "nineSlice": null, - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", - }, - "resourceVersion": "1.0", - "name": "s_black", - "tags": [], - "resourceType": "GMSprite", -} \ No newline at end of file