diff --git a/assets/audio/music/Grasswalk_filler.mp3 b/assets/audio/music/Grasswalk_filler.mp3 new file mode 100644 index 0000000..ec12480 Binary files /dev/null and b/assets/audio/music/Grasswalk_filler.mp3 differ diff --git a/assets/audio/music/Grasswalk_filler.mp3.import b/assets/audio/music/Grasswalk_filler.mp3.import new file mode 100644 index 0000000..1214cdb --- /dev/null +++ b/assets/audio/music/Grasswalk_filler.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://b0tyhgrhofdes" +path="res://.godot/imported/Grasswalk_filler.mp3-74bf66e1e97fc5399f63ec443ba18d00.mp3str" + +[deps] + +source_file="res://assets/audio/music/Grasswalk_filler.mp3" +dest_files=["res://.godot/imported/Grasswalk_filler.mp3-74bf66e1e97fc5399f63ec443ba18d00.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt new file mode 100644 index 0000000..653ff7d --- /dev/null +++ b/assets/fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf b/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf new file mode 100644 index 0000000..d754a85 Binary files /dev/null and b/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf differ diff --git a/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf.import b/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf.import new file mode 100644 index 0000000..6944ffd --- /dev/null +++ b/assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://bor21ae1lks57" +path="res://.godot/imported/SourceCodePro-Italic-VariableFont_wght.ttf-080117e26bb7737a0a23382e4534e274.fontdata" + +[deps] + +source_file="res://assets/fonts/SourceCodePro-Italic-VariableFont_wght.ttf" +dest_files=["res://.godot/imported/SourceCodePro-Italic-VariableFont_wght.ttf-080117e26bb7737a0a23382e4534e274.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/fonts/SourceCodePro-VariableFont_wght.ttf.import b/assets/fonts/SourceCodePro-VariableFont_wght.ttf.import new file mode 100644 index 0000000..943b6df --- /dev/null +++ b/assets/fonts/SourceCodePro-VariableFont_wght.ttf.import @@ -0,0 +1,35 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://dpvpyd5k83x2d" +path="res://.godot/imported/SourceCodePro-VariableFont_wght.ttf-7cc5dc09dda43d3fddfd8c7e9e9d5244.fontdata" + +[deps] + +source_file="res://assets/fonts/SourceCodePro-VariableFont_wght.ttf" +dest_files=["res://.godot/imported/SourceCodePro-VariableFont_wght.ttf-7cc5dc09dda43d3fddfd8c7e9e9d5244.fontdata"] + +[params] + +Rendering=null +antialiasing=1 +generate_mipmaps=false +disable_embedded_bitmaps=true +multichannel_signed_distance_field=false +msdf_pixel_range=8 +msdf_size=48 +allow_system_fallback=true +force_autohinter=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/levels/win_test.tres b/assets/levels/win_test.tres index fb42139..ee80513 100644 --- a/assets/levels/win_test.tres +++ b/assets/levels/win_test.tres @@ -18,7 +18,7 @@ script = ExtResource("3_mtsmf") zombiesOrdered = Array[ExtResource("4_tpjav")]([SubResource("Resource_sw8bw")]) events = Array[ExtResource("2_pkoaj")]([]) customWaveDelay = 0.0 -isHugeWave = false +isHugeWave = true [sub_resource type="Resource" id="Resource_5gmed"] script = ExtResource("4_tpjav") diff --git a/scenes/gui/almanach.tscn b/scenes/gui/almanach.tscn index 02b76be..9e90602 100644 --- a/scenes/gui/almanach.tscn +++ b/scenes/gui/almanach.tscn @@ -139,10 +139,12 @@ size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("1_1hnxi") -[node name="Previewport" type="SubViewport" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame" node_paths=PackedStringArray("_frameField")] +[node name="Previewport" type="SubViewport" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame" node_paths=PackedStringArray("title", "description", "_frameField")] canvas_item_default_texture_filter = 0 size = Vector2i(130, 130) script = ExtResource("2_ru62c") +title = NodePath("../../../Label") +description = NodePath("../../../../Description/ScrollContainer/RichTextLabel") _frameField = NodePath("CanvasLayer/Field") [node name="CanvasLayer" type="CanvasLayer" parent="zombies/Infobox/FrameAndTitle/VBoxContainer/Frame/Previewport"] diff --git a/scenes/templates/level_template.tscn b/scenes/templates/level_template.tscn index 2714c6d..507cc8e 100644 --- a/scenes/templates/level_template.tscn +++ b/scenes/templates/level_template.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=54 format=3 uid="uid://dd3yegl1xo44m"] +[gd_scene load_steps=55 format=3 uid="uid://dd3yegl1xo44m"] [ext_resource type="AudioStream" uid="uid://b6xb6mjdecg6a" path="res://assets/audio/sfx/level/readysetplant.mp3" id="1_4gg2g"] [ext_resource type="Script" uid="uid://bndu1h5kgcde8" path="res://scripts/level/RuntimeLevelData.cs" id="1_31ltw"] @@ -37,6 +37,7 @@ [ext_resource type="AudioStream" uid="uid://cfybn7wn04frs" path="res://assets/audio/music/Grasswalk_Standard.mp3" id="34_tqd4v"] [ext_resource type="AudioStream" uid="uid://get7nh1goi1c" path="res://assets/audio/music/Grasswalk_cool.mp3" id="35_4gg2g"] [ext_resource type="Script" uid="uid://bnj5tlcpmep2o" path="res://scripts/MusicTransitioner.cs" id="36_wwgye"] +[ext_resource type="AudioStream" uid="uid://b0tyhgrhofdes" path="res://assets/audio/music/Grasswalk_filler.mp3" id="37_wwgye"] [sub_resource type="Animation" id="Animation_vbgdr"] resource_name = "CYS_Sequence" @@ -553,22 +554,25 @@ normal = Vector2(1, 0) distance = 139.0 [sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_4tlhg"] -clip_count = 2 +clip_count = 3 clip_0/name = &"Grasswalk Standard" clip_0/stream = ExtResource("34_tqd4v") clip_0/auto_advance = 0 -clip_1/name = &"Grasswalk Cool" -clip_1/stream = ExtResource("35_4gg2g") +clip_1/name = &"Filler" +clip_1/stream = ExtResource("37_wwgye") clip_1/auto_advance = 1 -clip_1/next_clip = 0 +clip_1/next_clip = 2 +clip_2/name = &"Grasswalk Cool" +clip_2/stream = ExtResource("35_4gg2g") +clip_2/auto_advance = 0 _transitions = { Vector2i(0, 1): { "fade_beats": 5.0, "fade_mode": 3, -"from_time": 2, -"to_time": 0 +"from_time": 0, +"to_time": 1 }, -Vector2i(1, 0): { +Vector2i(2, 0): { "fade_beats": 5.0, "fade_mode": 4, "from_time": 0, diff --git a/scripts/gui/choose_your_seeds/Previewport.cs b/scripts/gui/choose_your_seeds/Previewport.cs index 9ebdd3a..4101aa8 100644 --- a/scripts/gui/choose_your_seeds/Previewport.cs +++ b/scripts/gui/choose_your_seeds/Previewport.cs @@ -41,7 +41,7 @@ public partial class Previewport : SubViewport _frameField.Texture = start_Field; current_display = resource.Scene.Instantiate(); title.Text = Tr(resource.name_key); - description.Text = Tr(resource.description_key); + description.Text = Tr("rwd_"+resource.name_key)+"\n"+ Tr(resource.description_key); AddChild(current_display); if (current_display is Entity entity) entity.DisableBrain(); diff --git a/scripts/gui/menu_buttons.gd b/scripts/gui/menu_buttons.gd index c7ea205..7db0f5e 100644 --- a/scripts/gui/menu_buttons.gd +++ b/scripts/gui/menu_buttons.gd @@ -2,7 +2,7 @@ extends Node func _on_play_button_pressed() -> void: - LevelController.call("StartLevel",preload("uid://dd3yegl1xo44m"),preload("uid://ctbue7dex4umy")) + LevelController.call("StartLevel",preload("uid://dd3yegl1xo44m"),preload("uid://ds2js2vylygvy")) $ChannelPlayer.call("Play")