Skip to content
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
8 changes: 8 additions & 0 deletions src/gamestate/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,14 @@ impl GameState {
)?;
}
"soldieradvice" => {
let advice: u16 = val.into("soldier advice")?;
if advice > 0 {
other_player
.get_or_insert_default()
.fortress
.get_or_insert_default()
.soldier_advice = advice;
}
// Replaced
}
"owngroupdescription" => self
Expand Down
9 changes: 6 additions & 3 deletions src/gamestate/social.rs
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@ pub struct OtherFortress {
/// The amount of soldiers suggested to use when attacking this players
/// fortress
pub soldier_advice: u16,
/// The level of the fortifications of that player
pub fortifications_level: u16,
/// The amount of stone we are expected to gain from raiding this players
/// fortress
pub lootable_wood: u64,
Expand Down Expand Up @@ -479,9 +481,10 @@ impl OtherPlayer {
) -> Result<(), SFError> {
let ft = self.fortress.get_or_insert_default();
ft.upgrade_count = data.csiget(0, "other ft upgrades", 0)?;
ft.soldier_advice = data.csiget(1, "other soldier advice", 0)?;
ft.mage_count = data.csiget(2, "other mage count", 0)?;
ft.archer_count = data.csiget(3, "other soldier advice", 0)?;
ft.fortifications_level =
data.csiget(1, "other soldier fortifications", 0)?;
ft.archer_count = data.csiget(2, "other mage count", 0)?;
ft.mage_count = data.csiget(3, "other soldier advice", 0)?;
ft.lootable_wood = data.csiget(4, "other lootable wood", 0)?;
ft.lootable_stone = data.csiget(5, "other lootable stone", 0)?;
Ok(())
Expand Down