Skip to content

Commit dca6c7a

Browse files
PyrdacorPyrdacor
committed
This is v2.1.0
1 parent 7d8983b commit dca6c7a

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

‎Freeserf.Core/Serf.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ internal static object Create(object parent)
263263
State.KnightAttacking => new StateDataAttacking(parentStateData),
264264
State.KnightAttackingDefeat => new StateDataAttacking(parentStateData),
265265
State.KnightAttackingDefeatFree => new StateDataAttacking(parentStateData),
266-
State.KnightAttackingFree => new StateDataFreeWalking(parentStateData),
266+
State.KnightAttackingFree => new StateDataAttacking(parentStateData),
267267
State.KnightAttackingFreeWait => new StateDataFreeWalking(parentStateData),
268268
State.KnightAttackingVictory => new StateDataAttacking(parentStateData),
269269
State.KnightAttackingVictoryFree => new StateDataAttackingVictoryFree(parentStateData),
@@ -1053,7 +1053,7 @@ public StateDataReadyToLeaveInventory ReadyToLeaveInventory
10531053
}
10541054

10551055
// States: Farming, Fishing, FreeSailing, FreeWalking,
1056-
// KnightAttackingFree, KnightAttackingFreeWait, KnightFreeWalking,
1056+
// KnightAttackingFreeWait, KnightFreeWalking,
10571057
// Logging, Planting, SamplingGeoSpot, StonecutterFreeWalking, Stonecutting
10581058
public class StateDataFreeWalking : StateDataBase
10591059
{
@@ -1149,7 +1149,6 @@ public StateDataFreeWalking FreeWalking
11491149
serf.SerfState != State.Fishing &&
11501150
serf.SerfState != State.FreeSailing &&
11511151
serf.SerfState != State.FreeWalking &&
1152-
serf.SerfState != State.KnightAttackingFree &&
11531152
serf.SerfState != State.KnightAttackingFreeWait &&
11541153
serf.SerfState != State.KnightFreeWalking &&
11551154
serf.SerfState != State.Logging &&
@@ -1700,7 +1699,8 @@ public StateDataBuildingBoat BuildingBoat
17001699

17011700
// States: KnightAttacking, KnightAttackingDefeat, KnightAttackingDefeatFree,
17021701
// KnightAttackingVictory, KnightEngageAttackingFree, KnightEngageAttackingFreeJoin,
1703-
// KnightEngagingBuilding, KnightPrepareAttacking, KnightPrepareAttackingFree
1702+
// KnightEngagingBuilding, KnightPrepareAttacking, KnightPrepareAttackingFree,
1703+
// KnightAttackingFree
17041704
public class StateDataAttacking : StateDataBase
17051705
{
17061706
private int move; // B
@@ -1780,6 +1780,7 @@ public StateDataAttacking Attacking
17801780
serf.SerfState != State.KnightAttackingDefeat &&
17811781
serf.SerfState != State.KnightAttackingDefeatFree &&
17821782
serf.SerfState != State.KnightAttackingVictory &&
1783+
serf.SerfState != State.KnightAttackingFree &&
17831784
serf.SerfState != State.KnightEngageAttackingFree &&
17841785
serf.SerfState != State.KnightEngageAttackingFreeJoin &&
17851786
serf.SerfState != State.KnightEngagingBuilding &&
@@ -4011,7 +4012,6 @@ public void ReadFrom(SaveReaderText reader)
40114012
case State.Farming:
40124013
case State.SamplingGeoSpot:
40134014
case State.KnightFreeWalking:
4014-
case State.KnightAttackingFree:
40154015
case State.KnightAttackingFreeWait:
40164016
stateData.FreeWalking.DistanceX = reader.Value("state.dist1").ReadInt();
40174017
stateData.FreeWalking.DistanceY = reader.Value("state.dist2").ReadInt();
@@ -4073,6 +4073,7 @@ public void ReadFrom(SaveReaderText reader)
40734073
case State.KnightAttackingDefeatFree:
40744074
case State.KnightAttacking:
40754075
case State.KnightAttackingVictory:
4076+
case State.KnightAttackingFree:
40764077
case State.KnightEngageAttackingFree:
40774078
case State.KnightEngageAttackingFreeJoin:
40784079
if (reader.HasValue("state.move"))
@@ -4228,7 +4229,6 @@ public void WriteTo(SaveWriterText writer)
42284229
case State.Farming:
42294230
case State.SamplingGeoSpot:
42304231
case State.KnightFreeWalking:
4231-
case State.KnightAttackingFree:
42324232
case State.KnightAttackingFreeWait:
42334233
writer.Value("state.dist1").Write(stateData.FreeWalking.DistanceX);
42344234
writer.Value("state.dist2").Write(stateData.FreeWalking.DistanceY);
@@ -4290,6 +4290,7 @@ public void WriteTo(SaveWriterText writer)
42904290
case State.KnightAttackingDefeatFree:
42914291
case State.KnightAttacking:
42924292
case State.KnightAttackingVictory:
4293+
case State.KnightAttackingFree:
42934294
case State.KnightEngageAttackingFree:
42944295
case State.KnightEngageAttackingFreeJoin:
42954296
writer.Value("state.move").Write(stateData.Attacking.Move);

‎FreeserfNet/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
[assembly: Guid("ea9340ab-cdd1-40ee-b242-f405c0e1f6f9")]
1616

17-
[assembly: AssemblyVersion("2.0.8.0")]
18-
[assembly: AssemblyFileVersion("2.0.8.0")]
17+
[assembly: AssemblyVersion("2.1.0.0")]
18+
[assembly: AssemblyFileVersion("2.1.0.0")]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Freeserf.net is a C# port and extension of [freeserf](https://github.com/freeser
1515

1616
| Windows | Linux |
1717
| ---- | ---- |
18-
| [v2.0.8](https://github.com/Pyrdacor/freeserf.net/releases/download/v2.0.8/Freeserf.net-Windows.zip "Windows v2.0.8") | [v2.0.8](https://github.com/Pyrdacor/freeserf.net/releases/download/v2.0.8/Freeserf.net-Linux.tar.gz "Linux v2.0.8") |
18+
| [v2.1.0](https://github.com/Pyrdacor/freeserf.net/releases/download/v2.1.0/Freeserf.net-Windows.zip "Windows v2.1.0") | [v2.1.0](https://github.com/Pyrdacor/freeserf.net/releases/download/v2.1.0/Freeserf.net-Linux.tar.gz "Linux v2.1.0") |
1919

2020
Builds for other platforms will follow later. Only recent Ubuntu versions are tested for Linux version.
2121

‎changelog.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Version 2.1.0:
2+
==============
3+
4+
- Fixed fighting of knights in free space (not at a military building)
5+
- Fixed missing animation of defending serf
6+
- Fixed infinite fighting
7+
- Fixed crash after fight
8+
- Unfortunately old savegames with free fighting knights won't work with this version
9+
10+
111
Version 2.0.8:
212
==============
313

0 commit comments

Comments
 (0)