BibliothecaDAO · credence0x · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/.github/workflows/discord-bot.yml b/.github/workflows/discord-bot.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          sparse-checkout: discord-bot
+          sparse-checkout: bot/discord
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
@@ -32,7 +32,7 @@ jobs:
           components: rustfmt
 
       - name: Run rustfmt
-        run: cd discord-bot && cargo fmt -- --check
+        run: cd bot/discord && cargo fmt -- --check
 
   clippy:
     runs-on: ubuntu-latest
@@ -41,7 +41,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          sparse-checkout: discord-bot
+          sparse-checkout: bot/discord
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
@@ -54,4 +54,4 @@ jobs:
         run: sudo apt-get install protobuf-compiler
 
       - name: Run clippy
-        run: cd discord-bot && cargo clippy -- -D warnings
+        run: cd bot/discord && cargo clippy -- -D warnings
diff --git a/bot/_ b/bot/_
diff --git a/discord-bot/.gitignore → bot/discord/.gitignore b/discord-bot/.gitignore → bot/discord/.gitignore
diff --git a/discord-bot/Cargo.lock → bot/discord/Cargo.lock b/discord-bot/Cargo.lock → bot/discord/Cargo.lock
diff --git a/discord-bot/Cargo.toml → bot/discord/Cargo.toml b/discord-bot/Cargo.toml → bot/discord/Cargo.toml
diff --git a/discord-bot/Makefile.toml → bot/discord/Makefile.toml b/discord-bot/Makefile.toml → bot/discord/Makefile.toml
diff --git a/discord-bot/Secrets.toml.example → bot/discord/Secrets.toml.example b/discord-bot/Secrets.toml.example → bot/discord/Secrets.toml.example
diff --git a/discord-bot/Shuttle.toml → bot/discord/Shuttle.toml b/discord-bot/Shuttle.toml → bot/discord/Shuttle.toml
diff --git a/...ons/20240818171830_create_users_table.sql → ...ons/20240818171830_create_users_table.sql b/...ons/20240818171830_create_users_table.sql → ...ons/20240818171830_create_users_table.sql
diff --git a/...bot/src/actors/discord_message_creator.rs → ...ord/src/actors/discord_message_creator.rs b/...bot/src/actors/discord_message_creator.rs → ...ord/src/actors/discord_message_creator.rs
diff --git a/...-bot/src/actors/discord_message_sender.rs → ...cord/src/actors/discord_message_sender.rs b/...-bot/src/actors/discord_message_sender.rs → ...cord/src/actors/discord_message_sender.rs
diff --git a/discord-bot/src/actors/mod.rs → bot/discord/src/actors/mod.rs b/discord-bot/src/actors/mod.rs → bot/discord/src/actors/mod.rs
diff --git a/discord-bot/src/actors/tick_sender.rs → bot/discord/src/actors/tick_sender.rs b/discord-bot/src/actors/tick_sender.rs → bot/discord/src/actors/tick_sender.rs
diff --git a/...bot/src/actors/torii_client_subscriber.rs → ...ord/src/actors/torii_client_subscriber.rs b/...bot/src/actors/torii_client_subscriber.rs → ...ord/src/actors/torii_client_subscriber.rs
diff --git a/discord-bot/src/commands/add_user.rs → bot/discord/src/commands/add_user.rs b/discord-bot/src/commands/add_user.rs → bot/discord/src/commands/add_user.rs
diff --git a/discord-bot/src/commands/get_user.rs → bot/discord/src/commands/get_user.rs b/discord-bot/src/commands/get_user.rs → bot/discord/src/commands/get_user.rs
diff --git a/discord-bot/src/commands/mod.rs → bot/discord/src/commands/mod.rs b/discord-bot/src/commands/mod.rs → bot/discord/src/commands/mod.rs
diff --git a/discord-bot/src/commands/update_user.rs → bot/discord/src/commands/update_user.rs b/discord-bot/src/commands/update_user.rs → bot/discord/src/commands/update_user.rs
diff --git a/discord-bot/src/constants.rs → bot/discord/src/constants.rs b/discord-bot/src/constants.rs → bot/discord/src/constants.rs
diff --git a/discord-bot/src/eternum_enums.rs → bot/discord/src/eternum_enums.rs b/discord-bot/src/eternum_enums.rs → bot/discord/src/eternum_enums.rs
diff --git a/discord-bot/src/events/battle_claim.rs → bot/discord/src/events/battle_claim.rs b/discord-bot/src/events/battle_claim.rs → bot/discord/src/events/battle_claim.rs
diff --git a/discord-bot/src/events/battle_join.rs → bot/discord/src/events/battle_join.rs b/discord-bot/src/events/battle_join.rs → bot/discord/src/events/battle_join.rs
diff --git a/discord-bot/src/events/battle_leave.rs → bot/discord/src/events/battle_leave.rs b/discord-bot/src/events/battle_leave.rs → bot/discord/src/events/battle_leave.rs
diff --git a/discord-bot/src/events/battle_pillage.rs → bot/discord/src/events/battle_pillage.rs b/discord-bot/src/events/battle_pillage.rs → bot/discord/src/events/battle_pillage.rs
@@ -14,7 +14,7 @@ use crate::{
 
 use super::{ToDiscordMessage, UNKNOWN_USER};
 
-const RESOURCE_PRECISION : u128 = 1_000_000_000;
+const RESOURCE_PRECISION: u128 = 1_000_000_000;
 #[derive(CairoSerde, Clone)]
 pub struct BattlePillage {
     pub id: u32,

diff --git a/discord-bot/src/events/battle_start.rs → bot/discord/src/events/battle_start.rs b/discord-bot/src/events/battle_start.rs → bot/discord/src/events/battle_start.rs
diff --git a/discord-bot/src/events/game_ended.rs → bot/discord/src/events/game_ended.rs b/discord-bot/src/events/game_ended.rs → bot/discord/src/events/game_ended.rs
diff --git a/...bot/src/events/hyperstructure_finished.rs → ...ord/src/events/hyperstructure_finished.rs b/...bot/src/events/hyperstructure_finished.rs → ...ord/src/events/hyperstructure_finished.rs
diff --git a/...-bot/src/events/hyperstructure_started.rs → ...cord/src/events/hyperstructure_started.rs b/...-bot/src/events/hyperstructure_started.rs → ...cord/src/events/hyperstructure_started.rs
diff --git a/discord-bot/src/events/mod.rs → bot/discord/src/events/mod.rs b/discord-bot/src/events/mod.rs → bot/discord/src/events/mod.rs
diff --git a/discord-bot/src/events/settle_realm.rs → bot/discord/src/events/settle_realm.rs b/discord-bot/src/events/settle_realm.rs → bot/discord/src/events/settle_realm.rs
diff --git a/discord-bot/src/init.rs → bot/discord/src/init.rs b/discord-bot/src/init.rs → bot/discord/src/init.rs
diff --git a/discord-bot/src/main.rs → bot/discord/src/main.rs b/discord-bot/src/main.rs → bot/discord/src/main.rs
diff --git a/discord-bot/src/types.rs → bot/discord/src/types.rs b/discord-bot/src/types.rs → bot/discord/src/types.rs
diff --git a/discord-bot/src/utils.rs → bot/discord/src/utils.rs b/discord-bot/src/utils.rs → bot/discord/src/utils.rs
diff --git a/contracts/scripts/contracts.sh → contracts/common/scripts/contracts.sh b/contracts/scripts/contracts.sh → contracts/common/scripts/contracts.sh
diff --git a/contracts/scripts/deploy.sh → contracts/common/scripts/deploy.sh b/contracts/scripts/deploy.sh → contracts/common/scripts/deploy.sh
diff --git a/contracts/scripts/extractPolicies.js → contracts/common/scripts/extractPolicies.js b/contracts/scripts/extractPolicies.js → contracts/common/scripts/extractPolicies.js
diff --git a/contracts/scripts/indexer.sh → contracts/common/scripts/indexer.sh b/contracts/scripts/indexer.sh → contracts/common/scripts/indexer.sh
diff --git a/contracts/scripts/set_admin_bank.sh → contracts/common/scripts/set_admin_bank.sh b/contracts/scripts/set_admin_bank.sh → contracts/common/scripts/set_admin_bank.sh
diff --git a/contracts/scripts/update_variables.sh → contracts/common/scripts/update_variables.sh b/contracts/scripts/update_variables.sh → contracts/common/scripts/update_variables.sh
diff --git a/contracts/.gitignore → contracts/game/.gitignore b/contracts/.gitignore → contracts/game/.gitignore
diff --git a/contracts/.tool-versions → contracts/game/.tool-versions b/contracts/.tool-versions → contracts/game/.tool-versions
diff --git a/contracts/Scarb.lock → contracts/game/Scarb.lock b/contracts/Scarb.lock → contracts/game/Scarb.lock
diff --git a/contracts/Scarb.toml → contracts/game/Scarb.toml b/contracts/Scarb.toml → contracts/game/Scarb.toml
diff --git a/contracts/dojo_dev.toml → contracts/game/dojo_dev.toml b/contracts/dojo_dev.toml → contracts/game/dojo_dev.toml
diff --git a/contracts/dojo_prod.toml → contracts/game/dojo_prod.toml b/contracts/dojo_prod.toml → contracts/game/dojo_prod.toml
diff --git a/contracts/game/ext/_ b/contracts/game/ext/_
diff --git a/contracts/formula/battles/battle_time.js → .../game/ext/formulas/battles/battle_time.js b/contracts/formula/battles/battle_time.js → .../game/ext/formulas/battles/battle_time.js
diff --git a/contracts/formula/battles/package.json → ...ts/game/ext/formulas/battles/package.json b/contracts/formula/battles/package.json → ...ts/game/ext/formulas/battles/package.json
diff --git a/contracts/formula/resources/readme.md → ...cts/game/ext/formulas/resources/readme.md b/contracts/formula/resources/readme.md → ...cts/game/ext/formulas/resources/readme.md
diff --git a/contracts/formula/resources/resources.py → .../game/ext/formulas/resources/resources.py b/contracts/formula/resources/resources.py → .../game/ext/formulas/resources/resources.py
diff --git a/contracts/manifest_dev.json → contracts/game/manifest_dev.json b/contracts/manifest_dev.json → contracts/game/manifest_dev.json
diff --git a/contracts/manifest_mainnet.json → contracts/game/manifest_mainnet.json b/contracts/manifest_mainnet.json → contracts/game/manifest_mainnet.json
diff --git a/contracts/manifest_prod.json → contracts/game/manifest_prod.json b/contracts/manifest_prod.json → contracts/game/manifest_prod.json
diff --git a/contracts/src/alias.cairo → contracts/game/src/alias.cairo b/contracts/src/alias.cairo → contracts/game/src/alias.cairo
diff --git a/contracts/src/constants.cairo → contracts/game/src/constants.cairo b/contracts/src/constants.cairo → contracts/game/src/constants.cairo
diff --git a/contracts/src/lib.cairo → contracts/game/src/lib.cairo b/contracts/src/lib.cairo → contracts/game/src/lib.cairo
diff --git a/contracts/src/models.cairo → contracts/game/src/models.cairo b/contracts/src/models.cairo → contracts/game/src/models.cairo
diff --git a/contracts/src/models/bank/bank.cairo → contracts/game/src/models/bank/bank.cairo b/contracts/src/models/bank/bank.cairo → contracts/game/src/models/bank/bank.cairo
diff --git a/contracts/src/models/bank/liquidity.cairo → ...acts/game/src/models/bank/liquidity.cairo b/contracts/src/models/bank/liquidity.cairo → ...acts/game/src/models/bank/liquidity.cairo
diff --git a/contracts/src/models/bank/market.cairo → contracts/game/src/models/bank/market.cairo b/contracts/src/models/bank/market.cairo → contracts/game/src/models/bank/market.cairo
diff --git a/contracts/src/models/buildings.cairo → contracts/game/src/models/buildings.cairo b/contracts/src/models/buildings.cairo → contracts/game/src/models/buildings.cairo
diff --git a/contracts/src/models/capacity.cairo → contracts/game/src/models/capacity.cairo b/contracts/src/models/capacity.cairo → contracts/game/src/models/capacity.cairo
diff --git a/contracts/src/models/combat.cairo → contracts/game/src/models/combat.cairo b/contracts/src/models/combat.cairo → contracts/game/src/models/combat.cairo
diff --git a/contracts/src/models/config.cairo → contracts/game/src/models/config.cairo b/contracts/src/models/config.cairo → contracts/game/src/models/config.cairo
diff --git a/contracts/src/models/event.cairo → contracts/game/src/models/event.cairo b/contracts/src/models/event.cairo → contracts/game/src/models/event.cairo
diff --git a/contracts/src/models/guild.cairo → contracts/game/src/models/guild.cairo b/contracts/src/models/guild.cairo → contracts/game/src/models/guild.cairo
diff --git a/contracts/src/models/hyperstructure.cairo → ...acts/game/src/models/hyperstructure.cairo b/contracts/src/models/hyperstructure.cairo → ...acts/game/src/models/hyperstructure.cairo
diff --git a/contracts/src/models/map.cairo → contracts/game/src/models/map.cairo b/contracts/src/models/map.cairo → contracts/game/src/models/map.cairo
diff --git a/contracts/src/models/message.cairo → contracts/game/src/models/message.cairo b/contracts/src/models/message.cairo → contracts/game/src/models/message.cairo
diff --git a/contracts/src/models/movable.cairo → contracts/game/src/models/movable.cairo b/contracts/src/models/movable.cairo → contracts/game/src/models/movable.cairo
diff --git a/contracts/src/models/name.cairo → contracts/game/src/models/name.cairo b/contracts/src/models/name.cairo → contracts/game/src/models/name.cairo
diff --git a/contracts/src/models/order.cairo → contracts/game/src/models/order.cairo b/contracts/src/models/order.cairo → contracts/game/src/models/order.cairo
diff --git a/contracts/src/models/owner.cairo → contracts/game/src/models/owner.cairo b/contracts/src/models/owner.cairo → contracts/game/src/models/owner.cairo
diff --git a/contracts/src/models/population.cairo → contracts/game/src/models/population.cairo b/contracts/src/models/population.cairo → contracts/game/src/models/population.cairo
diff --git a/contracts/src/models/position.cairo → contracts/game/src/models/position.cairo b/contracts/src/models/position.cairo → contracts/game/src/models/position.cairo
diff --git a/contracts/src/models/production.cairo → contracts/game/src/models/production.cairo b/contracts/src/models/production.cairo → contracts/game/src/models/production.cairo
diff --git a/contracts/src/models/quantity.cairo → contracts/game/src/models/quantity.cairo b/contracts/src/models/quantity.cairo → contracts/game/src/models/quantity.cairo
diff --git a/contracts/src/models/quest.cairo → contracts/game/src/models/quest.cairo b/contracts/src/models/quest.cairo → contracts/game/src/models/quest.cairo
diff --git a/contracts/src/models/realm.cairo → contracts/game/src/models/realm.cairo b/contracts/src/models/realm.cairo → contracts/game/src/models/realm.cairo
diff --git a/contracts/src/models/resources.cairo → contracts/game/src/models/resources.cairo b/contracts/src/models/resources.cairo → contracts/game/src/models/resources.cairo
diff --git a/contracts/src/models/season.cairo → contracts/game/src/models/season.cairo b/contracts/src/models/season.cairo → contracts/game/src/models/season.cairo
diff --git a/contracts/src/models/stamina.cairo → contracts/game/src/models/stamina.cairo b/contracts/src/models/stamina.cairo → contracts/game/src/models/stamina.cairo
diff --git a/contracts/src/models/structure.cairo → contracts/game/src/models/structure.cairo b/contracts/src/models/structure.cairo → contracts/game/src/models/structure.cairo
diff --git a/contracts/src/models/trade.cairo → contracts/game/src/models/trade.cairo b/contracts/src/models/trade.cairo → contracts/game/src/models/trade.cairo
diff --git a/contracts/src/models/weight.cairo → contracts/game/src/models/weight.cairo b/contracts/src/models/weight.cairo → contracts/game/src/models/weight.cairo
diff --git a/contracts/src/systems.cairo → contracts/game/src/systems.cairo b/contracts/src/systems.cairo → contracts/game/src/systems.cairo
diff --git a/contracts/src/systems/bank/contracts.cairo → ...cts/game/src/systems/bank/contracts.cairo b/contracts/src/systems/bank/contracts.cairo → ...cts/game/src/systems/bank/contracts.cairo
diff --git a/...cts/src/systems/bank/contracts/bank.cairo → ...ame/src/systems/bank/contracts/bank.cairo b/...cts/src/systems/bank/contracts/bank.cairo → ...ame/src/systems/bank/contracts/bank.cairo
diff --git a/...rc/systems/bank/contracts/liquidity.cairo → ...rc/systems/bank/contracts/liquidity.cairo b/...rc/systems/bank/contracts/liquidity.cairo → ...rc/systems/bank/contracts/liquidity.cairo
diff --git a/...cts/src/systems/bank/contracts/swap.cairo → ...ame/src/systems/bank/contracts/swap.cairo b/...cts/src/systems/bank/contracts/swap.cairo → ...ame/src/systems/bank/contracts/swap.cairo
diff --git a/contracts/src/systems/bank/tests.cairo → contracts/game/src/systems/bank/tests.cairo b/contracts/src/systems/bank/tests.cairo → contracts/game/src/systems/bank/tests.cairo
diff --git a/contracts/src/systems/bank/tests/bank.cairo → ...ts/game/src/systems/bank/tests/bank.cairo b/contracts/src/systems/bank/tests/bank.cairo → ...ts/game/src/systems/bank/tests/bank.cairo
diff --git a/...ts/src/systems/bank/tests/liquidity.cairo → ...me/src/systems/bank/tests/liquidity.cairo b/...ts/src/systems/bank/tests/liquidity.cairo → ...me/src/systems/bank/tests/liquidity.cairo
diff --git a/contracts/src/systems/bank/tests/swap.cairo → ...ts/game/src/systems/bank/tests/swap.cairo b/contracts/src/systems/bank/tests/swap.cairo → ...ts/game/src/systems/bank/tests/swap.cairo
diff --git a/...cts/src/systems/buildings/contracts.cairo → ...ame/src/systems/buildings/contracts.cairo b/...cts/src/systems/buildings/contracts.cairo → ...ame/src/systems/buildings/contracts.cairo
diff --git a/contracts/src/systems/buildings/tests.cairo → ...ts/game/src/systems/buildings/tests.cairo b/contracts/src/systems/buildings/tests.cairo → ...ts/game/src/systems/buildings/tests.cairo
diff --git a/...ems/combat/contracts/battle_systems.cairo → ...ems/combat/contracts/battle_systems.cairo b/...ems/combat/contracts/battle_systems.cairo → ...ems/combat/contracts/battle_systems.cairo
@@ -674,7 +674,6 @@ mod battle_systems {
             caller_army = r_caller_army;
 
             // slash army if battle was not concluded before they left
-            let leaver = starknet::get_caller_address();
             let mut army: Army = world.read_model(army_id);
             if army_left_early {
                 let troop_config = TroopConfigImpl::get(world);

diff --git a/...tems/combat/contracts/troop_systems.cairo → ...tems/combat/contracts/troop_systems.cairo b/...tems/combat/contracts/troop_systems.cairo → ...tems/combat/contracts/troop_systems.cairo
diff --git a/contracts/src/systems/combat/tests.cairo → ...racts/game/src/systems/combat/tests.cairo b/contracts/src/systems/combat/tests.cairo → ...racts/game/src/systems/combat/tests.cairo
diff --git a/.../systems/combat/tests/army_buy_test.cairo → .../systems/combat/tests/army_buy_test.cairo b/.../systems/combat/tests/army_buy_test.cairo → .../systems/combat/tests/army_buy_test.cairo
diff --git a/...stems/combat/tests/army_create_test.cairo → ...stems/combat/tests/army_create_test.cairo b/...stems/combat/tests/army_create_test.cairo → ...stems/combat/tests/army_create_test.cairo
diff --git a/...tems/combat/tests/battle_leave_test.cairo → ...tems/combat/tests/battle_leave_test.cairo b/...tems/combat/tests/battle_leave_test.cairo → ...tems/combat/tests/battle_leave_test.cairo
diff --git a/...ms/combat/tests/battle_pillage_test.cairo → ...ms/combat/tests/battle_pillage_test.cairo b/...ms/combat/tests/battle_pillage_test.cairo → ...ms/combat/tests/battle_pillage_test.cairo
diff --git a/...tems/combat/tests/battle_start_test.cairo → ...tems/combat/tests/battle_start_test.cairo b/...tems/combat/tests/battle_start_test.cairo → ...tems/combat/tests/battle_start_test.cairo
diff --git a/contracts/src/systems/config/contracts.cairo → ...s/game/src/systems/config/contracts.cairo b/contracts/src/systems/config/contracts.cairo → ...s/game/src/systems/config/contracts.cairo
diff --git a/contracts/src/systems/config/tests.cairo → ...racts/game/src/systems/config/tests.cairo b/contracts/src/systems/config/tests.cairo → ...racts/game/src/systems/config/tests.cairo
diff --git a/...g/tests/hyperstructure_config_tests.cairo → ...g/tests/hyperstructure_config_tests.cairo b/...g/tests/hyperstructure_config_tests.cairo → ...g/tests/hyperstructure_config_tests.cairo
diff --git a/...onfig/tests/settlement_config_tests.cairo → ...onfig/tests/settlement_config_tests.cairo b/...onfig/tests/settlement_config_tests.cairo → ...onfig/tests/settlement_config_tests.cairo
diff --git a/contracts/src/systems/dev/contracts.cairo → ...acts/game/src/systems/dev/contracts.cairo b/contracts/src/systems/dev/contracts.cairo → ...acts/game/src/systems/dev/contracts.cairo
diff --git a/...acts/src/systems/dev/contracts/bank.cairo → ...game/src/systems/dev/contracts/bank.cairo b/...acts/src/systems/dev/contracts/bank.cairo → ...game/src/systems/dev/contracts/bank.cairo
diff --git a/...cts/src/systems/dev/contracts/realm.cairo → ...ame/src/systems/dev/contracts/realm.cairo b/...cts/src/systems/dev/contracts/realm.cairo → ...ame/src/systems/dev/contracts/realm.cairo
diff --git a/.../src/systems/dev/contracts/resource.cairo → .../src/systems/dev/contracts/resource.cairo b/.../src/systems/dev/contracts/resource.cairo → .../src/systems/dev/contracts/resource.cairo
diff --git a/contracts/src/systems/guild/contracts.cairo → ...ts/game/src/systems/guild/contracts.cairo b/contracts/src/systems/guild/contracts.cairo → ...ts/game/src/systems/guild/contracts.cairo
diff --git a/contracts/src/systems/guild/tests.cairo → contracts/game/src/systems/guild/tests.cairo b/contracts/src/systems/guild/tests.cairo → contracts/game/src/systems/guild/tests.cairo
diff --git a/...rc/systems/hyperstructure/contracts.cairo → ...rc/systems/hyperstructure/contracts.cairo b/...rc/systems/hyperstructure/contracts.cairo → ...rc/systems/hyperstructure/contracts.cairo
diff --git a/...ts/src/systems/hyperstructure/tests.cairo → ...me/src/systems/hyperstructure/tests.cairo b/...ts/src/systems/hyperstructure/tests.cairo → ...me/src/systems/hyperstructure/tests.cairo
diff --git a/contracts/src/systems/map/contracts.cairo → ...acts/game/src/systems/map/contracts.cairo b/contracts/src/systems/map/contracts.cairo → ...acts/game/src/systems/map/contracts.cairo
diff --git a/...acts/src/systems/map/map_generation.cairo → ...game/src/systems/map/map_generation.cairo b/...acts/src/systems/map/map_generation.cairo → ...game/src/systems/map/map_generation.cairo
diff --git a/contracts/src/systems/map/tests.cairo → contracts/game/src/systems/map/tests.cairo b/contracts/src/systems/map/tests.cairo → contracts/game/src/systems/map/tests.cairo
diff --git a/contracts/src/systems/name/contracts.cairo → ...cts/game/src/systems/name/contracts.cairo b/contracts/src/systems/name/contracts.cairo → ...cts/game/src/systems/name/contracts.cairo
diff --git a/...cts/src/systems/ownership/contracts.cairo → ...ame/src/systems/ownership/contracts.cairo b/...cts/src/systems/ownership/contracts.cairo → ...ame/src/systems/ownership/contracts.cairo
diff --git a/contracts/src/systems/ownership/tests.cairo → ...ts/game/src/systems/ownership/tests.cairo b/contracts/src/systems/ownership/tests.cairo → ...ts/game/src/systems/ownership/tests.cairo
diff --git a/contracts/src/systems/realm/contracts.cairo → ...ts/game/src/systems/realm/contracts.cairo b/contracts/src/systems/realm/contracts.cairo → ...ts/game/src/systems/realm/contracts.cairo
diff --git a/contracts/src/systems/realm/tests.cairo → contracts/game/src/systems/realm/tests.cairo b/contracts/src/systems/realm/tests.cairo → contracts/game/src/systems/realm/tests.cairo
diff --git a/...cts/src/systems/resources/contracts.cairo → ...ame/src/systems/resources/contracts.cairo b/...cts/src/systems/resources/contracts.cairo → ...ame/src/systems/resources/contracts.cairo
diff --git a/...s/contracts/resource_bridge_systems.cairo → ...s/contracts/resource_bridge_systems.cairo b/...s/contracts/resource_bridge_systems.cairo → ...s/contracts/resource_bridge_systems.cairo
diff --git a/...esources/contracts/resource_systems.cairo → ...esources/contracts/resource_systems.cairo b/...esources/contracts/resource_systems.cairo → ...esources/contracts/resource_systems.cairo
diff --git a/contracts/src/systems/resources/tests.cairo → ...ts/game/src/systems/resources/tests.cairo b/contracts/src/systems/resources/tests.cairo → ...ts/game/src/systems/resources/tests.cairo
diff --git a/...ests/resource_approval_system_tests.cairo → ...ests/resource_approval_system_tests.cairo b/...ests/resource_approval_system_tests.cairo → ...ests/resource_approval_system_tests.cairo
diff --git a/.../tests/resource_bridge_system_tests.cairo → .../tests/resource_bridge_system_tests.cairo b/.../tests/resource_bridge_system_tests.cairo → .../tests/resource_bridge_system_tests.cairo
diff --git a/...ests/resource_transfer_system_tests.cairo → ...ests/resource_transfer_system_tests.cairo b/...ests/resource_transfer_system_tests.cairo → ...ests/resource_transfer_system_tests.cairo
diff --git a/contracts/src/systems/season/contracts.cairo → ...s/game/src/systems/season/contracts.cairo b/contracts/src/systems/season/contracts.cairo → ...s/game/src/systems/season/contracts.cairo
diff --git a/contracts/src/systems/season/tests.cairo → ...racts/game/src/systems/season/tests.cairo b/contracts/src/systems/season/tests.cairo → ...racts/game/src/systems/season/tests.cairo
diff --git a/contracts/src/systems/trade/contracts.cairo → ...ts/game/src/systems/trade/contracts.cairo b/contracts/src/systems/trade/contracts.cairo → ...ts/game/src/systems/trade/contracts.cairo
diff --git a/...stems/trade/contracts/trade_systems.cairo → ...stems/trade/contracts/trade_systems.cairo b/...stems/trade/contracts/trade_systems.cairo → ...stems/trade/contracts/trade_systems.cairo
diff --git a/contracts/src/systems/trade/tests.cairo → contracts/game/src/systems/trade/tests.cairo b/contracts/src/systems/trade/tests.cairo → contracts/game/src/systems/trade/tests.cairo
diff --git a/...ems/trade/tests/trade_systems_tests.cairo → ...ems/trade/tests/trade_systems_tests.cairo b/...ems/trade/tests/trade_systems_tests.cairo → ...ems/trade/tests/trade_systems_tests.cairo
diff --git a/...ts/trade_systems_tests/accept_order.cairo → ...ts/trade_systems_tests/accept_order.cairo b/...ts/trade_systems_tests/accept_order.cairo → ...ts/trade_systems_tests/accept_order.cairo
diff --git a/...ts/trade_systems_tests/cancel_order.cairo → ...ts/trade_systems_tests/cancel_order.cairo b/...ts/trade_systems_tests/cancel_order.cairo → ...ts/trade_systems_tests/cancel_order.cairo
diff --git a/...ts/trade_systems_tests/create_order.cairo → ...ts/trade_systems_tests/create_order.cairo b/...ts/trade_systems_tests/create_order.cairo → ...ts/trade_systems_tests/create_order.cairo
diff --git a/...cts/src/systems/transport/contracts.cairo → ...ame/src/systems/transport/contracts.cairo b/...cts/src/systems/transport/contracts.cairo → ...ame/src/systems/transport/contracts.cairo
diff --git a/.../transport/contracts/donkey_systems.cairo → .../transport/contracts/donkey_systems.cairo b/.../transport/contracts/donkey_systems.cairo → .../transport/contracts/donkey_systems.cairo
diff --git a/.../transport/contracts/travel_systems.cairo → .../transport/contracts/travel_systems.cairo b/.../transport/contracts/travel_systems.cairo → .../transport/contracts/travel_systems.cairo
diff --git a/contracts/src/systems/transport/tests.cairo → ...ts/game/src/systems/transport/tests.cairo b/contracts/src/systems/transport/tests.cairo → ...ts/game/src/systems/transport/tests.cairo
diff --git a/...ransport/tests/travel_systems_tests.cairo → ...ransport/tests/travel_systems_tests.cairo b/...ransport/tests/travel_systems_tests.cairo → ...ransport/tests/travel_systems_tests.cairo
diff --git a/contracts/src/utils.cairo → contracts/game/src/utils.cairo b/contracts/src/utils.cairo → contracts/game/src/utils.cairo
diff --git a/contracts/src/utils/map.cairo → contracts/game/src/utils/map.cairo b/contracts/src/utils/map.cairo → contracts/game/src/utils/map.cairo
diff --git a/contracts/src/utils/map/biomes.cairo → contracts/game/src/utils/map/biomes.cairo b/contracts/src/utils/map/biomes.cairo → contracts/game/src/utils/map/biomes.cairo
diff --git a/contracts/src/utils/map/constants.cairo → contracts/game/src/utils/map/constants.cairo b/contracts/src/utils/map/constants.cairo → contracts/game/src/utils/map/constants.cairo
diff --git a/contracts/src/utils/math.cairo → contracts/game/src/utils/math.cairo b/contracts/src/utils/math.cairo → contracts/game/src/utils/math.cairo
diff --git a/contracts/src/utils/number.cairo → contracts/game/src/utils/number.cairo b/contracts/src/utils/number.cairo → contracts/game/src/utils/number.cairo
diff --git a/contracts/src/utils/random.cairo → contracts/game/src/utils/random.cairo b/contracts/src/utils/random.cairo → contracts/game/src/utils/random.cairo
diff --git a/contracts/src/utils/tasks.cairo → contracts/game/src/utils/tasks.cairo b/contracts/src/utils/tasks.cairo → contracts/game/src/utils/tasks.cairo
diff --git a/contracts/src/utils/tasks/battlelord.cairo → ...cts/game/src/utils/tasks/battlelord.cairo b/contracts/src/utils/tasks/battlelord.cairo → ...cts/game/src/utils/tasks/battlelord.cairo
diff --git a/contracts/src/utils/tasks/breeder.cairo → contracts/game/src/utils/tasks/breeder.cairo b/contracts/src/utils/tasks/breeder.cairo → contracts/game/src/utils/tasks/breeder.cairo
diff --git a/contracts/src/utils/tasks/builder.cairo → contracts/game/src/utils/tasks/builder.cairo b/contracts/src/utils/tasks/builder.cairo → contracts/game/src/utils/tasks/builder.cairo
diff --git a/contracts/src/utils/tasks/claimer.cairo → contracts/game/src/utils/tasks/claimer.cairo b/contracts/src/utils/tasks/claimer.cairo → contracts/game/src/utils/tasks/claimer.cairo
diff --git a/contracts/src/utils/tasks/conqueror.cairo → ...acts/game/src/utils/tasks/conqueror.cairo b/contracts/src/utils/tasks/conqueror.cairo → ...acts/game/src/utils/tasks/conqueror.cairo
diff --git a/contracts/src/utils/tasks/discoverer.cairo → ...cts/game/src/utils/tasks/discoverer.cairo b/contracts/src/utils/tasks/discoverer.cairo → ...cts/game/src/utils/tasks/discoverer.cairo
diff --git a/contracts/src/utils/tasks/explorer.cairo → ...racts/game/src/utils/tasks/explorer.cairo b/contracts/src/utils/tasks/explorer.cairo → ...racts/game/src/utils/tasks/explorer.cairo
diff --git a/contracts/src/utils/tasks/index.cairo → contracts/game/src/utils/tasks/index.cairo b/contracts/src/utils/tasks/index.cairo → contracts/game/src/utils/tasks/index.cairo
diff --git a/contracts/src/utils/tasks/interface.cairo → ...acts/game/src/utils/tasks/interface.cairo b/contracts/src/utils/tasks/interface.cairo → ...acts/game/src/utils/tasks/interface.cairo
diff --git a/contracts/src/utils/tasks/maximalist.cairo → ...cts/game/src/utils/tasks/maximalist.cairo b/contracts/src/utils/tasks/maximalist.cairo → ...cts/game/src/utils/tasks/maximalist.cairo
diff --git a/contracts/src/utils/tasks/opportunist.cairo → ...ts/game/src/utils/tasks/opportunist.cairo b/contracts/src/utils/tasks/opportunist.cairo → ...ts/game/src/utils/tasks/opportunist.cairo
diff --git a/contracts/src/utils/tasks/ruler.cairo → contracts/game/src/utils/tasks/ruler.cairo b/contracts/src/utils/tasks/ruler.cairo → contracts/game/src/utils/tasks/ruler.cairo
diff --git a/contracts/src/utils/tasks/squire.cairo → contracts/game/src/utils/tasks/squire.cairo b/contracts/src/utils/tasks/squire.cairo → contracts/game/src/utils/tasks/squire.cairo
diff --git a/contracts/src/utils/tasks/warlord.cairo → contracts/game/src/utils/tasks/warlord.cairo b/contracts/src/utils/tasks/warlord.cairo → contracts/game/src/utils/tasks/warlord.cairo
diff --git a/contracts/src/utils/testing.cairo → contracts/game/src/utils/testing.cairo b/contracts/src/utils/testing.cairo → contracts/game/src/utils/testing.cairo
diff --git a/contracts/src/utils/testing/config.cairo → ...racts/game/src/utils/testing/config.cairo b/contracts/src/utils/testing/config.cairo → ...racts/game/src/utils/testing/config.cairo
diff --git a/contracts/src/utils/testing/constants.cairo → ...ts/game/src/utils/testing/constants.cairo b/contracts/src/utils/testing/constants.cairo → ...ts/game/src/utils/testing/constants.cairo
diff --git a/contracts/src/utils/testing/general.cairo → ...acts/game/src/utils/testing/general.cairo b/contracts/src/utils/testing/general.cairo → ...acts/game/src/utils/testing/general.cairo
diff --git a/...ts/src/utils/testing/mock/erc20mock.cairo → ...me/src/utils/testing/mock/erc20mock.cairo b/...ts/src/utils/testing/mock/erc20mock.cairo → ...me/src/utils/testing/mock/erc20mock.cairo
diff --git a/contracts/src/utils/testing/systems.cairo → ...acts/game/src/utils/testing/systems.cairo b/contracts/src/utils/testing/systems.cairo → ...acts/game/src/utils/testing/systems.cairo
diff --git a/contracts/src/utils/testing/world.cairo → contracts/game/src/utils/testing/world.cairo b/contracts/src/utils/testing/world.cairo → contracts/game/src/utils/testing/world.cairo
diff --git a/contracts/src/utils/trophies.cairo → contracts/game/src/utils/trophies.cairo b/contracts/src/utils/trophies.cairo → contracts/game/src/utils/trophies.cairo
diff --git a/...racts/src/utils/trophies/battlelord.cairo → .../game/src/utils/trophies/battlelord.cairo b/...racts/src/utils/trophies/battlelord.cairo → .../game/src/utils/trophies/battlelord.cairo
diff --git a/contracts/src/utils/trophies/breeder.cairo → ...cts/game/src/utils/trophies/breeder.cairo b/contracts/src/utils/trophies/breeder.cairo → ...cts/game/src/utils/trophies/breeder.cairo
diff --git a/contracts/src/utils/trophies/conqueror.cairo → ...s/game/src/utils/trophies/conqueror.cairo b/contracts/src/utils/trophies/conqueror.cairo → ...s/game/src/utils/trophies/conqueror.cairo
diff --git a/contracts/src/utils/trophies/explorer.cairo → ...ts/game/src/utils/trophies/explorer.cairo b/contracts/src/utils/trophies/explorer.cairo → ...ts/game/src/utils/trophies/explorer.cairo
diff --git a/contracts/src/utils/trophies/index.cairo → ...racts/game/src/utils/trophies/index.cairo b/contracts/src/utils/trophies/index.cairo → ...racts/game/src/utils/trophies/index.cairo
diff --git a/contracts/src/utils/trophies/interface.cairo → ...s/game/src/utils/trophies/interface.cairo b/contracts/src/utils/trophies/interface.cairo → ...s/game/src/utils/trophies/interface.cairo
diff --git a/...racts/src/utils/trophies/maximalist.cairo → .../game/src/utils/trophies/maximalist.cairo b/...racts/src/utils/trophies/maximalist.cairo → .../game/src/utils/trophies/maximalist.cairo
diff --git a/...acts/src/utils/trophies/opportunist.cairo → ...game/src/utils/trophies/opportunist.cairo b/...acts/src/utils/trophies/opportunist.cairo → ...game/src/utils/trophies/opportunist.cairo
diff --git a/contracts/src/utils/trophies/ruler.cairo → ...racts/game/src/utils/trophies/ruler.cairo b/contracts/src/utils/trophies/ruler.cairo → ...racts/game/src/utils/trophies/ruler.cairo
diff --git a/contracts/src/utils/trophies/squire.cairo → ...acts/game/src/utils/trophies/squire.cairo b/contracts/src/utils/trophies/squire.cairo → ...acts/game/src/utils/trophies/squire.cairo
diff --git a/...racts/src/utils/trophies/strategist.cairo → .../game/src/utils/trophies/strategist.cairo b/...racts/src/utils/trophies/strategist.cairo → .../game/src/utils/trophies/strategist.cairo
diff --git a/contracts/src/utils/trophies/warlord.cairo → ...cts/game/src/utils/trophies/warlord.cairo b/contracts/src/utils/trophies/warlord.cairo → ...cts/game/src/utils/trophies/warlord.cairo
diff --git a/contracts/src/utils/vrgda.cairo → contracts/game/src/utils/vrgda.cairo b/contracts/src/utils/vrgda.cairo → contracts/game/src/utils/vrgda.cairo
diff --git a/contracts/torii-sepolia.toml → contracts/game/torii-sepolia.toml b/contracts/torii-sepolia.toml → contracts/game/torii-sepolia.toml
diff --git a/contracts/torii.toml → contracts/game/torii.toml b/contracts/torii.toml → contracts/game/torii.toml
diff --git a/contracts/package.json b/contracts/package.json
diff --git a/contracts/scripts/client.sh b/contracts/scripts/client.sh
diff --git a/...acts/season_pass/contracts/.tool-versions → contracts/season_pass/.tool-versions b/...acts/season_pass/contracts/.tool-versions → contracts/season_pass/.tool-versions
diff --git a/contracts/season_pass/contracts/Scarb.lock → contracts/season_pass/Scarb.lock b/contracts/season_pass/contracts/Scarb.lock → contracts/season_pass/Scarb.lock
diff --git a/contracts/season_pass/contracts/Scarb.toml → contracts/season_pass/Scarb.toml b/contracts/season_pass/contracts/Scarb.toml → contracts/season_pass/Scarb.toml
diff --git a/contracts/season_pass/contracts/.DS_Store b/contracts/season_pass/contracts/.DS_Store
diff --git a/contracts/season_pass/ext/_ b/contracts/season_pass/ext/_
diff --git a/...ason_pass/scripts/deployment/.env.example → ..._pass/ext/scripts/deployment/.env.example b/...ason_pass/scripts/deployment/.env.example → ..._pass/ext/scripts/deployment/.env.example
diff --git a/...n_pass/scripts/deployment/.env.production → ...ss/ext/scripts/deployment/.env.production b/...n_pass/scripts/deployment/.env.production → ...ss/ext/scripts/deployment/.env.production
diff --git a/...ason_pass/scripts/deployment/.env.sepolia → ..._pass/ext/scripts/deployment/.env.sepolia b/...ason_pass/scripts/deployment/.env.sepolia → ..._pass/ext/scripts/deployment/.env.sepolia
diff --git a/...season_pass/scripts/deployment/.gitignore → ...on_pass/ext/scripts/deployment/.gitignore b/...season_pass/scripts/deployment/.gitignore → ...on_pass/ext/scripts/deployment/.gitignore
diff --git a/...son_pass/scripts/deployment/deploy_dev.js → ...pass/ext/scripts/deployment/deploy_dev.js b/...son_pass/scripts/deployment/deploy_dev.js → ...pass/ext/scripts/deployment/deploy_dev.js
diff --git a/...on_pass/scripts/deployment/deploy_prod.js → ...ass/ext/scripts/deployment/deploy_prod.js b/...on_pass/scripts/deployment/deploy_prod.js → ...ass/ext/scripts/deployment/deploy_prod.js
diff --git a/..._pass/scripts/deployment/libs/commands.js → ...s/ext/scripts/deployment/libs/commands.js b/..._pass/scripts/deployment/libs/commands.js → ...s/ext/scripts/deployment/libs/commands.js
diff --git a/...on_pass/scripts/deployment/libs/common.js → ...ass/ext/scripts/deployment/libs/common.js b/...on_pass/scripts/deployment/libs/common.js → ...ass/ext/scripts/deployment/libs/common.js
diff --git a/...n_pass/scripts/deployment/libs/network.js → ...ss/ext/scripts/deployment/libs/network.js b/...n_pass/scripts/deployment/libs/network.js → ...ss/ext/scripts/deployment/libs/network.js
diff --git a/...ason_pass/scripts/deployment/mainnet.ansi → ..._pass/ext/scripts/deployment/mainnet.ansi b/...ason_pass/scripts/deployment/mainnet.ansi → ..._pass/ext/scripts/deployment/mainnet.ansi
diff --git a/...ason_pass/scripts/deployment/package.json → ..._pass/ext/scripts/deployment/package.json b/...ason_pass/scripts/deployment/package.json → ..._pass/ext/scripts/deployment/package.json
diff --git a/.../season_pass/contracts/src/contract.cairo → contracts/season_pass/src/contract.cairo b/.../season_pass/contracts/src/contract.cairo → contracts/season_pass/src/contract.cairo
diff --git a/...racts/season_pass/contracts/src/lib.cairo → contracts/season_pass/src/lib.cairo b/...racts/season_pass/contracts/src/lib.cairo → contracts/season_pass/src/lib.cairo
diff --git a/...eason_pass/contracts/src/mock/lords.cairo → contracts/season_pass/src/mock/lords.cairo b/...eason_pass/contracts/src/mock/lords.cairo → contracts/season_pass/src/mock/lords.cairo
diff --git a/.../contracts/src/mock/realms/metadata.cairo → ...eason_pass/src/mock/realms/metadata.cairo b/.../contracts/src/mock/realms/metadata.cairo → ...eason_pass/src/mock/realms/metadata.cairo
diff --git a/...ss/contracts/src/mock/realms/realms.cairo → .../season_pass/src/mock/realms/realms.cairo b/...ss/contracts/src/mock/realms/realms.cairo → .../season_pass/src/mock/realms/realms.cairo
diff --git a/...ontracts/src/tests/test_season_pass.cairo → ...son_pass/src/tests/test_season_pass.cairo b/...ontracts/src/tests/test_season_pass.cairo → ...son_pass/src/tests/test_season_pass.cairo
diff --git a/...cts/season_pass/contracts/src/utils.cairo → contracts/season_pass/src/utils.cairo b/...cts/season_pass/contracts/src/utils.cairo → contracts/season_pass/src/utils.cairo
diff --git a/...season_resources/contracts/.tool-versions → contracts/season_resources/.tool-versions b/...season_resources/contracts/.tool-versions → contracts/season_resources/.tool-versions
diff --git a/...cts/season_resources/contracts/Scarb.lock → contracts/season_resources/Scarb.lock b/...cts/season_resources/contracts/Scarb.lock → contracts/season_resources/Scarb.lock
diff --git a/...cts/season_resources/contracts/Scarb.toml → contracts/season_resources/Scarb.toml b/...cts/season_resources/contracts/Scarb.toml → contracts/season_resources/Scarb.toml
diff --git a/contracts/season_resources/ext/_ b/contracts/season_resources/ext/_
diff --git a/...resources/scripts/deployment/.env.example → ...urces/ext/scripts/deployment/.env.example b/...resources/scripts/deployment/.env.example → ...urces/ext/scripts/deployment/.env.example
diff --git a/...ources/scripts/deployment/.env.production → ...es/ext/scripts/deployment/.env.production b/...ources/scripts/deployment/.env.production → ...es/ext/scripts/deployment/.env.production
diff --git a/..._resources/scripts/deployment/.env.sample → ...ources/ext/scripts/deployment/.env.sample b/..._resources/scripts/deployment/.env.sample → ...ources/ext/scripts/deployment/.env.sample
diff --git a/...resources/scripts/deployment/.env.sepolia → ...urces/ext/scripts/deployment/.env.sepolia b/...resources/scripts/deployment/.env.sepolia → ...urces/ext/scripts/deployment/.env.sepolia
diff --git a/...n_resources/scripts/deployment/.gitignore → ...sources/ext/scripts/deployment/.gitignore b/...n_resources/scripts/deployment/.gitignore → ...sources/ext/scripts/deployment/.gitignore
diff --git a/...ources/scripts/deployment/config/index.ts → ...es/ext/scripts/deployment/config/index.ts b/...ources/scripts/deployment/config/index.ts → ...es/ext/scripts/deployment/config/index.ts
diff --git a/...ripts/deployment/config/provider/index.ts → ...ripts/deployment/config/provider/index.ts b/...ripts/deployment/config/provider/index.ts → ...ripts/deployment/config/provider/index.ts
diff --git a/...on_resources/scripts/deployment/deploy.js → ...esources/ext/scripts/deployment/deploy.js b/...on_resources/scripts/deployment/deploy.js → ...esources/ext/scripts/deployment/deploy.js
diff --git a/...urces/scripts/deployment/libs/commands.js → ...s/ext/scripts/deployment/libs/commands.js b/...urces/scripts/deployment/libs/commands.js → ...s/ext/scripts/deployment/libs/commands.js
diff --git a/...sources/scripts/deployment/libs/common.js → ...ces/ext/scripts/deployment/libs/common.js b/...sources/scripts/deployment/libs/common.js → ...ces/ext/scripts/deployment/libs/common.js
diff --git a/...ources/scripts/deployment/libs/network.js → ...es/ext/scripts/deployment/libs/network.js b/...ources/scripts/deployment/libs/network.js → ...es/ext/scripts/deployment/libs/network.js
diff --git a/...es/scripts/deployment/libs/resources.json → ...xt/scripts/deployment/libs/resources.json b/...es/scripts/deployment/libs/resources.json → ...xt/scripts/deployment/libs/resources.json
diff --git a/...resources/scripts/deployment/package.json → ...urces/ext/scripts/deployment/package.json b/...resources/scripts/deployment/package.json → ...urces/ext/scripts/deployment/package.json
diff --git a/...on_resources/contracts/src/contract.cairo → ...racts/season_resources/src/contract.cairo b/...on_resources/contracts/src/contract.cairo → ...racts/season_resources/src/contract.cairo
diff --git a/.../season_resources/contracts/src/lib.cairo → contracts/season_resources/src/lib.cairo b/.../season_resources/contracts/src/lib.cairo → contracts/season_resources/src/lib.cairo
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml