Rc 1

balancing/src/App.tsx

@@ -7,7 +7,7 @@ import { ResourceTable } from "./components/modules/resource-table";
 function App() {
   return (
     <>
-      <div className="bg-black text-white">
+      <div className="bg-brown text-white">
         <Tabs defaultValue="account">
           <TabsList>
             <TabsTrigger value="resources">Production</TabsTrigger>

client/src/dojo/modelManager/BattleManager.ts

@@ -56,6 +56,7 @@ export enum ClaimStatus {
   Claimable = "Claim",
   NoSelectedArmy = "No selected army",
   BattleOngoing = "Battle ongoing",
+  DefenderPresent = "An army's defending the structure",
   NoStructureToClaim = "No structure to claim",
   StructureIsMine = "Can't claim your own structure",
   SelectedArmyIsDead = "Selected army is dead",
@@ -65,7 +66,6 @@ export class BattleManager {
   battleEntityId: ID;
   dojo: DojoResult;
   battleType: BattleType | undefined;
-  private battleIsClaimable: ClaimStatus | undefined;
 
   constructor(battleEntityId: ID, dojo: DojoResult) {
     this.battleEntityId = battleEntityId;
@@ -253,36 +253,30 @@ export class BattleManager {
     defender: ArmyInfo | undefined,
   ): ClaimStatus {
     if (!selectedArmy) return ClaimStatus.NoSelectedArmy;
-    if (this.battleIsClaimable) return this.battleIsClaimable;
 
     if (this.isBattleOngoing(currentTimestamp)) {
       return ClaimStatus.BattleOngoing;
     }
 
     if (!structure) {
-      this.battleIsClaimable = ClaimStatus.NoStructureToClaim;
       return ClaimStatus.NoStructureToClaim;
     }
 
     if (this.getBattleType(structure) !== BattleType.Structure) {
-      this.battleIsClaimable = ClaimStatus.NoStructureToClaim;
       return ClaimStatus.NoStructureToClaim;
     }
 
     if (defender === undefined) {
-      this.battleIsClaimable = ClaimStatus.Claimable;
       return ClaimStatus.Claimable;
     }
 
     const updatedBattle = this.getUpdatedBattle(currentTimestamp);
     if (updatedBattle && updatedBattle.defence_army_health.current > 0n) {
-      this.battleIsClaimable = ClaimStatus.BattleOngoing;
       return ClaimStatus.BattleOngoing;
     }
 
     if (defender.health.current > 0n) {
-      this.battleIsClaimable = ClaimStatus.BattleOngoing;
-      return ClaimStatus.BattleOngoing;
+      return ClaimStatus.DefenderPresent;
     }
 
     if (structure.isMine) {
@@ -293,7 +287,6 @@ export class BattleManager {
       return ClaimStatus.SelectedArmyIsDead;
     }
 
-    this.battleIsClaimable = ClaimStatus.Claimable;
     return ClaimStatus.Claimable;
   }
 

client/src/dojo/modelManager/__tests__/BattleManager.test.ts

@@ -637,7 +637,7 @@ describe("isClaimable", () => {
 
     const isClaimable = battleManager.isClaimable(CURRENT_TIMESTAMP, army, structure, defender);
 
-    expect(isClaimable).toBe(ClaimStatus.BattleOngoing);
+    expect(isClaimable).toBe(ClaimStatus.DefenderPresent);
   });
 
   it("should return false if structure protector has health", () => {
@@ -652,7 +652,7 @@ describe("isClaimable", () => {
 
     const isClaimable = battleManager.isClaimable(CURRENT_TIMESTAMP, army, structure, defender);
 
-    expect(isClaimable).toBe(ClaimStatus.BattleOngoing);
+    expect(isClaimable).toBe(ClaimStatus.DefenderPresent);
   });
 
   it("should return false if the structure is mine", () => {

client/src/hooks/helpers/useEntities.tsx

@@ -9,15 +9,7 @@ import {
   type ID,
 } from "@bibliothecadao/eternum";
 import { useEntityQuery } from "@dojoengine/react";
-import {
-  Has,
-  HasValue,
-  getComponentValue,
-  runQuery,
-  type Component,
-  type ComponentValue,
-  type Entity,
-} from "@dojoengine/recs";
+import { Has, getComponentValue, type Component, type ComponentValue, type Entity } from "@dojoengine/recs";
 import { useMemo } from "react";
 import { shortString } from "starknet";
 import { useDojo } from "../context/DojoContext";
@@ -179,22 +171,6 @@ export const useEntities = () => {
   };
 };
 
-export const getPlayerStructures = () => {
-  const {
-    setup: {
-      components: { Structure, Owner, Realm, Position },
-    },
-  } = useDojo();
-  const { getEntityName } = useEntitiesUtils();
-
-  const getStructures = (playerAddress: ContractAddress) => {
-    const playerStructures = runQuery([Has(Structure), HasValue(Owner, { address: playerAddress })]);
-    return formatStructures(Array.from(playerStructures), Structure, Realm, Position, getEntityName);
-  };
-
-  return getStructures;
-};
-
 export const useEntitiesUtils = () => {
   const {
     account: { account },
@@ -330,31 +306,3 @@ export const getAddressNameFromEntityIds = (
         owner !== undefined,
     );
 };
-
-const formatStructures = (
-  structures: Entity[],
-  Structure: Component<ClientComponents["Structure"]["schema"]>,
-  Realm: Component<ClientComponents["Realm"]["schema"]>,
-  Position: Component<ClientComponents["Position"]["schema"]>,
-  getEntityName: (entityId: ID) => string | undefined,
-) => {
-  return structures
-    .map((id) => {
-      const structure = getComponentValue(Structure, id);
-      if (!structure) return;
-
-      const realm = getComponentValue(Realm, id);
-      const position = getComponentValue(Position, id);
-
-      const structureName = getEntityName(structure.entity_id);
-
-      const name = realm
-        ? getRealmNameById(realm.realm_id)
-        : structureName
-          ? `${structure?.category} ${structureName}`
-          : structure.category || "";
-      return { ...structure, position: position!, name };
-    })
-    .filter((structure): structure is PlayerStructure => structure !== undefined)
-    .sort((a, b) => (b.category || "").localeCompare(a.category || ""));
-};

client/src/hooks/helpers/useGetAllPlayers.tsx

@@ -1,4 +1,4 @@
-import { ContractAddress } from "@bibliothecadao/eternum";
+import { ContractAddress, Player } from "@bibliothecadao/eternum";
 import { Has, NotValue, runQuery } from "@dojoengine/recs";
 import { useDojo } from "../context/DojoContext";
 import { getAddressNameFromEntityIds, useEntitiesUtils } from "./useEntities";
@@ -14,7 +14,7 @@ export const useGetAllPlayers = () => {
 
   const playersEntityIds = runQuery([Has(Owner), Has(Realm)]);
 
-  const getPlayers = () => {
+  const getPlayers = (): Player[] => {
     const players = getAddressNameFromEntityIds(Array.from(playersEntityIds), Owner, getAddressNameFromEntity);
 
     const uniquePlayers = Array.from(new Map(players.map((player) => [player.address, player])).values());
@@ -40,7 +40,7 @@ export const useGetOtherPlayers = () => {
     NotValue(Owner, { address: ContractAddress(account.address) }),
   ]);
 
-  const getPlayers = () => {
+  const getPlayers = (): Player[] => {
     const players = getAddressNameFromEntityIds(Array.from(playersEntityIds), Owner, getAddressNameFromEntity);
 
     const uniquePlayers = Array.from(new Map(players.map((player) => [player.address, player])).values());