Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Base improvements #635

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

JasonTarka
Copy link
Contributor

Improve appearance of bases & links

  • Show points for both capturing & holding a base
  • Show non-http(s) links as full-width, so they're easier to read
  • Show "Capture Points" & "Keep points" when editing bases instead of "Points" & "Bonus"

Mark bases as "held" when the team doesn't change

  • Mark as 'held' rather than 'captured' when the controlling team hasn't changed
  • Don't spam the gameboard's activity log with messages of a team holding a base
  • Show in the activity log when a base is captured by another team

Reverse points/bonus for bases

  • More logical to have main points be the capture points, and bonus be the hold points, rather than points = hold, bonus = capture.
  • Adding version detection to allow old exports to be imported easily.
  • Extra logging to make debugging easier/possible

Functional fixes for bases & links

  • Handle http/https/ftp/etc. prefix for base URLs
    • Previously http://example.com would lead to the system calling http:12345; will now call example.com:12345
  • Better display of non-http(s) links
    • If there's a port listed, show the full nc 1.2.3.4 567, if not, show just 1.2.3.4 (previously would show `nc 1.2.3.4 undefined)
    • Readonly, rather than disabled, so the text can be scrolled & selected

- Handle http/https/ftp/etc. prefix for base URLs
  - Previously `http://example.com` would lead to the system calling `http:12345`;
    now will call example.com:12345
- Better display of non-http(s) links
  - If there's a port listed, show the full `nc 1.2.3.4 567`, if not, show just `1.2.3.4`
    (previously would show `nc 1.2.3.4 undefined)
  - Readonly, rather than disabled, so the text can be scrolled & selected
It makes more logical sense to have the capture score be the main
capture points, and the holding score be the bonus points, rather
than the previous capture = bonus, hold = points.

- Adding version detection to allow old exports to be imported easily.
- Extra logging to make debugging easier/possible
- This will make upcoming changes to the base display easier.
- Mark as 'held' rather than 'captured' when the controlling team
  hasn't changed
- Don't spam the gameboard's activity log with messages of a team
  holding a base
- Show in the activity log when a base is captured by another team
- Show points for both capturing & holding a base
- Show non-http(s) links as full-width, so they're easier to read
- Show "Capture Points" & "Keep points" when editing bases instead of "Points" & "Bonus"
@JasonTarka
Copy link
Contributor Author

JasonTarka commented Mar 27, 2018

Note: This relies on Utils::logMessage() from #634. Making this a separate PR to so it's easier to review.

@icebowl
Copy link

icebowl commented Jun 5, 2019

Please throw us a bone.
Last year we ran fbctf and got the base to work. This year we have a problem.
fbctf installed on base metal Ubuntu.
fbctf 10.183.7.7/16 base 10.183.7.31/16 . Then base and the game are on the same level 1 switch.
We can not get the base to work.
Base url 10.183,7.31:12345
STEPS:

  • We create a jail chroot.
  • Run pythons sciprt on for port 12345
  • Start the game then create the BASE.
  • No luck.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants