Finish move over to xID.length from "xSlaves" style ints

These two systems had a lot of overlap, and it's better to just grab the fresh data from the array than make sure the int is always up to date, imho.

Edit: nursery was a mess before I got there. This "xSlaves" class of variables was only ever an int, but it's treating it like it's an array of slaves. It should probably be finding a better way to use NurseryiIDs, but I'm not touching that.

added 23 commits

• bbe9f6e9...ae75d79f - 8 commits from branch pregmodfan:pregmod-master
• bc575e97 - depretiate brothelSlaves
• 05a3d7e2 - depretiate clubSlaves
• 8bd301fe - depretiate dairySlave
• 5f69017d - fix
• bda3e057 - cellblock
• 37501f40 - arcade
• 7a32c670 - farmyard
• e7c0f12d - hgsuite
• 80b132fd - mastSuite
• 0aa80da0 - school
• 7632c80a - servQ
• d6865a10 - spa
• bef8f301 - nursery
• 297e75af - BC
• b02cd3b7 - fixes

Compare with previous version

changed the description

There was a reason for it I'm pretty sure. Plus, .length is heavier than a straight variable, I'm pretty sure.

For the most part, I'd rather stick with the current implementation instead of rocking the boat.

Also you've got some direct array accessors that got crossed up with .length in at least the nursery section.

I added an edit, bascialy nursery is fucked. It was broken before, since it was acting like nurserySlaves was an array of slaves. It's not, it's just an int.

Not measurably heavier, it's just a length check on an array instead of getting an int.

Edit: pretty sure this is what was desired in nursery.

averageIntelligence += V.slaves[V.slaveIndices[NurseryiIDs[j]]].intelligence;
averageIntelligenceImplant += V.slaves[V.slaveIndices[NurseryiIDs[j]]].intelligenceImplant;

added 1 commit

• f4b0164d - fix nursery

Compare with previous version

added 1 commit

• 0c815ed9 - nursery again

Compare with previous version

Overall, I'd still ask that you use the old variables as temporary go-betweens so that .length doesn't have to be called repeatedly.

It's safer to call it though, and cleaner to not have two systems. If you're worried about performance, length check isn't an issue.

No, I'm saying if in a passage you'd call .length on the same thing repeatedly, just set it once at the start and call the temp instead.

Ah, thanks, I can fix that. Many passages already did. Nursery for example used NL. But sometimes they didn't.

added 1 commit

• 13f83ab5 - set lengths with temps where it seems efficient

Compare with previous version

added 1 commit

• 47db4440 - ms change

Compare with previous version

Ok, should be much better. As a bonus I was able to use the new temp variables in a few extra places. Probably due to having the two systems, sometimes people were using one format sometimes the other. Setting a temp once at passage top makes it easy.

Well tested?

In particular, removing slave IDs from the id array. It is a map, so I'm not certain if it works the same.

added 1 commit

• 9ccda3cd - fix

Compare with previous version

Hmm, I took another look at the part that removed the IDs and I think it's better to remove that entirely and not replace it with anything, as I do elsewhere when the xSlaves values were updated. Good point.

With that gone, this should be safe to merge. I've gone through a week without problems.

Less a week and more moving things in and out of the facility while validating that it is working properly.

mentioned in issue #1028 (closed)

added 22 commits

• 9ccda3cd...7b055bea - 2 commits from branch pregmodfan:pregmod-master
• 9e7f79ba - depretiate brothelSlaves
• d24ef0df - depretiate clubSlaves
• 47342472 - depretiate dairySlave
• f112e773 - fix
• b4404886 - cellblock
• 73195b03 - arcade
• b00dfda2 - farmyard
• 21eb8f98 - hgsuite
• b5e5abca - mastSuite
• f33e3a1c - school
• db1e7853 - servQ
• ebeff703 - spa
• 0e343a45 - nursery
• 5cb8e6b1 - BC
• e83e85b1 - fixes
• 54645129 - fix nursery
• 9833c474 - nursery again
• 81c445ce - set lengths with temps where it seems efficient
• 5be8808c - ms change
• 5216176f - fix

Compare with previous version

added 1 commit

• 26986f6c - fix

Compare with previous version

Ok @Pregmodder, final fixes in and i think this is good to go. Going to try to put out nursery fires I guess, so I'd like this in so bc is consistent if possible and I can fix indices problems.