Merge commit 'b4b1be6'

This commit is contained in:
Hellie-xd 2026-08-06 18:34:54 +02:00
commit 34f0ab1baa
16 changed files with 1583 additions and 14 deletions

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="singleClickDiffPreview" value="1" />
<option name="unhandledExceptionsIgnoreList" value="1" />
<option name="vcsConfiguration" value="3" />
</component>
</project>

92
.idea/workspace.xml Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="99f22860-264e-489b-877e-61129f28b4f2" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CopilotPersistence">
<persistenceIdMap>
<entry key="_D:/Projects/Godot/BreadwinnerDevenv/breadwinner" value="3H2w3YiFmjOPl6ga7cpYX6VyS2H" />
</persistenceIdMap>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitHubPullRequestSearchHistory"><![CDATA[{
"lastFilter": {
"state": "OPEN",
"assignee": "BenTheFire"
}
}]]></component>
<component name="GithubPullRequestsUISettings"><![CDATA[{
"selectedUrlAndAccountId": {
"url": "https://github.com/Hellie-xd/breadwinner.git",
"accountId": "9002da20-4c6b-4687-9473-5e65c1a6be5d"
}
}]]></component>
<component name="ProjectColorInfo"><![CDATA[{
"associatedIndex": 4
}]]></component>
<component name="ProjectId" id="3H2w3YiFmjOPl6ga7cpYX6VyS2H" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ModuleVcsDetector.initialDetectionPerformed": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "master",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="99f22860-264e-489b-877e-61129f28b4f2" name="Changes" comment="" />
<created>1785079273142</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1785079273142</updated>
<workItem from="1785079274668" duration="214000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
<component name="VcsManagerConfiguration">
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
<option name="timeStamp" value="1" />
</breakpoint>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
<option name="timeStamp" value="2" />
</breakpoint>
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
<properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
<option name="timeStamp" value="3" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="github-copilot-workspace">
<instructionFileLocations>
<option value=".github/instructions" />
</instructionFileLocations>
<promptFileLocations>
<option value=".github/prompts" />
</promptFileLocations>
</component>
</project>

View file

@ -0,0 +1,11 @@
Model Information:
* title: Tanır Makina Factory Building
* source: https://sketchfab.com/3d-models/tanr-makina-factory-building-ff70f7f34bfe4cd495c5fbf93b78f64d
* author: benhur taşkın (https://sketchfab.com/betaarch)
Model License:
* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
* requirements: Author must be credited. Commercial use is allowed.
If you use this 3D model in your project be sure to copy paste this credit wherever you share it:
This work is based on "Tanır Makina Factory Building" (https://sketchfab.com/3d-models/tanr-makina-factory-building-ff70f7f34bfe4cd495c5fbf93b78f64d) by benhur taşkın (https://sketchfab.com/betaarch) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,45 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://ckegaplyr85gw"
path="res://.godot/imported/scene.gltf-aae9bd898664ab8990923fb485d16e94.scn"
[deps]
source_file="res://assets/imported/tanr_makina_factory_building/scene.gltf"
dest_files=["res://.godot/imported/scene.gltf-aae9bd898664ab8990923fb485d16e94.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
mesh_library/use_node_names_as_mesh_names=false
array_mesh/deduplicate_surfaces=true
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
gltf/naming_version=2
gltf/embedded_image_handling=1
gltf/texture_map_mode=1

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View file

@ -0,0 +1,41 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bb1mul4ow806s"
path.s3tc="res://.godot/imported/Brick_Antique_01_baseColor.jpeg-5c80506e26c613887cdd20360f75bd54.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/imported/tanr_makina_factory_building/textures/Brick_Antique_01_baseColor.jpeg"
dest_files=["res://.godot/imported/Brick_Antique_01_baseColor.jpeg-5c80506e26c613887cdd20360f75bd54.s3tc.ctex"]
[params]
compress/mode=2
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=true
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=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View file

@ -0,0 +1,41 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c048iyekk6xir"
path.s3tc="res://.godot/imported/Polished_Concrete_New_baseColor.jpeg-378af847324f13509c870dfa54ab1c7a.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/imported/tanr_makina_factory_building/textures/Polished_Concrete_New_baseColor.jpeg"
dest_files=["res://.godot/imported/Polished_Concrete_New_baseColor.jpeg-378af847324f13509c870dfa54ab1c7a.s3tc.ctex"]
[params]
compress/mode=2
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=true
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=0

View file

@ -27,12 +27,12 @@
"state": {
"type": "markdown",
"state": {
"file": "game mechanics/The upgrain shop.md",
"file": "TLDR/MVP Functionality.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "The upgrain shop"
"title": "MVP Functionality"
}
}
],
@ -59,7 +59,7 @@
"autoReveal": false
},
"icon": "lucide-folder-closed",
"title": "Files"
"title": "Fájlkezelő"
}
},
{
@ -200,19 +200,22 @@
},
"left-ribbon": {
"hiddenItems": {
"switcher:Open quick switcher": false,
"graph:Open graph view": false,
"canvas:Create new canvas": false,
"daily-notes:Open today's daily note": false,
"templates:Insert template": false,
"command-palette:Open command palette": false,
"bases:Create new base": false
"switcher:Gyors váltó megnyitása": false,
"graph:Gráf nézet megnyitása": false,
"canvas:Új vászon létrehozása": false,
"daily-notes:Mai jegyzet megnyitása": false,
"templates:Sablon beszúrása": false,
"command-palette:Parancspaletta megnyitása": false,
"bases:Új bázis létrehozása": false
}
},
"active": "cc30646b046d3148",
"lastOpenFiles": [
"game mechanics/The safe zone computer.md",
"TLDR/MVP Assets.md",
"TLDR/MVP.md",
"game mechanics/The upgrain shop.md",
"thing groups/Equippable.md",
"game mechanics/The safe zone computer.md",
"thing groups/Player.md",
"game mechanics/Run.md",
"game mechanics/XP earning.md",
@ -227,14 +230,11 @@
"entities/IT.md",
"entities/PlayerEntity.md",
"TLDR/MVP Functionality.md",
"TLDR/MVP Assets.md",
"TLDR/MVP.md",
"TLDR",
"concepts and lore/Lore.md",
"game mechanics/The pawn shop.md",
"game mechanics/The safe zone.md",
"game mechanics/The PSA system.md",
"thing groups/Equippable.md",
"thing groups/Grabbable.md",
"thing groups/!Group rules.md",
"thing groups/Entity.md",

30
maps/test_map.tscn Normal file
View file

@ -0,0 +1,30 @@
[gd_scene format=3 uid="uid://b7e2tqywq2mn2"]
[ext_resource type="PackedScene" uid="uid://kqq30y24c6kd" path="res://scenes/player/player.tscn" id="5_svl6s"]
[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_riqys"]
[sub_resource type="PlaneMesh" id="PlaneMesh_wd2vj"]
size = Vector2(400, 400)
[node name="TestMap" type="Node3D" unique_id=308836329]
[node name="Buildings" type="Node" parent="." unique_id=965489406]
[node name="Plane" type="StaticBody3D" parent="." unique_id=1437285448]
collision_layer = 17
collision_mask = 17
metadata/_edit_lock_ = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="Plane" unique_id=1448952936]
transform = Transform3D(200, 0, 0, 0, 200, 0, 0, 0, 200, 0, 0, 0)
shape = SubResource("WorldBoundaryShape3D_riqys")
metadata/_edit_lock_ = true
[node name="MeshInstance3D" type="MeshInstance3D" parent="Plane" unique_id=1613862640]
transform = Transform3D(9.905844, 0, 0, 0, 1, 0, 0, 0, 9.900972, 0, 0, 0)
mesh = SubResource("PlaneMesh_wd2vj")
metadata/_edit_lock_ = true
[node name="Player" parent="." unique_id=423228143 instance=ExtResource("5_svl6s")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.252159, 0.66129565, -22.735443)

View file

@ -29,6 +29,7 @@ PlayerConsts="*uid://l2rc674shj03"
Sounds="*uid://c4vhdhbi2yu8i"
LoadingScreen="*uid://br8pa51piwxuy"
GrabbableBase="*uid://csj6ipagcwmeu"
Report="*uid://c76y0hv0jqdr3"
[display]

View file

@ -0,0 +1,63 @@
extends Node
# Node references matching the structure in kép.png
@onready var ui_control = $Control
@onready var title_input = $Control/MarginContainer/VboxContainer/TitleInput
@onready var body_input = $Control/MarginContainer/VboxContainer/BodyInput
@onready var send_button = $Control/MarginContainer/VboxContainer/Send
@onready var cancel_button = $Control/MarginContainer/VboxContainer/Cancel
func _ready():
# Hide the UI when the game starts
ui_control.visible = false
# Connect the button pressed signals to our functions
send_button.pressed.connect(_on_send_pressed)
cancel_button.pressed.connect(_on_cancel_pressed)
func _input(event):
# Listen for the F3 key press to toggle the menu
if event is InputEventKey and event.pressed and not event.echo:
if event.keycode == KEY_F3:
toggle_bug_report_screen()
func toggle_bug_report_screen():
ui_control.visible = !ui_control.visible
if ui_control.visible:
# Automatically focus the title input so the player can just start typing
title_input.grab_focus()
else:
# Clear out the text if the player closes the screen using F3
clear_inputs()
func _on_send_pressed():
var title_text = title_input.text.strip_edges()
var body_text = body_input.text.strip_edges()
# Basic validation to ensure they don't send an empty report
if title_text.is_empty() or body_text.is_empty():
print("Report incomplete: Please provide both a title and a description.")
return
# --- YOUR SENDING LOGIC GOES HERE ---
# e.g., HTTPRequest to a Discord webhook, Trello API, or custom backend
print("Sending Bug Report...")
print("Title: ", title_text)
print("Body: ", body_text)
# Close the menu after successfully sending
close_and_clear()
func _on_cancel_pressed():
# Close the menu without sending
close_and_clear()
func close_and_clear():
clear_inputs()
ui_control.visible = false
func clear_inputs():
# Resets the text fields for the next time the screen is opened
title_input.text = ""
body_input.text = ""

View file

@ -0,0 +1 @@
uid://jgnmtqhrtb05

View file

@ -0,0 +1,42 @@
[gd_scene format=3 uid="uid://c76y0hv0jqdr3"]
[ext_resource type="Script" uid="uid://jgnmtqhrtb05" path="res://scenes/ui/report/report.gd" id="1_38r6u"]
[node name="Report" type="Control" unique_id=1645877163]
layout_mode = 3
anchor_left = 0.3
anchor_right = 0.7
anchor_bottom = 0.193
grow_horizontal = 2
offset_transform_enabled = true
script = ExtResource("1_38r6u")
[node name="Control" type="PanelContainer" parent="." unique_id=1597361814]
layout_mode = 1
anchors_preset = -1
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
[node name="MarginContainer" type="MarginContainer" parent="Control" unique_id=799180659]
layout_mode = 2
theme_override_constants/margin_left = 5
theme_override_constants/margin_top = 5
theme_override_constants/margin_right = 5
theme_override_constants/margin_bottom = 5
[node name="VboxContainer" type="VBoxContainer" parent="Control/MarginContainer" unique_id=2024139519]
propagate_maximum_size = false
layout_mode = 2
[node name="TitleInput" type="TextEdit" parent="Control/MarginContainer/VboxContainer" unique_id=1382406886]
layout_mode = 2
[node name="BodyInput" type="TextEdit" parent="Control/MarginContainer/VboxContainer" unique_id=701008498]
layout_mode = 2
[node name="Send" type="Button" parent="Control/MarginContainer/VboxContainer" unique_id=1143343072]
layout_mode = 2
[node name="Cancel" type="Button" parent="Control/MarginContainer/VboxContainer" unique_id=43583698]
layout_mode = 2