diff --git a/Classes/Notes/Assets/Note_PlayerCombo.png b/Classes/Notes/Assets/Note_PlayerCombo.png new file mode 100644 index 00000000..f86a2a79 Binary files /dev/null and b/Classes/Notes/Assets/Note_PlayerCombo.png differ diff --git a/Classes/Notes/Assets/Note_PlayerCombo.png.import b/Classes/Notes/Assets/Note_PlayerCombo.png.import new file mode 100644 index 00000000..996b4f44 --- /dev/null +++ b/Classes/Notes/Assets/Note_PlayerCombo.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvqo88fkuu8hs" +path="res://.godot/imported/Note_PlayerCombo.png-a24d525105b1bc80383245debb99deb4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Notes/Assets/Note_PlayerCombo.png" +dest_files=["res://.godot/imported/Note_PlayerCombo.png-a24d525105b1bc80383245debb99deb4.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/Classes/Notes/Assets/Note_PlayerMoney.png b/Classes/Notes/Assets/Note_PlayerMoney.png new file mode 100644 index 00000000..5d620f57 Binary files /dev/null and b/Classes/Notes/Assets/Note_PlayerMoney.png differ diff --git a/Classes/Notes/Assets/Note_PlayerMoney.png.import b/Classes/Notes/Assets/Note_PlayerMoney.png.import new file mode 100644 index 00000000..27997267 --- /dev/null +++ b/Classes/Notes/Assets/Note_PlayerMoney.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cje3p520pprt4" +path="res://.godot/imported/Note_PlayerMoney.png-f14210a70c94f89c7ea76606add2bdf2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Classes/Notes/Assets/Note_PlayerMoney.png" +dest_files=["res://.godot/imported/Note_PlayerMoney.png-f14210a70c94f89c7ea76606add2bdf2.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 37e19213..edcc0e14 100644 --- a/Globals/Scribe.cs +++ b/Globals/Scribe.cs @@ -151,6 +151,33 @@ public partial class Scribe : Node director.DealDamage(Targetting.Player, dmg, note.Owner); } ), + new Note( + 11, + "PlayerMoney", + GD.Load("res://Classes/Notes/Assets/Note_PlayerMoney.png"), + 1, + (director, note, timing) => + { + if (timing == Timing.Miss) + return; + StageProducer.PlayerStats.Money += note.GetBaseVal() * (int)timing; + } + ), + new Note( + 12, + "PlayerCombo", + GD.Load("res://Classes/Notes/Assets/Note_PlayerCombo.png"), + 1, + (director, note, timing) => + { + if (timing == Timing.Miss) + return; + director.NPB.HandleTiming( + timing, + (ArrowType)StageProducer.GlobalRng.RandiRange(0, 3) + ); + } + ), }; public static readonly RelicTemplate[] RelicDictionary = new[] diff --git a/Globals/Translations/Translations.csv b/Globals/Translations/Translations.csv index 2c762eec..f23185aa 100644 --- a/Globals/Translations/Translations.csv +++ b/Globals/Translations/Translations.csv @@ -60,6 +60,10 @@ NOTE_PLAYERECHO_NAME,PlayerEcho,玩家回声 NOTE_PLAYERECHO_TOOLTIP,"Deals more damage with each loop.","每次循环造成更多伤害。" NOTE_PLAYERPOISON_NAME,PlayerPoison,玩家中毒 NOTE_PLAYERPOISON_TOOLTIP,"Applies stacks of poison based on timing.","根据时机施加中毒层数。" +NOTE_PLAYERMONEY_NAME,PlayerMoney,玩家金钱 +NOTE_PLAYERMONEY_TOOLTIP,"Deals no damage, but gives you money when hit."."不会造成伤害,但命中时会获得金钱。" +NOTE_PLAYERCOMBO_NAME,PlayerCombo,玩家连击 +NOTE_PLAYERCOMBO_TOOLTIP,"Deals no damage, but gives you double the combo bar charge when hit.","不会造成伤害,但命中时会获得双倍连击槽充能。" RELIC_BREAKFAST_NAME,Breakfast,早餐 RELIC_BREAKFAST_TOOLTIP,"Increases max hp.",提高最大生命值 RELIC_GOODVIBES_NAME,Good Vibes,良好消息