From ca83fa38feb29ebbb4c7d4d79a2ce95308ebd41d Mon Sep 17 00:00:00 2001
From: Linus Probert <linus.probert@gmail.com>
Date: Sun, 11 Mar 2018 21:06:46 +0100
Subject: [PATCH] Better dagger throw hits and new skill graphics.

---
 assets/Extras/Skills.png | Bin 0 -> 848 bytes
 src/projectile.c         |   6 +++++-
 src/skill.c              |  18 +++++++++---------
 src/skillbar.c           |   5 ++++-
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 assets/Extras/Skills.png

diff --git a/assets/Extras/Skills.png b/assets/Extras/Skills.png
new file mode 100644
index 0000000000000000000000000000000000000000..9738d591b2214f0e747fba0803787ce8b67cb115
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz0009QNkl<Zc%1E+
zF=*RB6o!8l7cyu_L4_2Q%^3<AY;Xn-9z3|<K|`~-kikO=4I~glIt09Q@Q^`)3>h+}
z(14c?9Wr?E;K4%*D!AZ63n@5I4~As$V2I&$XimtgWXnD~vB>-2u%svH-rfJ+JNW>H
zVHk#C7=~dO<`JQYgIHplmY@Fy0DL+BqPTCAwFhGHmL_@*0B)YzeQK&s7p)53u5H+6
ztKCMYdo`I~j{!~9DOa@U^14Yz*7#2dS^IsWsXAR=H>puRp}pNam5xv8^14Zysz0b-
z4?QnlJaL|Aulm?GdpP=Z;OVTaeI$#wBvl3QPkaFAR%$q{*X`@(_pZ!qr$#24n7bgb
z(NvwbYZtzmENdSN5ez|^%ZI()JZY*<M%JKAG-0=KDggQ5Wef5?BWuuh?c%|!&`9Pg
z2qyG@Z#Qp?-zct<rt0=@kazfr>L>W9AQ0lu!!i^IA)=8r21Imbl8oK6(=juBnD0*U
z8|4$yRGoe{H~jl{FiiYm_xL^M6hBwA!Vv&~cMz0}m_3QI_F4O0GGcZBG|DH`D6UT2
zw_DsG882EW#TU3mbWftJeU^TUAP`Na-$}}TCYlI^_>p18PWMVV%f6=E`Dg6Bd5>fy
zGFAIf#`!nk+5;#Yl#t7<;rPP=dh1&#tg5Iw_5|*eeY1zkp)t365JR2PRGpHkH~=6S
zX`%clg^$@P3TF$b{Q9cM+NV93Of*4OyN&#22EFwy0Kkv@I{-ksu!E|3G;zN~M2ey)
z?qfec%v=xY!yEfrXam4`o=nA&jI>}@JLq(;6j{4xr=v38k?q5L&2MJ#Y$Xkxn=oR1
z6wVd^$n6M<vOh}v^vnLh7&TR=PzHb-=OlX#NY*Zcrs`BkYcOK{fy@&@S8YaMwcALh
z;;7fGnPsFH<Gc#)W{gF7^q^$z1KBS!eT<4w?=J)2T8J+#VPWOPUA3_w_5;OoG)uxF
zydYH0jzWBMh-Jo!5Pz20A4cY9B7%JNJJ)~r{dYFMWhQK;nPC`)VHk#C7=~dOhG7_H
adi({-G%X+<V30fj0000<MNUMnLSTZ2wu@T;

literal 0
HcmV?d00001

diff --git a/src/projectile.c b/src/projectile.c
index a85084a..d711ca3 100644
--- a/src/projectile.c
+++ b/src/projectile.c
@@ -86,8 +86,12 @@ projectile_update(Projectile *p, Player *player, RoomMatrix *rm, float deltatime
 
 	if (space->monster) {
 		Uint32 dmg = stats_fight(&player->stats, &space->monster->stats);
+		if (dmg > 0) {
+			gui_log("Your dagger pierced %s for %u damage", space->monster->lclabel, dmg);
+			mixer_play_effect(SWORD_HIT);
+			player->hits += 1;
+		}
 		monster_hit(space->monster, dmg);
-		mixer_play_effect(SWORD_HIT);
 	}
 	p->alive = false;
 }
diff --git a/src/skill.c b/src/skill.c
index a533b09..e86664c 100644
--- a/src/skill.c
+++ b/src/skill.c
@@ -111,11 +111,11 @@ skill_use_flurry(Skill *skill, SkillData *data)
 static Skill *
 create_flurry(void)
 {
-	Texture *t = texturecache_add("Items/MedWep.png");
+	Texture *t = texturecache_add("Extras/Skills.png");
 	Sprite *s = sprite_create();
 	sprite_set_texture(s, t, 0);
-	s->dim = DEFAULT_DIMENSION;
-	s->clip = CLIP16(0, 0);
+	s->dim = GAME_DIMENSION;
+	s->clip = CLIP32(0, 0);
 	s->fixed = true;
 	Skill *skill = create_default("Flurry", s);
 	skill->use = skill_use_flurry;
@@ -147,11 +147,11 @@ skill_throw_dagger(Skill *skill, SkillData *data)
 static Skill *
 create_throw_dagger(void)
 {
-	Texture *t = texturecache_add("Extras/Dagger.png");
+	Texture *t = texturecache_add("Extras/Skills.png");
 	Sprite *s = sprite_create();
 	sprite_set_texture(s, t, 0);
-	s->dim = DEFAULT_DIMENSION;
-	s->clip = CLIP16(0, 0);
+	s->dim = GAME_DIMENSION;
+	s->clip = CLIP32(64, 0);
 	s->fixed = true;
 	Skill *skill = create_default("Throw dagger", s);
 	skill->instantUse = false;
@@ -257,11 +257,11 @@ skill_charge(Skill *skill, SkillData *data)
 static Skill *
 create_charge(void)
 {
-	Texture *t = texturecache_add("Commissions/Warrior.png");
+	Texture *t = texturecache_add("Extras/Skills.png");
 	Sprite *s = sprite_create();
 	sprite_set_texture(s, t, 0);
-	s->dim = DEFAULT_DIMENSION;
-	s->clip = CLIP16(48, 32);
+	s->dim = GAME_DIMENSION;
+	s->clip = CLIP32(32, 0);
 	s->fixed = true;
 	Skill *skill = create_default("Charge", s);
 	skill->use = skill_charge;
diff --git a/src/skillbar.c b/src/skillbar.c
index 120d65a..ce1cab0 100644
--- a/src/skillbar.c
+++ b/src/skillbar.c
@@ -149,7 +149,10 @@ render_skills(Player *player, Camera *cam)
 			continue;
 
 		Skill *skill = player->skills[i];
-		skill->icon->pos = (Position) { 8 + i * 32, 8 };
+		if (skill->icon->dim.width >16)
+			skill->icon->pos = (Position) { i * 32, 0 };
+		else
+			skill->icon->pos = (Position) { 8 + i * 32, 8 };
 		sprite_render(skill->icon, cam);
 
 		if (player->skills[i]->active) {