From 1a04547336a0301ddbf2a029091471255221542f Mon Sep 17 00:00:00 2001 From: cathli66 Date: Mon, 29 Apr 2024 17:59:04 -0400 Subject: [PATCH] initialized hint circle + current points based on hints used --- game/lib/gameplay/gameplay_map.dart | 6 ++++-- game/lib/gameplay/gameplay_page.dart | 13 +++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/game/lib/gameplay/gameplay_map.dart b/game/lib/gameplay/gameplay_map.dart index d664db8a..a69ab97c 100644 --- a/game/lib/gameplay/gameplay_map.dart +++ b/game/lib/gameplay/gameplay_map.dart @@ -62,7 +62,7 @@ class _GameplayMapState extends State { int numHintsLeft = 10; GeoPoint? startingHintCenter; GeoPoint? hintCenter; - double defaultHintRadius = 100.0; + double defaultHintRadius = 200.0; double? hintRadius; // whether the picture is expanded over the map @@ -97,13 +97,15 @@ class _GameplayMapState extends State { * hints used for this challenge already. */ void setStartingHintCircle() { + print(widget.startingHintsUsed); hintRadius = defaultHintRadius - (defaultHintRadius - widget.awardingRadius) * 0.33 * - (totalHints - widget.startingHintsUsed); + widget.startingHintsUsed; if (hintRadius == null) { hintRadius = defaultHintRadius; } + print(hintRadius); Random _random = Random(); diff --git a/game/lib/gameplay/gameplay_page.dart b/game/lib/gameplay/gameplay_page.dart index 3425cce6..be35e085 100644 --- a/game/lib/gameplay/gameplay_page.dart +++ b/game/lib/gameplay/gameplay_page.dart @@ -186,7 +186,7 @@ class _GameplayPageState extends State { challenge.location] ?? ""), style: TextStyle( - fontSize: 12, + fontSize: 13, color: Color(0xFF835A7C))) ]), Row(children: [ @@ -201,7 +201,7 @@ class _GameplayPageState extends State { : "?.?") + ' Miles Away', style: TextStyle( - fontSize: 12, + fontSize: 13, color: Color(0xFF58B171))) ]), Row(children: [ @@ -209,11 +209,16 @@ class _GameplayPageState extends State { "assets/icons/bearcoins.svg"), Text( ' ' + + ((challenge.points ?? 0) - + startingHintsUsed * 25) + .toString() + + '/' + (challenge.points ?? 0).toString() + " PTS", style: TextStyle( - fontSize: 12, - color: Color(0xFFFFC737))) + fontSize: 13, + fontWeight: FontWeight.w500, + color: Color(0xFFC17E19))) ]), ])) ]))),