Skip to content

Commit 883a3c9

Browse files
authored
Merge pull request #1 from SebastianEPH/develop
se agregaron nuevos sprite, se agregó paredes, se agregó la explosion de bomba espina
2 parents f57ffec + 69c5f95 commit 883a3c9

File tree

73 files changed

+657
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+657
-21
lines changed

Bomberman4.yyp/Bomberman4.resource_order

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@
2727
{"name":"Tile Sets","order":3,"path":"folders/Tile Sets.yy",},
2828
{"name":"group0","order":1,"path":"folders/Tile Sets/group0.yy",},
2929
{"name":"Timelines","order":9,"path":"folders/Timelines.yy",},
30+
{"name":"levels","order":6,"path":"folders/Objects/levels.yy",},
31+
{"name":"modern era","order":1,"path":"folders/Objects/levels/modern era.yy",},
32+
{"name":"control","order":1,"path":"folders/Objects/levels/modern era/control.yy",},
3033
],
3134
"ResourceOrderSettings": [
3235
{"name":"spr_bomb_remote","order":1,"path":"sprites/spr_bomb_remote/spr_bomb_remote.yy",},
3336
{"name":"spr_bomb_pierce","order":2,"path":"sprites/spr_bomb_pierce/spr_bomb_pierce.yy",},
3437
{"name":"spr_bomb_s","order":3,"path":"sprites/spr_bomb_s/spr_bomb_s.yy",},
3538
{"name":"spr_bomb_h","order":4,"path":"sprites/spr_bomb_h/spr_bomb_h.yy",},
3639
{"name":"spr_bomb_d","order":5,"path":"sprites/spr_bomb_d/spr_bomb_d.yy",},
40+
{"name":"spr_modern_era_building5051","order":4,"path":"sprites/spr_modern_era_building5051/spr_modern_era_building5051.yy",},
3741
{"name":"spr_bomber_frontal","order":1,"path":"sprites/spr_bomber_frontal/spr_bomber_frontal.yy",},
3842
{"name":"spr_bomber_perfiles","order":2,"path":"sprites/spr_bomber_perfiles/spr_bomber_perfiles.yy",},
3943
{"name":"spr_bomber_frontal_caminando","order":3,"path":"sprites/spr_bomber_frontal_caminando/spr_bomber_frontal_caminando.yy",},
@@ -55,6 +59,7 @@
5559
{"name":"spr_item_bomb_pass","order":10,"path":"sprites/spr_item_bomb_pass/spr_item_bomb_pass.yy",},
5660
{"name":"spr_item_jelly","order":11,"path":"sprites/spr_item_jelly/spr_item_jelly.yy",},
5761
{"name":"spr_item_pierce_bomb","order":12,"path":"sprites/spr_item_pierce_bomb/spr_item_pierce_bomb.yy",},
62+
{"name":"spr_modern_era_wall_destroyer_animation","order":2,"path":"sprites/spr_modern_era_wall_destroyer_animation/spr_modern_era_wall_destroyer_animation.yy",},
5863
{"name":"spr_item_speed_up","order":13,"path":"sprites/spr_item_speed_up/spr_item_speed_up.yy",},
5964
{"name":"spr_item_select_item","order":14,"path":"sprites/spr_item_select_item/spr_item_select_item.yy",},
6065
{"name":"spr_item_vest","order":15,"path":"sprites/spr_item_vest/spr_item_vest.yy",},
@@ -73,7 +78,9 @@
7378
{"name":"spr_bomb_explosion_centro11112","order":6,"path":"sprites/spr_bomb_explosion_centro11112/spr_bomb_explosion_centro11112.yy",},
7479
{"name":"Dead_Player","order":1,"path":"scripts/Dead_Player/Dead_Player.yy",},
7580
{"name":"Create_Bomba","order":1,"path":"scripts/Create_Bomba/Create_Bomba.yy",},
81+
{"name":"spr_alarm","order":1,"path":"sprites/spr_alarm/spr_alarm.yy",},
7682
{"name":"SubMovimiento","order":1,"path":"scripts/SubMovimiento/SubMovimiento.yy",},
83+
{"name":"obj_walla_modern_era","order":2,"path":"objects/obj_walla_modern_era/obj_walla_modern_era.yy",},
7784
{"name":"obj_solido","order":1,"path":"objects/obj_solido/obj_solido.yy",},
7885
{"name":"bug","order":1,"path":"objects/bug/bug.yy",},
7986
{"name":"obj_bomb_pierce","order":1,"path":"objects/obj_bomb_pierce/obj_bomb_pierce.yy",},
@@ -82,11 +89,12 @@
8289
{"name":"obj_bomb_h","order":4,"path":"objects/obj_bomb_h/obj_bomb_h.yy",},
8390
{"name":"obj_bomb_d","order":5,"path":"objects/obj_bomb_d/obj_bomb_d.yy",},
8491
{"name":"obj_exp","order":6,"path":"objects/obj_exp/obj_exp.yy",},
85-
{"name":"modern_era_3_1_control","order":4,"path":"objects/modern_era_3_1_control/modern_era_3_1_control.yy",},
8692
{"name":"obj_item_punsh","order":1,"path":"objects/obj_item_punsh/obj_item_punsh.yy",},
8793
{"name":"obj_item_1_up","order":2,"path":"objects/obj_item_1_up/obj_item_1_up.yy",},
8894
{"name":"obj_item_heart","order":3,"path":"objects/obj_item_heart/obj_item_heart.yy",},
95+
{"name":"obj_wall","order":2,"path":"objects/obj_wall/obj_wall.yy",},
8996
{"name":"obj_item_bomb_kick","order":4,"path":"objects/obj_item_bomb_kick/obj_item_bomb_kick.yy",},
97+
{"name":"spr_modern_era_wall","order":3,"path":"sprites/spr_modern_era_wall/spr_modern_era_wall.yy",},
9098
{"name":"obj_item_bomb_remote","order":5,"path":"objects/obj_item_bomb_remote/obj_item_bomb_remote.yy",},
9199
{"name":"obj_item_bomb_up","order":6,"path":"objects/obj_item_bomb_up/obj_item_bomb_up.yy",},
92100
{"name":"obj_item_pierce_bomb","order":7,"path":"objects/obj_item_pierce_bomb/obj_item_pierce_bomb.yy",},

Bomberman4.yyp/Bomberman4.yyp

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bomberman4.yyp/objects/bug/Create_0.gml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ speed = 0
2424
global.BOMB_REMOTE = 3; // item Bomba de tiempo o con control remoto
2525
// Bombs configuration
2626
global.item_fire = 2; // Item Fuego, (Define que tan largó será la bomba al explorar)
27-
global.item_current_bomb_limit = 1; // cantidad de bombas actual que puede usar el personaje
27+
global.item_current_bomb_limit = 12; // cantidad de bombas actual que puede usar el personaje
2828

2929
global.BOMB_QUANTITY_LIMIT = 12; // limite de bombas que se pueden usar
3030
global.item_bombKick = false; // Item Empujar bombas // si este item esta true, item_bombPass debe ser falso
@@ -42,7 +42,21 @@ speed = 0
4242
global.item_select_item = false; // Item Creo que aparecen distintos items en éste items
4343

4444

45-
global.typeBomb = 1
45+
global.typeBomb = 1; // tipo de bomba
46+
47+
// las áreas son para el manjo de sprites de paredes u otros componentes que influyen en el mapa
48+
global.area_modern_era = 3;
49+
50+
51+
global.area_cap_1 = 1;
52+
53+
// este pedazo de codigo debe estar dentro del mapa, ya que identifica el tipo de mapa y capitulo
54+
global.current_area = global.area_modern_era; // [esto para el manejo de sprites]
55+
global.current_cap = global.area_cap_1;
56+
57+
58+
59+
4660
#endregion
4761
#region
4862

Bomberman4.yyp/objects/modern_era_3_1_control/modern_era_3_1_control.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/// @description inicio de destrucion
2+
//
3+
4+
5+
6+
7+
8+
9+
instance_destroy();

Bomberman4.yyp/objects/obj_wall/Collision_bug.gml

Whitespace-only changes.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/// @description Inserte aquí la descripción
2+
// Puede escribir su código en este editor
3+
4+
5+
var _current_spr = undefined;
6+
7+
if(global.current_area == global.area_modern_era){
8+
_current_spr = spr_modern_era_wall_destroyer_animation;
9+
10+
}
11+
12+
13+
sprite_index = _current_spr ;
14+
15+
16+
image_index = 0;
17+
18+
19+
alarm[0] = 50//*delta_time
20+
21+
22+
23+
24+
// Establecer una variable de estado para la destrucción
25+
26+
//if (true) {
27+
// // Avanzar la animación
28+
// image_index += 0.1; // Ajusta la velocidad de la animación según sea necesario
29+
30+
// // Verificar si la animación ha terminado
31+
// if (image_index >= sprite_get_number(_current_spr) - 0.1) {
32+
// // Destruir la instancia de la pared
33+
// instance_destroy();
34+
// return ;
35+
// }
36+
//}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/// @description Inserte aquí la descripción
2+
// Puede escribir su código en este editor
3+
4+
5+
// Identifica en que área nos encontramos
6+
if(global.current_area == global.area_modern_era){
7+
sprite_index = spr_modern_era_wall;
8+
}
9+
10+
11+
12+
// segun el capitulo, se usará un index distinto
13+
image_index = global.current_cap;
14+
15+
16+
17+

Bomberman4.yyp/objects/obj_wall/obj_wall.yy

Lines changed: 39 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Bomberman4.yyp/objects/obj_walla_modern_era/obj_walla_modern_era.yy

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)