From 8abfc2f9008680c67d1b2a46fbd5941929969283 Mon Sep 17 00:00:00 2001 From: Elouan Date: Fri, 24 Jan 2025 14:42:27 +0100 Subject: [PATCH] simplification structure --- Instrument/Corde.gd | 8 ------- Instrument/Flute.gd | 5 +---- Instrument/Instrument.gd | 9 -------- Instrument/Percusson.gd | 9 -------- Instrument/Tambour.gd | 5 +---- Instrument/Vent.gd | 8 ------- ressources/images/note1.png | Bin 0 -> 203 bytes ressources/images/note1.png.import | 34 +++++++++++++++++++++++++++++ ressources/images/note2.png | Bin 0 -> 203 bytes ressources/images/note2.png.import | 34 +++++++++++++++++++++++++++++ ressources/images/note3.png | Bin 0 -> 203 bytes ressources/images/note3.png.import | 34 +++++++++++++++++++++++++++++ 12 files changed, 104 insertions(+), 42 deletions(-) delete mode 100644 Instrument/Corde.gd delete mode 100644 Instrument/Instrument.gd delete mode 100644 Instrument/Percusson.gd delete mode 100644 Instrument/Vent.gd create mode 100644 ressources/images/note1.png create mode 100644 ressources/images/note1.png.import create mode 100644 ressources/images/note2.png create mode 100644 ressources/images/note2.png.import create mode 100644 ressources/images/note3.png create mode 100644 ressources/images/note3.png.import diff --git a/Instrument/Corde.gd b/Instrument/Corde.gd deleted file mode 100644 index ebda478..0000000 --- a/Instrument/Corde.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends Instrument -class_name Corde - -func _init(nom : String) -> void: - super(nom) - -func pincer() -> void: - print("On pince l'instrument %s." % nom) diff --git a/Instrument/Flute.gd b/Instrument/Flute.gd index fb58b35..85e14c8 100644 --- a/Instrument/Flute.gd +++ b/Instrument/Flute.gd @@ -1,13 +1,10 @@ -extends Vent +class_name Flute var Balle = preload("res://scenes/attaques/Balle.tscn").instantiate() # Charger le nœud Balle -func _init() -> void: - super("Flûte") func jouer_melodie(player_position) -> void: print("La flûte joue une mélodie.") - jouer() spawn_balle(player_position) diff --git a/Instrument/Instrument.gd b/Instrument/Instrument.gd deleted file mode 100644 index 484c935..0000000 --- a/Instrument/Instrument.gd +++ /dev/null @@ -1,9 +0,0 @@ -class_name Instrument - -var nom : String - -func _init(nom : String) -> void: - self.nom = nom - -func jouer() -> void: - print("L'instrument %s est joué." % nom) diff --git a/Instrument/Percusson.gd b/Instrument/Percusson.gd deleted file mode 100644 index 168ef6b..0000000 --- a/Instrument/Percusson.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends Instrument -class_name Percussion - - -func _init(nom : String) -> void: - super(nom) - -func frapper() -> void: - print("On frappe l'instrument %s." % nom) diff --git a/Instrument/Tambour.gd b/Instrument/Tambour.gd index c17e019..6b5c712 100644 --- a/Instrument/Tambour.gd +++ b/Instrument/Tambour.gd @@ -1,8 +1,5 @@ -extends Percussion +class_name Tambour -func _init() -> void: - super("Tambour") func faire_roulement() -> void: print("Le tambour fait un roulement.") - jouer() diff --git a/Instrument/Vent.gd b/Instrument/Vent.gd deleted file mode 100644 index d557412..0000000 --- a/Instrument/Vent.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends Instrument -class_name Vent - -func _init(nom : String) -> void: - super(nom) - -func souffler() -> void: - print("On souffle dans l'instrument %s." % nom) diff --git a/ressources/images/note1.png b/ressources/images/note1.png new file mode 100644 index 0000000000000000000000000000000000000000..e529fb143644b3f4aef5c061cbb9532a7557dc94 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArbD$ zDG~_>EDn4#?y*WRVR3VASR@cp`0i%?lN^~u71vFbD%lK?9eIYTeF`@jf9SAVwp55iE!ZWCWKvNkQ-Z&`QoYpc2 iTFaLj;hE;^%b*2ha{w_2Tne5HqC8#wT-G@yGywn?Gdhd_ literal 0 HcmV?d00001 diff --git a/ressources/images/note1.png.import b/ressources/images/note1.png.import new file mode 100644 index 0000000..7cb285f --- /dev/null +++ b/ressources/images/note1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csbrejwjfkspr" +path="res://.godot/imported/note1.png-96f27d997f75f6c14a701aa9df88a950.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/note1.png" +dest_files=["res://.godot/imported/note1.png-96f27d997f75f6c14a701aa9df88a950.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 diff --git a/ressources/images/note2.png b/ressources/images/note2.png new file mode 100644 index 0000000000000000000000000000000000000000..08d8cd415638783d90bb15a6554a16ec471e9afb GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArbD$ zDG~_>EDn4#?y*WRVR3VASR`Pv|Iy9*CpkG1imsa~Rk9f(JMs)w`xI_6{?K8!Y`GF3 zQOXdh$iS7B6X=-rp?OhH4tv0AA?eZs85})rKw^Rn(-p0TglA9#fu=GrZgEiLle?1v iw3aV5!ZXd+mq822<^W<4xD-4YM0vXUxvXn= literal 0 HcmV?d00001 diff --git a/ressources/images/note2.png.import b/ressources/images/note2.png.import new file mode 100644 index 0000000..78f7c66 --- /dev/null +++ b/ressources/images/note2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://1xayae6jyuge" +path="res://.godot/imported/note2.png-7ddebed95ea93b6f57090ac58466a01e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/note2.png" +dest_files=["res://.godot/imported/note2.png-7ddebed95ea93b6f57090ac58466a01e.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 diff --git a/ressources/images/note3.png b/ressources/images/note3.png new file mode 100644 index 0000000000000000000000000000000000000000..35cfa23dd7130b3b554c324096a1bd448f7188e6 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArbD$ zDG~_>EDn4#?y*WRVR3VASR_#K^UK-#CpkKLx=x!aRk9f(JMs)w`xI_6{?K8!Y`GF3 zQOXdh$iS7B6X=-rp?OhH4tv0AA?eZs85})rKw^Rn(-p0TglA9#fu=He#W*OIcuC9w iTFaLj;hE;^%b*2ha{w_2Tne5HqC8#wT-G@yGywolPCC^9 literal 0 HcmV?d00001 diff --git a/ressources/images/note3.png.import b/ressources/images/note3.png.import new file mode 100644 index 0000000..3abe3d1 --- /dev/null +++ b/ressources/images/note3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btqqmug6qex0d" +path="res://.godot/imported/note3.png-3a2fd90f8e888d278f8e7c03cb67db73.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ressources/images/note3.png" +dest_files=["res://.godot/imported/note3.png-3a2fd90f8e888d278f8e7c03cb67db73.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