- You are exploring the map, and nothing has happened. Continue exploring using the direction buttons or the Travel To menus.
- HTML;
-}
-
/**
* Show a character's info. Defaults to the currently logged in user.
*/
-function show_character_info(int $id = 0): void
+function show_character_info(int $id = 0): string
{
- global $controlrow, $userrow;
+ global $controlrow;
- $userrow = ($id === 0) ? $userrow : get_user($id);
- if ($userrow === false) exit('Failed to show info for user ID '.$id);
+ $user = $id !== 0 ? User::find($id) : user();
+ if ($user === false) exit('Failed to show info for user ID '.$id);
- $levelrow = db()->query("SELECT `{$userrow["charclass"]}_exp` FROM levels WHERE id=? LIMIT 1;", [$userrow['level'] + 1])->fetchArray(SQLITE3_ASSOC);
+ $level = db()->query("SELECT `{$user->charclass}_exp` FROM levels WHERE id=? LIMIT 1;", [$user->level + 1])->fetchArray(SQLITE3_ASSOC);
- $spells = db()->query('SELECT id, name FROM spells;');
- $userspells = explode(',', $userrow['spells']);
- $magic_list = '';
- while ($spellrow = $spells->fetchArray(SQLITE3_ASSOC)) {
- $spell = false;
- foreach($userspells as $b) if ($b == $spellrow["id"]) $spell = true;
- if ($spell == true) $magic_list .= $spellrow["name"]."+ Click a town name to purchase its map.
+
| ".$townrow["name"]." | Price: ".$townrow["mapprice"]." gold | Buy map to reveal details. | |
| ".$townrow["name"]." | Already mapped. | Location: $latitude $longitude | TP: ".$townrow["travelpoints"]." | {$town['name']} | +Already mapped. | +Location: $latitude $longitude | +TP: {$town['travelpoints']} | + + HTML; + } else { + $page .= << +{$town['name']} | +Price: {$town['mapprice']} gold | +Buy map to reveal details. | + + HTML; + } } - $page .= "
\n"; - $page .= "If you've changed your mind, you may also return back to town.\n"; + $page .= <<
+ If you've changed your mind, you may also return back to town. + HTML; - display($page, "Buy Maps"); + page_title('Maps'); + return is_htmx() ? $page : display($page, ''); } -/** - * Confirm user's intent to purchase map. - */ -function maps2($id) +function buy_map(int $id): string { - $townrow = get_town_by_id($id); + $town = get_town_by_id($id); + if ($town === false) redirect('/maps'); - if (user()->gold < $townrow["mapprice"]) { - display("You do not have enough gold to buy this map.
You may return to town, store, or use the direction buttons on the left to start exploring.", "Buy Maps"); + if (user()->gold < $town['mapprice']) { + $page = <<
+ You may return to town, store, or use the direction buttons on the left to start exploring. + HTML; + } elseif (is_post() && $_POST['buy']) { + user()->towns .= ",$id"; + user()->gold -= $town['mapprice']; + user()->save(); + + $page = <<
+ You may return to town, store, or use the direction buttons on the left to start exploring. + HTML; + } elseif (is_post() && !$_POST['buy']) { + redirect('/maps'); + } else { + $page = <<{$town['name']} map for {$town['mapprice']} gold. Is that ok?
+ + HTML; } - $page = "You are buying the ".$townrow["name"]." map. Is that ok?
"; - - display($page, "Buy Maps"); -} - -/** - * Add new map to user's profile. - */ -function maps3($id) -{ - if (isset($_POST["cancel"])) redirect('/'); - - $townrow = get_town_by_id($id); - - if (user()->gold < $townrow["mapprice"]) { - display("You do not have enough gold to buy this map.
You may return to town, store, or use the direction buttons on the left to start exploring.", "Buy Maps"); - } - - $mappedtowns = user()->towns.",$id"; - $newgold = user()->gold - $townrow["mapprice"]; - - db()->query('UPDATE users SET towns=?, gold=? WHERE id=?;', [$mappedtowns, $newgold, user()->id]); - - display("Thank you for purchasing this map.
You may return to town, store, or use the direction buttons on the left to start exploring.", "Buy Maps"); + page_title('Buying '.$town['name'].' Map'); + return is_htmx() ? $page : display($page, ''); } /** diff --git a/src/actions/users.php b/src/actions/users.php index b629765..2e95c82 100644 --- a/src/actions/users.php +++ b/src/actions/users.php @@ -23,7 +23,7 @@ function login() { global $auth; - if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (is_post()) { $form = validate($_POST, [ 'username' => ['length:3-18', 'alpha-spaces'], 'password' => ['length:6-255'], @@ -187,7 +187,7 @@ function changepassword() function settings() { - if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (is_post()) { $form = validate($_POST, [ 'game_skin' => ['in:0,1'] ]); diff --git a/src/lib.php b/src/lib.php index 9700e92..a7e1b13 100644 --- a/src/lib.php +++ b/src/lib.php @@ -558,6 +558,14 @@ function is_htmx(): bool return isset($_SERVER['HTTP_HX_REQUEST']) && $_SERVER['HTTP_HX_REQUEST'] === 'true'; } +/** + * Return whether the request is POST. + */ +function is_post(): bool +{ + return is_post(); +} + /** * Get the current page title per updates. Optionally set a new title. */ diff --git a/templates/showchar.php b/templates/showchar.php index ad6b372..5bd54e0 100644 --- a/templates/showchar.php +++ b/templates/showchar.php @@ -1,35 +1,35 @@
+username ?>
-Class: charclass) { 1 => $controlrow["class1name"], 2 => $controlrow["class2name"], 3 => $controlrow["class3name"] }; ?>
-Level:
-Experience: - ( 0 ? '+' : '' ?>) %)
-Next Level: None
-Gold: - ( 0 ? '+' : '' ?>) %)
-Hit Points: /
-Magic Points: /
-Travel Points: /
+Level: level ?>
+Experience: experience) ?> + expbonus !== 0): ?> (expbonus > 0 ? '+' : '' ?>) expbonus ?>%)
+Next Level: level < 99) { echo number_format($level[$char->charclass."_exp"]); } else { ?> None
+Gold: gold) ?> + goldbonus !== 0): ?> (goldbonus > 0 ? '+' : '' ?>) goldbonus ?>%)
+Hit Points: currenthp) ?> / maxhp) ?>
+Magic Points: currentmp) ?> / maxmp) ?>
+Travel Points: currenttp) ?> / maxtp) ?>
-Strength:
-Dexterity:
-Attack Power:
-Defense Power:
+Strength: strength) ?>
+Dexterity: dexterity) ?>
+Attack Power: attackpower) ?>
+Defense Power: defensepower) ?>
Weapon: -
Armor: -
Shield: -Slot 1:
-Slot 2:
-Slot 3: +
weaponname ?>+
armorname ?>+
shieldname ?>+Slot 1: slot1name ?>
+Slot 2: slot2name ?>
+Slot 3: slot3name ?>
