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

Commit

Permalink
Shaperka (#205)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: shaperka <[email protected]>
  • Loading branch information
porkbrain and shaperka authored Jun 24, 2024
1 parent 8d4104d commit 286cba0
Show file tree
Hide file tree
Showing 58 changed files with 808 additions and 338 deletions.
Binary file modified main_game/assets/downtown/ac_atlas.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/bamboo_rooftop.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/plantshop_bg.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/environment/seedlings_small.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/environment/seedlings_smallb.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/environment/sunflower.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/items/book.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/items/coffee.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/items/console_switch.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/items/controller.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/items/papiry.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/items/papiry_vertical.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/items/pill_box.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/mall/mall.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.
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/residential/indoors/calendar.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/chair_wood.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/residential/indoors/chair_wood_side.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.
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_interior.png
Binary file modified main_game/assets/residential/indoors/green_kitchen_set.png
Binary file modified main_game/assets/residential/indoors/hospital_divider.png
Binary file modified main_game/assets/residential/indoors/room_light_big.png
Binary file modified main_game/assets/residential/indoors/room_light_wide.png
Binary file modified main_game/assets/residential/indoors/table.png
Binary file modified main_game/assets/residential/indoors/toilet2.png
Binary file added main_game/assets/residential/indoors/tv_flat.png
61 changes: 38 additions & 23 deletions main_game/assets/scenes/building1_basement1.tscn
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
[gd_scene load_steps=37 format=3 uid="uid://b4jfxrl5rqnne"]

[ext_resource type="Texture2D" uid="uid://cbouvwlgc3k01" path="res://assets/residential/indoors/hallway2.png" id="1_hc42t"]
[ext_resource type="Texture2D" uid="uid://3212443mchtu" path="res://assets/residential/indoors/brown_dark_door_atlas.png" id="2_hgy38"]
[ext_resource type="Texture2D" uid="uid://cq4dga042qxr" path="res://assets/residential/indoors/elevator_atlas.png" id="3_af3up"]
[ext_resource type="Texture2D" uid="uid://dnj0hlb6fb6yh" path="res://assets/residential/indoors/utility_door_atlas.png" id="4_5p8gt"]
[ext_resource type="Texture2D" uid="uid://cve0p1fj5bjp3" path="res://assets/downtown/recycle_bin.png" id="5_0eq5h"]
[ext_resource type="Texture2D" uid="uid://bmy3x3gvi867d" path="res://assets/downtown/black_bin.png" id="6_sj14k"]
[ext_resource type="Texture2D" uid="uid://qe3r5b1iubhp" path="res://assets/residential/indoors/hallway2_wall.png" id="7_udva6"]
[ext_resource type="Texture2D" uid="uid://b06q4mk3jgjdn" path="res://assets/residential/indoors/poster_skeleton.png" id="8_xnu6d"]
[ext_resource type="Texture2D" uid="uid://c7kxndctyvlu0" path="res://assets/residential/indoors/sofa_purple.png" id="9_eaole"]
[ext_resource type="Texture2D" uid="uid://cucsq824qpe3w" path="res://assets/residential/indoors/kredenc.png" id="10_77ua5"]
[ext_resource type="Texture2D" uid="uid://dnu54tiuqoh11" path="res://assets/residential/indoors/side_table1.png" id="11_vbwku"]
[ext_resource type="Texture2D" uid="uid://d00p28mxdb8q6" path="res://assets/residential/indoors/bath_horizontal.png" id="12_6odtv"]
[ext_resource type="Texture2D" uid="uid://bcnwgs4asdo3o" path="res://assets/residential/indoors/sink.png" id="13_5srwn"]
[ext_resource type="Texture2D" uid="uid://d07qq5e0nd3h1" path="res://assets/residential/indoors/toilet.png" id="14_uwy0d"]
[ext_resource type="Texture2D" uid="uid://7l1abjmnq6gp" path="res://assets/residential/indoors/side_table2_back.png" id="15_ctho0"]
[ext_resource type="Texture2D" uid="uid://dlrneao0sl1dc" path="res://assets/environment/toilet_paper.png" id="16_g87gh"]
[ext_resource type="Texture2D" uid="uid://cds1sxu666s4i" path="res://assets/residential/indoors/tv_withcable.png" id="17_wf30n"]
[ext_resource type="Texture2D" uid="uid://c7q4u2hn8t80b" path="res://assets/residential/indoors/bed_wooden_black.png" id="18_i57do"]
[ext_resource type="Texture2D" uid="uid://bga8tmp3a2ahb" path="res://assets/twinpeaks_apartment/popelnik.png" id="19_axcx5"]
[ext_resource type="Texture2D" uid="uid://cf47qpcj3xpaq" path="res://assets/twinpeaks_apartment/black_rug.png" id="20_85nrp"]
[ext_resource type="Texture2D" uid="uid://cdocrf41avqp6" path="res://assets/residential/indoors/knihovna2.png" id="21_kcje3"]
[gd_scene load_steps=40 format=3 uid="uid://b4jfxrl5rqnne"]

[ext_resource type="Texture2D" uid="uid://cbs7hpafjhpxt" path="res://assets/residential/indoors/hallway2.png" id="1_hc42t"]
[ext_resource type="Texture2D" uid="uid://ds5d1ssvswgsm" path="res://assets/residential/indoors/brown_dark_door_atlas.png" id="2_hgy38"]
[ext_resource type="Texture2D" uid="uid://hny4j2anps08" path="res://assets/residential/indoors/elevator_atlas.png" id="3_af3up"]
[ext_resource type="Texture2D" uid="uid://bwlthosxjgc4w" path="res://assets/residential/indoors/utility_door_atlas.png" id="4_5p8gt"]
[ext_resource type="Texture2D" uid="uid://wm712yivg1yb" path="res://assets/downtown/recycle_bin.png" id="5_0eq5h"]
[ext_resource type="Texture2D" uid="uid://bfp6cm2hbyswi" path="res://assets/downtown/black_bin.png" id="6_sj14k"]
[ext_resource type="Texture2D" uid="uid://b6bc70ydbei0g" path="res://assets/residential/indoors/hallway2_wall.png" id="7_udva6"]
[ext_resource type="Texture2D" uid="uid://bedyh4n5xejgk" path="res://assets/residential/indoors/poster_skeleton.png" id="8_xnu6d"]
[ext_resource type="Texture2D" uid="uid://y246scmkkl2q" path="res://assets/residential/indoors/sofa_purple.png" id="9_eaole"]
[ext_resource type="Texture2D" uid="uid://40wrcm5hjv4p" path="res://assets/residential/indoors/kredenc.png" id="10_77ua5"]
[ext_resource type="Texture2D" uid="uid://dggtq8cr8skng" path="res://assets/residential/indoors/side_table1.png" id="11_vbwku"]
[ext_resource type="Texture2D" uid="uid://fpc3f14s24e7" path="res://assets/residential/indoors/bath_horizontal.png" id="12_6odtv"]
[ext_resource type="Texture2D" uid="uid://dbbu6xgobs5xu" path="res://assets/residential/indoors/sink.png" id="13_5srwn"]
[ext_resource type="Texture2D" uid="uid://cgd4gem7h52i6" path="res://assets/residential/indoors/toilet.png" id="14_uwy0d"]
[ext_resource type="Texture2D" uid="uid://coox5howsviig" path="res://assets/residential/indoors/side_table2_back.png" id="15_ctho0"]
[ext_resource type="Texture2D" uid="uid://oiymn7tgnmeq" path="res://assets/environment/toilet_paper.png" id="16_g87gh"]
[ext_resource type="Texture2D" uid="uid://i5mikktwmb2l" path="res://assets/residential/indoors/tv_withcable.png" id="17_wf30n"]
[ext_resource type="Texture2D" uid="uid://b54eahl80h2uy" path="res://assets/residential/indoors/bed_wooden_black.png" id="18_i57do"]
[ext_resource type="Texture2D" uid="uid://bp3krmlj4peg0" path="res://assets/twinpeaks_apartment/popelnik.png" id="19_axcx5"]
[ext_resource type="Texture2D" uid="uid://b838vr33qe6o8" path="res://assets/twinpeaks_apartment/black_rug.png" id="20_85nrp"]
[ext_resource type="Texture2D" uid="uid://dkd2f8jlm4n00" path="res://assets/residential/indoors/knihovna2.png" id="21_kcje3"]
[ext_resource type="Texture2D" uid="uid://rtil58tqay4m" path="res://assets/residential/indoors/wall_mirror3.png" id="22_t1pce"]
[ext_resource type="Texture2D" uid="uid://b6vfhqu2lc543" path="res://assets/residential/indoors/cactus1.png" id="23_8c3b1"]
[ext_resource type="Texture2D" uid="uid://yn6hx5pj8p3h" path="res://assets/items/controller.png" id="24_b8v2v"]

[sub_resource type="AtlasTexture" id="AtlasTexture_0m8kt"]
atlas = ExtResource("2_hgy38")
Expand Down Expand Up @@ -280,3 +283,15 @@ position = Vector2(-192, 76)
position = Vector2(-288, 81)

[node name="Point" type="Node" parent="Points/BasementExit"]

[node name="WallMirror3" type="Sprite2D" parent="."]
position = Vector2(-150, -118)
texture = ExtResource("22_t1pce")

[node name="Cactus1" type="Sprite2D" parent="."]
position = Vector2(181, -94)
texture = ExtResource("23_8c3b1")

[node name="Controller" type="Sprite2D" parent="."]
position = Vector2(-81, -36)
texture = ExtResource("24_b8v2v")
7 changes: 6 additions & 1 deletion main_game/assets/scenes/building1_basement2.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=26 format=3 uid="uid://e5yy5730l3t2"]
[gd_scene load_steps=27 format=3 uid="uid://e5yy5730l3t2"]

[ext_resource type="Texture2D" uid="uid://b286ya8t5yw16" path="res://assets/residential/indoors/basement.png" id="1_ikw8b"]
[ext_resource type="Texture2D" uid="uid://cn8rbfh0g5jtm" path="res://assets/downtown/trashcan_tables.png" id="2_307ea"]
Expand All @@ -22,6 +22,7 @@
[ext_resource type="Texture2D" uid="uid://h03jwe4lr73k" path="res://assets/residential/indoors/tissues.png" id="20_kuec5"]
[ext_resource type="Texture2D" uid="uid://dhfgp56ya8s8v" path="res://assets/residential/indoors/pc_table.png" id="21_sxy7u"]
[ext_resource type="Texture2D" uid="uid://d0p4h412y5qxu" path="res://assets/residential/indoors/sofa_old.png" id="22_epthn"]
[ext_resource type="Texture2D" uid="uid://p6v71m55dqgx" path="res://assets/residential/indoors/calendar.png" id="23_v4bhr"]

[sub_resource type="AtlasTexture" id="AtlasTexture_rnymp"]
atlas = ExtResource("2_ax6ay")
Expand Down Expand Up @@ -216,3 +217,7 @@ texture = ExtResource("2_mwdls")
[node name="SofaOld" type="Sprite2D" parent="."]
position = Vector2(-91, -14)
texture = ExtResource("22_epthn")

[node name="Calendar" type="Sprite2D" parent="."]
position = Vector2(-29, -49)
texture = ExtResource("23_v4bhr")
84 changes: 80 additions & 4 deletions main_game/assets/scenes/clinic.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=28 format=3 uid="uid://bl1kr7uql87cg"]
[gd_scene load_steps=43 format=3 uid="uid://bl1kr7uql87cg"]

[ext_resource type="Texture2D" uid="uid://bklphpjocwwkr" path="res://assets/residential/indoors/clinic_interior.png" id="1_v4nqd"]
[ext_resource type="Texture2D" uid="uid://drbv1a7tnye2r" path="res://assets/environment/vending_machine_atlas.png" id="2_ape1y"]
Expand All @@ -19,6 +19,21 @@
[ext_resource type="Texture2D" uid="uid://dggtq8cr8skng" path="res://assets/residential/indoors/side_table1.png" id="19_34wyq"]
[ext_resource type="Texture2D" uid="uid://h03jwe4lr73k" path="res://assets/residential/indoors/tissues.png" id="19_e0l5y"]
[ext_resource type="Texture2D" uid="uid://v2oxa46udhec" path="res://assets/residential/indoors/chair_red.png" id="19_jd0rw"]
[ext_resource type="Texture2D" uid="uid://brmdul3xjhmxk" path="res://assets/residential/indoors/clinic_eq.png" id="20_2fx0w"]
[ext_resource type="Texture2D" uid="uid://bsxtwhms55hi4" path="res://assets/residential/indoors/clinic_bed.png" id="21_j4ueb"]
[ext_resource type="Texture2D" uid="uid://d07hf85naekvt" path="res://assets/residential/indoors/clinic_IV.png" id="22_7ghy8"]
[ext_resource type="Texture2D" uid="uid://b8w6y3fi48ki2" path="res://assets/residential/indoors/clinic_poster.png" id="23_ffubf"]
[ext_resource type="Texture2D" uid="uid://7gylx12couuo" path="res://assets/residential/indoors/clinic_poster2.png" id="24_r0k1h"]
[ext_resource type="Texture2D" uid="uid://nlp1ta0hrg1h" path="res://assets/residential/indoors/clinic_cart.png" id="25_rx4q7"]
[ext_resource type="Texture2D" uid="uid://d2bvqonmgr2vn" path="res://assets/residential/indoors/clinic_wheelchair.png" id="26_6ujg3"]
[ext_resource type="Texture2D" uid="uid://80vo1t54sosc" path="res://assets/residential/indoors/side_table1_back.png" id="27_sbsjh"]
[ext_resource type="Texture2D" uid="uid://d01kfmw7mltte" path="res://assets/residential/indoors/sofa_blue_back.png" id="28_j4e0e"]
[ext_resource type="Texture2D" uid="uid://bp26pbv7lph2d" path="res://assets/residential/indoors/chair_blue_back.png" id="29_oyn7l"]
[ext_resource type="Texture2D" uid="uid://vtfof2e0ei40" path="res://assets/residential/indoors/clinic_clock.png" id="30_o4prj"]
[ext_resource type="Texture2D" uid="uid://cteb85n3uc7mo" path="res://assets/items/papiry_vertical.png" id="31_6ash4"]
[ext_resource type="Texture2D" uid="uid://c24128k3soyhf" path="res://assets/items/pill_box.png" id="32_nglwe"]
[ext_resource type="Texture2D" uid="uid://rtil58tqay4m" path="res://assets/residential/indoors/wall_mirror3.png" id="33_mjqye"]
[ext_resource type="Texture2D" uid="uid://cqnnxsrlye3ol" path="res://assets/residential/indoors/bin_small.png" id="34_65w6p"]

[sub_resource type="AtlasTexture" id="AtlasTexture_wx86m"]
atlas = ExtResource("2_ape1y")
Expand Down Expand Up @@ -152,13 +167,13 @@ position = Vector2(-106, -67)
texture = ExtResource("15_oqnj7")

[node name="HazardousBin" type="Sprite2D" parent="."]
position = Vector2(68, -33)
position = Vector2(68, -32)
texture = ExtResource("17_1fycq")

[node name="Points" type="Node2D" parent="."]

[node name="Entrance" type="Node2D" parent="Points"]
position = Vector2(-118, 107)
position = Vector2(-123, 109)

[node name="Point" type="Node" parent="Points/Entrance"]

Expand All @@ -177,7 +192,7 @@ position = Vector2(144, -28)
texture = ExtResource("19_34wyq")

[node name="SofaOldBack" type="Sprite2D" parent="."]
position = Vector2(55, 111)
position = Vector2(124.5, 109.5)
texture = ExtResource("17_1kj10")

[node name="SofaRed" type="Sprite2D" parent="."]
Expand All @@ -191,3 +206,64 @@ texture = ExtResource("19_jd0rw")
[node name="Tissues" type="Sprite2D" parent="."]
position = Vector2(132, 58)
texture = ExtResource("19_e0l5y")

[node name="ClinicEq" type="Sprite2D" parent="."]
position = Vector2(39, -43)
texture = ExtResource("20_2fx0w")

[node name="ClinicBed" type="Sprite2D" parent="."]
position = Vector2(-25, -23)
texture = ExtResource("21_j4ueb")

[node name="ClinicIv" type="Sprite2D" parent="."]
position = Vector2(70, 0)
texture = ExtResource("22_7ghy8")
flip_h = true

[node name="ClinicPoster" type="Sprite2D" parent="."]
position = Vector2(69, -68)
texture = ExtResource("23_ffubf")

[node name="ClinicPoster2" type="Sprite2D" parent="."]
position = Vector2(-36, -62)
texture = ExtResource("24_r0k1h")

[node name="ClinicCart" type="Sprite2D" parent="."]
position = Vector2(-43, 9)
texture = ExtResource("25_rx4q7")

[node name="ClinicWheelchair" type="Sprite2D" parent="."]
position = Vector2(144, 39)
texture = ExtResource("26_6ujg3")

[node name="SideTable1Back" type="Sprite2D" parent="."]
position = Vector2(79, 114)
texture = ExtResource("27_sbsjh")

[node name="SofaBlueBack" type="Sprite2D" parent="."]
position = Vector2(34, 109)
texture = ExtResource("28_j4e0e")

[node name="ChairBlueBack" type="Sprite2D" parent="."]
position = Vector2(-18, 109)
texture = ExtResource("29_oyn7l")

[node name="ClinicClock" type="Sprite2D" parent="."]
position = Vector2(-6, -78)
texture = ExtResource("30_o4prj")

[node name="PapiryVertical" type="Sprite2D" parent="."]
position = Vector2(-116, -7)
texture = ExtResource("31_6ash4")

[node name="PillBox" type="Sprite2D" parent="."]
position = Vector2(138, -40)
texture = ExtResource("32_nglwe")

[node name="WallMirror3" type="Sprite2D" parent="."]
position = Vector2(-4, -55)
texture = ExtResource("33_mjqye")

[node name="BinSmall" type="Sprite2D" parent="."]
position = Vector2(-175, -28)
texture = ExtResource("34_65w6p")
Loading

0 comments on commit 286cba0

Please sign in to comment.