Extension Period Final Release

ohtuprojekti-farmasia · Feb 6, 2020 · 16fb046 · 16fb046
2 parents fe668e0 + 9987037
commit 16fb046
Show file tree

Hide file tree

Showing 3 changed files with 227 additions and 206 deletions.
diff --git a/...ripts/ProgressSystem/TaskFactory/Tasks/MedicinePreparation/Workspace/MedicineToSyringe.cs b/...ripts/ProgressSystem/TaskFactory/Tasks/MedicinePreparation/Workspace/MedicineToSyringe.cs
@@ -61,7 +61,7 @@ private void NeedleWithSyringeInsertedIntoBottle(CallbackData data) {
  private void TakingMedicineFromBottle(CallbackData data) {
  Syringe s = data.DataObject as Syringe;
  if (s.BottleContainer.Capacity == 100000) {
- CreateTaskMistake("Ruiskulla otettiin väärää lääkettä", -5);
+ CreateTaskMistake("Ruiskulla otettiin väärää lääkettä", 5);
  }
  }
 

diff --git a/Assets/Scripts/UISystem/Description.cs b/Assets/Scripts/UISystem/Description.cs
@@ -15,7 +15,28 @@ void Update() {
  }
 
  private void SetText() {
- string text = "<color=#000000> " + G.Instance.Progress.CurrentPackage.name + " </color> \n";
+ string packageName = "";
+ if (G.Instance.Progress.CurrentPackage.activeTasks.Count <= 0) {
+ currentTextField.text = "<color=#0be325> Pisteet oikealla \n-----></color>";
+ return;
+ }
+
+
+ switch (G.Instance.Progress.CurrentPackage.name) {
+ case PackageName.EquipmentSelection:
+ packageName = "Työvälineiden valinta";
+ break;
+ case PackageName.Workspace:
+ packageName = "Työskentely Tila";
+ break;
+ case PackageName.CleanUp:
+ packageName = "Tilan Siivoaminen";
+ break;
+ }
+
+
+
+ string text = "<color=#000000> " + packageName + " </color> \n";
  text += UISystem.Instance.Descript;
  currentTextField.text = text;
  }