From bf395b7d01c0678cf1aa1f16508e1f1dfc23aa70 Mon Sep 17 00:00:00 2001
From: the me <alexanderzemans@gmail.com>
Date: Thu, 18 Aug 2022 17:14:02 -0700
Subject: [PATCH] https://www.youtube.com/watch?v=KTNTPpb2fbo

---
 eastern flames/eastern flames.yyp             |  1 +
 .../objects/ARTICULATOR/Draw_64.gml           |  2 +-
 .../objects/ARTICULATOR/Draw_72.gml           |  2 +
 eastern flames/objects/o_unit/Step_0.gml      |  3 ++
 .../scripts/c_deleteunit/c_deleteunit.gml     |  5 ++
 .../scripts/c_deleteunit/c_deleteunit.yy      | 12 +++++
 .../scripts/c_loadstageone/c_loadstageone.gml | 46 +++++++++++++++++--
 eastern flames/scripts/x_units/x_units.gml    | 38 +++++++++++++--
 8 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 eastern flames/scripts/c_deleteunit/c_deleteunit.gml
 create mode 100644 eastern flames/scripts/c_deleteunit/c_deleteunit.yy

diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp
index 07a5ef2..01422a1 100644
--- a/eastern flames/eastern flames.yyp	
+++ b/eastern flames/eastern flames.yyp	
@@ -90,6 +90,7 @@
     {"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":"c_deleteunit","path":"scripts/c_deleteunit/c_deleteunit.yy",},"order":22,},
     {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,},
   ],
   "Options": [
diff --git a/eastern flames/objects/ARTICULATOR/Draw_64.gml b/eastern flames/objects/ARTICULATOR/Draw_64.gml
index c6498b9..614c54e 100644
--- a/eastern flames/objects/ARTICULATOR/Draw_64.gml	
+++ b/eastern flames/objects/ARTICULATOR/Draw_64.gml	
@@ -1,6 +1,6 @@
 if hoveredunit != noone {
 	draw_set_color(c_black);
-	draw_rectangle(global.gw, global.gh, global.gw-100, global.gh-(array_length(hoveredunit.inventory)-1)*32-16, false);
+	draw_rectangle(global.gw, global.gh, global.gw-140, global.gh-(array_length(hoveredunit.inventory)-1)*32-16, false);
 	draw_set_color(c_white);
 	var i;
 	draw_set_halign(fa_right);
diff --git a/eastern flames/objects/ARTICULATOR/Draw_72.gml b/eastern flames/objects/ARTICULATOR/Draw_72.gml
index 2674f11..3c34e88 100644
--- a/eastern flames/objects/ARTICULATOR/Draw_72.gml	
+++ b/eastern flames/objects/ARTICULATOR/Draw_72.gml	
@@ -3,6 +3,8 @@ var cam = camera_get_active();
 global.projMat = camera_get_proj_mat(cam);
 global.viewMat = camera_get_view_mat(cam);
 setCam();
+draw_set_color(c_black);
+draw_rectangle(-9999, -9999, 9999, 9999, false);
 var i, j, k;
 for (i=0; i<array_length(global.map); i++) {
 	for (j=0; j<array_length(global.map[i]); j++) {
diff --git a/eastern flames/objects/o_unit/Step_0.gml b/eastern flames/objects/o_unit/Step_0.gml
index 89c3b3a..750097b 100644
--- a/eastern flames/objects/o_unit/Step_0.gml	
+++ b/eastern flames/objects/o_unit/Step_0.gml	
@@ -1 +1,4 @@
 state();
+if data.hp.val <= 0 {
+	c_deleteunit(pos.x, pos.y, id);
+}
\ No newline at end of file
diff --git a/eastern flames/scripts/c_deleteunit/c_deleteunit.gml b/eastern flames/scripts/c_deleteunit/c_deleteunit.gml
new file mode 100644
index 0000000..acfd950
--- /dev/null
+++ b/eastern flames/scripts/c_deleteunit/c_deleteunit.gml	
@@ -0,0 +1,5 @@
+function c_deleteunit(x, y, target) {
+	array_remove(global.map[x][y].contents, target);
+	array_remove(global.units[target.alignment], target);
+	instance_destroy(target);
+}
\ No newline at end of file
diff --git a/eastern flames/scripts/c_deleteunit/c_deleteunit.yy b/eastern flames/scripts/c_deleteunit/c_deleteunit.yy
new file mode 100644
index 0000000..4badf3e
--- /dev/null
+++ b/eastern flames/scripts/c_deleteunit/c_deleteunit.yy	
@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "c_deleteunit",
+  "tags": [],
+  "resourceType": "GMScript",
+}
\ 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 f559362..181f915 100644
--- a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml	
+++ b/eastern flames/scripts/c_loadstageone/c_loadstageone.gml	
@@ -1,7 +1,47 @@
 function c_loadstageone() {
-	var chara = c_inheritunit(8, 5, un.chara, ARMY.US);
+	/*var chara = c_inheritunit(8, 5, un.chara, ARMY.US);
 	c_addweapon(chara, wp.knife, true);
-	c_addweapon(chara, wp[$"iron sword"]);
+	c_addweapon(chara, wp[$"iron sword"], true);
 	var kris = c_inheritunit(10, 5, un.kris, ARMY.THEM);
-	c_addweapon(kris, wp[$"iron sword"], true);
+	c_addweapon(kris, wp[$"iron sword"], true, true);*/
+	var momiji = c_inheritunit(5, 9, un.momiji, ARMY.US);
+	c_addweapon(momiji, wp[$"iron sword"], true);
+	var nitori = c_inheritunit(4, 10, un.nitori, ARMY.US);
+	c_addweapon(nitori, wp[$"iron sword"], true);
+	
+	
+	bunny = c_inheritunit(19, 3, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(17, 2, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	
+	var bunny = c_inheritunit(8, 2, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(10, 3, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(12, 4, un.bunny, ARMY.THEM);
+	
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(9, 10, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(10, 8, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(12, 10, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(13, 7, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	
+	bunny = c_inheritunit(16, 12, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	
+	bunny = c_inheritunit(16, 5, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(17, 6, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	bunny = c_inheritunit(18, 7, un.bunny, ARMY.THEM);
+	c_addweapon(bunny, wp[$"iron sword"], true);
+	
+	
+	var reisen = c_inheritunit(19, 1, un[$"rei'sen"], true, ARMY.THEM);
+	c_addweapon(reisen, wp[$"iron sword"], true);
 }
\ No newline at end of file
diff --git a/eastern flames/scripts/x_units/x_units.gml b/eastern flames/scripts/x_units/x_units.gml
index 86e9236..84e03d0 100644
--- a/eastern flames/scripts/x_units/x_units.gml	
+++ b/eastern flames/scripts/x_units/x_units.gml	
@@ -21,10 +21,38 @@ mydata = {
 nu unit(mydata, mydata, [st.hp.add(110), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0)]);
 
 mydata = {
-	name: "",
+	name: "momiji",
 	desc: "",
 	skills: [],
-	idle: s_null,
-	up: s_null,
-	down: s_null,
-}
\ No newline at end of file
+	idle: s_momiji,
+	up: s_momijiup,
+	down: s_momijidown,
+}
+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)]);
+mydata = {
+	name: "nitori",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+}
+nu unit(mydata, mydata, [st.hp.add(34), st.str.add(10), st.def.add(6), st.spd.add(6), st.mov.add(4), st.hit.add(0)]);
+mydata = {
+	name: "bunny",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+}
+nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0)]);
+mydata = {
+	name: "rei'sen",
+	desc: "",
+	skills: [],
+	idle: s_bunny,
+	up: s_bunnyup,
+	down: s_bunnydown,
+}
+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)]);
\ No newline at end of file