evan/ludum-dare-50
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48 from Ewpratten/rsninja/fixes

Browse Source 
Rsninja/fixes
This commit is contained in:
Evan Pratten 2022-04-04 00:50:26 -04:00 committed by GitHub
commit 4f8f03a3dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 166 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/dist/assets/env/env_cars/env_carBlue.json → game/dist/assets/env/env_car/env_carBlue.json vendored
View File

@ -1,10 +1,10 @@
{ {
"name": "env_carBlue", "name": "env_carBlue",
"bottom_texture": { "bottom_texture": {
"file_path": "assets/env/env_cars/env_carWheels.png" "file_path": "assets/env/env_car/env_carWheels.png"
}, },
"top_texture": { "top_texture": {
"file_path": "assets/env/env_cars/env_carBlue.png" "file_path": "assets/env/env_car/env_carBlue.png"
}, },
"footprint": [ "footprint": [
{ {
@ -18,7 +18,7 @@
] ]
} }
], ],
"visualization_radius": 220.0, "visualization_radius": 220,
"physics_colliders": [ "physics_colliders": [
{ {
"position": [ "position": [
@ -61,5 +61,5 @@
] ]
} }
], ],
"temperature": 7.0 "temperature": 7
} }

0
game/dist/assets/env/env_cars/env_carBlue.png → game/dist/assets/env/env_car/env_carBlue.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

4
game/dist/assets/env/env_cars/env_carGrey.json → game/dist/assets/env/env_car/env_carGrey.json vendored
View File

@ -1,10 +1,10 @@
{ {
"name": "env_carGrey", "name": "env_carGrey",
"bottom_texture": { "bottom_texture": {
"file_path": "assets/env/env_cars/env_carWheels.png" "file_path": "assets/env/env_car/env_carWheels.png"
}, },
"top_texture": { "top_texture": {
"file_path": "assets/env/env_cars/env_carGrey.png" "file_path": "assets/env/env_car/env_carGrey.png"
}, },
"footprint": [ "footprint": [
{ {

0
game/dist/assets/env/env_cars/env_carGrey.png → game/dist/assets/env/env_car/env_carGrey.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

4
game/dist/assets/env/env_cars/env_carOrange.json → game/dist/assets/env/env_car/env_carOrange.json vendored
View File

@ -1,10 +1,10 @@
{ {
"name": "env_carOrange", "name": "env_carOrange",
"bottom_texture": { "bottom_texture": {
"file_path": "assets/env/env_cars/env_carWheels.png" "file_path": "assets/env/env_car/env_carWheels.png"
}, },
"top_texture": { "top_texture": {
"file_path": "assets/env/env_cars/env_carOrange.png" "file_path": "assets/env/env_car/env_carOrange.png"
}, },
"footprint": [ "footprint": [
{ {

0
game/dist/assets/env/env_cars/env_carOrange.png → game/dist/assets/env/env_car/env_carOrange.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
game/dist/assets/env/env_cars/env_carWheels.png → game/dist/assets/env/env_car/env_carWheels.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

36
game/dist/assets/env/env_market/env_marketPurple.json vendored
View File

@ -22,21 +22,21 @@
"physics_colliders": [ "physics_colliders": [
{ {
"position": [ "position": [
44, 50,
246 -246
], ],
"size": [ "size": [
60, 140,
20 20
] ]
}, },
{ {
"position": [ "position": [
157, -157,
246 -246
], ],
"size": [ "size": [
200, 190,
20 20
] ]
}, },
@ -52,22 +52,12 @@
}, },
{ {
"position": [ "position": [
-103, -100,
-62 -50
], ],
"size": [ "size": [
95, 77,
35 370
]
},
{
"position": [
-188,
-216
],
"size": [
396,
77
] ]
}, },
{ {
@ -76,13 +66,13 @@
-51 -51
], ],
"size": [ "size": [
340, 17,
17 340
] ]
}, },
{ {
"position": [ "position": [
44, 74,
-10 -10
], ],
"size": [ "size": [

36
game/dist/assets/env/env_market/env_marketRed.json vendored
View File

@ -22,21 +22,21 @@
"physics_colliders": [ "physics_colliders": [
{ {
"position": [ "position": [
44, 50,
246 -246
], ],
"size": [ "size": [
60, 140,
20 20
] ]
}, },
{ {
"position": [ "position": [
157, -157,
246 -246
], ],
"size": [ "size": [
200, 190,
20 20
] ]
}, },
@ -52,22 +52,12 @@
}, },
{ {
"position": [ "position": [
-103, -100,
-62 -50
], ],
"size": [ "size": [
95, 77,
35 370
]
},
{
"position": [
-188,
-216
],
"size": [
396,
77
] ]
}, },
{ {
@ -76,13 +66,13 @@
-51 -51
], ],
"size": [ "size": [
340, 17,
17 340
] ]
}, },
{ {
"position": [ "position": [
44, 74,
-10 -10
], ],
"size": [ "size": [

36
game/dist/assets/env/env_market/env_marketYellow.json vendored
View File

@ -22,21 +22,21 @@
"physics_colliders": [ "physics_colliders": [
{ {
"position": [ "position": [
44, 50,
246 -246
], ],
"size": [ "size": [
60, 140,
20 20
] ]
}, },
{ {
"position": [ "position": [
157, -157,
246 -246
], ],
"size": [ "size": [
200, 190,
20 20
] ]
}, },
@ -52,22 +52,12 @@
}, },
{ {
"position": [ "position": [
-103, -100,
-62 -50
], ],
"size": [ "size": [
95, 77,
35 370
]
},
{
"position": [
-188,
-216
],
"size": [
396,
77
] ]
}, },
{ {
@ -76,13 +66,13 @@
-51 -51
], ],
"size": [ "size": [
340, 17,
17 340
] ]
}, },
{ {
"position": [ "position": [
44, 74,
-10 -10
], ],
"size": [ "size": [

2
game/dist/assets/env/env_person/env_person2.json vendored
View File

@ -4,7 +4,7 @@
"file_path": "assets/env/env_person/env_blank.png" "file_path": "assets/env/env_person/env_blank.png"
}, },
"top_texture": { "top_texture": {
"file_path": "assets/env/env_person/env_person1.png" "file_path": "assets/env/env_person/env_personSit1.png"
}, },
"footprint":[ "footprint":[
{ {

0
game/dist/assets/env/env_cars/env_tronkDark.json → game/dist/assets/env/env_tronk/env_tronkDark.json vendored
View File

0
game/dist/assets/env/env_cars/env_tronkDark.png → game/dist/assets/env/env_tronk/env_tronkDark.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
game/dist/assets/env/env_cars/env_tronkLight.json → game/dist/assets/env/env_tronk/env_tronkLight.json vendored
View File

0
game/dist/assets/env/env_cars/env_tronkLight.png → game/dist/assets/env/env_tronk/env_tronkLight.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
game/dist/assets/env/env_cars/env_tronkWheels.png → game/dist/assets/env/env_tronk/env_tronkWheels.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

117
game/dist/map_gameMap.objects.json vendored
View File

@ -1,31 +1,82 @@
[ [
{ {
"type": "env", "type": "env",
"name": "env_umbrella", "name": "env_market",
"variant": "Blue",
"position": [
5,
7
],
"rotation_degrees": 90
},
{
"type": "env",
"name": "env_umbrella",
"variant": "RedTowels",
"position": [
7,
7
],
"rotation_degrees": 180
},
{
"type": "env",
"name": "env_towel",
"variant": "Red", "variant": "Red",
"position": [ "position": [
6, 14,120
9 ],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Yellow",
"position": [
14,115
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Purple",
"position": [
14,110
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Red",
"position": [
20,105
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Yellow",
"position": [
20,96
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Yellow",
"position": [
19,46
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Purple",
"position": [
19,32
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Purple",
"position": [
20,76
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_market",
"variant": "Yellow",
"position": [
15,15
], ],
"rotation_degrees": 0 "rotation_degrees": 0
}, },
@ -34,17 +85,25 @@
"name": "env_chair", "name": "env_chair",
"variant": "Dark", "variant": "Dark",
"position": [ "position": [
4, 4,124
9
], ],
"rotation_degrees": -90 "rotation_degrees": 0
}, },
{ {
"type": "env", "type": "env",
"name": "env_market", "name": "env_chair",
"variant": "Red", "variant": "Dark",
"position": [ "position": [
14,14 6,124
],
"rotation_degrees": 0
},
{
"type": "env",
"name": "env_chair",
"variant": "Light",
"position": [
19,119
], ],
"rotation_degrees": 0 "rotation_degrees": 0
} }

32
game/dist/map_gameMap.tmx vendored
View File

@ -522,10 +522,10 @@
4,29,29,48,49,29,29,29,29,29,29,29,29,50,51,29,29,29,29,29,50,51,29,29,29,59,52,52,52,52,52,52, 4,29,29,48,49,29,29,29,29,29,29,29,29,50,51,29,29,29,29,29,50,51,29,29,29,59,52,52,52,52,52,52,
4,29,29,29,29,29,50,41,51,29,29,29,29,48,49,50,51,50,41,51,48,49,50,51,50,59,52,52,52,52,52,52, 4,29,29,29,29,29,50,41,51,29,29,29,29,48,49,50,51,50,41,51,48,49,50,51,50,59,52,52,52,52,52,52,
4,29,29,29,50,51,44,24,40,51,29,29,29,29,50,42,40,42,24,40,41,41,42,43,44,59,52,52,52,52,52,52, 4,29,29,29,50,51,44,24,40,51,29,29,29,29,50,42,40,42,24,40,41,41,42,43,44,59,52,52,52,52,52,52,
4,29,29,29,48,49,44,24,24,40,41,41,51,50,42,24,24,24,24,24,24,24,24,40,42,59,52,52,52,52,52,52, 4,29,29,29,48,49,44,24,24,40,41,41,51,50,42,24,19,20,21,24,24,24,24,40,42,59,52,52,52,52,52,52,
4,29,29,29,29,29,44,24,24,24,24,24,40,42,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 4,29,29,29,29,29,44,24,24,24,24,24,40,42,24,24,17,9,18,24,24,24,24,24,24,59,52,52,52,52,52,52,
2,7,29,29,29,29,44,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 2,7,29,29,29,29,44,24,24,24,24,24,24,24,24,24,17,9,18,24,24,24,24,24,24,59,52,52,52,52,52,52,
5,1,29,29,29,29,48,47,24,24,24,19,20,20,20,20,20,20,20,20,20,20,20,20,20,59,52,52,52,52,52,52, 5,1,29,29,29,29,48,47,24,24,24,19,20,20,20,20,23,9,22,20,20,20,20,20,20,59,52,52,52,52,52,52,
4,29,29,29,29,29,29,44,24,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,9,59,52,52,52,52,52,52, 4,29,29,29,29,29,29,44,24,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,9,59,52,52,52,52,52,52,
2,7,29,29,29,29,50,42,24,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,9,59,52,52,52,52,52,52, 2,7,29,29,29,29,50,42,24,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,9,59,52,52,52,52,52,52,
68,2,3,3,7,29,48,46,54,54,54,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52, 68,2,3,3,7,29,48,46,54,54,54,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52,
@ -617,20 +617,20 @@
68,68,4,29,29,29,29,50,41,41,42,24,24,24,24,24,24,24,24,24,24,17,9,18,24,59,52,52,52,52,52,52, 68,68,4,29,29,29,29,50,41,41,42,24,24,24,24,24,24,24,24,24,24,17,9,18,24,59,52,52,52,52,52,52,
68,68,4,29,29,29,29,48,47,24,19,20,20,20,20,20,20,20,20,20,20,23,9,18,24,59,52,52,52,52,52,52, 68,68,4,29,29,29,29,48,47,24,19,20,20,20,20,20,20,20,20,20,20,23,9,18,24,59,52,52,52,52,52,52,
68,68,2,7,29,29,50,41,42,24,17,9,9,9,9,9,9,9,9,9,9,9,9,18,24,59,52,52,52,52,52,52, 68,68,2,7,29,29,50,41,42,24,17,9,9,9,9,9,9,9,9,9,9,9,9,18,24,59,52,52,52,52,52,52,
68,68,5,1,29,29,48,47,24,24,17,9,25,15,15,15,15,15,15,15,15,15,15,16,24,59,52,52,52,52,52,52, 68,68,5,1,29,29,48,47,24,24,17,9,25,15,26,9,25,15,15,15,15,15,15,16,24,59,52,52,52,52,52,52,
68,68,4,29,29,29,29,44,24,24,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 68,68,4,29,29,29,29,44,24,24,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
68,5,1,29,29,29,50,42,24,24,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 68,5,1,29,29,29,50,42,24,24,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
68,4,29,29,29,29,48,47,24,24,17,9,22,20,20,20,20,20,20,20,20,20,20,21,24,59,52,52,52,52,52,52, 68,4,29,29,29,29,48,47,24,24,17,9,22,20,23,9,22,20,20,20,20,20,20,21,24,59,52,52,52,52,52,52,
68,4,29,29,29,29,29,44,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,18,24,59,52,52,52,52,52,52, 68,4,29,29,29,29,29,44,24,24,17,9,9,9,9,9,9,9,9,9,9,9,9,18,24,59,52,52,52,52,52,52,
68,4,29,29,29,29,29,48,47,24,17,9,25,15,15,15,15,15,15,15,15,15,15,16,24,59,52,52,52,52,52,52, 68,4,29,29,29,29,29,48,47,24,17,9,25,15,26,9,25,15,15,15,15,15,15,16,24,59,52,52,52,52,52,52,
68,4,29,29,29,29,29,29,44,24,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 68,4,29,29,29,29,29,29,44,24,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
5,1,29,29,29,29,29,29,44,24,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 5,1,29,29,29,29,29,29,44,24,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
4,29,29,29,29,29,29,29,44,24,17,9,22,20,20,20,20,21,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 4,29,29,29,29,29,29,29,44,24,17,9,22,20,23,9,22,21,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
4,29,29,29,29,29,29,29,44,24,17,9,9,9,9,9,9,18,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 4,29,29,29,29,29,29,29,44,24,17,9,9,9,9,9,9,18,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
4,29,29,29,29,29,29,29,48,47,17,9,25,15,15,15,15,16,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 4,29,29,29,29,29,29,29,48,47,17,9,25,15,26,9,25,16,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
2,3,7,29,29,29,29,29,29,44,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 2,3,7,29,29,29,29,29,29,44,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
5,6,1,29,29,29,29,29,29,44,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 5,6,1,29,29,29,29,29,29,44,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
4,29,29,29,29,29,29,29,29,48,17,9,18,24,24,24,24,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52, 4,29,29,29,29,29,29,29,29,48,17,9,18,24,17,9,18,24,24,24,24,24,24,24,24,59,52,52,52,52,52,52,
2,7,29,29,29,29,29,29,29,29,14,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52, 2,7,29,29,29,29,29,29,29,29,14,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52,
5,1,29,29,29,29,29,29,29,50,24,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52, 5,1,29,29,29,29,29,29,29,50,24,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52,
4,29,29,29,29,29,29,29,29,44,24,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52, 4,29,29,29,29,29,29,29,29,44,24,55,55,55,55,55,55,55,55,55,55,55,55,55,55,55,52,52,52,52,52,52,

9
game/game_logic/src/rendering/utilities/map_render.rs
View File

@ -503,6 +503,15 @@ impl MapRenderer {
draw_handle.draw_pixel(x as i32, y as i32, Color::BLUE); draw_handle.draw_pixel(x as i32, y as i32, Color::BLUE);
} }
} }
// for collider in &self.world_objects.world_space_colliders {
// draw_handle.draw_rectangle_lines(
// (collider.position.x-collider.size.x/2.0) as i32,
// -(collider.position.y+collider.size.y/2.0) as i32,
// collider.size.x as i32,
// collider.size.y as i32,
// Color::BLUEVIOLET,
// );
// }
} }
} }
} }

10
game/game_logic/src/scenes/player_interaction.rs
View File

@ -315,9 +315,9 @@ impl PlayableScene {
for i in &self.world_colliders { for i in &self.world_colliders {
if player.position.x - player_size <= i.position.x + i.size.x / 2.0 if player.position.x - player_size <= i.position.x + i.size.x / 2.0
&& player.position.x + player_size >= i.position.x + i.size.x / 2.0 && player.position.x + player_size >= i.position.x - i.size.x / 2.0
&& player.position.y - player_size <= i.position.y + i.size.y / 2.0 && player.position.y - player_size <= i.position.y + i.size.y / 2.0
&& player.position.y + player_size >= i.position.y + i.size.y / 2.0 && player.position.y + player_size >= i.position.y - i.size.y / 2.0
{ {
// if player.velocity.x < 0.0 { // if player.velocity.x < 0.0 {
// player.position.x = i.position.x + i.size.x / 2.0 + player_size; // player.position.x = i.position.x + i.size.x / 2.0 + player_size;
@ -346,9 +346,9 @@ impl PlayableScene {
for i in &self.world_colliders { for i in &self.world_colliders {
if player.position.x - player_size <= i.position.x + i.size.x / 2.0 if player.position.x - player_size <= i.position.x + i.size.x / 2.0
&& player.position.x + player_size >= i.position.x + i.size.x / 2.0 && player.position.x + player_size >= i.position.x - i.size.x / 2.0
&& player.position.y - player_size <= i.position.y + i.size.y / 2.0 && player.position.y - player_size <= i.position.y + i.size.y / 2.0
&& player.position.y + player_size >= i.position.y + i.size.y / 2.0 && player.position.y + player_size >= i.position.y - i.size.y / 2.0
{ {
// if player.velocity.y < 0.0 { // if player.velocity.y < 0.0 {
// player.position.y = i.position.y + i.size.y / 2.0 + player_size; // player.position.y = i.position.y + i.size.y / 2.0 + player_size;