Skip to content

Commit 12d68f7

Browse files
authored
chore: adapt old code base to new architecture (#20)
1 parent d76966a commit 12d68f7

File tree

67 files changed

+1045
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1045
-322
lines changed

.github/workflows/gradle-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: Build & test project
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, development ]
66
paths:
77
- src/**
88
- build.gradle
99
- settings.gradle
1010
pull_request:
11-
branches: [ master ]
11+
branches: [ master, development ]
1212

1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}

assets/chest.png

35 KB
Loading

assets/diamond.png

600 Bytes
Loading

assets/key.png

684 Bytes
Loading

assets/knight.png

68 KB
Loading

assets/map.png

-27.3 KB
Loading

assets/map10x10.png

-5.36 KB
Loading

assets/zombie.png

63.7 KB
Loading
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"tag": "location-1",
33
"objects": [
4-
{ "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible" },
5-
{ "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "interactive" }
4+
{ "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible", "assetPath": "assets/someDude.png" },
5+
{ "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "dialog", "assetPath": "assets/someDude.png" }
66
],
7-
"backgroundPath": "file:assets/map.png"
7+
"backgroundPath": "assets/map.png"
88
}
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"tag": "object-1",
3-
"assetPath": "/path/to/the/asset",
4-
"type": ""
5-
}
3+
"assetPath": "assets/someDude.png",
4+
"type": "collectible",
5+
"position": {
6+
"row": 10,
7+
"col": 10
8+
}
9+
}

0 commit comments

Comments
 (0)