Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added new items for the chemical cabinet #3

Merged
merged 1 commit into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/assets/items/battery.tscn
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=10 format=2]

[ext_resource path="res://assets/items/item.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/items/textures/battery.png" type="Texture" id=2]
[ext_resource path="res://assets/common/shaders/items.shader" type="Shader" id=3]

[sub_resource type="RectangleShape2D" id=6]
[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
shader = ExtResource( 3 )
shader_param/line_color = Color( 1, 1, 1, 1 )
shader_param/line_thickness = 5.0

[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 9.5, 4.4 )

[sub_resource type="Shader" id=2]
[sub_resource type="Shader" id=3]
resource_local_to_scene = true
code = "shader_type canvas_item;

Expand Down Expand Up @@ -34,41 +41,42 @@ void fragment()
COLOR = mix(color, outlined_result, outlined_result.a);
}"

[sub_resource type="ShaderMaterial" id=3]
[sub_resource type="ShaderMaterial" id=4]
resource_local_to_scene = true
shader = SubResource( 2 )
shader = SubResource( 3 )
shader_param/line_color = Color( 1, 1, 0, 0 )
shader_param/line_thickness = 5.0

[sub_resource type="SpriteFrames" id=4]
[sub_resource type="SpriteFrames" id=5]
animations = [ {
"frames": [ ExtResource( 2 ) ],
"loop": true,
"name": "default",
"speed": 5.0
} ]

[sub_resource type="CapsuleShape2D" id=5]
[sub_resource type="CapsuleShape2D" id=6]
radius = 8.0
height = 12.0

[node name="Battery" instance=ExtResource( 1 )]
material = SubResource( 1 )
position = Vector2( -0.0936432, 0 )

[node name="ItemCollision" parent="." index="0"]
rotation = 2.35619
shape = SubResource( 6 )
shape = SubResource( 2 )

[node name="SpritePosition" parent="." index="2"]
position = Vector2( 0, 0 )

[node name="ItemSprite" parent="SpritePosition" index="0"]
material = SubResource( 3 )
material = SubResource( 4 )
rotation = 2.35619
scale = Vector2( 0.1, 0.1 )
frames = SubResource( 4 )
frames = SubResource( 5 )
offset = Vector2( 0, 0 )

[node name="MouseCollision" parent="SpritePosition/MouseArea" index="0"]
rotation = 0.785398
shape = SubResource( 5 )
shape = SubResource( 6 )
50 changes: 50 additions & 0 deletions src/assets/items/large-liquid-bottle.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[gd_scene load_steps=9 format=2]

[ext_resource path="res://assets/items/item.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/common/shaders/items.shader" type="Shader" id=2]
[ext_resource path="res://assets/items/textures/large-liquid-bottle.png" type="Texture" id=3]

[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 1, 1 )
shader_param/line_thickness = 5.0

[sub_resource type="CapsuleShape2D" id=2]
radius = 11.5
height = 19.5

[sub_resource type="ShaderMaterial" id=3]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 0, 0 )
shader_param/line_thickness = 5.0

[sub_resource type="SpriteFrames" id=4]
animations = [ {
"frames": [ ExtResource( 3 ) ],
"loop": true,
"name": "default",
"speed": 5.0
} ]

[sub_resource type="CapsuleShape2D" id=5]
radius = 15.625
height = 19.25

[node name="LargeLiquidBottle" instance=ExtResource( 1 )]
material = SubResource( 1 )

[node name="ItemCollision" parent="." index="0"]
position = Vector2( 0, 11 )
shape = SubResource( 2 )

[node name="ItemSprite" parent="SpritePosition" index="0"]
material = SubResource( 3 )
position = Vector2( 0, 12 )
scale = Vector2( 0.15, 0.15 )
frames = SubResource( 4 )

[node name="MouseCollision" parent="SpritePosition/MouseArea" index="0"]
position = Vector2( 0, 8 )
shape = SubResource( 5 )
50 changes: 50 additions & 0 deletions src/assets/items/powder-bottle.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[gd_scene load_steps=9 format=2]

[ext_resource path="res://assets/items/item.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/common/shaders/items.shader" type="Shader" id=2]
[ext_resource path="res://assets/items/textures/powder-bottle.png" type="Texture" id=3]

[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 1, 1 )
shader_param/line_thickness = 5.0

[sub_resource type="CapsuleShape2D" id=4]
radius = 6.0
height = 11.0

[sub_resource type="ShaderMaterial" id=2]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 0, 0 )
shader_param/line_thickness = 5.0

[sub_resource type="SpriteFrames" id=3]
animations = [ {
"frames": [ ExtResource( 3 ) ],
"loop": true,
"name": "default",
"speed": 5.0
} ]

[sub_resource type="CapsuleShape2D" id=5]
radius = 7.5
height = 18.0

[node name="PowderBottle" instance=ExtResource( 1 )]
material = SubResource( 1 )

[node name="ItemCollision" parent="." index="0"]
position = Vector2( 0, 5 )
shape = SubResource( 4 )

[node name="ItemSprite" parent="SpritePosition" index="0"]
material = SubResource( 2 )
position = Vector2( 0, 5 )
scale = Vector2( 0.15, 0.15 )
frames = SubResource( 3 )

[node name="MouseCollision" parent="SpritePosition/MouseArea" index="0"]
position = Vector2( 0, 3 )
shape = SubResource( 5 )
50 changes: 50 additions & 0 deletions src/assets/items/small-liquid-bottle.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[gd_scene load_steps=9 format=2]

[ext_resource path="res://assets/items/item.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/common/shaders/items.shader" type="Shader" id=2]
[ext_resource path="res://assets/items/textures/small-liquid-bottle.png" type="Texture" id=3]

[sub_resource type="ShaderMaterial" id=1]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 1, 1 )
shader_param/line_thickness = 5.0

[sub_resource type="CapsuleShape2D" id=2]
radius = 7.375
height = 12.75

[sub_resource type="ShaderMaterial" id=3]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader_param/line_color = Color( 1, 1, 0, 0 )
shader_param/line_thickness = 5.0

[sub_resource type="SpriteFrames" id=4]
animations = [ {
"frames": [ ExtResource( 3 ) ],
"loop": true,
"name": "default",
"speed": 5.0
} ]

[sub_resource type="CapsuleShape2D" id=5]
radius = 9.625
height = 15.25

[node name="SmallLiquidBottle" instance=ExtResource( 1 )]
material = SubResource( 1 )

[node name="ItemCollision" parent="." index="0"]
position = Vector2( 0, 6 )
shape = SubResource( 2 )

[node name="ItemSprite" parent="SpritePosition" index="0"]
material = SubResource( 3 )
position = Vector2( 0, 7 )
scale = Vector2( 0.15, 0.15 )
frames = SubResource( 4 )

[node name="MouseCollision" parent="SpritePosition/MouseArea" index="0"]
position = Vector2( 0, 4 )
shape = SubResource( 5 )
3 changes: 3 additions & 0 deletions src/assets/items/textures/large-liquid-bottle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/assets/items/textures/large-liquid-bottle.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/large-liquid-bottle.png-b85e83d54ea8d53b5b9adb6d794e82da.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/items/textures/large-liquid-bottle.png"
dest_files=[ "res://.import/large-liquid-bottle.png-b85e83d54ea8d53b5b9adb6d794e82da.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
3 changes: 3 additions & 0 deletions src/assets/items/textures/powder-bottle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/assets/items/textures/powder-bottle.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/powder-bottle.png-788d1d4ba26c8d8cc9bff4f661a7ce70.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/items/textures/powder-bottle.png"
dest_files=[ "res://.import/powder-bottle.png-788d1d4ba26c8d8cc9bff4f661a7ce70.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
3 changes: 3 additions & 0 deletions src/assets/items/textures/small-liquid-bottle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions src/assets/items/textures/small-liquid-bottle.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/small-liquid-bottle.png-b1f28f3dcc2545a6f9fd766619ca48ea.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/items/textures/small-liquid-bottle.png"
dest_files=[ "res://.import/small-liquid-bottle.png-b1f28f3dcc2545a6f9fd766619ca48ea.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