From 9ea0716181fb334c71bb06cb357c966840d69df9 Mon Sep 17 00:00:00 2001 From: AutisticGoat <83523192+AutisticGoat@users.noreply.github.com> Date: Mon, 31 Jan 2022 15:41:52 -0700 Subject: [PATCH 1/4] Rescaled and rearranged character icons --- resources/gfx/eid_player_icons.anm2 | 136 ++++++++++++++-------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/resources/gfx/eid_player_icons.anm2 b/resources/gfx/eid_player_icons.anm2 index 5d36dee3..c8c7fb90 100644 --- a/resources/gfx/eid_player_icons.anm2 +++ b/resources/gfx/eid_player_icons.anm2 @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 83eaae92885b4876220cc5a549c0ce6b2429bd33 Mon Sep 17 00:00:00 2001 From: AutisticGoat <83523192+AutisticGoat@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:31:40 -0700 Subject: [PATCH 2/4] Added status effects icons --- main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.lua b/main.lua index 2c3fe828..48538982 100644 --- a/main.lua +++ b/main.lua @@ -54,6 +54,9 @@ EID.ItemSprite:Load("gfx/005.100_collectible.anm2", true) EID.PlayerSprite = Sprite() EID.PlayerSprite:Load("gfx/eid_player_icons.anm2", true) +EID.StatusEffects = Sprite() +EID.StatusEffects:Load("gfx/eid_status_effects.anm2", true) + local ArrowSprite = Sprite() ArrowSprite:Load("gfx/eid_transform_icons.anm2", true) ArrowSprite:Play("Arrow", false) From 16fac8f3a478c4cbc7d2f441d46f51080770a909 Mon Sep 17 00:00:00 2001 From: AutisticGoat <83523192+AutisticGoat@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:32:01 -0700 Subject: [PATCH 3/4] Added status effects icons --- eid_data.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eid_data.lua b/eid_data.lua index 2cc6dc9e..a0d6bbed 100644 --- a/eid_data.lua +++ b/eid_data.lua @@ -357,6 +357,19 @@ EID.InlineIcons = { ["Player39"] = {"Players", 39, 12, 12, -1, 1, EID.PlayerSprite}, ["Player40"] = {"Players", 40, 12, 12, -1, 1, EID.PlayerSprite}, + -- Status effects + ["Charm"] = {"StatusEffects", 0, 11, 11, 6, 6, EID.StatusEffects}, + ["Burning"] = {"StatusEffects", 1, 11, 11, 6, 6, EID.StatusEffects}, + ["Crown"] = {"StatusEffects", 2, 11, 11, 6, 6, EID.StatusEffects}, + ["Fear"] = {"StatusEffects", 3, 11, 11, 6, 6, EID.StatusEffects}, + ["Poison"] = {"StatusEffects", 4, 11, 11, 6, 6, EID.StatusEffects}, + ["Magnetize"] = {"StatusEffects", 5, 11, 11, 6, 6, EID.StatusEffects}, + ["Slow"] = {"StatusEffects", 6, 11, 11, 6, 6, EID.StatusEffects}, + ["BrimstoneCurse"] = {"StatusEffects", 7, 11, 11, 6, 6, EID.StatusEffects}, + ["Bait"] = {"StatusEffects", 8, 11, 11, 6, 6, EID.StatusEffects}, + ["Weakness"] = {"StatusEffects", 9, 11, 11, 6, 6, EID.StatusEffects}, + ["BleedingOut"] = {"StatusEffects", 10, 11, 11, 6, 6, EID.StatusEffects}, + } -- Table that holds Colors used for markup objects. Example: "{{ColorRed}}" From fb3a1132591cad7fdbb0858481910a544728f8f7 Mon Sep 17 00:00:00 2001 From: AutisticGoat <83523192+AutisticGoat@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:32:39 -0700 Subject: [PATCH 4/4] Added status effects icons --- resources/gfx/eid_status_effects.anm2 | 37 ++++++++++++++++++++++++++ resources/gfx/eid_status_effects.png | Bin 0 -> 1345 bytes 2 files changed, 37 insertions(+) create mode 100644 resources/gfx/eid_status_effects.anm2 create mode 100644 resources/gfx/eid_status_effects.png diff --git a/resources/gfx/eid_status_effects.anm2 b/resources/gfx/eid_status_effects.anm2 new file mode 100644 index 00000000..c80df518 --- /dev/null +++ b/resources/gfx/eid_status_effects.anm2 @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/gfx/eid_status_effects.png b/resources/gfx/eid_status_effects.png new file mode 100644 index 0000000000000000000000000000000000000000..a4987a3c0c1b568ed92a2e78e31992e925a6f8e8 GIT binary patch literal 1345 zcmV-H1-|-;P)mhRYVwJ9vCxZXW*j z(5r84ff({dG5hE~78?l))B-(@s0-i@fru=5o<1iJ0O`G`H})DZV$mCtX5?==$m;j$ zyW}-|PO#E~wzmn*oIRT)P{+q&I&t!gjRdog?wh`=7cXPBf+lE@2LPPks0Fr!rF8K4 zK&L;4rI*csB)Pc+c^-Ma?=>o`*Ql&s7uyN}@_ER~fDE!laC_TpppQIY7d>FO_baQ{ znEUB>T)w`C&+lg9vw)Zh4*7_JC~gB^A&jm8A@Trl_f?|wBaf3G2?Zk0pmf?htvFfc z9H5Sm70-e^;vrnVzE?&~DWyW&B+4Gw2|kD!ph=e@f7WT@>cvZZem7%X1)&00S$*%o zvBRwg8Y3KtCWeU_BUSq^jr!oWckfWIMNVssQ`INRHBeQbxNBPE+wC?0L!Qg*w_IUfy{4Q2I{jDDYblk5VaV_9 z9ct15fK*OyD;cCO$#4!vRB1PZ@Mq7w}DM<5hS=IqM z`h4%#fwUmz7Q;Nku@3RU7wu3MgfPyp#1v2aBGC`Q*#-&#TCEmZtrn0LS$1#62)ZKd z4B*jU0UAr+0{}Ys0K7+D77$3cNabb!u@Mbva_)o>)|WR(6R*zIQJY^tZ_qW4SYO^C?gY06aPq@@BQgudhTfoyw{JQCfVXct=ncB!xC)$t zw~ygIcOw7*ijCFn&Uk8qQi5Z0%DyP>4bH85O}>A5f&Nu5)2}BXz>wE+^Uow@k9Uh? z=GB--eWGRz(k(} z(&R<c0H+WZ|un#)~8MWILp^ia130J+gOy6y*OaIWKZk(*~3Fi4%@o&&rGp|Xb% ztq+)@XYe3@U9Sz1Iu=Gb2?D``STsic{jTh~Q^ew5N+NDlm*oW-00000NkvXXu0mjf DF3ffw literal 0 HcmV?d00001