fix 2hot

Vortex2Oblivion · Sep 2, 2024 · 9759410 · 9759410
1 parent 38f59a7
commit 9759410
Show file tree

Hide file tree

Showing 20 changed files with 7,466 additions and 18,548 deletions.
diff --git a/assets/preload/data/character data/pico/config.json b/assets/preload/data/character data/pico/config.json
@@ -7,6 +7,7 @@
   "offsetsFlipWhenPlayer": true,
   "deathCharacterName": "pico-dead",
   "cameraOffset": [-100, 0],
+  "extraSheets": ["Pico_Intro", "Pico_Shooting"],
   "animations": [
     {
       "name": "idle",
@@ -61,6 +62,30 @@
       "animation_name": "Pico NOTE LEFT miss",
       "fps": 24,
       "looped": false
+    },
+    {
+      "name": "intro1",
+      "animation_name": "Pico Gets Pissed0",
+      "fps": 24,
+      "looped": false
+    },
+    {
+      "name": "intro2",
+      "animation_name": "shoot and return0",
+      "fps": 24,
+      "looped": false
+    },
+    {
+      "name": "cock",
+      "animation_name": "Pico Reload0",
+      "fps": 24,
+      "looped": false
+    },
+    {
+      "name": "shoot",
+      "animation_name": "Pico Shoot Hip Full0",
+      "fps": 24,
+      "looped": false
     }
   ]
 }
diff --git a/assets/preload/data/character data/pico/offsets.txt b/assets/preload/data/character data/pico/offsets.txt
@@ -7,4 +7,8 @@ intro1 0 0
 singDOWNmiss -35 -43
 singRIGHT -79 -13
 singLEFT 59 -1
-singUPmiss -19 58
+singUPmiss -19 58
+intro1 60 0
+intro2 -260 230
+cock 0 0
+shoot -300 250
diff --git a/assets/preload/data/scripts/darnell presong.hx b/assets/preload/data/scripts/darnell presong.hx
@@ -28,14 +28,6 @@ function startCutscene(){
 	newCan.visible = false;
 	PlayState.instance.add(newCan);
 
-	bf.frames.addAtlas(Paths.getSparrowAtlas('characters/Pico_Intro', 'shared'));
-	bf.frames.addAtlas(Paths.getSparrowAtlas('characters/Pico_Shooting', 'shared'));
-	bf.animation.addByPrefix('intro1', "Pico Gets Pissed0", 24, false);
-	bf.animation.addByPrefix('intro2', "shoot and return0", 24, false);
-	bf.animation.addByPrefix('cock', "Pico Reload0", 24, false);
-	bf.addOffset('intro1', 60, 0);
-	bf.addOffset('intro2', -260, 230);
-	bf.addOffset('cock', 0, 0);
 	bf.playAnim('intro1', true);
 
 	// camera sets up, pico does his animation showing him pissed