Skip to content
This repository has been archived by the owner on Oct 24, 2024. It is now read-only.

Commit

Permalink
Shaperka (#231)
Browse files Browse the repository at this point in the history
Co-authored-by: shaperka <[email protected]>
  • Loading branch information
porkbrain and shaperka authored Aug 31, 2024
1 parent f103f98 commit 9fe8f81
Show file tree
Hide file tree
Showing 22 changed files with 102 additions and 140 deletions.
Binary file modified main_game/assets/compound/fridge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_game/assets/compound/fridge2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/building_duo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/building_red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/catsino.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/house_plantshoptrio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/manhole.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_game/assets/downtown/nadrazi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/plain_trio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/praha_building.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/downtown/praha_building_purple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/residential/indoors/clinic_clock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified main_game/assets/residential/indoors/wall_fish2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 53 additions & 16 deletions main_game/assets/scenes/barn.tscn
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
[gd_scene load_steps=10 format=3 uid="uid://dajava8pv8ysd"]

[ext_resource type="Texture2D" uid="uid://b5fppd4473rfo" path="res://assets/compound/barn_interior.png" id="1_2glsl"]
[ext_resource type="Texture2D" uid="uid://bw1m7ph67v8u7" path="res://assets/residential/indoors/wall_fish2.png" id="2_ukrpc"]
[ext_resource type="Texture2D" uid="uid://dpgi57ipo0gox" path="res://assets/residential/indoors/clinic_clock.png" id="4_rrsnu"]
[ext_resource type="Texture2D" uid="uid://cpu1o25c7res0" path="res://assets/compound/window.png" id="5_43hc4"]
[ext_resource type="Texture2D" uid="uid://d07qq5e0nd3h1" path="res://assets/residential/indoors/toilet.png" id="6_cr7wq"]
[ext_resource type="Texture2D" uid="uid://dc5s5udab8n2k" path="res://assets/compound/window_light.png" id="6_xbloy"]
[ext_resource type="Texture2D" uid="uid://co8cvyghhuss1" path="res://assets/compound/table.png" id="8_h4ttt"]
[ext_resource type="Texture2D" uid="uid://bcnwgs4asdo3o" path="res://assets/residential/indoors/sink.png" id="8_n6hoc"]
[ext_resource type="Texture2D" uid="uid://dxt2jrtnaaqca" path="res://assets/compound/fridge.png" id="9_b5hlb"]
[gd_scene load_steps=16 format=3 uid="uid://dajava8pv8ysd"]

[ext_resource type="Texture2D" uid="uid://bo4wq2i0bkr8c" path="res://assets/compound/barn_interior.png" id="1_2glsl"]
[ext_resource type="Texture2D" uid="uid://dhbfxi5fhc2uf" path="res://assets/residential/indoors/wall_fish2.png" id="2_ukrpc"]
[ext_resource type="Texture2D" uid="uid://vtfof2e0ei40" path="res://assets/residential/indoors/clinic_clock.png" id="4_rrsnu"]
[ext_resource type="Texture2D" uid="uid://cnxj4juluqxlo" path="res://assets/compound/window.png" id="5_43hc4"]
[ext_resource type="Texture2D" uid="uid://cgd4gem7h52i6" path="res://assets/residential/indoors/toilet.png" id="6_cr7wq"]
[ext_resource type="Texture2D" uid="uid://ls84jkhn2yie" path="res://assets/compound/window_light.png" id="6_xbloy"]
[ext_resource type="Texture2D" uid="uid://bkn08mi2q7fcx" path="res://assets/compound/table.png" id="8_h4ttt"]
[ext_resource type="Texture2D" uid="uid://dbbu6xgobs5xu" path="res://assets/residential/indoors/sink.png" id="8_n6hoc"]
[ext_resource type="Texture2D" uid="uid://bijgh0xakxl6a" path="res://assets/residential/indoors/plant_leafs.png" id="10_kymjx"]
[ext_resource type="Texture2D" uid="uid://ophdkktm7yqx" path="res://assets/residential/indoors/wall_mirror2.png" id="11_7eqf2"]
[ext_resource type="Texture2D" uid="uid://cliyigbyh2a3x" path="res://assets/compound/fridge2.png" id="12_jasvm"]
[ext_resource type="Texture2D" uid="uid://c4phqysbg8s3" path="res://assets/residential/indoors/oven.png" id="12_um7ei"]

[sub_resource type="AtlasTexture" id="AtlasTexture_yvafp"]
atlas = ExtResource("12_um7ei")
region = Rect2(0, 0, 32, 62)

[sub_resource type="AtlasTexture" id="AtlasTexture_l80js"]
atlas = ExtResource("12_um7ei")
region = Rect2(32, 0, 32, 62)

[sub_resource type="SpriteFrames" id="SpriteFrames_ns3ui"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_yvafp")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_l80js")
}],
"loop": true,
"name": &"default",
"speed": 5.0
}]

[node name="Barn" type="Node2D"]

Expand All @@ -17,11 +42,11 @@ position = Vector2(-23, 14)
texture = ExtResource("1_2glsl")

[node name="WallFish3" type="Sprite2D" parent="."]
position = Vector2(71, -45)
position = Vector2(20, -56)
texture = ExtResource("2_ukrpc")

[node name="ClinicClock" type="Sprite2D" parent="."]
position = Vector2(103, -60)
position = Vector2(146, -68)
texture = ExtResource("4_rrsnu")

[node name="Window" type="Sprite2D" parent="."]
Expand All @@ -37,13 +62,25 @@ position = Vector2(232, 48)
texture = ExtResource("6_cr7wq")

[node name="Sink" type="Sprite2D" parent="."]
position = Vector2(190, -11)
position = Vector2(191, -11)
texture = ExtResource("8_n6hoc")

[node name="Table" type="Sprite2D" parent="."]
position = Vector2(-52, 39)
texture = ExtResource("8_h4ttt")

[node name="Fridge" type="Sprite2D" parent="."]
[node name="PlantLeafs" type="Sprite2D" parent="."]
position = Vector2(-135, -8)
texture = ExtResource("10_kymjx")

[node name="WallMirror2" type="Sprite2D" parent="."]
position = Vector2(191, -41)
texture = ExtResource("11_7eqf2")

[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(66, -20)
sprite_frames = SubResource("SpriteFrames_ns3ui")

[node name="Fridge2" type="Sprite2D" parent="."]
position = Vector2(146, -22)
texture = ExtResource("9_b5hlb")
texture = ExtResource("12_jasvm")
2 changes: 1 addition & 1 deletion main_game/assets/scenes/clinic_ward.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ position = Vector2(133, 116)
texture = ExtResource("35_vtaso")

[node name="PlantBiggestBack" type="Sprite2D" parent="SideTable1Back"]
position = Vector2(0, -24)
position = Vector2(1, -23)
texture = ExtResource("35_rwl8r")

[node name="PillBox" type="Sprite2D" parent="."]
Expand Down
146 changes: 28 additions & 118 deletions main_game/assets/scenes/downtown.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=208 format=3 uid="uid://dtow2k2vgk8kg"]
[gd_scene load_steps=209 format=3 uid="uid://dtow2k2vgk8kg"]

[ext_resource type="Texture2D" uid="uid://5dhtpbjd5ool" path="res://assets/downtown/bg.png" id="1_ac7tb"]
[ext_resource type="Texture2D" uid="uid://kkt2uh6il68y" path="res://assets/downtown/ac_atlas.png" id="2_vxd7e"]
Expand Down Expand Up @@ -125,6 +125,7 @@
[ext_resource type="Texture2D" uid="uid://flmsi8faj5jk" path="res://assets/downtown/electric_antenna2.png" id="119_j4h0q"]
[ext_resource type="Texture2D" uid="uid://1r1hvvyh00iu" path="res://assets/downtown/hanging_plants3.png" id="121_nkue0"]
[ext_resource type="Texture2D" uid="uid://d3lmwm3dvtbtv" path="res://assets/environment/flipflops.png" id="125_hos4p"]
[ext_resource type="Texture2D" uid="uid://xeeyd87wmone" path="res://assets/downtown/nadrazi.png" id="126_0x1sx"]

[sub_resource type="AtlasTexture" id="AtlasTexture_wx86m"]
atlas = ExtResource("4_fu7bc")
Expand Down Expand Up @@ -735,6 +736,18 @@ texture = ExtResource("17_5ai3x")
position = Vector2(1.5, 1)
texture = ExtResource("22_m6eml")

[node name="UnderConstruction2" type="Sprite2D" parent="."]
position = Vector2(1244, 408)
texture = ExtResource("17_5ai3x")

[node name="WiredFence" type="Sprite2D" parent="UnderConstruction2"]
position = Vector2(85, 0)
texture = ExtResource("17_5ai3x")

[node name="ConstructionSiteSign" type="Sprite2D" parent="UnderConstruction2"]
position = Vector2(1.5, 1)
texture = ExtResource("22_m6eml")

[node name="DowntownBg" type="Sprite2D" parent="."]
z_index = -5
position = Vector2(233, 477)
Expand Down Expand Up @@ -1188,7 +1201,7 @@ texture = ExtResource("14_8uy80")
position = Vector2(0, 33)

[node name="Catsino" type="Sprite2D" parent="BureauRoot"]
position = Vector2(1409, -597)
position = Vector2(1408, -599)
texture = ExtResource("89_1g1r7")

[node name="HangingPlants3" type="Sprite2D" parent="BureauRoot/Catsino"]
Expand Down Expand Up @@ -1406,22 +1419,22 @@ position = Vector2(-1, -68)
position = Vector2(0, -12)

[node name="PlainTrio" type="Sprite2D" parent="Block3Root"]
position = Vector2(1282, 324)
position = Vector2(-859, 620)
texture = ExtResource("52_ri67k")

[node name="HouseBig" type="Sprite2D" parent="Block3Root/PlainTrio"]
position = Vector2(78.5, 0.5)
position = Vector2(206, 2)
texture = ExtResource("54_b44kc")

[node name="YSort" type="Node2D" parent="Block3Root/PlainTrio"]
position = Vector2(-1, 102)
position = Vector2(126.5, 105.5)

[node name="Bike" type="Sprite2D" parent="Block3Root/PlainTrio"]
position = Vector2(173, 93)
position = Vector2(300.5, 96.5)
texture = ExtResource("62_rdvbw")

[node name="AcAtlas" type="AnimatedSprite2D" parent="Block3Root/PlainTrio"]
position = Vector2(156, -116)
position = Vector2(283.5, -112.5)
sprite_frames = SubResource("SpriteFrames_q1mli")
autoplay = "default"
frame = 2
Expand All @@ -1431,7 +1444,7 @@ frame_progress = 1.0
position = Vector2(0, 16)

[node name="PottedBush3" type="Sprite2D" parent="Block3Root/PlainTrio"]
position = Vector2(117, 93)
position = Vector2(244.5, 96.5)
texture = ExtResource("113_wa5al")

[node name="YSort" type="Node2D" parent="Block3Root/PlainTrio/PottedBush3"]
Expand Down Expand Up @@ -1595,7 +1608,7 @@ texture = ExtResource("90_gafo8")
position = Vector2(-0.5, 103.5)

[node name="PrahaBuildingPurple" type="Sprite2D" parent="Block4Root"]
position = Vector2(433.5, 289.5)
position = Vector2(435.5, 289.5)
texture = ExtResource("90_gsrac")

[node name="ElectricAntenna3" type="Sprite2D" parent="Block4Root/PrahaBuildingPurple"]
Expand Down Expand Up @@ -5576,7 +5589,7 @@ texture = ExtResource("70_mmv7u")
position = Vector2(2, 31)

[node name="HouseBigLime2" type="Sprite2D" parent="ShoreRoot"]
position = Vector2(1064, 874)
position = Vector2(1063, 874)
texture = ExtResource("71_4uhpc")

[node name="AcAtlas" type="AnimatedSprite2D" parent="ShoreRoot/HouseBigLime2"]
Expand Down Expand Up @@ -8077,16 +8090,6 @@ z_index = -6
position = Vector2(-1206, 438)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1467" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1086, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1468" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1086, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1469" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1230, -66)
Expand Down Expand Up @@ -8482,11 +8485,6 @@ z_index = -6
position = Vector2(-1182, 780)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1669" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1158, 762)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1670" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1182, 762)
Expand All @@ -8507,11 +8505,6 @@ z_index = -6
position = Vector2(-1254, 852)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1512" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1158, 852)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1513" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1158, 888)
Expand All @@ -8522,66 +8515,16 @@ z_index = -6
position = Vector2(-1182, 852)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1515" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1110, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1516" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1110, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1517" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1134, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1540" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1086, 786)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1541" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1110, 786)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1542" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1134, 786)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1518" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1134, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1543" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1014, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1544" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1014, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1545" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1038, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1546" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1038, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1547" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1062, 822)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1548" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1014, 786)
Expand All @@ -8597,41 +8540,11 @@ z_index = -6
position = Vector2(-1062, 786)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1663" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1086, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1664" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1110, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1665" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1134, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1666" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1014, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1667" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1038, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1668" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1062, 750)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1551" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1062, 858)
texture = ExtResource("82_65uwp")

[node name="Dlazdicky1552" type="Sprite2D" parent="dlazdickyRoot"]
z_index = -6
position = Vector2(-1086, 894)
Expand Down Expand Up @@ -13900,7 +13813,7 @@ sprite_frames = SubResource("SpriteFrames_lnl2b")
position = Vector2(0, 11)

[node name="BinGreen4" type="AnimatedSprite2D" parent="."]
position = Vector2(1086, 410.5)
position = Vector2(1028, 368)
sprite_frames = SubResource("SpriteFrames_03ayo")

[node name="YSort" type="Node2D" parent="BinGreen4"]
Expand Down Expand Up @@ -14078,13 +13991,6 @@ texture = ExtResource("113_wa5al")
[node name="YSort" type="Node2D" parent="PottedBush6"]
position = Vector2(1, 15)

[node name="ElectricPole6" type="Sprite2D" parent="."]
position = Vector2(1064, 359.5)
texture = ExtResource("114_6se48")

[node name="YSort" type="Node2D" parent="ElectricPole6"]
position = Vector2(1, 65)

[node name="ElectricPole7" type="Sprite2D" parent="."]
position = Vector2(52, 924)
texture = ExtResource("114_6se48")
Expand All @@ -14102,3 +14008,7 @@ position = Vector2(1, 65)
[node name="Flipflops" type="Sprite2D" parent="."]
position = Vector2(-241, 1269)
texture = ExtResource("125_hos4p")

[node name="Nadrazi" type="Sprite2D" parent="."]
position = Vector2(1333, 123)
texture = ExtResource("126_0x1sx")
2 changes: 1 addition & 1 deletion main_game/assets/scenes/mall.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ position = Vector2(-241, 57)
texture = ExtResource("17_8tma2")

[node name="Bonsai1" type="Sprite2D" parent="CounterWide"]
position = Vector2(34, -18)
position = Vector2(34, -20)
texture = ExtResource("20_lrmvj")

[node name="Kasa" type="Sprite2D" parent="CounterWide"]
Expand Down
Loading

0 comments on commit 9fe8f81

Please sign in to comment.