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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
macaronideath
fc-pregmod
Commits
c54ff4f4
Commit
c54ff4f4
authored
4 years ago
by
Pregmodder
Browse files
Options
Downloads
Plain Diff
Merge branch 'pregmod-master' into 'pregmod-master'
Fixes Closes
#2193
and
#2192
See merge request
!7589
parents
c2522f74
d4cb775d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/facilities/pit/pitFramework.js
+15
-0
15 additions, 0 deletions
src/facilities/pit/pitFramework.js
src/markets/theMarket/marketData.js
+2
-2
2 additions, 2 deletions
src/markets/theMarket/marketData.js
with
17 additions
and
2 deletions
src/facilities/pit/pitFramework.js
+
15
−
0
View file @
c54ff4f4
...
@@ -32,6 +32,21 @@ App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.Facili
...
@@ -32,6 +32,21 @@ App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.Facili
}
}
return
r
;
return
r
;
}
}
/**
* @param {App.Entity.SlaveState} slave
* @returns {string[]}
*/
canEmploy
(
slave
)
{
if
(
this
.
isEmployed
(
slave
))
{
return
[
`
${
slave
.
slaveName
}
is already assigned to fight in
${
this
.
facility
.
name
}
.`
];
}
if
(
!
this
.
_facilityHasFreeSpace
)
{
return
[
`Capacity of
${
this
.
facility
.
name
}
exceeded.`
];
}
return
this
.
checkRequirements
(
slave
);
}
};
};
App
.
Entity
.
Facilities
.
Pit
=
class
extends
App
.
Entity
.
Facilities
.
SingleJobFacility
{
App
.
Entity
.
Facilities
.
Pit
=
class
extends
App
.
Entity
.
Facilities
.
SingleJobFacility
{
...
...
This diff is collapsed.
Click to expand it.
src/markets/theMarket/marketData.js
+
2
−
2
View file @
c54ff4f4
...
@@ -178,9 +178,9 @@ App.Data.Markets = {
...
@@ -178,9 +178,9 @@ App.Data.Markets = {
get
requirements
()
{
return
(
V
.
seeDicks
!==
0
);
}
get
requirements
()
{
return
(
V
.
seeDicks
!==
0
);
}
},
},
{
{
title
:
"
The Gymnasium
-
Academy
"
,
title
:
"
The Gymnasium
-
Academy
"
,
marketType
:
"
TGA
"
,
marketType
:
"
TGA
"
,
passage
:
"
The Gymnasium
-
Academy
"
,
passage
:
"
The Gymnasium
-
Academy
"
,
note
:
"
Well trained slaves with dicks.
"
,
note
:
"
Well trained slaves with dicks.
"
,
get
requirements
()
{
return
(
V
.
seeDicks
!==
0
);
}
get
requirements
()
{
return
(
V
.
seeDicks
!==
0
);
}
},
},
...
...
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