Skip to content

Commit

Permalink
Merge pull request #183 from X-R-G-B/intro-plus-end
Browse files Browse the repository at this point in the history 
Intro plus end
  • Loading branch information
@Saverio976
Saverio976 authored May 8, 2022
2 parents 24bd836 + ca4bb39 commit dcfe4ef
Show file tree
Hide file tree
Showing 31 changed files with 539 additions and 650 deletions.
10 changes: 9 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ SRC_SETTINGS_MENU := $(addprefix settings_menu/,$(SRC_SETTINGS_MENU))

SRC_PAUSE := create_pause_menu.c \
home_button_event.c \
check_restart_end_magician.c \
restart_button.c \
pressed_button_event.c \
pause_button_event.c
Expand Down Expand Up @@ -225,13 +226,20 @@ SRC_NPC_UPDATE := update_dialog_text.c \
update_grandpa.c \
magician_view_rotation.c \
update_magician.c \
update_end_magician.c \
update_intro_magician.c \
update_dialogue_box.c \
update_npc.c \
update_elder.c
SRC_NPC_UPDATE := $(addprefix update/,$(SRC_NPC_UPDATE))

SRC_NPC_NPC := callback_npc.c
SRC_CHEST := dropping_infinity_86.c \
reset_86_number.c \
update_chest.c
SRC_CHEST := $(addprefix chest_npc/,$(SRC_CHEST))

SRC_NPC_NPC := callback_npc.c \
$(SRC_CHEST)
SRC_NPC_NPC := $(addprefix npc/,$(SRC_NPC_NPC))

SRC_NPC := add_text_dialog.c \
Expand Down
29 changes: 29 additions & 0 deletions assets/data/ennemy/magician.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"move": [
[[33, 144, 24, 41], [80, 144, 20, 41], [124, 144, 21, 40], [167, 144, 23, 41], [210, 144, 20, 41], [254, 145, 19, 40]],
[[0, 48, 26, 39], [42, 48, 30, 40], [90, 47, 23, 41], [138, 46, 20, 42], [179, 46, 22, 42], [217, 46, 27, 42], [255, 46, 31, 41], [301, 46, 31, 42]],
[[47, 0, 28, 41], [90, 3, 27, 40], [134, 1, 33, 40], [177, 2, 30, 41], [220, 1, 31, 42], [263, 1, 33, 40]],
[[0, 48, 26, 39], [42, 48, 30, 40], [90, 47, 23, 41], [138, 46, 20, 42], [179, 46, 22, 42], [217, 46, 27, 42], [255, 46, 31, 41], [301, 46, 31, 42]]
],
"stop": [
[33, 144, 24, 41],
[0, 48, 26, 39],
[47, 0, 28, 41],
[0, 48, 26, 39]
],
"dash time": 2.0,
"charge time": 0.5,
"scale": 3.0,
"rect actualisation": 0.2,
"speed": 200.0,
"range": 800.0,
"life": 200.0,
"dammage": 40.0,
"blink time": 0.7,
"sprite path": "./assets/image/ennemy/final_boss.png",
"xp loot": 200.0,
"range dash": 160.0,
"knock back coef": 30.0,
"is boss": "oui",
"drop rate": 100.0
}
9 changes: 9 additions & 0 deletions assets/data/npc/check_into_chest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"dialogus": [
"Le coffre est vide et pue la biere",
"Il il y a une note au fond",
"'Le tresor c'est l'aventure'",
"Eh bah...",
"Paye ta fin de jeu"
]
}
12 changes: 12 additions & 0 deletions assets/data/npc/chest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"sprite path": "./assets/image/npc/chest.png",
"rect": [0, 1, 30, 29],
"scd rect": [34, 0, 30, 30],
"current": 0,
"time": 0.0,
"scale": 3.0,
"dialogus": [
"*rot*",
"Le coffre a bu les 86 d'infinitees"
]
}
5 changes: 5 additions & 0 deletions assets/data/npc/closed_chest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dialogus": [
"pas assez de 86 dinfinite"
]
}
8 changes: 5 additions & 3 deletions assets/data/npc/magician_end.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
"time": 0.0,
"scale": 3.0,
"dialogus": [
"Enfin reveille ?",
"...",
"C'est ici que nos chemins se separent",
"C'est sur cette ile que d'apres la legende\n celui qui a les 5 86 d'infinitee pourra \nacceder au tresor legendaire de la prophetie",
"C'est sur cette ile que d'apres \nla legende celui qui a les 5 86 \nd'infinitee",
"pourra acceder au tresor \nlegendaire de la prophetie",
"...",
"Mais tu n'en a que 4",
"Sait tu ou est la derniere",
"Et bien c'est moi qui l'ai",
"et maintenant je vais te tuer et recuperer le tresor"
"et maintenant je vais te tuer et \nrecuperer le tresor"
]
}
}
159 changes: 28 additions & 131 deletions assets/data/story_mode/stage_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,6 @@
"#########################################################################################################################################################################################"
],
"char type": {
"F": {
"path": "./assets/image/map/squares/long_house_clear.png"
},
"m": {
"path": "./assets/image/map/squares/short_blue_house_clear.png"
},
"M": {
"path": "./assets/image/map/squares/short_red_house_clear.png"
},
"T": {
"path": "./assets/image/map/squares/green_tree.png",
"col": 1
},
"V": {
"path": "./assets/image/map/squares/corner.png",
"rotation": 180.0,
Expand All @@ -163,43 +150,6 @@
"path": "./assets/image/map/squares/corner.png",
"col": 1
},
"L": {
"path": "./assets/image/map/squares/flower.png",
"components": {
"ennemy path": "./assets/data/ennemy/ninho.json"
}
},
"S": {
"path": "./assets/image/map/squares/dark_flower.png",
"components": {
"ennemy path": "./assets/data/ennemy/amongus.json"
}
},
"9": {
"path": "./assets/image/map/squares/dark_flower.png",
"components": {
"npc path": "./assets/data/npc/magician_intro.json"
}
},
"+": {
"path": "./assets/image/map/squares/dark_flower.png",
"components": {
"npc path": "./assets/data/npc/stage_0/villager_3.json"
}
},
"=": {
"path": "./assets/image/map/squares/void.png",
"components": {
"npc path": "./assets/data/npc/stage_0/villager_2.json"
}
},
"*": {
"path": "./assets/image/map/squares/void.png",
"components": {
"npc path": "./assets/data/npc/stage_0/villager_1.json"
},
"col": 1
},
"b": {
"path": "./assets/image/map/squares/fall.png",
"rotation": 90.0,
Expand All @@ -219,112 +169,59 @@
"path": "./assets/image/map/squares/fall.png",
"col": 1
},
"p": {
"path": "./assets/image/map/squares/way.png",
"rotation": 90.0
"S": {
"path": "./assets/image/map/squares/water_sand_fade_2.png",
"col": 1,
"rotation": 180.0
},
".": {
"col": 0
"n": {
"path": "./assets/image/map/squares/sand_2.png"
},
"#": {
"col": 1
},
"g": {
"path": "./assets/image/map/squares/grass.png"
},
"d": {
"path": "./assets/image/map/squares/dirt.png"
},
"f": {
"path": "./assets/image/map/squares/flower.png"
},
"i": {
"path": "./assets/image/map/squares/big_way.png",
"rotation": 90.0
},
"I": {
"path": "./assets/image/map/squares/big_way.png"
},
"^": {
"path": "./assets/image/map/squares/ground_corner.png",
"rotation": 180.0
},
"|": {
"path": "./assets/image/map/squares/ground_corner.png"
},
"-": {
"path": "./assets/image/map/squares/ground_corner.png",
"rotation": 90.0
".": {
"col": 0
},
"/": {
"path": "./assets/image/map/squares/ground_corner.png",
"rotation": 270.0
"T": {
"path": "./assets/image/map/squares/green_tree.png"
},
"G": {
"path": "./assets/image/map/squares/ground.png"
},
"y": {
"path": "./assets/image/map/squares/bush_block_alone.png",
"col": 1
},
"r": {
"path": "./assets/image/map/squares/path.png",
"rotation": 270.0
},
"N": {
"path": "./assets/image/map/squares/path.png"
},
"k": {
"path": "./assets/image/map/squares/path.png",
"path": "./assets/image/map/squares/sand_dirt.png",
"rotation": 180.0
},
"K": {
"path": "./assets/image/map/squares/path.png",
"rotation": 90.0
},
"D": {
"path": "./assets/image/map/squares/dark_flower.png"
},
"t": {
"path": "./assets/image/map/squares/dark_dead_tree.png",
"g": {
"path": "./assets/image/map/squares/rock_wall.png",
"col": 1
},
"h": {
"path": "./assets/image/map/squares/grass_bush.png"
"9": {
"path": "./assets/image/map/squares/sand_2.png",
"components": {
"npc path" :"./assets/data/npc/magician_intro.json"
}
},
",": {
"t": {
"path": "./assets/image/map/squares/dirt_fade.png"
},
";": {
"path": "./assets/image/map/squares/dirt_corner_fade.png"
"d": {
"path": "./assets/image/map/squares/dirt.png"
},
">": {
"path": "./assets/image/map/squares/dirt_corner_fade.png",
"rotation": 90.0
"u": {
"path": "./assets/image/map/squares/grass_bush.png"
},
"<": {
"path": "./assets/image/map/squares/dirt_corner_fade.png",
"rotation": 270.0
"O": {
"path": "./assets/image/map/squares/dark_flower.png"
},
"8": {
"path": "./assets/image/map/squares/sand_2.png",
"components": {
"npc path": "./assets/data/npc/chest.json"
}
},
"!": {
"path": "./assets/image/map/squares/dirt_fade.png",
"rotation": 90.0
},
"?": {
"path": "./assets/image/map/squares/dirt_fade.png",
"rotation": 180.0
},
"}": {
"path": "./assets/image/map/squares/dirt_fade.png",
"rotation": 270.0
"o": {
"path": "./assets/image/map/squares/grass.png"
}
}
},
"spawn": [45, 115]
"spawn": [75, 85]
}
Binary file added assets/image/ennemy/final_boss.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/dark_clear_sand_fade.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/rock_wall.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/sand.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/sand_2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/sand_dirt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/water_sand_fade.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/map/squares/water_sand_fade_2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/image/npc/chest.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions assets/image/story_mode/save.json
View file

This file was deleted.

Loading

0 comments on commit dcfe4ef

Please sign in to comment.