Team Selection, Damage Engine, Stat Allocation

This commit is contained in:
2024-06-05 12:05:12 -04:00
parent 341bf010d4
commit cdbba45795
93 changed files with 1996 additions and 210 deletions

View File

@@ -56,8 +56,8 @@ var passiveUpgradeAmt10000 = 10000
# Called when the node enters the scene tree for the first time.
func _ready():
$ClickUpgrades.get_popup().connect("id_pressed",clickUpgrade)
$PassiveUpgrades.get_popup().connect("id_pressed",passiveUpgrade)
#$ClickUpgrades.get_popup().connect("id_pressed",clickUpgrade)
#$PassiveUpgrades.get_popup().connect("id_pressed",passiveUpgrade)
$Timer.connect("timeout", _on_Timer_timeout)
@@ -67,30 +67,20 @@ func _ready():
#print(event.as_text())
func _on_Timer_timeout():
Global.globalScore += Global.globalScorePerSec * Global.globalScoreMultiplier
Global.globalDamage += Global.globalDamagePerSec * Global.globalDamageMultiplier
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta):
#Displays normal numbers until commas are needed
if Global.globalScore > 999:
if Global.globalDamage > 999:
$Score.text = str(scoreFormat(score))
else:
$Score.text = str(Global.globalScore) #Changes the score number
$Score.text = str(Global.globalDamage) #Changes the score number
$ClickAdd.text = str(Global.globalClickAdd)
$PerSec.text = str(Global.globalScorePerSec)
#Pulls the global score data to keep it up to date
#score = Global.globalScore
#Global.globalClickAdd = Global.globalClickAdd
#scorePerSec = Global.globalScorePerSec
#scoreMultiplier = Global.globalScoreMultiplier
#Stores the score stats in a global variable to be called in other scenes
#Global.globalScore = score
#Global.globalClickAdd = Global.globalClickAdd
#Global.globalScorePerSec = scorePerSec
#Global.globalScoreMultiplier = scoreMultiplier
$ClickAdd.text = str(Global.globalDamagePerClick)
$PerSec.text = str(Global.globalDamagePerSec)
$Multiplier.text = str(Global.globalDamageMultiplier)
#Get the current status of any screens needed
var teamScreen = get_node(Global.teamScreenPath)
@@ -110,7 +100,7 @@ func _input(event):
#Formats the score string so commas are inserted
func scoreFormat(score):
# Convert value to string.
var str_value: String = str(Global.globalScore)
var str_value: String = str(Global.globalDamage)
# Loop backward starting at the last 3 digits,
# add comma then, repeat every 3rd step.
@@ -120,155 +110,155 @@ func scoreFormat(score):
return score
func leftClick():
Global.globalScore += Global.globalClickAdd * Global.globalScoreMultiplier
Global.globalDamage += Global.globalDamagePerClick * Global.globalDamageMultiplier
func clickUpgrade(id):
match id:
0:
if Global.globalScore >= clickUpgradeReq1:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq1
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt1
else:
print("not enough score")
1:
if Global.globalScore >= clickUpgradeReq10:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq10
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt10
else:
print("not enough score")
2:
if Global.globalScore >= clickUpgradeReq20:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq20
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt20
else:
print("not enough score")
3:
if Global.globalScore >= clickUpgradeReq40:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq40
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt40
else:
print("not enough score")
4:
if Global.globalScore >= clickUpgradeReq60:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq60
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt60
else:
print("not enough score")
5:
if Global.globalScore >= clickUpgradeReq80:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq80
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt80
else:
print("not enough score")
6:
if Global.globalScore >= clickUpgradeReq100:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq100
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt100
else:
print("not enough score")
7:
if Global.globalScore >= clickUpgradeReq200:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq200
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt200
else:
print("not enough score")
8:
if Global.globalScore >= clickUpgradeReq400:
print ("Score sufficient")
Global.globalScore -=clickUpgradeReq400
$ClickUpgrades.get_popup().set_item_disabled(id, true)
Global.globalClickAdd += clickUpgradeAmt400
else:
print("not enough score")
func passiveUpgrade(id):
match id:
0:
if Global.globalScore >= passiveUpgradeReq2:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq2
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt2
else:
print("not enough score")
1:
if Global.globalScore >= passiveUpgradeReq10:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq10
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt10
else:
print("not enough score")
2:
if Global.globalScore >= passiveUpgradeReq20:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq20
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt20
else:
print("not enough score")
3:
if Global.globalScore >= passiveUpgradeReq50:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq50
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt50
else:
print("not enough score")
4:
if Global.globalScore >= passiveUpgradeReq100:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq100
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt100
else:
print("not enough score")
5:
if Global.globalScore >= passiveUpgradeReq200:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq200
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt200
else:
print("not enough score")
6:
if Global.globalScore >= passiveUpgradeReq500:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq500
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt500
else:
print("not enough score")
7:
if Global.globalScore >= passiveUpgradeReq1000:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq1000
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt1000
else:
print("not enough score")
8:
if Global.globalScore >= passiveUpgradeReq10000:
print ("Score sufficient")
Global.globalScore -=passiveUpgradeReq10000
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
Global.globalScorePerSec = passiveUpgradeAmt10000
else:
print("not enough score")
#func clickUpgrade(id):
#match id:
#0:
#if Global.globalDamage >= clickUpgradeReq1:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq1
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt1
#else:
#print("not enough score")
#1:
#if Global.globalDamage >= clickUpgradeReq10:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq10
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt10
#else:
#print("not enough score")
#2:
#if Global.globalDamage >= clickUpgradeReq20:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq20
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt20
#else:
#print("not enough score")
#3:
#if Global.globalDamage >= clickUpgradeReq40:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq40
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt40
#else:
#print("not enough score")
#4:
#if Global.globalDamage >= clickUpgradeReq60:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq60
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt60
#else:
#print("not enough score")
#5:
#if Global.globalDamage >= clickUpgradeReq80:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq80
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt80
#else:
#print("not enough score")
#6:
#if Global.globalDamage >= clickUpgradeReq100:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq100
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt100
#else:
#print("not enough score")
#7:
#if Global.globalDamage >= clickUpgradeReq200:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq200
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt200
#else:
#print("not enough score")
#8:
#if Global.globalDamage >= clickUpgradeReq400:
#print ("Score sufficient")
#Global.globalDamage -=clickUpgradeReq400
#$ClickUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerClick += clickUpgradeAmt400
#else:
#print("not enough score")
#
#func passiveUpgrade(id):
#match id:
#0:
#if Global.globalDamage >= passiveUpgradeReq2:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq2
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt2
#else:
#print("not enough score")
#1:
#if Global.globalDamage >= passiveUpgradeReq10:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq10
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt10
#else:
#print("not enough score")
#2:
#if Global.globalDamage >= passiveUpgradeReq20:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq20
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt20
#else:
#print("not enough score")
#3:
#if Global.globalDamage >= passiveUpgradeReq50:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq50
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt50
#else:
#print("not enough score")
#4:
#if Global.globalDamage >= passiveUpgradeReq100:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq100
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt100
#else:
#print("not enough score")
#5:
#if Global.globalDamage >= passiveUpgradeReq200:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq200
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt200
#else:
#print("not enough score")
#6:
#if Global.globalDamage >= passiveUpgradeReq500:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq500
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt500
#else:
#print("not enough score")
#7:
#if Global.globalDamage >= passiveUpgradeReq1000:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq1000
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt1000
#else:
#print("not enough score")
#8:
#if Global.globalDamage >= passiveUpgradeReq10000:
#print ("Score sufficient")
#Global.globalDamage -=passiveUpgradeReq10000
#$PassiveUpgrades.get_popup().set_item_disabled(id, true)
#Global.globalDamagePerSec = passiveUpgradeAmt10000
#else:
#print("not enough score")

View File

@@ -11,14 +11,16 @@ func _ready():
func _process(delta):
#Checks if the texture needs to be set
if Global.selected_texture:
self.texture_normal = Global.selected_texture
if Global.texture_member1:
self.texture_normal = Global.texture_member1
# Function to handle the button press
func _on_Button_pressed():
Global.currentMemberSelected = 0
Global.teamScreenVisible = false
Global.teamSelectionVisible = true

27
User Interface/Member2.gd Normal file
View File

@@ -0,0 +1,27 @@
extends TextureButton
# Called when the node enters the scene tree for the first time.
func _ready():
# Connect the pressed signal to the _on_Button_pressed function
self.connect("pressed", Callable(self, "_on_Button_pressed"))
func _process(delta):
#Checks if the texture needs to be set
if Global.texture_member2:
self.texture_normal = Global.texture_member2
# Function to handle the button press
func _on_Button_pressed():
Global.currentMemberSelected = 1
Global.teamScreenVisible = false
Global.teamSelectionVisible = true
#Function to set texture of the button

27
User Interface/Member3.gd Normal file
View File

@@ -0,0 +1,27 @@
extends TextureButton
# Called when the node enters the scene tree for the first time.
func _ready():
# Connect the pressed signal to the _on_Button_pressed function
self.connect("pressed", Callable(self, "_on_Button_pressed"))
func _process(delta):
#Checks if the texture needs to be set
if Global.texture_member3:
self.texture_normal = Global.texture_member3
# Function to handle the button press
func _on_Button_pressed():
#This is an array, numbers will not match
Global.currentMemberSelected = 2
Global.teamScreenVisible = false
Global.teamSelectionVisible = true
#Function to set texture of the button

27
User Interface/Member4.gd Normal file
View File

@@ -0,0 +1,27 @@
extends TextureButton
# Called when the node enters the scene tree for the first time.
func _ready():
# Connect the pressed signal to the _on_Button_pressed function
self.connect("pressed", Callable(self, "_on_Button_pressed"))
func _process(delta):
#Checks if the texture needs to be set
if Global.texture_member4:
self.texture_normal = Global.texture_member4
# Function to handle the button press
func _on_Button_pressed():
Global.currentMemberSelected = 3
Global.teamScreenVisible = false
Global.teamSelectionVisible = true
#Function to set texture of the button

27
User Interface/Member5.gd Normal file
View File

@@ -0,0 +1,27 @@
extends TextureButton
# Called when the node enters the scene tree for the first time.
func _ready():
# Connect the pressed signal to the _on_Button_pressed function
self.connect("pressed", Callable(self, "_on_Button_pressed"))
func _process(delta):
#Checks if the texture needs to be set
if Global.texture_member5:
self.texture_normal = Global.texture_member5
# Function to handle the button press
func _on_Button_pressed():
Global.currentMemberSelected = 4
Global.teamScreenVisible = false
Global.teamSelectionVisible = true
#Function to set texture of the button

View File

@@ -1,13 +1,16 @@
[gd_scene load_steps=14 format=3 uid="uid://xh0p6v5ir05f"]
[gd_scene load_steps=17 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="Texture2D" uid="uid://bfdqkquqtf6ir" path="res://Images/plus-icon-vector-illustration.jpg" id="4_gxo13"]
[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="Texture2D" uid="uid://b1kl4huy0vnin" path="res://Member/#1 - Transparent Icons.png" id="7_s2y5l"]
[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"]
[sub_resource type="AtlasTexture" id="AtlasTexture_74gmg"]
atlas = ExtResource("7_s2y5l")
@@ -64,6 +67,7 @@ text = "0"
autostart = true
[node name="ClickUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
visible = false
layout_mode = 2
text = "Click Upgrades"
item_count = 9
@@ -87,6 +91,7 @@ popup/item_8/text = "+400 Cost: 1,000,000,000"
popup/item_8/id = 8
[node name="PassiveUpgrades" type="MenuButton" parent="UI/CanvasLayer/Header"]
visible = false
layout_mode = 2
text = "Passive Upgrades"
item_count = 9
@@ -133,8 +138,16 @@ text = "PerSec:
layout_mode = 2
text = "0"
[node name="MultiplierLabel" type="Label" parent="UI/CanvasLayer/Header"]
layout_mode = 2
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
@@ -149,42 +162,39 @@ alignment = 1
[node name="Member1" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
texture_normal = ExtResource("4_gxo13")
ignore_texture_size = true
stretch_mode = 0
script = ExtResource("4_4xump")
[node name="VSeparator" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Button2" type="Button" parent="UI/AspectRatioContainer/TeamScreen"]
[node name="Member2" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
text = "Click Here"
script = ExtResource("6_spk65")
[node name="VSeparator2" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Button3" type="Button" parent="UI/AspectRatioContainer/TeamScreen"]
[node name="Member3" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
text = "Click Here"
script = ExtResource("6_tuvg4")
[node name="VSeparator3" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Button4" type="Button" parent="UI/AspectRatioContainer/TeamScreen"]
[node name="Member4" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
text = "Click Here"
script = ExtResource("7_5ow7k")
[node name="VSeparator4" type="VSeparator" parent="UI/AspectRatioContainer/TeamScreen"]
layout_mode = 2
[node name="Button5" type="Button" parent="UI/AspectRatioContainer/TeamScreen"]
[node name="Member5" type="TextureButton" parent="UI/AspectRatioContainer/TeamScreen"]
custom_minimum_size = Vector2(200, 10)
layout_mode = 2
text = "Click Here"
script = ExtResource("8_n56qv")
[node name="Label" type="Label" parent="UI/AspectRatioContainer/TeamScreen"]
visible = false
@@ -193,6 +203,7 @@ 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
@@ -201,6 +212,7 @@ 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")
@@ -208,13 +220,16 @@ 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")