zmiana sceny um, zmiana logiki

assets/fonts/IBMPlexMono-Regular.ttf.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://bsbgcege4jnpc"
+path="res://.godot/imported/IBMPlexMono-Regular.ttf-9776dfbf2ebf317ab969c1c02b95a7b0.fontdata"
+
+[deps]
+
+source_file="res://assets/fonts/IBMPlexMono-Regular.ttf"
+dest_files=["res://.godot/imported/IBMPlexMono-Regular.ttf-9776dfbf2ebf317ab969c1c02b95a7b0.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+disable_embedded_bitmaps=true
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+modulate_color_glyphs=false
+hinting=1
+subpixel_positioning=4
+keep_rounding_remainders=true
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}

assets/media/kiwi_netrunner.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bxg52gkts1l8u"
+path="res://.godot/imported/kiwi_netrunner.png-1f19ab8a68c8324719ace2102f134962.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/media/kiwi_netrunner.png"
+dest_files=["res://.godot/imported/kiwi_netrunner.png-1f19ab8a68c8324719ace2102f134962.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

assets/scripts/player.gd

@@ -0,0 +1,17 @@
+extends Node
+
+var stats: Dictionary = {
+	"INT": 0,
+	"REF": 0,
+	"ZW": 0,
+	"TECH": 0,
+	"CHA": 0,
+	"SW": 0,
+	"RUCH": 0,
+	"BC": 0,
+	"EMP": 0,
+	"PW": 0,
+	"CZL": 0,
+}
+
+var roll : int

assets/scripts/player.gd.uid

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

assets/templates/netrunner.json

@@ -142,7 +142,7 @@
 				"CZL": 0.0
 			}
 		},
-		"umiejetnosci": {
+		"um": {
 			"Atletyka": 2.0,
 			"Bijatyka": 2.0,
 			"Język (slang uliczny)": 2.0,

project.godot

@@ -16,7 +16,8 @@ config/features=PackedStringArray("4.5", "Forward Plus")
 
 [autoload]
 
-Global="*res://scenes/create_player/global.gd"
+Global="*res://assets/scripts/global.gd"
+Player="*res://assets/scripts/player.gd"
 
 [display]
 

scenes/create_player/metody.tscn

@@ -0,0 +1,39 @@
+[gd_scene load_steps=2 format=3 uid="uid://d152p3bvxhcv3"]
+
+[ext_resource type="ButtonGroup" uid="uid://blusey675offa" path="res://scenes/create_player/resource/metody_cb.tres" id="1_ofqhb"]
+
+[node name="Metody" type="GridContainer"]
+clip_contents = true
+offset_left = 464.0
+offset_top = 48.0
+offset_right = 654.0
+offset_bottom = 134.0
+columns = 2
+
+[node name="UlicznicyCB" type="CheckBox" parent="."]
+layout_mode = 2
+button_pressed = true
+button_group = ExtResource("1_ofqhb")
+flat = true
+
+[node name="Ulicznicy" type="Label" parent="."]
+layout_mode = 2
+text = "Ulicznicy"
+
+[node name="KrawedziarzCB" type="CheckBox" parent="."]
+layout_mode = 2
+disabled = true
+button_group = ExtResource("1_ofqhb")
+
+[node name="Krawedziarz" type="Label" parent="."]
+layout_mode = 2
+text = "Krawędziarz"
+
+[node name="KompletnyPakietCB" type="CheckBox" parent="."]
+layout_mode = 2
+disabled = true
+button_group = ExtResource("1_ofqhb")
+
+[node name="KompletnyPakiet" type="Label" parent="."]
+layout_mode = 2
+text = "Kompletny Pakiet"

scenes/create_player/new_character.gd

@@ -8,8 +8,8 @@ extends Control
 @onready var stats = $Stats
 @onready var roll_button = $Top/TopMenu/Roll
 @onready var quit_button = $Top/TopMenu/Quit
-@onready var um_container = $Umiejetnosci/GridContainer
+@onready var save_button = $Top/TopMenu/Save
-@onready var roll_label = $Stats/Roll2
+@onready var roll_label = $Top/TopMenu/Roll2
 
 enum Chum {
 	SOLO,
@@ -28,12 +28,12 @@ func _ready() -> void:
 
 	for stat in stats_group:
 		stat.text = "0"
-		
+
-	
-		
 	quit_button.pressed.connect(_on_button_quit_pressed)
 	roll_button.pressed.connect(_on_button_roll_pressed)
-
+	save_button.pressed.connect(_on_button_save_pressed)
+	
+	print(Player.stats)
 
 ## Metoda która wczytuje plik json zawierający szablony
 ## dla odpowiednich klas
@@ -51,77 +51,83 @@ func load_template():
 
 ## Metoda która zapisuje postać
 func save_character():
-	pass
+	var group_stats = get_tree().get_nodes_in_group("stats")
+	
+	for stat in group_stats:
+		print(stat.text)
 
 
 ## Główna metoda do tworzenia postaci
-func create_character(roll, chum: int) -> void:
+func create_character():
 	var stats_group = get_tree().get_nodes_in_group("stats")
 	var template = load_template()
-	var um
+	
-	var player
+	var roll = str(Global.rolld(10))
+	#var button_pressed = rola_cb.get_pressed_button()
+	var player: Dictionary = {}
+	var chum = 1
+	
+	roll_label.text = roll
+	
+	#match button_pressed.name:
+		#"SoloCB":
+			#chum = Chum.SOLO
+		#"NetrunnerCB":
+			#chum = Chum.NETRUNNER
+		#"KorpoCB":
+			#chum = Chum.KORPO
 	
 	match chum:
 		1:
-			player = template["netrunner"]["rolls"][roll]
+			if not player.has("stats"):
-			um = template["netrunner"]["umiejetnosci"]
+				player["stats"] = template["netrunner"]["rolls"][roll]
+			
+			if not player.has("um"):
+				player["um"] = template["netrunner"]["um"]
 		_:
 			print(":(")
 	
-	player["PW"] = wylicz_pw(player)
+	player["stats"]["PW"] = wylicz_pw(player)
-	player["CZL"] = wylicz_czl(player)
+	player["stats"]["CZL"] = wylicz_czl(player)
 	
 	if chum <= 1:
 		for i in range(stats_group.size()):
-			stats_group[i].text = str(int(player.values()[i]))
+			stats_group[i].text = str(int(player["stats"].values()[i]))
 			
 	var labels: Array[Label]
 	var um_place = "{name}: {value}"
 	
-	for i in range(um.size()):
+	for i in range(player["um"].size()):
 		var label: Label = Label.new()
-		label.name = um.keys()[i]
+		label.name = player["um"].keys()[i]
 		label.text = um_place.format(
-			{"name": um.keys()[i], "value": int(um.values()[i])})
+			{"name": player["um"].keys()[i], "value": int(player["um"].values()[i])}
+		)
 		labels.append(label)
-		
-	if um_container.get_child_count() == 0:
-		for label in labels:
-			um_container.add_child(label)
 
 
-func wylicz_pw(player) -> int:
+func wylicz_pw(_player) -> int:
-	var bc = player["INT"]
+	var bc = _player["stats"]["INT"]
-	var sw = player["SW"]
+	var sw = _player["stats"]["SW"]
 	
 	var pw = 10 + (5 * ceil(lerp(bc, sw, 0.5)))
 	
 	return pw
 
 
-func wylicz_czl(player) -> int:
+func wylicz_czl(_player) -> int:
-	var emp = player["EMP"]
+	var emp = _player["stats"]["EMP"]
 	var czl = emp * 10
 	
 	return czl
 
 func _on_button_roll_pressed() -> void:
-	var roll = str(Global.rolld(10))
+	create_character()
-	var button_pressed = rola_cb.get_pressed_button()
-	var chum
-	
-	roll_label.text = roll
-	
-	match button_pressed.name:
-		"SoloCB":
-			chum = Chum.SOLO
-		"NetrunnerCB":
-			chum = Chum.NETRUNNER
-		"KorpoCB":
-			chum = Chum.KORPO
-	
-	create_character(roll, chum)
 
 
 func _on_button_quit_pressed() -> void:
 	get_tree().quit()
+
+
+func _on_button_save_pressed() -> void:
+	save_character()

scenes/create_player/new_character.tscn

@@ -1,9 +1,11 @@
-[gd_scene load_steps=5 format=3 uid="uid://dt41bt5fi3t47"]
+[gd_scene load_steps=7 format=3 uid="uid://dt41bt5fi3t47"]
 
 [ext_resource type="Script" uid="uid://be8pfcpjesmal" path="res://scenes/create_player/new_character.gd" id="2_g4ktg"]
 [ext_resource type="Theme" uid="uid://dy41x4ott07ql" path="res://assets/themes/main_theme.tres" id="2_s4h7g"]
 [ext_resource type="ButtonGroup" uid="uid://b18rjpsr6uaw4" path="res://scenes/create_player/resource/rola_cb.tres" id="3_g4ktg"]
 [ext_resource type="ButtonGroup" uid="uid://blusey675offa" path="res://scenes/create_player/resource/metody_cb.tres" id="4_hip5e"]
+[ext_resource type="Texture2D" uid="uid://bscowe58v4ymo" path="res://assets/media/mis_portret.png" id="6_42lr2"]
+[ext_resource type="PackedScene" uid="uid://d0kdibg5kgwhn" path="res://scenes/create_player/stats.tscn" id="6_shm68"]
 
 [node name="NewCharacter" type="Control"]
 custom_minimum_size = Vector2(640, 480)
@@ -46,234 +48,43 @@ layout_mode = 2
 text = "Quit
 "
 
-[node name="Separator" type="VSeparator" parent="Top/TopMenu"]
-layout_mode = 2
-
 [node name="Save" type="Button" parent="Top/TopMenu"]
 layout_mode = 2
 text = "SAVE"
 
+[node name="Separator" type="VSeparator" parent="Top/TopMenu"]
+layout_mode = 2
+
 [node name="Roll" type="Button" parent="Top/TopMenu"]
 layout_mode = 2
 text = "ROLL"
 
-[node name="Test" type="Button" parent="Top/TopMenu"]
+[node name="Roll2" type="LineEdit" parent="Top/TopMenu"]
 layout_mode = 2
-text = "!! TEST !!"
 
 [node name="Ksywa" type="Label" parent="."]
 layout_mode = 0
-offset_left = 8.0
+offset_left = 296.0
-offset_top = 48.0
+offset_top = 72.0
-offset_right = 58.0
+offset_right = 526.0
-offset_bottom = 69.0
+offset_bottom = 93.0
-text = "Ksywa"
+text = "What's your name, chum?"
 
 [node name="KsywaInput" type="LineEdit" parent="."]
 layout_mode = 0
-offset_left = 64.0
+offset_left = 280.0
-offset_top = 48.0
+offset_top = 96.0
-offset_right = 320.0
+offset_right = 536.0
-offset_bottom = 77.0
-
-[node name="Rola" type="GridContainer" parent="."]
-clip_contents = true
-layout_mode = 0
-offset_left = 328.0
-offset_top = 48.0
-offset_right = 448.0
-offset_bottom = 134.0
-columns = 2
-
-[node name="NetrunnerCB" type="CheckBox" parent="Rola"]
-layout_mode = 2
-button_pressed = true
-button_group = ExtResource("3_g4ktg")
-
-[node name="Netrunner" type="Label" parent="Rola"]
-layout_mode = 2
-text = "Netrunner"
-
-[node name="SoloCB" type="CheckBox" parent="Rola"]
-layout_mode = 2
-disabled = true
-button_group = ExtResource("3_g4ktg")
-
-[node name="Solo" type="Label" parent="Rola"]
-layout_mode = 2
-text = "Solo"
-
-[node name="KorpoCB" type="CheckBox" parent="Rola"]
-layout_mode = 2
-disabled = true
-button_group = ExtResource("3_g4ktg")
-
-[node name="Korpo" type="Label" parent="Rola"]
-layout_mode = 2
-text = "Korpo"
-
-[node name="Metody" type="GridContainer" parent="."]
-clip_contents = true
-layout_mode = 0
-offset_left = 464.0
-offset_top = 48.0
-offset_right = 654.0
-offset_bottom = 134.0
-columns = 2
-
-[node name="UlicznicyCB" type="CheckBox" parent="Metody"]
-layout_mode = 2
-button_pressed = true
-button_group = ExtResource("4_hip5e")
-
-[node name="Ulicznicy" type="Label" parent="Metody"]
-layout_mode = 2
-text = "Ulicznicy"
-
-[node name="KrawedziarzCB" type="CheckBox" parent="Metody"]
-layout_mode = 2
-disabled = true
-button_group = ExtResource("4_hip5e")
-
-[node name="Krawedziarz" type="Label" parent="Metody"]
-layout_mode = 2
-text = "Krawędziarz"
-
-[node name="KompletnyPakietCB" type="CheckBox" parent="Metody"]
-layout_mode = 2
-disabled = true
-button_group = ExtResource("4_hip5e")
-
-[node name="KompletnyPakiet" type="Label" parent="Metody"]
-layout_mode = 2
-text = "Kompletny Pakiet"
-
-[node name="Stats" type="GridContainer" parent="."]
-layout_mode = 0
-offset_left = 696.0
-offset_top = 48.0
-offset_right = 788.0
-offset_bottom = 592.0
-columns = 2
-
-[node name="Inteligencja" type="Label" parent="Stats"]
-layout_mode = 2
-text = "INT"
-
-[node name="Int" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Refleks" type="Label" parent="Stats"]
-layout_mode = 2
-text = "REF"
-
-[node name="Ref" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Zwinnosc" type="Label" parent="Stats"]
-layout_mode = 2
-text = "ZW"
-
-[node name="Zw" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Technika" type="Label" parent="Stats"]
-layout_mode = 2
-text = "TECH"
-
-[node name="Tech" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Charakter" type="Label" parent="Stats"]
-layout_mode = 2
-text = "CHA"
-
-[node name="Cha" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="SilaWoli" type="Label" parent="Stats"]
-layout_mode = 2
-text = "SW"
-
-[node name="Sw" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Szcescie" type="Label" parent="Stats"]
-layout_mode = 2
-text = "SZ"
-
-[node name="Sz" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Ruch" type="Label" parent="Stats"]
-layout_mode = 2
-text = "RUCH"
-
-[node name="Ruch2" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="BudowaCiala" type="Label" parent="Stats"]
-layout_mode = 2
-text = "BC"
-
-[node name="Bc" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Empatia" type="Label" parent="Stats"]
-layout_mode = 2
-text = "EMP"
-
-[node name="Emp" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="PunktyWytrzymalosci" type="Label" parent="Stats"]
-layout_mode = 2
-text = "PW"
-
-[node name="Pw" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Czlowieczenstwo" type="Label" parent="Stats"]
-layout_mode = 2
-text = "CZŁ"
-
-[node name="Czl" type="LineEdit" parent="Stats" groups=["stats"]]
-layout_mode = 2
-editable = false
-
-[node name="Roll" type="Label" parent="Stats"]
-layout_mode = 2
-text = "ROLL"
-
-[node name="Roll2" type="LineEdit" parent="Stats"]
-layout_mode = 2
-editable = false
-
-[node name="Umiejetnosci2" type="Label" parent="."]
-layout_mode = 0
-offset_left = 8.0
-offset_top = 104.0
-offset_right = 128.0
 offset_bottom = 125.0
-text = "Umiejętności"
 
-[node name="Umiejetnosci" type="ScrollContainer" parent="."]
+[node name="Stats" parent="." instance=ExtResource("6_shm68")]
 layout_mode = 0
-offset_left = 8.0
+offset_left = 144.0
-offset_top = 136.0
+offset_top = 408.0
-offset_right = 688.0
+offset_right = 666.0
-offset_bottom = 592.0
+offset_bottom = 470.0
+columns = 12
 
-[node name="GridContainer" type="VBoxContainer" parent="Umiejetnosci"]
+[node name="MisPortret" type="Sprite2D" parent="."]
-layout_mode = 2
+position = Vector2(408, 264)
+texture = ExtResource("6_42lr2")

scenes/create_player/rola.tscn

@@ -0,0 +1,39 @@
+[gd_scene load_steps=2 format=3 uid="uid://8q45myatf7wj"]
+
+[ext_resource type="ButtonGroup" uid="uid://b18rjpsr6uaw4" path="res://scenes/create_player/resource/rola_cb.tres" id="1_es8ch"]
+
+[node name="Rola" type="GridContainer"]
+clip_contents = true
+offset_left = 328.0
+offset_top = 48.0
+offset_right = 448.0
+offset_bottom = 134.0
+columns = 2
+
+[node name="NetrunnerCB" type="CheckBox" parent="."]
+layout_mode = 2
+button_pressed = true
+button_group = ExtResource("1_es8ch")
+flat = true
+
+[node name="Netrunner" type="Label" parent="."]
+layout_mode = 2
+text = "Netrunner"
+
+[node name="SoloCB" type="CheckBox" parent="."]
+layout_mode = 2
+disabled = true
+button_group = ExtResource("1_es8ch")
+
+[node name="Solo" type="Label" parent="."]
+layout_mode = 2
+text = "Solo"
+
+[node name="KorpoCB" type="CheckBox" parent="."]
+layout_mode = 2
+disabled = true
+button_group = ExtResource("1_es8ch")
+
+[node name="Korpo" type="Label" parent="."]
+layout_mode = 2
+text = "Korpo"

scenes/create_player/stats.tscn

@@ -0,0 +1,101 @@
+[gd_scene format=3 uid="uid://d0kdibg5kgwhn"]
+
+[node name="Stats" type="GridContainer"]
+offset_right = 226.0
+offset_bottom = 206.0
+
+[node name="Inteligencja" type="Label" parent="."]
+layout_mode = 2
+text = "INT"
+
+[node name="Int" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Refleks" type="Label" parent="."]
+layout_mode = 2
+text = "REF"
+
+[node name="Ref" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Zwinnosc" type="Label" parent="."]
+layout_mode = 2
+text = "ZW"
+
+[node name="Zw" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Technika" type="Label" parent="."]
+layout_mode = 2
+text = "TECH"
+
+[node name="Tech" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Charakter" type="Label" parent="."]
+layout_mode = 2
+text = "CHA"
+
+[node name="Cha" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="SilaWoli" type="Label" parent="."]
+layout_mode = 2
+text = "SW"
+
+[node name="Sw" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Szcescie" type="Label" parent="."]
+layout_mode = 2
+text = "SZ"
+
+[node name="Sz" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Ruch" type="Label" parent="."]
+layout_mode = 2
+text = "RUCH"
+
+[node name="Ruch2" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="BudowaCiala" type="Label" parent="."]
+layout_mode = 2
+text = "BC"
+
+[node name="Bc" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Empatia" type="Label" parent="."]
+layout_mode = 2
+text = "EMP"
+
+[node name="Emp" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="PunktyWytrzymalosci" type="Label" parent="."]
+layout_mode = 2
+text = "PW"
+
+[node name="Pw" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false
+
+[node name="Czlowieczenstwo" type="Label" parent="."]
+layout_mode = 2
+text = "CZŁ"
+
+[node name="Czl" type="LineEdit" parent="." groups=["stats"]]
+layout_mode = 2
+editable = false

scenes/create_player/um.tscn

@@ -0,0 +1,27 @@
+[gd_scene format=3 uid="uid://cdqc1qybekixx"]
+
+[node name="Um" type="Control"]
+layout_mode = 3
+anchors_preset = 0
+
+[node name="ScrollContainer" type="TabContainer" parent="."]
+layout_mode = 0
+offset_left = 8.0
+offset_top = 56.0
+offset_right = 672.0
+offset_bottom = 464.0
+current_tab = 0
+
+[node name="Umiejetnosci" type="VBoxContainer" parent="ScrollContainer"]
+layout_mode = 2
+metadata/_tab_index = 0
+
+[node name="Wyposazenie" type="VBoxContainer" parent="ScrollContainer"]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 1
+
+[node name="Ekwipunek" type="VBoxContainer" parent="ScrollContainer"]
+visible = false
+layout_mode = 2
+metadata/_tab_index = 2