diff --git a/assets/sprites/Evil_seed.png b/assets/sprites/Evil_seed.png
new file mode 100644
index 0000000..2fccd3e
Binary files /dev/null and b/assets/sprites/Evil_seed.png differ
diff --git a/assets/sprites/Flower_ennemy.png b/assets/sprites/Flower_ennemy.png
new file mode 100644
index 0000000..ab18d77
Binary files /dev/null and b/assets/sprites/Flower_ennemy.png differ
diff --git a/assets/sprites/Shrump.png b/assets/sprites/Shrump.png
new file mode 100644
index 0000000..ef51d53
Binary files /dev/null and b/assets/sprites/Shrump.png differ
diff --git a/assets/sprites/Turnipor.png b/assets/sprites/Turnipor.png
new file mode 100644
index 0000000..b34751e
Binary files /dev/null and b/assets/sprites/Turnipor.png differ
diff --git a/assets/sprites/mushroom_ennemy.png b/assets/sprites/mushroom_ennemy.png
new file mode 100644
index 0000000..ec939a6
Binary files /dev/null and b/assets/sprites/mushroom_ennemy.png differ
diff --git a/assets/ui/background_rpg.png b/assets/ui/background_rpg.png
index 624b459..f5fd479 100644
Binary files a/assets/ui/background_rpg.png and b/assets/ui/background_rpg.png differ
diff --git a/prefabs/combat.gcprefab b/prefabs/combat.gcprefab
index 6a728ce..2a6c442 100644
--- a/prefabs/combat.gcprefab
+++ b/prefabs/combat.gcprefab
@@ -17,6 +17,11 @@
+
+
+
+
+
@@ -48,7 +53,7 @@
-
+
diff --git a/prefabs/enemies/evil_seed.gcprefab b/prefabs/enemies/evil_seed.gcprefab
new file mode 100644
index 0000000..eb2621d
--- /dev/null
+++ b/prefabs/enemies/evil_seed.gcprefab
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prefabs/enemies/flower.gcprefab b/prefabs/enemies/flower.gcprefab
new file mode 100644
index 0000000..6c69b74
--- /dev/null
+++ b/prefabs/enemies/flower.gcprefab
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prefabs/enemies/mushroom.gcprefab b/prefabs/enemies/mushroom.gcprefab
new file mode 100644
index 0000000..1983f17
--- /dev/null
+++ b/prefabs/enemies/mushroom.gcprefab
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prefabs/enemies/shrump.gcprefab b/prefabs/enemies/shrump.gcprefab
new file mode 100644
index 0000000..e25ea1d
--- /dev/null
+++ b/prefabs/enemies/shrump.gcprefab
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prefabs/enemies/turnipor.gcprefab b/prefabs/enemies/turnipor.gcprefab
new file mode 100644
index 0000000..97e487c
--- /dev/null
+++ b/prefabs/enemies/turnipor.gcprefab
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 8bee568..1248951 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -147,7 +147,12 @@
-
+
+
+
+
+
+
@@ -214,7 +219,7 @@
-
+
diff --git a/src/game_loader.c b/src/game_loader.c
index 05425e6..2f42c3f 100644
--- a/src/game_loader.c
+++ b/src/game_loader.c
@@ -78,7 +78,12 @@ const struct gc_data attacks[] = {
{"attack", "Water jet", &water_jet, NULL},
{"attack", "Shield", &shield, NULL},
{"attack", "Aerial attack", &enemy_attack, NULL},
- {NULL, NULL, NULL, NULL}
+ {"attack", "Spore attack", &enemy_attack, NULL},
+ {"attack", "Sharp leaves", &enemy_attack, NULL},
+ {"attack", "Spinning roots", &enemy_attack, NULL},
+ {"attack", "Hypnosis", &enemy_attack, NULL},
+ {"attack", "Water gun", &enemy_attack, NULL},
+ {NULL, NULL, NULL, NULL}
};
void load_data(gc_scene *scene, const gc_data *datas)
diff --git a/src/systems/combat_methods.c b/src/systems/combat_methods.c
index 5e33161..b031ccc 100644
--- a/src/systems/combat_methods.c
+++ b/src/systems/combat_methods.c
@@ -26,13 +26,15 @@ void combat_start(gc_engine *engine, char *enemy_name)
gc_list *li = engine->scene->get_data(engine->scene, "enemies", NULL);
gc_scene *scene = scene_create(engine, "prefabs/combat.gcprefab");
struct enemy *enemy = NULL;
- gc_entity *player = engine->scene->get_entity(engine->scene, 50);
- gc_entity *player_combat = scene->get_entity(scene, 50);
+ gc_entity *player;
+ gc_entity *player_combat;
if (!scene) {
my_printf("The combat scene couldn't be found.\n");
return;
}
+ player = engine->scene->get_entity(engine->scene, 50);
+ player_combat = scene->get_entity(scene, 50);
this->state = ATTACK;
this->game_scene = engine->scene;
set_combat_player(engine, player, player_combat);