Merge branch 'master' of https://git.touhou.dev/shaun_chaky/eastern-flames

eastern flames/objects/ARTICULATOR/Create_0.gml

@@ -1,4 +1,5 @@
 c_addunit(un.chara, ARMY.US);
+c_addunit(un.kris, ARMY.THEM);
 var i;
 /*for (i=0; i<array_length(global.units[ARMY.US]); i++) {
 	c_inheritunit(2+i, 2, un.chara);
@@ -10,6 +11,8 @@ var kris = c_inheritunit(10, 5, un.kris);
 c_addweapon(kris, wp[$"iron sword"], true);
 selectedunit = noone;
 hoveredunit = noone;
+hspd = 0;
+vspd = 0;
 global.gw = 640;
 global.gh = 360;
 global.camerax = 0;

eastern flames/objects/ARTICULATOR/Step_0.gml

@@ -27,7 +27,21 @@ if select && selectedunit == noone {
 		//draw_text(global.gw-10, global.gh-10-i*20;
 	}
 }
+if selectedunit == noone {
+	hspd = lerp(hspd, (right-left)*((.1+stop*.1)*(ts.x)), .4);
+	vspd = lerp(vspd, (down-up)*((.1+stop*.1)*(ts.y)), .4);
+	x += hspd;
+	y += vspd;
 	
+} else {
+	hspd = 0;
+	vspd = 0;
+	x = lerp(x, selectedunit.x, .4);
+	y = lerp(y, selectedunit.y, .4);
+}
+
+global.camerax = x;
+global.cameray = y;
 var mousex = floor(mouse.x/global.tilesize.x);
 var mousey = floor(mouse.y/global.tilesize.y);
 //log(mousex, mousey);
@@ -42,15 +56,3 @@ if mousex < array_length(global.map) && mousex >= 0 {
 		}
 	}
 }
-if(left){
-	global.camerax--;	
-}
-if(right){
-	global.camerax++;	
-}
-if(up){
-	global.cameray--;	
-}
-if(down){
-	global.cameray++;	
-}

eastern flames/objects/o_unit/Draw_0.gml

@@ -17,11 +17,11 @@ x = tempx;
 y = tempy;
 //log(data);
 draw_set_color(c_red);
-draw_rectangle(0-ts.x/2, 0-ts.y/2-1,
+draw_rectangle(0-ts.x/2, 0-sprite_height-1,
 	0-ts.x/2+(ts.x*(data.hp.val/data.hp.cap)),
-	0-ts.y/2+1, false
+	0-sprite_height+1, false
 );
-draw_text(x, y-ts.y, data.hp.val);
+draw_text(0, 0-sprite_height-4, data.hp.val);
 //draw_set_color(c_red);
 //draw_circle(x, y, 5, false);
 

eastern flames/scripts/c_input/c_input.gml

@@ -10,6 +10,6 @@ function c_input() {
 	rightp = keyboard_check_pressed(ord("D")) + keyboard_check_pressed(vk_right);
 	
 	select = mouse_check_button_pressed(mb_left) + keyboard_check_pressed(vk_enter);
-	back = mouse_check_button_pressed(mb_right) + keyboard_check_pressed(vk_escape);
+	back = mouse_check_button_pressed(mb_right) + keyboard_check_pressed(vk_escape) + keyboard_check_pressed(ord("Q"));
 	stop = keyboard_check(vk_shift);
 }

eastern flames/scripts/st_moving/st_moving.gml

@@ -1,8 +1,8 @@
 function st_moving() {
 	var mov = data.mov.val;
 	c_input();
-	hspd = lerp(hspd, (right-left)*.05, .4);
-	vspd = lerp(vspd, (down-up)*.05, .4);
+	hspd = lerp(hspd, (right-left)*.07, .4);
+	vspd = lerp(vspd, (down-up)*.07, .4);
 	if !stop dir = DIR.NONE;
 	if left dir = DIR.LEFT;
 	if down dir = DIR.DOWN;
@@ -47,27 +47,23 @@ function st_moving() {
 	//var rng = [1];
 	var guy = c_gettile(x, y, true);
 	var hitting = noone;
-	if guy != noone && stop {
+	if guy != noone {
 		switch dir {
 			case DIR.LEFT:
 				hitting = c_gettile(guy.x-1, guy.y);
-				c_colortile(guy.x-1, guy.y, c_red);
 				sprite_index = data.down;
 				image_xscale = -1;
 				break;
 			case DIR.DOWN:
 				hitting = c_gettile(guy.x, guy.y+1);
-				c_colortile(guy.x, guy.y+1, c_red);
 				sprite_index = data.down;
 				break;
 			case DIR.UP:
 				hitting = c_gettile(guy.x, guy.y-1);
-				c_colortile(guy.x, guy.y-1, c_red);
 				sprite_index = data.up;
 				break;
 			case DIR.RIGHT:
 				hitting = c_gettile(guy.x+1, guy.y);
-				c_colortile(guy.x+1, guy.y, c_red);
 				sprite_index = data.down;
 				image_xscale = 1;
 				break;
@@ -77,7 +73,8 @@ function st_moving() {
 				break;
 				
 		}
-		if hitting != noone && select {
+		if hitting != noone && select && stop {
+			c_colortile(hitting.x, hitting.y, c_red);
 			log("found one");
 			log(hitting.contents, hitting.x, hitting.y);
 			var i;

eastern flames/scripts/tiledata/tiledata.gml

@@ -24,7 +24,7 @@ function c_informtiles() {
 	}
 }
 c_informtiles();
-global.tilesize = new vec2(32, 32);
+global.tilesize = new vec2(20, 20);
 
 function tiledata(passable_=true, contents_=[], overlays_=[], statmods=[]) constructor {
 	passable = passable_;

eastern flames/sprites/s_guy/s_guy.yy

@@ -2,7 +2,7 @@
   "bboxMode": 0,
   "collisionKind": 0,
   "type": 0,
-  "origin": 4,
+  "origin": 7,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
@@ -55,7 +55,7 @@
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
     "xorigin": 16,
-    "yorigin": 16,
+    "yorigin": 32,
     "eventToFunction": {},
     "eventStubScript": null,
     "parent": {"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},

eastern flames/sprites/s_momiji/s_momiji.yy

@@ -2,7 +2,7 @@
   "bboxMode": 0,
   "collisionKind": 0,
   "type": 0,
-  "origin": 4,
+  "origin": 9,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
@@ -59,7 +59,7 @@
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
     "xorigin": 16,
-    "yorigin": 16,
+    "yorigin": 27,
     "eventToFunction": {},
     "eventStubScript": null,
     "parent": {"name":"s_momiji","path":"sprites/s_momiji/s_momiji.yy",},

eastern flames/sprites/s_momijidown/s_momijidown.yy

@@ -2,7 +2,7 @@
   "bboxMode": 0,
   "collisionKind": 0,
   "type": 0,
-  "origin": 4,
+  "origin": 9,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
@@ -67,7 +67,7 @@
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
     "xorigin": 16,
-    "yorigin": 16,
+    "yorigin": 28,
     "eventToFunction": {},
     "eventStubScript": null,
     "parent": {"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},

eastern flames/sprites/s_momijiup/s_momijiup.yy

@@ -2,7 +2,7 @@
   "bboxMode": 0,
   "collisionKind": 0,
   "type": 0,
-  "origin": 4,
+  "origin": 9,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
@@ -10,7 +10,7 @@
   "bbox_left": 5,
   "bbox_right": 22,
   "bbox_top": 3,
-  "bbox_bottom": 26,
+  "bbox_bottom": 27,
   "HTile": false,
   "VTile": false,
   "For3D": false,
@@ -67,7 +67,7 @@
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
     "xorigin": 16,
-    "yorigin": 16,
+    "yorigin": 26,
     "eventToFunction": {},
     "eventStubScript": null,
     "parent": {"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},