Browse Source

:fire: Enleve le pouvoir de feu

DricomDragon 10 months ago
parent
commit
1c04021a2a

+ 2 - 2
godot/composants/objets/brique/brique.gd

@@ -48,12 +48,12 @@ func _associe_texture_brique(nouveau_type_pouvoir: Pouvoir.Type) -> void:
 	match nouveau_type_pouvoir:
 		Pouvoir.Type.AUCUN:
 			_texture_brique = preload("res://composants/objets/brique/images/01.png")
-		Pouvoir.Type.FEU:
-			_texture_brique = preload("res://composants/objets/brique/images/43.png")
 		Pouvoir.Type.VIE:
 			_texture_brique = preload("res://composants/objets/brique/images/44.png")
 		#Pouvoir.Type.RALENTIR:
 			#_texture_brique = preload("res://composants/objets/brique/images/08.png")
+		#Pouvoir.Type.FEU:
+			#_texture_brique = preload("res://composants/objets/brique/images/43.png")
 		_:
 			_texture_brique = preload("res://composants/objets/brique/images/34.png")
 	_montrer_type_pouvoir()

+ 0 - 3
godot/composants/pouvoirs/commun/association_pouvoirs.gd

@@ -3,7 +3,6 @@ class_name Pouvoir
 
 enum Type {
 	AUCUN, # si pas de pouvoir, laisser en premier
-	FEU,
 	VIE,
 	#RALENTIR,
 	BONJOUR # laisser en dernier
@@ -14,8 +13,6 @@ static func fabriquer(type: Type): # -> PouvoirBase
 	match type:
 		Type.BONJOUR:
 			return BonjourPouvoir.new()
-		Type.FEU:
-			return PouvoirFeu.new()
 		Type.VIE:
 			return VieBonus.new()
 		#Type.RALENTIR:

+ 0 - 13
godot/composants/pouvoirs/pouvoir_feu.gd

@@ -1,13 +0,0 @@
-class_name PouvoirFeu
-extends PouvoirBase
-## Pouvoir qui rend les balles enflammees
-
-
-func declencher_pouvoir(arbre_scene: SceneTree) -> void:
-	for balle in arbre_scene.get_nodes_in_group("groupe_des_balles"):
-		assert(balle is Balle, "Le groupe_des_balles ne doit contenir que des Balle !")
-		BalleDeFeu.transformer(balle)
-
-
-func couleur_principale() -> Color:
-	return Color.RED

+ 4 - 4
godot/exec/niveaux/blob_facile.tscn

@@ -28,7 +28,7 @@ script = ExtResource("3_gl2a7")
 
 [node name="Brique1" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(150, 112)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique2" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(180, 112)
@@ -59,7 +59,7 @@ position = Vector2(270, 128)
 
 [node name="Brique11" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(150, 144)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique12" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(180, 144)
@@ -72,14 +72,14 @@ position = Vector2(240, 144)
 
 [node name="Brique15" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(270, 112)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique16" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(300, 128)
 
 [node name="Brique17" parent="Briques" instance=ExtResource("4_nhi56")]
 position = Vector2(270, 144)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Arene" parent="." instance=ExtResource("5_jfp2p")]
 metadata/_edit_lock_ = true

+ 0 - 6
godot/exec/niveaux/carre_simple.tscn

@@ -44,27 +44,21 @@ position = Vector2(90, 0)
 
 [node name="Brique5" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(120, 0)
-pouvoir_type = 1
 
 [node name="Brique6" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(150, 0)
-pouvoir_type = 1
 
 [node name="Brique7" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(180, 0)
-pouvoir_type = 1
 
 [node name="Brique8" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(210, 0)
-pouvoir_type = 1
 
 [node name="Brique9" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(240, 0)
-pouvoir_type = 1
 
 [node name="Brique10" parent="Briques" instance=ExtResource("2_j0emn")]
 position = Vector2(270, 0)
-pouvoir_type = 1
 
 [node name="Brique11" parent="Briques" instance=ExtResource("2_j0emn")]
 modulate = Color(0.666667, 0.666667, 0.666667, 1)

+ 4 - 10
godot/exec/niveaux/jdll2024.tscn

@@ -29,7 +29,7 @@ script = ExtResource("3_qi6l6")
 
 [node name="Brique2" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(30, 32)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique3" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(60, 32)
@@ -60,7 +60,7 @@ position = Vector2(330, 32)
 
 [node name="Brique12" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(360, 32)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique13" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(210, 32)
@@ -318,7 +318,7 @@ position = Vector2(210, 128)
 
 [node name="Brique100" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(30, 144)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique101" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(60, 144)
@@ -349,7 +349,7 @@ position = Vector2(330, 144)
 
 [node name="Brique110" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(360, 144)
-pouvoir_type = 2
+pouvoir_type = 1
 
 [node name="Brique111" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(210, 144)
@@ -360,27 +360,21 @@ position = Vector2(30, 160)
 
 [node name="Brique124" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(150, 272)
-pouvoir_type = 1
 
 [node name="Brique125" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(330, 224)
-pouvoir_type = 1
 
 [node name="Brique126" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(270, 272)
-pouvoir_type = 1
 
 [node name="Brique128" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(120, 224)
-pouvoir_type = 1
 
 [node name="Brique129" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(60, 272)
-pouvoir_type = 1
 
 [node name="Brique127" parent="Briques" instance=ExtResource("4_upd8n")]
 position = Vector2(210, 224)
-pouvoir_type = 1
 
 [node name="Brique113" parent="Briques" instance=ExtResource("4_upd8n")]
 modulate = Color(0.666667, 0.666667, 0.666667, 1)