diff --git a/eastern flames/datafiles/Forest Battle/forestatlas.png b/eastern flames/datafiles/Forest Battle/forestatlas.png new file mode 100644 index 0000000..9a91543 Binary files /dev/null and b/eastern flames/datafiles/Forest Battle/forestatlas.png differ diff --git a/eastern flames/datafiles/Forest Battle/forestbattle.dat b/eastern flames/datafiles/Forest Battle/forestbattle.dat new file mode 100644 index 0000000..c05f938 Binary files /dev/null and b/eastern flames/datafiles/Forest Battle/forestbattle.dat differ diff --git a/eastern flames/datafiles/Forest Battle/forestbattle.size b/eastern flames/datafiles/Forest Battle/forestbattle.size new file mode 100644 index 0000000..a38c9cb --- /dev/null +++ b/eastern flames/datafiles/Forest Battle/forestbattle.size @@ -0,0 +1 @@ +21.73337745666504 , 17.503263473510742 , 16.766698837280273 \ No newline at end of file diff --git a/eastern flames/datafiles/Plains Battle/plainsatlas.png b/eastern flames/datafiles/Plains Battle/plainsatlas.png new file mode 100644 index 0000000..313a369 Binary files /dev/null and b/eastern flames/datafiles/Plains Battle/plainsatlas.png differ diff --git a/eastern flames/datafiles/Plains Battle/plainsbattle.dat b/eastern flames/datafiles/Plains Battle/plainsbattle.dat new file mode 100644 index 0000000..9ec990a Binary files /dev/null and b/eastern flames/datafiles/Plains Battle/plainsbattle.dat differ diff --git a/eastern flames/datafiles/Plains Battle/plainsbattle.size b/eastern flames/datafiles/Plains Battle/plainsbattle.size new file mode 100644 index 0000000..a38c9cb --- /dev/null +++ b/eastern flames/datafiles/Plains Battle/plainsbattle.size @@ -0,0 +1 @@ +21.73337745666504 , 17.503263473510742 , 16.766698837280273 \ No newline at end of file diff --git a/eastern flames/datafiles/map1/map1.dat b/eastern flames/datafiles/map1/map1.dat index d1d2e49..4db817f 100644 Binary files a/eastern flames/datafiles/map1/map1.dat and b/eastern flames/datafiles/map1/map1.dat differ diff --git a/eastern flames/datafiles/map1/map1.size b/eastern flames/datafiles/map1/map1.size index 430b7aa..dac797b 100644 --- a/eastern flames/datafiles/map1/map1.size +++ b/eastern flames/datafiles/map1/map1.size @@ -1 +1 @@ -23.718978881835938 , 16.35820198059082 , 1.6182538270950317 \ No newline at end of file +1.399999737739563 , 1.1000003814697266 , 0.06869175285100937 \ No newline at end of file diff --git a/eastern flames/datafiles/map1/mapatlas.png b/eastern flames/datafiles/map1/mapatlas.png index 7cf4a70..fb1b968 100644 Binary files a/eastern flames/datafiles/map1/mapatlas.png and b/eastern flames/datafiles/map1/mapatlas.png differ diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index 48399f8..2297ae0 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -26,7 +26,7 @@ function getView(){ var _x = global.camerax; var _y = global.cameray; var half = (7.5*32)+40; - return matrix_build_lookat(_x,_y+180,150,_x,_y,0,0,0,-1); + return matrix_build_lookat(_x,_y+60,90,_x,_y,0,0,0,-1); } function setCam(){ @@ -56,5 +56,5 @@ models = []; textbox_create(txt_test); var spr = sprite_add("./map1/mapatlas.png",0,false,false,0,0); -nu Model("./map1/map1.dat", spr, u, 200, 140, u, .65, u, u, u,); +nu Model("./map1/map1.dat", spr, u, 200, 140, u, 4, u, u, u,); setCam(); \ 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 6a716f2..2c9da58 100644 --- a/eastern flames/objects/o_unit/Draw_0.gml +++ b/eastern flames/objects/o_unit/Draw_0.gml @@ -4,7 +4,7 @@ draw_set_color(c_black); //draw_set_alpha(1); var worldMat = matrix_get(matrix_world); //this is the location of where i want to draw from !!! -var worldMat2 = matrix_build(x,y,0,90,0,0,1,1,1); +var worldMat2 = matrix_build(x,y+6,0,50,0,0,0.6,0.6,0.6); matrix_set(matrix_world,worldMat2); if waiting image_blend = c_grey else image_blend = c_white; var tempx = x; @@ -21,7 +21,7 @@ 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+1, false ); -draw_text(0, 0-sprite_height-4, data.hp.val); +draw_text(5, -6-sprite_height-6, data.hp.val); //draw_set_color(c_red); //draw_circle(x, y, 5, false);