Merge branch 'main' of github.com:Mylloon/GJ803z2024

ressources/assets/MeowSounds/Music.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dd8civte7y1h4"
+path="res://.godot/imported/Music.png-defab4b4c212d9e80e8229af3be98495.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/assets/MeowSounds/Music.png"
+dest_files=["res://.godot/imported/Music.png-defab4b4c212d9e80e8229af3be98495.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

ressources/assets/MeowSounds/MusicButton.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dthd82kqaqqs0"
+path="res://.godot/imported/MusicButton.png-b9edb8118a4821d72ef0edf7614c2dbb.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/assets/MeowSounds/MusicButton.png"
+dest_files=["res://.godot/imported/MusicButton.png-b9edb8118a4821d72ef0edf7614c2dbb.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

ressources/assets/RollDice/ButtonDice.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://br2tesflbta84"
+path="res://.godot/imported/ButtonDice.png-4c05526952f2a156a97d661d12505d15.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/assets/RollDice/ButtonDice.png"
+dest_files=["res://.godot/imported/ButtonDice.png-4c05526952f2a156a97d661d12505d15.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

ressources/assets/RollDice/Dice.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bbi7rhpstsku4"
+path="res://.godot/imported/Dice.png-dee754f09f861c593e54f6c407b458b3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ressources/assets/RollDice/Dice.png"
+dest_files=["res://.godot/imported/Dice.png-dee754f09f861c593e54f6c407b458b3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

scenes/game/ads/Ads_music.tscn

@@ -0,0 +1,7 @@
+[gd_scene load_steps=3 format=3 uid="uid://d2irk5735vjls"]
+
+[ext_resource type="PackedScene" uid="uid://n06gkookqeml" path="res://scenes/game/windows/Ads.tscn" id="1_0jlha"]
+[ext_resource type="Script" path="res://scripts/ads/ads_music.gd" id="2_l1b3e"]
+
+[node name="Windows" instance=ExtResource("1_0jlha")]
+script = ExtResource("2_l1b3e")

scenes/game/ads/Ads_operation.tscn

@@ -0,0 +1,7 @@
+[gd_scene load_steps=3 format=3 uid="uid://c3qlt4pa4qbji"]
+
+[ext_resource type="PackedScene" uid="uid://n06gkookqeml" path="res://scenes/game/windows/Ads.tscn" id="1_2b68r"]
+[ext_resource type="Script" path="res://scripts/ads/ads_operation.gd" id="2_jop1v"]
+
+[node name="Windows" instance=ExtResource("1_2b68r")]
+script = ExtResource("2_jop1v")

scenes/game/ads/Ads_roll.tscn

@@ -0,0 +1,47 @@
+[gd_scene load_steps=5 format=3 uid="uid://dk6bkpnylxwdb"]
+
+[ext_resource type="PackedScene" uid="uid://n06gkookqeml" path="res://scenes/game/windows/Ads.tscn" id="1_n2kk4"]
+[ext_resource type="Script" path="res://scripts/ads/ads_roll.gd" id="2_kihjv"]
+[ext_resource type="Texture2D" uid="uid://bbi7rhpstsku4" path="res://ressources/assets/RollDice/Dice.png" id="3_7himq"]
+[ext_resource type="Texture2D" uid="uid://br2tesflbta84" path="res://ressources/assets/RollDice/ButtonDice.png" id="4_ldetv"]
+
+[node name="Windows" instance=ExtResource("1_n2kk4")]
+script = ExtResource("2_kihjv")
+
+[node name="Dice" type="Sprite2D" parent="." index="2"]
+position = Vector2(251, 224.5)
+scale = Vector2(0.401667, 0.351042)
+texture = ExtResource("3_7himq")
+
+[node name="Right" type="Label" parent="Dice" index="0"]
+offset_left = 112.033
+offset_top = 47.0029
+offset_right = 319.033
+offset_bottom = 249.003
+theme_override_font_sizes/font_size = 142
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Left" type="Label" parent="Dice" index="1"]
+offset_left = -336.0
+offset_top = 47.0
+offset_right = -129.0
+offset_bottom = 249.0
+theme_override_font_sizes/font_size = 142
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="ButtonDice" type="Sprite2D" parent="." index="3"]
+position = Vector2(252, 194)
+scale = Vector2(0.4, 0.4)
+texture = ExtResource("4_ldetv")
+
+[node name="Button" type="Button" parent="ButtonDice" index="0"]
+offset_left = -192.0
+offset_top = -55.0
+offset_right = 198.0
+offset_bottom = 55.0
+focus_mode = 0
+flat = true
+
+[connection signal="pressed" from="ButtonDice/Button" to="." method="_on_button_pressed"]

scenes/game/scr918C.tmp

@@ -1,104 +0,0 @@
-[gd_scene load_steps=12 format=3 uid="uid://ur6erv76d2of"]
-
-[ext_resource type="FontFile" uid="uid://dwgslonlru0ck" path="res://ressources/Battlenet.ttf" id="1_7ecbr"]
-[ext_resource type="Script" path="res://scripts/game.gd" id="1_orxmr"]
-[ext_resource type="Texture2D" uid="uid://c012k8qiyjn4a" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button.png" id="2_j8eab"]
-[ext_resource type="Texture2D" uid="uid://ca0n6csxw7yd7" path="res://models/RetroWindowsGUI/RetroWindowsGUI/Windows_Button_Pressed.png" id="3_eb8po"]
-[ext_resource type="Texture2D" uid="uid://c1s8gaui8k13h" path="res://models/RetroWindowsGUI/Flag.png" id="4_medxy"]
-[ext_resource type="Shader" path="res://shaders/oldscreen.gdshader" id="6_7ta02"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_se4f0"]
-bg_color = Color(0.764706, 0.764706, 0.764706, 1)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2mxax"]
-draw_center = false
-border_width_left = 1
-border_width_top = 1
-border_width_right = 1
-border_width_bottom = 1
-border_color = Color(1, 1, 1, 1)
-
-[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mbq4w"]
-texture = ExtResource("2_j8eab")
-texture_margin_left = 2.0
-texture_margin_top = 2.0
-texture_margin_right = 2.0
-texture_margin_bottom = 2.0
-draw_center = false
-
-[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_lgpbg"]
-texture = ExtResource("3_eb8po")
-texture_margin_left = 2.0
-texture_margin_top = 2.0
-texture_margin_right = 2.0
-texture_margin_bottom = 2.0
-draw_center = false
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_lp2yn"]
-shader = ExtResource("6_7ta02")
-shader_parameter/SCREEN_HEIGHT = 240.0
-
-[node name="WindowsDesktop" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-script = ExtResource("1_orxmr")
-
-[node name="ColorRect" type="ColorRect" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-color = Color(0, 0.45098, 0.509804, 1)
-
-[node name="Panel" type="Panel" parent="."]
-layout_mode = 1
-anchors_preset = 12
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_top = -54.0
-grow_horizontal = 2
-grow_vertical = 0
-theme_override_styles/panel = SubResource("StyleBoxFlat_se4f0")
-
-[node name="Panel" type="Panel" parent="Panel"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-offset_top = -1.0
-offset_right = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_2mxax")
-
-[node name="Button" type="Button" parent="Panel"]
-layout_mode = 0
-offset_left = 4.0
-offset_top = 4.0
-offset_right = 118.0
-offset_bottom = 50.0
-focus_mode = 0
-theme_override_colors/font_color = Color(0, 0, 0, 1)
-theme_override_fonts/font = ExtResource("1_7ecbr")
-theme_override_font_sizes/font_size = 37
-theme_override_styles/normal = SubResource("StyleBoxTexture_mbq4w")
-theme_override_styles/hover = SubResource("StyleBoxTexture_lgpbg")
-text = "Start"
-icon = ExtResource("4_medxy")
-expand_icon = true
-
-[node name="ColorRect2" type="ColorRect" parent="."]
-material = SubResource("ShaderMaterial_lp2yn")
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2

scripts/ads.gd

@@ -14,15 +14,11 @@ func exit_condition():
 func close():
 	if exit_condition():
 		self.visible = false
-	
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
+func _process(_delta):
 	close()
 
-
-
-
 func _on_button_pressed():
 	print("pressed")
 	condition = true

scripts/ads/ads_default.gd

@@ -5,13 +5,12 @@ extends "res://scripts/ads.gd"
 func _ready():
 	$Panel2/Button.disabled = true
 	pass
-	
 
 func exit_condition():
 	return condition
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
+func _process(_delta):
 	close()
 
 func _on_button_pressed():

scripts/ads/ads_music.gd

@@ -0,0 +1,9 @@
+extends "res://scripts/ads/ads_default.gd"
+
+# TODO
+
+func _ready():
+	pass
+
+func exit_condition():
+	return condition

scripts/ads/ads_operation.gd

@@ -0,0 +1,9 @@
+extends "res://scripts/ads/ads_default.gd"
+
+# TODO
+
+func _ready():
+	pass
+
+func exit_condition():
+	return condition

scripts/ads/ads_roll.gd

@@ -0,0 +1,21 @@
+extends "res://scripts/ads/ads_default.gd"
+
+@onready var button      := $ButtonDice/Button
+@onready var label_left  := $Dice/Left
+@onready var label_right := $Dice/Right
+
+func _ready():
+	label_left.text  = "0"
+	label_right.text = "0"
+
+func exit_condition():
+	return condition
+
+func _on_button_pressed():
+	var left  := randi_range(0, 6)
+	var right := randi_range(0, 6)
+	
+	label_left.text  = str(left)
+	label_right.text = str(right)
+	
+	condition = left + right >= 5