ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Map generation #116

Merged
ynerant merged 0 commits from map_generation into master 2021-01-10 22:54:30 +00:00
Conversation 31 Commits - Files Changed -
ynerant commented 2020-12-05 11:11:58 +00:00 (Migrated from gitlab.crans.org)
Copy Link
No description provided.
charlesp commented 2020-12-11 00:13:08 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 7 commits

  • 32e6eab9 - Added import enum.auto to mapgeneration.randomwalk
  • 2a1be423 - Fixed syntax error in Walker.split
  • 7cfe55f4 - Added a failsafe for cases where the walker population randomly dies out
  • d40a6155 - Changing the way the tile matrix is declared so that every column is...
  • 021731b7 - Switching up the tiles used during generation to the correct ones
  • 30201722 - Fixing the sampling of the starting position that caused out of bounds error
  • 45120d0c - Integrating procedural generation into the game

Compare with previous version

added 7 commits <ul><li>32e6eab9 - Added import enum.auto to mapgeneration.randomwalk</li><li>2a1be423 - Fixed syntax error in Walker.split</li><li>7cfe55f4 - Added a failsafe for cases where the walker population randomly dies out</li><li>d40a6155 - Changing the way the tile matrix is declared so that every column is...</li><li>021731b7 - Switching up the tiles used during generation to the correct ones</li><li>30201722 - Fixing the sampling of the starting position that caused out of bounds error</li><li>45120d0c - Integrating procedural generation into the game</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1282&start_sha=3717429549dc2e35bfbffb0ebe8bfb0a5b27d33e)
charlesp commented 2020-12-11 00:24:30 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 29798c13 - Syntax change for the failsafe

Compare with previous version

added 1 commit <ul><li>29798c13 - Syntax change for the failsafe</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1283&start_sha=45120d0c2b48661b4658a1b43d0c95fed4df42db)
ynerant commented 2020-12-11 01:20:17 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 202 commits

  • 29798c13...53cb6a89 - 199 commits from branch master
  • 7db2dd2b - Merge branch 'master' into map_generation
  • 8751120f - Merge master into map_generation, there were some commit behind
  • 3c614dcc - Linting

Compare with previous version

added 202 commits <ul><li>29798c13...53cb6a89 - 199 commits from branch <code>master</code></li><li>7db2dd2b - Merge branch &#39;master&#39; into map_generation</li><li>8751120f - Merge master into map_generation, there were some commit behind</li><li>3c614dcc - Linting</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1284&start_sha=29798c135e7a411f111908df74ab853bc9a2ee5d)
charlesp commented 2020-12-11 16:10:11 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 3 commits

  • 7fb743eb - Switching up start_x and start_y so the player spawn is correctly set
  • 3a8549cf - Added a method to interfaces.Map to get the neighbours of a given tile
  • 6a4d13c7 - Walls now generate around the floor

Compare with previous version

added 3 commits <ul><li>7fb743eb - Switching up start_x and start_y so the player spawn is correctly set</li><li>3a8549cf - Added a method to interfaces.Map to get the neighbours of a given tile</li><li>6a4d13c7 - Walls now generate around the floor</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1285&start_sha=3c614dcca9e9cbd1c3f71ad8832212cefcaeb5c7)
charlesp commented 2020-12-11 16:17:35 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

  • 757a460a - Fix typo
  • c8b07b3b - Only empty tiles should be changed to walls, obviously...

Compare with previous version

added 2 commits <ul><li>757a460a - Fix typo</li><li>c8b07b3b - Only empty tiles should be changed to walls, obviously...</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1286&start_sha=6a4d13c7264758f24490ade84c2eafb6d2d1a7a6)
charlesp commented 2020-12-11 16:46:59 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • d3c14a48 - Add docstring for Map.large_neighbourhood

Compare with previous version

added 1 commit <ul><li>d3c14a48 - Add docstring for Map.large_neighbourhood</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1287&start_sha=c8b07b3bf59175e2285fe57cb487b254cfd55f9a)
charlesp commented 2020-12-11 17:33:29 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 7667079a - Changed Map.large_neighbourhood so we can also request only immediate...

Compare with previous version

added 1 commit <ul><li>7667079a - Changed Map.large_neighbourhood so we can also request only immediate...</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1289&start_sha=d3c14a48ee4168c709c8941e92319477550abed3)
charlesp commented 2020-12-11 17:59:18 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>18ca083b - Added a connexity test</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1293&start_sha=7667079aa3c026d8fb067f8453cda69bc7c3f7ef)
ynerant commented 2020-12-11 18:03:03 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 52 commits

  • 18ca083b...81de0d8e - 51 commits from branch master
  • e91deccb - Merge branch 'master' into map_generation

Compare with previous version

added 52 commits <ul><li>18ca083b...81de0d8e - 51 commits from branch <code>master</code></li><li>e91deccb - Merge branch &#39;master&#39; into map_generation</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1294&start_sha=18ca083ba213142416f7f7d28458f8c0ee3144b2)
charlesp commented 2020-12-11 18:05:33 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>deb52d73 - Adding a missing parenthesis</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1295&start_sha=e91deccb6fa6b0fea9feec92c805fbf95921d2c2)
charlesp commented 2020-12-11 18:13:23 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • fe9dfdf2 - Syntax change in randomwalk.Generator.__init__

Compare with previous version

added 1 commit <ul><li>fe9dfdf2 - Syntax change in randomwalk.Generator.__init__</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1296&start_sha=deb52d73502eb481ffd208ea7c0c26d2e90f05d5)
charlesp commented 2020-12-11 18:14:55 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 3d766757 - Add testing for the no_lone_walls option

Compare with previous version

added 1 commit <ul><li>3d766757 - Add testing for the no_lone_walls option</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1297&start_sha=fe9dfdf242f32cd02b2041415306f11ae81d948d)
ynerant commented 2020-12-11 18:21:08 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

  • 895abe88 - Ensure that the neighboorhood is walkable in movement tests
  • 209bde5b - Fix sunflowers and merchants since the position of the player is no longer fixed

Compare with previous version

added 2 commits <ul><li>895abe88 - Ensure that the neighboorhood is walkable in movement tests</li><li>209bde5b - Fix sunflowers and merchants since the position of the player is no longer fixed</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1298&start_sha=3d7667573e158c454031e9e6633f898151bf49ca)
ynerant commented 2020-12-11 18:28:03 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • fb926f8c - Always use predefined map in game unit tests

Compare with previous version

added 1 commit <ul><li>fb926f8c - Always use predefined map in game unit tests</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1300&start_sha=209bde5b5c23bc6c278e3cb1d4bf49bdf8aa5b1c)
charlesp commented 2020-12-18 16:06:20 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 5fbb9181 - Add walls even to map borders

Compare with previous version

added 1 commit <ul><li>5fbb9181 - Add walls even to map borders</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1317&start_sha=fb926f8c844c2e08ba8a368c427b6b6ffc5aaa34)
charlesp commented 2020-12-18 17:11:27 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>ba3d979f - Fix syntax error</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1319&start_sha=5fbb9181320e3bf742a706639a303da2d8e6fc22)
charlesp commented 2020-12-18 19:02:55 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • f5e5e365 - Starting the implementation of the new map generator

Compare with previous version

added 1 commit <ul><li>f5e5e365 - Starting the implementation of the new map generator</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1320&start_sha=ba3d979f9c6ca72ccefe98d12a11e53bcfb7077c)
charlesp commented 2021-01-07 06:06:41 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

  • 9fb366aa - Make name follow style convention
  • 5579f5d7 - Room now can now generate with a corridor; implemenent door placement finding

Compare with previous version

added 2 commits <ul><li>9fb366aa - Make name follow style convention</li><li>5579f5d7 - Room now can now generate with a corridor; implemenent door placement finding</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1405&start_sha=f5e5e365d47f0e49f98f02f5945c25487a24abe1)
charlesp commented 2021-01-08 03:38:29 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 6 commits

  • bb3422f7 - Add main generation loop
  • 5cbf15be - Return value of Generator.run should be a Map
  • ddbd0299 - Implement method room_fits
  • 42f0c195 - Add prototype for create_random_room; change return value of attach_doors and...
  • 3229eb8e - Implement place_room method
  • ffa7641b - Made Map.neighbourhood a static method

Compare with previous version

added 6 commits <ul><li>bb3422f7 - Add main generation loop</li><li>5cbf15be - Return value of Generator.run should be a Map</li><li>ddbd0299 - Implement method room_fits</li><li>42f0c195 - Add prototype for create_random_room; change return value of attach_doors and...</li><li>3229eb8e - Implement place_room method</li><li>ffa7641b - Made Map.neighbourhood a static method</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1415&start_sha=5579f5d7913c22b5aa0f5f9c8403ae0fbb44ea59)
charlesp commented 2021-01-08 03:43:17 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6fbc757f - Implement method place_walls</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1416&start_sha=ffa7641b215b5ec47650a81b6432bde850509f14)
charlesp commented 2021-01-08 06:06:48 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 13 commits

  • c6f66d95 - Fix typos
  • 05ccd0e3 - Circular rooms should not try to generate any holes if their radius isn't large enough
  • abbad0f3 - Fix formulas in place_room and room_fits
  • 49e26155 - Fix typos
  • 20cbf546 - Correct formulas for random enumeration of a grid
  • 8475e522 - Large neighbourhood shouldn't return the central cell
  • c959a9d8 - Update tests because Map.neighbourhood became a static method
  • 9c252a2b - Correct out of bounds errors and add missing arguments to range call
  • d362bdc9 - Fix place_room and add missing argument
  • b0ac5806 - Fix place_walls, that placed floors instead ...
  • e21d4d23 - Add missing termination condition
  • 5ba07afc - Fix typo in parameter names
  • ff1a07ac - Revamp the door chosing algorithm to verify every neighbouring tile is empty;...

Compare with previous version

added 13 commits <ul><li>c6f66d95 - Fix typos</li><li>05ccd0e3 - Circular rooms should not try to generate any holes if their radius isn&#39;t large enough</li><li>abbad0f3 - Fix formulas in place_room and room_fits</li><li>49e26155 - Fix typos</li><li>20cbf546 - Correct formulas for random enumeration of a grid</li><li>8475e522 - Large neighbourhood shouldn&#39;t return the central cell</li><li>c959a9d8 - Update tests because Map.neighbourhood became a static method</li><li>9c252a2b - Correct out of bounds errors and add missing arguments to range call</li><li>d362bdc9 - Fix place_room and add missing argument</li><li>b0ac5806 - Fix place_walls, that placed floors instead ...</li><li>e21d4d23 - Add missing termination condition</li><li>5ba07afc - Fix typo in parameter names</li><li>ff1a07ac - Revamp the door chosing algorithm to verify every neighbouring tile is empty;...</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1417&start_sha=6fbc757f1e2b46e7dc4da95400dc26b1fbdeb81e)
charlesp commented 2021-01-08 06:30:57 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 29b67a4a - Floors for corridors were not being built properly

Compare with previous version

added 1 commit <ul><li>29b67a4a - Floors for corridors were not being built properly</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1418&start_sha=ff1a07ac4029285fc065620cc83c5eb1b004fd7e)
charlesp commented 2021-01-10 20:50:44 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 5 commits

  • 26e66a57 - Implement method add_loops along with tests
  • 96bbc508 - Add a test case for non connex maps in distance computation
  • e639ad62 - Getting to full cover, and minor fix to bug that allowed corridors to create...
  • 12e19759 - Implement populate method, so map generation also handles entity spawn
  • 13e36286 - Merge branch 'map_generation' of...

Compare with previous version

added 5 commits <ul><li>26e66a57 - Implement method add_loops along with tests</li><li>96bbc508 - Add a test case for non connex maps in distance computation</li><li>e639ad62 - Getting to full cover, and minor fix to bug that allowed corridors to create...</li><li>12e19759 - Implement populate method, so map generation also handles entity spawn</li><li>13e36286 - Merge branch &#39;map_generation&#39; of...</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1462&start_sha=ad3cce116e470d20548fab41cbe4e4f59944ebaf)
ynerant commented 2021-01-10 20:58:01 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 01cdea6e - Don't spawn random entities on each level anymore

Compare with previous version

added 1 commit <ul><li>01cdea6e - Don&#39;t spawn random entities on each level anymore</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1463&start_sha=13e3628668d78584a02b77b181f6e4a55a717d33)
ynerant commented 2021-01-10 21:08:53 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9df1ac78 - Linting</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1464&start_sha=01cdea6edcbf6e48a2ef61a1d1523dd999bea5b2)
ynerant commented 2021-01-10 21:19:32 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 71 commits

  • 9df1ac78...b004dec8 - 69 commits from branch master
  • 4c7a2e9f - Merge branch 'master' into map_generation
  • 0ea10546 - Fix merge issues

Compare with previous version

added 71 commits <ul><li>9df1ac78...b004dec8 - 69 commits from branch <code>master</code></li><li>4c7a2e9f - Merge branch &#39;master&#39; into map_generation</li><li>0ea10546 - Fix merge issues</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1466&start_sha=9df1ac78832498838617b9b440ab738a1e044236)
ynerant commented 2021-01-10 21:27:57 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>5e378fc2 - Update game rules</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1468&start_sha=0ea10546ace7b34f60e90086ae9100dafd4a00c3)
charlesp commented 2021-01-10 22:02:46 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

Compare with previous version

added 2 commits <ul><li>099a0eab - Add comments and docstring</li><li>ca67d5d7 - Merge remote branch</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1471&start_sha=5e378fc2d02f87b6d5581cf4e4c24e4a6592fa76)
ynerant commented 2021-01-10 22:54:15 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 10 commits

  • e7443108 - Place doors at the beginning of the corridor
  • 6c0aaffd - Doors are walls
  • 11daa857 - The players can open doors
  • 8f845d1e - Doors don't break the connexity of map
  • b0ca1d4e - Cover everytime the map generation test
  • 60675d78 - Cover doors code
  • 65ae99a2 - The logs of the map was not updated
  • 2031d7fa - Merge branch 'map_generation' into 'doors'
  • 588357e5 - Linting
  • b72e41d1 - Merge branch 'doors' into 'map_generation'

Compare with previous version

added 10 commits <ul><li>e7443108 - Place doors at the beginning of the corridor</li><li>6c0aaffd - Doors are walls</li><li>11daa857 - The players can open doors</li><li>8f845d1e - Doors don&#39;t break the connexity of map</li><li>b0ca1d4e - Cover everytime the map generation test</li><li>60675d78 - Cover doors code</li><li>65ae99a2 - The logs of the map was not updated</li><li>2031d7fa - Merge branch &#39;map_generation&#39; into &#39;doors&#39;</li><li>588357e5 - Linting</li><li>b72e41d1 - Merge branch &#39;doors&#39; into &#39;map_generation&#39;</li></ul> [Compare with previous version](/ynerant/squirrel-battle/-/merge_requests/35/diffs?diff_id=1475&start_sha=ca67d5d7f47ac5024707ad44c54662317a56b46d)
ynerant commented 2021-01-10 22:54:25 +00:00 (Migrated from gitlab.crans.org)
Copy Link

marked this merge request as ready

marked this merge request as **ready**
ynerant commented 2021-01-10 22:54:30 +00:00 (Migrated from gitlab.crans.org)
Copy Link

mentioned in commit e9374c5e6b

mentioned in commit e9374c5e6bc672bf623100f7132a1f5e08a137c5
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug

   
documentation

   
Doing

   
Features

   
Improvements

   
Sugar coating

   
To Do
No Label
Bug
documentation
Doing
Features
Improvements
Sugar coating
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ynerant/squirrel-battle#116
No description provided.
Delete Branch "map_generation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?