v0.8 업데이트 #116

Closed
Hide_D wants to merge 209 commits from custom_map into devel
2 changed files with 7 additions and 3 deletions
Showing only changes of commit 0020cf7364 - Show all commits
+6 -3
View File
@@ -150,13 +150,16 @@ class NPC{
}
else if(is_numeric($picturePath)){
if($picturePath < 0){
$picturePath = 'default.jpg';
$picturePath = null;
}
else if(\key_exists($picturePath, $env['stored_icons']['.']??[])){
$picturePath = $env['stored_icons']['.'][$picturePath];
}
else{
$picturePath = "{$picturePath}.jpg";
$picturePath = null;
}
}
else if($picturePath !== null){
else if($picturePath !== null && in_array($picturePath, $env['stored_icons'][$env['icon_path']??'.']??[])){
$picturePath = ($env['icon_path']??'.').'/'.$picturePath;
}
else if($picturePath === null && \key_exists('stored_icons', $env)){
+1
View File
@@ -6,6 +6,7 @@
],
"diplomacy":[
],
"iconPath": "걸그룹",
"stat":{
"total":220,
"min":40,