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.

Sign up for GitHub

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

introduced an arrow shooting tower #32

Merged
merged 5 commits into from
Aug 28, 2017
Merged

introduced an arrow shooting tower #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cd406b
introduced an arrow shooting tower
0shine0 Aug 6, 2017
547924e
implemented sniper scope
0shine0 Aug 16, 2017
7bce2fb
added sniper model and scope hud assets
0shine0 Aug 16, 2017
4485c94
scope hud
0shine0 Aug 19, 2017
8188596
recoil for sniper and impulse on explosion
0shine0 Aug 23, 2017
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
Binary file added assets/blockTiles/placement.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions assets/blocks/arrowTower.block
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"displayName": "Arrow Tower Root",
"hardness": 12,
"mass": 10,
"shape" : "engine:eighthBlock",
"attachmentAllowed": false,
"rotation": "horizontal",
"tiles": {
"all": "placement"
},
"entity": {
"prefab": "CombatSystem:arrowTowerRoot"
},
"inventory": {
"stackable": true,
"directPickup": true
}
}
8 changes: 8 additions & 0 deletions assets/materials/tower.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"shader" : "engine:genericMeshMaterial",
"params" : {
"diffuse" : "CombatSystem:tower",
"colorOffset" : [1.0, 1.0, 1.0],
"textured" : true
}
}
253 changes: 253 additions & 0 deletions assets/mesh/tower.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
# Exported from 3D Builder
o Object.1
v -1.104851 2.182137 0.000001
v -0.883881 2.182137 0.920293
v -0.883881 2.182137 -0.920292
v 0.000003 2.182137 -1.150366
v 0.883884 2.182137 -0.920292
v 1.104855 2.182137 0.000001
v 0.883884 2.182135 0.920293
v 0.000001 2.182137 1.150367
v 0.000003 4.000318 0.000001
v -0.499999 0.926457 0.500000
v -0.624999 0.926457 0.000000
v -0.499998 0.926457 -0.499999
v 0.000002 0.926457 -0.624999
v 0.500002 0.926457 -0.499999
v 0.625001 0.926457 0.000000
v 0.500001 0.926457 0.500000
v 0.000001 0.926457 0.625000
v 0.000001 0.926457 0.000000
v 0.751288 -1.536610 0.751287
v 1.001501 -1.536610 0.000000
v 0.751288 -1.536611 -0.751286
v 1.002574 -3.999682 1.002576
v 1.502499 -3.999681 0.000001
v 1.002576 -3.999681 -1.002575
v 0.000001 -3.999682 1.502499
v 0.000001 -3.999681 0.000000
v 0.000001 -3.999679 -1.502499
v -1.002574 -3.999682 1.002575
v -1.502499 -3.999681 -0.000001
v -1.002573 -3.999681 -1.002576
v -0.751286 -1.536611 0.751287
v -1.001499 -1.536611 0.000000
v -0.751286 -1.536611 -0.751286
v 0.000001 -1.536613 -1.001499
v 0.000001 -1.536610 1.001500

vt 0.249000 0.498000
vt 0.493200 0.514600
vt 0.007800 0.521500
vt 0.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.247100 0.530300
vt 0.494100 0.530300
vt 0.000000 0.533200
vt 0.253900 1.000000
vt 0.251000 1.000000
vt 0.251000 0.505900
vt 0.000000 0.512700
vt 0.265600 1.000000
vt 0.503900 0.510700
vt 0.248000 0.517600
vt 0.002900 0.537100
vt 0.251000 0.998000
vt 0.493200 0.537100
vt 0.496100 0.000000
vt 1.000000 0.498000
vt 0.500000 0.500000
vt 0.496100 0.000000
vt 1.000000 0.000000
vt 1.000000 0.500000
vt 0.498000 0.500000
vt 0.503900 0.000000
vt 1.000000 0.000000
vt 1.000000 0.503900
vt 0.502000 0.500000
vt 0.502000 0.000000
vt 1.000000 0.000000
vt 1.000000 0.502000
vt 0.502000 0.502000
vt 1.000000 0.000000
vt 1.000000 0.498000
vt 0.500000 0.498000
vt 0.502000 0.000000
vt 0.500000 0.000000
vt 1.000000 0.000000
vt 1.000000 0.500000
vt 0.500000 0.502000
vt 0.503900 0.000000
vt 1.000000 0.502000
vt 0.503900 0.502000
vt 0.502000 0.000000
vt 1.000000 0.000000
vt 1.000000 0.503900
vt 0.500000 0.498000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 1.000000
vt 0.000000 1.000000
vt 0.000000 0.000000
vt 1.000000 0.000000
vt 0.000000 1.000000
vt 1.000000 1.000000
vt 0.502000 0.499000
vt 0.000000 0.502000
vt 0.501000 0.000000
vt 0.000000 0.000000
vt 0.502000 0.498000
vt 0.000000 0.500000
vt 0.000000 0.000000
vt 0.503900 0.000000
vt 1.000000 0.505900
vt 0.504500 0.505600
vt 0.503200 1.000000
vt 1.000000 1.000000
vt 0.506400 0.505600
vt 1.000000 0.505600
vt 1.000000 1.000000
vt 0.714200 0.501800
vt 0.720400 0.495800
vt 0.444700 0.504000
vt 0.231700 0.370200
vt 0.726700 0.489900
vt 0.453000 0.496100
vt 0.987900 0.495600
vt 0.897000 0.357600
vt 0.996200 0.487700
vt 0.503800 1.000000
vt 1.000000 1.000000
vt 0.507200 0.501900
vt 1.000000 0.498700
vt 0.504100 1.000000
vt 1.000000 1.000000
vt 1.000000 0.500300
vt 0.506000 0.498700
vt 0.502000 0.502000
vt 0.000000 0.500000
vt -0.000000 0.000000
vt 0.503900 0.000000
vt 0.000000 0.498000
vt 0.505900 0.000000
vt -0.000000 0.000000
vt 0.504100 0.997900
vt 0.506000 0.500300
vt 1.000000 1.000000
vt 0.509200 1.000000
vt 0.502600 0.503700
vt 1.000000 0.507100
vt 0.498000 0.000000
vt 0.500000 0.500000
vt 0.000000 0.500000
vt 0.498700 0.499600
vt 0.000000 0.499600
vt 0.500600 0.000000
vt -0.000000 0.000000
vt 0.000000 0.498000
vt 0.000500 0.007600
vt 0.500000 0.498000
vt 0.500000 0.000000
vt 1.000000 1.000000
vt 1.000000 0.501800
vt 0.503800 0.502100
vt 0.506800 1.000000
vt 0.000000 0.496100
vt 0.000000 0.000000
vt 0.505900 0.000000
vt 0.503900 0.498000
vt 1.000000 1.000000
vt 1.000000 0.501300
vt 0.503300 1.000000
vt 0.504400 0.499900

f 1/1 2/2 3/3
f 4/4 3/5 2/6
f 4/4 2/7 5/8
f 6/9 5/10 2/6
f 6/9 2/7 7/11
f 8/12 7/13 2/14
f 1/1 3/3 9/15
f 1/1 9/15 2/2
f 8/12 2/14 9/16
f 8/12 9/16 7/13
f 6/17 7/18 9/19
f 6/17 9/19 5/20
f 4/21 5/22 9/23
f 4/21 9/23 3/24
f 10/25 2/6 1/26
f 10/25 1/26 11/27
f 12/28 11/29 1/30
f 12/28 1/30 3/31
f 12/32 3/33 4/34
f 12/32 4/34 13/35
f 14/36 13/37 4/38
f 14/36 4/38 5/39
f 14/40 5/41 6/42
f 14/40 6/42 15/43
f 16/44 15/45 6/46
f 16/44 6/46 7/47
f 16/48 7/11 8/49
f 16/48 8/49 17/50
f 10/51 17/52 8/53
f 10/51 8/53 2/54
f 13/55 18/56 14/57
f 18/56 15/58 14/57
f 18/59 17/52 16/60
f 18/59 16/60 15/61
f 12/62 11/29 18/63
f 12/62 18/63 13/64
f 11/65 10/66 18/67
f 10/66 17/68 18/67
f 19/69 20/70 16/71
f 20/70 15/72 16/71
f 20/73 21/74 14/75
f 20/73 14/75 15/76
f 22/77 23/78 20/79
f 22/77 20/79 19/80
f 23/81 24/82 20/79
f 24/82 21/83 20/79
f 25/84 26/85 22/86
f 26/85 23/87 22/86
f 26/85 27/88 24/89
f 26/85 24/89 23/87
f 28/90 29/91 26/85
f 28/90 26/85 25/84
f 29/91 30/92 26/85
f 30/92 27/88 26/85
f 31/93 32/94 28/95
f 32/94 29/96 28/95
f 32/97 33/98 30/99
f 32/97 30/99 29/100
f 10/101 11/102 32/103
f 10/101 32/103 31/104
f 11/27 12/105 32/106
f 12/105 33/107 32/106
f 33/98 34/108 30/99
f 34/108 27/109 30/99
f 34/110 21/111 24/112
f 34/110 24/112 27/113
f 12/62 13/114 34/115
f 12/62 34/115 33/116
f 13/117 14/118 34/119
f 14/118 21/120 34/119
f 17/121 35/122 16/123
f 35/122 19/124 16/123
f 35/125 25/126 22/127
f 35/125 22/127 19/128
f 10/129 31/130 35/131
f 10/129 35/131 17/132
f 31/133 28/134 35/135
f 28/134 25/136 35/135
24 changes: 24 additions & 0 deletions assets/prefabs/projectiles/arrows/straightArrow.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parent" : "CombatSystem:basicShoot",
"Hurting" : {
"amount" : 3
},
"Stick" : {
"totalStickingTime" : 15
},
"Health" : {
"maxHealth" : 1,
"currentHealth" : 1,
"regenRate" : 0
},
"Arrow" : {

},
"BoxShape" : {
"extents" : [0.5, 0.5, 1]
},
"Mesh" : {
"mesh" : "CombatSystem:arrow",
"material" : "CombatSystem:arrow"
}
}
23 changes: 23 additions & 0 deletions assets/prefabs/traps/arrowTower.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"Health" : {
"maxHealth" : 20,
"currentHealth" : 20,
"regenRate" : 4,
"waitBeforeRegen" : 1,
"destroyEntityOnNoHealth" : true
},
"Location" : {

},
"BoxShape" : {
"extents" : [3, 8, 3]
},
"Trigger" : {
"detectGroups" : ["engine:default", "engine:character"]
},
"Mesh" : {
"mesh" : "CombatSystem:tower",
"material" : "CombatSystem:tower"
}
}

17 changes: 17 additions & 0 deletions assets/prefabs/traps/arrowTowerRoot.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"Location" : {

},
"Health" : {

},
"Parent" : {

},
"EntitiesConnector" : {
"childEntities" : [
{ "prefab" : "CombatSystem:arrowTower", "offset" : [0, 3.5, 0], "addParentAsChild" : true},
{ "prefab" : "CombatSystem:arrowTowerShooter", "offset" : [0, 5.5, 0]}
]
}
}
20 changes: 20 additions & 0 deletions assets/prefabs/traps/arrowTowerShooter.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parent" : "CombatSystem:volumeTrap",
"LaunchEntity": {
"launchEntityPrefab":"CombatSystem:straightArrow",
"impulse" : 200,
"cooldownTime" : 500
},
"Health": {
"maxHealth" : 1,
"currentHealth" : 1
},
"VolumeSensor" : {
"range" : 30,
"sensorLocOffset" : [0, -30, 0]
},
"ActivateOnPlace" : {

}
}

2 changes: 1 addition & 1 deletion assets/prefabs/traps/explodeMineTrap.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent" : "CombatSystem:mineTrap",
"parent" : "CombatSystem:volumeTrap",
"Explode" : {
"explosionPrefab":"CombatSystem:basicExplosion"
},
Expand Down
2 changes: 1 addition & 1 deletion assets/prefabs/traps/fireBallMineTrap.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent" : "CombatSystem:mineTrap",
"parent" : "CombatSystem:volumeTrap",
"LaunchEntity": {
"launchEntityPrefab":"CombatSystem:fireBall",
"impulse" : 200,
Expand Down
Loading