Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
c7e2b177
Commit
c7e2b177
authored
3 years ago
by
DCoded
Browse files
Options
Downloads
Patches
Plain Diff
Nursery reservation bugfix
parent
24eed6ef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!10247
Nursery reservation bugfix
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/facilities/nursery/nursery.js
+16
-17
16 additions, 17 deletions
src/facilities/nursery/nursery.js
with
16 additions
and
17 deletions
src/facilities/nursery/nursery.js
+
16
−
17
View file @
c7e2b177
...
...
@@ -320,19 +320,18 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
let
eligibility
=
0
;
let
linkArray
;
const
reservedChildren
=
FetusGlobalReserveCount
(
"
incubator
"
);
const
incubatorSlaves
=
V
.
incubator
.
tanks
.
length
;
const
freeTanks
=
V
.
incubator
.
capacity
-
incubatorSlaves
;
r
.
push
(
`Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of
${
V
.
incubator
.
capacity
}
tanks,
${
freeTanks
}
`
);
if
(
freeTanks
===
1
)
{
const
freeRooms
=
V
.
nursery
-
V
.
nurseryChildren
;
r
.
push
(
`Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of
${
V
.
nursery
}
rooms,
${
freeRooms
}
`
);
if
(
freeRooms
===
1
)
{
r
.
push
(
`is`
);
}
else
{
r
.
push
(
`are`
);
}
r
.
push
(
`unoccupied. Of those,
${
reservedChildren
}
`
);
if
(
reservedChildren
===
1
)
{
r
.
push
(
`
tank
is`
);
r
.
push
(
`
room
is`
);
}
else
{
r
.
push
(
`
tank
s are`
);
r
.
push
(
`
room
s are`
);
}
r
.
push
(
`reserved.`
);
App
.
Events
.
addNode
(
el
,
r
,
"
div
"
);
...
...
@@ -389,7 +388,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
const
{
His
,
his
}
=
getPronouns
(
slave
);
const
free
Tank
s
=
V
.
incubator
.
capacity
-
incubatorSlaves
;
const
free
Room
s
=
V
.
nursery
-
V
.
nurseryChildren
;
const
WL
=
slave
.
womb
.
length
;
const
reservedIncubator
=
WombReserveCount
(
slave
,
"
incubator
"
);
const
reservedNursery
=
WombReserveCount
(
slave
,
"
nursery
"
);
...
...
@@ -449,8 +448,8 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
}
else
{
r
.
push
(
`All
${
reservedIncubator
}
of
${
his
}
children`
);
}
r
.
push
(
`will be placed in
${
V
.
incubator
.
n
ame
}
.`
);
if
((
reservedIncubator
+
reservedNursery
<
WL
)
&&
(
reservedChildren
<
free
Tank
s
))
{
r
.
push
(
`will be placed in
${
V
.
nurseryN
ame
}
.`
);
if
((
reservedIncubator
+
reservedNursery
<
WL
)
&&
(
reservedChildren
<
free
Room
s
))
{
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
linkArray
.
push
(
App
.
UI
.
DOM
.
link
(
...
...
@@ -494,7 +493,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
)
);
}
if
((
reservedChildren
+
WL
-
reservedIncubator
)
<=
free
Tank
s
)
{
if
((
reservedChildren
+
WL
-
reservedIncubator
)
<=
free
Room
s
)
{
linkArray
.
push
(
App
.
UI
.
DOM
.
link
(
`Keep the rest of
${
his
}
children`
,
...
...
@@ -505,7 +504,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
)
);
}
}
else
if
((
reservedIncubator
===
WL
)
||
(
reservedChildren
===
free
Tank
s
)
||
(
reservedIncubator
+
reservedNursery
===
WL
))
{
}
else
if
((
reservedIncubator
===
WL
)
||
(
reservedChildren
===
free
Room
s
)
||
(
reservedIncubator
+
reservedNursery
===
WL
))
{
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
linkArray
.
push
(
App
.
UI
.
DOM
.
link
(
...
...
@@ -539,7 +538,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
);
}
}
}
else
if
(
reservedChildren
<
free
Tank
s
)
{
}
else
if
(
reservedChildren
<
free
Room
s
)
{
if
(
WL
-
reservedNursery
===
0
)
{
r
.
push
(
App
.
UI
.
DOM
.
makeElement
(
"
span
"
,
`
${
His
}
children are already reserved for
${
V
.
nurseryName
}
`
,
"
note
"
));
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
...
...
@@ -565,10 +564,10 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
);
}
else
{
r
.
push
(
`You have `
);
if
(
free
Tank
s
===
1
)
{
r
.
push
(
`an <span class="lime">available aging
tank
.</span>`
);
if
(
free
Room
s
===
1
)
{
r
.
push
(
`an <span class="lime">available aging
room
.</span>`
);
}
else
{
r
.
push
(
`<span class="lime">available aging
tank
s.</span>`
);
r
.
push
(
`<span class="lime">available aging
room
s.</span>`
);
}
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
...
...
@@ -593,7 +592,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
}
)
);
if
((
WL
>
1
)
&&
(
reservedChildren
+
WL
-
reservedIncubator
)
<=
free
Tank
s
)
{
if
((
WL
>
1
)
&&
(
reservedChildren
+
WL
-
reservedIncubator
)
<=
free
Room
s
)
{
linkArray
.
push
(
App
.
UI
.
DOM
.
link
(
`Keep all of
${
his
}
children`
,
...
...
@@ -605,7 +604,7 @@ App.Facilities.Nursery.nursery = class Nursery extends App.Facilities.Facility {
);
}
}
}
else
if
(
reservedChildren
===
free
Tank
s
)
{
}
else
if
(
reservedChildren
===
free
Room
s
)
{
if
(
V
.
pregnancyMonitoringUpgrade
===
1
)
{
linkArray
.
push
(
App
.
UI
.
DOM
.
link
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment