diff --git a/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.md5 b/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.md5 new file mode 100644 index 0000000..d47f499 --- /dev/null +++ b/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.md5 @@ -0,0 +1,3 @@ +source_md5="8a0fb3ef87300fc44ac3987509d7f5f2" +dest_md5="64af74b2eacfde1cad97d9b4572a5ee1" + diff --git a/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.stex b/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.stex new file mode 100644 index 0000000..6145747 Binary files /dev/null and b/.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.stex differ diff --git a/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.md5 b/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.md5 new file mode 100644 index 0000000..6fc5957 --- /dev/null +++ b/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.md5 @@ -0,0 +1,3 @@ +source_md5="0f10d98e7948a70ec35deb3bc334d6fe" +dest_md5="da8e551e0a414e65f0d43addc4cb84f8" + diff --git a/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.stex b/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.stex new file mode 100644 index 0000000..411b416 Binary files /dev/null and b/.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.stex differ diff --git a/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.md5 b/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.md5 new file mode 100644 index 0000000..4a254a3 --- /dev/null +++ b/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.md5 @@ -0,0 +1,3 @@ +source_md5="d8dbcc70def2592c3d00a3fb0f2aef14" +dest_md5="b2e91a2f8b6b89a422546a383febc881" + diff --git a/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.stex b/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.stex new file mode 100644 index 0000000..f33ef11 Binary files /dev/null and b/.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.stex differ diff --git a/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.md5 b/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.md5 new file mode 100644 index 0000000..f9dee2c --- /dev/null +++ b/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.md5 @@ -0,0 +1,3 @@ +source_md5="73f2d4a81922c92f3792e4afe53c4105" +dest_md5="ee566c60bb6b7484e0c5c78a3bdf93d7" + diff --git a/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.stex b/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.stex new file mode 100644 index 0000000..702acad Binary files /dev/null and b/.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.stex differ diff --git a/.import/radiobox.png-97fbb059e430690da938d4922b077a50.md5 b/.import/radiobox.png-97fbb059e430690da938d4922b077a50.md5 new file mode 100644 index 0000000..6477fee --- /dev/null +++ b/.import/radiobox.png-97fbb059e430690da938d4922b077a50.md5 @@ -0,0 +1,3 @@ +source_md5="15a949962a511a9f44f6156e0c4d1a4d" +dest_md5="8b0a4efb9ce9622136409fe2899d9985" + diff --git a/.import/radiobox.png-97fbb059e430690da938d4922b077a50.stex b/.import/radiobox.png-97fbb059e430690da938d4922b077a50.stex new file mode 100644 index 0000000..e54449a Binary files /dev/null and b/.import/radiobox.png-97fbb059e430690da938d4922b077a50.stex differ diff --git a/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.md5 b/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.md5 new file mode 100644 index 0000000..98a8bb7 --- /dev/null +++ b/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.md5 @@ -0,0 +1,3 @@ +source_md5="96bba993663ebe3ce7611fb2e10fc5f3" +dest_md5="828f5b05d200bfceb076e2d4fd8424e2" + diff --git a/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.stex b/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.stex new file mode 100644 index 0000000..2fd50b0 Binary files /dev/null and b/.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.stex differ diff --git a/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.md5 b/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.md5 new file mode 100644 index 0000000..c639a20 --- /dev/null +++ b/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.md5 @@ -0,0 +1,3 @@ +source_md5="79f838d112bc3f2b1fc0806725339a8b" +dest_md5="be9af28672ccbcd635d42af90482f097" + diff --git a/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.stex b/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.stex new file mode 100644 index 0000000..04b2f9d Binary files /dev/null and b/.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.stex differ diff --git a/Assets/Theme/OGDT_theme.tres b/Assets/Theme/OGDT_theme.tres index e922850..6ef6b72 100644 --- a/Assets/Theme/OGDT_theme.tres +++ b/Assets/Theme/OGDT_theme.tres @@ -1,10 +1,189 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=15 format=2] -[ext_resource path="res://Assets/Theme/NotoMono-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://Assets/Theme/buttondisabled_styleboxflat.tres" type="StyleBox" id=1] +[ext_resource path="res://Assets/Theme/buttonhover_styleboxflat.tres" type="StyleBox" id=2] +[ext_resource path="res://Assets/Theme/button_styleboxflat.tres" type="StyleBox" id=3] +[ext_resource path="res://Assets/Theme/buttonpressed_styleboxflat.tres" type="StyleBox" id=4] +[ext_resource path="res://Assets/Theme/checkbox_checked.png" type="Texture" id=5] +[ext_resource path="res://Assets/Theme/radiobox_checked.png" type="Texture" id=6] +[ext_resource path="res://Assets/Theme/radiobox.png" type="Texture" id=7] +[ext_resource path="res://Assets/Theme/checkbox.png" type="Texture" id=8] +[ext_resource path="res://Assets/Theme/editbox_styleboxflat.tres" type="StyleBox" id=9] +[ext_resource path="res://Assets/Theme/label_styleboxflat.tres" type="StyleBox" id=10] +[ext_resource path="res://Assets/Theme/disablebg_styleboxflat.tres" type="StyleBox" id=11] +[ext_resource path="res://Assets/Theme/seperator_styleboxflat.tres" type="StyleBox" id=12] +[ext_resource path="res://Assets/Theme/NotoMono-Regular.ttf" type="DynamicFontData" id=13] [sub_resource type="DynamicFont" id=1] -font_data = ExtResource( 1 ) +font_data = ExtResource( 13 ) [resource] default_font = SubResource( 1 ) +Button/colors/font_color = Color( 0, 0, 0, 1 ) +Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) +Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/constants/hseparation = 2 +Button/fonts/font = null +Button/styles/disabled = ExtResource( 1 ) +Button/styles/focus = ExtResource( 1 ) +Button/styles/hover = ExtResource( 2 ) +Button/styles/normal = ExtResource( 3 ) +Button/styles/pressed = ExtResource( 4 ) +CheckBox/colors/font_color = Color( 0, 0, 0, 1 ) +CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +CheckBox/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) +CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 ) +CheckBox/colors/font_color_pressed = Color( 0.152941, 0.113725, 0.0392157, 1 ) +CheckBox/constants/check_vadjust = 0 +CheckBox/constants/hseparation = 4 +CheckBox/fonts/font = null +CheckBox/icons/checked = ExtResource( 5 ) +CheckBox/icons/radio_checked = ExtResource( 6 ) +CheckBox/icons/radio_unchecked = ExtResource( 7 ) +CheckBox/icons/unchecked = ExtResource( 8 ) +CheckBox/styles/disabled = null +CheckBox/styles/focus = null +CheckBox/styles/hover = ExtResource( 2 ) +CheckBox/styles/hover_pressed = ExtResource( 4 ) +CheckBox/styles/normal = null +CheckBox/styles/pressed = null +Label/colors/font_color = Color( 0, 0, 0, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) +Label/constants/line_spacing = 3 +Label/constants/shadow_as_outline = 0 +Label/constants/shadow_offset_x = 1 +Label/constants/shadow_offset_y = 1 +Label/fonts/font = null +Label/styles/normal = null +LineEdit/colors/clear_button_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.941176, 0.941176, 0.941176, 1 ) +LineEdit/colors/font_color = Color( 0, 0, 0, 1 ) +LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) +LineEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 ) +LineEdit/constants/minimum_spaces = 12 +LineEdit/fonts/font = null +LineEdit/icons/clear = null +LineEdit/styles/focus = null +LineEdit/styles/normal = ExtResource( 9 ) +LineEdit/styles/read_only = null +MenuButton/colors/font_color = Color( 0, 0, 0, 1 ) +MenuButton/colors/font_color_disabled = Color( 1, 1, 1, 0.3 ) +MenuButton/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) +MenuButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +MenuButton/constants/hseparation = 3 +MenuButton/fonts/font = null +MenuButton/styles/disabled = ExtResource( 1 ) +MenuButton/styles/focus = ExtResource( 1 ) +MenuButton/styles/hover = ExtResource( 2 ) +MenuButton/styles/normal = ExtResource( 3 ) +MenuButton/styles/pressed = ExtResource( 4 ) +Panel/styles/panel = ExtResource( 10 ) +Panel/styles/panelf = null +Panel/styles/panelnc = null +PanelContainer/styles/panel = ExtResource( 10 ) +PopupMenu/colors/font_color = Color( 0, 0, 0, 1 ) +PopupMenu/colors/font_color_accel = Color( 0.7, 0.7, 0.7, 0.8 ) +PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 ) +PopupMenu/colors/font_color_hover = Color( 0.878431, 0.878431, 0.878431, 1 ) +PopupMenu/constants/hseparation = 4 +PopupMenu/constants/vseparation = 4 +PopupMenu/fonts/font = null +PopupMenu/icons/checked = null +PopupMenu/icons/radio_checked = null +PopupMenu/icons/radio_unchecked = null +PopupMenu/icons/submenu = null +PopupMenu/icons/unchecked = null +PopupMenu/styles/hover = ExtResource( 2 ) +PopupMenu/styles/labeled_separator_left = null +PopupMenu/styles/labeled_separator_right = null +PopupMenu/styles/panel = ExtResource( 10 ) +PopupMenu/styles/panel_disabled = ExtResource( 11 ) +PopupMenu/styles/separator = ExtResource( 12 ) +TextEdit/colors/background_color = Color( 0, 0, 0, 0 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.172549, 0.164706, 0.196078, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87451, 0.87451, 0.87451, 0.129412 ) +TextEdit/colors/completion_font_color = Color( 0.666667, 0.666667, 0.666667, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.262745, 0.258824, 0.266667, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/font_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.635294, 0.807843, 1 ) +TextEdit/colors/line_number_color = Color( 0.666667, 0.666667, 0.666667, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.901961, 0.305882, 0.34902, 1 ) +TextEdit/colors/number_color = Color( 0.921569, 0.584314, 0.196078, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.666667, 0.784314, 0.666667, 0.6 ) +TextEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 ) +TextEdit/colors/symbol_color = Color( 0.941176, 0.941176, 0.941176, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/constants/completion_lines = 7 +TextEdit/constants/completion_max_width = 50 +TextEdit/constants/completion_scroll_width = 3 +TextEdit/constants/line_spacing = 4 +TextEdit/fonts/font = null +TextEdit/icons/tab = null +TextEdit/styles/completion = null +TextEdit/styles/focus = null +TextEdit/styles/normal = ExtResource( 9 ) +TextEdit/styles/read_only = null +ToolButton/colors/font_color = Color( 0, 0, 0, 1 ) +ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 ) +ToolButton/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 ) +ToolButton/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +ToolButton/constants/hseparation = 3 +ToolButton/fonts/font = null +ToolButton/styles/disabled = null +ToolButton/styles/focus = null +ToolButton/styles/hover = ExtResource( 2 ) +ToolButton/styles/normal = ExtResource( 3 ) +ToolButton/styles/pressed = ExtResource( 4 ) +Tree/colors/cursor_color = Color( 0, 0, 0, 1 ) +Tree/colors/custom_button_font_highlight = Color( 0.941176, 0.941176, 0.941176, 1 ) +Tree/colors/drop_position_color = Color( 1, 0.3, 0.2, 1 ) +Tree/colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) +Tree/colors/font_color_selected = Color( 1, 1, 1, 1 ) +Tree/colors/guide_color = Color( 0, 0, 0, 0.1 ) +Tree/colors/relationship_line_color = Color( 0.27451, 0.27451, 0.27451, 1 ) +Tree/colors/selection_color = Color( 0.1, 0.1, 1, 0.8 ) +Tree/colors/title_button_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +Tree/constants/button_margin = 4 +Tree/constants/draw_guides = 1 +Tree/constants/draw_relationship_lines = 0 +Tree/constants/guide_width = 2 +Tree/constants/hseparation = 4 +Tree/constants/item_margin = 12 +Tree/constants/scroll_border = 4 +Tree/constants/scroll_speed = 12 +Tree/constants/vseparation = 4 +Tree/fonts/font = null +Tree/fonts/title_button_font = null +Tree/icons/arrow = null +Tree/icons/arrow_collapsed = null +Tree/icons/checked = null +Tree/icons/select_arrow = null +Tree/icons/unchecked = null +Tree/icons/updown = null +Tree/styles/bg = null +Tree/styles/bg_focus = null +Tree/styles/button_pressed = null +Tree/styles/cursor = null +Tree/styles/cursor_unfocused = null +Tree/styles/custom_button = null +Tree/styles/custom_button_hover = null +Tree/styles/custom_button_pressed = null +Tree/styles/selected = null +Tree/styles/selected_focus = null +Tree/styles/title_button_hover = null +Tree/styles/title_button_normal = null +Tree/styles/title_button_pressed = null +VBoxContainer/constants/separation = 4 diff --git a/Assets/Theme/button_styleboxflat.tres b/Assets/Theme/button_styleboxflat.tres new file mode 100644 index 0000000..28d75a2 --- /dev/null +++ b/Assets/Theme/button_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.941176, 0.611765, 0.0627451, 1 ) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 +corner_detail = 3 + diff --git a/Assets/Theme/buttondisabled_styleboxflat.tres b/Assets/Theme/buttondisabled_styleboxflat.tres new file mode 100644 index 0000000..3f49202 --- /dev/null +++ b/Assets/Theme/buttondisabled_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.615686, 0.458824, 0.207843, 1 ) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 +corner_detail = 3 + diff --git a/Assets/Theme/buttonhover_styleboxflat.tres b/Assets/Theme/buttonhover_styleboxflat.tres new file mode 100644 index 0000000..365ccf2 --- /dev/null +++ b/Assets/Theme/buttonhover_styleboxflat.tres @@ -0,0 +1,9 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 1, 0.686275, 0.168627, 0.870588 ) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 + diff --git a/Assets/Theme/buttonpressed_styleboxflat.tres b/Assets/Theme/buttonpressed_styleboxflat.tres new file mode 100644 index 0000000..92c5cf3 --- /dev/null +++ b/Assets/Theme/buttonpressed_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.870042, 0.550149, 0.016993, 1 ) +corner_radius_top_left = 7 +corner_radius_top_right = 7 +corner_radius_bottom_right = 7 +corner_radius_bottom_left = 7 +corner_detail = 3 + diff --git a/Assets/Theme/checkbox.png b/Assets/Theme/checkbox.png new file mode 100644 index 0000000..d4415bd Binary files /dev/null and b/Assets/Theme/checkbox.png differ diff --git a/Assets/Theme/checkbox.png.import b/Assets/Theme/checkbox.png.import new file mode 100644 index 0000000..a609f11 --- /dev/null +++ b/Assets/Theme/checkbox.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Theme/checkbox.png" +dest_files=[ "res://.import/checkbox.png-c05dde519ab06a9e7a4e1acea7f2d22d.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/Theme/checkbox_checked.png b/Assets/Theme/checkbox_checked.png new file mode 100644 index 0000000..c1e2928 Binary files /dev/null and b/Assets/Theme/checkbox_checked.png differ diff --git a/Assets/Theme/checkbox_checked.png.import b/Assets/Theme/checkbox_checked.png.import new file mode 100644 index 0000000..06be5c5 --- /dev/null +++ b/Assets/Theme/checkbox_checked.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Theme/checkbox_checked.png" +dest_files=[ "res://.import/checkbox_checked.png-16a60824c87d8386e4460bc8cad8c13b.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/Theme/disablebg_styleboxflat.tres b/Assets/Theme/disablebg_styleboxflat.tres new file mode 100644 index 0000000..8737f63 --- /dev/null +++ b/Assets/Theme/disablebg_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.752941, 0.67451, 0.541176, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.65098, 0.407843, 0, 1 ) + diff --git a/Assets/Theme/editbox_styleboxflat.tres b/Assets/Theme/editbox_styleboxflat.tres new file mode 100644 index 0000000..0f4b932 --- /dev/null +++ b/Assets/Theme/editbox_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.803922, 0.721569, 0.580392, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.941176, 0.611765, 0.0627451, 1 ) + diff --git a/Assets/Theme/label_styleboxflat.tres b/Assets/Theme/label_styleboxflat.tres new file mode 100644 index 0000000..cd3507a --- /dev/null +++ b/Assets/Theme/label_styleboxflat.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0.909804, 0.815686, 0.654902, 1 ) +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +border_color = Color( 0.941176, 0.611765, 0.0627451, 1 ) + diff --git a/Assets/Theme/radiobox.png b/Assets/Theme/radiobox.png new file mode 100644 index 0000000..1e231fb Binary files /dev/null and b/Assets/Theme/radiobox.png differ diff --git a/Assets/Theme/radiobox.png.import b/Assets/Theme/radiobox.png.import new file mode 100644 index 0000000..4f2cbc4 --- /dev/null +++ b/Assets/Theme/radiobox.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/radiobox.png-97fbb059e430690da938d4922b077a50.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Theme/radiobox.png" +dest_files=[ "res://.import/radiobox.png-97fbb059e430690da938d4922b077a50.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/Theme/radiobox_checked.png b/Assets/Theme/radiobox_checked.png new file mode 100644 index 0000000..f5d2252 Binary files /dev/null and b/Assets/Theme/radiobox_checked.png differ diff --git a/Assets/Theme/radiobox_checked.png.import b/Assets/Theme/radiobox_checked.png.import new file mode 100644 index 0000000..0568257 --- /dev/null +++ b/Assets/Theme/radiobox_checked.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Theme/radiobox_checked.png" +dest_files=[ "res://.import/radiobox_checked.png-629b104dedda83dec53a052f5826fc9a.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/Theme/seperator_styleboxflat.tres b/Assets/Theme/seperator_styleboxflat.tres new file mode 100644 index 0000000..fb9f659 --- /dev/null +++ b/Assets/Theme/seperator_styleboxflat.tres @@ -0,0 +1,14 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0, 0, 0, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 0.941176, 0.611765, 0.0627451, 1 ) +expand_margin_left = 1.0 +expand_margin_right = 1.0 +expand_margin_top = 3.0 +expand_margin_bottom = 3.0 + diff --git a/Assets/staffsprites/dude80s.png b/Assets/staffsprites/dude80s.png new file mode 100644 index 0000000..5b5b8e8 Binary files /dev/null and b/Assets/staffsprites/dude80s.png differ diff --git a/Assets/staffsprites/dude80s.png.import b/Assets/staffsprites/dude80s.png.import new file mode 100644 index 0000000..f0be4df --- /dev/null +++ b/Assets/staffsprites/dude80s.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/staffsprites/dude80s.png" +dest_files=[ "res://.import/dude80s.png-b2388c947c1e0832e0f9624fbdff8156.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/Assets/staffsprites/empty80s_desk.png b/Assets/staffsprites/empty80s_desk.png new file mode 100644 index 0000000..1b389ad Binary files /dev/null and b/Assets/staffsprites/empty80s_desk.png differ diff --git a/Assets/staffsprites/empty80s_desk.png.import b/Assets/staffsprites/empty80s_desk.png.import new file mode 100644 index 0000000..4c34a8d --- /dev/null +++ b/Assets/staffsprites/empty80s_desk.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/staffsprites/empty80s_desk.png" +dest_files=[ "res://.import/empty80s_desk.png-6895daf2351bbb430ced9e16caa5d2f9.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=true +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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/staffsprites/smallbg.png b/Assets/staffsprites/smallbg.png new file mode 100644 index 0000000..c831be0 Binary files /dev/null and b/Assets/staffsprites/smallbg.png differ diff --git a/Assets/staffsprites/smallbg.png.import b/Assets/staffsprites/smallbg.png.import new file mode 100644 index 0000000..5f43e10 --- /dev/null +++ b/Assets/staffsprites/smallbg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/staffsprites/smallbg.png" +dest_files=[ "res://.import/smallbg.png-a2cdbd5543a868e3d1474adb2b974101.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/GUI/HUD.tscn b/GUI/HUD.tscn index 72a7a35..a38d37d 100644 --- a/GUI/HUD.tscn +++ b/GUI/HUD.tscn @@ -1,8 +1,21 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://Assets/Theme/OGDT_theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/HUD.gd" type="Script" id=2] -[ext_resource path="res://Assets/Theme/progression.png" type="Texture" id=3] +[ext_resource path="res://Assets/Theme/label_styleboxflat.tres" type="StyleBox" id=3] +[ext_resource path="res://Assets/Theme/progression.png" type="Texture" id=4] +[ext_resource path="res://GUI/Staff.tscn" type="PackedScene" id=5] + +[sub_resource type="Theme" id=1] +Label/colors/font_color = Color( 0, 0, 0, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) +Label/constants/line_spacing = 3 +Label/constants/shadow_as_outline = 0 +Label/constants/shadow_offset_x = 1 +Label/constants/shadow_offset_y = 1 +Label/fonts/font = null +Label/styles/normal = ExtResource( 3 ) [node name="HUD" type="Control"] anchor_right = 1.0 @@ -11,6 +24,7 @@ theme = ExtResource( 1 ) script = ExtResource( 2 ) [node name="bottonbar" type="HBoxContainer" parent="."] +editor/display_folded = true anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 @@ -30,10 +44,12 @@ text = "Research" items = [ "Research", null, 0, false, false, -1, 0, null, "", false ] [node name="Date" type="Label" parent="."] +editor/display_folded = true anchor_left = 1.0 anchor_right = 1.0 margin_left = -140.0 margin_bottom = 19.0 +theme = SubResource( 1 ) text = "JAN/1988 Week 1" align = 2 @@ -43,6 +59,7 @@ wait_time = 2.5 autostart = true [node name="Gameindev" type="ScrollContainer" parent="."] +editor/display_folded = true margin_right = 873.0 margin_bottom = 120.0 @@ -53,6 +70,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Researchpoints" type="TextureRect" parent="."] +editor/display_folded = true self_modulate = Color( 0, 0, 1, 1 ) anchor_left = 1.0 anchor_top = 0.5 @@ -61,7 +79,7 @@ anchor_bottom = 0.5 margin_left = -64.0 margin_top = -180.0 margin_bottom = -116.0 -texture = ExtResource( 3 ) +texture = ExtResource( 4 ) [node name="Label" type="Label" parent="Researchpoints"] anchor_right = 1.0 @@ -70,3 +88,7 @@ text = "0" align = 1 valign = 1 +[node name="Staff" parent="." instance=ExtResource( 5 )] +position = Vector2( 480, 290 ) +scale = Vector2( 7, 7 ) + diff --git a/GUI/Main.tscn b/GUI/Main.tscn index 82be92f..9a66dc5 100644 --- a/GUI/Main.tscn +++ b/GUI/Main.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Assets/Theme/OGDT_theme.tres" type="Theme" id=1] [ext_resource path="res://Scripts/Main.gd" type="Script" id=2] +[ext_resource path="res://thumbnail.png" type="Texture" id=3] [node name="Main" type="Control"] anchor_right = 1.0 @@ -14,3 +15,13 @@ margin_right = 12.0 margin_bottom = 20.0 text = "New Game" +[node name="TextureRect" type="TextureRect" parent="."] +anchor_left = 1.0 +anchor_top = 0.5 +anchor_right = 1.0 +anchor_bottom = 0.5 +margin_left = -315.0 +margin_top = -125.0 +margin_bottom = 125.0 +texture = ExtResource( 3 ) + diff --git a/GUI/Staff.tscn b/GUI/Staff.tscn new file mode 100644 index 0000000..acad2c2 --- /dev/null +++ b/GUI/Staff.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Scripts/Staff.gd" type="Script" id=1] +[ext_resource path="res://objects/member.tscn" type="PackedScene" id=2] + +[node name="Staff" type="Node2D"] +script = ExtResource( 1 ) + +[node name="member" parent="." instance=ExtResource( 2 )] + diff --git a/GUI/devstudio.tscn b/GUI/devstudio.tscn index 5792c92..5498540 100644 --- a/GUI/devstudio.tscn +++ b/GUI/devstudio.tscn @@ -1,12 +1,20 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Scripts/devstudio.gd" type="Script" id=1] -[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=2] +[ext_resource path="res://Assets/staffsprites/smallbg.png" type="Texture" id=2] +[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=3] [node name="devstudio" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) -[node name="HUD" parent="." instance=ExtResource( 2 )] +[node name="TextureRect" type="TextureRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 2 ) +expand = true +stretch_mode = 4 + +[node name="HUD" parent="." instance=ExtResource( 3 )] diff --git a/GUI/makenewgame.tscn b/GUI/makenewgame.tscn index 56ca33c..a2fce93 100644 --- a/GUI/makenewgame.tscn +++ b/GUI/makenewgame.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://Scripts/makenewgame.gd" type="Script" id=1] -[ext_resource path="res://Assets/audience/young.png" type="Texture" id=2] -[ext_resource path="res://Assets/audience/young_selected.png" type="Texture" id=3] -[ext_resource path="res://Assets/audience/everyone.png" type="Texture" id=4] -[ext_resource path="res://Assets/audience/everyong_selected.png" type="Texture" id=5] -[ext_resource path="res://Assets/audience/mature.png" type="Texture" id=6] -[ext_resource path="res://Assets/audience/mature_selected.png" type="Texture" id=7] +[ext_resource path="res://Assets/Theme/OGDT_theme.tres" type="Theme" id=1] +[ext_resource path="res://Scripts/makenewgame.gd" type="Script" id=2] +[ext_resource path="res://Assets/audience/young.png" type="Texture" id=3] +[ext_resource path="res://Assets/audience/young_selected.png" type="Texture" id=4] +[ext_resource path="res://Assets/audience/everyone.png" type="Texture" id=5] +[ext_resource path="res://Assets/audience/everyong_selected.png" type="Texture" id=6] +[ext_resource path="res://Assets/audience/mature.png" type="Texture" id=7] +[ext_resource path="res://Assets/audience/mature_selected.png" type="Texture" id=8] [node name="makenewgame" type="VBoxContainer"] anchor_left = 0.5 @@ -14,113 +15,114 @@ anchor_right = 0.5 anchor_bottom = 1.0 margin_left = -164.0 margin_right = 164.0 -script = ExtResource( 1 ) +theme = ExtResource( 1 ) +script = ExtResource( 2 ) [node name="gamename" type="TextEdit" parent="."] margin_right = 328.0 -margin_bottom = 46.0 +margin_bottom = 47.0 size_flags_horizontal = 3 size_flags_vertical = 3 size_flags_stretch_ratio = 0.4 text = "Insert Game Name" [node name="gamesize" type="HBoxContainer" parent="."] -margin_top = 50.0 +margin_top = 51.0 margin_right = 328.0 -margin_bottom = 90.0 +margin_bottom = 83.0 size_flags_horizontal = 3 size_flags_vertical = 3 size_flags_stretch_ratio = 0.0 [node name="Small" type="Button" parent="gamesize"] -margin_right = 47.0 -margin_bottom = 40.0 +margin_right = 50.0 +margin_bottom = 32.0 text = "Small" [node name="Medium" type="Button" parent="gamesize"] -margin_left = 51.0 -margin_right = 116.0 -margin_bottom = 40.0 +margin_left = 54.0 +margin_right = 114.0 +margin_bottom = 32.0 text = "Medium" [node name="Large" type="Button" parent="gamesize"] -margin_left = 120.0 -margin_right = 166.0 -margin_bottom = 40.0 +margin_left = 118.0 +margin_right = 168.0 +margin_bottom = 32.0 text = "Large" [node name="TripleA" type="Button" parent="gamesize"] -margin_left = 170.0 -margin_right = 209.0 -margin_bottom = 40.0 +margin_left = 172.0 +margin_right = 202.0 +margin_bottom = 32.0 text = "AAA" [node name="MMO" type="CheckButton" parent="gamesize"] -margin_left = 213.0 -margin_right = 328.0 -margin_bottom = 40.0 +margin_left = 206.0 +margin_right = 302.0 +margin_bottom = 32.0 text = "MMO" [node name="targetaudience" type="HBoxContainer" parent="."] -margin_top = 94.0 +margin_top = 87.0 margin_right = 328.0 -margin_bottom = 210.0 +margin_bottom = 205.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Young" type="TextureButton" parent="targetaudience"] margin_right = 64.0 -margin_bottom = 116.0 +margin_bottom = 118.0 toggle_mode = true -texture_normal = ExtResource( 2 ) -texture_pressed = ExtResource( 3 ) +texture_normal = ExtResource( 3 ) +texture_pressed = ExtResource( 4 ) [node name="Everyone" type="TextureButton" parent="targetaudience"] margin_left = 68.0 margin_right = 132.0 -margin_bottom = 116.0 +margin_bottom = 118.0 toggle_mode = true pressed = true -texture_normal = ExtResource( 4 ) -texture_pressed = ExtResource( 5 ) +texture_normal = ExtResource( 5 ) +texture_pressed = ExtResource( 6 ) [node name="Mature" type="TextureButton" parent="targetaudience"] margin_left = 136.0 margin_right = 200.0 -margin_bottom = 116.0 +margin_bottom = 118.0 toggle_mode = true -texture_normal = ExtResource( 6 ) -texture_pressed = ExtResource( 7 ) +texture_normal = ExtResource( 7 ) +texture_pressed = ExtResource( 8 ) [node name="platforms" type="HBoxContainer" parent="."] -margin_top = 214.0 +margin_top = 209.0 margin_right = 328.0 -margin_bottom = 330.0 +margin_bottom = 327.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="genres" type="HBoxContainer" parent="."] -margin_top = 334.0 +margin_top = 331.0 margin_right = 328.0 -margin_bottom = 450.0 +margin_bottom = 449.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="themes" type="HBoxContainer" parent="."] -margin_top = 454.0 +margin_top = 453.0 margin_right = 328.0 -margin_bottom = 454.0 +margin_bottom = 453.0 [node name="engine" type="MenuButton" parent="."] -margin_top = 458.0 +margin_top = 457.0 margin_right = 328.0 -margin_bottom = 574.0 +margin_bottom = 575.0 size_flags_horizontal = 3 size_flags_vertical = 3 text = "Engine" [node name="confirm" type="Button" parent="."] -margin_top = 578.0 +margin_top = 579.0 margin_right = 328.0 margin_bottom = 598.0 text = "Start Project" diff --git a/README.txt b/README.txt index 0b021bd..00cb1d1 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,24 @@ - +### ABOUT +This is an opensource fan game of GameDevTycoon by GreenHeartGames +### TODO +Contracts +Engines +Manage staff to work on Games/Contracts +Staff add tech/design/bug points to games they work on +Staff add research points to the research bar +Staff Hire, research, training, vaction, and sack/fired handling ### BRAIN STORMING maybe add in cult followings that slowly push the game sales +staff special abilities +training menu +staff rest and vacation manager +spend excess research points to increase game review score during debugging phase +add background easter eggs like in GDT (Pong, and Portal) +News articles +Interactive economy +Multiplayer +Bankruptcies appear in from previous saves, (Like how the oregon trail had tombstones you could view after a save got a gameover.) ### LINKS Souce Code: https://gitgud.io/lavaduder/opengamedevtycoon diff --git a/Scripts/Staff.gd b/Scripts/Staff.gd new file mode 100644 index 0000000..c5a44da --- /dev/null +++ b/Scripts/Staff.gd @@ -0,0 +1,12 @@ +extends Node2D + +var mem = { + "You":{#Let's use this as an example + "experience":0,#Points you gain by making games and training. You can place them where you want. + "research":300,#larger research points, faster research, Avoids making bugs, and helps in debugging + "tech":300,#larger design points, also increased in bugs + "design":300,#larger design points, also increased in bugs + "speed":300,#Increases the chance of tech, design and bug points, debugs faster + "special":"Owner"#This is for special stuff, owner means you don't take breaks + } +} \ No newline at end of file diff --git a/Scripts/makenewgame.gd b/Scripts/makenewgame.gd index 107539f..fdf02b4 100644 --- a/Scripts/makenewgame.gd +++ b/Scripts/makenewgame.gd @@ -107,7 +107,7 @@ func register_game():#Sends the idea off to the studio for developement func _ready(): var t = $"/root/loader".load_json(ProjectSettings.get("Game/Resources/Themesmod")) add_menu_to($themes,t,get_parent().get_parent().themeamount) - add_menu_to($genres,["Action","Adventure","RPG","Simulation","Strategy"," Casual"],get_parent().get_parent().genreamount) + add_menu_to($genres,["Action","Adventure","RPG","Simulation","Strategy","Casual"],get_parent().get_parent().genreamount) add_menu_to($platforms,get_parent().get_parent().platforms,get_parent().get_parent().platforms.size()/2) for i in get_parent().get_parent().engines: diff --git a/Scripts/reviews.gd b/Scripts/reviews.gd index 22fc1d8..097d544 100644 --- a/Scripts/reviews.gd +++ b/Scripts/reviews.gd @@ -100,6 +100,27 @@ func calc_score():#calculation the scores while(ithemres[them][genre]): - scorecalc+=1 + scorecalc+=(1*personalmultiplier) possible_comments.append(genre+"/"+them+" Is good combo") possible_comments.append(genre+"/"+them+" Is a fun combo") else: - scorecalc-=1 + scorecalc-=(1*personalmultiplier) + if(i==3): + personalmultiplier-=0.1 possible_comments.append(genre+"/"+them+" Isn't really a good combo") #& is it a good targetaudience/theme match if(themres[them]["targetaudience"]==data["targetaudience"]): - scorecalc+=1 + scorecalc+=(1*personalmultiplier) possible_comments.append("The "+data["targetaudience"]+" crowd will enjoy the "+them+" theme.") possible_comments.append("The theme should not be rated for "+data["targetaudience"]+" audience.") possible_comments.append(them+" doesn't work with targeted audience.") else: - scorecalc-=1 + scorecalc-=(1*personalmultiplier) + if(i==3): + personalmultiplier-=0.1 #is it a good targetaudience/platform match for plat in data["platforms"]: if(platres[plat]["Targetaudience"]==data["targetaudience"]): - scorecalc+=1 + scorecalc+=(1*personalmultiplier) possible_comments.append(plat+" has just right audience") possible_comments.append(data["targetaudience"]+" Works for the platform.") else: - scorecalc-=1 + scorecalc-=(1*personalmultiplier) + if(i==3): + personalmultiplier-=0.1 possible_comments.append("What do they think the "+plat+" audience is?") possible_comments.append("I don't see how the platform works with "+data["targetaudience"]) #Does the phases match the genre? @@ -148,12 +175,15 @@ func calc_score():#calculation the scores var compare = genre_collab[devsection]/data["genres"].size() print_debug(abs(data[devsection]-compare)) if(abs(data[devsection]-compare)