diff --git a/src/adm_mine.py b/src/adm_mine.py new file mode 100644 index 0000000..ef5fe08 --- /dev/null +++ b/src/adm_mine.py @@ -0,0 +1,10 @@ +from typing import Union + +from mine import Mine + + +class ADMMine(Mine): + mine_type = 'ADM' + + def __init__(self, pressure: Union[float, int], armed: bool = True): + super().__init__(pressure, armed) diff --git a/src/ap_mine.py b/src/ap_mine.py index 833533f..2c035ec 100644 --- a/src/ap_mine.py +++ b/src/ap_mine.py @@ -1,8 +1,10 @@ +from typing import Union + from mine import Mine class APMine(Mine): - defuse_method = 2 + mine_type = 'AP' - def __init__(self): - super().__init__() + def __init__(self, pressure: Union[float, int], armed: bool = True): + super().__init__(pressure, armed) diff --git a/src/at_mine.py b/src/at_mine.py index f89a331..dfac7a7 100644 --- a/src/at_mine.py +++ b/src/at_mine.py @@ -1,8 +1,10 @@ +from typing import Union + from mine import Mine class ATMine(Mine): - defuse_method = 1 + mine_type = 'AT' - def __init__(self): - super().__init__() + def __init__(self, pressure: Union[float, int], armed: bool = True): + super().__init__(pressure, armed) diff --git a/src/mine.py b/src/mine.py index d317a41..d636929 100644 --- a/src/mine.py +++ b/src/mine.py @@ -1,3 +1,7 @@ +from typing import Union + + class Mine: - def __init__(self, is_armed: bool = True): - self.is_armed = is_armed + def __init__(self, pressure: Union[float, int], armed: bool): + self.is_armed = armed + self.pressure = pressure diff --git a/src/tile.py b/src/tile.py index 4063c3f..1c726f1 100644 --- a/src/tile.py +++ b/src/tile.py @@ -5,7 +5,10 @@ from at_mine import ATMine class Tile: - def __init__(self, number: int, weight: int, mine: Union[None, APMine, ATMine] = None): + def __init__(self, number: int, weight: int, visibility, stability, ground, mine: Union[None, APMine, ATMine] = None): self.number = number self.mine = mine self.weight = weight + self.visibility = visibility + self.stability = stability + self.ground = ground