Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 09:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better monster images (no image not found anymore) + use cache

Browse Source
This commit is contained in:
slawkens
2025-05-05 21:21:54 +02:00
parent 497338c2d6
commit 73a5829974
4 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
system/pages/monsters.php
View File

@@ -16,18 +16,22 @@ defined('MYAAC') or die('Direct access not allowed!');
$title = 'Monsters';
if (empty($_REQUEST['name'])) {
// display list of monsters
$preview = setting('core.monsters_images_preview');
$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
$query->where('rewardboss', 1);
})->get()->toArray();
if ($preview) {
foreach($monsters as $key => &$monster)
{
$monster['img_link'] = getMonsterImgPath($monster['name']);
// display list of monsters
$monsters = MyAAC\Cache::remember('monsters', 30 * 60, function () use ($preview) {
$monsters = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
$query->where('rewardboss', 1);
})->get()->toArray();
if ($preview) {
foreach($monsters as &$monster) {
$monster['img_link'] = getMonsterImage($monster);
}
}
}
return $monsters;
});
$twig->display('monsters.html.twig', array(
'monsters' => $monsters,
@@ -45,7 +49,7 @@ if ($monsterModel && isset($monsterModel->name)) {
/** @var array $monster */
$monster = $monsterModel->toArray();
function sort_by_chance($a, $b)
function sort_by_chance($a, $b): int
{
if ($a['chance'] == $b['chance']) {
return 0;
@@ -55,7 +59,7 @@ if ($monsterModel && isset($monsterModel->name)) {
$title = $monster['name'] . " - Monsters";
$monster['img_link']= getMonsterImgPath($monster_name);
$monster['img_link']= getMonsterImage($monster);
$voices = json_decode($monster['voices'], true);
$summons = json_decode($monster['summons'], true);
@@ -89,3 +93,39 @@ if ($monsterModel && isset($monsterModel->name)) {
// back button
$twig->display('monsters.back_button.html.twig');
function getMonsterImage($monster): string
{
$outfit = json_decode($monster['look'], true);
if (!empty($outfit['typeEx'])) {
return setting('core.item_images_url') . $outfit['typeEx'] . setting('core.item_images_extension');
}
if (isset($outfit['type'])) {
$getValue = function ($val) use ($outfit) {
return (!empty($outfit[$val])
? '&' . $val . '=' . $outfit[$val] : '');
};
return setting('core.outfit_images_url') . '?id=' . $outfit['type'] . $getValue('addons') . $getValue('head') . $getValue('body') . $getValue('legs') . $getValue('feet');
}
return getMonsterImgPath($monster['name']);
}
function getMonsterImgPath($name): string
{
$monster_path = setting('core.monsters_images_url');
$monster_gfx_name = trim(strtolower($name)) . setting('core.monsters_images_extension');
if (!file_exists($monster_path . $monster_gfx_name)) {
$monster_gfx_name = str_replace(" ", "", $monster_gfx_name);
if (file_exists($monster_path . $monster_gfx_name)) {
return $monster_path . $monster_gfx_name;
} else {
return $monster_path . 'nophoto.png';
}
} else {
return $monster_path . $monster_gfx_name;
}
}