Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: combat revamp #1140

Merged
merged 18 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/src/assets/icons/common/bagpack.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions client/src/assets/icons/common/eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions client/src/assets/icons/common/trashcan.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions client/src/dojo/createSystemCalls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ export function createSystemCalls({ provider }: SetupNetworkResult) {
await provider.create_army(props);
};

const delete_army = async (props: SystemProps.ArmyDeleteProps) => {
await provider.delete_army(props);
};

const army_buy_troops = async (props: SystemProps.ArmyBuyTroopsProps) => {
await provider.army_buy_troops(props);
};
Expand Down Expand Up @@ -240,8 +244,8 @@ export function createSystemCalls({ provider }: SetupNetworkResult) {
await provider.battle_claim_and_leave(props);
};

const battle_leave_and_raid = async (props: SystemProps.BattleLeaveAndRaidProps) => {
await provider.battle_leave_and_raid(props);
const battle_leave_and_pillage = async (props: SystemProps.BattleLeaveAndRaidProps) => {
await provider.battle_leave_and_pillage(props);
};

const battle_claim = async (props: SystemProps.BattleClaimProps) => {
Expand Down Expand Up @@ -288,6 +292,7 @@ export function createSystemCalls({ provider }: SetupNetworkResult) {
destroy_building,
create_building,
create_army,
delete_army,
uuid,
create_hyperstructure,
contribute_to_construction,
Expand All @@ -313,7 +318,7 @@ export function createSystemCalls({ provider }: SetupNetworkResult) {
battle_claim,
battle_pillage,
battle_leave_and_claim,
battle_leave_and_raid,
battle_leave_and_pillage,
};

// TODO: Fix Type
Expand Down
Loading
Loading