john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

bucket renamed to edge2d and saves now; proper input blocking with reversed()

Browse Source
This commit is contained in:
John Alanbrook
2023-09-27 22:40:04 +00:00
parent 98ba229c9c
commit 70e4105e1b
10 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/entity.js
View File

@@ -448,7 +448,8 @@ prototypes.from_file = function(file)
var urpath = file;
var path = urpath.split('.');
if (path.length > 1 && (path.at(-1) === path.at(-2))) {
return prototypes.get_ur(path.at(-1));
urpath = path.slice(0,-1).join('.');
return prototypes.get_ur(urpath);
}
var upperur = gameobject.ur;
@@ -477,18 +478,15 @@ prototypes.from_file = function(file)
jsfile = urpath + "/" + path.at(-1) + ".js";
if (IO.exists(jsfile)) script = IO.slurp(jsfile);
}
if (IO.exists(jsonfile)) {
try {
json = JSON.parse(IO.slurp(jsonfile));
}
try {
try {json = JSON.parse(IO.slurp(jsonfile)); }
catch(e) {
Log.warn(`JSON in file ${jsonfile} is malformed.`);
jsonfile = file + "/" + path.at(-1) + ".json";
if (IO.exists(jsonfile)) json = JSON.parse(IO.slurp(jsonfile));
}
}
else {
jsonfile = urpath + "/" + path.at(-1) + ".json";
if (IO.exists(jsonfile)) json = JSON.parse(IO.slurp(jsonfile));
} catch(e) {
Log.warn(`JSON in file ${jsonfile} is malformed.${e}`);
}
if (!json && !script) {