diff --git a/Adventures in Lestoria/Adventures in Lestoria.tiled-project b/Adventures in Lestoria/Adventures in Lestoria.tiled-project index 5e65128a..5b9d61a9 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.tiled-project +++ b/Adventures in Lestoria/Adventures in Lestoria.tiled-project @@ -272,7 +272,8 @@ "Red Slime", "Yellow Slime", "Flower Turret", - "Slime King" + "Slime King", + "Wolf" ], "valuesAsFlags": false }, diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 3cd14ef0..146b384e 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_PATCH 1 -#define VERSION_BUILD 5498 +#define VERSION_BUILD 5499 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx index ffebc581..c8f9f6f0 100644 --- a/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx +++ b/Adventures in Lestoria/assets/Campaigns/1_1_v2.tmx @@ -1,5 +1,5 @@ - + @@ -1951,6 +1951,13 @@ + + + + + + + diff --git a/Adventures in Lestoria/assets/config/Monsters.txt b/Adventures in Lestoria/assets/config/Monsters.txt index 07403b2f..f6a70527 100644 --- a/Adventures in Lestoria/assets/config/Monsters.txt +++ b/Adventures in Lestoria/assets/config/Monsters.txt @@ -209,4 +209,38 @@ Monsters #Additional custom animations go down below. Start with ANIMATION[0] ANIMATION[0] = monsters/Slime King - Cast.png } + Wolf + { + Health = 110 + Attack = 12 + + CollisionDmg = 12 + + MoveSpd = 120% + Size = 90% + + XP = 14 + + Strategy = Run Towards + + #Size of each animation frame + SheetFrameSize = 24,24 + + # Frame Count, Frame Speed (s), Frame Cycling (Repeat,OneShot,PingPong,Reverse) + IdleAnimation = 3, 0.2, PingPong + JumpAnimation = 4, 0.06, PingPong + ShootAnimation = 10, 0.1, OneShot + DeathAnimation = 4, 0.1, OneShot + + # Drop Item Name, Drop Percentage(0-100%), Drop Min Quantity, Drop Max Quantity + DROP[0] = Wolf Skin,35%,1,2 + + Hurt Sound = Monster Hurt + Death Sound = Slime Dead + Walk Sound = Slime Walk + + #Additional custom animations go down below. Start with ANIMATION[0]. Order is: + # Frame Count, Frame Speed (s), Frame Cycling (Repeat,OneShot,PingPong,Reverse) + #ANIMATION[0] = 6, 0.1, Repeat + } } \ No newline at end of file diff --git a/Adventures in Lestoria/assets/monsters/Wolf.png b/Adventures in Lestoria/assets/monsters/Wolf.png new file mode 100644 index 00000000..b3b1241b Binary files /dev/null and b/Adventures in Lestoria/assets/monsters/Wolf.png differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_bass.ogg b/Adventures in Lestoria/assets/music/foresty1_1_bass.ogg index 48265e1e..fe6c7d91 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_bass.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_bass.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_crash.ogg b/Adventures in Lestoria/assets/music/foresty1_1_crash.ogg index 1d8d2fee..2591f134 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_crash.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_crash.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg b/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg index 47d6f964..f31530dc 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_drums.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg b/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg index 94f362fe..1a4a799f 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_flute.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_piano 1.ogg b/Adventures in Lestoria/assets/music/foresty1_1_piano 1.ogg index 535aebe7..bc9d8180 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_piano 1.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_piano 1.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_piano 2.ogg b/Adventures in Lestoria/assets/music/foresty1_1_piano 2.ogg index 7611f1f9..9e179217 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_piano 2.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_piano 2.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_pizzicato.ogg b/Adventures in Lestoria/assets/music/foresty1_1_pizzicato.ogg index 7f4f9f55..f4075df4 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_pizzicato.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_pizzicato.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_staccato.ogg b/Adventures in Lestoria/assets/music/foresty1_1_staccato.ogg index 326ed94f..dd1c9eb5 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_staccato.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_staccato.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg b/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg index a9f3b8f5..d224c118 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_strings.ogg differ diff --git a/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg b/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg index 88602414..39c887ec 100644 Binary files a/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg and b/Adventures in Lestoria/assets/music/foresty1_1_xtra perc.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg new file mode 100644 index 00000000..e36729d2 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_bass.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg new file mode 100644 index 00000000..ad174227 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_drums.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg new file mode 100644 index 00000000..5a0b058d Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_flute.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg new file mode 100644 index 00000000..67b54fcd Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 1.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg new file mode 100644 index 00000000..a2757388 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_piano 2.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg new file mode 100644 index 00000000..4837c4b1 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_strings.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg new file mode 100644 index 00000000..6f253257 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop1/foresty1_1_loop1_xtra perc.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg new file mode 100644 index 00000000..7b96712b Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_bass.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg new file mode 100644 index 00000000..d3e71dab Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_drums.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg new file mode 100644 index 00000000..15a6f3e3 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 1.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg new file mode 100644 index 00000000..a58824c8 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_piano 2.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg new file mode 100644 index 00000000..f7f28fee Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_staccato.ogg differ diff --git a/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg new file mode 100644 index 00000000..6829a669 Binary files /dev/null and b/Adventures in Lestoria/assets/music/loop2/foresty1_1_loop2_strings.ogg differ