Clean project from old files and optimize for build size.

Convert wav files to ogg. Remove CardFree scene and files. Add builds folder to gitignore
crystal-bit · Mar 22, 2020 · 5db5ed8 · 5db5ed8
1 parent 7ec60a0
commit 5db5ed8
Show file tree

Hide file tree

Showing 62 changed files with 201 additions and 727 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ export_presets.cfg
 .mono/
 
 # folder that I use for builds
+builds
 Builds
diff --git a/GameObjects/Card/Card.tscn b/GameObjects/Card/Card.tscn
@@ -3,10 +3,7 @@
 [ext_resource path="res://GameObjects/Card/Textures/cards_0.png" type="Texture" id=1]
 [ext_resource path="res://GameObjects/Card/Scripts/Card.gd" type="Script" id=2]
 [ext_resource path="res://Globals/Textures/cardstext_13-edit.png" type="Texture" id=3]
-[ext_resource path="res://GameScenes/Battle/Audio/sound-capture.wav" type="AudioStream" id=4]
-
-
-
+[ext_resource path="res://GameScenes/Battle/Audio/sound-capture.ogg" type="AudioStream" id=4]
 
 [sub_resource type="AtlasTexture" id=1]
 flags = 4
@@ -88,6 +85,9 @@ size_flags_vertical = 3
 texture_normal = SubResource( 1 )
 expand = true
 script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="PlayerGradient" type="TextureRect" parent="."]
 show_behind_parent = true
@@ -121,7 +121,6 @@ texture = SubResource( 5 )
 expand = true
 
 [node name="Attributes" type="GridContainer" parent="."]
-editor/display_folded = true
 margin_left = 18.0
 margin_top = 18.0
 margin_right = 96.0
@@ -216,4 +215,3 @@ margin_bottom = 14.0
 
 [node name="AudioCapture" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 4 )
-
diff --git a/GameObjects/Card/Scripts/Card.gd b/GameObjects/Card/Scripts/Card.gd
@@ -59,9 +59,9 @@ func _get_atlas_texture_by_group_and_index(c_group, c_index):
 	t.atlas = load(CARDS_PATH + "cards_{grp}.png".format({"grp": int(c_group)}))
 	# set the region
 	t.region = Rect2(
-		(int(c_index) % CARDS_PER_ROW)*CARD_WIDTH, 
-		(int(c_index) / CARDS_PER_ROW)*CARD_HEIGHT, 
-		CARD_WIDTH, 
+		(int(c_index) % CARDS_PER_ROW)*CARD_WIDTH,
+		(int(c_index) / CARDS_PER_ROW)*CARD_HEIGHT,
+		CARD_WIDTH,
 		CARD_HEIGHT
 	)
 	return t
@@ -84,7 +84,7 @@ func _load_cards_data_from_json():
 		# JSON is valid
 		return parse_json(file_data)
 	else:
-	    prints("Invalid JSON\n", error_str)
+		prints("Invalid JSON\n", error_str)
 
 func set_covered(is_covered):
 	covered = is_covered
@@ -110,4 +110,4 @@ func _on_SpinBox_value_changed(value):
 	_ready()
 
 func _on_CheckBox_toggled(button_pressed):
-	set_owned_by_player(button_pressed)
+	set_owned_by_player(button_pressed)
diff --git a/GameObjects/Card/Textures/cards_1.png.import b/GameObjects/Card/Textures/cards_1.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_1.png-3a29df96747ca31bf238124f6e97f98c.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_10.png.import b/GameObjects/Card/Textures/cards_10.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_10.png-1f0fbbed28d45ef53d1692697a55bc97.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_11.png.import b/GameObjects/Card/Textures/cards_11.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_11.png-35a8e4da8ecaa02827ca4c4fc5768ced.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_12.png.import b/GameObjects/Card/Textures/cards_12.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_12.png-8dab7497a35c92f38e90ca3ab8b757e1.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_13.png.import b/GameObjects/Card/Textures/cards_13.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_13.png-f73fa3da877e0ad116167c9f45f24001.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_2.png.import b/GameObjects/Card/Textures/cards_2.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_2.png-611cd9fef83939bc37f005a9939dbfd5.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_3.png.import b/GameObjects/Card/Textures/cards_3.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_3.png-ff7dfa5dd589fcad3b9058de96800769.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_4.png.import b/GameObjects/Card/Textures/cards_4.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_4.png-b3b14cb04c5db2ef45f4212294aa58b3.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_5.png.import b/GameObjects/Card/Textures/cards_5.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_5.png-7c39b1f53fb9949db2ab0355429216c4.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_6.png.import b/GameObjects/Card/Textures/cards_6.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_6.png-c2a8b7ec9232b7a937fe27521165b707.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_7.png.import b/GameObjects/Card/Textures/cards_7.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_7.png-513962c4d1bab7ef503d9789f40a6b09.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_8.png.import b/GameObjects/Card/Textures/cards_8.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_8.png-4858258b4467e13b7269f38943fbf09c.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
diff --git a/GameObjects/Card/Textures/cards_9.png.import b/GameObjects/Card/Textures/cards_9.png.import
@@ -6,6 +6,7 @@ path="res://.import/cards_9.png-b10fabc846f173e1961e6a223b9d922e.stex"
 metadata={
 "vram_texture": false
 }
+group_file="res://GameObjects/Card/Textures/atlas.png"
 
 [deps]
 
@@ -32,3 +33,4 @@ stream=false
 size_limit=0
 detect_3d=true
 svg/scale=1.0
+atlas_file="res://GameObjects/Card/Textures/atlas.png"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,5 @@ export_presets.cfg @@
     .mono/
     # folder that I use for builds
+    builds
     Builds