Fix issue #391: Homes

app/drizzle/migrations/0195_add_home_types.sql

@@ -0,0 +1,45 @@
+CREATE TABLE `HomeType` (
+  `id` varchar(191) PRIMARY KEY NOT NULL,
+  `name` varchar(191) NOT NULL,
+  `regenBonus` int NOT NULL,
+  `storageSlots` int NOT NULL,
+  `cost` int NOT NULL,
+  `createdAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  `updatedAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3))
+);
+
+CREATE TABLE `UserHome` (
+  `id` varchar(191) PRIMARY KEY NOT NULL,
+  `userId` varchar(191) NOT NULL,
+  `homeTypeId` varchar(191) NOT NULL,
+  `createdAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  `updatedAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  INDEX `UserHome_userId_idx` (`userId`),
+  INDEX `UserHome_homeTypeId_idx` (`homeTypeId`)
+  -- Optionally, add foreign key constraints if desired:
+  -- FOREIGN KEY (`userId`) REFERENCES `UserData`(`userId`),
+  -- FOREIGN KEY (`homeTypeId`) REFERENCES `HomeType`(`id`)
+);
+
+CREATE TABLE `UserHomeStorage` (
+  `id` varchar(191) PRIMARY KEY NOT NULL,
+  `userHomeId` varchar(191) NOT NULL,
+  `itemId` varchar(191) NOT NULL,
+  `slot` int NOT NULL,
+  `createdAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  `updatedAt` datetime(3) NOT NULL DEFAULT (CURRENT_TIMESTAMP(3)),
+  INDEX `UserHomeStorage_userHomeId_idx` (`userHomeId`),
+  INDEX `UserHomeStorage_slot_idx` (`slot`)
+  -- Optionally, add a foreign key:
+  -- FOREIGN KEY (`userHomeId`) REFERENCES `UserHome`(`id`)
+);
+
+INSERT INTO `HomeType` (`id`, `name`, `regenBonus`, `storageSlots`, `cost`)
+VALUES
+  ('one-bed-apartment', 'One Bed Room Apartment', 20, 5, 3000000),
+  ('studio-apartment', 'Studio Apartment', 30, 10, 7000000),
+  ('two-bed-house', 'Two Bed Room House', 40, 15, 13000000),
+  ('town-house', 'Town House', 50, 20, 30000000),
+  ('small-mansion', 'Small Mansion', 60, 25, 40000000),
+  ('small-estate', 'Small Estate', 70, 30, 50000000),
+  ('large-estate', 'Large Estate', 100, 40, 70000000);

app/drizzle/schema.ts

@@ -387,6 +387,94 @@ export const bloodlineRollsRelations = relations(bloodlineRolls, ({ one }) => ({
   }),
 }));
 
+export const homeType = mysqlTable(
+  "HomeType",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    name: varchar("name", { length: 191 }).notNull(),
+    regenBonus: int("regenBonus").notNull(),
+    storageSlots: int("storageSlots").notNull(),
+    cost: bigint("cost", { mode: "number" }).notNull(),
+    createdAt: datetime("createdAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+    updatedAt: datetime("updatedAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+  },
+  (table) => {
+    return {
+      nameKey: uniqueIndex("HomeType_name_key").on(table.name),
+    };
+  },
+);
+
+export const userHome = mysqlTable(
+  "UserHome",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    userId: varchar("userId", { length: 191 }).notNull(),
+    homeTypeId: varchar("homeTypeId", { length: 191 }).notNull(),
+    createdAt: datetime("createdAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+    updatedAt: datetime("updatedAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+  },
+  (table) => {
+    return {
+      userIdKey: uniqueIndex("UserHome_userId_key").on(table.userId),
+    };
+  },
+);
+
+export const userHomeStorage = mysqlTable(
+  "UserHomeStorage",
+  {
+    id: varchar("id", { length: 191 }).primaryKey().notNull(),
+    userHomeId: varchar("userHomeId", { length: 191 }).notNull(),
+    itemId: varchar("itemId", { length: 191 }).notNull(),
+    slot: int("slot").notNull(),
+    createdAt: datetime("createdAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+    updatedAt: datetime("updatedAt", { mode: "date", fsp: 3 })
+      .default(sql`(CURRENT_TIMESTAMP(3))`)
+      .notNull(),
+  },
+  (table) => {
+    return {
+      storageKey: uniqueIndex("UserHomeStorage_storage_key").on(
+        table.userHomeId,
+        table.slot
+      ),
+    };
+  },
+);
+
+export const userHomeRelations = relations(userHome, ({ one }) => ({
+  user: one(userData, {
+    fields: [userHome.userId],
+    references: [userData.userId],
+  }),
+  homeType: one(homeType, {
+    fields: [userHome.homeTypeId],
+    references: [homeType.id],
+  }),
+}));
+
+export const userHomeStorageRelations = relations(userHomeStorage, ({ one }) => ({
+  userHome: one(userHome, {
+    fields: [userHomeStorage.userHomeId],
+    references: [userHome.id],
+  }),
+  item: one(item, {
+    fields: [userHomeStorage.itemId],
+    references: [item.id],
+  }),
+}));
+
 export const captcha = mysqlTable(
   "Captcha",
   {
@@ -1513,6 +1601,10 @@ export const userDataRelations = relations(userData, ({ one, many }) => ({
     fields: [userData.userId],
     references: [userNindo.userId],
   }),
+  home: one(userHome, {
+    fields: [userData.userId],
+    references: [userHome.userId],
+  }),
   userQuests: many(questHistory),
   conversations: many(user2conversation),
   items: many(userItem),

app/src/app/home/page.tsx

@@ -20,6 +20,41 @@ export default function Home() {
   const { userData, sectorVillage, access, ownVillage, updateUser } =
     useRequireInVillage("/home");
 
+  const { data, refetch } = api.home.getHome.useQuery(undefined, {
+    enabled: !!access && !!ownVillage,
+  });
+
+  const { mutate: upgradeHome, isPending: isUpgrading } =
+    api.home.upgradeHome.useMutation({
+      onSuccess: async (data) => {
+        showMutationToast(data);
+        if (data.success) {
+          await refetch();
+          await updateUser({ home: data.home });
+        }
+      },
+    });
+
+  const { mutate: storeItem, isPending: isStoringItem } =
+    api.home.storeItem.useMutation({
+      onSuccess: async (data) => {
+        showMutationToast(data);
+        if (data.success) {
+          await refetch();
+        }
+      },
+    });
+
+  const { mutate: removeItem, isPending: isRemovingItem } =
+    api.home.removeItem.useMutation({
+      onSuccess: async (data) => {
+        showMutationToast(data);
+        if (data.success) {
+          await refetch();
+        }
+      },
+    });
+
   const { mutate: toggleSleep, isPending: isTogglingSleep } =
     api.home.toggleSleep.useMutation({
       onSuccess: async (data) => {
@@ -98,13 +133,89 @@ export default function Home() {
         <>
           <ContentBox
             title="Overview"
-            subtitle="Decorate, upgrade, host parties"
+            subtitle="Upgrade your home for better regeneration and storage"
             initialBreak={true}
           >
-            WIP
+            <div className="space-y-4">
+              {data?.home ? (
+                <div className="text-center">
+                  <h3 className="text-lg font-bold">{data.home.name}</h3>
+                  <p>Regeneration Bonus: +{data.home.regenBonus}</p>
+                  <p>Storage Slots: {data.home.storageSlots}</p>
+                </div>
+              ) : (
+                <p className="text-center italic">You don&apos;t own a home yet</p>
+
+              )}
+
+              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                {data?.availableHomes.map((home) => (
+                  <div
+                    key={home.id}
+                    className={`p-4 border rounded-lg ${
+                      data.home?.id === home.id
+                        ? "border-green-500"
+                        : "border-gray-300"
+                    }`}
+                  >
+                    <h4 className="font-bold">{home.name}</h4>
+                    <p>Regeneration: +{home.regenBonus}</p>
+                    <p>Storage: {home.storageSlots} slots</p>
+                    <p>Cost: {home.cost.toLocaleString()} Ryo</p>
+                    {data.home?.id !== home.id && (
+                      <button
+                        className="mt-2 px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600"
+                        onClick={() => upgradeHome({ homeTypeId: home.id })}
+                        disabled={isUpgrading}
+                      >
+                        {isUpgrading ? "Upgrading..." : "Upgrade"}
+                      </button>
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
           </ContentBox>
-          <ContentBox title="Item Storage" subtitle="Store items" initialBreak={true}>
-            WIP
+          <ContentBox
+            title="Item Storage"
+            subtitle={`${data?.storage?.length ?? 0}/${
+              data?.home?.storageSlots ?? 0
+            } slots used`}
+            initialBreak={true}
+          >
+            {data?.home ? (
+              <div className="grid grid-cols-5 gap-4">
+                {Array.from({ length: data.home.storageSlots }).map((_, i) => {
+                  const storedItem = data.storage?.find((s) => s.slot === i);
+                  return (
+                    <div
+                      key={i}
+                      className="aspect-square border border-gray-300 rounded-lg p-2 flex items-center justify-center"
+                    >
+                      {storedItem ? (
+                        <button
+                          className="text-red-500 hover:text-red-600"
+                          onClick={() => removeItem({ slot: i })}
+                          disabled={isRemovingItem}
+                        >
+                          Remove Item
+                        </button>
+                      ) : (
+                        <button
+                          className="text-blue-500 hover:text-blue-600"
+                          onClick={() => storeItem({ itemId: "some-item", slot: i })}
+                          disabled={isStoringItem}
+                        >
+                          Store Item
+                        </button>
+                      )}
+                    </div>
+                  );
+                })}
+              </div>
+            ) : (
+              <p className="text-center italic">Purchase a home to store items</p>
+            )}
           </ContentBox>
         </>
       )}

app/src/libs/profile.ts

@@ -174,12 +174,19 @@ export const deduceActiveUserRegen = (
     clan?: Clan | null;
     bloodline?: Bloodline | null;
     village?: (Village & { structures?: VillageStructure[] }) | null;
+    home?: { 
+      id: string;
+      name: string;
+      regenBonus: number;
+      storageSlots: number;
+      cost: number;
+    };
   },
   settings: GameSetting[],
 ) => {
   let regeneration = user.regeneration;
 
-  // // Bloodline
+  // Bloodline
   if (user.bloodline?.regenIncrease) {
     regeneration = regeneration + user.bloodline.regenIncrease;
   }
@@ -206,6 +213,11 @@ export const deduceActiveUserRegen = (
     regeneration *= 0.5;
   }
 
+  // Home bonus boost
+  if (user.status === "ASLEEP" && user.home?.regenBonus) {
+    regeneration = regeneration + user.home.regenBonus;
+  }
+
   // Increase by event
   const setting = getGameSettingBoost("regenGainMultiplier", settings);
   const gameFactor = setting?.value || 1;