Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/domino #79

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ build.gradle
.project
.settings
bin/
build/
build/
.idea/misc.xml
.idea/workspace.xml
.idea/vcs.xml
.idea/runConfigurations.xml
.idea/checkstyle-idea.xml
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions assets/atlas/items.atlas
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"tileSize" : [16, 16],
"gridDimensions" : [16, 16],
"tileNames" : [
"clubTop", "club", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
"clubBottom", "spade", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
"spaceTop", "heart", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
"clubTop", "club", "diceOne", "diceTwo", "diceThree", "", "", "", "", "", "", "", "", "", "", "",
"clubBottom", "spade", "diceFour", "diceFive", "diceSix", "", "", "", "", "", "", "", "", "", "", "",
"spadeTop", "heart", "diceZero", "", "", "", "", "", "", "", "", "", "", "", "", "",
"spadeBottom", "diamond", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
"heartTop", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
"heartBottom", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
Expand Down
Binary file added assets/blockTiles/dominoes/whiteDiceFive.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceFour.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceOne.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceSix.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceThree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceTwo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/dominoes/whiteDiceZero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoFive.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Five",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceFive"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoFour.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Four",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceFour"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoOne.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino One",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceOne"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoSix.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Six",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceSix"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoThree.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Three",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceThree"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoTwo.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Two",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceTwo"
}
5 changes: 5 additions & 0 deletions assets/blocks/dominoes/dominoZero.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"displayName": "Domino Zero",
"basedOn" : "LightAndShadowResources:domino",
"tile": "LightAndShadowResources:whiteDiceZero"
}
7 changes: 7 additions & 0 deletions assets/blocks/templates/domino.block
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"template" : true,
"shape" : "CoreAssets:door",
"family" : "horizontal",
"attachmentAllowed" : true,
"craftPlace" : false
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoFive.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino Five"
},
"Item" : {
"name" : "Domino Five",
"icon" : "LightAndShadowResources:items#diceFive",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoFive"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoFive"
}
}
24 changes: 24 additions & 0 deletions assets/prefabs/dominoes/dominoFiveBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DisplayName": {
"name": "Domino Five"
},

"Health" : {
"currentHealth" : 4,
"maxHealth" : 4,
"destroyEntityOnNoHealth": true
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoFive"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoFive"
},
"Network": {}
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoFour.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino Four"
},
"Item" : {
"name" : "Domino Four",
"icon" : "LightAndShadowResources:items#diceFour",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoFour"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoFour"
}
}
24 changes: 24 additions & 0 deletions assets/prefabs/dominoes/dominoFourBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DisplayName": {
"name": "Domino Four"
},

"Health" : {
"currentHealth" : 4,
"maxHealth" : 4,
"destroyEntityOnNoHealth": true
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoFour"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoFour"
},
"Network": {}
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoOne.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino One"
},
"Item" : {
"name" : "Domino One",
"icon" : "LightAndShadowResources:items#diceOne",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoOne"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoOne"
}
}
24 changes: 24 additions & 0 deletions assets/prefabs/dominoes/dominoOneBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DisplayName": {
"name": "Domino One"
},

"Health" : {
"currentHealth" : 4,
"maxHealth" : 4,
"destroyEntityOnNoHealth": true
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoOne"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoOne"
},
"Network": {}
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoSix.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino Six"
},
"Item" : {
"name" : "Domino Six",
"icon" : "LightAndShadowResources:items#diceSix",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoSix"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoSix"
}
}
24 changes: 24 additions & 0 deletions assets/prefabs/dominoes/dominoSixBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DisplayName": {
"name": "Domino Six"
},

"Health" : {
"currentHealth" : 4,
"maxHealth" : 4,
"destroyEntityOnNoHealth": true
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoSix"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoSix"
},
"Network": {}
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoThree.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino Three"
},
"Item" : {
"name" : "Domino Three",
"icon" : "LightAndShadowResources:items#diceThree",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoThree"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoThree"
}
}
24 changes: 24 additions & 0 deletions assets/prefabs/dominoes/dominoThreeBlock.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"DisplayName": {
"name": "Domino Three"
},

"Health" : {
"currentHealth" : 4,
"maxHealth" : 4,
"destroyEntityOnNoHealth": true
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoThree"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoThree"
},
"Network": {}
}
28 changes: 28 additions & 0 deletions assets/prefabs/dominoes/dominoTwo.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "engine:iconItem",
"DisplayName": {
"name": "Domino Two"
},
"Item" : {
"name" : "Domino Two",
"icon" : "LightAndShadowResources:items#diceTwo",
"consumedOnUse" : false,
"usage" : "ON_BLOCK"
},
"Health" : {
"currentHealth" : 64,
"maxHealth" : 64
},
"BaseRegen": {
"regenRate": 4,
"waitBeforeRegen": 1
},
"DropGrammar": {
"itemDrops": [
"LightAndShadowResources:dominoTwo"
]
},
"ActAsBlock": {
"block": "LightAndShadowResources:dominoTwo"
}
}
Loading