Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

383 level 3 story adjustments #435

Merged
merged 38 commits into from
Oct 24, 2023
Merged

Conversation

pmarsh-scottlogic
Copy link
Contributor

@pmarsh-scottlogic pmarsh-scottlogic commented Oct 23, 2023

completes #383

Changes:

  • updates the documents used for level 3
  • updates the mission info and win condition for level 3
  • all mission info is now given in the form of dialogue, with a speaker and some text
  • mission info is now scrollable for small screens
  • added attacks specific for level 3 to the handbook

Notes:

  • The padding on the mission info on small screens looks weird, but to fix that I'd have to make changes to the generic overlay. I'm leaving that for now to prevent conflicts, since there is work being done on the overlay at the moment.
  • I've not fully playtested the level. I don't quite know how to beat it, so this may need tweaking down the line.

Mission info is now shown as dialogue. This is the info for level 3
image

Here's how the mission info looks on small screens.
image

@pmarsh-scottlogic pmarsh-scottlogic marked this pull request as draft October 23, 2023 09:48
@pmarsh-scottlogic pmarsh-scottlogic marked this pull request as ready for review October 23, 2023 10:01
@pmarsh-scottlogic pmarsh-scottlogic linked an issue Oct 23, 2023 that may be closed by this pull request
Copy link
Contributor

@gsproston-scottlogic gsproston-scottlogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great stuff! I especially like the dialog system. Just a few typo changes from me.

backend/resources/documents/level_3/Batman.txt Outdated Show resolved Hide resolved
frontend/src/Levels.ts Outdated Show resolved Hide resolved
frontend/src/components/Overlay/MissionInformation.css Outdated Show resolved Hide resolved
@chriswilty
Copy link
Member

chriswilty commented Oct 23, 2023

@pmarsh-scottlogic I think we wanted all text to be left-aligned now, for accessibility (dyslexia) reasons. The main page headers (e.g. "Mission Information") are center-aligned, but everything else is left-aligned.

This might resolve itself once you rebase on latest dev... Thanks to Doro!

@pmarsh-scottlogic
Copy link
Contributor Author

@pmarsh-scottlogic I think we wanted all text to be left-aligned now, for accessibility (dyslexia) reasons. The main page headers (e.g. "Mission Information") are center-aligned, but everything else is left-aligned.

This might resolve itself once you rebase on latest dev... Thanks to Doro!

Yup, just merged dev :)

Copy link
Member

@chriswilty chriswilty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few suggestions.

backend/test/unit/email.test.ts Outdated Show resolved Hide resolved
backend/test/unit/email.test.ts Outdated Show resolved Hide resolved
frontend/src/Attacks.ts Outdated Show resolved Hide resolved
frontend/src/Levels.ts Outdated Show resolved Hide resolved
frontend/src/Levels.ts Outdated Show resolved Hide resolved
frontend/src/Levels.ts Outdated Show resolved Hide resolved
frontend/src/Levels.ts Outdated Show resolved Hide resolved
frontend/src/components/Overlay/MissionInformation.css Outdated Show resolved Hide resolved
frontend/src/components/Overlay/MissionInformation.tsx Outdated Show resolved Hide resolved
Copy link
Member

@chriswilty chriswilty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there.... 😅

frontend/src/components/Overlay/MissionInformation.tsx Outdated Show resolved Hide resolved
frontend/src/components/Overlay/MissionInformation.css Outdated Show resolved Hide resolved
frontend/src/components/Overlay/MissionInformation.css Outdated Show resolved Hide resolved
Copy link
Contributor

@heatherlogan-scottlogic heatherlogan-scottlogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great 🤓

Copy link
Member

@chriswilty chriswilty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work 👍

@pmarsh-scottlogic pmarsh-scottlogic merged commit ddbd01a into dev Oct 24, 2023
2 checks passed
@pmarsh-scottlogic pmarsh-scottlogic deleted the 383-Level-3-story-adjustments branch October 24, 2023 09:47
chriswilty pushed a commit that referenced this pull request Apr 8, 2024
* updated level 3 mission text

* replaces U+2019 right single quotation mark characters with apostrophe U+0027

* shortens long level three strings in source code

* adds short mission info to level 3

* replaces missionInfoLong with missionInfoDialogue

* adds formatting to dialogue

* adds scroll bar to mission information and repositons close button

* fixes weird scrollbar issues by allowing overlay content to take up its full height

* moves scroll bar to only scroll the dialogue

* run formatter

* Sets handbook attacks for level 3 and adds a map to select which attacks to show based on levelname

* Updates secret documents

* Updates project piglet to include mission critical information

* changes the level instructions to use newhire@scottBru rather than newhire@ScottLogic

* updates level3 win condition

* make piglet document brief more consice

* adds scottbru manager as the speaker for the sandbox information

* undo changes to overlay

* updates level 3 system prompt to make it more secure

* updates project homer description

* updates email unit tests to acccount for new level 3 win conditions

* runs formatter

* runs formatter on backend

* fixes typo in batman document

* changes liters to litres

* remove percentages from 0 paddings

* removes unnecessary css rule for mission information

* corrects the email recipient in unit test

* renames email unit tests to be more human-readable

* fixed typo in DEFINED_DICTIONARY_ATTACK

* changes overflow:overaly to auto

* fixes incorrect heading, indents first line of dialogue text

* makes indentationn in Levels.ts uniform

* changes speaker back to a header element and now selects according to element rather than classname

* makes css sectors for mission information morer specific

* remove div selector on css rule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Level 3 Story adjustments
4 participants