From 0ead044da1a3e988e28f56267aeaccb282c63599 Mon Sep 17 00:00:00 2001
From: the me <alexanderzemans@gmail.com>
Date: Mon, 15 Aug 2022 10:51:51 -0700
Subject: [PATCH] a bit of a mess? surely not

---
 eastern flames/eastern flames.yyp             |   2 +
 .../objects/ARTICULATOR/Create_0.gml          |   7 +-
 eastern flames/objects/o_unit/Draw_0.gml      |   6 ++
 .../scripts/c_gettile/c_gettile.gml           |   2 +-
 .../scripts/st_moving/st_moving.gml           |  29 ++++++-
 eastern flames/scripts/stat/stat.gml          |   4 +-
 eastern flames/scripts/tiledata/tiledata.gml  |  22 +++--
 eastern flames/scripts/unit/unit.gml          |  19 ++++-
 .../scripts/x_skillstuff/x_skillstuff.gml     |  44 ++++++++++
 .../scripts/x_skillstuff/x_skillstuff.yy      |  12 +++
 .../c7b4d2b5-05bb-4c0f-8881-9b403315f06e.png  | Bin 0 -> 264 bytes
 .../57be2f77-fa54-4438-8ed7-0073af24bc49.png  | Bin 0 -> 264 bytes
 eastern flames/sprites/s_guy2/s_guy.yy        |  79 ++++++++++++++++++
 eastern flames/sprites/s_guy2/s_guy2.yy       |  79 ++++++++++++++++++
 14 files changed, 289 insertions(+), 16 deletions(-)
 create mode 100644 eastern flames/scripts/x_skillstuff/x_skillstuff.gml
 create mode 100644 eastern flames/scripts/x_skillstuff/x_skillstuff.yy
 create mode 100644 eastern flames/sprites/s_guy2/c7b4d2b5-05bb-4c0f-8881-9b403315f06e.png
 create mode 100644 eastern flames/sprites/s_guy2/layers/c7b4d2b5-05bb-4c0f-8881-9b403315f06e/57be2f77-fa54-4438-8ed7-0073af24bc49.png
 create mode 100644 eastern flames/sprites/s_guy2/s_guy.yy
 create mode 100644 eastern flames/sprites/s_guy2/s_guy2.yy

diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp
index bd0fabf..bb4312f 100644
--- a/eastern flames/eastern flames.yyp	
+++ b/eastern flames/eastern flames.yyp	
@@ -9,6 +9,7 @@
     {"id":{"name":"stat","path":"scripts/stat/stat.yy",},"order":3,},
     {"id":{"name":"vlambeer","path":"scripts/vlambeer/vlambeer.yy",},"order":1,},
     {"id":{"name":"x_unitsetup","path":"scripts/x_unitsetup/x_unitsetup.yy",},"order":0,},
+    {"id":{"name":"x_skillstuff","path":"scripts/x_skillstuff/x_skillstuff.yy",},"order":12,},
     {"id":{"name":"c_decolor","path":"scripts/c_decolor/c_decolor.yy",},"order":10,},
     {"id":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"order":0,},
     {"id":{"name":"easing","path":"scripts/easing/easing.yy",},"order":4,},
@@ -48,6 +49,7 @@
     {"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,},
     {"id":{"name":"collision_line_width","path":"scripts/collision_line_width/collision_line_width.yy",},"order":9,},
     {"id":{"name":"draw_rectangle_width","path":"scripts/draw_rectangle_width/draw_rectangle_width.yy",},"order":7,},
+    {"id":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"order":1,},
     {"id":{"name":"dir2hv","path":"scripts/dir2hv/dir2hv.yy",},"order":2,},
     {"id":{"name":"tag","path":"scripts/tag/tag.yy",},"order":6,},
     {"id":{"name":"instance_create","path":"scripts/instance_create/instance_create.yy",},"order":6,},
diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml
index 4e7cc18..d11f35b 100644
--- a/eastern flames/objects/ARTICULATOR/Create_0.gml	
+++ b/eastern flames/objects/ARTICULATOR/Create_0.gml	
@@ -1,2 +1,5 @@
-log(un);
-c_inheritunit(2, 2, un.chara);
\ No newline at end of file
+c_addunit(un.chara, ARMY.US);
+var i;
+for (i=0; i<array_length(global.units[ARMY.US]); i++) {
+	c_inheritunit(2+i, 2, un.chara);
+}
diff --git a/eastern flames/objects/o_unit/Draw_0.gml b/eastern flames/objects/o_unit/Draw_0.gml
index 3e9c7c5..d3d2128 100644
--- a/eastern flames/objects/o_unit/Draw_0.gml	
+++ b/eastern flames/objects/o_unit/Draw_0.gml	
@@ -1,4 +1,10 @@
 draw_self();
 drawstate();
+log(data);
+draw_set_color(c_red);
+draw_rectangle(x-ts.x/2, y-ts.y/2-1,
+	x-ts.x/2+(ts.x*(data.hp.val/data.hp.val)),
+	y-ts.y/2+1, false
+);
 //draw_set_color(c_red);
 //draw_circle(x, y, 5, false);
\ No newline at end of file
diff --git a/eastern flames/scripts/c_gettile/c_gettile.gml b/eastern flames/scripts/c_gettile/c_gettile.gml
index 1b3bab6..c5d7fb0 100644
--- a/eastern flames/scripts/c_gettile/c_gettile.gml	
+++ b/eastern flames/scripts/c_gettile/c_gettile.gml	
@@ -1,4 +1,4 @@
-function c_gettile(x, y) {
+function c_gettile(x, y, absolute=false) {
 	var thex = round((x-16)/ts.x);
 	var they = round((y-16)/ts.y);
 	if c_tileexists(thex, they) return mp[thex][they];
diff --git a/eastern flames/scripts/st_moving/st_moving.gml b/eastern flames/scripts/st_moving/st_moving.gml
index 8e0957f..7c24c17 100644
--- a/eastern flames/scripts/st_moving/st_moving.gml	
+++ b/eastern flames/scripts/st_moving/st_moving.gml	
@@ -41,7 +41,7 @@ function st_moving() {
 	prevremainingmov = remainingmov;
 	c_decolor_all(c_red);
 	c_decolor_all(c_green);
-	var guy = c_gettile(x, y);
+	var guy = c_gettile(x, y, true);
 	if guy != noone {
 		c_colortile(guy.x, guy.y, c_green);
 		switch dir {
@@ -59,7 +59,32 @@ function st_moving() {
 				break;
 		}
 	}
-	
+	if select {
+		var rng = [1];
+		var guy = c_gettile(x, y, true);
+		var hitting = noone;
+		switch dir {
+			case DIR.LEFT:
+				hitting = c_gettile(guy.x-1, guy.y);
+				break;
+			case DIR.DOWN:
+				hitting = c_gettile(guy.x, guy.y+1);
+				break;
+			case DIR.UP:
+				hitting = c_gettile(guy.x, guy.y-1);
+				break;
+			case DIR.RIGHT:
+				hitting = c_gettile(guy.x+1, guy.y);
+				break;
+		}
+		if hitting != noone {
+			
+		}
+	}
+	if back {
+		state = st_standing;
+		drawstate = c_null;
+	}
 	/*if x < (pos.x-mov)*ts.x {
 		x = (pos.x-mov)*ts.x;
 	} else if x > (pos.x+mov+1)*ts.x {
diff --git a/eastern flames/scripts/stat/stat.gml b/eastern flames/scripts/stat/stat.gml
index 4133b0b..33e8640 100644
--- a/eastern flames/scripts/stat/stat.gml	
+++ b/eastern flames/scripts/stat/stat.gml	
@@ -12,8 +12,8 @@ function stat(name_, fullname_, desc_, replacements_=[]) constructor {
 }
 #macro st global.stats
 
-function unitstat(val, name_, fullname_, desc_, replacements_) : stat(name_, fullname_, desc_, replacements_) constructor {
-	value = val;
+function unitstat(val_, name_, fullname_, desc_, replacements_) : stat(name_, fullname_, desc_, replacements_) constructor {
+	val = val_;
 	modifier = 0;
 }
 
diff --git a/eastern flames/scripts/tiledata/tiledata.gml b/eastern flames/scripts/tiledata/tiledata.gml
index 69a6e2e..d8ecfd4 100644
--- a/eastern flames/scripts/tiledata/tiledata.gml	
+++ b/eastern flames/scripts/tiledata/tiledata.gml	
@@ -1,10 +1,20 @@
 global.map = [
-[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(), 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()],
+[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(), 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(), 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()],
+[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(), 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(), new tiledata(), new tiledata(), new tiledata(), new tiledata(), new tiledata()],
+]; //i simply dont care
 function c_informtiles() {
 	for (i=0; i<array_length(global.map); i++) {
 		for (j=0; j<array_length(global.map[i]); j++) {
diff --git a/eastern flames/scripts/unit/unit.gml b/eastern flames/scripts/unit/unit.gml
index eaa25bf..4a4d5a5 100644
--- a/eastern flames/scripts/unit/unit.gml	
+++ b/eastern flames/scripts/unit/unit.gml	
@@ -1,5 +1,5 @@
 //global.units = 5;
-global.units = [[]];
+global.units = [[],[]];
 
 enum ARMY {
 	US,
@@ -17,11 +17,23 @@ var mydata = {
 function unit(personaldata_, classdata_, stats_) constructor {
 	name = personaldata_.name;
 	sprite = personaldata_.sprite;
-	
+	alignment = noone;
+	var i;
+	for (i=0; i<array_length(stats_); i++) {
+		self[$stats_[i].name] = stats_[i];
+	}
 	global.unitdata[$name] = self;
 }
 
-nu unit(mydata, [st.hp.add(92), st.str.add(20), st.def.add(20)]);
+nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20)]);
+
+mydata = {
+	name: "kris",
+	desc: "totally kris",
+	skills: ["SKILLS.LUNA"],
+	sprite: s_guy2,
+}
+nu unit(mydata, mydata, [st.hp.add(92), st.str.add(20), st.def.add(20)]);
 
 function archetypedata() constructor {
 	//PERSONALDATA AND CLASSDATA ARE THE SAME THINGS
@@ -31,6 +43,7 @@ function c_addunit(unit, alignment) {
 	//log(5);
 	//log(global.units);
 	array_push(global.units[alignment], unit);
+	unit.alignment = alignment;
 	log(global.units[alignment]);
 }
 
diff --git a/eastern flames/scripts/x_skillstuff/x_skillstuff.gml b/eastern flames/scripts/x_skillstuff/x_skillstuff.gml
new file mode 100644
index 0000000..4feb81e
--- /dev/null
+++ b/eastern flames/scripts/x_skillstuff/x_skillstuff.gml	
@@ -0,0 +1,44 @@
+enum SKILLS {
+	NULL,
+	FIGHT, //1
+	LUNA,
+	#region size
+	_DEBUG,
+	_CONSOLE,
+	SIZE,
+	#endregion
+}
+
+
+global.x_skillmanager = {
+	ReferenceskillList: array_create(SKILLS.SIZE),
+	Bindskill: function(skill, index) {
+		ReferenceskillList[index] = skill;
+	},
+}
+
+function c_getskillbyid(index) {
+	var skill = global.x_skillmanager.ReferenceskillList[index];
+	if(skill == 0){
+		log("skill index " + string(index) + " isnt bound! make sure to bind that shit!"); 
+		return global.x_skillmanager.ReferenceskillList[SKILLS.NULL]
+	}
+	return skill;
+}
+function c_getidbyskill(skill){
+	return skill.idnum;
+}
+
+global.defdata = {
+	myhooks: {}, //make ondie
+	name: "DEFAULT skill DATA",
+	description: "LOL",
+	tooltip: "IM FUNNY",
+	sprite: s_guy2,
+	usage: SKTYPE.NORMAL,
+}
+
+enum SKTYPE {
+	NORMAL,
+	HIDDEN,
+}
\ No newline at end of file
diff --git a/eastern flames/scripts/x_skillstuff/x_skillstuff.yy b/eastern flames/scripts/x_skillstuff/x_skillstuff.yy
new file mode 100644
index 0000000..bb958b4
--- /dev/null
+++ b/eastern flames/scripts/x_skillstuff/x_skillstuff.yy	
@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "x_skillstuff",
+  "tags": [],
+  "resourceType": "GMScript",
+}
\ No newline at end of file
diff --git a/eastern flames/sprites/s_guy2/c7b4d2b5-05bb-4c0f-8881-9b403315f06e.png b/eastern flames/sprites/s_guy2/c7b4d2b5-05bb-4c0f-8881-9b403315f06e.png
new file mode 100644
index 0000000000000000000000000000000000000000..b18c74270b26e395f08e2decc91c98be7813958f
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002bNkl<Zc%1E*
zZ3}=P41^Q<|9{!~kZ@SrZgWaO2a%-S9?jQ%lU2{BDEX}F^?vl)m5L=1LX-wD3Zb@~
z1waVX49YQOX#g~ndV>WF10YBhzK7%mz+fo@Gy;&SAK(Z0BtR9?jBe9b0?>??tOHYb
zKn7r$J_*nd!lB>g0g$%bAqW=03KE8304(#NX=wp?Ohe~K4Pg3-SObU#clW|;*8$H_
z9Od1d%$rd&#dM#)J(NoUz(CC$1N5z(whkZ!21=PBo<S&GN|pgMh*TY+$0d*A(^y*o
O0000<MNUMnLSTZ>d}h%A

literal 0
HcmV?d00001

diff --git a/eastern flames/sprites/s_guy2/layers/c7b4d2b5-05bb-4c0f-8881-9b403315f06e/57be2f77-fa54-4438-8ed7-0073af24bc49.png b/eastern flames/sprites/s_guy2/layers/c7b4d2b5-05bb-4c0f-8881-9b403315f06e/57be2f77-fa54-4438-8ed7-0073af24bc49.png
new file mode 100644
index 0000000000000000000000000000000000000000..b18c74270b26e395f08e2decc91c98be7813958f
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002bNkl<Zc%1E*
zZ3}=P41^Q<|9{!~kZ@SrZgWaO2a%-S9?jQ%lU2{BDEX}F^?vl)m5L=1LX-wD3Zb@~
z1waVX49YQOX#g~ndV>WF10YBhzK7%mz+fo@Gy;&SAK(Z0BtR9?jBe9b0?>??tOHYb
zKn7r$J_*nd!lB>g0g$%bAqW=03KE8304(#NX=wp?Ohe~K4Pg3-SObU#clW|;*8$H_
z9Od1d%$rd&#dM#)J(NoUz(CC$1N5z(whkZ!21=PBo<S&GN|pgMh*TY+$0d*A(^y*o
O0000<MNUMnLSTZ>d}h%A

literal 0
HcmV?d00001

diff --git a/eastern flames/sprites/s_guy2/s_guy.yy b/eastern flames/sprites/s_guy2/s_guy.yy
new file mode 100644
index 0000000..db53a58
--- /dev/null
+++ b/eastern flames/sprites/s_guy2/s_guy.yy	
@@ -0,0 +1,79 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 5,
+  "bbox_right": 26,
+  "bbox_top": 1,
+  "bbox_bottom": 31,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 32,
+  "height": 32,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy/s_guy.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy/s_guy.yy",},"LayerId":{"name":"57be2f77-fa54-4438-8ed7-0073af24bc49","path":"sprites/s_guy/s_guy.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},"resourceVersion":"1.0","name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"a0dd2354-2808-445b-aff6-29df2d196036","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy/s_guy.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,
+    "lockOrigin": false,
+    "showBackdrop": true,
+    "showBackdropImage": false,
+    "backdropImagePath": "",
+    "backdropImageOpacity": 0.5,
+    "backdropWidth": 1366,
+    "backdropHeight": 768,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 16,
+    "yorigin": 16,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_guy","path":"sprites/s_guy/s_guy.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_guy",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"57be2f77-fa54-4438-8ed7-0073af24bc49","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_guy",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
\ No newline at end of file
diff --git a/eastern flames/sprites/s_guy2/s_guy2.yy b/eastern flames/sprites/s_guy2/s_guy2.yy
new file mode 100644
index 0000000..6e62dfe
--- /dev/null
+++ b/eastern flames/sprites/s_guy2/s_guy2.yy	
@@ -0,0 +1,79 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 5,
+  "bbox_right": 26,
+  "bbox_top": 0,
+  "bbox_bottom": 30,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 32,
+  "height": 32,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy2/s_guy2.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy2/s_guy2.yy",},"LayerId":{"name":"57be2f77-fa54-4438-8ed7-0073af24bc49","path":"sprites/s_guy2/s_guy2.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},"resourceVersion":"1.0","name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.0,
+    "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
+    "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
+    "tracks": [
+      {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
+            {"id":"65414b11-eb75-4d45-92c0-89d1a6df82fa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c7b4d2b5-05bb-4c0f-8881-9b403315f06e","path":"sprites/s_guy2/s_guy2.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,
+    "lockOrigin": false,
+    "showBackdrop": true,
+    "showBackdropImage": false,
+    "backdropImagePath": "",
+    "backdropImageOpacity": 0.5,
+    "backdropWidth": 1366,
+    "backdropHeight": 768,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 16,
+    "yorigin": 16,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"s_guy2","path":"sprites/s_guy2/s_guy2.yy",},
+    "resourceVersion": "1.3",
+    "name": "s_guy",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"57be2f77-fa54-4438-8ed7-0073af24bc49","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "nineSlice": null,
+  "parent": {
+    "name": "Sprites",
+    "path": "folders/Sprites.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "s_guy2",
+  "tags": [],
+  "resourceType": "GMSprite",
+}
\ No newline at end of file