Merge pull request #81 from chosencharacters/credits

Credits and final!

Project.xml

@@ -4,7 +4,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="31.9.5" company="Glenside Helper Elf Society" />
+	<app title="Tankmas 2024" file="Tankmas 2024" main="Main" version="32.0.1" company="Glenside Helper Elf Society" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->

assets/data/anims/general-anims.xml

@@ -135,4 +135,24 @@
 		<anim name="cd-5" fps="100ms" looping="false">21t22</anim>
 		<anim name="reset" fps="100ms" looping="false">23t27</anim>
 	</animSet>
+
+	<animSet image="fireworks" width="96" height="119">
+		<anim name="mella" fps="100ms" looping="false">0t11</anim>
+		<anim name="gooble" fps="100ms" looping="false">12t23</anim>
+		<anim name="ghost" fps="100ms" looping="false">24t35</anim>
+		<anim name="boyfriend" fps="100ms" looping="false">36t47</anim>
+		<anim name="paco" fps="100ms" looping="false">48t59</anim>
+	</animSet>
+
+	<animSet image="pinnacle-4-aurora-fx" width="960" height="540">
+		<anim name="idle" fps="500ms">0t7</anim>
+	</animSet>
+
+	<animSet image="pinnacle-4-stars-fx" width="960" height="540">
+		<anim name="idle" fps="40ms">0t23</anim>
+	</animSet>
+
+	<animSet image="credits-screenshots" width="800" height="600">
+		<anim name="max">0t23</anim>
+	</animSet>
 </root>

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
         }
     ]
 }

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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+:)

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
                 },

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"
 		}
 	]
 }

assets/data/entries/npcs/amogus-npc-dlgs.xml

@@ -34,6 +34,9 @@
         </state>
     </npc>
     <npc name="amogus-orange">
+        <state name="pinnacle" if="PINNACLE">
+            <dlg>*Okay who moved the body over here*</dlg>
+        </state>
         <state name="default">
             <dlg>*Poor orange... Who could've seen it coming?*</dlg>
         </state>