DoorSpaceRandomizer #35
Conversation
There was a problem hiding this comment.
Definitely going in the right direction. Most of the comments are formatting related. Be sure to read the developing section that deals with installing pre-commit so that you don't have to worry about formatting it yourself by hand.
donjuan/randomizer.py
Outdated
| @@ -1,7 +1,7 @@ | |||
| import random | |||
| from typing import Optional | |||
|
|
|||
| from donjuan import Cell, Grid | |||
| from donjuan import Cell, Grid, DoorSpace, Door,Portcullis,Archway | |||
donjuan/randomizer.py
Outdated
| @@ -16,6 +16,9 @@ def randomize_cell(self, cell: Cell) -> None: | |||
| def randomize_grid(self, grid: Grid) -> None: | |||
| """Randomize properties of the `Grid`""" | |||
| pass # pragma: no cover | |||
| def randomize_door(self, cell: DoorSpace): | |||
There was a problem hiding this comment.
| def randomize_door(self, cell: DoorSpace): | |
| def randomize_door(self, cell: DoorSpace): |
There was a problem hiding this comment.
Also the argument should be cell is should be called door_space.
donjuan/randomizer.py
Outdated
| @@ -41,3 +44,30 @@ def randomize_grid(self, grid: Grid) -> None: | |||
| for j in range(grid.n_cols): | |||
| self.randomize_cell(grid.cells[i][j]) | |||
| return | |||
| class DoorSpaceRandomizer(Randomizer): | |||
| """ | |||
| Randomly set the :attrs: of the DoorSpace and select a DoorSpace type (Door, Archway, Portcullis). | |||
There was a problem hiding this comment.
| Randomly set the :attrs: of the DoorSpace and select a DoorSpace type (Door, Archway, Portcullis). | |
| Randomly set the attributes of the DoorSpace subclass (Door, Archway, Portcullis). |
| def randomize_doorspace(self, door_space:DoorSpace): | ||
| # | ||
| door_types = [Door, Portcullis, Archway] | ||
| material_types = ["wood","metal","stone"] |
donjuan/randomizer.py
Outdated
| selected_type = door_types[random.randint(0,len(door_types) - 1)]() | ||
|
|
||
| if(isinstance(selected_type, Door)): | ||
| door_space = Door(secret=secret,locked=locked,closed=closed,jammed=jammed,blocked=blocked,broken=broken,material=material) |
There was a problem hiding this comment.
We don't want to replace the object with another (it wouldn't work anyway, because pass by reference). We just want to set the attributes.
| door_space = Door(secret=secret,locked=locked,closed=closed,jammed=jammed,blocked=blocked,broken=broken,material=material) | |
| door_space.secret=secret | |
| door_space.locked=locked | |
| door_space.closed=closed | |
| door_space.jammed=jammed | |
| door_space.blocked=blocked | |
| door_space.broken=broken | |
| door_space.material=material |
same goes for the portcullis and archway cases.
donjuan/randomizer.py
Outdated
| door_space = Portcullis(locked=locked,closed=closed,jammed=jammed,broken=broken,material=material) | ||
| elif(isinstance(selected_type, Archway)): | ||
| door_space = Archway(material=material,blocked=blocked,broken=broken,secret=secret) | ||
| return door_space |
There was a problem hiding this comment.
Pass by reference, so no return value.
| return door_space | |
| return |
donjuan/randomizer.py
Outdated
| elif(isinstance(selected_type, Portcullis)): | ||
| door_space = Portcullis(locked=locked,closed=closed,jammed=jammed,broken=broken,material=material) | ||
| elif(isinstance(selected_type, Archway)): | ||
| door_space = Archway(material=material,blocked=blocked,broken=broken,secret=secret) |
There was a problem hiding this comment.
Multiple if cases should be ended with an else. In this case it should raise an error, since it means we are dealing with an unknown type.
| door_space = Archway(material=material,blocked=blocked,broken=broken,secret=secret) | |
| door_space = Archway(material=material,blocked=blocked,broken=broken,secret=secret) | |
| else: | |
| raise TypeError(f"unknown type: type(door_space) = {type(door_space)") |
|
Made some of the requested changes. Still have tests missing but I wanted to at least push the changes up in case anyone was waiting on it. |
|
None of the tests are passing, I merged in latest main into my branch, and it's throwing all kinds of issues. So i'll keep trying to iron that out |
This is the first pass for creating the
DoorSpaceRandomizerclass.It is not complete, but I just want feedback on progress so far. Tests still need to be written, etc