Commit Graph

Select branches

Hide Pull Requests

map_generation

master

test

webserver

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#123

#124

#125

#126

#127

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

v23.14

v3.14

v3.14.1

Mono Color

• 45f420aaef Linting Yohann D'ANELLO 2020-12-11 18:17:08 +01:00
• e7f24c2371 The store menu now displays the price of objects, fixes #41 eichhornchen 2020-12-11 18:08:10 +01:00
• 1afa397fec Better interaction with inventory menu Yohann D'ANELLO 2020-12-11 18:07:24 +01:00
• d3c14a48ee Add docstring for Map.large_neighbourhood Charles Peyrat 2020-12-11 17:46:49 +01:00
• 089a247b2f Maybe mouse clicks may use the game Yohann D'ANELLO 2020-12-11 17:43:46 +01:00
• d50f6701f4 Open a menu with the mouse Yohann D'ANELLO 2020-12-11 17:40:56 +01:00
• 99352bc1d5 Test buying an item when we don't have enough of money Yohann D'ANELLO 2020-12-11 17:28:16 +01:00
• 7179346e2b Add a InventoryHolder superclass for player and merchants Yohann D'ANELLO 2020-12-11 17:20:50 +01:00
• c8b07b3bf5 Only empty tiles should be changed to walls, obviously... Charles Peyrat 2020-12-11 17:17:11 +01:00
• 757a460a44 Fix typo Charles Peyrat 2020-12-11 17:13:12 +01:00
• 6a4d13c726 Walls now generate around the floor Charles Peyrat 2020-12-11 17:09:59 +01:00
• 3a8549cfcc Added a method to interfaces.Map to get the neighbours of a given tile Charles Peyrat 2020-12-11 17:09:27 +01:00
• 98b5dd64a8 Linting Yohann D'ANELLO 2020-12-11 17:06:30 +01:00
• 7fb743eb72 Switching up start_x and start_y so the player spawn is correctly set Charles Peyrat 2020-12-11 17:02:22 +01:00
• bbe37eab97 Listen for clicks, detect which display was clicked Yohann D'ANELLO 2020-12-11 16:56:22 +01:00
• b9b776b7ad Player now pays for what he buys and buying a heart does not put it in the inventory. Solves #38 and #36 eichhornchen 2020-12-11 16:49:17 +01:00
• 7ba49277a9 Added a symbol for hazels in the ascii texturepack eichhornchen 2020-12-11 15:52:36 +01:00
• 3c614dcca9 Linting Yohann D'ANELLO 2020-12-11 02:19:59 +01:00
• 8751120fe1 Merge master into map_generation, there were some commit behind Yohann D'ANELLO 2020-12-11 02:17:00 +01:00
• 7db2dd2b46 Merge branch 'master' into map_generation Yohann D'ANELLO 2020-12-11 02:14:47 +01:00
• 29798c135e Syntax change for the failsafe Charles Peyrat 2020-12-11 01:24:20 +01:00
• 45120d0c2b Integrating procedural generation into the game Charles Peyrat 2020-12-11 01:13:00 +01:00
• 302017222d Fixing the sampling of the starting position that caused out of bounds error Charles Peyrat 2020-12-11 01:11:07 +01:00
• 021731b740 Switching up the tiles used during generation to the correct ones Charles Peyrat 2020-12-11 01:09:49 +01:00
• d40a61554e Changing the way the tile matrix is declared so that every column is represented by a different list Charles Peyrat 2020-12-11 01:04:30 +01:00
• 53cb6a89ae Merge branch '35-better-pathfinding' into 'master' nicomarg 2020-12-10 22:31:40 +01:00
• 01cc77e146 Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles Nicolas Margulies 2020-12-10 22:28:12 +01:00
• cc6033e8e4 New pathfinding that avoids most of the mobs getting stuck, closes #35 Nicolas Margulies 2020-12-10 22:21:09 +01:00
• 6d4c0b2ca3 Testing the merchant must handle two cases: the bought item is a heart or not Yohann D'ANELLO 2020-12-09 17:04:29 +01:00
• 4dbd4f7912 Don't buy hearts, use them instant instead. Fixes #38 Yohann D'ANELLO 2020-12-09 16:57:46 +01:00
• 2d5a2e4c87 Display hazels in the StatsDisplay Yohann D'ANELLO 2020-12-09 16:54:53 +01:00
• 56627f3e84 Reorder texture pack entries Yohann D'ANELLO 2020-12-09 16:50:47 +01:00
• 05e79c14e3 Translate the settings entry that change the chat key Yohann D'ANELLO 2020-12-09 15:45:50 +01:00
• 405ee895d8 When an item is bought, remove it from the merchant inventory. Fixes #37 Yohann D'ANELLO 2020-12-09 15:35:53 +01:00
• 19b82ff71a Test merchants Yohann D'ANELLO 2020-12-09 15:32:37 +01:00
• 657f4e5209 Remove dead code: friendly entities are fighting entities Yohann D'ANELLO 2020-12-09 15:10:28 +01:00
• cea015d015 In load&save test, force to have a merchant Yohann D'ANELLO 2020-12-09 15:09:07 +01:00
• 39787861dc Test sunflowers interaction Yohann D'ANELLO 2020-12-09 15:05:19 +01:00
• 50d806cdcf Working Dijkstra Nicolas Margulies 2020-12-08 22:22:20 +01:00
• 7823a422b9 Start f new pathfinding, not working Nicolas Margulies 2020-12-08 00:59:19 +01:00
• 7ab4213273 Fix french translation file Yohann D'ANELLO 2020-12-07 22:03:48 +01:00
• e3ae7bcacf Resolve merge conflicts on german translation file Yohann D'ANELLO 2020-12-07 22:00:27 +01:00
• ca17bf424a Inventory displays were not updated when the texture pack changed Yohann D'ANELLO 2020-12-07 21:51:51 +01:00
• 2bb99a707e Merchant inventory is well-saved Yohann D'ANELLO 2020-12-07 21:48:56 +01:00
• 099508d4c0 Don't call screen.getkey() at a wrong place Yohann D'ANELLO 2020-12-07 21:29:57 +01:00
• 57fab7db51 Linting Yohann D'ANELLO 2020-12-07 21:22:06 +01:00
• b24cc1877f Merchant inventory is working! Yohann D'ANELLO 2020-12-07 21:13:55 +01:00
• 8540a8f354 Work in progress on printing a store menu. Its buggy though eichhornchen 2020-12-07 20:54:53 +01:00
• f648bcd7fb Merge branch 'es-translation' into 'master' ynerant 2020-12-07 01:04:55 +01:00
• fdc2bcab8d Add spanish translation Yohann D'ANELLO 2020-12-07 01:01:39 +01:00
• 7cfe55f42c Added a failsafe for cases where the walker population randomly dies out Charles Peyrat 2020-12-07 00:24:31 +01:00
• 2a1be4233b Fixed syntax error in Walker.split Charles Peyrat 2020-12-07 00:18:32 +01:00
• 32e6eab943 Added import enum.auto to mapgeneration.randomwalk Charles Peyrat 2020-12-06 23:55:57 +01:00
• d39427f978 Merge branch 'master' into village eichhornchen 2020-12-06 11:50:11 +01:00
• 866af98fe4 Merging master into village, conflicts were solved eichhornchen 2020-12-06 11:43:48 +01:00
• 38842cee68 There was a import error eichhornchen 2020-12-05 21:50:02 +01:00
• ba68e68584 Added a Gamemode for selling interfaces, as well as the base of the player/merchant interaction, related to issue #18 eichhornchen 2020-12-05 21:43:13 +01:00
• 6fa11d9dfe Merge branch 'body-snatch' into 'master' ynerant 2020-12-05 14:52:47 +01:00
• f8ca5b2cc5 Recalculate the path finder when the player exchanges its body Yohann D'ANELLO 2020-12-05 14:48:43 +01:00
• 7ad2cad77c Add a message in the logs when a body-snap potion is used Yohann D'ANELLO 2020-12-05 14:47:54 +01:00
• f39113fd0b Test body snatch potion, fixes #34 Yohann D'ANELLO 2020-12-05 14:39:33 +01:00
• c38f8cdc53 Save the inventory of the player when saving the game, fixes #33 Yohann D'ANELLO 2020-12-05 14:35:59 +01:00
• f887a1f0aa Entity name is a parameter since it can be changed through body snatch potion Yohann D'ANELLO 2020-12-05 14:25:22 +01:00
• ea672272f5 Add body snatch potion Yohann D'ANELLO 2020-12-05 14:20:58 +01:00
• 3985751bd1 Merge branch 'stack-items' into 'master' ynerant 2020-12-05 13:45:53 +01:00
• ca2ae15117 Stack items in the inventory, closes #29 Yohann D'ANELLO 2020-12-05 13:42:33 +01:00
• 4d60e95165 Merge branch 'inventory' into 'master' ynerant 2020-12-05 13:28:05 +01:00
• fb8b2aff01 The player must be alive to interact with the inventory Yohann D'ANELLO 2020-12-05 13:20:52 +01:00
• bc40f8d0e6 Some translations were missing in the settings menu Yohann D'ANELLO 2020-12-05 13:19:04 +01:00
• 013e81b3c0 Better sort in translation files, remove unwanted headers Yohann D'ANELLO 2020-12-05 13:13:04 +01:00
• 25c42ea9e8 Don't translate in english since it is the main language Yohann D'ANELLO 2020-12-05 13:07:37 +01:00
• 4b9399c687 Test inventory Yohann D'ANELLO 2020-12-04 18:16:46 +01:00
• 3717429549 Added some test default parameters for the random walk generator Charles Peyrat 2020-12-04 18:04:50 +01:00
• bc9c7cd7f7 Finalised implementation of the walker class with method split Charles Peyrat 2020-12-04 18:03:41 +01:00
• a5c53c898e Implemented walker class and methods random_turn, next_pos, move_in_bounds Charles Peyrat 2020-12-04 18:01:54 +01:00
• 91a4514649 'D' is not an intelligent key to drop an item Yohann D'ANELLO 2020-12-04 17:19:06 +01:00
• 5b4dc601bc Fix broken tests Yohann D'ANELLO 2020-12-04 17:15:41 +01:00
• 27fd73c96b Add log messages when a bomb is exploding Yohann D'ANELLO 2020-12-04 17:10:23 +01:00
• 056ca5cca8 Ensure that the inventory is not empty before interacting with an item Yohann D'ANELLO 2020-12-04 17:01:00 +01:00
• c7545e53f7 Items can be dropped/equipped/used Yohann D'ANELLO 2020-12-04 16:53:27 +01:00
• 0da7486750 Navigate through inventory menu Yohann D'ANELLO 2020-12-04 16:31:15 +01:00
• a68b3a6d08 Display full inventory Yohann D'ANELLO 2020-12-04 16:28:37 +01:00
• 428bbae736 Added base files for map generation and main loop for random walk generation Charles Peyrat 2020-12-04 16:02:48 +01:00
• fbfcd5dae0 Inventory title Yohann D'ANELLO 2020-12-04 16:02:03 +01:00
• cdd527a7fd Close the inventory using the same key Yohann D'ANELLO 2020-12-04 14:57:53 +01:00
• 067570fd1a The inventory is a popup Yohann D'ANELLO 2020-12-04 14:51:41 +01:00
• 39af791012 We can open an empty inventory! Yohann D'ANELLO 2020-12-04 14:41:59 +01:00
• 3886bee1ba Friendly entities are now a subclass of fighting entities, and can die. The T key is now used to talk to friendly entities eichhornchen 2020-12-04 00:27:25 +01:00
• 268e2d0dd2 Merge branch 'fix-lag' into 'master' ynerant 2020-12-02 16:07:13 +01:00
• da0d7e7055 Fix lag when monsters try to move in a random direction Yohann D'ANELLO 2020-12-02 16:04:43 +01:00
• 1ba6b1fbec Prototype of web streaming webserver Yohann D'ANELLO 2020-12-02 16:01:32 +01:00
• 654bab7c1d Translate sun flower messages Yohann D'ANELLO 2020-12-01 17:12:22 +01:00
• 29142cd91c Merge remote-tracking branch 'origin/master' into village Yohann D'ANELLO 2020-12-01 17:07:40 +01:00
• e5886bbe44 Merge branch 'translations' into 'master' ynerant 2020-11-28 16:23:12 +01:00
• 9f0a29302d Add german translation Yohann D'ANELLO 2020-11-28 16:22:06 +01:00
• 6b09d488b6 Documentation on translation Yohann D'ANELLO 2020-11-28 16:00:17 +01:00
• aade89de7b Tests and the CI are compiling messages Yohann D'ANELLO 2020-11-28 14:10:31 +01:00
• f78c73a703 Tests and the CI are compiling messages Yohann D'ANELLO 2020-11-28 14:02:23 +01:00
• a34dae2ad0 Compile messages on setup Yohann D'ANELLO 2020-11-28 13:49:28 +01:00
• 5ce62c15f7 Include locale files in Python setup script Yohann D'ANELLO 2020-11-28 03:23:04 +01:00