diff --git a/src/facilities/schoolroom/schoolroomFramework.js b/src/facilities/schoolroom/schoolroomFramework.js index 4aaf9dccb011825f21d31eacdfb04032014d4139..32c9137834d4bbc2a4895d1dc95b2ce38629b706 100644 --- a/src/facilities/schoolroom/schoolroomFramework.js +++ b/src/facilities/schoolroom/schoolroomFramework.js @@ -48,7 +48,7 @@ App.Entity.Facilities.SchoolroomStudentJob = class extends App.Entity.Facilities } } -App.Entity.facilities.schoolrom = new App.Entity.Facilities.Facility( +App.Entity.facilities.schoolroom = new App.Entity.Facilities.Facility( App.Data.Facilities.schoolroom, { student: new App.Entity.Facilities.SchoolroomStudentJob() diff --git a/src/js/assignJS.js b/src/js/assignJS.js index 459f9e6b22feb352b23cd74d136f4dedbc48c075..f3e7b9462b266e9f0ad7572f45ae0d052acc01ed 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -551,19 +551,20 @@ window.resetJobIDArray = function resetJobIDArray() { /* todo: expand to all ass App.UI.jobLinks = function () { "use strict"; const facilitiesOrder = [ + /* sorted by improvement before work, within improvement in order of progress, within work alphabetical for facilities*/ App.Entity.facilities.penthouse, - App.Entity.facilities.spa, - App.Entity.facilities.clinic, - App.Entity.facilities.masterSuite, - App.Entity.facilities.schoolrom, - App.Entity.facilities.servantsQuarters, - App.Entity.facilities.farmyard, + App.Entity.facilities.cellblock, App.Entity.facilities.nursery, + App.Entity.facilities.schoolroom, + App.Entity.facilities.clinic, + App.Entity.facilities.spa, + App.Entity.facilities.arcade, App.Entity.facilities.brothel, App.Entity.facilities.club, App.Entity.facilities.dairy, - App.Entity.facilities.arcade, - App.Entity.facilities.cellblock + App.Entity.facilities.farmyard, + App.Entity.facilities.masterSuite, + App.Entity.facilities.servantsQuarters ]; return { diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index f3d9bce85ba95997a1c56e95d4526b988415b9da..80286c88cefccc70aa22ccb6adeba94969b0d120 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -5072,7 +5072,7 @@ App.UI.slaveSummaryList = function (passageName) { "Master Suite": App.Entity.facilities.masterSuite, "Nursery": App.Entity.facilities.nursery, "Pit": App.Entity.facilities.pit, - "Schoolroom": App.Entity.facilities.schoolrom, + "Schoolroom": App.Entity.facilities.schoolroom, "Servants' Quarters": App.Entity.facilities.servantsQuarters, "Spa": App.Entity.facilities.spa }; @@ -5096,7 +5096,7 @@ App.UI.slaveSummaryList = function (passageName) { "DJ Select": makeSelectionPassageInfo(App.Entity.facilities.club, "DJ Workaround"), "Farmer Select": makeSelectionPassageInfo(App.Entity.facilities.farmyard, "Farmer Workaround"), "Stewardess Select": makeSelectionPassageInfo(App.Entity.facilities.servantsQuarters, "Stewardess Workaround"), - "Schoolteacher Select": makeSelectionPassageInfo(App.Entity.facilities.schoolrom, "Schoolteacher Workaround"), + "Schoolteacher Select": makeSelectionPassageInfo(App.Entity.facilities.schoolroom, "Schoolteacher Workaround"), "Wardeness Select": makeSelectionPassageInfo(App.Entity.facilities.cellblock, "Wardeness Workaround"), "Agent Select": makeSelectionPassageInfo(null, "Agent Workaround"), "Recruiter Select": makeSelectionPassageInfo(null, "Recruiter Workaround")