its 6 am

eastern flames/datafiles/readme.txt

@@ -8,5 +8,6 @@ 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.
+sometimes, if you stand next to nice people, they will want to talk! maybe even join you! yup!
 
 - aeon

eastern flames/eastern flames.yyp

@@ -243,7 +243,7 @@
     {"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":153157610357391598,"filePath":"datafiles","resourceVersion":"1.0","name":"readme.txt","resourceType":"GMIncludedFile",},
     {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"credits.txt","resourceType":"GMIncludedFile",},
     {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",},
     {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",},

eastern flames/objects/ARTICULATOR/Create_0.gml

@@ -6,7 +6,7 @@ var i;
 	c_inheritunit(2+i, 2, un.chara);
 }*/
 
-
+x -= 150;
 c_loadstageone();
 
 waiting = 0;

eastern flames/objects/ARTICULATOR/Step_0.gml

@@ -1,2 +1,4 @@
 state();
 draw_set_font(ft_chiaro);
+x = clamp(x, 0, 20*ts.x);
+y = clamp(y, 0, 14*ts.y);

eastern flames/objects/o_unit/Create_0.gml

@@ -19,6 +19,9 @@ hitting = noone;
 
 continuecombat = function(me, them) {
 	//if stamina returnable = true stamina-- return true
+	if them.data.str.val < 0 || me.data.hp.val <= 0 {
+		return false;
+	}
 	if !(attacks-(me.data.spd.val > them.data.spd.val+5)) { //DONT USE FIVE, OR ANY OF THIS
 		attacks++;
 		return true;
@@ -32,7 +35,7 @@ action = {
 		guy.hspd = random(3)-1.5;
 		guy.vspd = -random(1)-3;
 		if irandom(99) < (me.data.hit.val) { //add avo
-			them.data.hp.val -= (me.data.str.val-them.data.def.val);
+			them.data.hp.val = min(them.data.hp.val - (me.data.str.val-them.data.def.val), them.data.hp.cap);
 			guy.amount = (me.data.str.val-them.data.def.val);
 			return me.data.str.val;
 		} else {

eastern flames/objects/o_unit/Draw_0.gml

@@ -4,14 +4,17 @@ 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+6,0,50,0,0,0.6,0.6,0.6);
+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;
+image_blend = c_white;
+if marked image_blend = c_red;
+if waiting image_blend = c_grey;
 var tempx = x;
 var tempy = y;
 x = 0;
 y = 0;
 draw_self();
+//draw_sprite_ext(sprite_index, image_index, x+sprite_width/2, y, image_xscale, image_yscale, image_angle, image_blend, image_alpha);
 
 x = tempx;
 y = tempy;

eastern flames/scripts/c_deleteunit/c_deleteunit.gml

@@ -1,5 +1,11 @@
 function c_deleteunit(x, y, target) {
+	if target.data.name == "Rei'sen" {
+		textbox_create(txt_win);
+		c_inheritunit(0, 0, un.bunny, ARMY.THEM);
+	}
 	array_remove(global.map[x][y].contents, target);
+	//global.map[x][y].contents = [];
 	array_remove(global.units[target.alignment], target);
 	instance_destroy(target);
+	
 }

eastern flames/scripts/c_doenemyai/c_doenemyai.gml

@@ -1,6 +1,14 @@
 function c_doenemyai(target) {
 	switch target.data.aitype {
 		case AI.AFK:
+			var dude = c_findnearestunit(ARMY.US);
+			var dist = c_tiledist(target.pos.x, target.pos.y, dude.pos.x, dude.pos.y);
+			if dist.x+dist.y <= target.data.rng.val {
+				log("started combat")
+				c_generatecombatstack([target, dude]);
+				break;
+			}
+			c_loadmarkings();
 			target.waiting = true;
 			break;
 		case AI.KILLER:
@@ -35,7 +43,7 @@ function c_doenemyai(target) {
 		case AI.WAITER:
 			var dude = c_findnearestunit(ARMY.US);
 			var dist = c_tiledist(target.pos.x, target.pos.y, dude.pos.x, dude.pos.y);
-			if dist > target.data.mov.val + target.data.rng.val {
+			if dist.x+dist.y > target.data.mov.val + target.data.rng.val {
 				target.waiting = true;
 				break;
 			}
@@ -89,7 +97,8 @@ function c_doenemyai(target) {
 				log(dist);
 				if dist.x+dist.y <= 0 {
 					log("IM LEAVING");
-					c_deleteunit(target.pos.x, target.pos.y, target);
+					//c_deleteunit(target.pos.x, target.pos.y, target);
+					break;
 				}
 				c_loadmarkings();
 			}
@@ -100,11 +109,11 @@ function c_doenemyai(target) {
 	waiting = 70;
 }
 
-function c_findnearestunit(alignment) {
+function c_findnearestunit(x, y, alignment) {
 	var lowest = new vec2(99, 99);
 	var lowestunit = noone;
 	for (i=0; i<array_length(global.units[alignment]); i++) {
-		var guy = global.units[alignment][i].pos;
+		var guy = c_tiledist(x, y, global.units[alignment][i].pos.x, global.units[alignment][i].pos.y);
 		if (lowest.x + lowest.y > guy.x + guy.y) {
 			lowest = guy;
 			lowestunit = global.units[alignment][i];

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,10 +49,10 @@ 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);
+	var reisen = c_inheritunit(18, 1, un[$"Rei'sen"], ARMY.THEM);
 	c_addweapon(reisen, wp[$"Sniper Rifle"], true);
 	c_addweapon(reisen, wp[$"Bayonet"], false);
 }

eastern flames/scripts/c_moveunit/c_moveunit.gml

@@ -1,9 +1,15 @@
 function c_moveunit(targetunit, destination) {
+	if targetunit.alignment == ARMY.US {
+		var theguy = c_gettile(targetunit.returnpos.x, targetunit.returnpos.y);
+	} else {
 		var theguy = c_gettile(targetunit.pos.x, targetunit.pos.y);
-	log(theguy.contents);
+	}
+	//log(theguy.contents);
 	/*if !*/array_remove(theguy.contents, targetunit) //idhfnjg();
+	//theguy.contents = [];
+	//destination.contents = [];
 	array_push(destination.contents, targetunit);
 	targetunit.pos.x = destination.x;
 	targetunit.pos.y = destination.y;
-	theguy.event(targetunit);
+	destination.event(targetunit);
 }

eastern flames/scripts/st_control/st_control.gml

@@ -11,6 +11,7 @@ function st_control() {
 				for (i=0; i<array_length(global.map[mousex][mousey].contents); i++) {
 					if global.map[mousex][mousey].contents[i].object_index == o_unit {
 						var dude = global.map[mousex][mousey].contents[i];
+						log(global.map[mousex][mousey].contents);
 						if dude.alignment == global.turn {
 							if selectedunit == noone {
 								c_selectunit(dude);

eastern flames/scripts/st_moving/st_moving.gml

@@ -3,7 +3,7 @@ function st_moving() {
 	c_input();
 	hspd = lerp(hspd, (right-left)*.07, .4);
 	vspd = lerp(vspd, (down-up)*.07, .4);
-	if !stop dir = DIR.NONE;
+	dir = DIR.NONE;
 	if left dir = DIR.LEFT;
 	if down dir = DIR.DOWN;
 	if up dir = DIR.UP;
@@ -36,8 +36,8 @@ function st_moving() {
 	/*} else {
 		log("not oob!");*/
 	//}
-	var dude = c_gettile(x+hspd+abs(sprite_width)/4, y+vspd, true);
+	var dude = c_gettile(x, y, true);
-	if dude != noone {
+	/*if dude != noone {
 		var dist = c_tiledist(dude.x, dude.y, returnpos.x, returnpos.y);
 		var friend = c_containsunit(dude.x, dude.y);
 		if dist.x + dist.y <= data.mov.val && dude.passable && (friend == noone || friend == id) {
@@ -58,6 +58,21 @@ function st_moving() {
 		y -= vspd*ts.y;
 		x = linear_approach(x, returnpos.x*ts.x+abs(sprite_width)/4, 1);
 		y = linear_approach(y, returnpos.y*ts.y, 1);
+	}*/
+	if dude != noone && !stop {
+		var dist = c_tiledist(dude.x, dude.y, returnpos.x, returnpos.y);
+		x = clamp(x+hspd*ts.x, max(0, returnpos.x*ts.x-(data.mov.val*ts.x-ts.x/2-dist.y*ts.y)), min(20*ts.x, returnpos.x*ts.x+(data.mov.val*ts.x+ts.x-dist.y*ts.y)));
+		y = clamp(y+vspd*ts.y, max(0, returnpos.y*ts.y-(data.mov.val*ts.y-ts.x/2-dist.x*ts.x)), min(20*ts.y, returnpos.y*ts.y+(data.mov.val*ts.y+ts.y-dist.x*ts.x)));
+		//y = clamp(y+vspd*ts.y, max(0, returnpos.y*ts.y-dist.y*ts.y+dist.x*ts.x), min(14*ts.y, returnpos.y*ts.y+dist.y*ts.y-dist.x*ts.x));
+		log(x, y);
+		dude = c_gettile(x, y, true);
+		if dude != noone {
+			pos.x = dude.x;
+			pos.y = dude.y;
+		}
+	} else if dude == noone {
+		x = linear_approach(x, returnpos.x*ts.x, 2);
+		y = linear_approach(y, returnpos.y*ts.y, 2);
 	}
 	//prevremainingmov = remainingmov;
 	c_decolor_all(c_red);
@@ -134,11 +149,13 @@ function st_moving() {
 					if hitting.contents[i].object_index = o_unit {
 						//log("is unit");
 						//log("found two");
-						if hitting.contents[i].alignment != alignment ^^ !data.str.val {
+						//if hitting.contents[i].alignment != alignment ^^ !data.str.val {
+						if hitting.contents[i].alignment == ARMY.THEM ^^ !data.str.val {
 							c_moveunit(id, c_gettile(pos.x, pos.y));
 							c_generatecombatstack([id, hitting.contents[i]]);
 							waiting = true;
 							c_deselectunit(id);
+							exit
 						}
 					}
 				}
@@ -210,9 +227,9 @@ function st_movingdraw() {
 						draw_text(320, 280, "POW");
 						draw_text(320+60, 280, string(them.data.str.val - data.def.val) + (them.data.spd.val > data.spd.val+5 ? " x 2" : ""));
 						
-						draw_text(320-60, 315, data.hit.val);
+						draw_text(320-60, 315, string(data.hit.val)+"%");
 						draw_text(320, 315, "HIT");
-						draw_text(320+60, 315, them.data.hit.val);
+						draw_text(320+60, 315, string(them.data.hit.val)+"%");
 						
 						
 						draw_set_halign(fa_left);

eastern flames/scripts/st_standing/st_standing.gml

@@ -1,5 +1,5 @@
 function st_standing() {
 	x = lerp(x, pos.x*global.tilesize.x+global.tilesize.x/2, .1);
-	y = lerp(y, pos.y*global.tilesize.y+global.tilesize.y/2, .1);
+	y = lerp(y, pos.y*global.tilesize.y+global.tilesize.y, .1);
 	//log(x, y);
 }

eastern flames/scripts/st_textadv/st_textadv.gml

@@ -13,7 +13,7 @@ function st_textadv() {
 	}
 	if halting { exit}
 	draw_sprite(sprite_index, 0, x, y);
-	draw_set_font(font);
+	if global.lang = LANGUAGE.ENGLISH draw_set_font(font) else draw_set_font(ft_chiaro);
 	clr = c_white;
 	var xpos = 0;
 	var lb = 0;
@@ -25,14 +25,14 @@ function st_textadv() {
 	shake = 0;
 	sizepos = 0;
 	pressing = 0;
-	fontsize = font_get_size(draw_get_font())*.8;
+	fontsize = font_get_size(draw_get_font())*.8 + (global.lang == LANGUAGE.JAPANESE)*5;
 	atsound = 0;
 	atfunc = 0;
 	j = 0;
 	if msg[talkpos].type == "normal" {
 		draw_set_color(talker[0].namecolor);
 		draw_set_halign(fa_center);
-		draw_text(x+width/20-width/2+17, y-18, talker[0].name);
+		draw_text(x+width/20-width/2+17, y-18-(global.lang == LANGUAGE.JAPANESE)*16, talker[0].name);
 		draw_set_halign(fa_left);
 		draw_set_color(c_white);
 	}

eastern flames/scripts/tiledata/tiledata.gml

@@ -1,5 +1,7 @@
 global.gotaya = false;
 global.gottkn = false;
+global.didmmj = false;
+global.didotr = false;
 var forest123456 = function() {return new tiledata(u, u, [], [new statmod(st.def, 2, add)])}
 var block1234567 = function() {return new tiledata(false, u, [])}
 var recruit__aya = function() {return new tiledata(u, u, u, u, function(unitobject) {
@@ -37,10 +39,31 @@ var recruit__tkn = function() {return new tiledata(u, u, u, [new statmod(st.def,
 		
 	}
 })}
+var talk__reisen = 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.didmmj {
+					textbox_create(txt_momijiyreisen);
+					global.didmmj = true;
+					
+				}
+				break;
+			default:
+				if !global.didotr {
+					textbox_create(txt_reisen);
+					global.didotr = true;
+					
+				}
+				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(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), talk__reisen(), 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(), new tiledata(), recruit__aya(), new tiledata(), new tiledata(), forest123456(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), talk__reisen(), new tiledata(), talk__reisen()],
-[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(), recruit__aya(), new tiledata(), recruit__aya(), forest123456(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), block1234567(), block1234567(), block1234567(), new tiledata(), new tiledata(), new tiledata(), talk__reisen(), 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(), 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()],

eastern flames/scripts/txt_intro/txt_intro.gml

@@ -20,7 +20,7 @@ function txt_intro() {
 	
 	],[
 	
-	txt("つみ！", MOMIJI.SMUG, SPRITEPOS.LEFT),
+	txt("つみ！", MOMIJI.SMUG, SPRITEPOS.LEFT, s_black),
     txt("くっそー！ どうしても勝てれない！", NITORI.SHOCKED, SPRITEPOS.RIGHT),
     txt("うふふ！ 将棋では、たくさん計画を考えなきゃ。", MOMIJI.HAPPY),
     txt("一つの行動が、次の行動につながり、さらに次の行動へ...", MOMIJI.HAPPY),

eastern flames/scripts/txt_win/txt_win.gml

@@ -4,7 +4,7 @@ function txt_win() {
 	msg = msglang([
 	
 	txt("Ow...", REISEN.WOBBLE, SPRITEPOS.RIGHT, s_black),
-	txt("Hm, You don't seem like a bad person", MOMIJI.CONFUSED, SPRITEPOS.LEFT),
+	txt("Hm, You don't seem like a bad person.", MOMIJI.CONFUSED, SPRITEPOS.LEFT),
 	txt("Why are the rabbits attacking?", MOMIJI.CONFUSED),
 	txt("We... We're looking to build a summer home on Earth.", REISEN.WOBBLE),
 	txt("You're lying.",  MOMIJI.ANNOYED),
@@ -13,7 +13,7 @@ function txt_win() {
 	txt("There's a great evil that's taken over the Moon.", REISEN.WOBBLE),
 	txt("So, we're going to be staying here.", REISEN.WOBBLE),
 	txt("An invasion from the Lunar Capital...", AYA.SURPRISED, SPRITEPOS.LEFT),
-	txt("I'm guessing Reimu and her friends will find their way to the Moon…", AYA.HAPPY),
+	txt("I'm guessing Reimu and her friends will find their way to the Moon...", AYA.HAPPY),
 	txt("...Which leaves us to defend the surface.", AYA.HAPPY),
 	txt("Think you're up to it, miss Shogi master?", NITORI.HAPPY, SPRITEPOS.LEFT),
 	txt("...I won't let anyone take over my home.", MOMIJI.ANGRY),
@@ -22,9 +22,9 @@ function txt_win() {
 	
 	],[
 	
-	txt("いった...", REISEN.WOBBLE, SPRITEPOS.RIGHT),
+	txt("いった...", REISEN.WOBBLE, SPRITEPOS.RIGHT, s_black),
     txt("えっと、 君は悪に見えない。", MOMIJI.CONFUSED, SPRITEPOS.LEFT),
-    txt("なぜうさぎは攻撃しているのか？", MOMIJI,CONFUSED),
+    txt("なぜうさぎは攻撃しているのか？", MOMIJI.CONFUSED),
     txt("私たちは…海外旅行に行きたかったです...か？", REISEN.WOBBLE),
     txt("...それは弱い噓だぞ。", MOMIJI.ANNOYED),
     txt("...チェ。", REISEN.POUTING),
@@ -41,5 +41,5 @@ function txt_win() {
 	
 	])
 	
-	endevent = function() {game_restart()};
+	endevent = function() {show_message(msglang("congrats! you win. bye", "おめでとう！プレイヤーの勝利！バイバイ"));game_end()};
 }

eastern flames/scripts/weapon/weapon.gml

@@ -41,8 +41,9 @@ nu weapon("Microlaser", "special science laser instead of magic!", WPTYPE.SWORD,
 nu weapon("Wrench", "a wrench of a common material", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 60, add)]);
 nu weapon("Healgun", "heal-ish gun", WPTYPE.SWORD, [new statmod(st.str, 0, add), new statmod(st.str, -1, mult), new statmod(st.hit, 100, add)]);
 
-nu weapon("Bayonet", "it's out of ammo...", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 90, add)]);
+nu weapon("Bayonet", "it's out of ammo...", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 70, add)]);
-nu weapon("Rifle", "it has ammo, i guess", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 80, add), new statmod(st.rng, 1, add)]);
+//nu weapon("Rifle", "it has ammo, i guess", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 80, add), new statmod(st.rng, 1, add)]);
+nu weapon("Rifle", "it has ammo, i guess", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]);
 nu weapon("Lunar Machete", "sick", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 90, add)]);
 nu weapon("Glock", "gang shit", WPTYPE.SWORD, [new statmod(st.str, 4, add), new statmod(st.hit, 95, add)]);
 nu weapon("Sniper Rifle", "gang shit", WPTYPE.SWORD, [new statmod(st.str, 11, add), new statmod(st.hit, 100, add)]);

eastern flames/scripts/x_bunnies/x_bunnies.gml

@@ -118,7 +118,7 @@ mydata = {
 	up: s_bunnyup,
 	down: s_bunnydown,
 	face: s_bunnyface,
-	aitype: AI.WAITER,
+	aitype: AI.AFK,
 }
 nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
 mydata = {
@@ -129,7 +129,7 @@ mydata = {
 	up: s_bunnyup,
 	down: s_bunnydown,
 	face: s_bunnyface2,
-	aitype: AI.WAITER,
+	aitype: AI.AFK,
 }
 nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
 mydata = {
@@ -140,7 +140,7 @@ mydata = {
 	up: s_bunnyup,
 	down: s_bunnydown,
 	face: s_bunnyface,
-	aitype: AI.WAITER,
+	aitype: AI.AFK,
 }
 nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);
 mydata = {
@@ -175,6 +175,6 @@ mydata = {
 	up: s_reisenup,
 	down: s_reisendown,
 	face: s_reisentalk,
-	aitype: AI.WAITER,
+	aitype: AI.AFK,
 }
-nu unit(mydata, mydata, [st.hp.add(40), st.str.add(14), st.def.add(10), st.spd.add(13), st.mov.add(2), st.hit.add(0), st.rng.add(1)]);
+nu unit(mydata, mydata, [st.hp.add(40), st.str.add(13), st.def.add(9), st.spd.add(13), st.mov.add(0), st.hit.add(0), st.rng.add(1)]);

eastern flames/scripts/x_units/x_units.gml

@@ -18,7 +18,8 @@ mydata = {
 	face: s_momijitalk,
 	aitype: AI.KILLER,
 }
-nu unit(mydata, mydata, [st.hp.add(30), st.str.add(12), st.def.add(8), st.spd.add(10), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
+nu unit(mydata, mydata, [st.hp.add(30), st.str.add(99), st.def.add(8), st.spd.add(10), st.mov.add(99), st.hit.add(0), st.rng.add(1)]);
+//nu unit(mydata, mydata, [st.hp.add(30), st.str.add(13), st.def.add(8), st.spd.add(10), st.mov.add(4), st.hit.add(0), st.rng.add(1)]);
 mydata = {
 	name: "Nitori",
 	desc: "",

eastern flames/sprites/s_nitori/s_nitori.yy

@@ -24,12 +24,12 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"1e766ea6-5ac3-41ac-9a10-400e7c774d69","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"1e766ea6-5ac3-41ac-9a10-400e7c774d69","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"9f99f1e1-edf2-4935-993a-642ac5c8428d","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"712b567c-8e0f-455e-ba74-776434d10a2f","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"1e766ea6-5ac3-41ac-9a10-400e7c774d69","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"0e53079e-442d-4960-9d6f-9df2c870718e","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"c0d82e37-179f-4aef-8c20-53561901a506","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"0e53079e-442d-4960-9d6f-9df2c870718e","path":"sprites/s_nitori/s_nitori.yy",},"LayerId":{"name":"9f99f1e1-edf2-4935-993a-642ac5c8428d","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","name":"0e53079e-442d-4960-9d6f-9df2c870718e","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"s_nitori","path":"sprites/s_nitori/s_nitori.yy",},
@@ -44,8 +44,8 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"6aa94ef3-e8a4-4aee-9890-9a003f8f6a49","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"712b567c-8e0f-455e-ba74-776434d10a2f","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"92a41659-d9a8-44dd-a2a8-3e8812419442","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1e766ea6-5ac3-41ac-9a10-400e7c774d69","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"966860dd-e405-45a1-8dbf-9f65f933293a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"17124072-95bc-4c6d-83d9-e08f8fd9d9d8","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"66e541c4-e5e8-44bd-898d-76bb9bef40cd","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"0e53079e-442d-4960-9d6f-9df2c870718e","path":"sprites/s_nitori/s_nitori.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -69,7 +69,7 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"c0d82e37-179f-4aef-8c20-53561901a506","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"9f99f1e1-edf2-4935-993a-642ac5c8428d","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {

eastern flames/sprites/s_nitoridown/s_nitoridown.yy

@@ -24,18 +24,18 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"d685244f-31c5-40d0-9774-3642ee7538b4","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"1932f248-66f7-44f3-b7a2-5bcb787389e3","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"d685244f-31c5-40d0-9774-3642ee7538b4","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"d22c4b26-6238-40c9-b306-fe49ba838e8a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"1932f248-66f7-44f3-b7a2-5bcb787389e3","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"be6c8148-2ce9-4254-b2e4-4bc46d86fa33","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"d685244f-31c5-40d0-9774-3642ee7538b4","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"1932f248-66f7-44f3-b7a2-5bcb787389e3","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"1dcbc38f-60ba-4fdd-a1b6-7b02a795a0cd","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"dd99f0cd-fac9-4d4d-a29c-45be13a05dba","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"1dcbc38f-60ba-4fdd-a1b6-7b02a795a0cd","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"d22c4b26-6238-40c9-b306-fe49ba838e8a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"dd99f0cd-fac9-4d4d-a29c-45be13a05dba","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"be6c8148-2ce9-4254-b2e4-4bc46d86fa33","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"1dcbc38f-60ba-4fdd-a1b6-7b02a795a0cd","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"dd99f0cd-fac9-4d4d-a29c-45be13a05dba","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"734e3cd3-f7fc-4cd5-bfbb-1fd30e18292a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"6ae30cff-578e-4fcf-8ccc-595181227e75","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"734e3cd3-f7fc-4cd5-bfbb-1fd30e18292a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"d22c4b26-6238-40c9-b306-fe49ba838e8a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"6ae30cff-578e-4fcf-8ccc-595181227e75","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"be6c8148-2ce9-4254-b2e4-4bc46d86fa33","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"734e3cd3-f7fc-4cd5-bfbb-1fd30e18292a","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"6ae30cff-578e-4fcf-8ccc-595181227e75","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"4afa35cc-e3e1-483a-990f-a3ab6d2a9b93","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"bde8c589-775b-4b9f-8e50-b457ad1221ee","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"4afa35cc-e3e1-483a-990f-a3ab6d2a9b93","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"d22c4b26-6238-40c9-b306-fe49ba838e8a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"bde8c589-775b-4b9f-8e50-b457ad1221ee","path":"sprites/s_nitoridown/s_nitoridown.yy",},"LayerId":{"name":"be6c8148-2ce9-4254-b2e4-4bc46d86fa33","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"4afa35cc-e3e1-483a-990f-a3ab6d2a9b93","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","name":"bde8c589-775b-4b9f-8e50-b457ad1221ee","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"s_nitoridown","path":"sprites/s_nitoridown/s_nitoridown.yy",},
@@ -50,10 +50,10 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"8eb2b62e-570e-415f-998a-5372c87efbf2","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d685244f-31c5-40d0-9774-3642ee7538b4","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"4f6f1199-4a18-4906-b853-5b74f15cb956","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1932f248-66f7-44f3-b7a2-5bcb787389e3","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"56ae1cb2-ab01-4729-ad3b-60523a547aec","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1dcbc38f-60ba-4fdd-a1b6-7b02a795a0cd","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"03cd4b23-73a6-4b80-ba14-cfe40d5ee6ad","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"dd99f0cd-fac9-4d4d-a29c-45be13a05dba","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"741d1737-2871-4736-8b0c-aea0f09407bc","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"734e3cd3-f7fc-4cd5-bfbb-1fd30e18292a","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"e50742a0-7d07-495c-b1a4-c7b08a9c193f","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6ae30cff-578e-4fcf-8ccc-595181227e75","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"07cb7826-434a-4b44-905d-57dcd0b533cd","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4afa35cc-e3e1-483a-990f-a3ab6d2a9b93","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"b0a023c7-f00a-4e12-bde2-45321e16a95f","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"bde8c589-775b-4b9f-8e50-b457ad1221ee","path":"sprites/s_nitoridown/s_nitoridown.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -77,7 +77,7 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"d22c4b26-6238-40c9-b306-fe49ba838e8a","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"be6c8148-2ce9-4254-b2e4-4bc46d86fa33","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {

eastern flames/sprites/s_nitoriup/s_nitoriup.yy

@@ -24,18 +24,18 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"22ff1ae1-99fe-4cbe-ba16-47833f4821f6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"1123ea47-5d54-414b-b5e2-28a4a65af42e","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"22ff1ae1-99fe-4cbe-ba16-47833f4821f6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"48b7849d-13be-416a-b5bf-fb6e1c4b4421","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"1123ea47-5d54-414b-b5e2-28a4a65af42e","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"f394efc7-681c-4d30-8cd6-3578694c60f0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"22ff1ae1-99fe-4cbe-ba16-47833f4821f6","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"1123ea47-5d54-414b-b5e2-28a4a65af42e","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"47b00a16-dd6e-4f0c-985e-e9b3ec91adc0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"456a3736-cbcd-4c06-a0da-2b347cdd32e6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"47b00a16-dd6e-4f0c-985e-e9b3ec91adc0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"48b7849d-13be-416a-b5bf-fb6e1c4b4421","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"456a3736-cbcd-4c06-a0da-2b347cdd32e6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"f394efc7-681c-4d30-8cd6-3578694c60f0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"47b00a16-dd6e-4f0c-985e-e9b3ec91adc0","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"456a3736-cbcd-4c06-a0da-2b347cdd32e6","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"96579a74-4a88-4107-b3de-5af0e2cbf62c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"8c99461e-ad85-4eb0-b2ac-7c7579106162","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"96579a74-4a88-4107-b3de-5af0e2cbf62c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"48b7849d-13be-416a-b5bf-fb6e1c4b4421","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"8c99461e-ad85-4eb0-b2ac-7c7579106162","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"f394efc7-681c-4d30-8cd6-3578694c60f0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"96579a74-4a88-4107-b3de-5af0e2cbf62c","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"8c99461e-ad85-4eb0-b2ac-7c7579106162","tags":[],"resourceType":"GMSpriteFrame",},
-    {"compositeImage":{"FrameId":{"name":"d05be275-9fab-4760-ad70-8737bda4127c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+    {"compositeImage":{"FrameId":{"name":"c1b86a06-6f3e-406b-bbf4-8dd1e74fbe91","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"d05be275-9fab-4760-ad70-8737bda4127c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"48b7849d-13be-416a-b5bf-fb6e1c4b4421","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"c1b86a06-6f3e-406b-bbf4-8dd1e74fbe91","path":"sprites/s_nitoriup/s_nitoriup.yy",},"LayerId":{"name":"f394efc7-681c-4d30-8cd6-3578694c60f0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"d05be275-9fab-4760-ad70-8737bda4127c","tags":[],"resourceType":"GMSpriteFrame",},
+      ],"parent":{"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","name":"c1b86a06-6f3e-406b-bbf4-8dd1e74fbe91","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"s_nitoriup","path":"sprites/s_nitoriup/s_nitoriup.yy",},
@@ -50,10 +50,10 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"6ad876c6-616d-4f04-b634-bb845536428c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"22ff1ae1-99fe-4cbe-ba16-47833f4821f6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"8a02089c-8cd9-4276-bd2a-f16d4e889944","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1123ea47-5d54-414b-b5e2-28a4a65af42e","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"f48e496f-bb24-4547-856e-603488963a2a","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"47b00a16-dd6e-4f0c-985e-e9b3ec91adc0","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"6b7061f8-f8be-4925-9030-ad6e4c9044ac","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"456a3736-cbcd-4c06-a0da-2b347cdd32e6","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"32a81531-f2dd-4972-9932-7b39e95e9d85","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"96579a74-4a88-4107-b3de-5af0e2cbf62c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"60b0b636-7ee6-4d9b-87a9-b5c428a0c98e","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8c99461e-ad85-4eb0-b2ac-7c7579106162","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
-            {"id":"37dbb34e-240a-483c-a1f1-b9fb25b31c14","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d05be275-9fab-4760-ad70-8737bda4127c","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"011df3e2-ec47-4eb8-9091-e7654bf6f8c1","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c1b86a06-6f3e-406b-bbf4-8dd1e74fbe91","path":"sprites/s_nitoriup/s_nitoriup.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -77,7 +77,7 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"48b7849d-13be-416a-b5bf-fb6e1c4b4421","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f394efc7-681c-4d30-8cd6-3578694c60f0","tags":[],"resourceType":"GMImageLayer",},
   ],
   "nineSlice": null,
   "parent": {