new production

.github/workflows/lint.yml

@@ -28,4 +28,4 @@ jobs:
         run: pnpm i
 
       - name: Run Prettier
-        run: pnpm run prettier-check .
+        run: pnpm run format:check .

.gitignore

@@ -1,4 +1,6 @@
 node_modules
 target
 .snfoundry_cache
-docs/dist
+docs/dist
+.DS_Store
+**/.DS_Store

.knip.json

@@ -0,0 +1,26 @@
+{
+  "ignore": [
+    "eliza/**",
+
+    "**/*.js",
+    "**/vitest**",
+    "client/apps/game/src/setupTests.ts",
+
+    "client/sdk/packages/eternum/global.d.ts",
+
+    "**/**__test__**/**",
+    "**/**__tests__**/**",
+    "client/apps/game/src/setup-tests.ts",
+
+    "client/apps/landing/src/routeTree.gen.ts",
+    "client/apps/landing/src/components/ui/**",
+    "client/apps/landing/src/components/typography/**",
+    "client/apps/landing/src/hooks/gql/**",
+
+    "client/apps/game-docs/vocs.config.ts",
+    "client/apps/game-docs/docs/**",
+    "client/apps/game-docs/vocs.config.ts",
+
+    "client/apps/game/src/ui/modules/chat/**"
+  ]
+}

client/.prettierignore → .prettierignore

@@ -13,3 +13,11 @@
 
 # ignore eliza folder
 **/eliza
+
+# ignore draco files
+**/draco
+
+# ignore generated files
+**/gql
+**/*.graphql
+**/*.gen.ts

CONTRIBUTING.md

@@ -47,6 +47,18 @@ Please adhere to the following guidelines when writing code for the Eternum proj
 - Ensure your code is compatible with the existing codebase and follows the project's coding conventions.
 - Include tests to verify the functionality of your changes.
 
+### Naming Conventions
+
+| Entity Type        | Naming Convention | Examples                            |
+| ------------------ | ----------------- | ----------------------------------- |
+| Files              | kebab-case        | `user-profile.tsx`, `api-utils.ts`  |
+| Components         | PascalCase        | `UserProfile`, `NavigationMenu`     |
+| Enums              | PascalCase        | `UserRole`, `PaymentStatus`         |
+| Types & Interfaces | PascalCase        | `UserProfile`, `ApiResponse`        |
+| Functions          | camelCase         | `getUserData()`, `calculateTotal()` |
+| Variables          | camelCase         | `userCount`, `totalPrice`           |
+| Constants          | UPPER_SNAKE_CASE  | `MAX_USERS`, `API_ENDPOINT`         |
+
 ## Review Process
 
 Once you submit a pull request, maintainers will review your changes and provide feedback. Your pull request may be

bot/discord/src/actors/tick_sender.rs

@@ -45,7 +45,7 @@ impl<'a> TickSender<'a> {
                         Some(Felt::from_hex(TICK_ARMIES_ID).unwrap()),
                     ],
                     pattern_matching: PatternMatching::FixedLen,
-                    models: vec!["s0_eternum-TickConfig".to_string()],
+                    models: vec!["s1_eternum-TickConfig".to_string()],
                 })),
                 limit: 1,
                 offset: 0,
@@ -61,7 +61,7 @@ impl<'a> TickSender<'a> {
         let tick_interval_in_seconds = entity
             .models
             .iter()
-            .find(|model| model.name == "s0_eternum-TickConfig")
+            .find(|model| model.name == "s1_eternum-TickConfig")
             .expect("Tick interval in seconds not found")
             .children
             .iter()

bot/discord/src/actors/torii_client_subscriber.rs

@@ -22,15 +22,15 @@ use crate::{
 };
 
 const TORII_SUBSCRIPTION_MODELS: [&str; 9] = [
-    "s0_eternum-BattleClaimData",
-    "s0_eternum-BattleJoinData",
-    "s0_eternum-BattleLeaveData",
-    "s0_eternum-BattlePillageData",
-    "s0_eternum-BattleStartData",
-    "s0_eternum-SettleRealmData",
-    "s0_eternum-GameEnded",
-    "s0_eternum-HyperstructureFinished",
-    "s0_eternum-HyperstructureStarted",
+    "s1_eternum-BattleClaimData",
+    "s1_eternum-BattleJoinData",
+    "s1_eternum-BattleLeaveData",
+    "s1_eternum-BattlePillageData",
+    "s1_eternum-BattleStartData",
+    "s1_eternum-SettleRealmData",
+    "s1_eternum-GameEnded",
+    "s1_eternum-HyperstructureFinished",
+    "s1_eternum-HyperstructureStarted",
 ];
 
 pub struct ToriiClientSubscriber {
@@ -125,64 +125,64 @@ impl ToriiClientSubscriber {
             let felts = ty.serialize().unwrap();
 
             let event = match model.name.as_str() {
-                "s0_eternum-BattleStartData" => {
+                "s1_eternum-BattleStartData" => {
                     let event = BattleStart::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.defender,
                     }
                 }
-                "s0_eternum-BattleJoinData" => {
+                "s1_eternum-BattleJoinData" => {
                     let event = BattleJoin::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.joiner,
                     }
                 }
-                "s0_eternum-BattleLeaveData" => {
+                "s1_eternum-BattleLeaveData" => {
                     let event = BattleLeave::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.leaver,
                     }
                 }
-                "s0_eternum-BattleClaimData" => {
+                "s1_eternum-BattleClaimData" => {
                     let event = BattleClaim::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.claimee_address,
                     }
                 }
-                "s0_eternum-BattlePillageData" => {
+                "s1_eternum-BattlePillageData" => {
                     let event = BattlePillage::cairo_deserialize(&felts, 0).unwrap();
                     let event_clone = event.clone();
                     Event {
                         event: Box::new(event_clone),
                         identifier: event.pillaged_structure_owner,
                     }
                 }
-                "s0_eternum-SettleRealmData" => {
+                "s1_eternum-SettleRealmData" => {
                     let event = SettleRealm::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.owner_address,
                     }
                 }
-                "s0_eternum-GameEnded" => {
+                "s1_eternum-GameEnded" => {
                     let event = GameEnded::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.winner_address,
                     }
                 }
-                "s0_eternum-HyperstructureFinished" => {
+                "s1_eternum-HyperstructureFinished" => {
                     let event = HyperstructureFinished::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),
                         identifier: event.hyperstructure_owner_name,
                     }
                 }
-                "s0_eternum-HyperstructureStarted" => {
+                "s1_eternum-HyperstructureStarted" => {
                     let event = HyperstructureStarted::cairo_deserialize(&felts, 0).unwrap();
                     Event {
                         event: Box::new(event),

bot/discord/src/eternum_enums.rs

@@ -33,15 +33,16 @@ pub enum ResourceIds {
     #[strum(serialize = "Ethereal Silica")]
     EtherealSilica = 21,
     Dragonhide = 22,
+    Demonhide = 23,
     #[strum(serialize = "Ancient Fragment")]
-    AncientFragment = 29,
-    Donkey = 249,
-    Knight = 250,
-    Crossbowman = 251,
-    Paladin = 252,
-    Lords = 253,
-    Wheat = 254,
-    Fish = 255,
+    AncientFragment = 24,
+    Donkey = 25,
+    Knight = 26,
+    Crossbowman = 27,
+    Paladin = 28,
+    Wheat = 29,
+    Fish = 30,
+    Lords = 31,
 }
 
 #[derive(FromPrimitive, Debug, Clone, Copy, strum_macros::Display)]

bot/discord/src/events/battle_start.rs

@@ -16,7 +16,7 @@ use super::{duration_to_string, ToDiscordMessage, UNKNOWN_USER};
 
 // abigen!(
 //     _unused,
-//     "../contracts/target/dev/s0_eternum_e_BattleStartData.contract_class.json",
+//     "../contracts/target/dev/s1_eternum_e_BattleStartData.contract_class.json",
 // );
 // TODO have a build.rs that can load the abis of the types we care about and writes them to a file
 // Dojo world can load local world from manifests and retrieve the abi

client/apps/balancing/package.json

@@ -7,6 +7,8 @@
     "build": "tsc -b && vite build",
     "dev": "vite",
     "lint": "eslint .",
+    "format": "npx prettier --write . --root=..",
+    "format:check": "npx prettier --check . --root=..",
     "preview": "vite preview"
   },
   "dependencies": {

client/apps/balancing/src/components/modules/resource-table.tsx

@@ -1,13 +1,13 @@
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import {
-  BUILDING_COSTS_SCALED,
-  RESOURCE_BUILDING_COSTS,
-  RESOURCE_INPUTS_SCALED,
-  RESOURCE_OUTPUTS,
-  RESOURCE_RARITY,
-  RESOURCE_TIERS,
-  Resources,
-  WEIGHTS_GRAM,
+    BUILDING_COSTS_SCALED,
+    RESOURCE_BUILDING_COSTS,
+    RESOURCE_PRODUCTION_INPUT_RESOURCES_SCALED,
+    RESOURCE_PRODUCTION_OUTPUT_AMOUNTS,
+    RESOURCE_RARITY,
+    RESOURCE_TIERS,
+    Resources,
+    WEIGHTS_GRAM,
 } from "@bibliothecadao/eternum";
 import { Badge } from "../ui/badge";
 
@@ -46,16 +46,16 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {
     const multiplier = RESOURCE_RARITY[resourceId as keyof typeof RESOURCE_RARITY] || 1; // Default multiplier is 1
 
     return (
-      RESOURCE_INPUTS_SCALED[resourceId]?.map((input) => ({
+      RESOURCE_PRODUCTION_INPUT_RESOURCES_SCALED[resourceId]?.map((input) => ({
         ...input,
         adjustedAmount: input.amount * multiplier,
       })) || []
     );
   };
-  // Sum up how many times each resource is used as an input based on RESOURCE_INPUTS_SCALED and BUILDING_COSTS_SCALED
+  // Sum up how many times each resource is used as an input based on RESOURCE_PRODUCTION_INPUT_RESOURCES_SCALED and BUILDING_COSTS_SCALED
   const resourceUsageCount = resources.reduce(
     (acc, resource) => {
-      const inputUsageCount = Object.values(RESOURCE_INPUTS_SCALED).reduce((count, inputs) => {
+      const inputUsageCount = Object.values(RESOURCE_PRODUCTION_INPUT_RESOURCES_SCALED).reduce((count, inputs) => {
         return count + inputs.filter((input: any) => input.resource === resource.id).length;
       }, 0);
       const buildingUsageCount = Object.values(BUILDING_COSTS_SCALED).reduce((count, costs) => {
@@ -125,7 +125,7 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {
             <TableCell className="text-center">{getResourceTier(resource.id)}</TableCell>
             <TableCell className="text-center">{getResourceWeight(resource.id)}</TableCell>
             <TableCell className="rounded flex gap-2 justify-center">
-              {RESOURCE_INPUTS_SCALED[resource.id]?.map((input, idx) => (
+              {RESOURCE_PRODUCTION_INPUT_RESOURCES_SCALED[resource.id]?.map((input, idx) => (
                 <Badge className="border p-1" key={idx} style={{ borderColor: resourceColor(input.resource) }}>
                   <img src={getResourceImage(input.resource)} alt={resource.trait} className="w-6 h-6 mx-auto" /> x{" "}
                   {input.amount}
@@ -135,7 +135,7 @@ export const ResourceTable = ({ resources }: { resources: Resources[] }) => {
             <TableCell className="text-center">
               {sumAdjustedInputs(resource.id)} [{adjustedDemand[resource.id].toFixed(2)}]
             </TableCell>
-            <TableCell className="text-center">{RESOURCE_OUTPUTS[resource.id]}</TableCell>
+            <TableCell className="text-center">{RESOURCE_PRODUCTION_OUTPUT_AMOUNTS[resource.id]}</TableCell>
 
             <TableCell className="text-center">{resourceUsageCount[resource.id]}</TableCell>
             <TableCell className="rounded flex gap-2 justify-center">

client/apps/balancing/src/components/ui/badge.tsx

@@ -1,5 +1,5 @@
-import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -20,10 +20,10 @@ const badgeVariants = cva(
   },
 );
 
-export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
+interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
 
 function Badge({ className, variant, ...props }: BadgeProps) {
   return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
 }
 
-export { Badge, badgeVariants };
+export { Badge };

client/apps/balancing/src/components/ui/table.tsx

@@ -73,4 +73,4 @@ const TableCaption = React.forwardRef<HTMLTableCaptionElement, React.HTMLAttribu
 );
 TableCaption.displayName = "TableCaption";
 
-export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption };
+export { Table, TableBody, TableCell, TableHead, TableHeader, TableRow };