Crash Warped: small fixes

magcius · Feb 13, 2025 · bc995d6 · bc995d6
1 parent 01ab3f8
commit bc995d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/CrashWarped/scenes.ts b/src/CrashWarped/scenes.ts
@@ -63,7 +63,7 @@ class WarpedRenderer implements SceneGfx {
     }
 
     public adjustCameraController(c: CameraController) {
-        c.setSceneMoveSpeedMult(.3);
+        c.setSceneMoveSpeedMult(.1);
     }
 
     public createPanels(): UI.Panel[] {
@@ -293,6 +293,9 @@ class CrashWarpedScene implements SceneDesc {
             );
         }
 
+        if (this.index === 0x3c) // title screen has weird triangles?
+            renderer.worldParts[0].visible = false;
+
         renderer.data = parsed;
         return renderer;
     }
@@ -326,11 +329,11 @@ export const sceneDescs = [
     new CrashWarpedScene(0x1D, "Double Header"),
     new CrashWarpedScene(0x04, "N. Tropy"),
     "Egyptian Room",
+    new CrashWarpedScene(0x1E, "Sphynxinator"),
     new CrashWarpedScene(0x13, "Bye Bye Blimps"),
     new CrashWarpedScene(0x0D, "Tell No Tales"),
     new CrashWarpedScene(0x1B, "Future Frenzy"),
     new CrashWarpedScene(0x18, "Tomb Wader"),
-    new CrashWarpedScene(0x1E, "Sphynxinator"),
     new CrashWarpedScene(0x05, "N. Gin"),
     "Future Room",
     new CrashWarpedScene(0x20, "Orange Asphalt"),

diff --git a/src/CrashWarped/script.ts b/src/CrashWarped/script.ts
@@ -2416,9 +2416,11 @@ class InstructionExecutor implements InstructionHandler<ExecResult> {
     }
     public spawnChild(fileIndex: number, id: number, count: number, argCount: number): ExecResult {
         let spawn = true;
+        const name = this.game.level.classNameList[fileIndex];
+        if (name === "ShadC")
+            spawn = false; // no shadows for now
         if (this.game.objects.length < 500 && spawn) {
             // console.warn('spawn', inst, this.placement);
-            const name = this.game.level.classNameList[fileIndex];
             for (let i = 0; i < count; i++)
                 this.obj.spawnChild(id, argCount, assertExists(this.game.level.behaviors.get(name)), this.game);
         }
@@ -2668,9 +2670,9 @@ class InstructionExecutor implements InstructionHandler<ExecResult> {
                     const rot = this.obj.getVec(Source.YAW_SPEED, scratchVecs[1]);
                     vec3.scale(rot, rot, toRad);
                     this.obj.getVec(vec, scratchVecs[2]);
-                    vec3.rotateY(v, v, Vec3Zero, rot[2]);
-                    vec3.rotateX(v, v, Vec3Zero, rot[0]);
                     vec3.rotateY(v, v, Vec3Zero, rot[1] - rot[2]);
+                    vec3.rotateX(v, v, Vec3Zero, rot[0]);
+                    vec3.rotateY(v, v, Vec3Zero, rot[2]);
                 }
                 vec3.add(v, v, scratchVecs[2]);
                 this.obj.setVec(otherVec, v);

diff --git a/src/DefaultSaveStates.json b/src/DefaultSaveStates.json
@@ -6485,7 +6485,7 @@
     "SaveState_CrashWarped/18/1": "ShareData=APxILUj~2}7&8X*TY&l!WmDvk5*tnNUiKWbT]5e|Vwqtl8u+~o9D61HUq:d)Wq",
     "SaveState_CrashWarped/19/1": "ShareData=AZa(_9xgTtUOf_F9rtzeWOAqh560IjUnO2}UC88nV+:KnUmhl&T&HJb9ttEhV[",
     "SaveState_CrashWarped/1a/1": "ShareData=AXEWCUpLA!Skm?y8hs/zV|rtS5[7]MUpK2TUOi0GV2vPOTP!xG9cZ+9Up|PqWq",
-    "SaveState_CrashWarped/1b/1": "ShareData=AJ(RnUg)_07?j:CTaz[p=m5c4Q{X$WUf@paT/?(YVw0bT82Icq8;(IIUm$xXWq",
+    "SaveState_CrashWarped/1b/1": "ShareData=AMpV]Uhhl&7,6OLTRo$1WP4QRQ(GO4UWalGUB2n=V8IyQ8Y:mO9Js~:UpvwNWq",
     "SaveState_CrashWarped/1c/1": "ShareData=AC,^NUpC/ZTPgL!9OZ2zVwa+X5EsE,UZ}mcTx}Ku=H)xzUOV/989,LvUk{9BV[",
     "SaveState_CrashWarped/1d/1": "ShareData=AP_SpUiW]nTO3m98])BCWjlxF5x?R;Um_uXT9{p4VuCB}T]XPG8_lc$Ur0l=Wq",
     "SaveState_CrashWarped/1e/1": "ShareData=AYlJNUpeMz5p!m^TtGVzWiJwA5[iFzUZ}/d537k2V=)|F8vL-I5qjKXUVk6GWq",
@@ -6499,6 +6499,6 @@
     "SaveState_CrashWarped/26/1": "ShareData=AT/oKUVh/cS?rNK9B{ki=-H[~5$I5FUmUp5T_),)=oun|T3!r;9BN39Uagx7V[",
     "SaveState_CrashWarped/27/1": "ShareData=AY2n$Udd]kTm0Dd9RWTlW0nN255^W&UskWeUL&92VrRF8ULQok8*lmUUa+|NWq",
     "SaveState_CrashWarped/29/1": "ShareData=AIWn+UuaLv8A{bLT+BnQ9mhy}5qH&UUXc;UTf=rRV[Eis8[2a28pTdyUq_rbVt",
-    "SaveState_CrashWarped/2a/1": "ShareData=AGw-BUd8|@8Zcc6T]6!S=LQgS6I2nDUcXPjT4XvtVhuwl8{0d(9Cd8VUs|0iVt",
+    "SaveState_CrashWarped/2a/1": "ShareData=AWbbeUlKx^8]9IxUHDJW=0ktz5;eoWUX~6VUG)_3VgG!q9Whd/9R_=SUY[MI+C",
     "SaveState_CrashWarped/3c/1": "ShareData=ARtabUg2H=Tjys(T!(eu+FzRN4=+sJUYHA}8~C@,+bUuA8-FGVT=VuUUv;w;Vt"
 }