chsh
/
game
1
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

changed shape and size of npc collision boxes

master
as4s4hetic 3 years ago
parent
82a7d0cba1
commit
c21e713fcd
14 changed files with 84 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      Scenes/Player.tscn
  2. 9
      Sprites/alistair/Alistair-back.tscn
  3. 5
      Sprites/charlene/Charlene.tscn
  4. 5
      Sprites/eunsu/Eunsu.tscn
  5. 5
      Sprites/jame/James.tscn
  6. 5
      Sprites/joe/Joe.tscn
  7. BIN
      Sprites/joe/front.png
  8. 5
      Sprites/josep/Josep.tscn
  9. BIN
      Sprites/josep/left.png
  10. 35
      Sprites/josep/left.png.import
  11. 5
      Sprites/josha/Josh.tscn
  12. 5
      Sprites/richal/Richal.tscn
  13. 5
      Sprites/sak/Sak.tscn
  14. 6
      Story/Ch1S2.tscn

30
Scenes/Player.tscn
Unescape View File

@ -21,6 +21,11 @@ animations = [ { @@ -21,6 +21,11 @@ animations = [ {
"name": "MoveDown",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ],
"loop": true,
"name": "MoveUp",
"speed": 5.0
}, {
"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ],
"loop": true,
"name": "MoveLeft",
@ -31,14 +36,14 @@ animations = [ { @@ -31,14 +36,14 @@ animations = [ {
"name": "MoveRight",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ],
"frames": [ ExtResource( 3 ) ],
"loop": true,
"name": "MoveUp",
"name": "IdleRight",
"speed": 5.0
}, {
"frames": [ ExtResource( 4 ) ],
"frames": [ ExtResource( 2 ) ],
"loop": true,
"name": "IdleLeft",
"name": "IdleDown",
"speed": 5.0
}, {
"frames": [ ExtResource( 5 ) ],
@ -46,19 +51,15 @@ animations = [ { @@ -46,19 +51,15 @@ animations = [ {
"name": "IdleUp",
"speed": 5.0
}, {
"frames": [ ExtResource( 2 ) ],
"loop": true,
"name": "IdleDown",
"speed": 5.0
}, {
"frames": [ ExtResource( 3 ) ],
"frames": [ ExtResource( 4 ) ],
"loop": true,
"name": "IdleRight",
"name": "IdleLeft",
"speed": 5.0
} ]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 24, 7.5 )
[sub_resource type="CapsuleShape2D" id=4]
radius = 8.0
height = 32.0
[sub_resource type="CircleShape2D" id=3]
radius = 30.0
@ -75,7 +76,8 @@ playing = true @@ -75,7 +76,8 @@ playing = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( -4, 30.5 )
shape = SubResource( 1 )
rotation = 1.5708
shape = SubResource( 4 )
one_way_collision = true
[node name="RayCast2D" type="RayCast2D" parent="."]

9
Sprites/alistair/Alistair-back.tscn
Unescape View File

@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
[ext_resource path="res://Sprites/alistair/back.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=2]
radius = 25.0
height = 0.0
[sub_resource type="CapsuleShape2D" id=1]
radius = 12.0
height = 25.0
[node name="Alistair" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
shape = SubResource( 2 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/charlene/Charlene.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/charlene/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Charlene" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/eunsu/Eunsu.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/eunsu/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Eunsu" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/jame/James.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/jame/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="James" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/joe/Joe.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/joe/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Joe" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

BIN
Sprites/joe/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

5
Sprites/josep/Josep.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/josep/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Josep" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

BIN
Sprites/josep/left.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

35
Sprites/josep/left.png.import
Unescape View File

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/left.png-b030edeb4b7709d11a1c7286008597c7.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/josep/left.png"
dest_files=[ "res://.import/left.png-b030edeb4b7709d11a1c7286008597c7.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

5
Sprites/josha/Josh.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/josha/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Josh" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/richal/Richal.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/richal/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Richal" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

5
Sprites/sak/Sak.tscn
Unescape View File

@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
[ext_resource path="res://Sprites/sak/front.png" type="Texture" id=1]
[sub_resource type="CapsuleShape2D" id=1]
radius = 25.0
height = 0.0
radius = 12.0
height = 25.0
[node name="Sak" type="StaticBody2D"]
@ -13,4 +13,5 @@ texture = ExtResource( 1 ) @@ -13,4 +13,5 @@ texture = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 35 )
rotation = 1.5708
shape = SubResource( 1 )

6
Story/Ch1S2.tscn
Unescape View File

@ -139,7 +139,7 @@ scale = Vector2( 1.00493, 0.995532 ) @@ -139,7 +139,7 @@ scale = Vector2( 1.00493, 0.995532 )
z_index = 1
[node name="Richal" parent="FG/Rooms/Living/NPCs" instance=ExtResource( 11 )]
position = Vector2( 600, 180 )
position = Vector2( 600, 188.036 )
[node name="Node2D" parent="FG/Rooms/Living/NPCs/Richal" instance=ExtResource( 13 )]
position = Vector2( 0, 4 )
@ -180,7 +180,7 @@ timeline = "timeline-1642568183.json" @@ -180,7 +180,7 @@ timeline = "timeline-1642568183.json"
position = Vector2( 0, 18 )
[node name="Alistair" parent="FG/Rooms/Living/NPCs" instance=ExtResource( 3 )]
position = Vector2( 165, 150 )
position = Vector2( 165, 158.036 )
[node name="Node2D" parent="FG/Rooms/Living/NPCs/Alistair" instance=ExtResource( 13 )]
position = Vector2( 0, 4 )
@ -281,6 +281,8 @@ tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 @@ -281,6 +281,8 @@ tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0
position = Vector2( -330, 1068 )
[node name="BathTop" type="TileMap" parent="FG/Rooms"]
cell_tile_origin = 2
cell_y_sort = true
format = 1
[node name="Joe" parent="FG/Rooms/BathTop" instance=ExtResource( 26 )]

Write Preview
Loading…
Cancel
Save