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

Commit

Permalink
Shaperka (#145)
Browse files Browse the repository at this point in the history
* modre zabradli

* we have sewers!

* poo festival time

* plant shop + bin update

---------

Co-authored-by: shaperka <[email protected]>
  • Loading branch information
porkbrain and shaperka authored May 9, 2024
1 parent 8f7aa00 commit 0783013
Show file tree
Hide file tree
Showing 24 changed files with 255 additions and 75 deletions.
Binary file modified main_game/assets/downtown/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/downtown/bin_big.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/bin_big_empty.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/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 added 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 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 added 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/downtown/sewers_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/downtown/zabradli_blue.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/residential/indoors/counter.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 added main_game/assets/residential/indoors/kasa.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/residential/indoors/plant1.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 added main_game/assets/residential/indoors/plant2.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/residential/indoors/plant3.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 added main_game/assets/residential/indoors/shelf.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.
187 changes: 112 additions & 75 deletions main_game/assets/scenes/downtown.tscn

Large diffs are not rendered by default.

129 changes: 129 additions & 0 deletions main_game/assets/scenes/plant_shop.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
[gd_scene load_steps=16 format=3 uid="uid://dek7ps022pco7"]

[ext_resource type="Texture2D" uid="uid://c116mof5v4lgc" path="res://assets/downtown/plantshop_bg.png" id="1_bruju"]
[ext_resource type="Texture2D" uid="uid://5ywhhdx6rx7r" path="res://assets/downtown/recycle_bin.png" id="2_gim71"]
[ext_resource type="Texture2D" uid="uid://bsle4hh6l11lu" path="res://assets/residential/indoors/kasa.png" id="3_7v53w"]
[ext_resource type="Texture2D" uid="uid://brapyya5pqurk" path="res://assets/downtown/potted_bush.png" id="6_uoc65"]
[ext_resource type="Texture2D" uid="uid://b4n3d4xbt3n7t" path="res://assets/downtown/fire_ex.png" id="7_2xqcs"]
[ext_resource type="Texture2D" uid="uid://ccxxljf8a5ca6" path="res://assets/residential/indoors/shelf.png" id="8_52cf7"]
[ext_resource type="Texture2D" uid="uid://byf72ah4t7wx6" path="res://assets/residential/indoors/plant2.png" id="9_5sdla"]
[ext_resource type="Texture2D" uid="uid://2wr58b6rdevo" path="res://assets/residential/indoors/plant3.png" id="10_ejop8"]
[ext_resource type="Texture2D" uid="uid://uy06ivqk8lwk" path="res://assets/residential/indoors/plant1.png" id="11_xm18b"]
[ext_resource type="Texture2D" uid="uid://d3e4b27xcbekt" path="res://assets/residential/indoors/plant1_pink.png" id="12_8vj2d"]
[ext_resource type="Texture2D" uid="uid://b5b8jfmoq2513" path="res://assets/residential/indoors/counter_wide.png" id="13_f2gnt"]
[ext_resource type="Texture2D" uid="uid://xbqsfm2abqm5" path="res://assets/residential/indoors/plantshop_painting.png" id="13_fsohl"]
[ext_resource type="Texture2D" uid="uid://dvx0l0dj2hcr3" path="res://assets/residential/indoors/shelf_wide.png" id="14_afqnm"]
[ext_resource type="Texture2D" uid="uid://dw2ugjewuepxm" path="res://assets/residential/indoors/counter_wide_purple.png" id="15_c65y4"]
[ext_resource type="Texture2D" uid="uid://ck0d0ox20muxk" path="res://assets/residential/indoors/cupboard2.png" id="17_xg3n8"]

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

[node name="PlantshopBg" type="Sprite2D" parent="."]
position = Vector2(155, -79)
texture = ExtResource("1_bruju")

[node name="RecycleBin" type="Sprite2D" parent="."]
position = Vector2(343, -129)
texture = ExtResource("2_gim71")

[node name="PottedBush" type="Sprite2D" parent="."]
position = Vector2(63, -177)
texture = ExtResource("6_uoc65")

[node name="FireEx" type="Sprite2D" parent="."]
position = Vector2(343, -166)
texture = ExtResource("7_2xqcs")

[node name="Shelf" type="Sprite2D" parent="."]
position = Vector2(184, -195)
texture = ExtResource("8_52cf7")

[node name="Plant2" type="Sprite2D" parent="Shelf"]
position = Vector2(-17, -27)
texture = ExtResource("9_5sdla")

[node name="Plant3" type="Sprite2D" parent="Shelf"]
position = Vector2(-30, 7)
texture = ExtResource("10_ejop8")

[node name="Plant5" type="Sprite2D" parent="Shelf"]
position = Vector2(-19, 7)
texture = ExtResource("10_ejop8")
flip_h = true

[node name="Plant1" type="Sprite2D" parent="Shelf"]
position = Vector2(10, -36)
texture = ExtResource("11_xm18b")

[node name="Plant1Pink" type="Sprite2D" parent="Shelf"]
position = Vector2(19, -35.5)
texture = ExtResource("12_8vj2d")

[node name="Plant1Pink2" type="Sprite2D" parent="Shelf"]
position = Vector2(27, -35.5)
texture = ExtResource("12_8vj2d")

[node name="Plant4" type="Sprite2D" parent="Shelf"]
position = Vector2(-30, 21)
texture = ExtResource("10_ejop8")

[node name="PlantshopPainting" type="Sprite2D" parent="."]
position = Vector2(63, -215)
texture = ExtResource("13_fsohl")

[node name="ShelfWide" type="Sprite2D" parent="."]
position = Vector2(8, -195)
texture = ExtResource("14_afqnm")

[node name="Plant1Pink" type="Sprite2D" parent="ShelfWide"]
position = Vector2(25.5, 0.5)
texture = ExtResource("12_8vj2d")

[node name="Plant1" type="Sprite2D" parent="ShelfWide"]
position = Vector2(16.5, 0.5)
texture = ExtResource("11_xm18b")

[node name="Plant3" type="Sprite2D" parent="ShelfWide"]
position = Vector2(7.5, 0.5)
texture = ExtResource("10_ejop8")

[node name="Plant2" type="Sprite2D" parent="ShelfWide"]
position = Vector2(16, -9)
texture = ExtResource("9_5sdla")
flip_h = true

[node name="Plant4" type="Sprite2D" parent="ShelfWide"]
position = Vector2(33, -36)
texture = ExtResource("10_ejop8")

[node name="Cupboard2" type="Sprite2D" parent="."]
position = Vector2(100, -172)
texture = ExtResource("17_xg3n8")

[node name="CounterWide" type="Sprite2D" parent="."]
position = Vector2(286, -108)
texture = ExtResource("13_f2gnt")

[node name="Plant4" type="Sprite2D" parent="CounterWide"]
position = Vector2(39, -16)
texture = ExtResource("11_xm18b")

[node name="Kasa" type="Sprite2D" parent="CounterWide"]
position = Vector2(19, -18)
texture = ExtResource("3_7v53w")

[node name="CounterWidePurple" type="Sprite2D" parent="."]
position = Vector2(42, -115)
texture = ExtResource("15_c65y4")

[node name="CounterWidePurple2" type="Sprite2D" parent="."]
position = Vector2(42, -55)
texture = ExtResource("15_c65y4")

[node name="ShelfWide2" type="Sprite2D" parent="."]
position = Vector2(204, -32)
texture = ExtResource("14_afqnm")

[node name="ShelfWide3" type="Sprite2D" parent="."]
position = Vector2(301, -32)
texture = ExtResource("14_afqnm")
14 changes: 14 additions & 0 deletions main_game/assets/scenes/sewers.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_scene load_steps=3 format=3 uid="uid://cehfnn2h1xqt7"]

[ext_resource type="Texture2D" uid="uid://sit53g2cltgl" path="res://assets/downtown/sewers_bg.png" id="1_sy4gy"]
[ext_resource type="Texture2D" uid="uid://bflcaqeap0y6j" path="res://assets/downtown/bin_bag.png" id="2_w3jta"]

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

[node name="SewersBg" type="Sprite2D" parent="."]
position = Vector2(-280, -139)
texture = ExtResource("1_sy4gy")

[node name="BinBag" type="Sprite2D" parent="."]
position = Vector2(-78, -8)
texture = ExtResource("2_w3jta")

0 comments on commit 0783013

Please sign in to comment.