Added fence gates and fixed dialogic toggle for inventory

feature/fight_system
kziolkowski 6 months ago
parent b9c5de6dc3
commit 28bb81c0b0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://blb3agipyxnal"
path="res://.godot/imported/fence_door.png-19eb021073131bf04d1c242c32b3c026.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://art/farm/farming/farmobjekte/zaun/fence_door.png"
dest_files=["res://.godot/imported/fence_door.png-19eb021073131bf04d1c242c32b3c026.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

@ -1,6 +1,7 @@
[gd_scene load_steps=10 format=3 uid="uid://cgjc4wurbgimy"]
[gd_scene load_steps=11 format=3 uid="uid://cgjc4wurbgimy"]
[ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="1_l3npx"]
[ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
[ext_resource type="Texture2D" uid="uid://u0dku75l17re" path="res://art/ui/UI/UI_bag_export_highlight_01.png" id="5_df8i8"]
[ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
@ -13,8 +14,10 @@
[node name="CanvasLayer" type="CanvasLayer"]
layer = 90
[node name="DialogicToggle" type="Node2D" parent="."]
[node name="DialogicToggle" type="Node2D" parent="." node_paths=PackedStringArray("itemToToggle")]
scale = Vector2(0.7, 0.7)
script = ExtResource("1_l3npx")
itemToToggle = NodePath("../Inventory")
[node name="Inventory" type="Control" parent="." node_paths=PackedStringArray("_slotsParent", "_slotsMover", "_headerSlots", "_slotSelect")]
layout_mode = 3

@ -133,7 +133,7 @@ _data = {
[sub_resource type="CircleShape2D" id="CircleShape2D_uo3dh"]
resource_local_to_scene = true
radius = 300.0
radius = 443.041
[node name="Duck" type="Node2D" node_paths=PackedStringArray("_animationPlayer")]
z_index = 1

@ -1,4 +1,4 @@
[gd_scene load_steps=96 format=3 uid="uid://gigb28qk8t12"]
[gd_scene load_steps=99 format=3 uid="uid://gigb28qk8t12"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="1_7wfwe"]
[ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
@ -46,7 +46,6 @@
[ext_resource type="Texture2D" uid="uid://bq2wojyy4ptva" path="res://art/nature/baum märz 2025/sonnenblume7.png" id="38_2rjny"]
[ext_resource type="AudioStream" uid="uid://fsiypqhql67w" path="res://audio/sfx/Farming/SFX_GettingWater_01.wav" id="39_di1ed"]
[ext_resource type="AudioStream" uid="uid://foyw26hq1qp5" path="res://audio/sfx/Farming/SFX_GettingWater_02.wav" id="40_ceriq"]
[ext_resource type="Texture2D" uid="uid://hlgoftb0fv34" path="res://art/farm/tilable grounds/böden/brüchiger beton boden.png" id="40_d77e7"]
[ext_resource type="Script" uid="uid://cfnrd5k1k0gxw" path="res://scripts/CSharp/Common/AudioPlayer.cs" id="40_w3jkj"]
[ext_resource type="Texture2D" uid="uid://dgavbfci8x178" path="res://art/nature/grass/grass-1.png" id="41_apj51"]
[ext_resource type="Script" uid="uid://clxb3n668oud3" path="res://scripts/CSharp/Common/Audio/AudioDebugger.cs" id="42_1nkjm"]
@ -61,6 +60,7 @@
[ext_resource type="Texture2D" uid="uid://d3dwl6ph0pu1d" path="res://art/nature/grass/grass-6.png" id="46_ycj14"]
[ext_resource type="Texture2D" uid="uid://lvhbicmwqab5" path="res://art/farm/tilable grounds/böden/fruchtbarer wilder trockender boden.png" id="47_loeum"]
[ext_resource type="AudioStream" uid="uid://c43a6x43jkikl" path="res://audio/sfx/Farming/SFX_GettingWater_Well_01_Reverb.wav" id="49_d77e7"]
[ext_resource type="Texture2D" uid="uid://blb3agipyxnal" path="res://art/farm/farming/farmobjekte/zaun/fence_door.png" id="49_i36hd"]
[ext_resource type="PackedScene" uid="uid://muuxxgvx33fp" path="res://prefabs/farm/duck.tscn" id="62_i36hd"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_wtdui"]
@ -115,6 +115,7 @@ shader = ExtResource("13_kt1wx")
shader_parameter/tiling_scale = Vector2(10, 1)
[sub_resource type="RectangleShape2D" id="RectangleShape2D_2vojv"]
resource_local_to_scene = true
size = Vector2(725.109, 456)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_p4qqi"]
@ -202,6 +203,25 @@ size = Vector2(5782, 1176)
resource_local_to_scene = true
size = Vector2(7150, 1192)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_uxa2m"]
shader = ExtResource("13_7p0hq")
shader_parameter/hue_shift = 0.0
shader_parameter/saturation_mult = 0.753
shader_parameter/value_mult = 1.0
shader_parameter/brightness_add = 0.0
shader_parameter/contrast_mult = 1.0
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lwk6t"]
shader = ExtResource("13_7p0hq")
shader_parameter/hue_shift = 0.0
shader_parameter/saturation_mult = 0.871
shader_parameter/value_mult = 1.0
shader_parameter/brightness_add = 0.0
shader_parameter/contrast_mult = 1.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ycj14"]
size = Vector2(707.116, 604.111)
[sub_resource type="AudioStreamPlaylist" id="AudioStreamPlaylist_ceriq"]
loop = false
stream_count = 1
@ -2068,30 +2088,34 @@ shape = SubResource("RectangleShape2D_p6n74")
[node name="Blocker" type="Node2D" parent="YSorted"]
[node name="Fence Door" type="Sprite2D" parent="YSorted/Blocker"]
position = Vector2(11301, 1672)
scale = Vector2(0.923469, 0.965054)
texture = ExtResource("40_d77e7")
material = SubResource("ShaderMaterial_uxa2m")
position = Vector2(11205, 1560)
rotation = 0.00432089
scale = Vector2(-0.905, 0.925)
texture = ExtResource("49_i36hd")
[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door"]
collision_layer = 2
collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door/StaticBody2D"]
position = Vector2(1.75458, 76)
position = Vector2(-113.561, 193.035)
shape = SubResource("RectangleShape2D_2vojv")
[node name="Fence Door2" type="Sprite2D" parent="YSorted/Blocker"]
position = Vector2(3701, 1691)
scale = Vector2(0.923469, 0.965054)
texture = ExtResource("40_d77e7")
material = SubResource("ShaderMaterial_lwk6t")
position = Vector2(3788, 1563)
rotation = -0.0963081
scale = Vector2(0.903, 0.96)
texture = ExtResource("49_i36hd")
[node name="StaticBody2D" type="StaticBody2D" parent="YSorted/Blocker/Fence Door2"]
collision_layer = 2
collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="YSorted/Blocker/Fence Door2/StaticBody2D"]
position = Vector2(1.75458, 76)
shape = SubResource("RectangleShape2D_2vojv")
position = Vector2(-106.663, 182.891)
shape = SubResource("RectangleShape2D_ycj14")
[node name="ducks" type="Node2D" parent="YSorted"]

Loading…
Cancel
Save