Skip to content

Commit

Permalink
changed all mention of scunt 2t3 settings to skule hunt™ 2t4 settings
Browse files Browse the repository at this point in the history
  • Loading branch information
gaurikam2003 committed Aug 24, 2024
1 parent d3dfc46 commit d4b3d0b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const ScuntGameSettings = () => {
}, [dispatch]);

const initialSettings = {
name: 'Scunt 2T3 Settings',
name: 'Skule™ Hunt 2T4 Settings',
amountOfTeams: 10,
amountOfStarterBribePoints: 2500,
maxAmountPointsPercent: 1.5,
Expand Down Expand Up @@ -170,7 +170,7 @@ const ScuntGameSettings = () => {
<Button
label="Update Settings"
onClick={async () => {
let name = 'Scunt 2T3 Settings';
let name = 'Skule™ Hunt 2T4 Settings';
let amountOfTeams = newSettings.amountOfTeams;
let amountOfStarterBribePoints = newSettings.amountOfStarterBribePoints;
let maxAmountPointsPercent = newSettings.maxAmountPointsPercent;
Expand Down Expand Up @@ -209,7 +209,7 @@ const ScuntGameSettings = () => {
onClick={async () => {
// setting recommended settings

let name = 'Scunt 2T3 Settings';
let name = 'Skule™ Hunt 2T4 Settings';
let amountOfTeams = initialSettings.amountOfTeams;
let amountOfStarterBribePoints = initialSettings.amountOfStarterBribePoints;
let maxAmountPointsPercent = initialSettings.maxAmountPointsPercent;
Expand Down Expand Up @@ -560,7 +560,7 @@ const CurrentScuntGameSettings = () => {
return (
<div className="current-scunt-game-settings-container">
<h3 style={{ color: 'var(--text-dynamic)', textAlign: 'center', marginBottom: '20px' }}>
CURRENT SCUNT SETTINGS
CURRENT SKULE HUNT SETTINGS
</h3>

{scuntSettings ? (
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/ScuntHome/ScuntHome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ const ScuntCountdown = () => {
useEffect(() => {
if (scuntSettings !== undefined) {
let settings = scuntSettings;
//const tempDate = new Date(settings?.scuntDate);
const tempDate = new Date('2024-08-28T18:00:00'); // Hardcoded date??
const tempDate = new Date(settings?.scuntDate);
// const tempDate = new Date('2024-08-28T18:00:00'); // Hardcoded date??
const tempCountDownDate = new Date(tempDate).getTime();

setTargetDate(tempDate);
Expand Down
2 changes: 1 addition & 1 deletion server/src/models/ScuntGameSettingsModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const ScuntGameSettingSchema = new mongoose.Schema({
name: {
type: String,
required: true,
default: 'Scunt 2T3 Settings',
default: 'Skule™ Hunt 2T4 Settings',
},
amountOfTeams: {
type: Number,
Expand Down
20 changes: 10 additions & 10 deletions server/test/services/ScuntGameSettingsServices.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('ScuntGameSettingsServices', () => {
it('.setGameSettings()\t\t\t|\tSet invalid scunt game settings (SETTINGS_NOT_FOUND)', async () => {
await assert.rejects(
ScuntGameSettingsServices.setGameSettings(
'Scunt2T3',
'SkuleHunt2T4',
11,
2500,
0.3,
Expand All @@ -30,21 +30,21 @@ describe('ScuntGameSettingsServices', () => {

it('.initScuntGameSettings()\t\t\t|\tFind settings', async () => {
settings = await ScuntGameSettingsServices.initScuntGameSettings();
assert(settings.name === 'Scunt 2T3 Settings');
assert(settings.name === 'Skule™ Hunt 2T4 Settings');
assert(settings.amountOfTeams === 10);
});

/* couldn't think of test case for getGameSettings for it not to work besides network error */
it('.getGameSettings()\t\t\t|\tGet scunt game settings', async () => {
settings = await ScuntGameSettingsServices.getGameSettings();
assert(settings !== null);
assert.equal(settings.name, 'Scunt 2T3 Settings');
assert.equal(settings.name, 'Skule™ Hunt 2T4 Settings');
assert.equal(settings.amountOfStarterBribePoints, 10000);
});

it('.setGameSettings()\t\t\t|\tSet scunt game settings', async () => {
settings = await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
11,
2500,
0.3,
Expand All @@ -56,13 +56,13 @@ describe('ScuntGameSettingsServices', () => {
true,
true,
);
assert(settings.name === 'Scunt2T3 Settings');
assert(settings.name === 'Skule™ Hunt 2T4 Settings');
assert(settings.amountOfTeams === 11);
});

it('.setGameSettings()\t\t\t|\tSet multiple scunt game settings', async () => {
await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
11,
2500,
0.3,
Expand All @@ -75,7 +75,7 @@ describe('ScuntGameSettingsServices', () => {
true,
);
await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
10,
2500,
0.3,
Expand All @@ -88,7 +88,7 @@ describe('ScuntGameSettingsServices', () => {
true,
);
await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
11,
2500,
0.3,
Expand All @@ -101,7 +101,7 @@ describe('ScuntGameSettingsServices', () => {
true,
);
const testSettings = await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
11,
2400,
0.3,
Expand All @@ -115,7 +115,7 @@ describe('ScuntGameSettingsServices', () => {
);
assert(testSettings.amountOfStarterBribePoints === 2400);
await ScuntGameSettingsServices.setGameSettings(
'Scunt2T3 Settings',
'Skule™ Hunt 2T4 Settings',
10,
2500,
0.3,
Expand Down
2 changes: 1 addition & 1 deletion server/test/services/ScuntMissionServices.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('ScuntMissionServices', () => {

it('.getAllScuntMissions(showHidden, user)\t\t\t\t\t\t\t\t|\tGetting Scunt Missions', async () => {
const scuntGameSettings = {
name: 'Scunt 2T3 Settings',
name: 'Skule™ Hunt 2T4 Settings',
amountOfTeams: 10,
amountOfStarterBribePoints: 10000,
maxAmountPointsPercent: 1.5,
Expand Down

0 comments on commit d4b3d0b

Please sign in to comment.