From 7ee192cfce519d38b137a0686774ac923ef15298 Mon Sep 17 00:00:00 2001 From: TinyTakinTeller Date: Sat, 11 Jan 2025 22:31:47 +0100 Subject: [PATCH] soulstone patch: add 15th charm --- assets/i18n/localization.csv | 8 ++++---- .../i18n/localization.description.translation | Bin 29658 -> 29666 bytes assets/i18n/localization.en.translation | Bin 31698 -> 31730 bytes assets/i18n/localization.fr.translation | Bin 38217 -> 38313 bytes assets/i18n/localization.pt.translation | Bin 35965 -> 36057 bytes assets/i18n/localization.zh.translation | Bin 37017 -> 37061 bytes ...64_64.png => the_high_priestess_64_64.png} | Bin ...rt => the_high_priestess_64_64.png.import} | 6 +++--- global/const/game.gd | 2 +- .../tres/charm/the_high_priestess.tres | 16 ++++++++++++++++ .../chromatic_vignette.gdshader | 4 ++-- scenes/autostart/main/main.tscn | 1 - .../offline_controller/offline_controller.gd | 5 +++++ scenes/ui/info_container/info_container.tscn | 6 +++--- .../screen/darkness_screen/darkness_screen.gd | 4 ++++ .../ui/screen/world_screen/world_screen.tscn | 9 +++++---- 16 files changed, 43 insertions(+), 18 deletions(-) rename assets/image/substance/charm/{the_high_priestes_64_64.png => the_high_priestess_64_64.png} (100%) rename assets/image/substance/charm/{the_high_priestes_64_64.png.import => the_high_priestess_64_64.png.import} (74%) create mode 100644 resources/game_data/substance_data/tres/charm/the_high_priestess.tres diff --git a/assets/i18n/localization.csv b/assets/i18n/localization.csv index a9b1cb7..a3de5a0 100644 --- a/assets/i18n/localization.csv +++ b/assets/i18n/localization.csv @@ -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.","Si tu le permets, je vais la prendre maintenant." 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),"[""?""]","[""?""]","[""?""]","[""?""]" @@ -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,正义,, diff --git a/assets/i18n/localization.description.translation b/assets/i18n/localization.description.translation index 337970116d5c7899201a2a495aba460580408144..9c8d42c0a1cc387cbcaaaac7f3e3262edbd85f4a 100644 GIT binary patch delta 433 zcmZ9HKS&#K6vyv-QA8xwh~^sOzn~B#XMT~;6E$$PBB2QF(BTHbTf_{4IS_FWOt%y= zr0}4vDBKvNgOvx(P%woK4jrPCpcK(1&{71K8wAgv=;ZKyJidH*@B2M%;Ie^lQ8XKi zYw0B(gwc*4Y;~AWn?~tN=o6wWIz6;*>WUIl6eUce%f}9jZUOuvJM5y3{IE81B!Qp= z?)A)hV@HLeB;`IWg-7iiYz_S+Q;TDYa#|kCbfTR#Kb);Tuj4xxBjbQawVncAlNr6j zJc-^M{`2SF7GR3qzM3jMd(cOM?O2P7Ka?9PV}m?7OI#d|2e8b0@wZL*OMarD22%81 zU%)P%>lzZ|>3g`K%4i;C){?S=psYB=KDDPRIHPLH#R6Mnhrl)sq%C~l^|Vm&k18*U z@{2G`{N}vjsrX8{i2~-RF=63`%}JSMm9iNV*Hp}8(a-fvRlSd7YCweCmo*97({+Sc pyqX7QxisVGvCL{$;N8)&m2A5mTk(-ro*EQ$K9b`EdEXfc+yU&+jDi3F delta 415 zcmZvXJxD@f6o&76Eux|9*IQ~-7)W&MDZeY-&D&^Y(NaPEs;(#viiAX46SfPrn>umM;9Y}EAKU0Gzst#n;4?%1C0uJa=*Wjayp2r>K z22-$D8J!qG_G%wEI8U HPDdSIA5e%q diff --git a/assets/i18n/localization.en.translation b/assets/i18n/localization.en.translation index e62a7366004711b5cea7eb6ef1ab83ab2fd940c9..2098862f2efdeb0b57f2ec20040162c5d74c3518 100644 GIT binary patch delta 459 zcmWlUF=!KE7>4itn{us`MvKjFY^~MG9cqqKqRF)!UQLlmv_=v!V8tv-1+iDHE`r=5 z1aZjl331U(lF2H3N~c;8p^8YQh$4aomx2gI9U>@={|yg(eDCr+%T4@h;z=LclQUQR z3p|K{C|23q=mF0t*i^$mmOX#bp3pSyILXZ|Tw~d519vDJtMC4k*0hM4LWBZ}t_N=8 zuKIVXdxN5T`b62HsFc`FrZh#HLnq~w=yCXkoCR*NA5R01sIfJ`0W$m6uuQUl5(WqT zI`EDw+ZKfAcIfEfI^J@2hc0lR@ig;#VQ>E;@Rjsr2{|q& zZGkna9;}F7hqj~+;X9X7O@VKe9}Yx^L+^)A<2Rcl$}dB<>){OfZWgb2&YctZ!oDYg z^HdpKz!GH-FJYc#W&*g(Gh>Q~dHq1X0xzwuMcFVqxq*Y8{Ju delta 427 zcmWm9F=!KU6vy%V{Y|)5s%dTO-`G?ltsc^bYbm`ytyaKtc-L6SpVwT}D&+5*X)A@diNC`ofw8VEsSy>dPir>jSpunZ50(Pi=*@q-+v6lba9JHNe^}2PwopGaLJW`N0mE= tcuC&EF`ltpybomg@zSC?mohr3o}1g9?3#1;IX5>#=nL$Dd3j}d=|53ZfpP!< diff --git a/assets/i18n/localization.fr.translation b/assets/i18n/localization.fr.translation index 61b580eca2832a4a0b595fe98d6a3ab4110106bc..b13a9b0d637737b5d676c8916b02ca09e5eeb3df 100644 GIT binary patch delta 523 zcmYk3Ur1A77{w1FehnCh8*auDdY0C~xAdbE2S&-^=?xzncf%cjLS;!Jqq4 z85wF$wTOCz*5HAtbEL{a6euna;1$iwpDShC`>9yBfRiHQYXQ#C%k?G} zN%eojc~Szsm>0tV2^bO&Hq3BLQmnp=K@n?^I8IZ1(`}fvWX~Cq*&KA?qIeqYtUy2g z+-h>kpmU9JU+;fq{*`(oO@AMyrN(ER8I%ttaYA^ug~6*0(!;a(MJt-daF>crd3+Jk z?Q_6Y@lQ}6lt-w8;^v#!|wN$+BBWJ3^KJ2 zq{OT?#c@ewbQyfLLD^l?NK6 z`Cu_ScJ4yjyLZ&Bt@Jm@b!8qbjr30(x}bOuXjwZl)AM zAxEsRBOCqzWp6XGVafF>i_fXk_nhd&-GMkMMT*Dk@yxOd4OvjxpREJg6v>IA zpOxHq*i#Lg4K@o>@;{KqN`VSwkXab7>9(X~OZq~5jaWEhzCFj^iq$)p{L?E`A=B8>pm&RcAOUdUR9utVy)|#B1O~T;W_PH zpq2vdVT{mI`#3sT>#*`gsLQ8|9fQKY0p#+H??Rx8L%IxcY*4iO3No2J56EGqcM{^l W;I%%P zLx@xY>(Czz2?)x7MiVAUVQQ4sh{7VujKLX1Ylt%U4?~D35qWrDLgW4*xxagF&iS2> zd(OEJ-r}zwh$qDR+BJE7zRD2!-MOk7^gaitu`l{3&I+{jp5 z5Ql$a8=b?2i85`*$i#@aqL$;#jG-aLysH0u%|1l+UiuW5^^MdIX;O$R=$aIve_);L zpq21X9>{v;DUNe8yM>UZL@0=!DJ}X_9*$!!xfX`%!`=sbAmw&aF?w@lnvG%X$dg|%?HJ}k1J9r_#vgIV_KvdBt@AgjunGd*gj0}d06`%{ zNnB=9@q5f;6CmKO<8qGk+<_4FC+Mu9e=&gc*m3db#A zCZR_`wZK0-o7rB8s8J@M*VxWy`cPq#=ywE7^?bS;F;fF8zG{-`2qber+*`+SY;ns* z`8br=QvWBS<`65UY8L2o7%Va?uVNAOy)KR$%eWerJm~mx0L>N$YigIptM{-*nwUJF z;Z|hh^xGJ+w2&Kqt3bEVY?bK*qEN9q9to2=V09e4^)|KG8&PAULg) z1ss_c(4S|C6*59GL&nI4b5ZyU9CQQWf&iItneE@hS}2nPb%kv-j6Qb1kD)?2YX^I- zjaik!AXQK|{E|%T;+rLb=xs!0fsWy%?4a*3D9f}DsvM$)@z&`HqE&Hwk(bDc))}(? z26HoxxzUh!?QTsDPRHNar&8ZePMk@dv!! zhodD59Y(UmLA#-|d-<^*1ndf#5w#zk)W`~#YFB1|biy1TybgtW5q3nxBH#amn~MLh zdCg51tfigw5qe4m@m@X0)v&Bb&qwp}%i-%@46PwM!*^N{RdwGaH!IAO^U5Dh9 z>2>&>0?WJE*)A>|^{7f|^P$~c zM_st!e#k!Z1y36(P!w5Q@|f)Qk1IIqMOYDN9=endX*K*_2gTxHuRvloYePDVry-T& zK-#Mx+t4#7Mu*T)(?Vy_$M*e@Y8z=4!nGIaIO^tB^YeZ29dnnuvO}Bfw#6?#uN_Ff zGTpp1Qzw0s{q6X*X|JiPvtJssao5(Vp7p14=4Tnx;=9eB9C4kqfiRB!W6p6T3>qh=5j9gB<1n8<=g%(98mIDAF7M2DUxH0d8p?ss!@&Uaql zId}F|>FNRL-2z&^V_Uz!Ayz^|8T10iEyMIU%uFxsKqND&ZgvV$BZO#R&=P(~-BQ{E zPu3tE#i=Zv`mvA|R=e7TC}c()3FfSPd3zHgvWvzsE%(qv(6R%RiIMCu{Q~Q1gS_yp zKAUcHFU3I13DYeY&*_s#TZQ11qL1M`r`9K8lj@Eb z+fynrkQctbpS>yUi9=dqtUBBh-H;Sz+2QfM0jr|WORy_CJ%U~(KzlIFmTAl@lj+q7 zHpbUP=?uD6o$3%&UD7`$CRL5LVqWc}_hHLds1F_ahWef<#AYrSSSlKqys1+kcF4^Ek7O=gT@oV_e@(Y+R>LVLG zR)x;PZ`J7)M68Nz+$h8<=EQMDs`#x6C#+Mlw^@jEw#0G%&B^cuM2e>X-E~0V_RO<3MPP3BJ#IfevzuE|6 zm0s1JSUFo0=ltE+mi8}Tsp^wv-59LuRco(7I+;50djJbnN2Raa7_Bxbg1Ksg3|MR~ z=}HT{Hj^xf*haHAv2clXrJassTy(=_m~;d|Bdkty>crtD>i=7~{Zb{YHN$id#%mPy z=T0HoxWDB4@NZ2E{)jpDUP`)#M20_hA1keZr8d5EtyY&}Zg^`==}!lSYZvGcf^`b- zY@{wk9^}>Qv=e5%Ax*hsfqFmjZO&}yp>?n|1jvWO4Pkl?nq8+S;jt@p7yR~++L|;} zqUu|(l?I@;mp%JoHpXv=k_+8! zeH6t6za7xpd#DG&_9+@c$4000lRLI|LUAB@f4{qCK!}+Jn<(o9|@ZJ4;y{}g{ Vjop{xtVoHKJ#)}P0+}y<{y!}`ZWI6j diff --git a/assets/i18n/localization.zh.translation b/assets/i18n/localization.zh.translation index 19eda1af46e9d7942b991e4ae621d3ee7112c0c7..c2cc95ea4fb83f360b89152cc21ddd0fe4805f63 100644 GIT binary patch delta 468 zcmYk2Pe_w-7{}l5FXg?&tZ2TNOAPBB)%-JNZz#iMLImxdVDNef=Rv81up+|h(6(MG z>oSR_v=;ax;ewzxcu*Odd9mFTI&|#f-13msr4AAHd+E~Q^YHw+e7?`~S+O=N3XP~8 zPXtFtxEZZ=$Z%|51Q?>s{%O2q{lIV3b}EX}N&3NEaV*MyZyV4}R=soFi7HBsytxPo zBztGVuX^QPmA#AST5R|uHE9}3WN3c8rnq($MPAqPK!}qKrvZx=4yEvkjK*)cO}g(2 z);Z%-fg3z^_`Se9S_$Ba&;$11^>2ud0vTSrq!SB=)jtH+wsqi_B@rUrDfX&H> z2GL^D^qCcmlhwO{QP$610)lM!eZ3H>-kslmV^-9y8$Q7 zB`jc^)x;k}MoW?uO={Aw`0=nkxfqBiBPCogs!Nj1yjchnn8Yl*HWhO(o3lmiu(xxI zvJ?eNq$zexl1~{zkgt?IAd3B|6@Y^d(gN5fE&UbEq-OMDjps6Cpov47X9BZiWdEX( zjT~7Zi+s6381!Ohi2Zr?2(=kx$pB3L er|O?QQ4j0 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} diff --git a/scenes/ui/info_container/info_container.tscn b/scenes/ui/info_container/info_container.tscn index f106141..52da0a0 100644 --- a/scenes/ui/info_container/info_container.tscn +++ b/scenes/ui/info_container/info_container.tscn @@ -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 @@ -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 diff --git a/scenes/ui/screen/darkness_screen/darkness_screen.gd b/scenes/ui/screen/darkness_screen/darkness_screen.gd index d17bee6..fd555bb 100644 --- a/scenes/ui/screen/darkness_screen/darkness_screen.gd +++ b/scenes/ui/screen/darkness_screen/darkness_screen.gd @@ -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) diff --git a/scenes/ui/screen/world_screen/world_screen.tscn b/scenes/ui/screen/world_screen/world_screen.tscn index ddb236e..0a4b6da 100644 --- a/scenes/ui/screen/world_screen/world_screen.tscn +++ b/scenes/ui/screen/world_screen/world_screen.tscn @@ -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 @@ -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