diff --git a/control.tscn b/control.tscn index 767fd50..9f1433a 100644 --- a/control.tscn +++ b/control.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://scripts/scaling.gd" type="Script" id=1] [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=2] [ext_resource path="res://maps/level_select.tscn" type="PackedScene" id=3] [ext_resource path="res://scripts/crt.gdshader" type="Shader" id=4] -[ext_resource path="res://scripts/theme.tres" type="Theme" id=5] +[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=5] +[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=6] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 4 ) @@ -14,6 +15,14 @@ shader_param/curvature = Vector2( 6, 6 ) shader_param/scanline_opacity = Vector2( 0.4, 0.05 ) shader_param/brightness = 1.25 +[sub_resource type="ShaderMaterial" id=2] +shader = ExtResource( 6 ) +shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) +shader_param/border_corners = true + +[sub_resource type="Theme" id=3] +default_font = ExtResource( 5 ) + [node name="Control" type="Control"] pause_mode = 2 anchor_right = 1.0 @@ -54,10 +63,11 @@ render_target_update_mode = 3 layer = 127 [node name="CheatLabel" type="Label" parent="ViewportContainer/Viewport/CheatLayer"] +material = SubResource( 2 ) anchor_right = 1.0 anchor_bottom = 1.0 margin_right = -1.0 margin_bottom = -5.0 -theme = ExtResource( 5 ) +theme = SubResource( 3 ) align = 2 valign = 2 diff --git a/fonts/2ndpuberty_no_dropshadow.fnt b/fonts/2ndpuberty_no_dropshadow.fnt new file mode 100644 index 0000000..1b40439 --- /dev/null +++ b/fonts/2ndpuberty_no_dropshadow.fnt @@ -0,0 +1,102 @@ +info face="2ndPubertyMono" size=16 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,2,1 spacing=-2,0 +common lineHeight=7 base=12 scaleW=512 scaleH=512 pages=1 packed=0 +page id=0 file="2ndpuberty_no_dropshadow.png" +chars count=97 +char id=0 x=108 y=20 width=8 height=20 xoffset=0 yoffset=-1 xadvance=6 page=0 chnl=0 +char id=10 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=0 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0 +char id=33 x=333 y=0 width=9 height=20 xoffset=2 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=34 x=324 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=35 x=63 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=36 x=18 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=37 x=36 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=38 x=81 y=20 width=9 height=20 xoffset=1 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=39 x=360 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=40 x=405 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=41 x=414 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=42 x=99 y=20 width=9 height=20 xoffset=1 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=43 x=45 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=44 x=378 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=45 x=27 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=46 x=369 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=47 x=486 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=48 x=315 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=49 x=234 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=50 x=243 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=51 x=252 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=52 x=261 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=53 x=270 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=54 x=279 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=55 x=288 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=56 x=297 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=57 x=306 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=58 x=396 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=59 x=387 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=60 x=459 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=61 x=54 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=62 x=468 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=63 x=351 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=64 x=495 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=65 x=0 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=66 x=9 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=67 x=18 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=68 x=27 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=69 x=36 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=70 x=45 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=71 x=54 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=72 x=63 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=73 x=72 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=74 x=81 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=75 x=90 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=76 x=99 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=77 x=108 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=78 x=117 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=79 x=126 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=80 x=135 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=81 x=144 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=82 x=153 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=83 x=162 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=84 x=171 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=85 x=180 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=86 x=189 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=87 x=198 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=88 x=207 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=89 x=216 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=90 x=225 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=91 x=423 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=92 x=0 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=93 x=432 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=94 x=9 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=95 x=72 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=96 x=342 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=97 x=0 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=98 x=9 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=99 x=18 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=100 x=27 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=101 x=36 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=102 x=45 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=103 x=54 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=104 x=63 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=105 x=72 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=106 x=81 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=107 x=90 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=108 x=99 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=109 x=108 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=110 x=117 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=111 x=126 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=112 x=135 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=113 x=144 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=114 x=153 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=115 x=162 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=116 x=171 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=117 x=180 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=118 x=189 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=119 x=198 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=120 x=207 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=121 x=216 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=122 x=225 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=123 x=441 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=124 x=477 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=125 x=450 y=0 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +char id=126 x=90 y=20 width=9 height=20 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0 +kernings count=0 diff --git a/fonts/2ndpuberty_no_dropshadow.png b/fonts/2ndpuberty_no_dropshadow.png new file mode 100644 index 0000000..d04887e Binary files /dev/null and b/fonts/2ndpuberty_no_dropshadow.png differ diff --git a/fonts/2ndpuberty_no_dropshadow.png.import b/fonts/2ndpuberty_no_dropshadow.png.import new file mode 100644 index 0000000..c152788 --- /dev/null +++ b/fonts/2ndpuberty_no_dropshadow.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/2ndpuberty_no_dropshadow.png-1885217c8cb02614801aae74f3adfb95.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://fonts/2ndpuberty_no_dropshadow.png" +dest_files=[ "res://.import/2ndpuberty_no_dropshadow.png-1885217c8cb02614801aae74f3adfb95.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/objects/environment/barrier/barrier.tscn b/objects/environment/barrier/barrier.tscn index d7d480e..ea89e0e 100644 --- a/objects/environment/barrier/barrier.tscn +++ b/objects/environment/barrier/barrier.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://objects/environment/barrier/barrier.gd" type="Script" id=1] [ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2] -[ext_resource path="res://fonts/2ndpuberty..fnt" type="BitmapFont" id=3] +[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=3] +[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 2, 0.5 ) @@ -87,7 +88,12 @@ tracks/2/keys = { "values": [ Vector2( 1, 1 ), Vector2( 1, 0 ) ] } -[sub_resource type="Theme" id=5] +[sub_resource type="ShaderMaterial" id=5] +shader = ExtResource( 4 ) +shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) +shader_param/border_corners = true + +[sub_resource type="Theme" id=6] default_font = ExtResource( 3 ) [node name="Barrier" type="Node2D"] @@ -111,11 +117,12 @@ anims/open = SubResource( 3 ) [node name="Label" type="Label" parent="."] visible = false +material = SubResource( 5 ) margin_left = -18.0 margin_top = -15.0 margin_right = 22.0 margin_bottom = 5.0 -theme = SubResource( 5 ) +theme = SubResource( 6 ) text = "00" align = 1