Compare commits

..

47 Commits

Author SHA1 Message Date
mal 4dff9566a4 i fixed a null pointer exception in getLocation of job Smile 2023-10-20 17:39:52 -04:00
Ivory c4bfd44cc9 tilebox and workorders started 2023-02-13 20:23:13 -05:00
Bronwen 51d6c3db8b workshop ui start 2023-02-11 18:01:57 -05:00
Ivory 39710d33a7 more boxes 2023-02-06 02:23:07 -05:00
Bronwen ac0a9217db mason shop in and working 2023-02-05 03:17:10 -05:00
Ivory ce5906b768 ner ner ner ner ner ner nernnnnn 2023-02-05 02:11:47 -05:00
Ivory 04eaf1434f mmmmthock, yum yum thock (remove xy buildables) 2023-02-04 10:41:01 -05:00
Ivory 54229b1f2e remove buildable metadata. new simple work job 2023-02-04 10:39:26 -05:00
Ivory fe29860988 move render to construction 2023-02-04 03:38:55 -05:00
Ivory 3c2a62c7dd deprecate old bad method 2023-02-02 00:05:06 -05:00
Ivory f4608463e0 mild reorganizations 2023-02-02 00:03:32 -05:00
Ivory 93b2788c58 camera clamping 2023-02-01 18:16:58 -05:00
Ivory 4d2a630fce Merge branch 'bottom-bar' into stable 2023-01-30 00:36:12 -05:00
Ivory 87a4bf3a99 cleanup 2023-01-30 00:35:55 -05:00
Ivory 175d572903 pausing 2023-01-30 00:30:59 -05:00
Ivory 5374bcaaeb padding cleanup 2023-01-29 23:43:39 -05:00
Ivory 2ff6b06588 job board & main menu + bugfixes 2023-01-29 23:26:33 -05:00
Ivory a24bcce937 et al 2023-01-29 23:25:59 -05:00
Ivory 7bc5996cf9 vertical layout & better management 2023-01-29 23:25:44 -05:00
Ivory 02046f8fd3 new box fundamentals 2023-01-29 23:25:06 -05:00
Ivory 8bcc7b0714 debug logger 2023-01-28 22:15:43 -05:00
Bronwen b1171ed4eb selection ui exclusivity 2023-01-28 13:03:13 -05:00
Bronwen 91c3e87c6e kb listner, better exclusives, debug logger 2023-01-28 04:09:44 -05:00
Ivory ed9b183c53 exclusivity manager, not applied to selectionui 2023-01-28 03:06:31 -05:00
Ivory afa487e78d debug info, tabs more well defined to be immediategui panels 2023-01-27 13:21:59 -05:00
Ivory 118f5299df lots of conversion to color & box 2023-01-27 09:56:56 -05:00
Ivory 072774e2bf zooming camera & build menu 2023-01-21 17:09:55 -05:00
Ivory 97d6412ea7 more minor ui 2023-01-20 07:46:15 -05:00
Ivory b7991cdb74 selection box now tied to world not screen 2023-01-20 07:26:06 -05:00
Ivory 9f59efc3d7 ui updates & camera! 2023-01-20 06:47:44 -05:00
Ivory 7c0a3be105 new selection ui 2023-01-18 17:31:27 -05:00
Ivory f19cfccf1a horizontal, for some things. 2023-01-18 08:20:27 -05:00
Ivory 0f73574f13 expanding buttons and dynamic gui areas 2023-01-18 06:38:31 -05:00
Ivory 58618b97bc better jobs, quarry, immediateui 2023-01-15 04:11:17 -05:00
Ivory 58e4c02dc1 lots of fun sounds to work with 2023-01-14 04:42:24 -05:00
Ivory 60529c9552 proper diagonal path, no walking on walls! 2023-01-12 10:15:37 -05:00
Ivory 46f75fa53c walls built in debug mode require no resources 2023-01-12 10:15:22 -05:00
Ivory 493c81f779 remove some logging 2023-01-12 09:04:28 -05:00
Ivory ecc9a7a99f cleanup: warnings 2023-01-12 09:03:41 -05:00
Ivory a205bad00f random names, wandering, improved selection ui 2023-01-12 08:55:30 -05:00
Ivory 9b12ee7417 quarrys exist and work, but are a little buggy... 2023-01-11 05:09:35 -05:00
Ivory 6bec854463 cleanup logging 2023-01-11 03:37:13 -05:00
Ivory 0aed4f8625 some arch changes for better sound support 2023-01-11 03:32:43 -05:00
Ivory 807e6a2a49 started sounds! 2023-01-11 02:54:14 -05:00
Ivory 3d0754f060 context aware walls 2023-01-10 21:51:11 -05:00
Ivory 18f4a33038 add missing build method to designation 2023-01-10 04:04:06 -05:00
Ivory 76fa3b0f8a Merge branch 'world-object-unification-project' into stable 2023-01-10 03:58:39 -05:00
303 changed files with 19087 additions and 1598 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ out
output output
SAVE_DATA.TXT SAVE_DATA.TXT
.DS_Store .DS_Store
.vscode/graalvm

41
.vscode/launch.json vendored
View File

@ -1,20 +1,25 @@
{ {
// Use IntelliSense to learn about possible attributes. // Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes. // Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "java", "type": "java",
"name": "Launch App", "name": "Launch App",
"request": "launch", "request": "launch",
"mainClass": "xyz.valnet.hadean.HadeanGame", "mainClass": "xyz.valnet.hadean.HadeanGame",
"projectName": "hadean", "projectName": "hadean",
"console": "internalConsole", "console": "internalConsole",
"internalConsoleOptions": "neverOpen", "internalConsoleOptions": "neverOpen",
"osx": {
"vmArgs": "-XstartOnFirstThread" "osx": {
} "type": "java",
} "name": "Launch App",
] "request": "launch",
"mainClass": "xyz.valnet.hadean.HadeanGame",
"vmArgs": "-XstartOnFirstThread"
}
}
]
} }

View File

@ -1,4 +1,5 @@
{ {
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.dependency.packagePresentation": "hierarchical" "java.dependency.packagePresentation": "hierarchical",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
} }

41
bin/stats.js 100755
View File

@ -0,0 +1,41 @@
#!/usr/bin/env node
const { readdirSync, readFileSync } = require('fs');
const { resolve, parse, relative } = require('path');
const trimWhitespace = true;
const base = "./src";
let lines = 0;
let files = [];
function processDir(path) {
const children = readdirSync(path, {
withFileTypes: true
});
for(const entity of children) {
const { name } = entity
const full = resolve(path, name);
if(entity.isFile()) {
processFile(full);
} else if(entity.isDirectory()) {
processDir(full);
}
}
}
function processFile(path) {
const parsed = parse(path);
const rel = relative(resolve(base), path)
const type = parsed.ext;
const text = readFileSync(path);
console.log(path);
}
function printStats() {
console.log("")
}
processDir(base);
printStats();

View File

@ -76,9 +76,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>org.yaml</groupId>
<artifactId>jackson-dataformat-yaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>2.13.4</version> <version>1.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.lwjgl</groupId> <groupId>org.lwjgl</groupId>

View File

@ -0,0 +1,5 @@
items:
- name: Log
plural: Logs
texture: [48, 96, 16, 16]

46
res/convert.py 100644
View File

@ -0,0 +1,46 @@
import yaml
dataStr = open("res/names.yml").read()
print("loading data")
data = yaml.safe_load(dataStr)
# data = [
# {
# "name": 'fonk',
# "sex": 'donk'
# },
# {
# "name": 'fonk',
# "sex": 'donk'
# },
# {
# "name": 'tonk',
# "sex": 'donk'
# }
# ]
newData = []
def findPairInArray(arr, n, s):
for pair in arr:
name = pair["name"]
sex = pair["sex"]
if n == name and s == sex:
return pair
return None
for pair in data:
name = pair["name"]
sex = pair["sex"]
print("" + name + " " + sex)
match = findPairInArray(newData, name, sex)
print(match)
if match == None:
newData.append({
"name": name,
"sex": sex
})
print(newData)
with open('res/output.yaml', 'w') as file:
outputs = yaml.dump(newData, file)

14911
res/names.yaml 100644

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1 @@
https://opengameart.org/content/botton-sound-pack

Some files were not shown because too many files have changed in this diff Show More