jerick/ClickerGacha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Boss fight rewards now update team inventory

Browse Source
This commit is contained in:
jerick
2024-06-12 08:48:21 -04:00
parent 4312c044d3
commit ee6fa21177
16 changed files with 534 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
User Interface/BossGrid.gd
View File

@@ -38,5 +38,7 @@ func _on_button_exited(button: TextureButton):
func _on_button_pressed(button: TextureButton, boss: Dictionary):
var character_manager = get_node("/root/@Control@14/UI/CharacterRoll")
character_manager.roll_character()
#var character_manager = get_node("/root/Root/UI/CharacterRoll")
#character_manager.roll_character()
$CharacterRoll.roll_character()

16
User Interface/Bossbutton.gd
View File

@@ -7,11 +7,13 @@ func _ready():
# Function to handle the button press
func _on_Button_pressed():
if Global.bossScreenVisible == false:
Global.bossScreenVisible = true
Global.teamScreenVisible = false
Global.teamSelectionVisible = false
else:
Global.bossScreenVisible = false
get_tree().change_scene_to_file("res://bossFights.tscn")
#if Global.bossScreenVisible == false:
#Global.bossScreenVisible = true
#Global.teamScreenVisible = false
#Global.teamSelectionVisible = false
#else:
#Global.bossScreenVisible = false
#
#

8
User Interface/CharacterRoll.gd
View File

@@ -14,7 +14,7 @@ func load_character_inventory():
if file:
var json_text = file.get_as_text()
file.close()
print("Loaded JSON text: ", json_text)
#print("Loaded JSON text: ", json_text)
var json_parser = JSON.new()
var json_result = json_parser.parse(json_text)
@@ -22,7 +22,7 @@ func load_character_inventory():
if json_result == OK:
#character_data = json_result.result.get("members", [])
character_data = json_parser.get_data()
print("Loaded character data: ", character_data)
#print("Loaded character data: ", character_data)
else:
print("Error parsing JSON: ", json_result.error_string)
else:
@@ -38,7 +38,7 @@ func save_character_inventory():
var json_text = JSON.stringify({ "members": getMembers })
file.store_string(json_text)
file.close()
print("Saved character data: ", json_text)
#print("Saved character data: ", json_text)
else:
print("Failed to open file: ", file_path)
@@ -48,7 +48,7 @@ func update_character(index, new_data):
if index >= 0 and index < character_data.size():
character_data[index] = new_data
save_character_inventory()
print("Updated character data: ", character_data[index])
#print("Updated character data: ", character_data[index])
else:
print("Invalid character index: ", index)

3
User Interface/Member1.gd
View File

@@ -17,7 +17,8 @@ func _process(delta):
# Function to handle the button press
func _on_Button_pressed():
#MemberDatabase.load_character_data()
get_tree().change_scene_to_file("res://teamSelection.tscn")
Global.currentMemberSelected = 0

2
User Interface/Member2.gd
View File

@@ -17,6 +17,8 @@ func _process(delta):
# Function to handle the button press
func _on_Button_pressed():
get_tree().change_scene_to_file("res://teamSelection.tscn")
Global.currentMemberSelected = 1
Global.teamScreenVisible = false

2
User Interface/Member3.gd
View File

@@ -17,6 +17,8 @@ func _process(delta):
# Function to handle the button press
func _on_Button_pressed():
#This is an array, numbers will not match
get_tree().change_scene_to_file("res://teamSelection.tscn")
Global.currentMemberSelected = 2
Global.teamScreenVisible = false

2
User Interface/Member4.gd
View File

@@ -17,6 +17,8 @@ func _process(delta):
# Function to handle the button press
func _on_Button_pressed():
get_tree().change_scene_to_file("res://teamSelection.tscn")
Global.currentMemberSelected = 3
Global.teamScreenVisible = false

2
User Interface/Member5.gd
View File

@@ -17,6 +17,8 @@ func _process(delta):
# Function to handle the button press
func _on_Button_pressed():
get_tree().change_scene_to_file("res://teamSelection.tscn")
Global.currentMemberSelected = 4
Global.teamScreenVisible = false

16
User Interface/TeamButton.gd
View File

@@ -7,12 +7,16 @@ func _ready():
# Function to handle the button press
func _on_Button_pressed():
if Global.teamScreenVisible == false:
Global.teamSelectionVisible = false
Global.teamScreenVisible = true
Global.bossScreenVisible = false
else:
Global.teamScreenVisible = false
#var new_scene = load("res://teamSelection.tscn")
get_tree().change_scene_to_file("res://team.tscn")
#if Global.teamScreenVisible == false:
#Global.teamSelectionVisible = false
#Global.teamScreenVisible = true
#Global.bossScreenVisible = false
#else:
#Global.teamScreenVisible = false

146
User Interface/UserInterface.tscn
View File

@@ -1,40 +1,9 @@
[gd_scene load_steps=22 format=3 uid="uid://xh0p6v5ir05f"]
[gd_scene load_steps=5 format=3 uid="uid://xh0p6v5ir05f"]
[ext_resource type="Script" path="res://Root.gd" id="1_dtx5s"]
[ext_resource type="Script" path="res://User Interface/TeamButton.gd" id="3_g0muc"]
[ext_resource type="Script" path="res://User Interface/Header.gd" id="3_q5rri"]
[ext_resource type="Script" path="res://User Interface/Member1.gd" id="4_4xump"]
[ext_resource type="Script" path="res://User Interface/Bossbutton.gd" id="4_7wp2t"]
[ext_resource type="Script" path="res://User Interface/AspectRatioContainer.gd" id="5_priim"]
[ext_resource type="Script" path="res://TeamSelection.gd" id="6_1cnw8"]
[ext_resource type="Script" path="res://User Interface/Member2.gd" id="6_spk65"]
[ext_resource type="Script" path="res://User Interface/Member3.gd" id="6_tuvg4"]
[ext_resource type="Script" path="res://User Interface/Member4.gd" id="7_5ow7k"]
[ext_resource type="Script" path="res://User Interface/Hank.gd" id="8_kx4m8"]
[ext_resource type="Script" path="res://User Interface/Member5.gd" id="8_n56qv"]
[ext_resource type="Script" path="res://User Interface/BossGrid.gd" id="12_16xc1"]
[ext_resource type="Script" path="res://User Interface/Boss1.gd" id="12_ullwe"]
[ext_resource type="Script" path="res://User Interface/CharacterRoll.gd" id="14_ox8ae"]
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_8gi0c"]
[sub_resource type="AtlasTexture" id="AtlasTexture_74gmg"]
atlas = SubResource("CompressedTexture2D_8gi0c")
region = Rect2(128, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_xmmtg"]
atlas = SubResource("CompressedTexture2D_8gi0c")
region = Rect2(96, 320, 32, 32)
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_pioex"]
[sub_resource type="AtlasTexture" id="AtlasTexture_l5qwh"]
atlas = SubResource("CompressedTexture2D_pioex")
region = Rect2(32, 416, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_t1ab2"]
atlas = SubResource("CompressedTexture2D_pioex")
region = Rect2(288, 416, 32, 32)
[node name="Root" type="Control"]
layout_mode = 3
@@ -158,116 +127,3 @@ text = "Multiplier:
[node name="Multiplier" type="Label" parent="UI/CanvasLayer/Header"]
layout_mode = 2
text = "0"
[node name="AspectRatioContainer" type="AspectRatioContainer" parent="UI"]
visible = false
layout_mode = 0
offset_left = -2.60654
offset_top = 271.396
offset_right = 1917.39
offset_bottom = 800.396
script = ExtResource("5_priim")
[node name="TeamScreen" type="HBoxContainer" parent="UI/AspectRatioContainer"]
visibility_layer = 2
layout_mode = 2
alignment = 1
[node name="Member1" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
script = ExtResource("4_4xump")
[node name="VSeparator" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Member2" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
script = ExtResource("6_spk65")
[node name="VSeparator2" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Member3" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
script = ExtResource("6_tuvg4")
[node name="VSeparator3" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Member4" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
script = ExtResource("7_5ow7k")
[node name="VSeparator4" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Member5" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
script = ExtResource("8_n56qv")
[node name="Label" type="Label" parent="UI/AspectRatioContainer/TeamScreen"]
visible = false
layout_mode = 2
text = "testtestsetsetsetsetsetsetset"
[node name="TeamSelection" type="GridContainer" parent="UI"]
visible = false
layout_mode = 0
offset_left = 3.0
offset_top = 40.0
offset_right = 1923.0
offset_bottom = 1120.0
columns = 10
script = ExtResource("6_1cnw8")
[node name="Hank" type="TextureButton" parent="UI/TeamSelection"]
visible = false
layout_mode = 2
texture_normal = SubResource("AtlasTexture_74gmg")
script = ExtResource("8_kx4m8")
memberClickAdd = 5
memberPerSec = 25
[node name="Rory" type="TextureButton" parent="UI/TeamSelection"]
visible = false
layout_mode = 2
texture_normal = SubResource("AtlasTexture_xmmtg")
[node name="TextureButton3" type="TextureButton" parent="UI/TeamSelection"]
visible = false
layout_mode = 2
texture_normal = SubResource("AtlasTexture_l5qwh")
[node name="TextureButton4" type="TextureButton" parent="UI/TeamSelection"]
visible = false
layout_mode = 2
texture_normal = SubResource("AtlasTexture_t1ab2")
[node name="BossFights" type="PanelContainer" parent="UI"]
visible = false
layout_mode = 0
offset_left = 857.0
offset_top = 294.0
offset_right = 1049.0
offset_bottom = 422.0
[node name="BossGrid" type="GridContainer" parent="UI/BossFights"]
layout_mode = 2
script = ExtResource("12_16xc1")
[node name="Boss1" type="TextureButton" parent="UI/BossFights/BossGrid"]
layout_mode = 2
script = ExtResource("12_ullwe")
[node name="CharacterRoll" type="PanelContainer" parent="UI"]
visible = false
layout_mode = 0
offset_top = 31.0
offset_right = 1917.0
offset_bottom = 1080.0
script = ExtResource("14_ox8ae")