diff --git a/README.md b/README.md index 9385fac..e3cab54 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ - [x] Disk drives scavenge to disks of varying rarity worth $$$ - [x] scavenge rolls can produce nothing? - [x] balancing recipes -- [ ] sound effects -- [ ] mixed bag random? +- [ ] sound effects - stretch goal +- [ ] mixed bag random? - stretch goal Submission day: Jan 19th 8AM @@ -82,3 +82,15 @@ https://www.flaticon.com/free-icon/bin_484611 https://www.flaticon.com/free-icon/volume-up_6996058 Glyphs - https://kenney.nl/assets/input-prompts + +### Name Ideas +rust, hacking, looting, ewaste, repurposing, +- Rust to Ritches +- Ewaste Looting Simulator +- Ewaste, Just a week away +- Catgirl Rust Hacker +- reddit 2 +some sort of acronym - RUST, REDDIT, UTS, CAT, CATGIRL +- Reclaim U System Takeover + +https://cooltext.com/Edit-Logo?LogoID=5002855292&5002855292_Gradient2=Frost%20Black%2001 diff --git a/assets/ewaste anon.pdn b/assets/ewaste anon.pdn new file mode 100644 index 0000000..7222a2a Binary files /dev/null and b/assets/ewaste anon.pdn differ diff --git a/assets/ewaste anon.png b/assets/ewaste anon.png new file mode 100644 index 0000000..c62fc56 Binary files /dev/null and b/assets/ewaste anon.png differ diff --git a/assets/ewaste anon.png.import b/assets/ewaste anon.png.import new file mode 100644 index 0000000..c1b714e --- /dev/null +++ b/assets/ewaste anon.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dckkn322pbel4" +path="res://.godot/imported/ewaste anon.png-90ea395d196e2c1ae6816f05a8945715.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ewaste anon.png" +dest_files=["res://.godot/imported/ewaste anon.png-90ea395d196e2c1ae6816f05a8945715.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/logo/bg.png b/assets/logo/bg.png new file mode 100644 index 0000000..2e3f216 Binary files /dev/null and b/assets/logo/bg.png differ diff --git a/assets/logo/bg.png.import b/assets/logo/bg.png.import new file mode 100644 index 0000000..df4ecb8 --- /dev/null +++ b/assets/logo/bg.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://be1l34ysr6ewf" +path="res://.godot/imported/bg.png-5e5461f147e230a4f375e6da70014446.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/logo/bg.png" +dest_files=["res://.godot/imported/bg.png-5e5461f147e230a4f375e6da70014446.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/logo/game_name.png b/assets/logo/game_name.png new file mode 100644 index 0000000..33e413a Binary files /dev/null and b/assets/logo/game_name.png differ diff --git a/assets/logo/game_name.png.import b/assets/logo/game_name.png.import new file mode 100644 index 0000000..c5cd0dd --- /dev/null +++ b/assets/logo/game_name.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bx7x5ufcp3nmt" +path="res://.godot/imported/game_name.png-0b16858ffb255f79f6e29368e6a2dcd2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/logo/game_name.png" +dest_files=["res://.godot/imported/game_name.png-0b16858ffb255f79f6e29368e6a2dcd2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/logo/logo.pdn b/assets/logo/logo.pdn new file mode 100644 index 0000000..f110614 Binary files /dev/null and b/assets/logo/logo.pdn differ diff --git a/assets/logo/logo.png b/assets/logo/logo.png new file mode 100644 index 0000000..4516d5e Binary files /dev/null and b/assets/logo/logo.png differ diff --git a/assets/logo/logo.png.import b/assets/logo/logo.png.import new file mode 100644 index 0000000..51385cb --- /dev/null +++ b/assets/logo/logo.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://kqpy3aig5yb7" +path="res://.godot/imported/logo.png-017de6ce0c27066e3c0377ee024a25c8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/logo/logo.png" +dest_files=["res://.godot/imported/logo.png-017de6ce0c27066e3c0377ee024a25c8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/logo/sqaure.pdn b/assets/logo/sqaure.pdn new file mode 100644 index 0000000..65e4a71 Binary files /dev/null and b/assets/logo/sqaure.pdn differ diff --git a/assets/logo/sqaure.png b/assets/logo/sqaure.png new file mode 100644 index 0000000..59de9b3 Binary files /dev/null and b/assets/logo/sqaure.png differ diff --git a/assets/logo/sqaure.png.import b/assets/logo/sqaure.png.import new file mode 100644 index 0000000..54ab25c --- /dev/null +++ b/assets/logo/sqaure.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csov3hvc14ki4" +path="res://.godot/imported/sqaure.png-53d4e94c25bff1c778bfbafc905d2bfe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/logo/sqaure.png" +dest_files=["res://.godot/imported/sqaure.png-53d4e94c25bff1c778bfbafc905d2bfe.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/scenes/credits.tscn b/scenes/credits.tscn index b5ca442..d3ead3e 100644 --- a/scenes/credits.tscn +++ b/scenes/credits.tscn @@ -182,6 +182,7 @@ text = "[center]Icons[/center][ul] [url=https://www.flaticon.com/free-icon/renovation_2825738]Rennovation Icon by Freepik[/url] [url=https://www.flaticon.com/free-icon/home_25694]Home Icon by Dave Gandy[/url] [url=https://www.flaticon.com/free-icon/home_25694]Volume Icon by Bharat Icons[/url] +[url=https://kenney.nl/assets/input-prompts]Input Glyphs by Kenny[/url] [/ul][center]Items[/center][ul] [url=https://www.umart.com.au/product/corsair-cx750-series-750w-80-bronze-non-modular-atx-power-supply-cp-9020279-au-77539]Large Power Supply[/url] [url=https://sanmarcoscomputers.com/laptop-screen-repair/]Broken Laptop[/url] @@ -199,7 +200,10 @@ text = "[center]Icons[/center][ul] [url=https://www.advantech.com/emt/products/atx-power-supply/sub_2d9aae24-dfb2-4741-bec5-62dca5bc9cd3]Small Power Supply[/url] [url=https://www.ebay.com.au/itm/394942125788]SSD[/url] [url=https://www.fingers.co.in/computer-peripherals/power-protection-ups/fr--1250lcd]UPS[/url] -[url=https://simple.wikipedia.org/wiki/Compact_disc]Disc[/url]" +[url=https://simple.wikipedia.org/wiki/Compact_disc]Disc[/url] + + +" fit_content = true [node name="MenuButton" type="Button" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer"] diff --git a/scenes/manager/location_manager.gd b/scenes/manager/location_manager.gd index 0081d18..13cce5c 100644 --- a/scenes/manager/location_manager.gd +++ b/scenes/manager/location_manager.gd @@ -8,6 +8,7 @@ var block_moving = false @export var room_button : Button var current_location : Location @export var move_blocker_panel : PanelContainer +@export var selection_indicator : Panel enum Location{ ewaste, @@ -42,18 +43,24 @@ func _process(delta: float) -> void: room_button.self_modulate = normal_color func goto_ewaste(): + selection_indicator.reparent(ewaste_button) + selection_indicator.position = Vector2(0,0) if current_location == Location.ewaste: return current_location = Location.ewaste get_tree().change_scene_to_file("res://scenes/ewaste.tscn") func goto_workshop(): - if current_location == Location.workshop: - return + selection_indicator.reparent(workshop_button) + selection_indicator.position = Vector2(0,0) + #if current_location == Location.workshop: + #return current_location = Location.workshop get_tree().change_scene_to_file("res://scenes/workshop.tscn") func goto_room(): + selection_indicator.reparent(room_button) + selection_indicator.position = Vector2(0,0) if current_location == Location.room: return current_location = Location.room diff --git a/scenes/manager/locations panel.tscn b/scenes/manager/locations panel.tscn index 148618e..dd5d8f1 100644 --- a/scenes/manager/locations panel.tscn +++ b/scenes/manager/locations panel.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://b5dh55o5mgima"] +[gd_scene load_steps=8 format=3 uid="uid://b5dh55o5mgima"] [ext_resource type="Script" uid="uid://bxymsudka4nnb" path="res://scenes/manager/location_manager.gd" id="1_o5d0c"] [ext_resource type="Texture2D" uid="uid://m10v3leibbil" path="res://assets/icons/bin.png" id="2_qjxm7"] @@ -18,7 +18,24 @@ corner_radius_bottom_right = 3 corner_radius_bottom_left = 3 corner_detail = 5 -[node name="LocationManager" type="Control" node_paths=PackedStringArray("ewaste_button", "workshop_button", "room_button", "move_blocker_panel")] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qjxm7"] +content_margin_left = 0.0 +content_margin_top = 0.0 +content_margin_right = 0.0 +content_margin_bottom = 0.0 +bg_color = Color(0.101960786, 0.101960786, 0.101960786, 0) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_width_bottom = 3 +border_color = Color(1, 1, 0, 1) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[node name="LocationManager" type="Control" node_paths=PackedStringArray("ewaste_button", "workshop_button", "room_button", "move_blocker_panel", "selection_indicator")] z_index = 3 layout_mode = 3 anchors_preset = 15 @@ -34,6 +51,7 @@ ewaste_button = NodePath("PanelContainer/VBoxContainer/MoveEwaste") workshop_button = NodePath("PanelContainer/VBoxContainer/MoveWorkshop") room_button = NodePath("PanelContainer/VBoxContainer/MoveHome") move_blocker_panel = NodePath("Move blocker") +selection_indicator = NodePath("PanelContainer/VBoxContainer/MoveWorkshop/Selected") [node name="PanelContainer" type="PanelContainer" parent="."] layout_mode = 0 @@ -54,11 +72,22 @@ icon = ExtResource("2_qjxm7") layout_mode = 2 icon = ExtResource("3_1ogtx") +[node name="Selected" type="Panel" parent="PanelContainer/VBoxContainer/MoveWorkshop"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_qjxm7") + [node name="MoveHome" type="Button" parent="PanelContainer/VBoxContainer"] layout_mode = 2 icon = ExtResource("4_5p1uq") [node name="Move blocker" type="PanelContainer" parent="."] +visible = false layout_mode = 0 offset_left = 603.0 offset_top = 165.0 diff --git a/scenes/menu.gd b/scenes/menu.gd index a0bea95..6828e5a 100644 --- a/scenes/menu.gd +++ b/scenes/menu.gd @@ -23,8 +23,9 @@ func _on_play_button_pressed() -> void: PlayerInventory.show() Clock.show() Locations.show() - Locations.current_location = Locations.Location.workshop - get_tree().change_scene_to_file("res://scenes/workshop.tscn") + Locations.goto_workshop() + #Locations.current_location = Locations.Location.workshop + #get_tree().change_scene_to_file("res://scenes/workshop.tscn") func _on_credits_button_pressed() -> void: diff --git a/scenes/menu.tscn b/scenes/menu.tscn index f4e8041..46ac23e 100644 --- a/scenes/menu.tscn +++ b/scenes/menu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://dxr1ergmn3ij7"] +[gd_scene load_steps=4 format=3 uid="uid://dxr1ergmn3ij7"] [ext_resource type="Script" uid="uid://4c4k3o0jnmdk" path="res://scenes/menu.gd" id="1_vjb58"] [ext_resource type="Texture2D" uid="uid://b1rs6epjar6mj" path="res://assets/menu.png" id="2_con2f"] +[ext_resource type="Texture2D" uid="uid://bx7x5ufcp3nmt" path="res://assets/logo/game_name.png" id="3_con2f"] [node name="Menu" type="Control"] layout_mode = 3 @@ -52,7 +53,15 @@ theme_override_constants/margin_bottom = 5 layout_mode = 2 alignment = 1 +[node name="TextureRect" type="TextureRect" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 189.09) +layout_mode = 2 +texture = ExtResource("3_con2f") +expand_mode = 1 +stretch_mode = 5 + [node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/PanelContainer/MarginContainer/VBoxContainer"] +visible = false layout_mode = 2 bbcode_enabled = true text = "[center][font_size=50][wave](title pending)"