Converted rest of sprites

2026-02-15 03:30:53 +01:00 · 2015-01-18 16:20:50 -05:00
parent e0e5b892d6
commit d2a590262e
12 changed files with 84 additions and 120 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ obj
 Media/textures/Animations/*.*
 _ReSharper*
 Media/ResourcePack.zip
-SS13.suo
+SS13.suo
+/NewMedia/textures/Animations
--- a/CGO/ClientGameObject.csproj
+++ b/CGO/ClientGameObject.csproj
@@ -109,9 +109,7 @@
    <Compile Include="Component\Mover\SlaveMoverComponent.cs" />
    <Compile Include="Component\Physics\PhysicsComponent.cs" />
    <Compile Include="Component\PlayerActionComp\PlayerActionCompC.cs" />
-    <Compile Include="Component\Renderable\AnimatedItemSpriteComponent.cs" />
    <Compile Include="Component\Renderable\AnimatedSpriteComponent.cs" />
-    <Compile Include="Component\Renderable\AnimatedWearableSpriteComponent.cs" />
    <Compile Include="Component\Renderable\ParticleSystem.cs" />
    <Compile Include="Component\Renderable\ParticleSystemComponent.cs" />
    <Compile Include="Component\Renderable\Speechbubble.cs" />
--- a/CGO/Component/Equipment/EquipmentComponent.cs
+++ b/CGO/Component/Equipment/EquipmentComponent.cs
@@ -167,10 +167,10 @@ namespace CGO
                }
            }

-            var removed = EquippedEntities.Where(x => !state.EquippedEntities.ContainsKey(x.Key));
-            foreach(KeyValuePair<EquipmentSlot, Entity> rem in removed)
+            var removed = EquippedEntities.Keys.Where(x => !state.EquippedEntities.ContainsKey(x)).ToArray();
+            foreach(EquipmentSlot rem in removed)
            {
-                UnEquipItem(rem.Key);
+                UnEquipItem(rem);
            }

            //Find differences and raise event?
--- a/ClientServices/State/States/MainMenu.cs
+++ b/ClientServices/State/States/MainMenu.cs
@@ -24,7 +24,6 @@ namespace ClientServices.State.States
        private readonly ImageButton _buttExit;
        private readonly ImageButton _buttOptions;
        private readonly Textbox _connectTextbox;
-        private readonly SimpleImage _glow;
        private readonly Label _lblVersion;
        private readonly SimpleImage _titleImage;

@@ -81,13 +80,6 @@ namespace ClientServices.State.States
                                  Sprite = "SpaceStationLogoColor",
                                  Position = new Point(Gorgon.Screen.Width - 550, 100)
                              };
-
-            _glow = new SimpleImage
-                        {
-                            Sprite = "mainbg_glow",
-                            Position = new Point(0, 0)
-                        };
-            _glow.size = new Vector2D(Gorgon.Screen.Width, Gorgon.Screen.Height);
        }

        #region IState Members
@@ -194,7 +186,7 @@ namespace ClientServices.State.States
                               });

            //            DrawSprite.Axis = new Vector2D(DrawSprite.Width / 2f, DrawSprite.Height / 2f);
-            var clouds = new FloatingDecoration(ResourceManager, "mainbg_clouds")
+/*            var clouds = new FloatingDecoration(ResourceManager, "mainbg_clouds")
                             {
                                 BounceRotate = true,
                                 BounceRotateAngle = 10,
@@ -202,11 +194,11 @@ namespace ClientServices.State.States
                                 SpriteLocation = new Vector2D(-50, -50),
                                 Velocity = new Vector2D(0, 0),
                                 RotationSpeed = 0.25f,
-                             };
+                             };*/

            //clouds.DrawSprite.Axis = new Vector2D(clouds.DrawSprite.Width/2f, clouds.DrawSprite.Height/2f);

-            DecoFloats.Add(clouds);
+           /* DecoFloats.Add(clouds);

            DecoFloats.Add(new FloatingDecoration(ResourceManager, "floating_dude")
                               {
@@ -216,9 +208,9 @@ namespace ClientServices.State.States
                                   SpriteLocation = new Vector2D(125, 115),
                                   Velocity = new Vector2D(0, 0),
                                   RotationSpeed = 0.5f
-                               });
+                               });*/

-            DecoFloats.Add(new FloatingDecoration(ResourceManager, "floating_oxy")
+          /*  DecoFloats.Add(new FloatingDecoration(ResourceManager, "floating_oxy")
                               {
                                   BounceRotate = true,
                                   BounceRotateAngle = 15,
@@ -226,8 +218,9 @@ namespace ClientServices.State.States
                                   SpriteLocation = new Vector2D(325, 135),
                                   Velocity = new Vector2D(0, 0),
                                   RotationSpeed = -0.60f
-                               });
+                               });*/

+/*
            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_mid_back")
                               {
                                   BounceRotate = false,
@@ -236,7 +229,8 @@ namespace ClientServices.State.States
                                   Velocity = new Vector2D(0, 0),
                                   RotationSpeed = -0.20f
                               });
-
+*/
+/*
            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_far_right_back")
                               {
                                   BounceRotate = true,
@@ -245,9 +239,9 @@ namespace ClientServices.State.States
                                   SpriteLocation = new Vector2D(Gorgon.Screen.Width - 260, 415),
                                   Velocity = new Vector2D(0, 0),
                                   RotationSpeed = 0.1f
-                               });
+                               });*/

-            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_far_right_fore")
+/*            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_far_right_fore")
                               {
                                   BounceRotate = true,
                                   BounceRotateAngle = 15,
@@ -255,16 +249,16 @@ namespace ClientServices.State.States
                                   SpriteLocation = new Vector2D(Gorgon.Screen.Width - 295, 415),
                                   Velocity = new Vector2D(0, 0),
                                   RotationSpeed = -0.36f
-                               });
+                               });*/

-            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_far_left_fore")
+/*            DecoFloats.Add(new FloatingDecoration(ResourceManager, "debris_far_left_fore")
                               {
                                   BounceRotate = false,
                                   ParallaxScale = 0.019f,
                                   SpriteLocation = new Vector2D(0, 335),
                                   Velocity = new Vector2D(6, 2),
                                   RotationSpeed = 0.40f
-                               });
+                               });*/

            foreach (FloatingDecoration floatingDeco in DecoFloats)
                UserInterfaceManager.AddComponent(floatingDeco);
@@ -274,7 +268,6 @@ namespace ClientServices.State.States
            UserInterfaceManager.AddComponent(_buttOptions);
            UserInterfaceManager.AddComponent(_buttExit);
            UserInterfaceManager.AddComponent(_titleImage);
-            UserInterfaceManager.AddComponent(_glow);
            UserInterfaceManager.AddComponent(_lblVersion);
        }

@@ -287,7 +280,6 @@ namespace ClientServices.State.States
            UserInterfaceManager.RemoveComponent(_buttOptions);
            UserInterfaceManager.RemoveComponent(_buttExit);
            UserInterfaceManager.RemoveComponent(_titleImage);
-            UserInterfaceManager.RemoveComponent(_glow);
            UserInterfaceManager.RemoveComponent(_lblVersion);

            foreach (FloatingDecoration floatingDeco in DecoFloats)
--- a/SS3D_Client/EntityTemplates/Clothing.xml
+++ b/SS3D_Client/EntityTemplates/Clothing.xml
@@ -7,9 +7,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="shoes" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -29,9 +29,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="helmet" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -96,9 +96,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="janitorsuit" />
+          <Parameter name="sprite" type="string" value="player_jumpsuit_gray" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -118,9 +118,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="medicsuit" />
+          <Parameter name="sprite" type="string" value="player_jumpsuit_gray" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -140,9 +140,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="biosuit" />
+          <Parameter name="sprite" type="string" value="player_jumpsuit_gray" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -163,9 +163,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="gloves_surgical" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -185,9 +185,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="medshoes" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -207,9 +207,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="surgicalmask" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -229,9 +229,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="surgicalgown" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -251,9 +251,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="armour" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -274,9 +274,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="bluegloves" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -296,9 +296,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="galoshes" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3D_Client/EntityTemplates/Internals.xml
+++ b/SS3D_Client/EntityTemplates/Internals.xml
@@ -7,11 +7,11 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="WearableSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="surgicalmask" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
-      </Component>
+      </Component>s
      <Component name="IconComponent">
        <Parameters>
          <Parameter name="icon" type="string" value="surgicalmask" />
--- a/SS3D_Client/EntityTemplates/JanitorItems.xml
+++ b/SS3D_Client/EntityTemplates/JanitorItems.xml
@@ -7,9 +7,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="bluebucket" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -28,9 +28,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="wetfloorsign" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3D_Client/EntityTemplates/Lights.xml
+++ b/SS3D_Client/EntityTemplates/Lights.xml
@@ -40,9 +40,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="flashlight" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3D_Client/EntityTemplates/MedicalItems.xml
+++ b/SS3D_Client/EntityTemplates/MedicalItems.xml
@@ -7,9 +7,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="forceps" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -28,9 +28,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="medscanner" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -49,9 +49,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="saw" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -70,9 +70,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="scalpel" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -91,9 +91,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="syringegun" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -112,9 +112,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="vial" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -133,9 +133,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="vial_2" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -154,9 +154,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="medkit_r" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -175,9 +175,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="medkit_w" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -196,9 +196,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="bruisepack" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -217,9 +217,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="bandages" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3D_Client/EntityTemplates/Tools.xml
+++ b/SS3D_Client/EntityTemplates/Tools.xml
@@ -7,9 +7,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="wrench" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -28,9 +28,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="welder" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -49,9 +49,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="crowbar" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
@@ -70,9 +70,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="mop" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3D_Client/EntityTemplates/Weapons.xml
+++ b/SS3D_Client/EntityTemplates/Weapons.xml
@@ -7,10 +7,9 @@
      <Component name="VelocityComponent"></Component>
      <Component name="DirectionComponent"></Component>
      <Component name="BasicMoverComponent"></Component>
-      <Component name="ItemSpriteComponent">
+      <Component name="AnimatedSpriteComponent">
        <Parameters>
-          <Parameter name="basename" type="string" value="sword" />
-          <Parameter name="addsprite" type="string" value="sword_on" />
+          <Parameter name="sprite" type="string" value="player_toolbox" />
        </Parameters>
      </Component>
      <Component name="IconComponent">
--- a/SS3d_server/JobDefinitions.xml
+++ b/SS3d_server/JobDefinitions.xml
@@ -73,32 +73,6 @@
      <Name>Geneticist</Name>
      <Department>Research</Department>
    </JobDefinition>
-
-    <JobDefinition>
-      <Available>true</Available>
-      <Description>Responsible for embiggening the Wall Tops.</Description>
-      <JobIcon>job_enlarger</JobIcon>
-      <MaxNum>3</MaxNum>
-      <Name>Top Enlarger</Name>
-      <Department>Wall Research</Department>
-    </JobDefinition>
-    <JobDefinition>
-      <Available>true</Available>
-      <Description>Calculates perfect Wall Heights.</Description>
-      <JobIcon>job_height</JobIcon>
-      <MaxNum>3</MaxNum>
-      <Name>Height Negotiator</Name>
-      <Department>Wall Research</Department>
-    </JobDefinition>
-    <JobDefinition>
-      <Available>true</Available>
-      <Description>Ensures that all Walls on the Station meet certain Thickness Standards.</Description>
-      <JobIcon>job_thick</JobIcon>
-      <MaxNum>2</MaxNum>
-      <Name>Thickness Surveyor</Name>
-      <Department>Wall Research</Department>
-    </JobDefinition>
-    
  </JobDefinitions>
  
  <DepartmentDefinitions>