walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Increases dagger speed, Adds charge pickup and dagger sound.

This commit is contained in:
Linus_Probert 2018-03-12 09:09:03 +01:00
parent ca83fa38fe
commit 5f4140fb6f
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/projectile.c
View File

@ -22,6 +22,7 @@
#include "player.h"
#include "monster.h"
#include "mixer.h"
#include "gui.h"
static void
onDaggerRender(Sprite *s)

2
src/projectile.h
View File

@ -26,6 +26,8 @@
#include "timer.h"
#include "roommatrix.h"
#define DAGGER_VELOCITY 500
// Forward declare
struct Player_t;

24
src/skill.c
View File

@ -31,6 +31,7 @@
#include "particle_engine.h"
#include "projectile.h"
#include "linkedlist.h"
#include "item.h"
static void
set_player_clip_for_direction(Player *player, Vector2d *direction)
@ -126,18 +127,18 @@ static bool
skill_throw_dagger(Skill *skill, SkillData *data)
{
UNUSED(skill);
UNUSED(data);
Projectile *p = projectile_dagger_create();
if (vector2d_equals(VECTOR2D_UP, data->direction))
p->velocity = (Vector2d) { 0, -300 };
p->velocity = (Vector2d) { 0, -DAGGER_VELOCITY };
else if (vector2d_equals(VECTOR2D_DOWN, data->direction))
p->velocity = (Vector2d) { 0, 300 };
p->velocity = (Vector2d) { 0, DAGGER_VELOCITY };
else if (vector2d_equals(VECTOR2D_RIGHT, data->direction))
p->velocity = (Vector2d) { 300, 0 };
p->velocity = (Vector2d) { DAGGER_VELOCITY, 0 };
else
p->velocity = (Vector2d) { -300, 0 };
p->velocity = (Vector2d) { -DAGGER_VELOCITY, 0 };
mixer_play_effect(SWOOSH);
p->sprite->pos = data->player->sprite->pos;
linkedlist_append(&data->player->projectiles, p);
@ -200,11 +201,20 @@ skill_charge(Skill *skill, SkillData *data)
// Find collider
destination.x += (int) data->direction.x;
destination.y += (int) data->direction.y;
while (position_in_roommatrix(&destination)
&& !matrix->spaces[destination.x][destination.y].occupied)
RoomSpace *space = &matrix->spaces[destination.x][destination.y];
while (position_in_roommatrix(&destination) && !space->occupied)
{
destination.x += (int) data->direction.x;
destination.y += (int) data->direction.y;
if (space->items != NULL) {
LinkedList *items = space->items;
while (items != NULL) {
Item *item = items->data;
items = items->next;
item_collected(item, player);
}
}
space = &matrix->spaces[destination.x][destination.y];
steps++;
}