Skip to content

Commit

Permalink
Merge branch 'Team-4---General-Mobs' into Team4-GeneralMobs-Megan
Browse files Browse the repository at this point in the history
  • Loading branch information
meganroxburgh committed Sep 11, 2023
2 parents 69ca995 + 280bf1c commit 0e8b0ff
Show file tree
Hide file tree
Showing 92 changed files with 4,155 additions and 512 deletions.
16 changes: 16 additions & 0 deletions source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,21 @@
"health": 10,
"baseAttack": 5,
"cost": 1
},
"DroidTower": {
"health": 50,
"baseAttack": 5,
"cost": 1
},
"fireTower": {
"health": 10,
"baseAttack": 10,
"cost": 10
},
"stunTower": {
"health": 10,
"baseAttack": 10,
"cost": 10

}
}
37 changes: 22 additions & 15 deletions source/core/assets/images/projectiles/basic_projectile.atlas
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,38 @@ size: 256, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
projectileFinal
rotate: false
xy: 2, 2
size: 36, 19
orig: 36, 19
offset: 0, 0
index: 4
projectileFinal
rotate: false
xy: 103, 3
size: 30, 18
orig: 30, 18
offset: 0, 0
index: 3
index: 2
projectile
rotate: false
xy: 40, 2
size: 30, 19
orig: 30, 19
size: 36, 19
orig: 36, 19
offset: 0, 0
index: 2
index: 4
projectile
rotate: false
xy: 72, 2
size: 29, 19
orig: 29, 19
xy: 78, 2
size: 36, 19
orig: 36, 19
offset: 0, 0
index: 1
projectile
rotate: false
xy: 116, 2
size: 36, 19
orig: 36, 19
offset: 0, 0
index: 3
default
rotate: false
xy: 116, 2
size: 36, 19
orig: 36, 19
offset: 0, 0
index: 3
Binary file modified source/core/assets/images/projectiles/basic_projectile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions source/core/assets/images/projectiles/engineer_projectile.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

engineer_projectile.png
size: 128, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
bullet
rotate: false
xy: 47, 2
size: 19, 19
orig: 19, 19
offset: 0, 0
index: -1
bullet
rotate: false
xy: 2, 2
size: 21, 19
orig: 21, 19
offset: 0, 0
index: -1
bulletFinal
rotate: false
xy: 68, 2
size: 19, 19
orig: 19, 19
offset: 0, 0
index: -1
bullet
rotate: false
xy: 25, 2
size: 20, 19
orig: 20, 19
offset: 0, 0
index: -1

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions source/core/assets/images/projectiles/mobKing_projectile.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@

mobKing_projectile.png
size: 256, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
mob_boss
rotate: false
xy: 142, 2
size: 26, 19
orig: 26, 19
offset: 0, 0
index: -1
mob_boss
rotate: false
xy: 198, 3
size: 24, 18
orig: 24, 18
offset: 0, 0
index: -1
mob_boss
rotate: false
xy: 170, 2
size: 26, 19
orig: 26, 19
offset: 0, 0
index: -1
mob_boss
rotate: false
xy: 37, 2
size: 33, 19
orig: 33, 19
offset: 0, 0
index: -1
mob_boss
rotate: false
xy: 107, 2
size: 33, 19
orig: 33, 19
offset: 0, 0
index: -1
mob_boss
rotate: false
xy: 72, 2
size: 33, 19
orig: 33, 19
offset: 0, 0
index: -1
mob_bossFinal
rotate: false
xy: 2, 2
size: 33, 19
orig: 33, 19
offset: 0, 0
index: -1
default
rotate: false
xy: 142, 2
size: 26, 19
orig: 26, 19
offset: 0, 0
index: -1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion source/core/assets/images/projectiles/mobProjectile.atlas
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rotate
index: -1
default
rotate: false
xy: 54, 2
xy: 28, 2
size: 24, 23
orig: 24, 23
offset: 0, 0
Expand Down
97 changes: 97 additions & 0 deletions source/core/assets/images/projectiles/projectile_explosion.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@

projectile_explosion.png
size: 2048, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: none
explosion
rotate: false
xy: 1042, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 782, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 262, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosionFinal
rotate: false
xy: 1302, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 392, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 1432, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 652, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 132, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 1172, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 522, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 2, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
explosion
rotate: false
xy: 912, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
default
rotate: false
xy: 1042, 2
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions source/core/assets/images/projectiles/snow_ball.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

snow_ball.png
size: 128, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 20, 2
size: 16, 19
orig: 16, 19
offset: 0, 0
index: -1
projectile
rotate: false
xy: 56, 2
size: 16, 19
orig: 16, 19
offset: 0, 0
index: -1
projectile
rotate: false
xy: 38, 2
size: 16, 19
orig: 16, 19
offset: 0, 0
index: -1
projectileFinal
rotate: false
xy: 2, 2
size: 16, 19
orig: 16, 19
offset: 0, 0
index: -1
collision
rotate: false
xy: 92, 3
size: 16, 18
orig: 16, 18
offset: 0, 0
index: -1
collision
rotate: false
xy: 74, 3
size: 16, 18
orig: 16, 18
offset: 0, 0
index: -1
Binary file added source/core/assets/images/projectiles/snow_ball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0e8b0ff

Please sign in to comment.