diff --git a/Project.xml b/Project.xml index af5a6aaa..e0f13d45 100644 --- a/Project.xml +++ b/Project.xml @@ -4,7 +4,7 @@ - + diff --git a/assets/data/anims/general-anims.xml b/assets/data/anims/general-anims.xml index bbc9ff73..bb6098b5 100644 --- a/assets/data/anims/general-anims.xml +++ b/assets/data/anims/general-anims.xml @@ -135,4 +135,24 @@ 21t22 23t27 + + + 0t11 + 12t23 + 24t35 + 36t47 + 48t59 + + + + 0t7 + + + + 0t23 + + + + 0t23 + \ No newline at end of file diff --git a/assets/data/config/ng/medals/medals.json b/assets/data/config/ng/medals/medals.json index d316eb41..03d603d9 100644 --- a/assets/data/config/ng/medals/medals.json +++ b/assets/data/config/ng/medals/medals.json @@ -235,6 +235,14 @@ { "name": "fulp-ware", "id": 82361 + }, + { + "name": "final-present", + "id": 82382 + }, + { + "name": "pinnacle", + "id": 82395 } ] } \ No newline at end of file diff --git a/assets/data/entries/credits/credits.txt b/assets/data/entries/credits/credits.txt new file mode 100644 index 00000000..ab3c08b4 --- /dev/null +++ b/assets/data/entries/credits/credits.txt @@ -0,0 +1,248 @@ +**Tankmas 2024** + +*Co-Organizers* +Squidly +MrShmoods + +*Lead Programmer* +Squidly + +*Lead Artist* +MrShmoods + +*Helper Elves* +Tamag0 +GR1MP +OnyxGalaria +midgetsausage +KingCrowned +Ferstofus + +*Additional Programmers* +Jefvel +EliteMasterEric + +*Additional Art* +Mimny +donpeppi +sebulant +BingoWaders +blakenator9872 + +*Sticker Mod* +OnyxGalaria + +*Present Artists* +Cymbourine +Sevi +midgetsausage +SirLenward +TheExtreamH +Bleak-Creep +MKMaffo +MatthewLopz +BellvonArtsy +Karlestonchew +KonanSaurus +EctoSludge +travsaus +dannydoods +ThePsychoSheep +OmegaKevin +Mimny +Pukebomb +VIATHINE +Oddlem +MondoBilby +Kinomoru +MudHutGrug +Slimygoo +MANTIS +KeithGarces +Tamag0 +SrPelo +EllieDoodles343 +rappinawful +leroyalmess +donpeppi +KOLANI +Smugarug +YourWorstDirector +wild0moon +ShangXian +Mutant-Girl-Mintt +Kunaigirl +CheddarExuberant +Chuw-Croissantier +Jaster +Poplako +RobC3 +BeepBeepBastard +demonrhythms +phaox05 +OnyxGalaria +XieLrssin +PITBULLMUTAFUCKA +nn-haste +ATOXBCC +Just-a-ng-dummy + +*Comic Artists* +midgetsausage +marbardan82 +guri-gure +DRAGONMIRACLES +theoscarlors + +*Music* +StixDevs - christmas? oh yeah! +RealTin3Sn - Christmas Joy +everratic - The Wanderer +TwistedFW - Dancing in the Snow +Leavesz - Ode to Snow +Irish-Soul - Holiday Melody +Druoxtheshredder - Santa's Gone +Jumbs - Hark the Angels +Albe - Spiritus +TeraVex - Another Tankmas Snowday +TeffyD - Towards a New Year +Droid - Snowflakes +ConnorGrail - A Lot Like Christmas +rappinawful - Endless Snowbag +Starcat - Vericon +Phonometrologist - Drift + +*Minigames* +Blawnode +Jefvel +Squidly + +*Premiers* +RPGAnims FulpWare Team +midgetsausage Sketch Collab 2024 Team +Kolumbo NGTV Christmas Marathon Team +DannyGoodShirt Dr. Good's Operating Theater Team +Tankmas Animation Jam Entrants + +*Tankmas Chronicles* +VoicesByCorey +Squidly +Tamag0 +MrShmoods +Smuggers +Kenkoy +Smugarug +CheddarExuberant +Bree +Lemewhim +MayBunny +TheExtreamH +Blitzilla +Chuw_Croissantier +MOHD5aqer +Xie.core.04 +Devilucis +Adamsandlerstan (Anni) +DragonMiracles +DannyDoods +Raviolibox +AJthecrocodile +Picochu +Meliness +Shwlft +ceyptcur + +*Tankmas Cast* +Jiffrey +The Concierge +Lil' Jimby (@ GeistBeatz dot com) +Javert +Joan +Gold Miser Jacquez +Backpacker Jill +Mella +Mallow +The Persimmons of Philosophy +Boxter the Boxing Day Box +Mall Santa +The Shape + +*Cameo Cast* +Peanutbudder Santa +Durooge +Amogus +Gacha Gal +Awesome Snake +Captain Carrion +Pony Boy +ConnorGrail in an apron +Tankmas 2023 Tombstone +The Thomas Apparation +Rare Tamago +Common Tamago +Dr Good +Bitey +Project 154 +Blade the Hedgehog + +*Special Thanks* +TomFulp +PsychoGoldfish +Johnny Jeff Utah +TheDyingSun +SplatterDash +BrandyBuizel +GeoKurelli +Dungeonation +TurkeyOnAStick +ninjamuffin99 +Gacha Panic Dev Team +HaxeFlixel Community +Haxe Community +Chompy +The Portel Management +Tamago Conservation Society +Dark Paco + +...and you! + +All events as portrayed in Tankmas 2024 are truthful and canon. All persons, living or dead, are real people with real feelings and you should feel bad if you made fun of them. Especially the box. + + + + + + + + + + + +And now... +Rest! +"I'm gonna go fishing" - Squidly, 2025 + + + + + + + + + + + + + + + + + + + + + + + + +:) \ No newline at end of file diff --git a/assets/data/entries/emote-sheets.json b/assets/data/entries/emote-sheets.json index f8cfed8c..fb386abf 100644 --- a/assets/data/entries/emote-sheets.json +++ b/assets/data/entries/emote-sheets.json @@ -197,6 +197,47 @@ { "name": "bellvonartsy-sticker" }, + { + "name": "smile-pim" + }, + { + "name": "poppy" + } + ] + }, + { + "name": "emotes-6-back-orange", + "items": [ + { + "name": "cordelia-rofl" + }, + { + "name": "chatterbox" + }, + { + "name": "mella-cuddle" + }, + { + "name": "a-well-earned-rest" + }, + { + "name": null + }, + { + "name": null + }, + { + "name": null + }, + { + "name": null + }, + { + "name": null + }, + { + "name": null + }, { "name": null }, diff --git a/assets/data/entries/emotes.json b/assets/data/entries/emotes.json index 581501a6..76795e39 100644 --- a/assets/data/entries/emotes.json +++ b/assets/data/entries/emotes.json @@ -321,6 +321,36 @@ "artist": "tamag0", "unlock": "FLAG", "data": "TAMAGO_ENCOUNTERED" + }, + { + "name": "smile-pim", + "properName": "Smile for the Pic", + "artist": "Alex-PhantomGlitch" + }, + { + "name": "poppy", + "properName": "SweetmasPoppy!", + "artist": "RavioliBox" + }, + { + "name": "cordelia-rofl", + "properName": "Cordelia ROFL", + "artist": "leroyalmess" + }, + { + "name": "chatterbox", + "properName": "Chatter Box", + "artist": "RavioliBox" + }, + { + "name": "mella-cuddle", + "properName": "Mella Cuddle", + "artist": "kingcrowned" + }, + { + "name": "a-well-earned-rest", + "properName": "And that's a wrap", + "artist": "squidly" } ] } \ No newline at end of file diff --git a/assets/data/entries/npcs/amogus-npc-dlgs.xml b/assets/data/entries/npcs/amogus-npc-dlgs.xml index 9d2000cb..dd8dd705 100644 --- a/assets/data/entries/npcs/amogus-npc-dlgs.xml +++ b/assets/data/entries/npcs/amogus-npc-dlgs.xml @@ -34,6 +34,9 @@ + + *Okay who moved the body over here* + *Poor orange... Who could've seen it coming?* diff --git a/assets/data/entries/npcs/cameo-npc-dlgs.xml b/assets/data/entries/npcs/cameo-npc-dlgs.xml index ec42af92..eb443235 100644 --- a/assets/data/entries/npcs/cameo-npc-dlgs.xml +++ b/assets/data/entries/npcs/cameo-npc-dlgs.xml @@ -1,6 +1,10 @@ + + Fellow traveler, this is where we depart. + For me? The skies. For you? Wherever your mind dreams. + Once more we meet, fellow traveler. Hello, fellow traveler. @@ -48,6 +52,13 @@ + + Hey buddy, look, I'm sorry I was ramblin' a bit back there + Eh who am I kiddin', I aint sorry. + But I was thinkin' I might as well stop wondering about' the past. + And start movin' forward, yea? Like a box oughtta. + Seeya around, bud + Hey, buddy, what ya lookin at? You a big box looker, huh? @@ -139,6 +150,9 @@ + + *They seem satisfied with their handiwork* + *Ah. What a wonderful surprise, it's Peantbudder Santa!* *It's never a Tankmas without them!* @@ -164,6 +178,10 @@ + + Oh, hey, you know, the show's over but the arcade's still going. + Stop on by sometime. + Oh, hey, what brings a cool robot like you down here? I'm Ponyboy, nice to meet you! @@ -209,6 +227,10 @@ + + *You found the Thing Thing!* + *Yep... They're still just as confused about this whole thing as before* + *You found the thing thing!* *They seem very confused about being here* diff --git a/assets/data/entries/npcs/general-npc-dlgs.xml b/assets/data/entries/npcs/general-npc-dlgs.xml index 3315b3e7..540a49ce 100644 --- a/assets/data/entries/npcs/general-npc-dlgs.xml +++ b/assets/data/entries/npcs/general-npc-dlgs.xml @@ -24,7 +24,7 @@ Here lies Tankmas ADVENTure Calendar 2023's hopes and dreams. - "I died before I could live." + I died before I could live. @@ -55,6 +55,13 @@ + + Hello... Dear guest... + It seems... It is time for us all to depart... + We hope you have enjoyed your stay... + Our... Benefactor... Did make for such festive arrangements... + But now... It is time... To cherish the memories... + Hello... Hello... Dear guests... Welcome... Welcome... It is now time... @@ -87,6 +94,19 @@ + + Hey man whazz goin on + Did you see the big things? Yea man, they were coming soon, man! + But now all the big things I was thinkin about are over, man... + But I was thinking. Man. What if like. There's MORE coming soon? + What if we are, like, free to shape our destiny, man? + These stars always inspirin' my mind, man. + Well, whatever's next, you can follow me on Lil Jimby @ GeistBeatz dot com + + Hey man whazz goin on I was telling you man big things coming soon, right? @@ -121,6 +141,11 @@ + + I see ze ringarde one has found me at zis place. + Had your fill of ze hotel life, no? + I zupose even ze ones like you must know when it is time to go. + I see ze ringarde one has found their way in. Had your fill of your puff peasent treats? @@ -143,6 +168,12 @@ + + Hey, dude, did you see the bonfire is out? + I guess all things come to an end, huh. + I guess I don't have to hide anymore... + I wonder where Mella went off to + Shh... Dude... Keep it down! Did you see what's going on out there? They're absolutely crazy. @@ -150,10 +181,10 @@ Impaling cute lil marshmallows just like me on wooden stakes! Then eating them! It's sick! But you wouldn't do that, would you? @@ -164,12 +195,21 @@ + + Oh, hallo! + What a beautiful sky! The woods are so often friendly to the stargazing, yes? + The stars. They glisten like diamonds. They watch over the travelers, like you and me. + To know something, somewhere, is looking out over me, this is truly wunderbar! + + - "Oh, hallo! + Oh, hallo! Did you happen upon this hotel too? Very fascinating, yes? I was just hiking along, but then I saw it appear in the distance! I feel myself drawn to it, so much excitement, as are you, yes? - Wunderbar! We will make this a home together!" + Wunderbar! We will make this a home together! @@ -177,73 +217,85 @@ + + Oh, it's you, once again. + You... Lesser beings always fancy such silly little hills. + So I saw it fit to take a stroll here and show you what true class looks like. + Now... Begone. I'm strolling. + - "Hmm? Sorry, were you trying to talk to me? + Hmm? Sorry, were you trying to talk to me? You must have me confused for a commoner. Allow me to correct you, let's call it a charity, to the lesser beings like yourself. - I am Joan. And YOU are not worth my efforts. Now begone." + I am Joan. And YOU are not worth my efforts. Now begone. - "Hmm? Sorry, were you trying to talk to me? + Hmm? Sorry, were you trying to talk to me? You must have me confused for a commoner. Allow me to correct you, let's call it a charity, to the lesser beings like yourself. I am Joan. And YOU are not worth my efforts. Now begone. This premiere is far too exclusive for one such as yourself. - Well... There's the door. So see yourself out the way you came." + Well... There's the door. So see yourself out the way you came. - "Grrch-gak...guh- + Grrch-gak...guh- AGH! YOU! PLEASE! This bag is much too heavy for my brittle 23 year old body! Would you offer this humble Mall Santa a hand? Here, just bend down and extend your arms so- ... - Where are you going?" + Where are you going? + + Hmmph? You are wondering why I'd be in such a place? + I am just assessing my opportunities in the skies. + We ghosts may be tethered to this earth, but that doesn't mean others are. + And there's *always* money to be made in space, you know. + - "Hmmph? Do I owe you my time? + Hmmph? Do I owe you my time? No? I did not think so. But so many here owe ME. It's not easy being so generous, you know. I collect and collect. But then they ask ME for my worth. And, ME, being such a generous being, give them with the small ask they pay me back slightly more later. Of course... If they're late, well, then special arrangements will have to be made. And this hotel is *quite* late". @@ -255,13 +307,13 @@ - "Hahaha! What did you think of my experiments? + Hahaha! What did you think of my experiments? I hope they disturbed you greatly! Hahahaha!!! - ...Did they though?" + ...Did they though? - "Haha! It seems someone here has taste in their attire! - Marvelous!" + Haha! It seems someone here has taste in their attire! + Marvelous! @@ -274,6 +326,10 @@ + + Hey duder. I thought I told you to leave me alone. + Duder. I'm trying to stargaze. + Hey duder, I came here to watch the new Shadow the Hedgehog 3 movie and they're not showing it. Doctor what? Duder. I need to crush some Crush 40 into my system, okay? It's what electrifies my Blade. @@ -287,7 +343,7 @@ diff --git a/assets/data/entries/npcs/persimmon-npc-dlgs.xml b/assets/data/entries/npcs/persimmon-npc-dlgs.xml index f7649dee..eab5661d 100644 --- a/assets/data/entries/npcs/persimmon-npc-dlgs.xml +++ b/assets/data/entries/npcs/persimmon-npc-dlgs.xml @@ -1,6 +1,10 @@ + + Child... It seems our time together is passing at last. + Did you enjoy this world? Until we meet again in the next one. + Hello.