Class-Diagram.md

@@ -19,9 +19,56 @@ package Model.Common {
     }
 
     class Singleton {
-        - {static} instance : Singleton
+        - {static} instance : T
         - Singleton()
-        + {static} GetInstance() : Singleton
+        + {static} GetInstance() : T
+    }
+
+    Singleton <|-- Simulation
+
+    class Simulation {
+        - people : Person[]
+        - Simulation()
+    }
+
+
+    Simulation --> Park
+    Singleton <|-- Park
+    IInspectable <|-- Park
+
+    class Park {
+        - balance : int
+        - entryFee : int
+        - buildings : Building[]
+        - Park()
+        + GetBalance() : int
+        + GetEntryFee() : int
+        + GetBuildings() : Building[]
+        + ModifyBalance(int)
+        + AddBuilding(Building)
+        + SetEntryFee(int)
+    }
+
+    IDisplayable <|-- WorldEntity
+
+    class WorldEntity {
+        - position : Vector2
+        - visible : bool
+        # WorldEntity(Vector2)
+        + GetPosition() : Vector2
+        + GetVisible() : bool
+        + SetPosition(Vector2)
+        + SetVisible(bool)
+    }
+
+
+    Singleton <|-- MaintenanceDispatcher
+    Simulation ---> MaintenanceDispatcher
+
+    class MaintenanceDispatcher {
+        - maintainers : MaintenanceGuy[]
+        - MaintenanceDispatcher()
+        + {static} GameBroken(Building)
     }
 }
 
@@ -42,6 +89,7 @@ package Model.Nav {
 }
 
 package Model.Map {
+    WorldEntity <|-- MapObject
 
     abstract class MapObject {
         + Enter(Person) : Vector2? {abstract}
@@ -64,7 +112,10 @@ package Model.Map {
     class Placement {
         + Pos : Vector2
     }
+
+    
     Placement "1" *-- Orientation
+    Simulation "1" *- Map
 
     class Map {
         + Map(Vector2)
@@ -89,44 +140,7 @@ package Model.Map {
 }
 
 
-Singleton <|-- Simulation
-
-class Simulation {
-    - people : Person[]
-    - Simulation()
-}
-
-
-Simulation --> Park
-Singleton <|-- Park
-IInspectable <|-- Park
-
-class Park {
-    - balance : int
-    - entryFee : int
-    - buildings : Building[]
-    - Park()
-    + GetBalance() : int
-    + GetEntryFee() : int
-    + GetBuildings() : Building[]
-    + ModifyBalance(int)
-    + AddBuilding(Building)
-    + SetEntryFee(int)
-}
-
-IDisplayable <|-- WorldEntity
-
-class WorldEntity {
-    - position : Vector2
-    - visible : bool
-    # WorldEntity(Vector2)
-    + GetPosition() : Vector2
-    + GetVisible() : bool
-    + SetPosition(Vector2)
-    + SetVisible(bool)
-}
-
-
+package Model.People {
     Simulation *-- "-people\n*" Person
     IInspectable <|--- Person
     ITickable <|--- Person
@@ -138,6 +152,7 @@ class Person {
         - speed : float {readonly}
         - pavement : Pavement
         - routeHandle : RouteHandle
+        - name : string
         # Person(Vector2, float)
         + Tick() {override}
         + GetProperties() {override}
@@ -188,29 +203,15 @@ class CleaningLady {
 
 
     Staff <|-- MaintenanceGuy
+    MaintenanceDispatcher *-- "-maintainers\n*" MaintenanceGuy
 
     class MaintenanceGuy {
         + MaintenanceGuy(Vector2, float)
         + Tick() {override}
         + GetProperties() {override}
     }
-
-
-Singleton <|-- MaintenanceDispatcher
-Simulation ---> MaintenanceDispatcher
-
-class MaintenanceDispatcher {
-    - maintainers : MaintenanceGuy[]
-    - MaintenanceDispatcher()
-    + {static} GameBroken(Building)
 }
 
-MaintenanceDispatcher *-- "-maintainers\n*" MaintenanceGuy
-
-
-Simulation "1" *- Map
-WorldEntity <|-- MapObject
-
 
 package Model.Landscape {
     package Blueprints {