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

fix production miscalculation #29

Merged
merged 1 commit into from
Feb 25, 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 resources/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

- Fixed AI player's shadow remaining after death
- Fixed doctors not healing stationed NPCs
- Fixed production miscalculation in locations where AI players died
- Fixed New Village name, rooms etc.
- Fixed radio construction
- Fixed Nob Hill room background
Expand Down
7 changes: 5 additions & 2 deletions source/Burntime.Remaster/Logic/Character/Character.cs
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,11 @@ public virtual void Die()
ani.Endless = false;

// schedule for respawn
ClassicGame classic = (ClassicGame)container.Root;
classic.World.Respawn.Object.Respawn(this);
if (this is not PlayerCharacter)
{
ClassicGame classic = (ClassicGame)container.Root;
classic.World.Respawn.Object.Respawn(this);
}
}

public virtual void Revive()
Expand Down
5 changes: 5 additions & 0 deletions source/Burntime.Remaster/Logic/World.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,15 @@ public virtual void Turn()

Players[i].IsDead = true;
Players[i].DiedThisRound = true;
Players[i].Character.Location = null;
}
}
else
{
Players[i].DiedThisRound = false;
// fix for saves that don't do this yet
Players[i].Character.Location = null;
}

if (!Players[i].IsDead)
{
Expand Down
Loading