Commit Graph

756 Commits

Author SHA1 Message Date
ynerant 5c07071cff Merge branch 'moredocs' into 'master'
Moredocs

See merge request ynerant/squirrel-battle!63
2021-01-10 12:11:37 +01:00
Yohann D'ANELLO 0ef5875a72
Documentation on ladders 2021-01-10 12:07:53 +01:00
Yohann D'ANELLO 92a3081b2e
Display "Edit on Gitlab" button 2021-01-10 11:58:32 +01:00
eichhornchen dd37c2f62f Renamed the title's ascii art file. 2021-01-10 11:54:49 +01:00
Yohann D'ANELLO 6d786c7358
Documentation on unit tests 2021-01-10 11:30:04 +01:00
Yohann D'ANELLO d738029335
Fix import order 2021-01-10 11:25:53 +01:00
Yohann D'ANELLO 94c12541ef
Happy new year! 2021-01-10 10:46:17 +01:00
Yohann D'ANELLO 391fe6897b
Drop unusued english translation file 2021-01-10 10:29:43 +01:00
ynerant 5b5180d44a Merge branch 'fix-tty-colors' into 'master'
Don't use custom colors on unsupported screens, fixes #67

Closes #67

See merge request ynerant/squirrel-battle!61
2021-01-09 21:52:03 +01:00
nicomarg 1e5a268586 Merge branch 'remove-debug-code' into 'master'
Removed debug code

See merge request ynerant/squirrel-battle!62
2021-01-09 18:49:20 +01:00
Nicolas Margulies 7bf1789239 Removed debug code 2021-01-09 18:45:55 +01:00
Yohann D'ANELLO 8cb2b2388f
Don't use custom colors on unsupported screens, fixes #67 2021-01-09 18:42:11 +01:00
eichhornchen 93a9e5e4c4 Merge branch 'moreitems' into 'master'
Moreitems

Closes #64 and #60

See merge request ynerant/squirrel-battle!60
2021-01-09 00:05:14 +01:00
eichhornchen ac4a73b2cb Final linting 2021-01-09 00:01:02 +01:00
eichhornchen cbe3e226b4 Repaired a merge error, tests now work. 2021-01-08 23:51:47 +01:00
eichhornchen eac9057f31 Merge branch 'master' into 'moreitems'
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-08 23:41:21 +01:00
eichhornchen 2eb42668c8 Linting and tests for chests 2021-01-08 23:32:47 +01:00
eichhornchen bdbf214d8d Added chests, they are immortal and contain objects the player can take for free. 2021-01-08 23:15:48 +01:00
eichhornchen 175706b1e4 Merchants had default maxhealth. 2021-01-08 22:30:30 +01:00
eichhornchen 9ff615a6b0 Linting and tests... 2021-01-08 22:25:00 +01:00
Yohann D'ANELLO ad3cce116e
Load map floor index when loading a new game 2021-01-08 21:23:12 +01:00
Yohann D'ANELLO 949555ffff
Map at floor -1 is now not deterministic 2021-01-08 20:06:32 +01:00
Yohann D'ANELLO 571857b063
Generate a random map when changing floor 2021-01-08 20:00:42 +01:00
Yohann D'ANELLO d8d0bc6190
Fix the end ladder 2021-01-08 20:00:10 +01:00
Charles Peyrat 9e099d0715 Ladders should spawn with no wall nearby 2021-01-08 19:50:27 +01:00
eichhornchen 746379bad6 Now with EXPLOSIONS! 2021-01-08 19:18:29 +01:00
eichhornchen 591630b8a7 Added a fire ball staff, closes #64 2021-01-08 19:05:02 +01:00
eichhornchen 903a06c36c Subclassed and removed some debugging code 2021-01-08 18:38:54 +01:00
eichhornchen f6210a6356 Added a Bow, related to #64 2021-01-08 18:06:26 +01:00
nicomarg da8cf238ee Merge branch 'mobs-seeing-through-walls' into 'master'
Resolve "Mobs seeing through walls"

Closes #63

See merge request ynerant/squirrel-battle!59
2021-01-08 17:34:27 +01:00
Nicolas Margulies 46a5dc6931 Made mobs check if they can see the player 2021-01-08 17:26:56 +01:00
Charles Peyrat 7e14122b8c Randomly place exit ladder 2021-01-08 17:25:52 +01:00
Yohann D'ANELLO df2c1a4b55
Add ladder on the start position 2021-01-08 17:10:42 +01:00
Yohann D'ANELLO 8e7029e34d
Fix walls 2021-01-08 17:10:30 +01:00
Yohann D'ANELLO 1ab63434f6
Merge branch 'master' into map_generation
# Conflicts:
#	squirrelbattle/game.py
#	squirrelbattle/interfaces.py
#	squirrelbattle/tests/game_test.py
2021-01-08 17:02:10 +01:00
Yohann D'ANELLO afaa9d17cd
Linting 2021-01-08 16:55:02 +01:00
Yohann D'ANELLO 9b853324ad
Drop first version of random walk 2021-01-08 16:52:38 +01:00
Charles Peyrat c216a6089e Add a break so that generated rooms arre only placed once 2021-01-08 16:51:04 +01:00
Charles Peyrat a390f4f5e9 Fix is_connex tests 2021-01-08 16:21:16 +01:00
eichhornchen bde33e9232 Added a second scroll object closes #60 2021-01-08 16:14:40 +01:00
Charles Peyrat 0aa4eb9c0b Refactoring in tests to allow for easy connexity verification 2021-01-08 16:11:17 +01:00
ynerant 4a80dc36ad Merge branch 'save_floors' into 'master'
Save floors

Closes #62 et #61

See merge request ynerant/squirrel-battle!58
2021-01-08 16:05:10 +01:00
Yohann D'ANELLO 7a4936e6a5
Test monocles 2021-01-08 15:58:54 +01:00
Charles Peyrat 785ac403e3 Forbid walker from ever reaching the outer most edge of the map 2021-01-08 15:56:30 +01:00
Charles Peyrat f240cafa83 Fixing syntax in tests 2021-01-08 15:55:26 +01:00
Yohann D'ANELLO a497d08f31
Implement the monocle of truth, closes #62 2021-01-08 15:48:12 +01:00
Charles Peyrat 5424c7cd98 Nicer default parameters 2021-01-08 15:20:32 +01:00
Charles Peyrat dab84738d9 Remove the starting room door only if it really shouldn't be here; also account for the new randomized placement in removing lone door tile 2021-01-08 15:18:13 +01:00
Yohann D'ANELLO 1270640619
Change hint whenever the T key is pressed or not 2021-01-08 15:07:35 +01:00
Charles Peyrat 8d7e264381 Fix a bug where the generator could crash by trying to place the starting room out of bounds; starting room position is now random 2021-01-08 15:06:38 +01:00