Skip to content

Commit

Permalink
Merge branch 'programmer-branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
@JacobSeto
JacobSeto committed Mar 23, 2024
2 parents af3790a + cbea76d commit 754ed95
Show file tree
Hide file tree
Showing 64 changed files with 2,183 additions and 790 deletions.
47 changes: 29 additions & 18 deletions assets/assets.json
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
{
"textures": {
"world:platforms:blackTile" : {
"file": "world/platforms/blackTile.png",
"wrapU": "repeated",
"wrapV": "repeated"
},
"world:platforms:weightedPlatform" : {
"file": "world/platforms/weightedPlatform.png",
"wrapU": "repeated",
"wrapV": "repeated"
},
"world:platforms:platformTile" : {
"file": "world/platforms//platformTile.png",
"world:platforms:blackTile" : {
"file": "world/platforms/blackTile.png",
"wrapU": "repeated",
"wrapV": "repeated"
},
"world:weightedLaserTile" : {
"file": "world/weightedLaserTile.png",
"world:platforms:weightedPlatform" : {
"file": "world/platforms/weightedPlatform.png",
"wrapU": "repeated",
"wrapV": "repeated"
},
"world:goal": "world/goaldoor.png",
"world:platforms:platform" : "world/platforms/platform.png",

"world:platforms:endPlatform" : "world/platforms/endPlatform.png",

"world:platforms:wirePlatform" : "world/platforms/wirePlatform.png",

"world:platforms:radioPlatform" : "world/platforms/radioPlatform.png",

"world:platforms:guitarPlatform" : "world/platforms/guitarPlatform.png",

"world:weightedLaserTile" : "world/weightedLaserTile.png",

"world:goal": "world/goaldoor.png",

"checkpoint:checkDefault": "world/checkpoints/checkDefault.png",

"checkpoint:checkActive": "world/checkpoints/checkActive.png",

"player:synth": "player/synth.png",

"player:synth-jazz": "player/synth-jazz.png",

"backgrounds:test-bg": "backgrounds/test-bg.png"
"backgrounds:test-bg": "backgrounds/background.png",

"backgrounds:overlay": "backgrounds/background-overlay.png",

"world:bullet": "world/bullet.png"
},
"jsons" : {
"constants": "constants.json"
Expand All @@ -34,8 +45,8 @@

},
"music" : {
"music:synth1": "music/synth1.ogg",
"music:jazz1": "music/jazz1.ogg"
"music:synth1": "music/synth_technical.ogg",
"music:jazz1": "music/jazz_technical.ogg"
},
"fonts": {
"fonts:retro": {
Expand Down
Binary file added assets/backgrounds/background-overlay.png
View file
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/backgrounds/background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
177 changes: 135 additions & 42 deletions assets/constants.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,34 @@
"restitution": 0.1,
"volume": 0.8
},
"start": {
"pos": [2.0, 2.2],
"density": 0.0,
"friction": 0.0,
"restitution": 0.0
},
"goal": {
"pos": [4.0, 14.0],
"pos": [31, 5],
"density": 0.0,
"friction": 0.0,
"restitution": 0.0
},
"checkpoints": [
{
"pos": [17, 7.3],
"density": 0.0,
"friction": 0.0,
"restitution": 0.0
}
],
"bunny" : {
"pos": [2.5, 5.0],
"shrink": [0.7, 0.95],
"force": 20.0,
"damping": 10.0,
"density": 1.0,
"friction": 0.0,
"jump_force": 5.5,
"jump_force": 10.0,
"jump_cool": 30,
"shot_cool": 40,
"sensor": {
Expand All @@ -30,26 +44,72 @@
"jazz": 2.5
}
},
"enemy" : {
"pos": [20.0, 5.0],
"shrink": [0.7, 0.95],
"force": 20.0,
"damping": 10.0,
"density": 1.0,
"friction": 10.0,
"shot_cool": 40,
"sensor": {
"shrink" : 0.6,
"height" : 0.05
"enemies" : [
{
"pos": [ 11.0, 5.3 ],
"shrink": [
0.7,
0.95
],
"force": 20.0,
"damping": 10.0,
"density": 1.0,
"friction": 10.0,
"shot_cool": 40,
"sensor": {
"shrink": 0.6,
"height": 0.05
},
"max_speed": {
"synth": 6.0,
"jazz": 2.5
}
},
"max_speed": {
"synth": 6.0,
"jazz": 2.5
{
"pos": [ 26.5, 3.5 ],
"shrink": [
0.7,
0.95
],
"force": 20.0,
"damping": 10.0,
"density": 1.0,
"friction": 10.0,
"shot_cool": 40,
"sensor": {
"shrink": 0.6,
"height": 0.05
},
"max_speed": {
"synth": 6.0,
"jazz": 2.5
}
},
{
"pos": [ 20.5, 3.5 ],
"shrink": [
0.7,
0.95
],
"force": 20.0,
"damping": 10.0,
"density": 1.0,
"friction": 10.0,
"shot_cool": 40,
"sensor": {
"shrink": 0.6,
"height": 0.05
},
"max_speed": {
"synth": 6.0,
"jazz": 2.5
}
}
},
],
"bullet": {
"offset" : 0.2,
"speed" : 20.0,
"offset" : 0.5,
"synth speed" : 5.0,
"jazz speed" : 2.5,
"density": 10.0
},
"bridge": {
Expand All @@ -58,38 +118,71 @@
"density": 1.0,
"pin_radius": 0.1
},
"walls": [
[16.0, 18.0, 16.0, 17.0, 1.0, 17.0,
1.0, 0.0, 0.0, 0.0, 0.0, 18.0],
[32.0, 18.0, 32.0, 0.0, 31.0, 0.0,
31.0, 17.0, 16.0, 17.0, 16.0, 18.0]
],
"platforms": [
[ 1.0, 3.0, 6.0, 3.0, 6.0, 2.5, 1.0, 2.5],
[ 6.0, 4.5, 9.0, 4.5, 9.0, 5.0, 6.0, 5.0],
[15.0, 2.5, 18.0, 2.5, 18.0, 3.0, 15.0, 3.0],
[19.0, 2.5, 22.0, 2.5, 22.0, 3.0, 19.0, 3.0],
[26.5,4.5,29.5,4.5,29.5,5.0,26.5,5.0],
[26.5,8.5,29.5,8.5,29.5,9.0,26.5,9.0],
[19.5,9.5,22.5,9.5,22.5,10.0,19.5,10.0],
[15.0, 12.0,19.0, 12.0,19.0, 11.5,15.0, 11.5],
[ 1.0,12.5, 7.0,12.5, 7.0,12.0, 1.0,12.0]
],
"walls": [
[16.0, 18.0, 16.0, 17.0, 1.0, 17.0,
1.0, 0.0, 0.0, 0.0, 0.0, 18.0]
],
"platforms": {
"platforms": [
[ 2, 1.0 ],
[ 0, 0 ]
],
"endPlatforms": [
[3, 1.0]
],
"wirePlatforms": [
[ 17,6],

[ 20,2.5]
],
"radioPlatforms": [
[ 8.5, 4],
[ 14.2,3.75 ],
[ 23.0, 2.5]
],
"guitarPlatforms": [
[ 12.0, 4],

[19,2.5]
]
},
"wplatforms": [
{
"pos": [18.0,2.5,18.5,2.5,18.5,5.5,18.0,5.5],
"pos": [4, 1.3, 7, 1.3, 7, 1.8, 4,1.8],
"synthPos": [0.0, 0.0],
"jazzPos": [0.0, 4.0]
"jazzPos": [0.0, 3.0],
"speed": 1.0
},

{
"pos": [23.0,3.5,26.0,3.5,26.0,4.0,23.0,4.0],
"pos": [25.75,2.75,28.5,2.75,28.5,2.5,25.75,2.5],
"synthPos": [0.0, 0.0],
"jazzPos": [0.0, 3.0]
"jazzPos": [0.0, 0.0],
"speed": 0.0
},
{
"pos": [9.0,12.5,13.0,12.5,13.0,12.0,9.0,12.0],
"pos": [25,4.5,25.25,4.5,25.25,3,25,3],
"synthPos": [0.0, 0.0],
"jazzPos": [0.0, 4.0]
"jazzPos": [0.0, 1.5],
"speed": 2.0
},
{
"pos": [21.5,6,21.75,6,21.75,4.5,21.5,4.5],
"synthPos": [0.0, 0.0],
"jazzPos": [0.0, -1.5],
"speed": 2.0
}
],
"mplatforms": [
{
"pos": [ 8.0, 6.5, 11.0, 6.5, 11.0, 7.0 ,8.0,7.0],
"nodes": [0.0, 0.0, 3.0, 0.0],
"speed": 1.0
},
{
"pos": [ 23, 0.5, 26, 0.5, 26, 0 ,23,0],
"nodes": [0.0, 0.0, 6.0, 0.0, 6, 4.5, 6.0, 0.0],
"speed": 1.0
}
],
"genre_gravity": {
Expand Down
33 changes: 33 additions & 0 deletions assets/enemies/bearIdle.atlas
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
bearIdle.png
size: 1000, 205
format: RGBA8888
filter: Linear,Linear
repeat: none
bearIdle
rotate: false
xy: 0, 0
size: 250, 205
orig: 250, 205
offset: 0, 0
index: 0
bearIdle
rotate: false
xy: 250, 0
size: 250, 205
orig: 250, 205
offset: 0, 0
index: 1
bearIdle
rotate: false
xy: 500, 0
size: 250, 205
orig: 250, 205
offset: 0, 0
index: 2
bearIdle
rotate: false
xy: 750, 0
size: 250, 205
orig: 250, 205
offset: 0, 0
index: 3
Binary file added assets/enemies/bearIdle.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/music/jazz1.ogg
View file
Binary file not shown.
Binary file added assets/music/jazz_technical.ogg
View file
Binary file not shown.
Binary file removed assets/music/synth1.ogg
View file
Binary file not shown.
Binary file added assets/music/synth_technical.ogg
View file
Binary file not shown.
26 changes: 26 additions & 0 deletions assets/player/jazzIdle.atlas
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
jazzIdle.png
size: 120, 477
format: RGBA8888
filter: Linear,Linear
repeat: none
jazzIdle
rotate: false
xy: 0, 0
size: 120, 159
orig: 120, 159
offset: 0, 0
index: 0
jazzIdle
rotate: false
xy: 0, 159
size: 120, 159
orig: 120, 159
offset: 0, 0
index: 1
jazzIdle
rotate: false
xy: 0, 318
size: 120, 159
orig: 120, 159
offset: 0, 0
index: 2
Binary file added assets/player/jazzIdle.png
View file
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 754ed95

Please sign in to comment.