Commit dec66dea authored by Julia Santos's avatar Julia Santos

Edited some hitboxes, added sprites

parent d57d347d
source_md5="f05b2fd28a99c338b600c3da4d2f8fed"
dest_md5="17b2b269943b7abdd12b2b1eb697055d"
source_md5="1cb5754e3b215fa2c5adac56da0f0f39"
dest_md5="5693e81d373d11a6f561f613c58a7495"
source_md5="eaee4e24c06d213d29aa086d274394e8"
dest_md5="70d4e175c7525a26c58df50208898c65"
source_md5="90b6f758c52410f5320a6a3164fb21a0"
dest_md5="a7685a796bb1ff1b5b2913e092002b15"
source_md5="20e00dc985d8ede3c35a2ed67417ea41"
dest_md5="af276f10c1af9266e2cb221e0525b10b"
source_md5="9d1e0b3390b4b06dcba2548d59c12822"
dest_md5="6e39d7d3fa33e53ff880589d7e115431"
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[ext_resource path="res://Item.gd" type="Script" id=2] [ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/Ladder.png" type="Texture" id=3] [ext_resource path="res://assets/Thesis Clickables/Ladder.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/Toolbox.png" type="Texture" id=4] [ext_resource path="res://assets/Thesis Clickables/Toolbox.png" type="Texture" id=4]
[ext_resource path="res://assets/Thesis Clickables/Neighbor.png" type="Texture" id=5] [ext_resource path="res://assets/Thesis Clickables/brodie1.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=6] [ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=6]
[ext_resource path="res://Scripts/Neighbor.gd" type="Script" id=7] [ext_resource path="res://Scripts/Neighbor.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8] [ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8]
...@@ -39,7 +39,7 @@ flags = 4 ...@@ -39,7 +39,7 @@ flags = 4
load_path = "res://.import/front door.png-58881902b918df4a261fe60f02da2bc4.stex" load_path = "res://.import/front door.png-58881902b918df4a261fe60f02da2bc4.stex"
[sub_resource type="RectangleShape2D" id=8] [sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 13.3036, 29.613 ) extents = Vector2( 13.3036, 32.1643 )
[sub_resource type="RectangleShape2D" id=9] [sub_resource type="RectangleShape2D" id=9]
extents = Vector2( 8.10034, 6.2543 ) extents = Vector2( 8.10034, 6.2543 )
...@@ -238,16 +238,21 @@ __meta__ = { ...@@ -238,16 +238,21 @@ __meta__ = {
interactable = true interactable = true
flavorText = "Brodie: Um... What are you doing?" flavorText = "Brodie: Um... What are you doing?"
[node name="Hitbox" type="CollisionShape2D" parent="Neighbor"] [node name="Hitbox" type="CollisionPolygon2D" parent="Neighbor"]
position = Vector2( -0.433167, 2.2196 ) position = Vector2( 0.457642, -0.635071 )
scale = Vector2( 5, 5 ) scale = Vector2( 0.28, 0.28 )
shape = SubResource( 8 ) polygon = PoolVector2Array( 90, -509.8, 90, -503.7, 105, -461.7, 105, -447.7, 93.6, -406, 89.2, -406, 53.8, -369.2, 149, -337.2, 149, -329.9, 211, -180, 211, -175, 226.7, -75, 219.7, -75, 200.7, -43, 195.6, -43, 157.4, -21.7, 171, -10.8, 171, 7.09998, 165.2, 20.3, 190, 35.4, 190, 69, 193.9, 69, 228, 82.1, 228, 115.3, 263, 119, 263, 127.2, 270.9, 148.6, 303, 146.2, 303, 154.9, 311.3, 166.7, 348, 157, 348, 167.3, 368.8, 191.3, 363.4, 203, 361.1, 203, 336.1, 237, 331, 237, 270.1, 264, 263.8, 264, 192, 269.9, 192, 265.5, 160, 255.8, 176.6, 460.4, 251, 529.6, 251, 536, 253.5, 591, 241.6, 591, 100.6, 600, 74, 600, 74, 597.5, 11, 578.4, 11, 569, -9.20001, 368.5, -23.6, 585, -32.9, 585, -121.2, 600, -139.4, 600, -275, 590.3, -275, 576.7, -261.6, 528, -256.6, 528, -204.4, 485.8, -194, 458.3, -194, 447.9, -186.2, -37.3, -234, -41.9, -234, -47, -266, -71, -266, -76, -281, -110.9, -281, -143.8, -275.5, -177, -272.5, -177, -200.5, -339, -194.6, -339, -108.7, -368.7, -145, -397.1, -145, -404.5, -156.4, -492, -148.6, -492, -107.6, -540, -102.9, -540, -31, -567, -31, -578.1 )
[node name="Sprite" type="Sprite" parent="Neighbor/Hitbox"] [node name="Sprite" type="Sprite" parent="Neighbor/Hitbox"]
position = Vector2( 0.178162, -0.570938 )
scale = Vector2( 0.138713, 0.295602 )
texture = ExtResource( 5 ) texture = ExtResource( 5 )
[node name="h" type="CollisionShape2D" parent="Neighbor"]
visible = false
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 8 )
disabled = true
[node name="Dialogue arrow" type="StaticBody2D" parent="."] [node name="Dialogue arrow" type="StaticBody2D" parent="."]
visible = false visible = false
position = Vector2( 353.534, -272.056 ) position = Vector2( 353.534, -272.056 )
......
[gd_scene load_steps=41 format=2] [gd_scene load_steps=41 format=2]
[ext_resource path="res://Main rooms/Test room 1.tscn" type="PackedScene" id=1] [ext_resource path="res://Main rooms/Test room 1.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/189066690_228150108704696_3850052974465333899_n.png" type="Texture" id=2] [ext_resource path="res://assets/Thesis Clickables/moxie1.png" type="Texture" id=2]
[ext_resource path="res://ItemList.gd" type="Script" id=3] [ext_resource path="res://ItemList.gd" type="Script" id=3]
[ext_resource path="res://Main.gd" type="Script" id=4] [ext_resource path="res://Main.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Button.gd" type="Script" id=5] [ext_resource path="res://Scripts/Button.gd" type="Script" id=5]
...@@ -157,7 +157,7 @@ __meta__ = { ...@@ -157,7 +157,7 @@ __meta__ = {
} }
[node name="Path2D" type="Path2D" parent="Moxie"] [node name="Path2D" type="Path2D" parent="Moxie"]
position = Vector2( 5.94604, 27.3518 ) position = Vector2( 8.88391, 53.6094 )
curve = ExtResource( 31 ) curve = ExtResource( 31 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
...@@ -174,7 +174,7 @@ script = ExtResource( 30 ) ...@@ -174,7 +174,7 @@ script = ExtResource( 30 )
[node name="Sprite" type="Sprite" parent="Moxie/Path2D/PathFollow2D"] [node name="Sprite" type="Sprite" parent="Moxie/Path2D/PathFollow2D"]
position = Vector2( -58.278, -40.2653 ) position = Vector2( -58.278, -40.2653 )
rotation = -0.28771 rotation = -0.28771
scale = Vector2( 0.349515, 0.349515 ) scale = Vector2( 0.3, 0.3 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="Camera2D" type="Camera2D" parent="Moxie/Path2D/PathFollow2D/Sprite"] [node name="Camera2D" type="Camera2D" parent="Moxie/Path2D/PathFollow2D/Sprite"]
...@@ -265,6 +265,12 @@ __meta__ = { ...@@ -265,6 +265,12 @@ __meta__ = {
visible = false visible = false
position = Vector2( 144.013, 197.335 ) position = Vector2( 144.013, 197.335 )
shape = SubResource( 4 ) shape = SubResource( 4 )
disabled = true
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="UI/To do"]
position = Vector2( 150.967, 149.796 )
scale = Vector2( 0.629082, 0.629082 )
polygon = PoolVector2Array( 143, -298.8, 143, -291.4, 145.7, -283, 162.7, -301, 204, -301, 204, -294.5, 262, -241, 262, 287, 255.3, 287, 234.7, 302, -261, 302, -261, 291, -262, 221.9, -262, -269, -260.6, -269, -201.7, -302, -178.8, -302, -153.1, -278, -134.5, -302, -106.5, -302, -81.2, -279, -72.3, -279, -61.3, -302, -54.2, -302, -19, -302, -19, -301.2, 4, -279, 6, -279, 18.5, -302, 57, -302, 57, -300.9, 78.3, -284.5, 95.1, -302, 135, -302 )
[node name="Inventory" type="ItemList" parent="UI"] [node name="Inventory" type="ItemList" parent="UI"]
margin_left = -201.0 margin_left = -201.0
......
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/brodie1.png-237ea56a37909490cd856d61d70939a6.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/brodie1.png"
dest_files=[ "res://.import/brodie1.png-237ea56a37909490cd856d61d70939a6.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/brodie2.png-4bea1a7e740f1463b2b70e590e9c0184.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/brodie2.png"
dest_files=[ "res://.import/brodie2.png-4bea1a7e740f1463b2b70e590e9c0184.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/brodie3.png-9ec4bde67ed78de32cb1dae0cfcf4a54.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/brodie3.png"
dest_files=[ "res://.import/brodie3.png-9ec4bde67ed78de32cb1dae0cfcf4a54.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/brodie4.png-c4b75d8e5887b0f05ec513583ecd1948.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/brodie4.png"
dest_files=[ "res://.import/brodie4.png-c4b75d8e5887b0f05ec513583ecd1948.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/moxie1.png-ada60c0df7f84a29a163f2c7abd6b8aa.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/moxie1.png"
dest_files=[ "res://.import/moxie1.png-ada60c0df7f84a29a163f2c7abd6b8aa.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/moxie2.png-34cb2c68d055457362efa6e3411f5ff4.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/moxie2.png"
dest_files=[ "res://.import/moxie2.png-34cb2c68d055457362efa6e3411f5ff4.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
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment