Yohann D'ANELLO
|
04ae56e451
|
Higher abstraction level on addmsg, fixes #43
|
2020-12-12 13:46:45 +01:00 |
|
Yohann D'ANELLO
|
48318a91fe
|
Give more hazels to the player when testing the interaction with merchants
|
2020-12-11 21:19:25 +01:00 |
|
Yohann D'ANELLO
|
777668848e
|
Clicking on the main image changes its color
|
2020-12-11 21:17:21 +01:00 |
|
Yohann D'ANELLO
|
fb926f8c84
|
Always use predefined map in game unit tests
|
2020-12-11 19:27:57 +01:00 |
|
Nicolas Margulies
|
1cf5e7bd8b
|
First implementation of visibility, not tested, nor used for now
|
2020-12-11 19:23:21 +01:00 |
|
Yohann D'ANELLO
|
209bde5b5c
|
Fix sunflowers and merchants since the position of the player is no longer fixed
|
2020-12-11 19:21:02 +01:00 |
|
Yohann D'ANELLO
|
895abe88ad
|
Ensure that the neighboorhood is walkable in movement tests
|
2020-12-11 19:18:48 +01:00 |
|
Charles Peyrat
|
3d7667573e
|
Add testing for the no_lone_walls option
|
2020-12-11 19:14:28 +01:00 |
|
Charles Peyrat
|
fe9dfdf242
|
Syntax change in randomwalk.Generator.__init__
|
2020-12-11 19:13:15 +01:00 |
|
Charles Peyrat
|
deb52d7350
|
Adding a missing parenthesis
|
2020-12-11 19:05:26 +01:00 |
|
Yohann D'ANELLO
|
e91deccb6f
|
Merge branch 'master' into map_generation
# Conflicts:
# squirrelbattle/interfaces.py
|
2020-12-11 19:02:45 +01:00 |
|
Charles Peyrat
|
18ca083ba2
|
Added a connexity test
|
2020-12-11 18:59:07 +01:00 |
|
ynerant
|
81de0d8eb0
|
Merge branch 'mouse_interaction' into 'master'
Mouse interaction
Closes #40
See merge request ynerant/squirrel-battle!45
|
2020-12-11 18:47:20 +01:00 |
|
Yohann D'ANELLO
|
a4a10e340d
|
Test clicking on the merchant pad
|
2020-12-11 18:44:05 +01:00 |
|
ynerant
|
53d090a9c8
|
Merge branch 'master' into 'mouse_interaction'
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/entities/items.py
|
2020-12-11 18:38:13 +01:00 |
|
Yohann D'ANELLO
|
f453b82a58
|
Test clicking on the screen
|
2020-12-11 18:33:47 +01:00 |
|
Charles Peyrat
|
7667079aa3
|
Changed Map.large_neighbourhood so we can also request only immediate neighbours, ignoring diagonals
|
2020-12-11 18:33:16 +01:00 |
|
eichhornchen
|
9d3e8a9822
|
Merge branch 'village' into 'master'
Village
Closes #41, #38, #37, #36, and #18
See merge request ynerant/squirrel-battle!44
|
2020-12-11 18:23:10 +01:00 |
|
Yohann D'ANELLO
|
d9912cacad
|
Listen to mouse clicks in the main loop
|
2020-12-11 18:17:59 +01:00 |
|
Yohann D'ANELLO
|
45f420aaef
|
Linting
|
2020-12-11 18:17:08 +01:00 |
|
eichhornchen
|
e7f24c2371
|
The store menu now displays the price of objects, fixes #41
|
2020-12-11 18:08:10 +01:00 |
|
Yohann D'ANELLO
|
1afa397fec
|
Better interaction with inventory menu
|
2020-12-11 18:07:39 +01:00 |
|
Charles Peyrat
|
d3c14a48ee
|
Add docstring for Map.large_neighbourhood
|
2020-12-11 17:46:49 +01:00 |
|
Yohann D'ANELLO
|
089a247b2f
|
Maybe mouse clicks may use the game
|
2020-12-11 17:43:46 +01:00 |
|
Yohann D'ANELLO
|
d50f6701f4
|
Open a menu with the mouse
|
2020-12-11 17:40:56 +01:00 |
|
Yohann D'ANELLO
|
99352bc1d5
|
Test buying an item when we don't have enough of money
|
2020-12-11 17:28:16 +01:00 |
|
Yohann D'ANELLO
|
7179346e2b
|
Add a InventoryHolder superclass for player and merchants
|
2020-12-11 17:20:50 +01:00 |
|
Charles Peyrat
|
c8b07b3bf5
|
Only empty tiles should be changed to walls, obviously...
|
2020-12-11 17:17:11 +01:00 |
|
Charles Peyrat
|
757a460a44
|
Fix typo
|
2020-12-11 17:13:12 +01:00 |
|
Charles Peyrat
|
6a4d13c726
|
Walls now generate around the floor
|
2020-12-11 17:09:59 +01:00 |
|
Charles Peyrat
|
3a8549cfcc
|
Added a method to interfaces.Map to get the neighbours of a given tile
|
2020-12-11 17:09:27 +01:00 |
|
Yohann D'ANELLO
|
98b5dd64a8
|
Linting
|
2020-12-11 17:06:30 +01:00 |
|
Charles Peyrat
|
7fb743eb72
|
Switching up start_x and start_y so the player spawn is correctly set
|
2020-12-11 17:02:22 +01:00 |
|
Yohann D'ANELLO
|
bbe37eab97
|
Listen for clicks, detect which display was clicked
|
2020-12-11 16:56:22 +01:00 |
|
eichhornchen
|
b9b776b7ad
|
Player now pays for what he buys and buying a heart does not put it in the inventory. Solves #38 and #36
|
2020-12-11 16:49:17 +01:00 |
|
eichhornchen
|
7ba49277a9
|
Added a symbol for hazels in the ascii texturepack
|
2020-12-11 15:52:36 +01:00 |
|
Yohann D'ANELLO
|
3c614dcca9
|
Linting
|
2020-12-11 02:19:59 +01:00 |
|
Yohann D'ANELLO
|
8751120fe1
|
Merge master into map_generation, there were some commit behind
|
2020-12-11 02:17:00 +01:00 |
|
Yohann D'ANELLO
|
7db2dd2b46
|
Merge branch 'master' into map_generation
# Conflicts:
# dungeonbattle/game.py
# squirrelbattle/mapgeneration/__init__.py
# squirrelbattle/mapgeneration/randomwalk.py
|
2020-12-11 02:14:47 +01:00 |
|
Charles Peyrat
|
29798c135e
|
Syntax change for the failsafe
|
2020-12-11 01:24:20 +01:00 |
|
Charles Peyrat
|
45120d0c2b
|
Integrating procedural generation into the game
|
2020-12-11 01:13:00 +01:00 |
|
Charles Peyrat
|
302017222d
|
Fixing the sampling of the starting position that caused out of bounds error
|
2020-12-11 01:11:07 +01:00 |
|
Charles Peyrat
|
021731b740
|
Switching up the tiles used during generation to the correct ones
|
2020-12-11 01:09:49 +01:00 |
|
Charles Peyrat
|
d40a61554e
|
Changing the way the tile matrix is declared so that every column is represented by a different list
|
2020-12-11 01:04:30 +01:00 |
|
nicomarg
|
53cb6a89ae
|
Merge branch '35-better-pathfinding' into 'master'
Resolve "Better pathfinding"
Closes #35
See merge request ynerant/squirrel-battle!43
|
2020-12-10 22:31:40 +01:00 |
|
Nicolas Margulies
|
01cc77e146
|
Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles
|
2020-12-10 22:28:12 +01:00 |
|
Nicolas Margulies
|
cc6033e8e4
|
New pathfinding that avoids most of the mobs getting stuck, closes #35
|
2020-12-10 22:21:09 +01:00 |
|
Yohann D'ANELLO
|
6d4c0b2ca3
|
Testing the merchant must handle two cases: the bought item is a heart or not
|
2020-12-09 17:04:29 +01:00 |
|
Yohann D'ANELLO
|
4dbd4f7912
|
Don't buy hearts, use them instant instead. Fixes #38
|
2020-12-09 16:57:46 +01:00 |
|
Yohann D'ANELLO
|
2d5a2e4c87
|
Display hazels in the StatsDisplay
|
2020-12-09 16:54:53 +01:00 |