Skip to content

Commit

Permalink
soulstone patch: add 15th charm
Browse files Browse the repository at this point in the history
  • Loading branch information
TinyTakinTeller committed Jan 11, 2025
1 parent a68d6d2 commit d00145a
Show file tree
Hide file tree
Showing 17 changed files with 45 additions and 19 deletions.
8 changes: 4 additions & 4 deletions assets/i18n/localization.csv
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,9 @@ npc_event_text:cat_talk_C0,dialogue line (cat npc),"You struck it down, all on y
npc_event_text:cat_intro_1,dialogue line (cat npc),"Your smell betrays your identity... You couldn't possibly be wholly human, now could you?",气味出卖了你的身份...你不可能完全是人类,对吧?,"Ton odeur trahie ton identité... Il parait peu probable que tu sois entièrement humain, n’est-ce pas ?","O seu cheiro revela sua identidade... Você não poderia ser humano por inteiro, poderia?"
npc_event_text:cat_intro_1_1,dialogue line (cat npc),"How curious. You look familiar, yet your scent... Unrecognizable.",真奇怪。你看起来很熟悉,但你的气味...我不认识。,"Comme c’est étrange. Tu semble familier, pourtant ton odeur... m’échappe.","Quão curioso. Você parece familiar, mas seu cheiro... Irreconhecível."
npc_event_text:cat_intro_1_2,dialogue line (cat npc),"I will... keep my distance, for now.",我会...暂时保持距离。,"Je vais... garder mes distances, pour le moment.","Eu vou... manter minha distância, por agora."
npc_event_text:cat_intro_0,dialogue line (cat npc),Meow. Meow. *Purr*,喵。喵。*呼噜*,Miaou. Miaou. *Ronron*,Miau. Miau.*Ronron*
npc_event_text:cat_intro_0,dialogue line (cat npc),Meow. Meow. *Purr*,喵。喵。*呼噜*,Miaou. Miaou. *Ronron*,Miaou. Miaou. *Ronron*
npc_event_text:cat_soul_crafted,dialogue line (cat npc),I knew you could do it...,我知道你能做到...,Je savais que tu en étais capable...,Eu sabia que você conseguiria.
npc_event_text:cat_soul_crafted_1,dialogue line (cat npc),I will be taking that now.,我现在会拿走它。,"Si tu le permets, je vais la prendre maintenant.",Eu vou ficar com isso agora.
npc_event_text:cat_soul_crafted_1,dialogue line (cat npc),I will be taking that now.,我现在会拿走它。,"Si tu le permets, je vais la prendre maintenant.","Eu vou ficar com isso agora."
npc_event_options:cat_intro,dialogue response options (cat npc),"[""Yes"", ""No""]","[""是"", ""否""]","[""Oui"", ""Non""]","[""Sim"", ""Não""]"
npc_event_options:cat_peek,dialogue response options (cat npc),[],[],[],[]
npc_event_options:cat_talk_A1,dialogue response options (cat npc),"[""?""]","[""?""]","[""?""]","[""?""]"
Expand Down Expand Up @@ -595,8 +595,8 @@ substance_text:the_magician_title,tarot card title,The Magician,魔术师,Le Mag
substance_text:the_magician_info,tarot card infobox description,"Learn ""Harvest Forest"", click all forest buttons at once.",学会“收获森林”,一次点击所有森林按钮。,Débloque le bouton « Exploiter la forêt » qui vous permet de cliquer l’ensemble des boutons d’un coup.,"Aprenda “Colher a Floresta”, clique em todos os botões da floresta de uma vez."
substance_text:the_fool_title,[DEPRECATED],The Fool,愚者,Le Fou,
substance_text:the_fool_info,[DEPRECATED],The Fool,愚者,Le Fou,
substance_text:the_high_priestess_title,[DEPRECATED],The High Priestess,女祭司,,
substance_text:the_high_priestess_info,[DEPRECATED],The High Priestess,女祭司,,
substance_text:the_high_priestess_title,prototype release 1.3,The High Priestess,女祭司,La Grande Prêtresse aussi,A Grande Sacerdotisa também
substance_text:the_high_priestess_info,prototype release 1.3,Soulstone harvest is multiplied by total number of collected singularities.,灵魂石收获会乘以收集到的奇点总数。,La récolte de pierres d'âme est multipliée par le nombre total de singularités collectées.,A quantidade de Pedra da Alma coletada é multiplicada por singularidades.
substance_text:the_lovers_title,[DEPRECATED],The Lovers,恋人,,
substance_text:the_lovers_info,[DEPRECATED],The Lovers,恋人,,
substance_text:justice_title,[DEPRECATED],Justice,正义,,
Expand Down
Binary file modified assets/i18n/localization.description.translation
Binary file not shown.
Binary file modified assets/i18n/localization.en.translation
Binary file not shown.
Binary file modified assets/i18n/localization.fr.translation
Binary file not shown.
Binary file modified assets/i18n/localization.pt.translation
Binary file not shown.
Binary file modified assets/i18n/localization.zh.translation
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://2qt1kqlusfe1"
path="res://.godot/imported/the_high_priestes_64_64.png-3acac6badd19c45408b85b091739308a.ctex"
path="res://.godot/imported/the_high_priestess_64_64.png-c870fa7501feff810ab36f4197ace1cf.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/image/substance/charm/the_high_priestes_64_64.png"
dest_files=["res://.godot/imported/the_high_priestes_64_64.png-3acac6badd19c45408b85b091739308a.ctex"]
source_file="res://assets/image/substance/charm/the_high_priestess_64_64.png"
dest_files=["res://.godot/imported/the_high_priestess_64_64.png-c870fa7501feff810ab36f4197ace1cf.ctex"]

[params]

Expand Down
2 changes: 1 addition & 1 deletion global/const/game.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const WORKER_RESOURCE_ID: String = "worker"
const WORKER_ROLE_RESOURCE: Array[String] = [WORKER_RESOURCE_ID, "swordsman"]

const VERSION_MAJOR: String = "prototype"
const VERSION_MINOR: String = "release 1.2b"
const VERSION_MINOR: String = "release 1.3"

const PARAMS: Dictionary = PARAMS_PROD #PARAMS_PROD #PARAMS_DEBUG

Expand Down
3 changes: 2 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Inspired by A Dark Room, the Dark Forest is an incremental experimental minimalistic game project.

THE GAME: (current version is `prototype.release.1.2`)
THE GAME: (current version is `prototype.release.1.3`)
- PLAY ON Itch https://tinytakinteller.itch.io/the-best-game-ever
- DEVLOGS ON Itch https://tinytakinteller.itch.io/the-best-game-ever/devlog

Expand All @@ -19,6 +19,7 @@ CONTRIBUTE:
- 07/10/2024 [`prototype.release.1.0`] **Added final boss fight, a short minigame ending.**
- 05/01/2025 [`prototype.release.1.1`] **Localization Update for French and Chinese (SC).** 🌎
- 08/01/2025 [`prototype.release.1.2`] **Localization Update for Portuguese (Brazilian).** 🌎
- 11/01/2025 [`prototype.release.1.3`] **Soulstone Patch: Added 15th Charm to fix endgame grind.**



Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[gd_resource type="Resource" script_class="SubstanceData" load_steps=2 format=3 uid="uid://cmkbtbegsx5ff"]

[ext_resource type="Script" path="res://resources/game_data/substance_data/substance_data.gd" id="1_p4of1"]

[resource]
script = ExtResource("1_p4of1")
color = Color(0.878431, 0.878431, 0.392157, 1)
order = 15
id = "the_high_priestess"
image_id = "the_high_priestess_64_64"
resource_costs = {
"singularity": 616
}
category_id = "charm"
hidden = true
unlocked_by = "death"
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ void fragment()
float shrink_width = 2.0 / width;
float shrink_height = 2.0 / height;
float dist = distance(vec2(UV.x * shrink_width, UV.y * shrink_height), vec2(0.5 * shrink_width, 0.5 * shrink_height));

float r = texture(SCREEN_TEXTURE, SCREEN_UV + vec2(SCREEN_PIXEL_SIZE*r_displacement), 0.0).r;
float g = texture(SCREEN_TEXTURE, SCREEN_UV + vec2(SCREEN_PIXEL_SIZE*g_displacement), 0.0).g;
float b = texture(SCREEN_TEXTURE, SCREEN_UV + vec2(SCREEN_PIXEL_SIZE*b_displacement), 0.0).b;

COLOR = vec4(r, g, b, dist - fade);
}
}
1 change: 0 additions & 1 deletion scenes/autostart/main/main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ theme_override_constants/margin_right = 0

[node name="VersionContainer" parent="CanvasLayer/MainControl/MainUI/MarginContainer/ScrollContainer/VBoxContainer/FooterHBoxContainer" instance=ExtResource("20_ynkq3")]
layout_mode = 2
theme_override_constants/margin_left = 0

[node name="DeveloperConsole" parent="CanvasLayer/MainControl/MainUI" instance=ExtResource("20_yijsf")]
visible = false
Expand Down
5 changes: 5 additions & 0 deletions scenes/controller/offline_controller/offline_controller.gd
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ func _progress_enemy_controller(
Limits.safe_mult(int(overkill_factor), max(1, (spirit_count + ratio) / ratio)),
)

var has_mult: bool = SaveFile.substances.get("the_high_priestess", 0) > 0
if has_mult:
var mult: int = SaveFile.resources.get("singularity", 0)
generated["soulstone"] = Limits.safe_mult(generated["soulstone"], mult)

return {"overkill_factor": overkill_factor, "damage": damage, "generated": generated}


Expand Down
6 changes: 3 additions & 3 deletions scenes/ui/info_container/info_container.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource type="Script" path="res://addons/label_font_auto_sizer/label_auto_sizer.gd" id="3_5af5u"]

[node name="InfoContainer" type="MarginContainer"]
size_flags_horizontal = 4
size_flags_horizontal = 3
size_flags_vertical = 4
theme_override_constants/margin_left = 4
theme_override_constants/margin_bottom = 4
Expand Down Expand Up @@ -37,10 +37,10 @@ unique_name_in_owner = true
visible = false
custom_minimum_size = Vector2(845, 30)
layout_mode = 2
theme_override_font_sizes/font_size = 14
theme_override_font_sizes/font_size = 13
text = "Venture on a hunt for some rare resources!Venture on a hunt for some rare resources!Venture on a hunt for some rare resources!"
autowrap_mode = 3
_current_font_size = 14
_current_font_size = 13

[node name="TitleLabel" type="Label" parent="MarginContainer/VBoxContainer"]
unique_name_in_owner = true
Expand Down
4 changes: 4 additions & 0 deletions scenes/ui/screen/darkness_screen/darkness_screen.gd
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ func _generate_soulstone(total_damage: int, source_id: String) -> void:
total_damage / health_points
)
if soulstone > 0:
var has_mult: bool = SaveFile.substances.get("the_high_priestess", 0) > 0
if has_mult:
var mult: int = SaveFile.resources.get("singularity", 0)
soulstone = Limits.safe_mult(soulstone, mult)
SignalBus.resource_generated.emit("soulstone", soulstone, self.name)


Expand Down
9 changes: 5 additions & 4 deletions scenes/ui/screen/world_screen/world_screen.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ _npc_id = "cat"
[node name="ExperienceMarginContainer" parent="." instance=ExtResource("4_p5w24")]
unique_name_in_owner = true
layout_mode = 2
theme_override_constants/margin_left = 12
theme_override_constants/margin_top = 12
theme_override_constants/margin_right = 12
theme_override_constants/margin_bottom = 12
theme_override_constants/margin_left = 8
theme_override_constants/margin_top = 8
theme_override_constants/margin_right = 8
theme_override_constants/margin_bottom = 8

[node name="AllButtonMarginContainer" type="MarginContainer" parent="."]
unique_name_in_owner = true
Expand All @@ -95,6 +95,7 @@ theme_override_constants/margin_right = 8

[node name="AllButton" type="Button" parent="AllButtonMarginContainer"]
unique_name_in_owner = true
z_index = -4096
custom_minimum_size = Vector2(80, 74)
layout_mode = 2
size_flags_horizontal = 0
Expand Down

0 comments on commit d00145a

Please sign in to comment.