Commit a664d8ed authored by KLAPCZYNSKI NATHANAEL's avatar KLAPCZYNSKI NATHANAEL
Browse files

Merge branch 'master' into 'master'

Merge executable

See merge request !13
parents 74133aed e494cac5
source_md5="df35831385cdf2d60c02b4a76232aa02"
dest_md5="09399b318c372576acbb1fd659361cf3"
source_md5="df35831385cdf2d60c02b4a76232aa02"
dest_md5="09399b318c372576acbb1fd659361cf3"
[preset.0]
name="Windows Desktop"
platform="Windows Desktop"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../bin/ArcheoQuest.exe"
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""
[preset.0.options]
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
binary_format/64_bits=true
binary_format/embed_pck=true
custom_template/release=""
custom_template/debug=""
codesign/enable=false
codesign/identity_type=0
codesign/identity=""
codesign/password=""
codesign/timestamp=true
codesign/timestamp_server_url=""
codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PoolStringArray( )
application/icon="res://icon.png"
application/file_version=""
application/product_version=""
application/company_name=""
application/product_name="Archeoquest"
application/file_description=""
application/copyright=""
application/trademarks=""
......@@ -17,7 +17,7 @@ var objet
func _init():
objet = {
"id" : -1,
"load" : "res://terrain/tresor.png",
"load" : "res://terrain/assets/tresor.png",
"tab" : [
[1,2,2],[1,1,2],[1,2,2]
],
......
......@@ -18,15 +18,15 @@ use_mipmaps = true
use_filter = true
font_data = ExtResource( 1 )
[sub_resource type="StyleBoxFlat" id=5]
bg_color = Color( 0.635294, 0.329412, 0, 1 )
[sub_resource type="StyleBoxFlat" id=3]
bg_color = Color( 0.635294, 0.329412, 0, 1 )
[sub_resource type="StyleBoxFlat" id=4]
bg_color = Color( 0.635294, 0.329412, 0, 1 )
[sub_resource type="StyleBoxFlat" id=5]
bg_color = Color( 0.635294, 0.329412, 0, 1 )
[node name="Fin" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
......@@ -55,10 +55,10 @@ __meta__ = {
}
[node name="lbl_fouille" type="Label" parent="."]
margin_left = 205.091
margin_top = 167.591
margin_right = 368.091
margin_bottom = 203.591
margin_left = 179.094
margin_top = 165.591
margin_right = 342.094
margin_bottom = 201.591
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
text = "Note fouille :"
......@@ -81,10 +81,10 @@ __meta__ = {
}
[node name="lbl_note_rapport" type="Label" parent="."]
margin_left = 379.997
margin_top = 236.545
margin_right = 542.997
margin_bottom = 272.545
margin_left = 382.994
margin_top = 226.796
margin_right = 545.994
margin_bottom = 262.796
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
text = "/10"
......@@ -107,10 +107,10 @@ __meta__ = {
}
[node name="lbl_temps_rest" type="Label" parent="."]
margin_left = 377.475
margin_top = 310.543
margin_right = 540.475
margin_bottom = 346.543
margin_left = 386.475
margin_top = 284.543
margin_right = 549.475
margin_bottom = 320.543
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
text = "0s"
......@@ -120,10 +120,10 @@ __meta__ = {
}
[node name="lbl_rapport" type="Label" parent="."]
margin_left = 199.204
margin_top = 237.385
margin_right = 362.204
margin_bottom = 273.385
margin_left = 184.204
margin_top = 228.385
margin_right = 347.204
margin_bottom = 264.385
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
text = "Note rapport :"
......@@ -133,9 +133,9 @@ __meta__ = {
}
[node name="lbl_totale" type="Label" parent="."]
margin_left = 206.772
margin_left = 175.595
margin_top = 376.974
margin_right = 369.772
margin_right = 338.595
margin_bottom = 412.974
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
......@@ -146,10 +146,10 @@ __meta__ = {
}
[node name="lbl_temps" type="Label" parent="."]
margin_left = 183.227
margin_top = 308.862
margin_right = 362.227
margin_bottom = 344.862
margin_left = 187.443
margin_top = 285.862
margin_right = 366.443
margin_bottom = 321.862
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0.658824, 0.345098, 0.0117647, 1 )
text = "Temps restant : "
......@@ -163,9 +163,9 @@ margin_left = 704.0
margin_top = 510.0
margin_right = 951.0
margin_bottom = 559.0
custom_styles/hover = SubResource( 5 )
custom_styles/focus = SubResource( 3 )
custom_styles/normal = SubResource( 4 )
custom_styles/hover = SubResource( 3 )
custom_styles/focus = SubResource( 4 )
custom_styles/normal = SubResource( 5 )
custom_colors/font_color = Color( 1, 0.6, 0.282353, 1 )
text = "Menu principale"
__meta__ = {
......
[gd_scene load_steps=16 format=2]
[gd_scene load_steps=15 format=2]
[ext_resource path="res://menus/principal/Button_menu.tscn" type="PackedScene" id=1]
[ext_resource path="res://menus/principal/fond_debut.png" type="Texture" id=2]
[ext_resource path="res://menus/fonts/Banbury DEMO.otf" type="DynamicFontData" id=3]
[ext_resource path="res://menus/fonts/font_dinamique.tres" type="DynamicFont" id=4]
[ext_resource path="res://fonts/RINGM___.TTF" type="DynamicFontData" id=5]
[ext_resource path="res://menus/principal/fond_debut_normal.png" type="Texture" id=6]
......@@ -59,7 +58,7 @@ region_rect = Rect2( 0, 0, 620, 150 )
[sub_resource type="DynamicFont" id=7]
size = 40
use_filter = true
font_data = ExtResource( 3 )
font_data = ExtResource( 5 )
[node name="Principal" type="Control"]
anchor_right = 1.0
......@@ -122,6 +121,7 @@ margin_bottom = 426.0
custom_styles/focus = SubResource( 5 )
custom_styles/normal = SubResource( 6 )
custom_fonts/font = SubResource( 7 )
custom_colors/font_color = Color( 0.482353, 0.345098, 0.192157, 1 )
align = 1
script = ExtResource( 7 )
__meta__ = {
......
......@@ -21,6 +21,26 @@ func _process(delta):
func _on_Suivant_pressed():
if Joueur.objet["degats"] < 1:
Joueur.note_fouille = 10
elif Joueur.objet["degats"] < 3:
Joueur.note_fouille = 9
elif Joueur.objet["degats"] < 5:
Joueur.note_fouille = 8
elif Joueur.objet["degats"] < 7:
Joueur.note_fouille = 7
elif Joueur.objet["degats"] < 9:
Joueur.note_fouille = 6
elif Joueur.objet["degats"] < 11:
Joueur.note_fouille = 5
elif Joueur.objet["degats"] < 15:
Joueur.note_fouille = 4
elif Joueur.objet["degats"] < 20:
Joueur.note_fouille = 3
elif Joueur.objet["degats"] < 30:
Joueur.note_fouille = 2
elif Joueur.objet["degats"] < 50:
Joueur.note_fouille = 1
get_tree().change_scene("res://scenes/scene2/scene2.tscn")
......
......@@ -267,7 +267,7 @@ margin_top = 569.427
margin_right = 818.744
margin_bottom = 589.427
custom_fonts/font = SubResource( 10 )
custom_colors/font_color = Color( 0.937255, 0.92549, 0.0784314, 1 )
custom_colors/font_color = Color( 0.482353, 0.345098, 0.192157, 1 )
text = "Pourcentage de découverte :"
__meta__ = {
"_edit_use_anchors_": false
......
......@@ -6,7 +6,7 @@ var date_correcte
var ethnie_correcte
var geo_correcte
var time = 50
var time = 180
var txt_time = " s"
......
......@@ -186,11 +186,14 @@ margin_bottom = 64.0
custom_fonts/font = SubResource( 2 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "Rapport archeologique"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="lbl_suite" type="Label" parent="annalyse/Panel"]
margin_left = 98.0
margin_left = 45.437
margin_top = 104.0
margin_right = 672.0
margin_right = 619.437
margin_bottom = 121.0
custom_fonts/font = ExtResource( 3 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
......@@ -260,9 +263,9 @@ __meta__ = {
}
[node name="edit_obj" type="LineEdit" parent="annalyse/Panel"]
margin_left = 92.0
margin_left = 201.44
margin_top = 157.0
margin_right = 292.0
margin_right = 401.44
margin_bottom = 181.0
custom_styles/focus = SubResource( 3 )
custom_styles/normal = SubResource( 4 )
......@@ -300,9 +303,9 @@ __meta__ = {
}
[node name="edit_ethnie" type="LineEdit" parent="annalyse/Panel"]
margin_left = 101.0
margin_left = 276.104
margin_top = 286.0
margin_right = 228.0
margin_right = 403.104
margin_bottom = 310.0
custom_styles/focus = SubResource( 3 )
custom_styles/normal = SubResource( 4 )
......@@ -313,9 +316,9 @@ __meta__ = {
}
[node name="edit_geo" type="LineEdit" parent="annalyse/Panel"]
margin_left = 173.0
margin_left = 276.828
margin_top = 326.0
margin_right = 300.0
margin_right = 403.828
margin_bottom = 350.0
custom_styles/focus = SubResource( 3 )
custom_styles/normal = SubResource( 4 )
......@@ -351,9 +354,9 @@ __meta__ = {
}
[node name="CheckBox" type="CheckBox" parent="annalyse/Panel"]
margin_left = 258.0
margin_left = 264.735
margin_top = 246.0
margin_right = 282.0
margin_right = 337.735
margin_bottom = 270.0
custom_colors/font_color_disabled = Color( 0, 0, 0, 1 )
custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 )
......@@ -363,9 +366,9 @@ custom_colors/font_color_pressed = Color( 0, 0, 0, 1 )
text = "av. J. C."
[node name="CheckBox2" type="CheckBox" parent="annalyse/Panel"]
margin_left = 337.0
margin_left = 330.826
margin_top = 246.0
margin_right = 412.0
margin_right = 405.826
margin_bottom = 270.0
custom_colors/font_color_disabled = Color( 0, 0, 0, 1 )
custom_colors/font_color_hover_pressed = Color( 0, 0, 0, 1 )
......@@ -647,8 +650,8 @@ script = ExtResource( 22 )
[connection signal="pressed" from="outils/VBoxContainer/encyclopedie" to="encyclopedie_popup" method="_on_encyclopedie_pressed"]
[connection signal="timeout" from="annalyse/Panel/Timer" to="annalyse/Panel" method="_on_Timer_timeout"]
[connection signal="pressed" from="carbon_popup/Control/Control/exit" to="carbon_popup" method="_on_exit_pressed"]
[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/Control/date_screen/date" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/VBoxContainer/TextureRect/affichage_taux" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="carbon_popup/Control/VBoxContainer/TextureButton" to="carbon_popup/Control/Control/date_screen/date" method="_on_TextureButton_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/Label" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/TextureRect" method="_on_apres_pressed"]
[connection signal="pressed" from="encyclopedie_popup/Control/apres" to="encyclopedie_popup/Control/RichTextLabel" method="_on_apres_pressed"]
......
......@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/tresor.png-564a91d0048325d1d118d37c49c75028.stex"
path="res://.import/tresor.png-8179201debbcc6e70f6ab7259ef4cf04.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://terrain/tresor.png"
dest_files=[ "res://.import/tresor.png-564a91d0048325d1d118d37c49c75028.stex" ]
source_file="res://terrain/assets/tresor.png"
dest_files=[ "res://.import/tresor.png-8179201debbcc6e70f6ab7259ef4cf04.stex" ]
[params]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment