This commit is contained in:
Kaan Soral
2025-10-07 21:51:48 +03:00
parent 687bd5f05e
commit 1b5e19215c
5 changed files with 11 additions and 3 deletions
+4
View File
@@ -114,7 +114,11 @@ if is_production:
#maps["desertland"]["key"]="jayson_desertland_copy" #maps["desertland"]["key"]="jayson_desertland_copy"
pass pass
<<<<<<< HEAD
game_version=825 game_version=825
=======
game_version=827
>>>>>>> 01a2112 (Pre pull)
SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales SALES=4+5+388+5101+125/20 #donation+manual+macos+steam+sales
update_notes=[ update_notes=[
"Last Update [August 7th]", "Last Update [August 7th]",
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -1141,7 +1141,7 @@ imagesets={
"size":20, "size":20,
"rows":9, "rows":9,
"columns":7, "columns":7,
"file":"/images/tiles/items/custom.png?v=9", "file":"/images/tiles/items/custom.png?v=10",
"load":True, "load":True,
}, },
"community":{ "community":{
@@ -1155,7 +1155,7 @@ imagesets={
tilesets={ tilesets={
"castle":{"file":"/images/tiles/map/castle.png?v=2"}, "castle":{"file":"/images/tiles/map/castle.png?v=2"},
"custom2":{"file":"/images/tiles/map/custom2.png?v=14"}, "custom2":{"file":"/images/tiles/map/custom2.png?v=14"},
"custom":{"file":"/images/tiles/map/custom.png?v=13"}, "custom":{"file":"/images/tiles/map/custom.png?v=14"},
"custom_a":{"frames":3,"frame_width":16,"file":"/images/tiles/map/custom_a.png?v=5"}, "custom_a":{"frames":3,"frame_width":16,"file":"/images/tiles/map/custom_a.png?v=5"},
"doors":{"file":"/images/tiles/map/doors.png"}, "doors":{"file":"/images/tiles/map/doors.png"},
"dungeon":{"file":"/images/tiles/map/dungeon.png?v=5"}, "dungeon":{"file":"/images/tiles/map/dungeon.png?v=5"},
Binary file not shown.
+1 -1
View File
@@ -2203,7 +2203,7 @@ function render_tracker()
html+="</div>"; html+="</div>";
html+="<div class='trackers trackerm'>"; html+="<div class='trackers trackerm'>";
object_sort(G.monsters,"hpsort").forEach(function(e){ object_sort(G.monsters,"hpsort").forEach(function(e){
if((e[1].unlist || e[1].cute) && !e[1].achievements || e[1].unlist) return; if(e[1].cute && !e[1].achievements || e[1].unlist) return;
var count=(tracker.monsters[e[0]]||0)+(tracker.monsters_diff[e[0]]||0),color="#50ADDD"; var count=(tracker.monsters[e[0]]||0)+(tracker.monsters_diff[e[0]]||0),color="#50ADDD";
if(tracker.max.monsters[e[0]] && tracker.max.monsters[e[0]][0]>count) if(tracker.max.monsters[e[0]] && tracker.max.monsters[e[0]][0]>count)
{ {