CrewContracts - onUpdateBB #5596
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -379,6 +379,24 @@ local isEnabled = function (ref) | |
| return numCrewmenAvailable > 0 | ||
| end | ||
|
|
||
| local newCrew = function() | ||
| local hopefulCrew = Character.New() | ||
| -- Roll new stats, with a 1/3 chance that they're utterly inexperienced | ||
| hopefulCrew:RollNew(Engine.rand:Integer(0, 2) > 0) | ||
| -- Make them a title if they're good at anything | ||
| local maxScore = math.max(hopefulCrew.engineering, | ||
| hopefulCrew.piloting, | ||
| hopefulCrew.navigation, | ||
| hopefulCrew.sensors) | ||
| if maxScore > 45 then | ||
| if hopefulCrew.engineering == maxScore then hopefulCrew.title = lui.SHIPS_ENGINEER end | ||
| if hopefulCrew.piloting == maxScore then hopefulCrew.title = lui.PILOT end | ||
| if hopefulCrew.navigation == maxScore then hopefulCrew.title = lui.NAVIGATOR end | ||
| if hopefulCrew.sensors == maxScore then hopefulCrew.title = lui.SENSORS_AND_DEFENCE end | ||
| end | ||
| return hopefulCrew | ||
| end | ||
|
|
||
| local onCreateBB = function (station) | ||
| -- Create non-persistent Characters as available crew | ||
| nonPersistentCharactersForCrew[station] = {} | ||
|
|
@@ -393,26 +411,38 @@ local onCreateBB = function (station) | |
|
|
||
| -- Number is based on population, nicked from Assassinations.lua and tweaked | ||
| for i = 1, Engine.rand:Integer(0, math.ceil(Game.system.population) * 2 + 1) do | ||
| table.insert(nonPersistentCharactersForCrew[station],newCrew()) | ||
| end | ||
| end | ||
| Event.Register("onCreateBB", onCreateBB) | ||
|
|
||
| local onUpdateBB = function (station) | ||
| -- If no crew available (ad is greyed out), reseed the table after a while | ||
| if #nonPersistentCharactersForCrew[station] < 1 and Engine.rand:Integer(0, 10) == 0 then -- Not much crew around | ||
| table.insert(nonPersistentCharactersForCrew[station],newCrew()) | ||
| print("Reseeding crew candidates") | ||
| else | ||
| -- 1 in 30 to be removed and then maybe someone new inserted | ||
|
There was a problem hiding this comment. Did you mean 1 in 101? or I do not understand correctly? There was a problem hiding this comment. Yes, old comment, numbers have changed. |
||
| for k,v in pairs(nonPersistentCharactersForCrew[station]) do | ||
| if #nonPersistentCharactersForCrew[station] > 0 then | ||
| if Engine.rand:Integer(0, 100) == 0 then | ||
| table.remove(nonPersistentCharactersForCrew[station],k) | ||
| print("Removing crew candidate. #nonPersistentCharactersForCrew: " .. #nonPersistentCharactersForCrew[station]) | ||
| end | ||
| end | ||
| end | ||
| for k,v in pairs(nonPersistentCharactersForCrew[station]) do | ||
| if #nonPersistentCharactersForCrew[station] < math.ceil(Game.system.population) * 2 + 1 then | ||
|
There was a problem hiding this comment. it would be nice to see an explanation of this criterion, looks like something empirical? There was a problem hiding this comment. It's from this equation a bit higher up on the page. pioneer/data/modules/CrewContracts/CrewContracts.lua Lines 394 to 395 in 0f417f2 There was a problem hiding this comment. Oh, maybe then we should put it in a small separate function, with a descriptive name? |
||
| if Engine.rand:Integer(0, 100) == 0 then | ||
| table.insert(nonPersistentCharactersForCrew[station],k,newCrew()) | ||
| print("Adding crew candidate. #nonPersistentCharactersForCrew: " .. #nonPersistentCharactersForCrew[station]) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
| Event.Register("onUpdateBB", onUpdateBB) | ||
|
|
||
| -- Wipe temporary crew out when hyperspacing | ||
| Event.Register("onEnterSystem", function(ship) | ||
| if ship:IsPlayer() then | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
10 times out of 11 this branch will fire, even if the array is empty, although now it will not cause an effect, it looks suspicious.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there are no applicants, array is empty AND a random number equates to 0.
That's one in 11, not 10 times out of 11. The function reseeds the table when it goes to zero and let's it stay at zero for a randomly determined time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was talking about the "else" branch, yes, I said incorrectly, if the array is empty, the else branch will fire 10 times out of 11.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I go it. Yes, that looks a bit wonky.