From ea9a313684deb74f7f54a7976fafb830e2f5c8d9 Mon Sep 17 00:00:00 2001 From: cornerloan Date: Wed, 14 May 2025 00:10:10 -0700 Subject: [PATCH 1/3] Added art for all relics --- Classes/Relics/Assets/Relic_BloodMoney.png | Bin 968 -> 795 bytes .../Relics/Assets/Relic_BloodMoney.png.import | 2 +- .../Relics/Assets/Relic_BrokenDrumstick.png | Bin 1122 -> 539 bytes .../Assets/Relic_BrokenDrumstick.png.import | 2 +- Classes/Relics/Assets/Relic_LooseChange.png | Bin 1154 -> 1415 bytes .../Assets/Relic_LooseChange.png.import | 2 +- Classes/Relics/Assets/Relic_LuckyDice.png | Bin 1045 -> 1275 bytes .../Relics/Assets/Relic_LuckyDice.png.import | 2 +- Classes/Relics/Assets/Relic_SecondPick.png | Bin 1021 -> 382 bytes .../Relics/Assets/Relic_SecondPick.png.import | 2 +- Classes/Relics/Assets/Relic_Shortcut.png | Bin 998 -> 981 bytes .../Relics/Assets/Relic_Shortcut.png.import | 2 +- Classes/Relics/Assets/Relic_SpikedShield.png | Bin 1139 -> 960 bytes .../Assets/Relic_SpikedShield.png.import | 2 +- 14 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/Relics/Assets/Relic_BloodMoney.png b/Classes/Relics/Assets/Relic_BloodMoney.png index f1bef7ea7747e9d80e3348b99cbbbeec51d3fe15..2a30e5cf2518ea70ae181b6e25e79188c6150b32 100644 GIT binary patch delta 759 zcmVke_ZwEJw?Z`e2Sln(#nQ)!Vhd}h z2q;Aa4Hm^lLbwM}Z7LA|kOsL4bsD-Yx3zDI@eDI&9;S$*9LWNE?wot)K5gJ1gZ&Ls z8tlkWvg|tbyt6%gX}690`w!m?!XH1sS_zfhqGK8aVUXPS>3?wW8xSJAAHpD1vQln7 z2LLRepD}oR1QxN{S2f;gz%_(Qwv>}Nolam+Pf+e##KQQ)IV4sCt|s(g#F*HVB-ZtY zZ?lh3VbOujSczV*hY@2Kb1q~S9V1CE44}czdip9MVi5+HoWxzLg~@E@T=yoSlW?^P zDz1xKA&5AyO@DaIGK@LLm~%`?czVpa(+fcZj#;KirbNQ^)zi=CDkPiDMm-)ek?cx& z90S9>(U>j_V9PGUaIXlzmxQkxVO>ZM0B$eV3c*|XJIQmW%(&SE;uw=W$CLdfh|-U0ue{g2aNz;H5v8*k`dae5 zhiF9DY(!~69Pq2ucJ-|8*W#;;3fU6pS@C5W4aDlpWK914n95(^Oy$0x~S9R+k z3!Tz80i6a&=ym&M6R@D)Y#QbED*wdp_ydkIv~VduW|!lvI6;>1s;*b3=Dh+L6~vJ#O${~4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bf8EGx4y}ot?;9I= zzdW^c*O&12bt}x1|L=dXS0?_`QTL2Z4eQpJ+FX686n15|&b(b$MW=fI`{%oR(LEP= zug_{1OBgRnq#w1=);OD8IG3+1wU)nX_M?}RUNIDzoa^mG)_cd(c3I7J||92L>a()=8_hBaQWLAyTH1kzOe%TLMFCN`+jr9=s z1J=K60@h_u=SNT2^VT)(a0;W-uW1U$Cup3o*vXa%ytdC(ES3%H zdad<2zt43jd+hn5n!&cw?#nmj7k5Qk9v!^5ohkM(hf^Vo_S5V_*$2y}9J~4VHWS;1 zA1reWp8scAnBt!1B9`)aPv>*iSk|!dK;a zyto1D!jJnLCn;Q+x^-DS*Fx2apP0YgtAAL3wdZN%e82sSQ*Q}&1n1<;2W2NuS3j3^ HP6MEurM%o$W$dSfP^X}1~W8vZ6{}ZaRk?)wc6bOx+t7^4(Z0jmY(9dhTnZ;&Qzxi~>m=F}36R7|Itd=>p)gE`R@1RC7%d$>WQig2zn1Fb?z0{u-L|3S5 zLm|3NCLz}kYkw>ji| zv!k*f$36(Po{mSDiwW+pF5-4V4uspD-`eB{XiDbJxo!`FdS5MbZxzT2C<6@v;S0J2 z36h~8`T+zx2ez+r4m?%wbl#P#E|_jJWN6Lvwwi1Pp(2o-ZNu|(g>4*-pc1CDh3 rGoLY1E{qmFWDd$5{ok-7BP-_*EF)-DYUV=d00000NkvXXu0mjf@{QS% literal 1122 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bfJkp-Et6Uz5keNcHUI4Poh1iVicDd zr#F^ej(${n-@==v7C{~@A)&| z`#q1}7gt_3PhMVpdFy=c$E}xlGA1(gF*?lb($jv&IJ0_oj;ovhk~fc}1gF`ZtXrHj zcc;$%ifSSCq`mrQSsgY6ZJX7fWR(A;JXOnSL(#5^Z*F~4SFZ4}Rs1H+a9Lop!uR`+ zf~G%}=2&a=Rpmyl%nsXgp@K(v7@}A?ejGlY$lk?w?YfEE%vVcAxfzzQRj5CZx;K+C zV)q&Wfz9_~l*H~bd7RuUtlDDs)%8)e(+PD3JGUcU8+g=N1l(Fu_e7_@^0YqP_)WRt zOl%m3Liwq%&)fJJemb1eyK~dX_s_w9RjfOTtjv`b>l>a+ZMBHC*(Myjv*;;POxT^> zI{CNW?_YMA{oZ`Ho?SoMM55FZr>s03vLWet@V0X`HTypEX8dPxP+zo}VIxoG@{Lp7 ztNagebBj6pgz2V>thszcBdg)eq6)^ME0e0Z85Rg9{+eqQrDW3bA$`XthV2Im=bZ>( zH0$71_;I6D>06!AikQU>;+LZvPQ2hea;dwo=G`y;6J}g~*NdN?np%D^^=ICT>i7Hq znCj1LI;Z;}#lL)4MNZ2ST`kSv)K$|<4jY7a8i~%;o9DPQbeZ1m(>8nOZfGo$R+mX# zy)@?zn4b-V?Sm&^Ze`k8rsv5#%%qpQVHm*t`l%V%u#4sg58JsXtK NJzf1=);T3K0RRO4zdZl| diff --git a/Classes/Relics/Assets/Relic_BrokenDrumstick.png.import b/Classes/Relics/Assets/Relic_BrokenDrumstick.png.import index 056f3973..8d74d665 100644 --- a/Classes/Relics/Assets/Relic_BrokenDrumstick.png.import +++ b/Classes/Relics/Assets/Relic_BrokenDrumstick.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c8j841tqqkqeb" +uid="uid://cu26dy5itkd4m" path="res://.godot/imported/Relic_BrokenDrumstick.png-94c905ef353da245ad24e71cbd686e66.ctex" metadata={ "vram_texture": false diff --git a/Classes/Relics/Assets/Relic_LooseChange.png b/Classes/Relics/Assets/Relic_LooseChange.png index 435e58d3103f133cf2e43921ff19a086e1bccfbb..abe8418bc56d50c29926969d6774c2e25303268b 100644 GIT binary patch delta 943 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 UZ~?bcp8x;=07*qoM6N<$f^%;QdH?_b diff --git a/Classes/Relics/Assets/Relic_LuckyDice.png.import b/Classes/Relics/Assets/Relic_LuckyDice.png.import index 59a603a1..8733a36b 100644 --- a/Classes/Relics/Assets/Relic_LuckyDice.png.import +++ b/Classes/Relics/Assets/Relic_LuckyDice.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dv8u82rj2vkxu" +uid="uid://c4sx72edrmarc" path="res://.godot/imported/Relic_LuckyDice.png-88ca6d67d74b2a5f34af4000f643b3a7.ctex" metadata={ "vram_texture": false diff --git a/Classes/Relics/Assets/Relic_SecondPick.png b/Classes/Relics/Assets/Relic_SecondPick.png index 3691aa713a5b916895ee50fee548388ddb5f916d..c004b4acbea50d3283c2ff550911e286847d60f0 100644 GIT binary patch delta 343 zcmV-d0jU1{2mS((Fn<9!Nkl|YIn4D%MvC9 zII#hn8H?YQB1N$^=gb650-T(Ry^}z~%Bg!X;EDp1$;Or~wy?`O`snM5ow!hb!O1C?ef@e>H(dw^3C zf4h$x literal 1021 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~4egmB5hW46K32*3xq68y`AMmI6}bgK)eHls47YguJQ{>uF6ifOi{PD zbs{}UK3djZt>nqvW6s4qD1-ZCERRDRmN*N_31y=g{ z<>lpi<;HsXMd|v6mX?v90`zGE;%B09k2gXakl<5wp<;IRwdJb`TMuUx6%m z$bf0E=Po;s8(Wm~4 z`#uD2soco6cGKU^{m@(wTguT>SNC_IjhKIde_A^~@?~i*H|0 zx&8aO*0hNxHW{;~Wtnx(ewFFd?I9jH{g3ypnA5Fk-yZlcOZaTEj@8Wnr2KxybiFG@ z8&5{Z$1&CIJ~v}o1j7-(-IL_>`I6O)7{p)AUMG-UTd5h@_~iDUEoS<>C%wZGp8UPV z*Z=Z)naZlSdtdImT*tU%Msua$3vPyjg^?x8V`r`O>{klC9c$iUV4>*XQnpK0^75AN z0>-8im*+b8#XGz{ef8azkjXn%8r=OJ^}lXLYJ8*o%3#-mjr-Wj<~o&6-f?qo(E*h_ zEf>=h!r!j<^z`iM2KxE$UB1j(!MItspZA|V(Hf;+`}zGtUu!?Mq~&`zCdBNFh~K`C z!)=>~S}==>f4a@1kJnC!9kOfGjm`P=cZcoqGKF0Mr+th!JV}#Xs~^7L+=;SS!LqhD zpR-R|?qUdD@_+6-<C4SET$*W}{c{0J}*)&id^mO%e JS?83{1OWD&n>zpi diff --git a/Classes/Relics/Assets/Relic_SecondPick.png.import b/Classes/Relics/Assets/Relic_SecondPick.png.import index 63bb10d4..ffb5f043 100644 --- a/Classes/Relics/Assets/Relic_SecondPick.png.import +++ b/Classes/Relics/Assets/Relic_SecondPick.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cbv2j4ysk3ydd" +uid="uid://bjw3cyofjjxv6" path="res://.godot/imported/Relic_SecondPick.png-0361bd1bad087f4d81be27c9c5b3fe2b.ctex" metadata={ "vram_texture": false diff --git a/Classes/Relics/Assets/Relic_Shortcut.png b/Classes/Relics/Assets/Relic_Shortcut.png index 6df1df7aab83b76433ee20914a063a170c162ab6..4650ecd530650a418c2d0a8d88fb9756dc70a886 100644 GIT binary patch delta 947 zcmV;k15Etp2h|6VFn$!-%t6h%+lG0tRX4q=GG28h@pB*cb=zkwBB z#@}ETED;ilB?1BgA`3DZ5@&GQZ8wW|%Ux}^+X0aU6}7sY8t#4f4OI>QU5kmw_OAp~ ze>KMR|By^@8St8B)nlmTtf&jN79@Rwe2jboF);ywPvR$VO@B`p=m3?RE$VSTi9#ND zEg+>p2blH1dq5Fr11*gYfjdJ+v}|Tt;LCjh!~!eA} zUeM-k;0CY)tZMuK*w$tdrbG`@se-2j!z4y3;L8p$2~>eK;DLUxcm!Vn_kmsD7&yZe zn;O`9P>D2w0e|Vcddk}DA+QeIk|K{i0{g%Y&;Yium^jn8b4ONYBm^>~k1*L|;3;rd zDl~x^Ox|T#Srw5T;H5|$V=nVa462aI0>`i?a0LDc*c3VD4w614K;Gx#K0tXo`=xLHmvqh3pdxH73B!CIMC)KYAB+}d!Js&Wa6h|r$5V!y= zU{W7ya(^gNvmQ{9Bt6R-pVs_UlI*AguQ4}`YK1`s?5DLo%&)Et$NJsG{Ca?8K~et? z)t{3x`&e;u?P4SWPXR|D)&~0maglr>psp-C#&UlL_>4&(Vv@V{6>nci$3T#!fID2= z!soyp^*dN5lrdkoMJyyKy%ClH4J-@XcJSBo(#ayh4;21J184v416t4rPU_Y%U1rMWh7$67V(_Lq#lbU1jy<2bYGXK>r|` z@hm#kqy|a#Ta!u~n&*7IE6d+wg(;8$j%fa2s&$d zTYvs>45=fzDeFt#DUW5(@AxhRwikKrL_cT|JOo z&)QgQxOay{_I`X_>PnWO1SHk0qRm~c$lBx#3%cbT%Uv6NEA|%DV*_?|A?#1F4GJRV zuIux_R?a;z4KuEJO86fhO>eO~=l|xzd`|Qg4B&(7B|GxnpM`nQ7)dOEa`wfkO Ve4r%2*%$x-002ovPDHLkV1jf}tpfl6 literal 998 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 Date: Wed, 14 May 2025 00:30:30 -0700 Subject: [PATCH 2/3] Added coupon --- Classes/Relics/Assets/Relic_Coupon.png | Bin 0 -> 1170 bytes Classes/Relics/Assets/Relic_Coupon.png.import | 34 ++++++++++++++++++ Globals/Scribe.cs | 17 +++++++++ Scenes/Puppets/Scripts/PlayerStats.cs | 2 ++ Scenes/ShopScene/Scripts/ShopScene.cs | 2 +- 5 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Classes/Relics/Assets/Relic_Coupon.png create mode 100644 Classes/Relics/Assets/Relic_Coupon.png.import diff --git a/Classes/Relics/Assets/Relic_Coupon.png b/Classes/Relics/Assets/Relic_Coupon.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea084b794ca1ad29635c5f6c6ef244f10a36ac8 GIT binary patch literal 1170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(=#m=Ynda-upao=eFfg`fGOz$yj6f^}#0(6~ z3m6%gfixpXYylHoR$&1%f(=r*rY-3+P+5CsNJL45ua8x7ey(0(N`6wRUPW#JNCAV5 zeMLcHa&~HoLQ-maW}dD3``!E16*5z7)x%AF4SWlnQ!_F>s)|yBtNcQetFn_VQ`GJ4 zc)4sUtbiuurj{fsROII56ON0GHI_ zN%^HEwo0X?nJHFjiD{-uDJiD9Nr}cOx`u`+iMoj?#)i5n#>Oe;riK zGN53Bhi+;fFi6XRVW%@?1~&r(lZ&T|V@QPi+iCl=qa0-p*nh8SmbfR-?xq-I+^MkC z`}Wxj2Xo5S{dZVk(f)@~va7^TQ+9JohWW$`Xo-_8X_-_Er$0w&|H(E=B?-}%>@x7JB>?vu3rnX~i!8w8v*TBiiDeR+9Ji$R3H zf9vK;M;F%YZMI$KXU%Zujkz=DjMuN$_j?^UA{@zdll$ePfP;Sz8i<&zVtVzuGs|gm zV5#t$#aGLUO0q?5i^TU7UpXev^YxC)UN6nLSBwmoD{f<&cfx2@-XjzLWnqee>mTvA z0WI;ovU;23yKOFpVT_-hqAI_|uwNH;5%W*kYSX#?pX$o#`N!_%hWOM?~C<>0;JSEjY)+&kMh z>oe@gy7a#MJ>!p$->x1h6uY*){7Y)swsZB~JErj7zaVy|dFxf)y?fJo9;O1rdFv1R erQXwY=Gf1(HU1>Ht)vT-kv(1gT-G@yGywq5zrbw( literal 0 HcmV?d00001 diff --git a/Classes/Relics/Assets/Relic_Coupon.png.import b/Classes/Relics/Assets/Relic_Coupon.png.import new file mode 100644 index 00000000..33d0e0fb --- /dev/null +++ b/Classes/Relics/Assets/Relic_Coupon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7kegse3tt25t" +path="res://.godot/imported/Relic_Coupon.png-fbc4593b2a2e278d51828d9813481a77.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Relics/Assets/Relic_Coupon.png" +dest_files=["res://.godot/imported/Relic_Coupon.png-fbc4593b2a2e278d51828d9813481a77.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Globals/Scribe.cs b/Globals/Scribe.cs index 6e8a498d..34ce7976 100644 --- a/Globals/Scribe.cs +++ b/Globals/Scribe.cs @@ -524,6 +524,23 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs ), } ), + new RelicTemplate( + 17, + "Coupon", + Rarity.Common, + GD.Load("res://Classes/Relics/Assets/Relic_Coupon.png"), + new RelicEffect[] + { + new RelicEffect( + BattleEffectTrigger.OnPickup, + 10, + (e, self, val) => + { + StageProducer.PlayerStats.DiscountPercent += val; + } + ), + } + ), }; public static readonly SongTemplate[] SongDictionary = new[] //Generalize and make pools for areas/room types diff --git a/Scenes/Puppets/Scripts/PlayerStats.cs b/Scenes/Puppets/Scripts/PlayerStats.cs index 9b0d70e5..3d3581f7 100644 --- a/Scenes/Puppets/Scripts/PlayerStats.cs +++ b/Scenes/Puppets/Scripts/PlayerStats.cs @@ -15,6 +15,7 @@ public partial class PlayerStats : Resource public int RewardAmountModifier = 0; public int Rerolls = 0; public int Shortcuts = 0; + public int DiscountPercent = 0; //Array in order of descending rarities, Legendary -> ... Common. Int odds out of 100. public int[] RarityOdds = [1, 5, 10, 20, 100]; @@ -77,6 +78,7 @@ public void RemoveNote(int index) CurNotes = CurNotes.Where((_, i) => i != index).ToArray(); } + public void RemoveNote(Note nSelection) { CurNotes = CurNotes.Where(n => n != nSelection).ToArray(); diff --git a/Scenes/ShopScene/Scripts/ShopScene.cs b/Scenes/ShopScene/Scripts/ShopScene.cs index 42a579b9..18a36615 100644 --- a/Scenes/ShopScene/Scripts/ShopScene.cs +++ b/Scenes/ShopScene/Scripts/ShopScene.cs @@ -133,7 +133,7 @@ private void AddShopItem(GridContainer container, IDisplayable item, int price) GD.PushError("AddShopItem called with null!"); return; } - price = Math.Max(price, 0); //Price can't go negative. + price = Math.Max(price - (price * StageProducer.PlayerStats.DiscountPercent / 100), 0); //Price can't go negative. ShopItem newItem = GD.Load(ShopItem.LoadPath).Instantiate(); newItem.Display(price, item.Texture, item.Name); newItem.DisplayButton.Pressed += () => SetPurchasable(item, newItem); From d4b78d2dc2df45bd59649a20444a29353bfc739a Mon Sep 17 00:00:00 2001 From: cornerloan Date: Wed, 14 May 2025 00:40:42 -0700 Subject: [PATCH 3/3] Added translations to coupon I always forget to do this. Chinese gamers probably hate me --- Globals/Translations/Translations.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv index c19f2296..211315a0 100644 --- a/Globals/Translations/Translations.csv +++ b/Globals/Translations/Translations.csv @@ -102,6 +102,8 @@ RELIC_BROKENDRUMSTICK_NAME,Broken Drumstick,破碎的鼓棒 RELIC_BROKENDRUMSTICK_TOOLTIP,"Enemies start combat damaged.","敌人在战斗开始时受到伤害。" RELIC_BLOODMONEY_NAME,Blood Money,血腥钱袋 RELIC_BLOODMONEY_TOOLTIP,"Gain money when taking damage below half health.","在生命值低于一半时受到伤害可获得金钱。" +RELIC_COUPON_NAME,Coupon,优惠券 +RELIC_COUPON_TOOLTIP,"Get a 10% discount on notes and relics in the shop.","在商店购买音符和遗物时可享受9折优惠。" INVENTORY_TAB_NOTES,Notes,乐谱 INVENTORY_TAB_RELICS,Relics,遗物 OPTIONS_VOLUME_LABEL,Master Volume,最终音量设置