From 982ea986dda1dde40d3c4844fefee9003ba320b4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-0JSGHSD\\nasuh" Date: Wed, 20 Oct 2021 23:23:59 +0300 Subject: [PATCH 1/5] add vibranium material --- src/MaterialManager.py | 8 ++++++-- src/Util.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index bdfbaa2..6051080 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -7,7 +7,7 @@ def __init__(self, params: list): self.params = params # other configurations - def changeMaterial(self, material) -> bool: + def changeMaterial(self, material) -> bool: returnText = "" match material: @@ -19,8 +19,12 @@ def changeMaterial(self, material) -> bool: self.carManager.setMaterial(materialType.Carbon) returnText = "Material is changed to Carbon." + case materialType.Vibranium: + self.carManager.setMaterial(materialType.Vibranium) + returnText = "Material is changed to Vibranium." + case _: - returnText = "Material seletion is invalid." + returnText = "Material selection is invalid." return self._announceMaterial(returnText) diff --git a/src/Util.py b/src/Util.py index 81ab0ba..34422c6 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,3 @@ from enum import Enum -materialType = Enum('Titanium', 'Carbon') +materialType = Enum('Titanium', 'Carbon', 'Vibranium') From e2d9719bf4ede61a6dc9a6f15934fffff097c98e Mon Sep 17 00:00:00 2001 From: "DESKTOP-0JSGHSD\\nasuh" Date: Wed, 20 Oct 2021 23:24:23 +0300 Subject: [PATCH 2/5] add comment for vibranium material --- src/Util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Util.py b/src/Util.py index 34422c6..3707321 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,4 @@ from enum import Enum +# vibranium is specific to Steve's car materialType = Enum('Titanium', 'Carbon', 'Vibranium') From d31d39ae125118e26b0c9a06a5ebbb84ae20e939 Mon Sep 17 00:00:00 2001 From: "DESKTOP-0JSGHSD\\nasuh" Date: Wed, 20 Oct 2021 23:25:44 +0300 Subject: [PATCH 3/5] add alloyX material --- src/MaterialManager.py | 9 +++++++-- src/Util.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index bdfbaa2..a8a6e80 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -7,7 +7,7 @@ def __init__(self, params: list): self.params = params # other configurations - def changeMaterial(self, material) -> bool: + def changeMaterial(self, material) -> bool: returnText = "" match material: @@ -19,10 +19,15 @@ def changeMaterial(self, material) -> bool: self.carManager.setMaterial(materialType.Carbon) returnText = "Material is changed to Carbon." + case materialType.AlloyX: + self.carManager.setMaterial(materialType.AlloyX) + returnText = "Material is changed to AlloyX." + case _: - returnText = "Material seletion is invalid." + returnText = "Material selection is invalid." return self._announceMaterial(returnText) + def _announceMaterial(self, text: str) -> bool: return self.announcer(text) diff --git a/src/Util.py b/src/Util.py index 81ab0ba..5abfeff 100644 --- a/src/Util.py +++ b/src/Util.py @@ -1,3 +1,3 @@ from enum import Enum -materialType = Enum('Titanium', 'Carbon') +materialType = Enum('Titanium', 'Carbon', 'AlloyX') From 03119b91299206bbcf288cfcd9ec93714e5da5a8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-0JSGHSD\\nasuh" Date: Wed, 20 Oct 2021 23:27:58 +0300 Subject: [PATCH 4/5] =?UTF-8?q?refactor=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaterialManager.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index 4950f32..b0c3adb 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -9,25 +9,20 @@ def __init__(self, params: list): def changeMaterial(self, material) -> bool: returnText = "" + textBaseForValidMaterial = "Material is changed to" match material: case materialType.Titanium: self.carManager.setMaterial(materialType.Titanium) - returnText = "Material is changed to Titanium." + returnText = textBaseForValidMaterial + " Titanium." case materialType.Carbon: self.carManager.setMaterial(materialType.Carbon) - returnText = "Material is changed to Carbon." + returnText = textBaseForValidMaterial + " Carbon." -<<<<<<< HEAD - case materialType.Vibranium: - self.carManager.setMaterial(materialType.Vibranium) - returnText = "Material is changed to Vibranium." -======= case materialType.AlloyX: self.carManager.setMaterial(materialType.AlloyX) - returnText = "Material is changed to AlloyX." ->>>>>>> bruce-alloyX + returnText = textBaseForValidMaterial + " AlloyX." case _: returnText = "Material selection is invalid." @@ -35,5 +30,6 @@ def changeMaterial(self, material) -> bool: return self._announceMaterial(returnText) + def _announceMaterial(self, text: str) -> bool: return self.announcer(text) From 9a3b9210b5a82bfb3eb7b0c3544bb36b0853fbb5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-0JSGHSD\\nasuh" Date: Wed, 20 Oct 2021 23:28:26 +0300 Subject: [PATCH 5/5] refactor with f-strings --- src/MaterialManager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MaterialManager.py b/src/MaterialManager.py index b0c3adb..dee8786 100644 --- a/src/MaterialManager.py +++ b/src/MaterialManager.py @@ -14,15 +14,15 @@ def changeMaterial(self, material) -> bool: match material: case materialType.Titanium: self.carManager.setMaterial(materialType.Titanium) - returnText = textBaseForValidMaterial + " Titanium." + returnText = f"{textBaseForValidMaterial} Titanium." case materialType.Carbon: self.carManager.setMaterial(materialType.Carbon) - returnText = textBaseForValidMaterial + " Carbon." + returnText = f"{textBaseForValidMaterial} Carbon." case materialType.AlloyX: self.carManager.setMaterial(materialType.AlloyX) - returnText = textBaseForValidMaterial + " AlloyX." + returnText = f"{textBaseForValidMaterial} AlloyX." case _: returnText = "Material selection is invalid." @@ -31,5 +31,6 @@ def changeMaterial(self, material) -> bool: + def _announceMaterial(self, text: str) -> bool: return self.announcer(text)