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.

Sign up for GitHub

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

Jump to bottom

Inventory and Headquarters Number of Private don't match #1253

Closed
Unterwald opened this issue Jun 7, 2020 · 8 comments · Fixed by #1256
Closed

Inventory and Headquarters Number of Private don't match #1253

Unterwald opened this issue Jun 7, 2020 · 8 comments · Fixed by #1256
Labels
bug lua

Comments

@Unterwald
Copy link

Hello,
I found out, that the number of privates in the inventory is X+1 to the number in the Headquarters
image
Best regards, Unterwald
@Flow86
Copy link
Member

Flow86 commented Jun 7, 2020

Hi,
I think one private is reserved inside the head-quarters

@Unterwald
Copy link
Author

Unterwald commented Jun 7, 2020 •
edited
Loading

I opened the Mission from the old roman campaign (VII-Die Schlange), and it was still there, even if i turn the reserve to 0.

@Flamefire
Copy link
Member

The soldiers in "inventur" are the soldiers in "HQ" + the soldiers in the reserve of the HQ. This works as expected (just tested). So I'm not sure what you mean by "it was still there".

@Unterwald
Copy link
Author

It seems to appear only in the Kampagne-Games...

@Spikeone
Copy link
Member

Spikeone commented Jun 7, 2020

Guess this is caused by using rttr:GetPlayer(p):ClearResources()

@Flamefire
Copy link
Member

@Spikeone spot on! We even have that as TODO:

s25client/libs/s25main/buildings/nobBaseWarehouse.cpp

Line 207 in 163f127

// TODO: inventory!?

Flamefire added a commit to Flamefire/s25client that referenced this issue Jun 8, 2020
@Flamefire
Update player inventory with reserve soldiers used on ClearResources
49dfca8 
Also don't touch claimed reserve soldiers
Fixes Return-To-The-Roots#1253
@Flamefire Flamefire mentioned this issue Jun 8, 2020
Merged
@Spikeone
Copy link
Member

Spikeone commented Jun 8, 2020

possibly the reason for this one: #1132

@Flamefire
Copy link
Member

Unfortunately not. The replay in the linked issue does not have a lua file

Flamefire added a commit to Flamefire/s25client that referenced this issue Jun 8, 2020
@Flamefire
Update player inventory with reserve soldiers used on ClearResources
b321742 
Also don't touch claimed reserve soldiers
Fixes Return-To-The-Roots#1253
Flamefire added a commit to Flamefire/s25client that referenced this issue Jun 9, 2020
@Flamefire
Update player inventory with reserve soldiers used on ClearResources
3776cf4 
Also don't touch claimed reserve soldiers
Fixes Return-To-The-Roots#1253
Flamefire added a commit to Flamefire/s25client that referenced this issue Jun 9, 2020
@Flamefire
Update player inventory with reserve soldiers used on ClearResources
f20b0a0 
Also don't touch claimed reserve soldiers
Fixes Return-To-The-Roots#1253
Flamefire added a commit to Flamefire/s25client that referenced this issue Jun 14, 2020
@Flamefire
Update player inventory with reserve soldiers used on ClearResources
ba02447 
Also don't touch claimed reserve soldiers
Fixes Return-To-The-Roots#1253
Flow86 pushed a commit that referenced this issue Jun 27, 2020
@Flamefire @Flow86
Update player inventory with reserve soldiers used on ClearResources
8cd16d9 
Also don't touch claimed reserve soldiers
Fixes #1253
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug lua
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Update player inventory with reserve soldiers used on ClearResources Flamefire/s25client
4 participants
@Flamefire @Flow86 @Spikeone @Unterwald