Skip to content

Commit 5ad6aba

Browse files
committed
SImulator 3.1
1 parent 57bb972 commit 5ad6aba

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Copyright>Copyright © Khil-soft 2002 - 2024</Copyright>
66
<SIGameVersion>7.13.0</SIGameVersion>
77
<SIQuesterVersion>6.2.0</SIQuesterVersion>
8-
<SImulatorVersion>3.0.1</SImulatorVersion>
8+
<SImulatorVersion>3.1.0</SImulatorVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup>

src/SImulator/SImulator.ViewModel/ViewModel/GameViewModel.cs

+8-2
Original file line numberDiff line numberDiff line change
@@ -2536,7 +2536,7 @@ private void MakeStake_Executed(object? arg)
25362536

25372537
for (var i = 0; i < _stakers.Count; )
25382538
{
2539-
if (i == _stakersIterator)
2539+
if (i == _stakersIterator || _stakers[i] < 0 || _stakers[i] >= Players.Count)
25402540
{
25412541
i++;
25422542
continue;
@@ -2563,7 +2563,8 @@ private void MakeStake_Executed(object? arg)
25632563
return;
25642564
}
25652565

2566-
_isAllIn = Staker.Sum == Stake;
2566+
var staker = Staker;
2567+
_isAllIn = staker != null && staker.Sum == Stake;
25672568

25682569
_stakersIterator++;
25692570

@@ -2581,6 +2582,11 @@ private void AskNextStake(bool firstTime = false)
25812582
StakerIndex = _stakers[_stakersIterator];
25822583
var staker = Staker;
25832584

2585+
if (staker == null)
2586+
{
2587+
return;
2588+
}
2589+
25842590
if (_isAllIn)
25852591
{
25862592
Stake = staker.Sum;

src/SImulator/SImulator/Properties/PublishProfiles/ClickOnceX86Profile.pubxml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<ApplicationRevision>3</ApplicationRevision>
8-
<ApplicationVersion>3.0.1.*</ApplicationVersion>
7+
<ApplicationRevision>5</ApplicationRevision>
8+
<ApplicationVersion>3.1.0.*</ApplicationVersion>
99
<BootstrapperEnabled>True</BootstrapperEnabled>
1010
<Configuration>Release</Configuration>
1111
<CreateWebPageOnPublish>True</CreateWebPageOnPublish>
@@ -36,6 +36,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
3636
<UpdateRequired>False</UpdateRequired>
3737
<WebPageFileName>index.htm</WebPageFileName>
3838
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
39-
<History>True|2024-11-01T06:33:01.1824488Z||;True|2024-10-10T17:54:01.2742843+03:00||;True|2024-06-18T10:22:00.1970911+03:00||;True|2024-06-18T10:08:20.3219715+03:00||;True|2024-06-03T10:52:10.2074046+03:00||;True|2024-06-02T10:26:54.7018944+03:00||;True|2024-06-02T10:15:15.7809121+03:00||;True|2024-06-02T10:10:55.7597890+03:00||;True|2024-06-02T10:02:32.4699686+03:00||;True|2024-06-02T09:47:54.1434141+03:00||;True|2024-06-02T09:46:04.0341591+03:00||;True|2024-02-04T11:09:50.0418740+03:00||;True|2024-02-04T10:36:45.0040548+03:00||;True|2023-10-09T20:28:12.3146788+03:00||;True|2023-10-08T11:09:30.9675119+03:00||;True|2023-10-08T10:04:58.7408510+03:00||;True|2023-04-05T10:20:34.2222213+03:00||;True|2023-04-05T10:19:42.0864925+03:00||;True|2023-03-05T14:25:57.0140212+03:00||;True|2023-03-05T13:55:02.4267411+03:00||;True|2023-03-05T00:04:18.8157069+03:00||;True|2023-03-05T00:01:42.5379576+03:00||;False|2023-03-04T23:30:31.7645530+03:00||;True|2023-01-28T11:23:56.0211677+03:00||;True|2023-01-08T13:13:45.0386973+03:00||;True|2023-01-08T12:15:52.4694362+03:00||;True|2022-12-27T11:14:19.3776898+03:00||;</History>
39+
<History>True|2024-11-26T08:57:53.5881140Z||;True|2024-11-01T07:38:14.0067792+01:00||;True|2024-11-01T07:33:01.1824488+01:00||;True|2024-10-10T16:54:01.2742843+02:00||;True|2024-06-18T09:22:00.1970911+02:00||;True|2024-06-18T09:08:20.3219715+02:00||;True|2024-06-03T09:52:10.2074046+02:00||;True|2024-06-02T09:26:54.7018944+02:00||;True|2024-06-02T09:15:15.7809121+02:00||;True|2024-06-02T09:10:55.7597890+02:00||;True|2024-06-02T09:02:32.4699686+02:00||;True|2024-06-02T08:47:54.1434141+02:00||;True|2024-06-02T08:46:04.0341591+02:00||;True|2024-02-04T09:09:50.0418740+01:00||;True|2024-02-04T08:36:45.0040548+01:00||;True|2023-10-09T19:28:12.3146788+02:00||;True|2023-10-08T10:09:30.9675119+02:00||;True|2023-10-08T09:04:58.7408510+02:00||;True|2023-04-05T09:20:34.2222213+02:00||;True|2023-04-05T09:19:42.0864925+02:00||;True|2023-03-05T12:25:57.0140212+01:00||;True|2023-03-05T11:55:02.4267411+01:00||;True|2023-03-04T22:04:18.8157069+01:00||;True|2023-03-04T22:01:42.5379576+01:00||;False|2023-03-04T21:30:31.7645530+01:00||;True|2023-01-28T09:23:56.0211677+01:00||;True|2023-01-08T11:13:45.0386973+01:00||;True|2023-01-08T10:15:52.4694362+01:00||;True|2022-12-27T09:14:19.3776898+01:00||;</History>
4040
</PropertyGroup>
4141
</Project>

src/SImulator/SImulator/Properties/Resources.ru-RU.resx

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@
649649
<value>Старт</value>
650650
</data>
651651
<data name="StartGame" xml:space="preserve">
652-
<value />
652+
<value>Старт</value>
653653
</data>
654654
<data name="Stop" xml:space="preserve">
655655
<value>Завершить</value>

0 commit comments

Comments
 (0)