small fix

crowplexus · Apr 2, 2024 · c3e21b2 · c3e21b2
1 parent 6f674c9
commit c3e21b2
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 44 deletions.
diff --git a/assets/data/themes/raven_ui.tres b/assets/data/themes/raven_ui.tres
@@ -13,7 +13,7 @@ corner_radius_top_right = 16
 corner_radius_bottom_right = 16
 corner_radius_bottom_left = 16
 
-[sub_resource type="Image" id="Image_m8ltw"]
+[sub_resource type="Image" id="Image_jsd6d"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 76, 255, 255, 255, 75, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 99, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 99, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 122, 255, 255, 255, 191, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 191, 255, 255, 255, 121, 255, 255, 255, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 142, 255, 255, 255, 191, 255, 255, 255, 181, 255, 255, 255, 53, 255, 255, 255, 54, 255, 255, 255, 181, 255, 255, 255, 191, 255, 255, 255, 142, 255, 255, 255, 12, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 71, 255, 255, 255, 191, 255, 255, 255, 171, 255, 255, 255, 36, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 36, 255, 255, 255, 171, 255, 255, 255, 191, 255, 255, 255, 71, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 86, 255, 255, 255, 22, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 22, 255, 255, 255, 86, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 86, 255, 255, 255, 22, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 22, 255, 255, 255, 86, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 71, 255, 255, 255, 191, 255, 255, 255, 171, 255, 255, 255, 36, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 36, 255, 255, 255, 171, 255, 255, 255, 191, 255, 255, 255, 71, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 142, 255, 255, 255, 191, 255, 255, 255, 181, 255, 255, 255, 54, 255, 255, 255, 54, 255, 255, 255, 182, 255, 255, 255, 191, 255, 255, 255, 142, 255, 255, 255, 12, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 4, 255, 255, 255, 121, 255, 255, 255, 191, 255, 255, 255, 188, 255, 255, 255, 188, 255, 255, 255, 191, 255, 255, 255, 121, 255, 255, 255, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 98, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 98, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 75, 255, 255, 255, 75, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -23,7 +23,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_qipge"]
-image = SubResource("Image_m8ltw")
+image = SubResource("Image_jsd6d")
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l0vsp"]
 bg_color = Color(0, 0, 0, 0.588235)

diff --git a/assets/images/menus/main_menu/kickstarter.png.import b/assets/images/menus/main_menu/kickstarter.png.import
@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dux1hkbwc2cxv"
+uid="uid://h8w0gc6d81gd"
 path="res://.godot/imported/kickstarter.png-e0f052465faf80253246f27bfe9356cf.ctex"
 metadata={
 "vram_texture": false

diff --git a/assets/images/menus/main_menu/kickstarter.res b/assets/images/menus/main_menu/kickstarter.res
diff --git a/assets/images/menus/main_menu/play.png.import b/assets/images/menus/main_menu/play.png.import
@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dvs2o8wxkq8d5"
+uid="uid://micted5dlr1t"
 path="res://.godot/imported/play.png-be75b8131d1c3ef42ab849201360aeb9.ctex"
 metadata={
 "vram_texture": false

diff --git a/assets/images/menus/main_menu/play.res b/assets/images/menus/main_menu/play.res
diff --git a/export_presets.cfg b/export_presets.cfg
@@ -8,7 +8,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="out/Raven.exe"
+export_path="../Raven Window Build V1.0.0B/Raven.exe"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
@@ -71,7 +71,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../raven.x86_64"
+export_path="../Raven Linux Build V1.0.0B/Raven.x86_64"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false

diff --git a/project.godot b/project.godot
@@ -97,3 +97,7 @@ volume_down={
 
 locale/translations=PackedStringArray("res://assets/data/locale/texts.en.translation", "res://assets/data/locale/texts.es.translation", "res://assets/data/locale/texts.pt.translation", "res://assets/data/introText.es.translation", "res://assets/data/introText.pt.translation")
 locale/translations_pot_files=PackedStringArray("res://raven/game/menus/pause.tscn")
+
+[rendering]
+
+renderer/rendering_method="gl_compatibility"
diff --git a/raven/game/actors/face.gd b/raven/game/actors/face.gd
diff --git a/raven/game/actors/face.tscn b/raven/game/actors/face.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=14 format=3 uid="uid://d3u5kqi3tot20"]
 
 [ext_resource type="SpriteFrames" uid="uid://767msn3rj62k" path="res://assets/images/chars/custom/boyend.res" id="1_phsnm"]
-[ext_resource type="Script" path="res://raven/game/actors/face.gd" id="2_i4iap"]
+[ext_resource type="Script" path="res://raven/game/actors/character.gd" id="2_vpxl3"]
 
 [sub_resource type="Animation" id="Animation_3w263"]
 resource_name = "RESET"
@@ -126,8 +126,8 @@ tracks/2/keys = {
 "values": [Vector2(0, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_3p7pn"]
-resource_name = "singRIGHT"
+[sub_resource type="Animation" id="Animation_wm3cf"]
+resource_name = "singDOWNmiss"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -140,7 +140,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"left"]
+"values": [&"downmiss"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -164,11 +164,11 @@ tracks/2/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [Vector2(10, 0)]
+"values": [Vector2(0, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_e1rl6"]
-resource_name = "singLEFT"
+[sub_resource type="Animation" id="Animation_3p7pn"]
+resource_name = "singRIGHT"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -181,7 +181,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"right"]
+"values": [&"left"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -205,11 +205,11 @@ tracks/2/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [Vector2(0, 0)]
+"values": [Vector2(10, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_davws"]
-resource_name = "singUP"
+[sub_resource type="Animation" id="Animation_pg4m3"]
+resource_name = "singLEFTmiss"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -222,7 +222,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"up"]
+"values": [&"leftmiss"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -249,8 +249,8 @@ tracks/2/keys = {
 "values": [Vector2(0, 0.5)]
 }
 
-[sub_resource type="Animation" id="Animation_wm3cf"]
-resource_name = "singDOWNmiss"
+[sub_resource type="Animation" id="Animation_e1rl6"]
+resource_name = "singLEFT"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -263,7 +263,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"downmiss"]
+"values": [&"right"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -290,8 +290,8 @@ tracks/2/keys = {
 "values": [Vector2(0, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_pg4m3"]
-resource_name = "singLEFTmiss"
+[sub_resource type="Animation" id="Animation_eyyt0"]
+resource_name = "singRIGHTmiss"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -304,7 +304,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"leftmiss"]
+"values": [&"right"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -328,11 +328,11 @@ tracks/2/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [Vector2(0, 0.5)]
+"values": [Vector2(0, 0)]
 }
 
-[sub_resource type="Animation" id="Animation_eyyt0"]
-resource_name = "singRIGHTmiss"
+[sub_resource type="Animation" id="Animation_davws"]
+resource_name = "singUP"
 length = 0.0416709
 step = 0.0416667
 tracks/0/type = "value"
@@ -345,7 +345,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [&"right"]
+"values": [&"up"]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -369,7 +369,7 @@ tracks/2/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [Vector2(0, 0)]
+"values": [Vector2(0, 0.5)]
 }
 
 [sub_resource type="Animation" id="Animation_axw4x"]
@@ -431,7 +431,7 @@ _data = {
 texture_filter = 1
 sprite_frames = ExtResource("1_phsnm")
 animation = &"idle"
-script = ExtResource("2_i4iap")
+script = ExtResource("2_vpxl3")
 is_player = true
 
 [node name="anim" type="AnimationPlayer" parent="."]

diff --git a/raven/game/menus/main_menu.tscn b/raven/game/menus/main_menu.tscn
@@ -3,12 +3,12 @@
 [ext_resource type="Script" path="res://raven/game/menus/main_menu.gd" id="1_mokt2"]
 [ext_resource type="Texture2D" uid="uid://bli7f3ci8mlxa" path="res://assets/images/menus/menuBG.png" id="2_3e4k3"]
 [ext_resource type="Texture2D" uid="uid://bth4tolk5b84k" path="res://assets/images/menus/menuDesat.png" id="3_awav8"]
-[ext_resource type="SpriteFrames" uid="uid://bkuiknk4golyw" path="res://assets/images/menus/main_menu/play.res" id="4_fjbnc"]
+[ext_resource type="SpriteFrames" uid="uid://ci77orl43crd6" path="res://assets/images/menus/main_menu/play.res" id="4_fjbnc"]
 [ext_resource type="SpriteFrames" uid="uid://w180sq1lbj1p" path="res://assets/images/menus/main_menu/freeplay.res" id="4_qwuvt"]
 [ext_resource type="SpriteFrames" uid="uid://bob1sdn453x3b" path="res://assets/images/menus/main_menu/story.res" id="4_s1seb"]
 [ext_resource type="SpriteFrames" uid="uid://btpvkofwmc0xv" path="res://assets/images/menus/main_menu/donate.res" id="5_li2ux"]
 [ext_resource type="SpriteFrames" uid="uid://h01osq7vid6y" path="res://assets/images/menus/main_menu/options.res" id="6_yx8xw"]
-[ext_resource type="SpriteFrames" uid="uid://c2x4me3t1cet7" path="res://assets/images/menus/main_menu/kickstarter.res" id="7_8c5tk"]
+[ext_resource type="SpriteFrames" uid="uid://chnei4ocs7aq3" path="res://assets/images/menus/main_menu/kickstarter.res" id="7_8c5tk"]
 
 [node name="main_menu" type="Node2D"]
 script = ExtResource("1_mokt2")

diff --git a/raven/game/menus/title_screen.gd b/raven/game/menus/title_screen.gd
@@ -17,19 +17,30 @@ var intro_blobs: Array[PackedStringArray] = []
 var intro_display: PackedStringArray = ["my nuts", "itch"]
 
 func reload_intro_text():
-	if not ResourceLoader.exists("res://assets/data/introText.csv"): return
-	var text: String = FileAccess.open("res://assets/data/introText.csv", FileAccess.READ).get_as_text()
-	var split_text: PackedStringArray = text.dedent().split("\n")
+	var path: String = "res://assets/data/introText.csv"
+	if not ResourceLoader.exists(path): return
+
+	var intro_file: = FileAccess.open(path, FileAccess.READ)
+	if intro_file == null: return
 
+	var text: String = intro_file.get_as_text()
+	var split_text: PackedStringArray = text.dedent().split("\n")
 	intro_blobs.clear()
+
 	for i: int in split_text.size():
-		if i == 0 or split_text[i].is_empty(): continue
+		if i == 0 or split_text[i].is_empty():
+			continue
+
 		# cropping the text so we can properly translate
 		var erase_index: int = clampi(split_text[i].find(","), 0, split_text[i].length())
 		var eng_txt: String = split_text[i].erase(erase_index, split_text[i].length())
 		var text_array: PackedStringArray = tr(eng_txt).split("--")
+
 		if not text_array.is_empty() and text_array.size() > 1:
 			intro_blobs.append(text_array)
+
+	if not intro_blobs.is_empty():
+		intro_display = intro_blobs[intro_blobs.find(intro_blobs.pick_random())]
 
 func _ready():
 	await RenderingServer.frame_post_draw
@@ -39,8 +50,6 @@ func _ready():
 	Conductor.bpm = 102.0
 
 	reload_intro_text()
-	# this makes me dizzy.
-	intro_display = intro_blobs[intro_blobs.find(intro_blobs.pick_random())]
 
 	if not SoundBoard.bg_tracks.playing:
 		SoundBoard.play_track(load("res://assets/audio/bgm/freakyMenu.ogg"), true, 0.01)