diff --git a/sanityCheck.sh b/sanityCheck.sh index cbe5b51291def7d2035d9bdc930dd0bc100dfa10..e8199e4e2f4ac26dfd89e666e58fc46114307a43 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -117,6 +117,8 @@ $GREP "span class=[^\"\']" -- src/*.js ':!src/001-lib/Jquery/Jquery.js' | myprin $GREP '[^A-Za-z]let(\r|\n)' | myprint "WrongLetStyle" # Check for lines with only "const" $GREP 'const(\r|\n)' | myprint "WrongConstStyle" +# Check for events with mismatched names +$GREP -P 'App\.Events\.(.*)\s*=\s*class\s+(?!\1)(.*)(?=\s+extends\s+App\.Events\.BaseEvent)' -- src/*.js | myprint "MismatchedEventName" # Check that all the tags are properly opened and closed & a lot of other stuff java -jar devTools/javaSanityCheck/SanityCheck.jar diff --git a/src/events/RE/reShelterInspection.js b/src/events/RE/reShelterInspection.js index b9d81bdecaddb86b0bea3ec82de3d6b016427242..07a0675eab01dbb1dac8fab874349dc9d1f583f7 100644 --- a/src/events/RE/reShelterInspection.js +++ b/src/events/RE/reShelterInspection.js @@ -714,7 +714,7 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.Ba break; default: r.push(`${inspectee.slaveName} ${say}s flatly,`); - r.push(Spoken(inspectee, `"Whatever my beloved ${properMaster()} requires I have a good life now, and I would appreciate it if you would support me by doing everything you can for ${himP}."`)); + r.push(Spoken(inspectee, `"Whatever my beloved ${properMaster()} requires. I have a good life now, and I would appreciate it if you would support me by doing everything you can for ${himP}."`)); r.push(`Taken aback, the inspector ${say2}s ${he2}'ll put out a <span class="reputation inc">good word</span> about you.`); repX(500, "event", inspectee); V.shelterAbuse -= 1; diff --git a/src/events/nonRandom/foodCrisis/pFoodCrisisLowerClass.js b/src/events/nonRandom/foodCrisis/pFoodCrisisLowerClass.js index 4fcf64c831cbd5df297bf81536e372469bb9d292..bc288790a63c42dec11d458147688dbbf49d0a6b 100644 --- a/src/events/nonRandom/foodCrisis/pFoodCrisisLowerClass.js +++ b/src/events/nonRandom/foodCrisis/pFoodCrisisLowerClass.js @@ -1,4 +1,4 @@ -App.Events.pFoodCrisisLowerClass = class PFoodCrisis extends App.Events.BaseEvent { +App.Events.pFoodCrisisLowerClass = class pFoodCrisisLowerClass extends App.Events.BaseEvent { actorPrerequisites() { return []; } diff --git a/src/events/nonRandom/foodCrisis/pFoodCrisisMiddleClass.js b/src/events/nonRandom/foodCrisis/pFoodCrisisMiddleClass.js index 913100971c1bc11eb0143f5cca4c162834de29c4..513f1574b62c1494d36e1b93b29779c4032b414c 100644 --- a/src/events/nonRandom/foodCrisis/pFoodCrisisMiddleClass.js +++ b/src/events/nonRandom/foodCrisis/pFoodCrisisMiddleClass.js @@ -1,4 +1,4 @@ -App.Events.pFoodCrisisMiddleClass = class PFoodCrisis extends App.Events.BaseEvent { +App.Events.pFoodCrisisMiddleClass = class pFoodCrisisMiddleClass extends App.Events.BaseEvent { actorPrerequisites() { return []; } diff --git a/src/events/nonRandom/foodCrisis/pFoodCrisisUpperClass.js b/src/events/nonRandom/foodCrisis/pFoodCrisisUpperClass.js index 3e5c573a4bad03b7016b7f63d9efb3cf9e1a66eb..a58b2c864789086b29a2e079bda66f8299f3d0ff 100644 --- a/src/events/nonRandom/foodCrisis/pFoodCrisisUpperClass.js +++ b/src/events/nonRandom/foodCrisis/pFoodCrisisUpperClass.js @@ -1,4 +1,4 @@ -App.Events.pFoodCrisisUpperClass = class PFoodCrisis extends App.Events.BaseEvent { +App.Events.pFoodCrisisUpperClass = class pFoodCrisisUpperClass extends App.Events.BaseEvent { actorPrerequisites() { return []; } diff --git a/src/events/scheduled/murderAttempt.js b/src/events/scheduled/murderAttempt.js index 55c52d0ec757f96ad287c0fba0d66ec5a7b72236..618795bb12500d0626a613d3153178fa4d6e5a33 100644 --- a/src/events/scheduled/murderAttempt.js +++ b/src/events/scheduled/murderAttempt.js @@ -392,7 +392,7 @@ App.Events.MurderAttempt = class MurderAttempt extends App.Events.BaseEvent { } }; -App.Events.MurderAttemptFollowup = class MurderAttemptTradeFollowup extends App.Events.BaseEvent { +App.Events.MurderAttemptFollowup = class MurderAttemptFollowup extends App.Events.BaseEvent { constructor(actors, params) { super(actors, params); } diff --git a/src/events/scheduled/seFCTVinstall.js b/src/events/scheduled/seFCTVinstall.js index 2f3c66f004f3946a81c5fd95afe081e1edd89f8f..02f2001995d5449412c5af58b7c596265cdfe154 100644 --- a/src/events/scheduled/seFCTVinstall.js +++ b/src/events/scheduled/seFCTVinstall.js @@ -1,4 +1,4 @@ -App.Events.SEFctvInstall = class SEHuskSlaveDelivery extends App.Events.BaseEvent { +App.Events.SEFctvInstall = class SEFctvInstall extends App.Events.BaseEvent { eventPrerequisites() { return [ () => App.Events.effectiveWeek() >= 5,