zoriya/ForecastingVillage
1
0
Fork 0
mirror of https://github.com/zoriya/ForecastingVillage.git synced 2026-06-01 02:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

random works with ennemies now

Browse Source
This commit is contained in:
Clément Le Bihan
2020-05-01 15:44:49 +02:00
parent 4e5f5f1872
commit 341ddd1813
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/game.gcprefab
+6 -6
View File
@@ -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>
src/systems/combat_methods.c
+4 -2
View File
@@ -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);