diff options
author | Nao Pross <naopross@thearcway.org> | 2018-11-25 16:33:21 +0100 |
---|---|---|
committer | Nao Pross <naopross@thearcway.org> | 2018-11-25 16:33:21 +0100 |
commit | 248292905ea424a5bec18c34cb056b60bb813a76 (patch) | |
tree | 87d0527d11b81d053bc8bc97d0afb56fa85f949b /res | |
parent | Remove super dangerous pack recipe from makefile (diff) | |
download | Subconscious-java-248292905ea424a5bec18c34cb056b60bb813a76.tar.gz Subconscious-java-248292905ea424a5bec18c34cb056b60bb813a76.zip |
Add jar recipe in Makefile, move res folder inside package
MapLoader was update accordingly to load maps as resources
Diffstat (limited to 'res')
-rw-r--r-- | res/maps/testmap.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/maps/testmap.json b/res/maps/testmap.json deleted file mode 100644 index 1bfb65e..0000000 --- a/res/maps/testmap.json +++ /dev/null @@ -1 +0,0 @@ -{"size":{"width":15,"height":15},"grid":[{"x":0,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":0,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":1,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":2,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":2,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":8,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":2,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":2,"y":13,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":2,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":3,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":9,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":3,"y":10,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":3,"y":11,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":3,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":3,"y":13,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":3,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":1,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":4,"y":2,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":4,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":5,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":4,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":4,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":10,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":4,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":4,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":2,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":5,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":4,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":5,"y":5,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":5,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":5,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":8,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":5,"y":9,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":5,"y":10,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":5,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":5,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":5,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":6,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":6,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":8,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":6,"y":9,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":6,"y":10,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":6,"y":11,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":6,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":6,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":2,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":7,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":7,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":8,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":7,"y":9,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":7,"y":10,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":7,"y":11,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":7,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":7,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":1,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":8,"y":2,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":8,"y":3,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":8,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":8,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":8,"y":9,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":8,"y":10,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":8,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":8,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":9,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":9,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":9,"y":10,"type":"WATER","selected":false,"cost":3.0,"distance":0.0},{"x":9,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":9,"y":12,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":9,"y":13,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":9,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":10,"y":7,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":10,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":10,"y":13,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":10,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":5,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":11,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":11,"y":7,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":11,"y":8,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":11,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":11,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":6,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":12,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":11,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":12,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":12,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":2,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":13,"y":3,"type":"MOUNTAIN","selected":false,"cost":8.0,"distance":0.0},{"x":13,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":13,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":0,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":1,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":2,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":3,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":4,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":5,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":6,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":7,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":8,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":9,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":10,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":11,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":12,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":13,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0},{"x":14,"y":14,"type":"GRASS","selected":false,"cost":1.0,"distance":0.0}],"actors":[{"name":"marc","alive":true,"enemy":true,"hp":10,"agility":10,"strenght":0,"defense":0,"x":12,"y":13},{"name":"bob","alive":true,"enemy":false,"hp":10,"agility":10,"strenght":0,"defense":0,"x":1,"y":4},{"name":"mike","alive":true,"enemy":false,"hp":10,"agility":10,"strenght":0,"defense":0,"x":8,"y":4},{"name":"jack","alive":true,"enemy":false,"hp":10,"agility":10,"strenght":0,"defense":0,"x":1,"y":10}],"actorIndex":-1} |