Skip to content

Commit

Permalink
Story Mode, update collision layers and masks (#607)
Browse files Browse the repository at this point in the history
  • Loading branch information
duianto authored Aug 6, 2022
1 parent cea778c commit f86dd9f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions scenes/levels/story_mode/StoryMode.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ anims/slide = SubResource( 14 )
z_index = -1
tile_set = ExtResource( 6 )
collision_layer = 2
collision_mask = 0
format = 1
tile_data = PoolIntArray( -2293757, 0, 0, -2293756, 0, 0, -2293755, 0, 0, -2228221, 0, 0, -2228220, 0, 0, -2228219, 0, 0, -2228218, 0, 0, -2228217, 0, 0, -2162684, 0, 0, -2162683, 1, 0, -2162682, 1, 0, -2162681, 0, 0, -2162680, 0, 0, -2097148, 0, 0, -2097147, 0, 0, -2097146, 1, 0, -2097145, 1, 0, -2097144, 0, 0, -2097143, 0, 0, -2031611, 0, 0, -2031610, 1, 0, -2031609, 1, 0, -2031608, 1, 0, -2031607, 0, 0, -1966075, 0, 0, -1966074, 1, 0, -1966073, 1, 0, -1966072, 0, 0, -1966071, 0, 0, -1900540, 0, 0, -1900539, 0, 0, -1900538, 1, 0, -1900537, 1, 0, -1900536, 0, 0, -1835004, 0, 0, -1835003, 1, 0, -1835002, 1, 0, -1835001, 0, 0, -1835000, 0, 0, -1769470, 0, 0, -1769469, 0, 0, -1769468, 1, 0, -1769467, 1, 0, -1769466, 0, 0, -1703934, 0, 0, -1703933, 0, 0, -1703932, 0, 0, -1703931, 0, 0, -1638399, 0, 0, -1638398, 0, 0, -1638397, 1, 0, -1638396, 0, 0, -1572864, 0, 0, -1572863, 1, 0, -1572862, 1, 0, -1572861, 1, 0, -1572860, 0, 0, -1441793, 0, 0, -1507328, 1, 0, -1507327, 1, 0, -1507326, 1, 0, -1507325, 0, 0, -1376258, 0, 0, -1376257, 1, 0, -1441792, 1, 0, -1441791, 1, 0, -1441790, 0, 0, -1310735, 0, 0, -1310734, 0, 0, -1310733, 0, 0, -1310732, 0, 0, -1310731, 0, 0, -1310730, 0, 0, -1310729, 0, 0, -1310728, 0, 0, -1310727, 0, 0, -1310726, 0, 0, -1310725, 0, 0, -1310724, 0, 0, -1310723, 0, 0, -1310722, 0, 0, -1310721, 1, 0, -1376256, 1, 0, -1376255, 1, 0, -1376254, 0, 0, -1245199, 0, 0, -1245198, 1, 0, -1245197, 1, 0, -1245196, 1, 0, -1245195, 1, 0, -1245194, 1, 0, -1245193, 1, 0, -1245192, 1, 0, -1245191, 1, 0, -1245190, 1, 0, -1245189, 1, 0, -1245188, 1, 0, -1245187, 1, 0, -1245186, 0, 0, -1245185, 1, 0, -1310720, 1, 0, -1310719, 0, 0, -1179663, 0, 0, -1179662, 1, 0, -1179661, 1, 0, -1179660, 1, 0, -1179659, 1, 0, -1179658, 1, 0, -1179657, 1, 0, -1179656, 1, 0, -1179655, 1, 0, -1179654, 1, 0, -1179653, 1, 0, -1179652, 1, 0, -1179651, 1, 0, -1179650, 0, 0, -1179649, 1, 0, -1245184, 1, 0, -1245183, 0, 0, -1114127, 0, 0, -1114126, 1, 0, -1114125, 1, 0, -1114124, 1, 0, -1114123, 1, 0, -1114122, 1, 0, -1114121, 1, 0, -1114120, 1, 0, -1114119, 1, 0, -1114118, 1, 0, -1114117, 1, 0, -1114116, 1, 0, -1114115, 1, 0, -1114114, 1, 0, -1114113, 1, 0, -1179648, 1, 0, -1179647, 1, 0, -1179646, 0, 0, -1179645, 0, 0, -1179644, 0, 0, -1179643, 0, 0, -1179642, 0, 0, -1179641, 0, 0, -1179640, 0, 0, -1179639, 0, 0, -1179638, 0, 0, -1179637, 0, 0, -1179636, 0, 0, -1179635, 0, 0, -1179634, 0, 0, -1048591, 0, 0, -1048590, 1, 0, -1048589, 1, 0, -1048588, 1, 0, -1048587, 1, 0, -1048586, 1, 0, -1048585, 1, 0, -1048584, 1, 0, -1048583, 1, 0, -1048582, 1, 0, -1048581, 1, 0, -1048580, 1, 0, -1048579, 1, 0, -1048578, 1, 0, -1048577, 1, 0, -1114112, 1, 0, -1114111, 1, 0, -1114110, 1, 0, -1114109, 1, 0, -1114108, 1, 0, -1114107, 1, 0, -1114106, 1, 0, -1114105, 1, 0, -1114104, 1, 0, -1114103, 1, 0, -1114102, 1, 0, -1114101, 1, 0, -1114100, 1, 0, -1114099, 1, 0, -1114098, 0, 0, -1114097, 0, 0, -983055, 0, 0, -983054, 1, 0, -983053, 1, 0, -983052, 1, 0, -983051, 1, 0, -983050, 1, 0, -983049, 1, 0, -983048, 1, 0, -983047, 1, 0, -983046, 1, 0, -983045, 1, 0, -983044, 1, 0, -983043, 1, 0, -983042, 1, 0, -983041, 1, 0, -1048576, 1, 0, -1048575, 1, 0, -1048574, 1, 0, -1048573, 1, 0, -1048572, 1, 0, -1048571, 1, 0, -1048570, 1, 0, -1048569, 1, 0, -1048568, 1, 0, -1048567, 1, 0, -1048566, 1, 0, -1048565, 1, 0, -1048564, 1, 0, -1048563, 1, 0, -1048562, 1, 0, -1048561, 0, 0, -1048560, 0, 0, -917519, 0, 0, -917518, 0, 0, -917517, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 1, 0, -983040, 1, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 1, 0, -983030, 1, 0, -983029, 1, 0, -983028, 1, 0, -983027, 1, 0, -983026, 1, 0, -983025, 1, 0, -983024, 0, 0, -851970, 0, 0, -851969, 1, 0, -917504, 1, 0, -917503, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 1, 0, -917492, 1, 0, -917491, 1, 0, -917490, 1, 0, -917489, 1, 0, -917488, 0, 0, -917483, 0, 0, -917482, 0, 0, -917481, 0, 0, -917480, 0, 0, -917479, 0, 0, -917478, 0, 0, -917477, 0, 0, -917476, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 1, 0, -851968, 1, 0, -851967, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 1, 0, -851955, 1, 0, -851954, 1, 0, -851953, 1, 0, -851952, 0, 0, -851951, 0, 0, -851948, 0, 0, -851947, 0, 0, -851946, 1, 0, -851945, 1, 0, -851944, 1, 0, -851943, 1, 0, -851942, 1, 0, -851941, 1, 0, -851940, 0, 0, -720899, 0, 0, -720898, 1, 0, -720897, 1, 0, -786432, 1, 0, -786431, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 1, 0, -786418, 1, 0, -786417, 1, 0, -786416, 1, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 1, 0, -786410, 1, 0, -786409, 1, 0, -786408, 1, 0, -786407, 1, 0, -786406, 1, 0, -786405, 1, 0, -786404, 0, 0, -655363, 0, 0, -655362, 1, 0, -655361, 1, 0, -720896, 1, 0, -720895, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 1, 0, -720880, 1, 0, -720879, 1, 0, -720878, 1, 0, -720877, 1, 0, -720876, 0, 0, -720875, 1, 0, -720874, 1, 0, -720873, 1, 0, -720872, 1, 0, -720871, 1, 0, -720870, 1, 0, -720869, 1, 0, -720868, 0, 0, -720867, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 1, 0, -655360, 1, 0, -655359, 0, 0, -655346, 0, 0, -655345, 0, 0, -655344, 0, 0, -655343, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 1, 0, -655338, 1, 0, -655337, 1, 0, -655336, 1, 0, -655335, 1, 0, -655334, 1, 0, -655333, 1, 0, -655332, 0, 0, -655331, 0, 0, -524290, 0, 0, -524289, 1, 0, -589824, 1, 0, -589823, 0, 0, -589804, 0, 0, -589803, 0, 0, -589802, 1, 0, -589801, 1, 0, -589800, 1, 0, -589799, 1, 0, -589798, 1, 0, -589797, 1, 0, -589796, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 1, 0, -524288, 1, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524267, 0, 0, -524266, 0, 0, -524265, 0, 0, -524264, 0, 0, -524263, 0, 0, -524262, 0, 0, -524261, 0, 0, -524260, 0, 0, -393222, 0, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 0, 0, -327686, 0, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 0, 0, -262150, 0, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 1, 0, -327680, 1, 0, -327679, 1, 0, -327678, 1, 0, -327677, 0, 0, -327676, 0, 0, -327675, 0, 0, -327674, 0, 0, -196614, 0, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 1, 0, -262144, 1, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 0, 0, -131078, 0, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 0, 0, -65542, 0, 0, -65541, 1, 0, -65540, 1, 0, -65539, 1, 0, -65538, 1, 0, -65537, 1, 0, -131072, 1, 0, -131071, 1, 0, -131070, 1, 0, -131069, 1, 0, -131068, 1, 0, -131067, 1, 0, -131066, 0, 0, -6, 0, 0, -5, 1, 0, -4, 1, 0, -3, 1, 0, -2, 1, 0, -1, 1, 0, -65536, 1, 0, -65535, 1, 0, -65534, 1, 0, -65533, 1, 0, -65532, 1, 0, -65531, 1, 0, -65530, 0, 0, 65530, 0, 0, 65531, 1, 0, 65532, 1, 0, 65533, 1, 0, 65534, 1, 0, 65535, 1, 0, 0, 1, 0, 1, 1, 0, 2, 1, 0, 3, 1, 0, 4, 1, 0, 5, 1, 0, 6, 0, 0, 131066, 0, 0, 131067, 1, 0, 131068, 1, 0, 131069, 1, 0, 131070, 1, 0, 131071, 1, 0, 65536, 1, 0, 65537, 1, 0, 65538, 1, 0, 65539, 1, 0, 65540, 1, 0, 65541, 1, 0, 65542, 0, 0, 196602, 0, 0, 196603, 0, 0, 196604, 0, 0, 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 131074, 0, 0, 131075, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0 )

Expand Down
1 change: 1 addition & 0 deletions scenes/levels/story_mode/character/Character.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ radius = 158.382

[node name="Character" type="Area2D"]
collision_layer = 0
collision_mask = 64
script = ExtResource( 1 )

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
Expand Down
1 change: 1 addition & 0 deletions scenes/levels/story_mode/item/GroundItem.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ radius = 60.0083

[node name="GroundItem" type="Area2D"]
collision_layer = 0
collision_mask = 64
script = ExtResource( 2 )

[node name="Sprite" type="Sprite" parent="."]
Expand Down
2 changes: 2 additions & 0 deletions scenes/levels/story_mode/player/TopDownPlayer.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ radius = 4.0
height = 24.0

[node name="TopDownPlayer" type="KinematicBody2D"]
collision_layer = 64
collision_mask = 2
script = ExtResource( 3 )
__meta__ = {
"_edit_group_": true
Expand Down

1 comment on commit f86dd9f

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.