Globalized variables, team member consistency
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
extends Control
|
||||
|
||||
#https://www.youtube.com/watch?v=V79YabQZC1s
|
||||
#13:03
|
||||
|
||||
var score = 0
|
||||
var clickAdd = 1
|
||||
@@ -61,23 +59,45 @@ func _ready():
|
||||
$ClickUpgrades.get_popup().connect("id_pressed",clickUpgrade)
|
||||
$PassiveUpgrades.get_popup().connect("id_pressed",passiveUpgrade)
|
||||
$Timer.connect("timeout", _on_Timer_timeout)
|
||||
#$TeamButton.pressed.connect(self.openTeamWindow)
|
||||
#Code for the Click Me Button (deprecated)
|
||||
#$Click.pressed.connect(self._on_button_pressed)
|
||||
|
||||
|
||||
|
||||
#Prints all input events, only for debugging
|
||||
#func _input(event):
|
||||
#print(event.as_text())
|
||||
|
||||
func _on_Timer_timeout():
|
||||
score += scorePerSec * scoreMultiplier
|
||||
Global.globalScore += Global.globalScorePerSec * Global.globalScoreMultiplier
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
#Displays normal numbers until commas are needed
|
||||
if score > 999:
|
||||
if Global.globalScore > 999:
|
||||
$Score.text = str(scoreFormat(score))
|
||||
else:
|
||||
$Score.text = str(score) #Changes the score number
|
||||
$Score.text = str(Global.globalScore) #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
|
||||
|
||||
#Get the current status of any screens needed
|
||||
var teamScreen = get_node(Global.teamScreenPath)
|
||||
teamScreen.visible = Global.teamScreenVisible
|
||||
|
||||
var teamSelection = get_node(Global.teamSelectionPath)
|
||||
teamSelection.visible = Global.teamSelectionVisible
|
||||
|
||||
#This checks any input that comes in
|
||||
func _input(event):
|
||||
@@ -87,14 +107,11 @@ func _input(event):
|
||||
#_on_button_pressed()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#Formats the score string so commas are inserted
|
||||
func scoreFormat(score):
|
||||
# Convert value to string.
|
||||
var str_value: String = str(score)
|
||||
|
||||
var str_value: String = str(Global.globalScore)
|
||||
|
||||
# Loop backward starting at the last 3 digits,
|
||||
# add comma then, repeat every 3rd step.
|
||||
for i in range(str_value.length()-3, 0, -3):
|
||||
@@ -103,155 +120,155 @@ func scoreFormat(score):
|
||||
return score
|
||||
|
||||
func leftClick():
|
||||
score += clickAdd * scoreMultiplier
|
||||
Global.globalScore += Global.globalClickAdd * Global.globalScoreMultiplier
|
||||
|
||||
|
||||
func clickUpgrade(id):
|
||||
match id:
|
||||
0:
|
||||
if score >= clickUpgradeReq1:
|
||||
if Global.globalScore >= clickUpgradeReq1:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq1
|
||||
Global.globalScore -=clickUpgradeReq1
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt1
|
||||
Global.globalClickAdd += clickUpgradeAmt1
|
||||
else:
|
||||
print("not enough score")
|
||||
1:
|
||||
if score >= clickUpgradeReq10:
|
||||
if Global.globalScore >= clickUpgradeReq10:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq10
|
||||
Global.globalScore -=clickUpgradeReq10
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt10
|
||||
Global.globalClickAdd += clickUpgradeAmt10
|
||||
else:
|
||||
print("not enough score")
|
||||
2:
|
||||
if score >= clickUpgradeReq20:
|
||||
if Global.globalScore >= clickUpgradeReq20:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq20
|
||||
Global.globalScore -=clickUpgradeReq20
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt20
|
||||
Global.globalClickAdd += clickUpgradeAmt20
|
||||
else:
|
||||
print("not enough score")
|
||||
3:
|
||||
if score >= clickUpgradeReq40:
|
||||
if Global.globalScore >= clickUpgradeReq40:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq40
|
||||
Global.globalScore -=clickUpgradeReq40
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt40
|
||||
Global.globalClickAdd += clickUpgradeAmt40
|
||||
else:
|
||||
print("not enough score")
|
||||
4:
|
||||
if score >= clickUpgradeReq60:
|
||||
if Global.globalScore >= clickUpgradeReq60:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq60
|
||||
Global.globalScore -=clickUpgradeReq60
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt60
|
||||
Global.globalClickAdd += clickUpgradeAmt60
|
||||
else:
|
||||
print("not enough score")
|
||||
5:
|
||||
if score >= clickUpgradeReq80:
|
||||
if Global.globalScore >= clickUpgradeReq80:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq80
|
||||
Global.globalScore -=clickUpgradeReq80
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt80
|
||||
Global.globalClickAdd += clickUpgradeAmt80
|
||||
else:
|
||||
print("not enough score")
|
||||
6:
|
||||
if score >= clickUpgradeReq100:
|
||||
if Global.globalScore >= clickUpgradeReq100:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq100
|
||||
Global.globalScore -=clickUpgradeReq100
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt100
|
||||
Global.globalClickAdd += clickUpgradeAmt100
|
||||
else:
|
||||
print("not enough score")
|
||||
7:
|
||||
if score >= clickUpgradeReq200:
|
||||
if Global.globalScore >= clickUpgradeReq200:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq200
|
||||
Global.globalScore -=clickUpgradeReq200
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt200
|
||||
Global.globalClickAdd += clickUpgradeAmt200
|
||||
else:
|
||||
print("not enough score")
|
||||
8:
|
||||
if score >= clickUpgradeReq400:
|
||||
if Global.globalScore >= clickUpgradeReq400:
|
||||
print ("Score sufficient")
|
||||
score -=clickUpgradeReq400
|
||||
Global.globalScore -=clickUpgradeReq400
|
||||
$ClickUpgrades.get_popup().set_item_disabled(id, true)
|
||||
clickAdd += clickUpgradeAmt400
|
||||
Global.globalClickAdd += clickUpgradeAmt400
|
||||
else:
|
||||
print("not enough score")
|
||||
|
||||
func passiveUpgrade(id):
|
||||
match id:
|
||||
0:
|
||||
if score >= passiveUpgradeReq2:
|
||||
if Global.globalScore >= passiveUpgradeReq2:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq2
|
||||
Global.globalScore -=passiveUpgradeReq2
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt2
|
||||
Global.globalScorePerSec = passiveUpgradeAmt2
|
||||
else:
|
||||
print("not enough score")
|
||||
1:
|
||||
if score >= passiveUpgradeReq10:
|
||||
if Global.globalScore >= passiveUpgradeReq10:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq10
|
||||
Global.globalScore -=passiveUpgradeReq10
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt10
|
||||
Global.globalScorePerSec = passiveUpgradeAmt10
|
||||
else:
|
||||
print("not enough score")
|
||||
2:
|
||||
if score >= passiveUpgradeReq20:
|
||||
if Global.globalScore >= passiveUpgradeReq20:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq20
|
||||
Global.globalScore -=passiveUpgradeReq20
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt20
|
||||
Global.globalScorePerSec = passiveUpgradeAmt20
|
||||
else:
|
||||
print("not enough score")
|
||||
3:
|
||||
if score >= passiveUpgradeReq50:
|
||||
if Global.globalScore >= passiveUpgradeReq50:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq50
|
||||
Global.globalScore -=passiveUpgradeReq50
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt50
|
||||
Global.globalScorePerSec = passiveUpgradeAmt50
|
||||
else:
|
||||
print("not enough score")
|
||||
4:
|
||||
if score >= passiveUpgradeReq100:
|
||||
if Global.globalScore >= passiveUpgradeReq100:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq100
|
||||
Global.globalScore -=passiveUpgradeReq100
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt100
|
||||
Global.globalScorePerSec = passiveUpgradeAmt100
|
||||
else:
|
||||
print("not enough score")
|
||||
5:
|
||||
if score >= passiveUpgradeReq200:
|
||||
if Global.globalScore >= passiveUpgradeReq200:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq200
|
||||
Global.globalScore -=passiveUpgradeReq200
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt200
|
||||
Global.globalScorePerSec = passiveUpgradeAmt200
|
||||
else:
|
||||
print("not enough score")
|
||||
6:
|
||||
if score >= passiveUpgradeReq500:
|
||||
if Global.globalScore >= passiveUpgradeReq500:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq500
|
||||
Global.globalScore -=passiveUpgradeReq500
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt500
|
||||
Global.globalScorePerSec = passiveUpgradeAmt500
|
||||
else:
|
||||
print("not enough score")
|
||||
7:
|
||||
if score >= passiveUpgradeReq1000:
|
||||
if Global.globalScore >= passiveUpgradeReq1000:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq1000
|
||||
Global.globalScore -=passiveUpgradeReq1000
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt1000
|
||||
Global.globalScorePerSec = passiveUpgradeAmt1000
|
||||
else:
|
||||
print("not enough score")
|
||||
8:
|
||||
if score >= passiveUpgradeReq10000:
|
||||
if Global.globalScore >= passiveUpgradeReq10000:
|
||||
print ("Score sufficient")
|
||||
score -=passiveUpgradeReq10000
|
||||
Global.globalScore -=passiveUpgradeReq10000
|
||||
$PassiveUpgrades.get_popup().set_item_disabled(id, true)
|
||||
scorePerSec = passiveUpgradeAmt10000
|
||||
Global.globalScorePerSec = passiveUpgradeAmt10000
|
||||
else:
|
||||
print("not enough score")
|
||||
|
||||
Reference in New Issue
Block a user