Bugfixes

cporras · Nov 12, 2014 · 21dfc29 · 21dfc29
1 parent b6983c8
commit 21dfc29
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/export.cfg b/export.cfg
@@ -20,10 +20,10 @@ custom_package/debug=""
 custom_package/release=""
 keystore/release=""
 keystore/release_user=""
-package/icon=""
-package/name=""
+package/icon="res://icon.png"
+package/name="Virus Defence"
 package/signed=true
-package/unique_name="com.android.noname"
+package/unique_name="com.tropicalnihilism.virusdefence"
 permissions/access_checkin_properties=false
 permissions/access_coarse_location=false
 permissions/access_fine_location=false

diff --git a/resources/ui/multiplication.gd b/resources/ui/multiplication.gd
@@ -16,9 +16,9 @@ var rowYResult = [142,225,309];
 func _ready():
 	get_node("result").connect("pressed",self,"_on_result_pressed")
 	get_node("fakeResult1").connect("pressed",self,"_on_fakeResult_pressed")
-	get_node("fakeResult2").connect("pressed",self,"_on_fakeResult_pressed")
-	set_process(true);
+	get_node("fakeResult2").connect("pressed",self,"_on_fakeResult_pressed")	
 	setResult();
+	set_process(true);
 
 func setResult():
 	randomize();

diff --git a/scenes/mainMenu.xml b/scenes/mainMenu.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resource_file type="PackedScene" subresource_count="6" version="1.0" version_name="Godot Engine v1.0.3917-beta1">
+	<ext_resource path="res://assets/sprites/backgrounds/mainMenuBG.png" type="Texture"></ext_resource>
 	<ext_resource path="res://assets/fonts/xolonium/xolonium_60.fnt" type="Font"></ext_resource>
-	<ext_resource path="res://assets/fonts/xolonium/xolonium_50.fnt" type="Font"></ext_resource>
 	<ext_resource path="res://scenes/scripts/mainMenu.gd" type="Script"></ext_resource>
+	<ext_resource path="res://assets/fonts/xolonium/xolonium_50.fnt" type="Font"></ext_resource>
 	<ext_resource path="res://assets/sprites/ui/dialogButton.png" type="Texture"></ext_resource>
-	<ext_resource path="res://assets/sprites/backgrounds/mainMenuBG.png" type="Texture"></ext_resource>
 	<main_resource>
 		<dictionary name="_bundled" shared="false">
 			<string> "names" </string>
@@ -101,13 +101,17 @@
 						<string> "Script" </string>
 						<dictionary  shared="false">
 							<string> "current" </string>
-							<int> 1 </int>
+							<int> 0 </int>
 							<string> "sources" </string>
-							<array  len="4" shared="false">
+							<array  len="8" shared="false">
 								<string> "res://scenes/scripts/gameMenu.gd" </string>
 								<string> "res://scenes/scripts/mainMenu.gd" </string>
 								<string> "res://scenes/scripts/global.gd" </string>
 								<string> "res://scenes/scripts/game.gd" </string>
+								<string> "res://resources/ui/subtraction.gd" </string>
+								<string> "res://resources/ui/division.gd" </string>
+								<string> "res://resources/ui/multiplication.gd" </string>
+								<string> "res://resources/ui/sum.gd" </string>
 							</array>
 						</dictionary>
 						<string> "2D" </string>

diff --git a/scenes/scripts/gameMenu.gd b/scenes/scripts/gameMenu.gd
@@ -77,6 +77,9 @@ func processCooldown(delta):
 		get_node("antivirusButton/antivirusCooldown").set_scale(Vector2(1,1));
 		if !(get_node("antivirus2Button").disabled && get_node("firewallButton").disabled && get_node("bombButton").disabled):
 			get_node("antivirusButton").disabled = false;
+		elif (actualCooldownAntivirus2>0 && actualCooldownFirewall>0 && actualCooldownBomb>0):
+			get_node("antivirusButton").disabled = false;
+
 
 	if(actualCooldownAntivirus2>0):
 		actualCooldownAntivirus2-=delta;
@@ -93,6 +96,8 @@ func processCooldown(delta):
 		get_node("antivirus2Button/antivirus2Cooldown").set_scale(Vector2(1,1));
 		if !(get_node("antivirusButton").disabled && get_node("firewallButton").disabled && get_node("bombButton").disabled):
 			get_node("antivirus2Button").disabled = false;
+		elif (actualCooldownAntivirus>0 && actualCooldownFirewall>0 && actualCooldownBomb>0):
+			get_node("antivirus2Button").disabled = false;
 
 	if(actualCooldownFirewall>0):
 		actualCooldownFirewall-=delta;
@@ -109,6 +114,8 @@ func processCooldown(delta):
 		get_node("firewallButton/firewallCooldown").set_scale(Vector2(1,1));
 		if !(get_node("antivirusButton").disabled && get_node("antivirus2Button").disabled && get_node("bombButton").disabled):
 			get_node("firewallButton").disabled = false;
+		elif (actualCooldownAntivirus2>0 && actualCooldownAntivirus>0 && actualCooldownBomb>0):
+			get_node("firewallButton").disabled = false;
 
 	if(actualCooldownBomb>0):
 		actualCooldownBomb-=delta;
@@ -125,6 +132,8 @@ func processCooldown(delta):
 		get_node("bombButton/bombCooldown").set_scale(Vector2(1,1));
 		if !(get_node("antivirusButton").disabled && get_node("antivirus2Button").disabled && get_node("firewallButton").disabled):
 			get_node("bombButton").disabled = false;
+		elif (actualCooldownAntivirus2>0 && actualCooldownAntivirus>0 && actualCooldownFirewall>0):
+			get_node("bombButton").disabled = false;
 
 
 func setUnitCooldown(unitType,result):