From 7c3fd134e78d811769bc4a33de727f8af29baa64 Mon Sep 17 00:00:00 2001 From: Leon Palluch Date: Sat, 1 Feb 2020 16:54:53 +0100 Subject: [PATCH] mmmhh --- 3D Input/Beintextur.png.import | 34 ++++++++++++++++++++++++++++ 3D Input/beinimage.png.import | 34 ++++++++++++++++++++++++++++ Controllers/GameStateController.gd | 34 +++++++++++----------------- Controllers/GameStateController.tscn | 4 ++-- Resources/Fonts/FontReadMe.txt | 29 ++++++++++++++++++++++++ UI/WinScreen.tscn | 4 ++-- UI/WinScreenScript.gd | 4 ++-- 7 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 3D Input/Beintextur.png.import create mode 100644 3D Input/beinimage.png.import create mode 100644 Resources/Fonts/FontReadMe.txt diff --git a/3D Input/Beintextur.png.import b/3D Input/Beintextur.png.import new file mode 100644 index 0000000..c384a07 --- /dev/null +++ b/3D Input/Beintextur.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Beintextur.png-2ae020ac9731826dac97bd29939f551e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://3D Input/Beintextur.png" +dest_files=[ "res://.import/Beintextur.png-2ae020ac9731826dac97bd29939f551e.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/3D Input/beinimage.png.import b/3D Input/beinimage.png.import new file mode 100644 index 0000000..9f17b69 --- /dev/null +++ b/3D Input/beinimage.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/beinimage.png-a7e3863a81de772333653d8998415984.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://3D Input/beinimage.png" +dest_files=[ "res://.import/beinimage.png-a7e3863a81de772333653d8998415984.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/Controllers/GameStateController.gd b/Controllers/GameStateController.gd index 54dd23a..4f38f3c 100644 --- a/Controllers/GameStateController.gd +++ b/Controllers/GameStateController.gd @@ -2,21 +2,17 @@ extends Node var _win_screen_scene var _fighting_scene_path = "res://Ingame/Testing.tscn" - -#test vars -var test = 0 -var tested = false -signal player_win(player_id) - - +var _fighting_scene +var _body_build_scene func _ready(): _win_screen_scene = preload("res://UI/WinScreen.tscn").instance() - #_fighting_scene = preload("res://Ingame/Testing.tscn").instance() + _body_build_scene = preload("res://BodyConfig/bodyBuilderMenu.tscn").instance() + _fighting_scene = preload("res://Ingame/Testing.tscn").instance() - connect("player_win", self, "_switch_to_win") - _win_screen_scene.connect("start_fight", self, "_switch_to_fighting") - + InGameState.connect("player_win", self, "_switch_to_win") + _body_build_scene.connect("start_fight", self, "_switch_to_fighting") + _win_screen_scene.connect("build_body", self, "_switch_to_body_build") func _switch_scene(scene): #delete children @@ -35,15 +31,11 @@ func _switch_to_win(player_id): func _switch_to_fighting(): - #_switch_scene(_fighting_scene) - get_tree().reload_current_scene() + print("oh fuck") + + _switch_scene(_fighting_scene) + #get_tree().reload_current_scene() -# test -#func _process(delta): - #if test > 3 and not tested: - #tested = true - #test = 0 - #emit_signal("player_win", 1) - #else: - #test += delta +func _switch_to_body_build(): + _switch_scene(_body_build_scene) diff --git a/Controllers/GameStateController.tscn b/Controllers/GameStateController.tscn index e55c1f8..31e7866 100644 --- a/Controllers/GameStateController.tscn +++ b/Controllers/GameStateController.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://Controllers/GameStateController.gd" type="Script" id=1] -[ext_resource path="res://Ingame/Testing.tscn" type="PackedScene" id=2] +[ext_resource path="res://BodyConfig/bodyBuilderMenu.tscn" type="PackedScene" id=2] [node name="GameStateController" type="Node"] script = ExtResource( 1 ) -[node name="InGame" parent="." instance=ExtResource( 2 )] +[node name="Body Builder Menu" parent="." instance=ExtResource( 2 )] diff --git a/Resources/Fonts/FontReadMe.txt b/Resources/Fonts/FontReadMe.txt new file mode 100644 index 0000000..1d8b90b --- /dev/null +++ b/Resources/Fonts/FontReadMe.txt @@ -0,0 +1,29 @@ +T E P I D M O N K E Y F O N T S +freeware fonts for a freeware world + +Site: http://www.tepidmonkey.com/ +E-mail: brandon@tepidmonkey.com + +Thanks for your interest in my fonts! + +For help on how to unzip, unstuff or install one of my +fonts, please visit my site at +www.tepidmonkey.com and go to the Help section. +If you have any comments or questions, you can e-mail +me at brandon@tepidmonkey.com and I'll try to reply as +soon as possible. + +Every week, I present a brand new original font for +your downloading pleasure, so be sure to visit the web +site every Sunday. + +You may use this font(s) for non-commercial and +commercial purposes. You are not allowed to sell this +font for any fee at all. You are allowed to +redistribute it as long as you don't charge anything +for it and as long as you include this unaltered +ReadMe.txt file. You may not change any aspect of the font +file or of this file. +For the full set of terms of use (which override what +is listed here anyway), go to www.tepidmonkey.com +and visit the Terms section. \ No newline at end of file diff --git a/UI/WinScreen.tscn b/UI/WinScreen.tscn index 1a82773..bf0693b 100644 --- a/UI/WinScreen.tscn +++ b/UI/WinScreen.tscn @@ -38,9 +38,9 @@ align = 1 valign = 2 [node name="PlayerWon" type="Label" parent="MarginContainer/VBoxContainer"] -margin_top = 253.0 +margin_top = 254.0 margin_right = 1024.0 -margin_bottom = 503.0 +margin_bottom = 504.0 rect_min_size = Vector2( 0, 250 ) custom_fonts/font = ExtResource( 3 ) align = 1 diff --git a/UI/WinScreenScript.gd b/UI/WinScreenScript.gd index 6d9c713..d02ea86 100644 --- a/UI/WinScreenScript.gd +++ b/UI/WinScreenScript.gd @@ -3,7 +3,7 @@ extends Control export(NodePath) var labelPath export(NodePath) var continuePath -signal start_fight() +signal build_body() var _playerWonLabel var _continueButton @@ -20,4 +20,4 @@ func set_win_message(player_id): func _on_Continue_pressed(): print("test2") - emit_signal("start_fight") + emit_signal("build_body")