From c09597d66888d7f6fab5dc320b480b551837cc76 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 21 Apr 2019 16:55:44 +0200
Subject: [PATCH] semis, padding and spelling
---
src/facilities/arcade/arcadeFramework.js | 6 +++---
src/facilities/armory/armoryFramework.js | 2 +-
src/facilities/brothel/brothelFramework.js | 6 +++---
src/facilities/cellblock/cellblockFramework.js | 6 +++---
src/facilities/clinic/clinicFramework.js | 4 ++--
src/facilities/club/clubFramework.js | 6 +++---
src/facilities/dairy/dairyFramework.js | 10 +++++-----
src/facilities/farmyard/farmyardFramework.js | 2 +-
.../headGirlSuite/headGirlSuiteFramework.js | 2 +-
src/facilities/masterSuite/masterSuiteFramework.js | 8 ++++----
src/facilities/nursery/nurseryFramework.js | 4 ++--
src/facilities/penthouse/penthouseFramework.js | 10 ++++------
src/facilities/pit/pitFramework.js | 6 +++---
src/facilities/schoolroom/schoolroomFramework.js | 6 +++---
.../servantsQuarters/servantsQuartersFramework.js | 12 ++++++------
src/facilities/spa/spaFramework.js | 4 ++--
16 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/src/facilities/arcade/arcadeFramework.js b/src/facilities/arcade/arcadeFramework.js
index 97e9412caf3..94a45cb9507 100644
--- a/src/facilities/arcade/arcadeFramework.js
+++ b/src/facilities/arcade/arcadeFramework.js
@@ -11,7 +11,7 @@ App.Data.Facilities.arcade = {
},
defaultJob: "assignee",
manager: null
-}
+};
App.Entity.Facilities.ArcadeJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -22,11 +22,11 @@ App.Entity.Facilities.ArcadeJob = class extends App.Entity.Facilities.FacilitySi
canEmploy(slave) {
let r = super.canEmploy(slave);
if (slave.indentureRestrictions > 0) {
- r.push(`${slave.slaveName}'s indenture forbids arcade service.`)
+ r.push(`${slave.slaveName}'s indenture forbids arcade service.`);
}
return r;
}
-}
+};
App.Entity.facilities.arcade = new App.Entity.Facilities.Facility(
App.Data.Facilities.arcade,
diff --git a/src/facilities/armory/armoryFramework.js b/src/facilities/armory/armoryFramework.js
index 01d50b48357..a29228bbf95 100644
--- a/src/facilities/armory/armoryFramework.js
+++ b/src/facilities/armory/armoryFramework.js
@@ -18,7 +18,7 @@ App.Data.Facilities.armory = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.facilities.armory = new App.Entity.Facilities.Facility(
App.Data.Facilities.armory
diff --git a/src/facilities/brothel/brothelFramework.js b/src/facilities/brothel/brothelFramework.js
index a816578a5f1..f473d68dfdb 100644
--- a/src/facilities/brothel/brothelFramework.js
+++ b/src/facilities/brothel/brothelFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.brothel = {
shouldThink: true,
requiredDevotion: 50
}
-}
+};
App.Entity.Facilities.BrothelJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -41,7 +41,7 @@ App.Entity.Facilities.BrothelJob = class extends App.Entity.Facilities.FacilityS
}
return r;
}
-}
+};
App.Entity.Facilities.MadamJob = class extends App.Entity.Facilities.ManagingJob {
/**
@@ -55,7 +55,7 @@ App.Entity.Facilities.MadamJob = class extends App.Entity.Facilities.ManagingJob
}
return r;
}
-}
+};
App.Entity.facilities.brothel = new App.Entity.Facilities.Facility(
App.Data.Facilities.brothel,
diff --git a/src/facilities/cellblock/cellblockFramework.js b/src/facilities/cellblock/cellblockFramework.js
index c07c3473efe..e6842c356da 100644
--- a/src/facilities/cellblock/cellblockFramework.js
+++ b/src/facilities/cellblock/cellblockFramework.js
@@ -11,7 +11,7 @@ App.Data.Facilities.cellblock = {
},
defaultJob: "assignee",
manager: {
- position: "wardness",
+ position: "wardeness",
assignment: "be the Wardeness",
careers: ["a bouncer", "a bounty hunter", "a bully", "a chief of police", "a gang member", "a hall monitor", "a mercenary", "a police detective", "a police officer", "a prison guard", "a prison warden", "a private detective", "a security guard", "a street thug", "an enforcer", "an orderly"],
skill: "wardeness",
@@ -26,7 +26,7 @@ App.Data.Facilities.cellblock = {
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.CellblockJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -42,7 +42,7 @@ App.Entity.Facilities.CellblockJob = class extends App.Entity.Facilities.Facilit
return r;
}
-}
+};
App.Entity.facilities.cellblock = new App.Entity.Facilities.Facility(
App.Data.Facilities.cellblock,
diff --git a/src/facilities/clinic/clinicFramework.js b/src/facilities/clinic/clinicFramework.js
index d2192203b0e..8a434b15681 100644
--- a/src/facilities/clinic/clinicFramework.js
+++ b/src/facilities/clinic/clinicFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.clinic = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.ClinicPatientJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -45,7 +45,7 @@ App.Entity.Facilities.ClinicPatientJob = class extends App.Entity.Facilities.Fac
return r;
}
-}
+};
App.Entity.facilities.clinic = new App.Entity.Facilities.Facility(
App.Data.Facilities.clinic,
diff --git a/src/facilities/club/clubFramework.js b/src/facilities/club/clubFramework.js
index 131d99d7e2c..f6ae8529c44 100644
--- a/src/facilities/club/clubFramework.js
+++ b/src/facilities/club/clubFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.club = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.ClubSlutJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -43,7 +43,7 @@ App.Entity.Facilities.ClubSlutJob = class extends App.Entity.Facilities.Facility
return r;
}
-}
+};
App.Entity.Facilities.ClubDJJob = class extends App.Entity.Facilities.ManagingJob {
canEmploy(slave) {
@@ -53,7 +53,7 @@ App.Entity.Facilities.ClubDJJob = class extends App.Entity.Facilities.ManagingJo
}
return r;
}
-}
+};
App.Entity.facilities.club = new App.Entity.Facilities.Facility(
App.Data.Facilities.club,
diff --git a/src/facilities/dairy/dairyFramework.js b/src/facilities/dairy/dairyFramework.js
index 9f960df229e..bc9610fba93 100644
--- a/src/facilities/dairy/dairyFramework.js
+++ b/src/facilities/dairy/dairyFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.dairy = {
shouldThink: true,
requiredDevotion: 21
}
-}
+};
App.Entity.Facilities.DairyCowJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -69,14 +69,14 @@ App.Entity.Facilities.DairyCowJob = class extends App.Entity.Facilities.Facility
return r;
}
-}
+};
App.Entity.Facilities.Dairy = class extends App.Entity.Facilities.Facility {
constructor() {
super(App.Data.Facilities.dairy,
{
- cow: new App.Entity.Facilities.DairyCowJob()
- });
+ cow: new App.Entity.Facilities.DairyCowJob()
+ });
}
get hasFreeSpace() {
@@ -84,6 +84,6 @@ App.Entity.Facilities.Dairy = class extends App.Entity.Facilities.Facility {
const dairySeed = V.bioreactorsXY + V.bioreactorsXX + V.bioreactorsHerm + V.bioreactorsBarren;
return this.capacity > this.hostedSlaves + dairySeed;
}
-}
+};
App.Entity.facilities.dairy = new App.Entity.Facilities.Dairy();
diff --git a/src/facilities/farmyard/farmyardFramework.js b/src/facilities/farmyard/farmyardFramework.js
index 79ba34d5535..d5075570cdf 100644
--- a/src/facilities/farmyard/farmyardFramework.js
+++ b/src/facilities/farmyard/farmyardFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.farmyard = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.facilities.farmyard = new App.Entity.Facilities.Facility(
App.Data.Facilities.farmyard
diff --git a/src/facilities/headGirlSuite/headGirlSuiteFramework.js b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
index a40d3cf0a84..fc8270e292a 100644
--- a/src/facilities/headGirlSuite/headGirlSuiteFramework.js
+++ b/src/facilities/headGirlSuite/headGirlSuiteFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.headGirlSuite = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.facilities.headGirlSuite = new App.Entity.Facilities.Facility(
App.Data.Facilities.headGirlSuite
diff --git a/src/facilities/masterSuite/masterSuiteFramework.js b/src/facilities/masterSuite/masterSuiteFramework.js
index ad1b86a9eeb..640ea2361bc 100644
--- a/src/facilities/masterSuite/masterSuiteFramework.js
+++ b/src/facilities/masterSuite/masterSuiteFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.masterSuite = {
shouldThink: false,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.MasterSuiteFuckToyJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -40,17 +40,17 @@ App.Entity.Facilities.MasterSuiteFuckToyJob = class extends App.Entity.Facilitie
return r;
}
-}
+};
App.Entity.Facilities.ConcubineJob = class extends App.Entity.Facilities.ManagingJob {
canEmploy(slave) {
let r = super.canEmploy(slave);
if (slave.amp === 1) {
- r.push(`${slave.slaveName} can't serve as your Concubine without limbs.`)
+ r.push(`${slave.slaveName} can't serve as your Concubine without limbs.`);
}
return r;
}
-}
+};
App.Entity.facilities.masterSuite = new App.Entity.Facilities.Facility(
App.Data.Facilities.masterSuite,
diff --git a/src/facilities/nursery/nurseryFramework.js b/src/facilities/nursery/nurseryFramework.js
index 83fd33bfba5..ec47485e7ac 100644
--- a/src/facilities/nursery/nurseryFramework.js
+++ b/src/facilities/nursery/nurseryFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.nursery = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.NurseryNannyJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -41,7 +41,7 @@ App.Entity.Facilities.NurseryNannyJob = class extends App.Entity.Facilities.Faci
return r;
}
-}
+};
App.Entity.facilities.nursery = new App.Entity.Facilities.Facility(
App.Data.Facilities.nursery,
diff --git a/src/facilities/penthouse/penthouseFramework.js b/src/facilities/penthouse/penthouseFramework.js
index c757b11a7e3..c4741f5ba91 100644
--- a/src/facilities/penthouse/penthouseFramework.js
+++ b/src/facilities/penthouse/penthouseFramework.js
@@ -80,11 +80,11 @@ App.Data.Facilities.penthouse = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.PenthouseJob = class extends App.Entity.Facilities.Job {
-}
+};
App.Entity.Facilities.PenthouseJobs = {
Classes: class extends App.Entity.Facilities.PenthouseJob {
@@ -120,7 +120,6 @@ App.Entity.Facilities.PenthouseJobs = {
return r;
}
-
},
SubordinateSlave: class extends App.Entity.Facilities.PenthouseJob {
@@ -142,11 +141,10 @@ App.Entity.Facilities.PenthouseJobs = {
return r;
}
},
-}
+};
App.Entity.Facilities.Penthouse = class extends App.Entity.Facilities.Facility {
constructor() {
-
super(App.Data.Facilities.penthouse, {
classes: new App.Entity.Facilities.PenthouseJobs.Classes(),
houseServant: new App.Entity.Facilities.PenthouseJobs.HouseServant(),
@@ -166,6 +164,6 @@ App.Entity.Facilities.Penthouse = class extends App.Entity.Facilities.Facility {
get hostedSlaves() {
return State.variables.dormitoryPopulation;
}
-}
+};
App.Entity.facilities.penthouse = new App.Entity.Facilities.Penthouse();
diff --git a/src/facilities/pit/pitFramework.js b/src/facilities/pit/pitFramework.js
index b77697e3862..cffe4e9e00e 100644
--- a/src/facilities/pit/pitFramework.js
+++ b/src/facilities/pit/pitFramework.js
@@ -11,7 +11,7 @@ App.Data.Facilities.pit = {
},
defaultJob: "fighter",
manager: null
-}
+};
App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -35,7 +35,7 @@ App.Entity.Facilities.PitFighterJob = class extends App.Entity.Facilities.Facili
isEmployed(slave) {
return State.variables.fighterIDs.includes(slave.ID);
}
-}
+};
App.Entity.Facilities.Pit = class extends App.Entity.Facilities.Facility {
constructor() {
@@ -48,6 +48,6 @@ App.Entity.Facilities.Pit = class extends App.Entity.Facilities.Facility {
get hostedSlaves() {
return 0; // does not host anyone
}
-}
+};
App.Entity.facilities.pit = new App.Entity.Facilities.Pit();
diff --git a/src/facilities/schoolroom/schoolroomFramework.js b/src/facilities/schoolroom/schoolroomFramework.js
index b3bd82c9fd7..b207a406c61 100644
--- a/src/facilities/schoolroom/schoolroomFramework.js
+++ b/src/facilities/schoolroom/schoolroomFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.schoolroom = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.SchoolroomStudentJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -39,7 +39,7 @@ App.Entity.Facilities.SchoolroomStudentJob = class extends App.Entity.Facilities
r.push(`${slave.slaveName} is too resistant to learn.`);
}
- const maxSkill = 10 + this.facility.upgrade("Skills") * 20; // maximal skill value the scholl can teach
+ const maxSkill = 10 + this.facility.upgrade("Skills") * 20; // maximal skill value the school can teach
if ((slave.intelligenceImplant >= 30) && (slave.voice === 0 || slave.accent + this.facility.upgrade("Language") <= 2) &&
(slave.skill.oral > maxSkill) && (slave.skill.whoring > maxSkill) && (slave.skill.entertainment > maxSkill) &&
(slave.skill.anal > maxSkill) && ((slave.vagina < 0) || (slave.skill.vaginal > maxSkill))) {
@@ -48,7 +48,7 @@ App.Entity.Facilities.SchoolroomStudentJob = class extends App.Entity.Facilities
return r;
}
-}
+};
App.Entity.facilities.schoolroom = new App.Entity.Facilities.Facility(
App.Data.Facilities.schoolroom,
diff --git a/src/facilities/servantsQuarters/servantsQuartersFramework.js b/src/facilities/servantsQuarters/servantsQuartersFramework.js
index 8056e301541..af38738066e 100644
--- a/src/facilities/servantsQuarters/servantsQuartersFramework.js
+++ b/src/facilities/servantsQuarters/servantsQuartersFramework.js
@@ -1,4 +1,4 @@
-App.Data.Facilities.servantsQuaters = {
+App.Data.Facilities.servantsQuarters = {
baseName: "servantsQuarters",
genericName: "Servants' Quarters",
jobs: {
@@ -25,7 +25,7 @@ App.Data.Facilities.servantsQuaters = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.ServantsQuartersServantJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -46,7 +46,7 @@ App.Entity.Facilities.ServantsQuartersServantJob = class extends App.Entity.Faci
}
return r;
}
-}
+};
App.Entity.Facilities.ServantsQuartersStewardessJob = class extends App.Entity.Facilities.ManagingJob {
/**
@@ -56,14 +56,14 @@ App.Entity.Facilities.ServantsQuartersStewardessJob = class extends App.Entity.F
canEmploy(slave) {
let r = super.canEmploy(slave);
if (slave.intelligence + slave.intelligenceImplant < -50) {
- r.push(`${slave.slaveName} is not intellegent enough.`);
+ r.push(`${slave.slaveName} is not intelligent enough.`);
}
return r;
}
-}
+};
App.Entity.facilities.servantsQuarters = new App.Entity.Facilities.Facility(
- App.Data.Facilities.servantsQuaters,
+ App.Data.Facilities.servantsQuarters,
{
servant: new App.Entity.Facilities.ServantsQuartersServantJob()
},
diff --git a/src/facilities/spa/spaFramework.js b/src/facilities/spa/spaFramework.js
index 5bfe6ed053a..45f7049be16 100644
--- a/src/facilities/spa/spaFramework.js
+++ b/src/facilities/spa/spaFramework.js
@@ -25,7 +25,7 @@ App.Data.Facilities.spa = {
shouldThink: true,
requiredDevotion: 51
}
-}
+};
App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.FacilitySingleJob {
/**
@@ -41,7 +41,7 @@ App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.Facil
return r;
}
-}
+};
App.Entity.facilities.spa = new App.Entity.Facilities.Facility(
App.Data.Facilities.spa,
--
GitLab