diff --git a/assets/UI/Menu_Map.png b/assets/UI/Menu_Map.png new file mode 100644 index 0000000..e4be5a4 --- /dev/null +++ b/assets/UI/Menu_Map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad4cf292e86c82f2c945d16ed435b4313bfc7f8a29d0d3e1d14880a86b4fdf98 +size 360923 diff --git a/assets/UI/Menu_Map.png.import b/assets/UI/Menu_Map.png.import new file mode 100644 index 0000000..cd0b7b5 --- /dev/null +++ b/assets/UI/Menu_Map.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Menu_Map.png-af77eb6266496e0be2636e84fb856a78.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/UI/Menu_Map.png" +dest_files=[ "res://.import/Menu_Map.png-af77eb6266496e0be2636e84fb856a78.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/level/Console_MAT.material b/assets/level/Console_MAT.material new file mode 100644 index 0000000..f592757 --- /dev/null +++ b/assets/level/Console_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11d1803917ef7b42daebb7302fa9848eb06aef614ccb7466a64bbf2dd4ef7bf0 +size 3148746 diff --git a/assets/level/ConveyorBelt_MAT.material b/assets/level/ConveyorBelt_MAT.material new file mode 100644 index 0000000..47605be --- /dev/null +++ b/assets/level/ConveyorBelt_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08b67a283a0adf199efd760ada5168645d95d63a57decd0b98add428d212407e +size 2361899 diff --git a/assets/level/ConveyorWheels_MAT.material b/assets/level/ConveyorWheels_MAT.material new file mode 100644 index 0000000..7c4b20b --- /dev/null +++ b/assets/level/ConveyorWheels_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a7e3b4f54114172d3f15e669c4d3cda01b2e6854b44703437a4d1f224513ad0 +size 2361903 diff --git a/assets/level/CraftingTable_Arm_MAT.material b/assets/level/CraftingTable_Arm_MAT.material new file mode 100644 index 0000000..47586f4 --- /dev/null +++ b/assets/level/CraftingTable_Arm_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28eac03814b0d29c69bb8ce2d0e1048e94cce53b28035562021d8c3bbb571d1a +size 3148766 diff --git a/assets/level/CraftingTable_Console_MAT.material b/assets/level/CraftingTable_Console_MAT.material new file mode 100644 index 0000000..342f2d2 --- /dev/null +++ b/assets/level/CraftingTable_Console_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d27a496ad2297344c7fe154a4b771dc2f9b39d6087707e504408e46d8bbe0025 +size 3148774 diff --git a/assets/level/CraftingTable_Table_MAT.material b/assets/level/CraftingTable_Table_MAT.material new file mode 100644 index 0000000..322b5a5 --- /dev/null +++ b/assets/level/CraftingTable_Table_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebdfffb890eeb32a0724ccc3f5b47081b1bfd979948d8b9719f59fbf44af76e6 +size 3148770 diff --git a/assets/level/Excavator_MAT.material b/assets/level/Excavator_MAT.material new file mode 100644 index 0000000..f11a86c --- /dev/null +++ b/assets/level/Excavator_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a098c54d80a6273dbd2eac1a63fbdaea1391e24edb7aee23808c517fdcada9c1 +size 3148750 diff --git a/assets/level/HydroponicsStation_MAT.material b/assets/level/HydroponicsStation_MAT.material new file mode 100644 index 0000000..d88f029 --- /dev/null +++ b/assets/level/HydroponicsStation_MAT.material @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:236f77b555537b2288176fde5f8ad296cffe3f5acd21f456f6d9e5e9e5f15b31 +size 3148768 diff --git a/assets/level/Level.glb b/assets/level/Level.glb index eedf590..0ab41b2 100644 --- a/assets/level/Level.glb +++ b/assets/level/Level.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec36c0a7d871b22c3db6eb2a6826933de85687f0731ee0ac83e9b961c2b29efd -size 9731112 +oid sha256:a0093b936402171ccb31400b0742bb150630272cec6c09a464397802aa8e9531 +size 12428256 diff --git a/dialogic/folder_structure.json b/dialogic/folder_structure.json index 603269f..bf5786a 100644 --- a/dialogic/folder_structure.json +++ b/dialogic/folder_structure.json @@ -47,7 +47,9 @@ "timeline-1660454153.json", "timeline-1660463789.json", "timeline-1660696967.json", - "timeline-1660738067.json" + "timeline-1660738067.json", + "timeline-1661098482.json", + "timeline-1661098669.json" ], "folders": { diff --git a/dialogic/timelines/timeline-1661098482.json b/dialogic/timelines/timeline-1661098482.json new file mode 100644 index 0000000..e62bbbe --- /dev/null +++ b/dialogic/timelines/timeline-1661098482.json @@ -0,0 +1,15 @@ +{ + "events": [ + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "Crafting table lets you combine materials into advanced items. Hit the \"Start\" button to pull up the all recipes. Don't forget to grab a charge from the RTG" + } + ], + "metadata": { + "dialogic-version": "1.4.4", + "file": "timeline-1661098482.json", + "name": "crafting" + } +} diff --git a/dialogic/timelines/timeline-1661098669.json b/dialogic/timelines/timeline-1661098669.json new file mode 100644 index 0000000..40db434 --- /dev/null +++ b/dialogic/timelines/timeline-1661098669.json @@ -0,0 +1,15 @@ +{ + "events": [ + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "Ore Excavator mines Ore but it needs charge for each run. Grab some charge from the RTG!" + } + ], + "metadata": { + "dialogic-version": "1.4.4", + "file": "timeline-1661098669.json", + "name": "excavator" + } +} diff --git a/scenes/game_manager.tscn b/scenes/game_manager.tscn index bd00dbd..09c9a44 100644 --- a/scenes/game_manager.tscn +++ b/scenes/game_manager.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://scripts/game_manager.gd" type="Script" id=1] [ext_resource path="res://assets/UI/Menu_Recipes.png" type="Texture" id=2] -[ext_resource path="res://assets/tutorial/machine_repair.png" type="Texture" id=3] +[ext_resource path="res://assets/UI/Menu_Map.png" type="Texture" id=3] [ext_resource path="res://assets/Fonts/AlphaProta-Wy7VE.ttf" type="DynamicFontData" id=4] [ext_resource path="res://assets/UI/Timers.png" type="Texture" id=5] @@ -14,6 +14,9 @@ colors = PoolColorArray( 0, 0, 0, 1, 0, 0, 0, 0.429105, 0, 0, 0, 0 ) gradient = SubResource( 22 ) fill_to = Vector2( 0, 1 ) +[sub_resource type="StyleBoxFlat" id=23] +bg_color = Color( 0, 0, 0, 0.843137 ) + [sub_resource type="DynamicFont" id=2] size = 50 font_data = ExtResource( 4 ) @@ -57,14 +60,13 @@ visible = false anchor_right = 1.0 anchor_bottom = 1.0 rect_pivot_offset = Vector2( 989, 509 ) -size_flags_horizontal = 3 -size_flags_vertical = 3 +custom_styles/panel = SubResource( 23 ) -[node name="machine_repair" type="TextureRect" parent="UI/pause_menu"] -anchor_left = 0.466146 -anchor_top = 0.0962963 -anchor_right = 0.894272 -anchor_bottom = 0.666666 +[node name="map" type="TextureRect" parent="UI/pause_menu"] +anchor_left = 0.418229 +anchor_top = 0.135185 +anchor_right = 0.947917 +anchor_bottom = 0.840741 margin_left = 6.10352e-05 rect_pivot_offset = Vector2( -754, 325 ) texture = ExtResource( 3 ) @@ -75,10 +77,10 @@ __meta__ = { } [node name="recipes" type="TextureRect" parent="UI/pause_menu"] -anchor_left = 0.0427083 -anchor_top = 0.0592593 -anchor_right = 0.323438 -anchor_bottom = 0.925926 +anchor_left = 0.0994792 +anchor_top = 0.0611111 +anchor_right = 0.380209 +anchor_bottom = 0.927778 texture = ExtResource( 2 ) expand = true __meta__ = { @@ -92,10 +94,10 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = 166.0 -margin_top = -303.0 -margin_right = 529.0 -margin_bottom = -217.0 +margin_left = -35.0 +margin_top = -143.0 +margin_right = 328.0 +margin_bottom = -57.0 rect_pivot_offset = Vector2( 30.7864, 9.2928 ) custom_fonts/font = SubResource( 2 ) text = "RESUME" @@ -109,10 +111,10 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = 166.0 -margin_top = -184.0 -margin_right = 529.0 -margin_bottom = -98.0 +margin_left = 404.0 +margin_top = -143.0 +margin_right = 767.0 +margin_bottom = -57.0 rect_pivot_offset = Vector2( 30.7864, 9.2928 ) custom_fonts/font = SubResource( 2 ) text = "MAIN MENU" diff --git a/scenes/item_generator.tscn b/scenes/item_generator.tscn index 47cd612..1c50caa 100644 --- a/scenes/item_generator.tscn +++ b/scenes/item_generator.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scenes/coin_machine.tscn" type="PackedScene" id=1] [ext_resource path="res://scenes/item_holder.tscn" type="PackedScene" id=2] @@ -7,30 +7,6 @@ [ext_resource path="res://scenes/status_light.tscn" type="PackedScene" id=5] [ext_resource path="res://item_types/gem.tres" type="Resource" id=6] [ext_resource path="res://item_types/ore.tres" type="Resource" id=7] -[ext_resource path="res://assets/UI/Meter_Completion.png" type="Texture" id=8] - -[sub_resource type="Shader" id=1] -code = "shader_type canvas_item; //2D shader -render_mode unshaded, blend_disabled; // no bells and wistles -uniform sampler2D palette; //Uses palletes with colors in rows -uniform float palette_count = 1.0; //Tells the shader how many palettes you have -uniform float palette_index = 0.0; //Telss the shader which palette to choose - -void fragment(){ - float increment = 1.0/palette_count; //Value for getting palette index - float y = increment * palette_index + increment * 0.5; // + safety measure for floating point imprecision - vec4 color = texture(TEXTURE, UV); //Original graysscale color used as collumn index - vec4 new_color = texture(palette, vec2(color.r, y)); //get color from palette texture - float a = step(0.00392, color.a); //check if transparent color is less than 1/255 for backgrounds - new_color.a *= a; //if BG is transparent, then alpha is multiplied by 0 - - COLOR = new_color; //set new color from palette -}" - -[sub_resource type="ShaderMaterial" id=2] -shader = SubResource( 1 ) -shader_param/palette_count = 1.0 -shader_param/palette_index = 0.0 [node name="item_generator" type="Spatial"] transform = Transform( 1, 0, 3.57628e-07, 0, 1, 0, -3.57628e-07, 0, 1, 0.330428, 0, -8.57503 ) @@ -71,12 +47,6 @@ visible = false modulate = Color( 0, 0, 0, 1 ) text = "Progress: 20%" -[node name="Sprite3D" type="Sprite3D" parent="."] -transform = Transform( 0.132773, 0, -1.72258e-08, 0, 0.132773, 0, -1.72258e-08, 0, 0.18094, -0.0166484, 2.48385, 2.79593 ) -material_override = SubResource( 2 ) -billboard = 1 -texture = ExtResource( 8 ) - [connection signal="coin_requirement_met" from="coin_machine" to="." method="_on_coin_machine_coin_requirement_met"] [connection signal="timeout" from="gen_timer" to="." method="_on_gen_timer_timeout"] [connection signal="item_dump_completed" from="item_dump" to="." method="_on_item_dump_item_dump_completed"] diff --git a/scenes/main.tscn b/scenes/main.tscn index 0114466..a98ed44 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -417,6 +417,7 @@ start_broken = true [node name="CanvasLayer" type="CanvasLayer" parent="."] pause_mode = 1 +layer = 10 [node name="cheat_menu" parent="CanvasLayer" instance=ExtResource( 18 )]