170 Commits

Author SHA1 Message Date
97d1b6ba02 Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités.
Début changement selon héritage de UnitPlacementButton
2024-06-08 18:52:58 -04:00
12a8497708 Tentative d'associer le clique utilisateur à une position sur le jeu 2024-05-12 18:48:26 -04:00
Felix-gabriel Boucher-luneau
99655f7e09 Pull request #63: extraire les prix et cooldowns des unit cards
Merge in CGD/gather-and-defend from feature/separate_cooldown_from_units to main

* commit '927c08559f2f0c8850be6c9b3e170165e8bccb27':
  extraire les prix et cooldowns des unit cards
2024-03-17 19:03:14 +00:00
8e8c32ca68 Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant 2024-03-17 12:10:04 -04:00
Felix Boucher
927c08559f extraire les prix et cooldowns des unit cards
problème : le fait que les prix et les cooldowns étaient dans les game objects directement rendait le design compliqué

solution : créer un scriptable object pour contenir l'info des unit cards
2024-03-13 16:38:07 -04:00
25c9382dfd - Le jeu éteint l'animation des unités lorsque le joueur les drag-and-drop sur le terrain, réglant le problème avec l'événement dans l'animation. 2024-03-10 19:43:30 -04:00
849427777b Merge remote-tracking branch 'origin/main' into feature/InvestigationSpawnConstant 2024-03-03 14:16:53 -05:00
10ec788979 Fix misplaced variable 2024-03-03 14:13:43 -05:00
bd28e30da5 Comments + variable structure 2024-03-03 13:41:23 -05:00
bc4b4c30a8 Fixed spawning decrementation and changing spawner objectives dynamically 2024-03-02 16:26:47 -05:00
8921c898ec Fix ConstantSpawn to change constant spawn group when one group dies
Keeps doing constant spawn after 2nd group dies

To test: 2 groups die, what about the 3rd one
2024-02-27 15:44:11 -05:00
Felix Boucher
effe4ca2cc unit cooldown
#Le besoin addressé par le commit
les unités et bâtiments devrait avoir un temps de cooldown avant de pouvoir être spawné à nouveau

#Comment le besoin est-il addressé? (modifications)
les unités et bâtiments prennent maintenant 3 secondes avant de redevenir interactif après avoir été spawné
2024-02-18 11:11:03 -05:00
d0371349db Temp reset 2024-02-04 19:05:01 -05:00
0fd0584a50 Fixed enemy death resuming spawner timers unexpectedly. Now checks if the constant spawn is done to decide if spawning should end. 2024-02-04 18:25:23 -05:00
a4f7accfcd Removed Debug logs and prepared main rebase 2024-02-04 11:30:28 -05:00
e1e3c42b00 Created destination placeholders where resource ui should be 2024-02-04 11:30:28 -05:00
Felix Boucher
27d329df71 fix unit cost not working anymore
turns out it was an inheritance problem
2024-01-25 14:45:50 -05:00
Felix Boucher
42fbffd306 working delete feature + placeholder refactor 2024-01-19 15:30:54 -05:00
Felix Boucher
795d6751ec refactor placement buttons to accomodate delete 2024-01-19 14:51:30 -05:00
8e50c6d455 Fix spawning for gala and fix archer atk speed 2023-11-13 22:26:24 -05:00
28c9cb85c7 Merge with main 2023-11-13 20:12:17 -05:00
c8d2e43326 Add timed victory and config changes 2023-11-13 20:03:28 -05:00
Baptiste Girard
4bd16c7786 Pull request #55: add the save and unlock next level after finishing anyone
Merge in CGD/gather-and-defend from progress_worldmap to main

* commit '25d574714f32e7eec33f90451d2054cb643722ff':
  add the save and unlock next level after finishing anyone
2023-11-14 01:02:21 +00:00
Baptiste
25d574714f add the save and unlock next level after finishing anyone 2023-11-13 19:08:18 -05:00
e8d89dbd03 Balanced level configs 2023-11-13 18:57:58 -05:00
Felix-gabriel Boucher-luneau
e1ae20e101 Pull request #52: fix detection range
Merge in CGD/gather-and-defend from prog/fix_detection_range to main

* commit '4568c350bfec91842dc9a8fe0917798fbfce7dda':
  toggle collider in coroutine instead of script
  fix detection range
2023-11-13 22:38:51 +00:00
2ec32f8832 Merge branch 'main' into origin/feature/berriesInteractions 2023-11-13 17:27:36 -05:00
Felix Boucher
4568c350bf toggle collider in coroutine instead of script 2023-11-12 20:31:21 -05:00
Felix Boucher
7dba305d30 fixes to berry harvesting
- berry harvester appears on bush tiles
- change berry resource for food instead
- some structural change to reduce bugs
2023-11-12 18:26:36 -05:00
7edbec43b3 End groupSpawn delay
Adds a ~3 seconds delay when a group has more ennemies than available rows·.

Added groupSpawnDelay to GlobalConfigFile
2023-11-12 16:18:52 -05:00
cba5364045 Création et implémentation des baies. Couramment, donne de la nourriture, mais pourra probablement donner des baies plus tard. 2023-11-11 14:06:28 -05:00
Felix Boucher
bff2df154a fix detection range
besoin :

- quand une unité meurt, la prochaine unité n'est pas targetted

solution :

- deactivate and reactivate collider to re-trigger collision
2023-11-05 11:52:48 -05:00
4ae8f0dcfa Start delay with for loop and breakTag 2023-11-04 10:01:40 -04:00
Felix-gabriel Boucher-luneau
4c8b34993a Pull request #50: repair pause button + refactoring
Merge in CGD/gather-and-defend from prog/fix_pause to main

* commit '104f812c41a2f9a15a9672316c8aeded23752d67':
  repair pause button + refactoring
2023-11-01 01:13:37 +00:00
Felix-gabriel Boucher-luneau
4b800c73c2 Pull request #51: fix detection range
Merge in CGD/gather-and-defend from prog/fix_detection_range to main

* commit '937624f54fafd20cbc70dd752fa00314139ec795':
  remove underscore
  fix detection range
2023-11-01 01:13:17 +00:00
Felix Boucher
937624f54f remove underscore 2023-10-31 21:12:24 -04:00
c6f819bee1 Fix compile errors 2023-10-31 21:06:05 -04:00
Felix Boucher
3c1a94257f fix detection range
problem :

detection range didn't show anymore on placeholders

solution :

calculate detection range from collider's offset and size instead of it's bound
2023-10-30 21:28:21 -04:00
Felix Boucher
104f812c41 repair pause button + refactoring
problem :

- pause button needed 2 times to press

solution

- decouple pause from resume
- refactor
2023-10-30 20:45:47 -04:00
Felix-gabriel Boucher-luneau
96d9b0fd7b Pull request #49: added population mechanic
Merge in CGD/gather-and-defend from prog/population to main

* commit '6778880d5fed0d60c92f48995e62eca289bfaec3':
  reset resources for real each level loading
  oops forgot some staging
  population mechanic with art
2023-10-30 03:26:43 +00:00
Felix Boucher
6778880d5f reset resources for real each level loading 2023-10-29 23:25:56 -04:00
Felix Boucher
b54627196c population mechanic with art
- added art for house and UI
- put population in ResourceManager
- create house prefab
- added code for adding and removing pop depending on entity
- refactor harvesters so they inherit from ally
- modify placeholders and buttons so that only units cost population
- add events for population and resources changing
- add population relative configs to global config
- add start resources values to Levels
- add debug feature for generating resources for free
2023-10-29 19:12:32 -04:00
b8d4907efb Removed useless script 2023-10-29 17:06:46 -04:00
570b3948d4 Added some basic sounds including ambiant and res collection; Fixed level retry not working 2023-10-29 16:54:13 -04:00
c57417a583 PR corrections 2023-10-22 15:28:34 -04:00
749d2c5643 Finished group spawn
Created Serializable class GroupList in WaveConfig.cs to contain multiple enemy types per group
2023-10-18 20:31:57 -04:00
13f00e326c Start group spawn 2023-10-18 20:31:57 -04:00
2478c8b3fb Added show victory and defeat screens animation 2023-10-15 19:23:24 -04:00
e2ff56264e Fix game conflict and added correct UI for the victory and defeat screens 2023-10-15 18:34:42 -04:00
449744cdc7 Merged with main 2023-10-15 17:51:21 -04:00