From 9a6a40cec78c021069fd171300a95c5f1ff93f5c Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 2 Jun 2023 21:23:27 -0400 Subject: [PATCH] begin work on kill mode --- graphics/hud/killmode_skull.png | Bin 0 -> 245 bytes graphics/hud/killmode_skull.png.import | 35 +++++++++++++++++++++++++ maps/level_select.tscn | 18 ++++++++++++- menus/file_select.tscn | 19 ++++++++++++-- menus/title_screen.tscn | 15 ++++++++--- 5 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 graphics/hud/killmode_skull.png create mode 100644 graphics/hud/killmode_skull.png.import diff --git a/graphics/hud/killmode_skull.png b/graphics/hud/killmode_skull.png new file mode 100644 index 0000000000000000000000000000000000000000..f66be54a3272e92846feb07f5a41f91cd26bbeca GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl}24DbnY1=9cj{|A!A$C?X)6mvM1 zMG8k`uAe3f+`D(lD}5qk4du~ z5_(qfZ4kZJP%Cv{J~zwFoG(IdAEe$hXm?I*Nj^IJ`TEZ@bk}PaHdLC)Fl00SVVJ)6 f&B0aK4y6naS(y{2_}K*mZDjCt^>bP0l+XkKqC8Ma literal 0 HcmV?d00001 diff --git a/graphics/hud/killmode_skull.png.import b/graphics/hud/killmode_skull.png.import new file mode 100644 index 0000000..70b0f95 --- /dev/null +++ b/graphics/hud/killmode_skull.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/killmode_skull.png-b04f545789948a183bd39a46c229e29a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/killmode_skull.png" +dest_files=[ "res://.import/killmode_skull.png-b04f545789948a183bd39a46c229e29a.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/maps/level_select.tscn b/maps/level_select.tscn index 217c712..6d84eb7 100644 --- a/maps/level_select.tscn +++ b/maps/level_select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2] @@ -22,6 +22,16 @@ shader_param/cycle_speed = Vector2( 11, 1 ) shader_param/cycle_alternation = Vector2( 1, 1 ) shader_param/uv_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +[sub_resource type="ShaderMaterial" id=4] +shader = ExtResource( 11 ) +shader_param/color_1 = Color( 1, 0.121569, 0.92549, 1 ) +shader_param/color_2 = Color( 0.258824, 0.909804, 0.396078, 0 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 0.2, 11 ) +shader_param/cycle_alternation = Vector2( 2.404, 1.608 ) +shader_param/uv_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) + [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 3 ) shader_param/border_color = Color( 0, 0, 0, 1 ) @@ -35,6 +45,12 @@ material = SubResource( 3 ) margin_right = 256.0 margin_bottom = 192.0 +[node name="BackGround2" type="ColorRect" parent="."] +visible = false +material = SubResource( 4 ) +margin_right = 256.0 +margin_bottom = 192.0 + [node name="ColorRect2" type="ColorRect" parent="."] margin_left = 43.0 margin_top = 48.0 diff --git a/menus/file_select.tscn b/menus/file_select.tscn index 2c6a71e..cb3e1f3 100644 --- a/menus/file_select.tscn +++ b/menus/file_select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://menus/file_select_panel.tscn" type="PackedScene" id=1] [ext_resource path="res://graphics/borders/skaborder.png" type="Texture" id=8] @@ -16,6 +16,16 @@ shader_param/cycle_speed = Vector2( 0, 16 ) shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 2, 0, 2, 1, 0, 0 ) +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 11 ) +shader_param/color_1 = Color( 0.960784, 0.2, 0.258824, 1 ) +shader_param/color_2 = Color( 0.286275, 0.0745098, 0.12549, 1 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/pan_speed = Vector2( 32, 1 ) +shader_param/cycle_speed = Vector2( -8, 32 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) +shader_param/uv_transform = Transform2D( 1, 1.582, 1, 2, 0, 0 ) + [node name="FileSelect" type="Node"] script = ExtResource( 10 ) @@ -28,7 +38,7 @@ texture = ExtResource( 8 ) expand = true stretch_mode = 2 -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Background" type="ColorRect" parent="."] material = SubResource( 2 ) margin_right = 256.0 margin_bottom = 192.0 @@ -82,3 +92,8 @@ texture_normal = ExtResource( 9 ) texture_focused = ExtResource( 9 ) expand = true stretch_mode = 3 + +[node name="ColorRect" type="ColorRect" parent="."] +material = SubResource( 3 ) +margin_right = 256.0 +margin_bottom = 192.0 diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index f82eae3..987ee91 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -1,12 +1,21 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=1] -[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=2] +[ext_resource path="res://shaders/wibble_border.gdshader" type="Shader" id=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=3] [ext_resource path="res://tilesets/t_factory.tres" type="TileSet" id=4] [ext_resource path="res://menus/title_screen.gd" type="Script" id=5] [ext_resource path="res://menus/main_menu.tscn" type="PackedScene" id=6] +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 2 ) +shader_param/speed = Vector2( 4, 0 ) +shader_param/ammount = Vector2( 4, 0 ) +shader_param/offset = Vector2( 0, 0 ) +shader_param/delay = Vector2( 0, 0 ) +shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 ) +shader_param/border_corners = true + [node name="TitleScreen" type="Node"] script = ExtResource( 5 ) next_menu = ExtResource( 6 ) @@ -24,7 +33,7 @@ format = 1 tile_data = PoolIntArray( 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262153, 0, 0, 262154, 0, 0, 262155, 0, 0, 262157, 0, 0, 262158, 0, 0, 262161, 0, 0, 262162, 0, 0, 262163, 0, 0, 327685, 0, 0, 327687, 0, 0, 327689, 0, 0, 327691, 0, 0, 327693, 0, 0, 327695, 0, 0, 327697, 0, 0, 327699, 0, 0, 393221, 0, 0, 393222, 0, 0, 393223, 0, 0, 393225, 0, 0, 393227, 0, 0, 393229, 0, 0, 393231, 0, 0, 393233, 0, 0, 393235, 0, 0, 458757, 0, 0, 458758, 0, 0, 458761, 0, 0, 458763, 0, 0, 458765, 0, 0, 458766, 0, 0, 458769, 0, 0, 458771, 0, 0, 524293, 0, 0, 524295, 0, 0, 524297, 0, 0, 524299, 0, 0, 524301, 0, 0, 524303, 0, 0, 524305, 0, 0, 524307, 0, 0, 589829, 0, 0, 589831, 0, 0, 589833, 0, 0, 589835, 0, 0, 589837, 0, 0, 589839, 0, 0, 589841, 0, 0, 589843, 0, 0, 655365, 0, 0, 655367, 0, 0, 655369, 0, 0, 655370, 0, 0, 655371, 0, 0, 655373, 0, 0, 655374, 0, 0, 655377, 0, 0, 655378, 0, 0, 655379, 0, 0, 786441, 0, 0, 786442, 0, 0, 786445, 0, 0, 786446, 0, 0, 786447, 0, 0, 786449, 0, 0, 786450, 0, 0, 786453, 0, 0, 786454, 0, 0, 786455, 0, 0, 851977, 0, 0, 851979, 0, 0, 851981, 0, 0, 851983, 0, 0, 851985, 0, 0, 851987, 0, 0, 851989, 0, 0, 851991, 0, 0, 917513, 0, 0, 917515, 0, 0, 917517, 0, 0, 917519, 0, 0, 917521, 0, 0, 917523, 0, 0, 917525, 0, 0, 917527, 0, 0, 983049, 0, 0, 983050, 0, 0, 983053, 0, 0, 983055, 0, 0, 983057, 0, 0, 983059, 0, 0, 983061, 0, 0, 983062, 0, 0, 983063, 0, 0, 1048585, 0, 0, 1048587, 0, 0, 1048589, 0, 0, 1048591, 0, 0, 1048593, 0, 0, 1048595, 0, 0, 1048599, 0, 0, 1114121, 0, 0, 1114123, 0, 0, 1114125, 0, 0, 1114127, 0, 0, 1114129, 0, 0, 1114131, 0, 0, 1114133, 0, 0, 1114135, 0, 0, 1179657, 0, 0, 1179658, 0, 0, 1179661, 0, 0, 1179662, 0, 0, 1179663, 0, 0, 1179665, 0, 0, 1179667, 0, 0, 1179669, 0, 0, 1179670, 0, 0, 1179671, 0, 0 ) [node name="Label" type="Label" parent="."] -material = ExtResource( 2 ) +material = SubResource( 1 ) margin_top = 168.0 margin_right = 256.0 margin_bottom = 182.0