This commit is contained in:
Leon Palluch 2020-02-01 16:54:53 +01:00
parent c6f6fbfac8
commit 7c3fd134e7
7 changed files with 116 additions and 27 deletions

View File

@ -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

View File

@ -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

View File

@ -2,21 +2,17 @@ extends Node
var _win_screen_scene var _win_screen_scene
var _fighting_scene_path = "res://Ingame/Testing.tscn" var _fighting_scene_path = "res://Ingame/Testing.tscn"
var _fighting_scene
#test vars var _body_build_scene
var test = 0
var tested = false
signal player_win(player_id)
func _ready(): func _ready():
_win_screen_scene = preload("res://UI/WinScreen.tscn").instance() _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") InGameState.connect("player_win", self, "_switch_to_win")
_win_screen_scene.connect("start_fight", self, "_switch_to_fighting") _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): func _switch_scene(scene):
#delete children #delete children
@ -35,15 +31,11 @@ func _switch_to_win(player_id):
func _switch_to_fighting(): func _switch_to_fighting():
#_switch_scene(_fighting_scene) print("oh fuck")
get_tree().reload_current_scene()
_switch_scene(_fighting_scene)
#get_tree().reload_current_scene()
# test func _switch_to_body_build():
#func _process(delta): _switch_scene(_body_build_scene)
#if test > 3 and not tested:
#tested = true
#test = 0
#emit_signal("player_win", 1)
#else:
#test += delta

View File

@ -1,9 +1,9 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://Controllers/GameStateController.gd" type="Script" id=1] [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"] [node name="GameStateController" type="Node"]
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="InGame" parent="." instance=ExtResource( 2 )] [node name="Body Builder Menu" parent="." instance=ExtResource( 2 )]

View File

@ -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.

View File

@ -38,9 +38,9 @@ align = 1
valign = 2 valign = 2
[node name="PlayerWon" type="Label" parent="MarginContainer/VBoxContainer"] [node name="PlayerWon" type="Label" parent="MarginContainer/VBoxContainer"]
margin_top = 253.0 margin_top = 254.0
margin_right = 1024.0 margin_right = 1024.0
margin_bottom = 503.0 margin_bottom = 504.0
rect_min_size = Vector2( 0, 250 ) rect_min_size = Vector2( 0, 250 )
custom_fonts/font = ExtResource( 3 ) custom_fonts/font = ExtResource( 3 )
align = 1 align = 1

View File

@ -3,7 +3,7 @@ extends Control
export(NodePath) var labelPath export(NodePath) var labelPath
export(NodePath) var continuePath export(NodePath) var continuePath
signal start_fight() signal build_body()
var _playerWonLabel var _playerWonLabel
var _continueButton var _continueButton
@ -20,4 +20,4 @@ func set_win_message(player_id):
func _on_Continue_pressed(): func _on_Continue_pressed():
print("test2") print("test2")
emit_signal("start_fight") emit_signal("build_body")