Skip to content

Commit b1b596b

Browse files
cornerloanLifeHckr
andauthored
Simple Enemy Descriptions (#249)
* Initial implementation The enemy descriptions class should be working but the box is small so it doesn't look good. Also the icons need to be different than just the note icon. Such as making the loop icon for loop type effects. * Finished except for temp icons I don't have it set up for every BattleEffectTrigger, so as we use more triggers we need to edit GetTriggerIcon() in EnemyDescriptions.cs * Updated temp arts * Minor Refinements Removed Description on Note class to build translation key. Made description for enemy effect an optional parameter. Adjusted translations for accuracy. Removed effect description from Strawman to not compete screen space with arrow input guides. Better set up description box in controls. --------- Co-authored-by: LifeHckr <jarodthereal@gmail.com>
1 parent 046b9ff commit b1b596b

25 files changed

Lines changed: 339 additions & 20 deletions

Globals/Translations/Translations.csv

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,4 +206,22 @@ CREDITS_ADDITIONAL_ART,Art,额外美术
206206
CREDITS_ADDITIONAL_HELP,Additional Help,额外协助
207207
CREDITS_OTHER_PLAYTESTERS,All our other playtesters,以及所有其他测试玩家
208208
CREDITS_SPECIAL_THANKS,Special Thanks,特别鸣谢
209-
CREDITS_THANKS_PLAYERS,And to you the player!,以及屏幕前的你!
209+
CREDITS_THANKS_PLAYERS,And to you the player!,以及屏幕前的你!
210+
BOSSBLOOD_EFFECT1,"Heal and convert a basic note into a Blood note.","每循环治疗 点生命,并将一个普通音符转化为血之音符。"
211+
CYBERFOX_EFFECT1,Gains one dodge.,获得一次闪避。
212+
EFFIGY_EFFECT1,Only takes 1 damage at a time.,每次只受到1点伤害。
213+
EFFIGY_EFFECT2,Sets player's health to 1 if defeated.,被击败时将玩家的生命值设为1。
214+
HOLOGRAEME_EFFECT1,Player only plays every other loop.,玩家每隔一轮行动一次。
215+
HOLOGRAEME_EFFECT2,"Holograeme only has 1 health, and is immune to relic damage.","全息格莱姆仅有1点生命值,且免疫遗物伤害。"
216+
KEYTHULU_EFFECT1,"Every loop mindcrush ticks down by one, when it reaches zero, the player is defeated.","每次循环,心灵碾压计数会减1。当计数归零时,玩家即被击败。"
217+
LWS_EFFECT1,Converts an empty note into a Lesser Wolf Snake note.,将一个基础音符转化为次级狼蛇音符。
218+
PARASIFLY_EFFECT1,All enemies gains block the first time fatal damage is dealt.,首次受到致命伤害时,所有敌人获得格挡。
219+
STRAWMAN_EFFECT1,Player cannot take fatal damage.,玩家不会受到致命伤害。
220+
GWS_EFFECT1,Adds Greater Wolf Snake notes after the first loop.,首次循环后,添加高级狼蛇音符。
221+
TURTLE_EFFECT1,Gains one block and drains some of player's charge to heal.,获得一层格挡,并消耗玩家部分充能以进行治疗。
222+
GWS_NOTE_DESCRIPTION,"If timed badly, deals high damage to the player. Damage increases each loop.","若时机不佳,则对玩家造成高额伤害,且伤害随每次循环递增。"
223+
PARASIFLY_NOTE_DESCRIPTION,Parasifly gains block if timed badly.,若时机不佳,寄生蝇获得格挡。
224+
BOSSBLOOD_NOTE_DESCRIPTION,Boss Blood heals if timed badly.,若时机不佳,首领之血会进行治疗。
225+
SPIDER_NOTE_DESCRIPTION,Player gets poisoned if timed badly.,若时机不佳,玩家会中毒。
226+
LWS_NOTE_DESCRIPTION,"If timed badly, deals damage to the player. Damage increases each loop.","若时机不佳,则对玩家造成伤害,且伤害随每次循环递增。"
227+
MUSHROOM_NOTE_DESCRIPTION,Player gets poisoned if timed badly.,若时机不佳,玩家会中毒。
131 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bmw2tkpmv22ew"
6+
path="res://.godot/imported/BattleEndSymbol.png-5c282cbc73fc3f3efd9a51295ca4bc9d.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/BattleEndSymbol.png"
14+
dest_files=["res://.godot/imported/BattleEndSymbol.png-5c282cbc73fc3f3efd9a51295ca4bc9d.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
688 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://c5r2idc5x21ro"
6+
path="res://.godot/imported/BattleStartSymbol.png-a8cb230df43bb6721a2442dfafc1c8b6.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/BattleStartSymbol.png"
14+
dest_files=["res://.godot/imported/BattleStartSymbol.png-a8cb230df43bb6721a2442dfafc1c8b6.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
700 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://dosjbiqlrb3cr"
6+
path="res://.godot/imported/DamageInstanceSymbol.png-9cd27c768e2ba03d6c47f5ac093aa1d8.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/DamageInstanceSymbol.png"
14+
dest_files=["res://.godot/imported/DamageInstanceSymbol.png-9cd27c768e2ba03d6c47f5ac093aa1d8.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
630 Bytes
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://r7oc2aa06s24"
6+
path="res://.godot/imported/LoopSymbol.png-4d5a564a81d7d7d2248da6ec1ceb0061.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/BattleDirector/Assets/LoopSymbol.png"
14+
dest_files=["res://.godot/imported/LoopSymbol.png-4d5a564a81d7d7d2248da6ec1ceb0061.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

Scenes/BattleDirector/BattleScene.tscn

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=13 format=3 uid="uid://b0mrgr7h0ty1y"]
1+
[gd_scene load_steps=14 format=3 uid="uid://b0mrgr7h0ty1y"]
22

33
[ext_resource type="Script" uid="uid://bttu0wmy2fp64" path="res://Scenes/BattleDirector/Scripts/BattleDirector.cs" id="1_jmdo1"]
44
[ext_resource type="Script" uid="uid://pl57giqyhckb" path="res://Scenes/UI/Scripts/MenuModule.cs" id="2_ka0ws"]
@@ -10,6 +10,7 @@
1010
[ext_resource type="Script" uid="uid://cp6t6haqyef7o" path="res://Scenes/AreaBasedBackground.cs" id="7_6k2qj"]
1111
[ext_resource type="Texture2D" uid="uid://dbjotl0v1ymia" path="res://SharedAssets/BattleFrame1.png" id="7_klvil"]
1212
[ext_resource type="Theme" uid="uid://d37e3tpsbxwak" path="res://Scenes/UI/Assets/GeneralTheme.tres" id="8_62qim"]
13+
[ext_resource type="PackedScene" uid="uid://bejjkejyeffek" path="res://Scenes/BattleDirector/EnemyDescriptions.tscn" id="11_gbbxr"]
1314

1415
[sub_resource type="Gradient" id="Gradient_8uy3a"]
1516
offsets = PackedFloat32Array(0, 0.766234, 1)
@@ -20,7 +21,7 @@ gradient = SubResource("Gradient_8uy3a")
2021
fill_from = Vector2(1, 0)
2122
fill_to = Vector2(0.738532, 1)
2223

23-
[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("PuppetMarkers", "_countdownLabel", "CD", "CM", "DW", "NPB", "Audio", "FocusedButton")]
24+
[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("PuppetMarkers", "_countdownLabel", "CD", "CM", "DW", "NPB", "Audio", "Descriptions", "FocusedButton")]
2425
process_mode = 1
2526
script = ExtResource("1_jmdo1")
2627
PuppetMarkers = [NodePath("PlayerMarker"), NodePath("Enemy1Marker"), NodePath("Enemy2Marker"), NodePath("Enemy3Marker")]
@@ -30,6 +31,7 @@ CM = NodePath("VPContainer")
3031
DW = NodePath("3D/SubViewport/3DWizard")
3132
NPB = NodePath("NotePlacementBar")
3233
Audio = NodePath("AudioStreamPlayer")
34+
Descriptions = NodePath("EnemyDescriptions")
3335
FocusedButton = NodePath("StartButton")
3436
metadata/_edit_lock_ = true
3537

@@ -100,10 +102,10 @@ offset_bottom = 360.0
100102
texture = ExtResource("7_klvil")
101103

102104
[node name="StartButton" type="Button" parent="."]
103-
offset_left = 241.0
104-
offset_top = 230.0
105-
offset_right = 443.0
106-
offset_bottom = 267.0
105+
offset_left = 190.0
106+
offset_top = 200.0
107+
offset_right = 450.0
108+
offset_bottom = 248.0
107109
theme = ExtResource("8_62qim")
108110
text = "BATTLE_ROOM_BEGIN_BUTTON"
109111

@@ -142,3 +144,14 @@ theme_override_constants/shadow_offset_y = 3
142144
theme_override_constants/shadow_outline_size = 3
143145
theme_override_font_sizes/font_size = 64
144146
text = "5"
147+
148+
[node name="EnemyDescriptions" parent="." instance=ExtResource("11_gbbxr")]
149+
anchors_preset = 0
150+
anchor_right = 0.0
151+
anchor_bottom = 0.0
152+
offset_left = 320.0
153+
offset_top = 183.0
154+
offset_right = 320.0
155+
offset_bottom = 183.0
156+
grow_horizontal = 1
157+
grow_vertical = 1

0 commit comments

Comments
 (0)