From 341ddd18137a476734317f7bcdd61b7f6f03a9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.le-bihan@epitech.eu>
Date: Fri, 1 May 2020 15:44:49 +0200
Subject: [PATCH] random works with ennemies now

---
 prefabs/game.gcprefab        | 12 ++++++------
 src/systems/combat_methods.c |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 596a06a..1e08568 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -146,12 +146,12 @@
         <sprite name="mayor" src="assets/sprites/npc/mayor.png" />
 
         <enemies>
-            <enemy name="bee" src="prefabs/enemies/bee.gcprefab" />
-            <enemy name="mushroom" src="prefabs/enemies/mushroom.gcprefab" />
-            <enemy name="turnipor" src="prefabs/enemies/turnipor.gcprefab" />
-            <enemy name="shrump" src="prefabs/enemies/shrump.gcprefab" />
-            <enemy name="evil seed" src="prefabs/enemies/evil_seed.gcprefab" />
-            <enemy name="flower" src="prefabs/enemies/flower.gcprefab" />
+            <enemy name="bee" src="prefabs/enemies/bee.gcprefab" spawn_rate="17%" />
+            <enemy name="mushroom" src="prefabs/enemies/mushroom.gcprefab" spawn_rate="17%" />
+            <enemy name="turnipor" src="prefabs/enemies/turnipor.gcprefab" spawn_rate="17%"/>
+            <enemy name="shrump" src="prefabs/enemies/shrump.gcprefab" spawn_rate="17%"/>
+            <enemy name="evil seed" src="prefabs/enemies/evil_seed.gcprefab" spawn_rate="17%"/>
+            <enemy name="flower" src="prefabs/enemies/flower.gcprefab" spawn_rate="17%"/>
         </enemies>
     </data>
 
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);