fix: Don't overfill any rooms with cargo.

Thorium-Sim · Jan 16, 2023 · d1062c7 · d1062c7
1 parent f65f703
commit d1062c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/client/src/components/QuoteOfTheDay.tsx b/client/src/components/QuoteOfTheDay.tsx
@@ -247,7 +247,7 @@ const quotes = [
 const QuoteOfTheDay = () => {
   const quote = useRef(quotes[Math.floor(Math.random() * quotes.length)]);
   return (
-    <h5 className="text-lg px-2 fixed bottom-0 right-0 text-white text-opacity-60">
+    <h5 className="text-lg px-2 fixed bottom-0 right-0 text-white text-opacity-60 max-w-prose">
       {quote.current}
     </h5>
   );

diff --git a/server/src/components/shipMap/passengerMovement.ts b/server/src/components/shipMap/passengerMovement.ts
@@ -15,8 +15,8 @@ export class PassengerMovementComponent extends Component {
     y: MetersPerSecond;
     z: MetersPerSecond;
   } = {
-    x: 1.3,
-    y: 1.3,
-    z: 1.3 / 10, // The Z default is because decks are 10 meters high, so it should take 10x as long to move between decks.
+    x: 3,
+    y: 3,
+    z: 3 / 10, // The Z default is because decks are 10 meters high, so it should take 10x as long to move between decks.
   };
 }
diff --git a/server/src/spawners/inventory.ts b/server/src/spawners/inventory.ts
@@ -65,6 +65,7 @@ export function generateShipInventory(
       roomEntity.contents[inventoryTemplate.name] ?? 0;
     roomEntity.contents[inventoryTemplate.name] += 1;
     totalVolume -= inventoryTemplate.volume;
+    room.availableVolume -= inventoryTemplate.volume;
     const inventoryIndex = inventoryList.indexOf(inventoryTemplate);
     if (inventoryIndex === -1) return;
     const removeIndex = cargoAbundance.indexOf(inventoryIndex);
@@ -83,7 +84,7 @@ export function generateShipInventory(
    * to the cargo hold
    */
   const roomMap = rooms.reduce(
-    (acc: {[key: string]: typeof rooms[0][]}, room) => {
+    (acc: {[key: string]: (typeof rooms)[0][]}, room) => {
       room.flags.forEach(flag => {
         if (!acc[flag]) acc[flag] = [];
         if (flag !== "cargo") {