diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc index 10fc91d211..370345f540 100644 --- a/decompiler/config/jak3/all-types.gc +++ b/decompiler/config/jak3/all-types.gc @@ -10277,25 +10277,6 @@ (progress-fps-disclaimer-warning #x1314) (progress-fps-disclaimer #x1315) (progress-highscores-local-score #x1316) - (trick-board-none #x1320) - (trick-board-spin #x1321) - (trick-board-boost #x1322) - (trick-board-flip #x1323) - (trick-board-rail #x1324) - (trick-board-rail-jump #x1325) - (trick-board-nosegrab #x1326) - (trick-board-method #x1327) - (trick-board-board-spin #x1328) - (trick-board-board-flip #x1329) - (trick-board-noseflip #x132a) - (trick-board-kickflip #x132b) - (trick-board-jump #x132c) - (trick-board-duck-jump #x132d) - (trick-board-quick-jump #x132e) - (trick-darkjak #x132f) - (trick-darkjak-bomb0 #x1330) - (trick-darkjak-bomb1 #x1331) - (trick-darkjak-giant #x1332) (progress-graphics-ps2 #x1333) (progress-graphics-actor-culling #x1334) (progress-graphics-force-envmap #x1335) @@ -10325,6 +10306,35 @@ (progress-misc-fix-projectile-focus #x134d) (progress-controller-options-pacman-dpad #x134e) (progress-controller-options-analog-sensitivity #x134f) + (trick-board-none #x1350) + (trick-board-board-spin #x1351) + (trick-board-board-boost #x1352) + (trick-board-board-flip #x1353) + (trick-board-board-rail #x1354) + (trick-board-board-rail-jump #x1355) + (trick-board-board-nosegrab #x1356) + (trick-board-board-board-spin #x1357) + (trick-board-board-board-flip #x1358) + (trick-board-board-noseflip #x1359) + (trick-board-board-kickflip #x135a) + (trick-board-board-kickspin #x135b) + (trick-board-board-method #x135c) + (trick-board-board-method-cross #x135d) + (trick-board-board-backgrab #x135e) + (trick-board-board-airwalk #x135f) + (trick-board-board-jump #x1360) + (trick-board-board-duck-jump #x1361) + (trick-board-board-quick-jump #x1362) + (trick-board-darkjak #x1363) + (trick-board-darkjak-bomb0 #x1364) + (trick-board-darkjak-bomb1 #x1365) + (trick-board-darkjak-smack #x1366) + (trick-board-darkjak-tracking #x1367) + (trick-board-lightjak #x1368) + (trick-board-lightjak-regen #x1369) + (trick-board-lightjak-swoop #x136a) + (trick-board-lightjak-freeze #x136b) + (trick-board-lightjak-shield #x136c) ) ;; ---text-h:text-id diff --git a/game/assets/jak3/temp-text-id-mapping.json b/game/assets/jak3/temp-text-id-mapping.json index edfe0b73cf..b7434ab6e5 100644 --- a/game/assets/jak3/temp-text-id-mapping.json +++ b/game/assets/jak3/temp-text-id-mapping.json @@ -201,25 +201,6 @@ "1314": "1314", "1315": "1315", "1316": "1316", - "1320": "1320", - "1321": "1321", - "1322": "1322", - "1323": "1323", - "1324": "1324", - "1325": "1325", - "1326": "1326", - "1327": "1327", - "1328": "1328", - "1329": "1329", - "132a": "132a", - "132b": "132b", - "132c": "132c", - "132d": "132d", - "132e": "132e", - "132f": "132f", - "1330": "1330", - "1331": "1331", - "1332": "1332", "1333": "1333", "1334": "1334", "1335": "1335", @@ -245,5 +226,34 @@ "1349": "1349", "134a": "134a", "134b": "134b", - "134c": "134c" + "134c": "134c", + "1350": "1320", + "1351": "1321", + "1352": "1322", + "1353": "1323", + "1354": "1324", + "1355": "1325", + "1356": "1326", + "1357": "1328", + "1358": "1329", + "1359": "132a", + "135a": "132b", + "135b": "135b", + "135c": "1327", + "135d": "135d", + "135e": "135e", + "135f": "135f", + "1360": "132c", + "1361": "132d", + "1362": "132e", + "1363": "132f", + "1364": "1330", + "1365": "1331", + "1366": "1366", + "1367": "1367", + "1368": "1368", + "1369": "1369", + "136a": "136a", + "136b": "136b", + "136c": "136c" } diff --git a/game/assets/jak3/text/game_custom_text_ca-ES.json b/game/assets/jak3/text/game_custom_text_ca-ES.json index b66319abc2..545f5d6794 100644 --- a/game/assets/jak3/text/game_custom_text_ca-ES.json +++ b/game/assets/jak3/text/game_custom_text_ca-ES.json @@ -201,25 +201,6 @@ "1314": "Avís!", "1315": "Aquesta configuració és altament experimental. Quan no es reprodueix a 60 fotogrames per segon, poden sorgir problemes visuals i de joc com a resultat.", "1316": "Puntuació local", - "1320": "Cap", - "1321": "Girar", - "1322": "Estímul", - "1323": "Volteja", - "1324": "Carril per Lliscar", - "1325": "Salt de ferrocarril", - "1326": "Agafar el nas", - "1327": "Mètode", - "1328": "Tauler de gir", - "1329": "Tauler Flip", - "132a": "Flip nasal", - "132b": "Salt amb Gir", - "132c": "Saltar", - "132d": "Salt d'ànec", - "132e": "Salt ràpid", - "132f": "Jak fosc", - "1330": "Bomba fosca", - "1331": "Explosió fosca", - "1332": "Gegant fosc", "1333": "Opcions de PS2", "1334": "L'actor Culling", "1335": "Cartografia de l'entorn de força", @@ -248,6 +229,35 @@ "134c": "Efectes pels Gatells", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Cap", + "1351": "Girar", + "1352": "Estímul", + "1353": "Volteja", + "1354": "Carril per Lliscar", + "1355": "Salt de ferrocarril", + "1356": "Agafar el nas", + "1357": "Tauler de gir", + "1358": "Tauler Flip", + "1359": "Flip nasal", + "135a": "Salt amb Gir", + "135b": "Kickspin", + "135c": "Mètode", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Saltar", + "1361": "Salt d'ànec", + "1362": "Salt ràpid", + "1363": "Jak fosc", + "1364": "Bomba fosca", + "1365": "Explosió fosca", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Si us plau, no traieu ni introduïu cap perifèric, apagueu el vostre sistema o apagueu el joc", "b6": "Mentre aquesta icona estigui a la pantalla, no traieu ni inseriu cap perifèric, apagueu el vostre sistema o apagueu el joc" } diff --git a/game/assets/jak3/text/game_custom_text_da-DK.json b/game/assets/jak3/text/game_custom_text_da-DK.json index e4b47d05ff..1ad1ea57aa 100644 --- a/game/assets/jak3/text/game_custom_text_da-DK.json +++ b/game/assets/jak3/text/game_custom_text_da-DK.json @@ -201,25 +201,6 @@ "1314": "Advarsel!", "1315": "Denne indstilling er meget eksperimentel. Når den ikke spilles ved 60 billeder pr. sekund, kan der opstå visuelle problemer og problemer med gameplay.", "1316": "Lokal score", - "1320": "Ingen", - "1321": "Drej", - "1322": "Boost", - "1323": "Vend", - "1324": "Rail Grind", - "1325": "Skinnehop", - "1326": "Næsegreb", - "1327": "Metode", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Næseklip", - "132b": "Kickflip", - "132c": "Hoppe", - "132d": "Andespring", - "132e": "Hurtigt hop", - "132f": "Mørke Jak", - "1330": "Mørk bombe", - "1331": "Dark Blast", - "1332": "Mørk Kæmpe", "1333": "PS2 Indstillinger", "1334": "Skuespiller Culling", "1335": "Tving Miljø Kortlægning", @@ -248,6 +229,35 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Ingen", + "1351": "Drej", + "1352": "Boost", + "1353": "Vend", + "1354": "Rail Grind", + "1355": "Skinnehop", + "1356": "Næsegreb", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Næseklip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Metode", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Hoppe", + "1361": "Andespring", + "1362": "Hurtigt hop", + "1363": "Mørke Jak", + "1364": "Mørk bombe", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Fjern Venligst Ikke, Indsæt Ekstra Enheder, Eller Slukke Systemet Eller Spillet", "b6": "Mens Dette Ikon Er På Skærmen, Må Du Ikke Fjerne Eller Indsætte Nogen Ekstra Enheder, Slukke Systemet Eller Slukke Spillet" } diff --git a/game/assets/jak3/text/game_custom_text_de-DE.json b/game/assets/jak3/text/game_custom_text_de-DE.json index a0b54f1503..97887463ac 100644 --- a/game/assets/jak3/text/game_custom_text_de-DE.json +++ b/game/assets/jak3/text/game_custom_text_de-DE.json @@ -201,25 +201,6 @@ "1314": "Warnung!", "1315": "Diese Einstellung ist hoch-experimentell. Bei anderen Werten als 60 Bilder pro Sekunde können visuelle und spielerische Fehler auftreten.", "1316": "Lokales Ergebnis", - "1320": "Nichts", - "1321": "Drehung", - "1322": "Boost", - "1323": "Salto", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board-Drehung", - "1329": "Board-Salto", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Springen", - "132d": "Duck-Sprung", - "132e": "Schnellsprung", - "132f": "Dunkler Jak", - "1330": "Dunkelbombe", - "1331": "Dunkle Explosion", - "1332": "Dunkler Riese", "1333": "PS2-Optionen", "1334": "Schauspieler-Auswahl", "1335": "Erzwingen der Umgebungsabbildung", @@ -248,6 +229,35 @@ "134c": "Trigger-Effekte", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Nichts", + "1351": "Drehung", + "1352": "Boost", + "1353": "Salto", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board-Drehung", + "1358": "Board-Salto", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Springen", + "1361": "Duck-Sprung", + "1362": "Schnellsprung", + "1363": "Dunkler Jak", + "1364": "Dunkelbombe", + "1365": "Dunkle Explosion", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Bitte entferne oder verbinde kein Zubehör und schalte weder das System noch das Spiel aus", "b6": "Während dieses Symbol angezeigt wird, entferne oder verbinde kein Zubehör und schalte nicht das System oder das Spiel aus" } diff --git a/game/assets/jak3/text/game_custom_text_en-US.json b/game/assets/jak3/text/game_custom_text_en-US.json index 1a5b15db7b..dba8b80529 100644 --- a/game/assets/jak3/text/game_custom_text_en-US.json +++ b/game/assets/jak3/text/game_custom_text_en-US.json @@ -203,25 +203,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -250,5 +231,34 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", - "134f": "Analog Sensitivity" + "134f": "Analog Sensitivity", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield" } diff --git a/game/assets/jak3/text/game_custom_text_es-ES.json b/game/assets/jak3/text/game_custom_text_es-ES.json index a0ac5e27b1..0f6832fbad 100644 --- a/game/assets/jak3/text/game_custom_text_es-ES.json +++ b/game/assets/jak3/text/game_custom_text_es-ES.json @@ -201,25 +201,6 @@ "1314": "¡Advertencia!", "1315": "Esta opción es muy experimental. Si no juegas a 60 frames por segundo, pueden surgir problemas gráficos y de jugabilidad.", "1316": "Puntuación local", - "1320": "Ningún", - "1321": "Girar", - "1322": "Impulso", - "1323": "Voltereta", - "1324": "Deslizarse", - "1325": "Salto Raíl", - "1326": "Agarre de morro", - "1327": "Método", - "1328": "Giro de tabla", - "1329": "Vuelta de tabla", - "132a": "Giro de morro", - "132b": "Vuelta de patada", - "132c": "Saltar", - "132d": "Agachate y saltar", - "132e": "Salto Rápido", - "132f": "Jak Oscuro", - "1330": "Bomba Oscura", - "1331": "Explosión Oscura", - "1332": "Gigante Oscuro", "1333": "Opciones de PS2", "1334": "Culling de Actores", "1335": "Forzar Mapeado de Entorno", @@ -248,6 +229,35 @@ "134c": "Efectos de Gatillos", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Ningún", + "1351": "Girar", + "1352": "Impulso", + "1353": "Voltereta", + "1354": "Deslizarse", + "1355": "Salto Raíl", + "1356": "Agarre de morro", + "1357": "Giro de tabla", + "1358": "Vuelta de tabla", + "1359": "Giro de morro", + "135a": "Vuelta de patada", + "135b": "Kickspin", + "135c": "Método", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Saltar", + "1361": "Agachate y saltar", + "1362": "Salto Rápido", + "1363": "Jak Oscuro", + "1364": "Bomba Oscura", + "1365": "Explosión Oscura", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Por favor, no conectes o desconectes ningún dispositivo, apagues el sistema o cierres el juego", "b6": "Cuando este icono aparezca, no quites o conectes ningún dispositivo, no apagues el sistema ni cierres el juego." } diff --git a/game/assets/jak3/text/game_custom_text_fi-FI.json b/game/assets/jak3/text/game_custom_text_fi-FI.json index 8f73beca72..2462e54adb 100644 --- a/game/assets/jak3/text/game_custom_text_fi-FI.json +++ b/game/assets/jak3/text/game_custom_text_fi-FI.json @@ -200,25 +200,6 @@ "1314": "Varoitus!", "1315": "Tämä asetus on erittäin kokeellinen. Kun peliä ei pelata 60 Hz:n kuvataajuudella, visuaalisia sekä pelattavuuden ongelmia voi ilmaantua sen seurauksena.", "1316": "Paikallinen tulos", - "1320": "Ei mitään", - "1321": "Pyörähdys", - "1322": "Nopeuslisä", - "1323": "Voltti", - "1324": "Grindaus", - "1325": "Kaidehyppy", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Lautapyörähdys", - "1329": "Lautavoltti", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Hyppy", - "132d": "Kyykkyhyppy", - "132e": "Pikahyppy", - "132f": "Raivo-Jak", - "1330": "Raivopommi", - "1331": "Raivopurkaus", - "1332": "Raivojätti", "1333": "PS2-asetukset", "1334": "Objektien karsinta", "1335": "Pakota heijastusteksturointi", @@ -248,6 +229,35 @@ "134d": "Korjaa ammusten kohdistus", "134e": "Ecoverkkopelin suuntanäppäinohjaus", "134f": "Ohjaussauvan herkkyys", + "1350": "Ei mitään", + "1351": "Pyörähdys", + "1352": "Nopeuslisä", + "1353": "Voltti", + "1354": "Grindaus", + "1355": "Kaidehyppy", + "1356": "Nosegrab", + "1357": "Lautapyörähdys", + "1358": "Lautavoltti", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Hyppy", + "1361": "Kyykkyhyppy", + "1362": "Pikahyppy", + "1363": "Raivo-Jak", + "1364": "Raivopommi", + "1365": "Raivopurkaus", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Älä lisää tai poista mitään oheislaitteita, sammuta laitettasi tai sammuta peliä", "b6": "Kun tämä kuvake on ruudulla, älä lisää tai poista mitään oheislaitteita, sammuta laitettasi tai sammuta peliä" } diff --git a/game/assets/jak3/text/game_custom_text_fr-FR.json b/game/assets/jak3/text/game_custom_text_fr-FR.json index ea3ad4aa68..220ad793d4 100644 --- a/game/assets/jak3/text/game_custom_text_fr-FR.json +++ b/game/assets/jak3/text/game_custom_text_fr-FR.json @@ -201,25 +201,6 @@ "1314": "Attention !", "1315": "Ce paramètre est expérimental. Si le jeu n'est pas joué à 60 images par seconde, des problèmes visuels et de gameplay peuvent survenir.", "1316": "Score Local", - "1320": "Rien", - "1321": "Tourbillon", - "1322": "Boost", - "1323": "Flip", - "1324": "Glissade sur rail.", - "1325": "Saut sur rail", - "1326": "Nosegrab", - "1327": "Méthode ", - "1328": "Tour de planche.", - "1329": "Flip de planche.", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Sauter", - "132d": "Saut accroupi.", - "132e": "Saut rapide", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "Options PS2", "1334": "Élimination des acteurs.", "1335": "Cartographie forcée de l'environnement.", @@ -248,6 +229,35 @@ "134c": "Déclencher des effets.", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Rien", + "1351": "Tourbillon", + "1352": "Boost", + "1353": "Flip", + "1354": "Glissade sur rail.", + "1355": "Saut sur rail", + "1356": "Nosegrab", + "1357": "Tour de planche.", + "1358": "Flip de planche.", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Méthode", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Sauter", + "1361": "Saut accroupi", + "1362": "Saut rapide", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Sauvegarde en cours. Veillez à ne retirer ou n'insérer aucun périphérique, ni éteindre votre système ou arrêter le jeu.", "b6": "Lorsque cette icône apparait, ne retirez ou n'insérez aucun périphérique, ni éteindre votre système ou arrêter le jeu." } diff --git a/game/assets/jak3/text/game_custom_text_hu-HU.json b/game/assets/jak3/text/game_custom_text_hu-HU.json index fd2b6a2899..b7856c80da 100644 --- a/game/assets/jak3/text/game_custom_text_hu-HU.json +++ b/game/assets/jak3/text/game_custom_text_hu-HU.json @@ -201,25 +201,6 @@ "1314": "Figyelem!", "1315": "Ez a beállítás erősen kísérleti. Ha nem 60FPS-sel játszol akkor látvány- és játékmenetbeli problémák merülhetnek fel ennek következtében.", "1316": "Helyi pontszám", - "1320": "Egyik sem", - "1321": "Pörgés", - "1322": "Gyorsító", - "1323": "Forgatás", - "1324": "Síncsúszás", - "1325": "Sínugrás", - "1326": "Nosegrab", - "1327": "Módszer", - "1328": "Pörgés", - "1329": "Forgatás", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Ugrás", - "132d": "Magas Ugrás", - "132e": "Gyors Ugrás", - "132f": "Sötét Jak", - "1330": "Sötét Bomba", - "1331": "Sötét Robbanás", - "1332": "Sötét Óriás", "1333": "PS2 Beállítások", "1334": "Actor Culling", "1335": "Environment Mapping kényszerítése", @@ -248,6 +229,35 @@ "134c": "Trigger Effektek", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Egyik sem", + "1351": "Pörgés", + "1352": "Gyorsító", + "1353": "Forgatás", + "1354": "Síncsúszás", + "1355": "Sínugrás", + "1356": "Nosegrab", + "1357": "Pörgés", + "1358": "Forgatás", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Módszer", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Ugrás", + "1361": "Magas Ugrás", + "1362": "Gyors Ugrás", + "1363": "Sötét Jak", + "1364": "Sötét Bomba", + "1365": "Sötét Robbanás", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Kérlek ne távolíts el vagy csatlakoztass bármiféle perifériát, és ne kapcsold ki a számítógéped vagy állítsd le a játékot", "b6": "Amíg ez az ikon a képernyőn van, ne távolíts el vagy csatlakoztass bármiféle perifériát, és ne kapcsold ki a számítógéped vagy állítsd le a játékot" } diff --git a/game/assets/jak3/text/game_custom_text_is-IS.json b/game/assets/jak3/text/game_custom_text_is-IS.json index 683a61307f..622acf6b0a 100644 --- a/game/assets/jak3/text/game_custom_text_is-IS.json +++ b/game/assets/jak3/text/game_custom_text_is-IS.json @@ -201,25 +201,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -248,6 +229,35 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Please Do Not Remove Or Insert Any Peripherals, Turn Off Your System Or Shut Down The Game", "b6": "While This Icon Is On Screen, Do Not Remove Or Insert Any Peripherals, Turn Off Your System Or Shut Down The Game" } diff --git a/game/assets/jak3/text/game_custom_text_it-IT.json b/game/assets/jak3/text/game_custom_text_it-IT.json index 2a4312e7a7..42d027f308 100644 --- a/game/assets/jak3/text/game_custom_text_it-IT.json +++ b/game/assets/jak3/text/game_custom_text_it-IT.json @@ -201,25 +201,6 @@ "1314": "Attenzione!", "1315": "Questa impostazione è sperimentale. Quando non è impostata su 60 FPS, potresti riscontrare problemi grafici e di gameplay.", "1316": "Punteggio locale", - "1320": "Nessuno", - "1321": "Giro", - "1322": "Boost", - "1323": "Capriola", - "1324": "Grind", - "1325": "Salto sulla ringhiera", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Giravolta", - "1329": "Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Salto", - "132d": "Salto accovacciato", - "132e": "Salto rapido", - "132f": "Dark Jak", - "1330": "Bomba oscura", - "1331": "Esplosione oscura", - "1332": "Dark Jak gigante", "1333": "Opzioni PS2", "1334": "Riduzione attori", "1335": "Forza mappatura ambiente", @@ -248,6 +229,35 @@ "134c": "Effetti di Attivazione", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Nessuno", + "1351": "Giro", + "1352": "Boost", + "1353": "Capriola", + "1354": "Grind", + "1355": "Salto sulla ringhiera", + "1356": "Nosegrab", + "1357": "Giravolta", + "1358": "Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Salto", + "1361": "Salto accovacciato", + "1362": "Salto rapido", + "1363": "Dark Jak", + "1364": "Bomba oscura", + "1365": "Esplosione oscura", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Non rimuovere o inserire alcuna periferica, spegnere il sistema o chiudere il gioco", "b6": "Quando questa icona appare sullo schermo, non rimuovere o inserire alcuna periferica, spegnere il sistema o chiudere il gioco" } diff --git a/game/assets/jak3/text/game_custom_text_ja-JP.json b/game/assets/jak3/text/game_custom_text_ja-JP.json index 0ddf92b462..f164c90fe4 100644 --- a/game/assets/jak3/text/game_custom_text_ja-JP.json +++ b/game/assets/jak3/text/game_custom_text_ja-JP.json @@ -202,25 +202,6 @@ "1314": "警告!", "1315": "この??は??に???なものです.?秒60フレームで??されていない場合、???な??やゲームプレイの??が発?する?能性があります.", "1316": "ローカルスコア", - "1320": "なし", - "1321": "スピン", - "1322": "ブースト", - "1323": "フリップ", - "1324": "レールグラインド", - "1325": "レールジャンプ", - "1326": "ノーズグラブ", - "1327": "メソッド", - "1328": "ボードスピン", - "1329": "ボードフリップ", - "132a": "ノーズフリップ", - "132b": "キックフリップ", - "132c": "ジャンプ", - "132d": "ダックジャンプ", - "132e": "クイックジャンプ", - "132f": "ダークジャック", - "1330": "ダークボム", - "1331": "ダークブラスト", - "1332": "ダークジャイアント", "1333": "PS2オプション", "1334": "アクターカリング", "1335": "?制?に??マッピング", @@ -246,5 +227,34 @@ "1349": " Galego", "134a": "Pressure Sensitivity", "134b": "Swap R1 and R2", - "134c": "Trigger Effects" + "134c": "Trigger Effects", + "1350": "なし", + "1351": "スピン", + "1352": "ブースト", + "1353": "フリップ", + "1354": "レールグラインド", + "1355": "レールジャンプ", + "1356": "ノーズグラブ", + "1357": "ボードスピン", + "1358": "ボードフリップ", + "1359": "ノーズフリップ", + "135a": "キックフリップ", + "135b": "Kickspin", + "135c": "メソッド", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "ジャンプ", + "1361": "ダックジャンプ", + "1362": "クイックジャンプ", + "1363": "ダークジャック", + "1364": "ダークボム", + "1365": "ダークブラスト", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield" } diff --git a/game/assets/jak3/text/game_custom_text_ko-KO.json b/game/assets/jak3/text/game_custom_text_ko-KO.json index dccce47ae9..09896c88c2 100644 --- a/game/assets/jak3/text/game_custom_text_ko-KO.json +++ b/game/assets/jak3/text/game_custom_text_ko-KO.json @@ -202,25 +202,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -248,5 +229,34 @@ "134b": "Swap R1 and R2", "134c": "Trigger Effects", "134d": "Fix Projectile Focus", - "134e": "Eco Grid (Pac-Man) D-Pad Controls" + "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield" } diff --git a/game/assets/jak3/text/game_custom_text_nl-NL.json b/game/assets/jak3/text/game_custom_text_nl-NL.json index 668820bd16..b4133107ca 100644 --- a/game/assets/jak3/text/game_custom_text_nl-NL.json +++ b/game/assets/jak3/text/game_custom_text_nl-NL.json @@ -201,25 +201,6 @@ "1314": "Waarschuwing!", "1315": "Deze instelling is zeer experimenteel. Wanneer er niet op 60 frames per seconde wordt gespeeld, kunnen er visuele en gameplay-problemen ontstaan.", "1316": "Lokale score", - "1320": "Geen", - "1321": "Draai", - "1322": "Versnellen", - "1323": "Omdraaien", - "1324": "Spoorwegslijpen", - "1325": "Spoorsprong", - "1326": "Neusgrijper", - "1327": "Methode", - "1328": "Bord draaien", - "1329": "Bord omdraaien", - "132a": "Neusbeweging", - "132b": "Kickflip", - "132c": "Springen", - "132d": "Eend sprong", - "132e": "Snelle sprong", - "132f": "Donker Jak", - "1330": "Donkere bom", - "1331": "Donkere explosie", - "1332": "Donkere reus", "1333": "PS2-opties", "1334": "Acteur Culling", "1335": "Forceer omgevingskaarten", @@ -248,6 +229,35 @@ "134c": "Activeer Effecten", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Geen", + "1351": "Draai", + "1352": "Versnellen", + "1353": "Omdraaien", + "1354": "Spoorwegslijpen", + "1355": "Spoorsprong", + "1356": "Neusgrijper", + "1357": "Bord draaien", + "1358": "Bord omdraaien", + "1359": "Neusbeweging", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Methode", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Springen", + "1361": "Eend sprong", + "1362": "Snelle sprong", + "1363": "Donker Jak", + "1364": "Donkere bom", + "1365": "Donkere explosie", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Gelieve Geen Randapparatuur Te Verwijderen Of Aan Te Sluiten, Uw Systeem Niet Uit Te Schakelen En Het Spel Niet Af Te Sluiten", "b6": "Wanneer Dit Pictogram Op Het Scherm Getoond Wordt, Gelieve Geen Randapparatuur Te Verwijderen Of Aan Te Sluiten, Uw Systeem Niet Uit Te Schakelen En Het Spel Niet Af Te Sluiten" } diff --git a/game/assets/jak3/text/game_custom_text_no-NO.json b/game/assets/jak3/text/game_custom_text_no-NO.json index 1ebfa975ca..9ca4e6e8fc 100644 --- a/game/assets/jak3/text/game_custom_text_no-NO.json +++ b/game/assets/jak3/text/game_custom_text_no-NO.json @@ -201,25 +201,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -248,6 +229,35 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Vennligst Ikke Fjern Eller Sett Inn Noe Periferi, Skru Av Systemet, Eller Skru Av Spillet", "b6": "I Mens Dette Ikonet Er På Skjermen, Ikke Fjern Eller Sett Inn Noe Periferi, Skru Av Systemet, Eller Skru Av Spillet" } diff --git a/game/assets/jak3/text/game_custom_text_pl-PL.json b/game/assets/jak3/text/game_custom_text_pl-PL.json index 0f77f407ef..5236787f81 100644 --- a/game/assets/jak3/text/game_custom_text_pl-PL.json +++ b/game/assets/jak3/text/game_custom_text_pl-PL.json @@ -201,25 +201,6 @@ "1314": "Ostrzeżenie!", "1315": "To ustawienie jest mocno eksperymentalne. Gdy gra nie jest w 60 klatkach na sekundę, mogą pojawić się błędy graficzne i problemy z rozgrywką.", "1316": "Wynik lokalny", - "1320": "Brak", - "1321": "Wir", - "1322": "Doładowanie", - "1323": "Przewrót", - "1324": "Jazda na poręczy", - "1325": "Skok z poręczy", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Wirowanie deską", - "1329": "Obrót deską", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Skok", - "132d": "Skok z przykucnięcia", - "132e": "Szybki skok", - "132f": "Mroczny Jak", - "1330": "Mroczna Bomba", - "1331": "Mroczny Ładunek", - "1332": "Mroczny Gigant", "1333": "Opcje PS2", "1334": "Optymalizacja aktorów", "1335": "Wymuś mapowanie środowiska", @@ -248,6 +229,35 @@ "134c": "Efekty \"Trigger\"", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Brak", + "1351": "Wir", + "1352": "Doładowanie", + "1353": "Przewrót", + "1354": "Jazda na poręczy", + "1355": "Skok z poręczy", + "1356": "Nosegrab", + "1357": "Wirowanie deską", + "1358": "Obrót deską", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Skok", + "1361": "Skok z przykucnięcia", + "1362": "Szybki skok", + "1363": "Mroczny Jak", + "1364": "Mroczna Bomba", + "1365": "Mroczny Ładunek", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Proszę nie odłączać ani podłączać żadnych urządzeń, wyłączać systemu oraz nie wyłączać gry", "b6": "Kiedy ta ikona jest na ekranie, proszę nie odłączać ani podłączać żadnych urządzeń, wyłączać systemu oraz nie wyłączać gry" } diff --git a/game/assets/jak3/text/game_custom_text_pt-BR.json b/game/assets/jak3/text/game_custom_text_pt-BR.json index a4f8bcc805..798dfe111c 100644 --- a/game/assets/jak3/text/game_custom_text_pt-BR.json +++ b/game/assets/jak3/text/game_custom_text_pt-BR.json @@ -201,25 +201,6 @@ "1314": "Aviso!", "1315": "Essa configuração é extremamente experimental. Se não for executado a 60 quadros por segundo, poderão ocorrer problemas visuais e de jogabilidade.", "1316": "Pontuação Local", - "1320": "Nenhum", - "1321": "Girar", - "1322": "Impulso", - "1323": "Virar", - "1324": "Grind no Trilho", - "1325": "Salto no Trilho", - "1326": "Nosegrab", - "1327": "Método", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Salto", - "132d": "Salto Agachado", - "132e": "Salto Rápido", - "132f": "Jak Sombrio", - "1330": "Bomba Sombria", - "1331": "Explosão Sombria", - "1332": "Gigante Sombrio", "1333": "Opções do PS2", "1334": "Descarte de Ator", "1335": "Forçar Mapeamento Ambiental", @@ -248,6 +229,35 @@ "134c": "Efeitos dos Gatilhos", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Nenhum", + "1351": "Girar", + "1352": "Impulso", + "1353": "Virar", + "1354": "Grind no Trilho", + "1355": "Salto no Trilho", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Método", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Salto", + "1361": "Salto Agachado", + "1362": "Salto Rápido", + "1363": "Jak Sombrio", + "1364": "Bomba Sombria", + "1365": "Explosão Sombria", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Por favor, não remova ou insira nenhum periférico, desligue o seu sistema ou remova o jogo", "b6": "Enquanto este ícone estiver na tela, por favor, não remova ou insira nenhum periférico, desligue o seu sistema ou remova o jogo" } diff --git a/game/assets/jak3/text/game_custom_text_pt-PT.json b/game/assets/jak3/text/game_custom_text_pt-PT.json index 10979fe519..2372298f91 100644 --- a/game/assets/jak3/text/game_custom_text_pt-PT.json +++ b/game/assets/jak3/text/game_custom_text_pt-PT.json @@ -201,25 +201,6 @@ "1314": "Aviso!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Pontuação Local", - "1320": "Nenhum", - "1321": "Girar", - "1322": "Impulso", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Método", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Salto", - "132d": "Salto Abaixado", - "132e": "Salto Rápido", - "132f": "Jak Negro", - "1330": "Bomba negra", - "1331": "Explosão Negra", - "1332": "Gigante Negro", "1333": "Opções da PS2", "1334": "Actor Culling", "1335": "Forçar Mapeamento Ambiental", @@ -248,6 +229,35 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "Nenhum", + "1351": "Girar", + "1352": "Impulso", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Método", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Salto", + "1361": "Salto Abaixado", + "1362": "Salto Rápido", + "1363": "Jak Negro", + "1364": "Bomba negra", + "1365": "Explosão Negra", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Por favor não removas ou insiras qualquer dispositivo, desligues o sistema ou feches o jogo", "b6": "Enquanto este ícone estiver no ecrã, não removas ou insiras qualquer dispositivo, desligues o sistema ou feches o jogo" } diff --git a/game/assets/jak3/text/game_custom_text_ru-RU.json b/game/assets/jak3/text/game_custom_text_ru-RU.json index dccce47ae9..09896c88c2 100644 --- a/game/assets/jak3/text/game_custom_text_ru-RU.json +++ b/game/assets/jak3/text/game_custom_text_ru-RU.json @@ -202,25 +202,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -248,5 +229,34 @@ "134b": "Swap R1 and R2", "134c": "Trigger Effects", "134d": "Fix Projectile Focus", - "134e": "Eco Grid (Pac-Man) D-Pad Controls" + "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield" } diff --git a/game/assets/jak3/text/game_custom_text_sv-SE.json b/game/assets/jak3/text/game_custom_text_sv-SE.json index d8d016ed1b..14fdb9ee38 100644 --- a/game/assets/jak3/text/game_custom_text_sv-SE.json +++ b/game/assets/jak3/text/game_custom_text_sv-SE.json @@ -201,25 +201,6 @@ "1314": "Warning!", "1315": "This setting is highly experimental. When not played at 60 frames per second, visual and gameplay issues may arise as a result.", "1316": "Local Score", - "1320": "None", - "1321": "Spin", - "1322": "Boost", - "1323": "Flip", - "1324": "Rail Grind", - "1325": "Rail Jump", - "1326": "Nosegrab", - "1327": "Method", - "1328": "Board Spin", - "1329": "Board Flip", - "132a": "Noseflip", - "132b": "Kickflip", - "132c": "Jump", - "132d": "Duck Jump", - "132e": "Quick Jump", - "132f": "Dark Jak", - "1330": "Dark Bomb", - "1331": "Dark Blast", - "1332": "Dark Giant", "1333": "PS2 Options", "1334": "Actor Culling", "1335": "Force Environment Mapping", @@ -248,6 +229,35 @@ "134c": "Trigger Effects", "134d": "Fix Projectile Focus", "134e": "Eco Grid (Pac-Man) D-Pad Controls", + "1350": "None", + "1351": "Spin", + "1352": "Boost", + "1353": "Flip", + "1354": "Rail Grind", + "1355": "Rail Jump", + "1356": "Nosegrab", + "1357": "Board Spin", + "1358": "Board Flip", + "1359": "Noseflip", + "135a": "Kickflip", + "135b": "Kickspin", + "135c": "Method", + "135d": "Method Cross", + "135e": "Backgrab", + "135f": "Airwalk", + "1360": "Jump", + "1361": "Duck Jump", + "1362": "Quick Jump", + "1363": "Dark Jak", + "1364": "Dark Bomb", + "1365": "Dark Blast", + "1366": "Dark Strike", + "1367": "Dark Tracking", + "1368": "Light Jak", + "1369": "Light Regeneration", + "136a": "Light Flight", + "136b": "Flash Freeze", + "136c": "Light Shield", "a4": "Ta Inte Bort Eller Lägg Till Några Tillbehör, Stäng Av Din Konsol Eller Avsluta Spelet", "b6": "Ta Inte Bort Eller Lägg Till Några Tillbehör, Stäng Av Din Konsol Eller Avsluta Spelet Medan Den Här Ikonen Är Synlig" } diff --git a/goal_src/jak2/engine/target/board/target-board.gc b/goal_src/jak2/engine/target/board/target-board.gc index f9eaa9e3e7..bbf69797cf 100644 --- a/goal_src/jak2/engine/target/board/target-board.gc +++ b/goal_src/jak2/engine/target/board/target-board.gc @@ -83,13 +83,13 @@ (let ((times (-> freq trick)) (color (case trick (((board-tricks board-boost) (board-tricks board-jump) (board-tricks board-duck-jump) (board-tricks board-quick-jump)) - "~9L") ;; pink + "~9L") ;; pink (X tricks) (((board-tricks board-rail) (board-tricks board-rail-jump)) - "~3L") ;; red + "~3L") ;; red (square tricks) (((board-tricks board-spin) (board-tricks board-flip) (board-tricks board-board-flip) (board-tricks board-nosegrab)) - "~26L") ;; pad-triangle + "~26L") ;; pad-triangle (green, r1 tricks) (((board-tricks board-board-spin) (board-tricks board-method) (board-tricks board-noseflip) (board-tricks board-kickflip)) - "~15L"))) ;; menu-flag-on + "~15L"))) ;; menu-flag-on (yellow, l1 tricks) (padding (if (zero? i) "" " + ")) (trick-name (lookup-text! *common-text* (board-trick->text-id trick) #f))) @@ -777,6 +777,9 @@ (set! (-> self board flip-count) 0) (set! (-> self board unknown-float00) 0.0) (set! (-> self board unknown-float01) 0.0) + ;; og:preserve-this reset trick display + (#when PC_PORT + (reset-combo! *board-trick-tracker*)) (set! (-> self board trick-count) 0) (countdown (v1-62 16) (set! (-> self board trick-list 0) (board-tricks none)) diff --git a/goal_src/jak3/engine/common-obs/voicebox.gc b/goal_src/jak3/engine/common-obs/voicebox.gc index 682aa18625..fd0c67a9af 100644 --- a/goal_src/jak3/engine/common-obs/voicebox.gc +++ b/goal_src/jak3/engine/common-obs/voicebox.gc @@ -411,6 +411,9 @@ ) ) ) + ;; og:preserve-this pc port trick tracker + (#when PC_PORT + (render-combo *board-trick-tracker*)) 0 (none) ) @@ -440,6 +443,10 @@ (when s4-0 (change-parent self (ppointer->process s4-0)) (focus-on! (-> self focus) (the-as process-focusable s5-2)) + ;; og:preserve-this pc port trick tracker + (#when PC_PORT + (end-combo! *board-trick-tracker*) + (reset-combo! *board-trick-tracker*)) (go-virtual enter) ) ) diff --git a/goal_src/jak3/engine/target/board/board-h.gc b/goal_src/jak3/engine/target/board/board-h.gc index c8d5c170f9..a48ec3e42e 100644 --- a/goal_src/jak3/engine/target/board/board-h.gc +++ b/goal_src/jak3/engine/target/board/board-h.gc @@ -41,6 +41,22 @@ ) ;; ---board-tricks +(#when PC_PORT + +(deftype board-trick-tracker (structure) + ((tricks-in-combo board-tricks 16) + (num-tricks-in-combo uint32) + (points-in-combo float) + (combo-in-progress? symbol)) + (:methods + (reset-combo! (_type_) none) + (add-trick-to-combo! (_type_ board-tricks float) none) + (render-combo (_type_) none) + (end-combo! (_type_) none))) + +(define-extern *board-trick-tracker* board-trick-tracker) + +) ;; DECOMP BEGINS diff --git a/goal_src/jak3/engine/target/board/target-board.gc b/goal_src/jak3/engine/target/board/target-board.gc index 06428e83bb..e4e1b651a6 100644 --- a/goal_src/jak3/engine/target/board/target-board.gc +++ b/goal_src/jak3/engine/target/board/target-board.gc @@ -10,6 +10,96 @@ (define-extern *board-spin-post-mods* surface) (define-extern *board-flip-mods* surface) + +(#when PC_PORT + +(define *board-trick-tracker* (new 'static 'board-trick-tracker)) + +(defmethod reset-combo! board-trick-tracker ((this board-trick-tracker)) + (set! (-> this num-tricks-in-combo) 0) + (set! (-> this points-in-combo) 0.0) + (countdown (idx 16) + (set! (-> this tricks-in-combo idx) (board-tricks none))) + (none)) + +(defmethod add-trick-to-combo! board-trick-tracker ((this board-trick-tracker) (trick board-tricks) (points float)) + (when (not (-> this combo-in-progress?)) + (set! (-> this combo-in-progress?) #t) + (reset-combo! this)) + (when (< (-> this num-tricks-in-combo) 15) + (set! (-> this tricks-in-combo (-> this num-tricks-in-combo)) trick) + (set! (-> this num-tricks-in-combo) (inc (-> this num-tricks-in-combo))) + (set! (-> this points-in-combo) (+ (-> this points-in-combo) points))) + (none)) + +(defun board-trick->text-id ((trick board-tricks)) + "return the in-game text ID for this trick" + ;; the text ID for the board tricks is in the same order as the enum! + (the text-id (+ (text-id trick-board-none) trick))) + +(defmethod render-combo board-trick-tracker ((this board-trick-tracker)) + (when (not (pc-cheats? (-> *pc-settings* cheats) board-tricks)) + (return 0)) + + (clear *temp-string*) + ;; Also only print each trick type once + (let ((freq (new 'stack-no-clear 'array 'uint32 19)) + (printed (new 'stack-no-clear 'array 'symbol 19))) + ;; Initialize the arrays + (countdown (i 19) + (set! (-> freq i) 0) + (set! (-> printed i) #f)) + + ;; Build up a frequency list, god i wish i had a map + (dotimes (i (-> this num-tricks-in-combo)) + (let ((trick (-> this tricks-in-combo i))) + (1+! (-> freq trick)))) + + ;; Now we can construct the string + (dotimes (i (-> this num-tricks-in-combo)) + (let ((trick (-> this tricks-in-combo i))) + (unless (-> printed trick) + (let ((times (-> freq trick)) + (color (case trick + (((board-tricks board-boost) (board-tricks board-jump) (board-tricks board-duck-jump) (board-tricks board-quick-jump)) + "~9L") ;; pink (X tricks) + (((board-tricks board-rail) (board-tricks board-rail-jump)) + "~3L") ;; red (square tricks) + (((board-tricks board-spin) (board-tricks board-flip)) + "~26L") ;; pad-triangle (green, r1 tricks) + (((board-tricks board-method) (board-tricks board-method-cross) (board-tricks board-backgrab) (board-tricks board-airwalk)) + "~21L") ;; font-color-21 (blue, l2 tricks) + (((board-tricks board-nosegrab) (board-tricks board-board-spin) (board-tricks board-noseflip) (board-tricks board-kickflip) (board-tricks board-kickspin)) + "~15L"))) ;; menu-flag-on (yellow, l1 tricks) + (padding (if (zero? i) "" " + ")) + (trick-name (lookup-text! *common-text* (board-trick->text-id trick) #f))) + + (format *temp-string* "~S~S~S~0L" padding color trick-name) + (if (> times 1) + (format *temp-string* " x ~D" times)) + + (set! (-> printed trick) #t)))))) + + + ;; Print it finally + (let ((font-ctx (new 'stack 'font-context *font-default-matrix* 90 320 0.0 (font-color default) (font-flags large shadow kerning middle)))) + (set-width! font-ctx 300) + (set-scale! font-ctx 0.25) + (print-game-text *temp-string* font-ctx #f 44 (bucket-id debug-no-zbuf1)) + ;; Add points + (+! (-> font-ctx origin y) 36.0) + (set-scale! font-ctx 0.5) + (set-color! font-ctx (font-color font-color-38)) + (when (> (-> this points-in-combo) 0.0) + (print-game-text (string-format "~D" (the int (-> this points-in-combo))) font-ctx #f 44 (bucket-id debug-no-zbuf1)))) + (none)) + +(defmethod end-combo! board-trick-tracker ((this board-trick-tracker)) + (set! (-> this combo-in-progress?) #f) + (none)) + +) + ;; DECOMP BEGINS (define *board-walk-mods* @@ -878,6 +968,9 @@ (set! (-> self board unk-float005) 0.0) (set! (-> self board unk-float006) 0.0) (set! (-> self board unk-float007) 0.0) + ;; og:preserve-this reset trick display + (#when PC_PORT + (reset-combo! *board-trick-tracker*)) (set! (-> self board trick-count) 0) (countdown (v1-69 16) (set! (-> self board trick-list 0) (board-tricks none)) @@ -2967,117 +3060,33 @@ (sound-play "do-trick") (let ((t9-4 format) (a0-29 #t) - (a1-8 "trick: ~S (~D) ~,,0f") - (v1-30 arg0) - ) + (a1-8 "trick: ~S (~,,0f, ~D, ~f) ~,,0f") + ;; og:preserve-this + (trick-name (enum->string board-tricks arg0))) (t9-4 a0-29 a1-8 - (cond - ((= v1-30 (board-tricks darkjak-tracking)) - "darkjak-tracking" - ) - ((= v1-30 (board-tricks board-rail-jump)) - "board-rail-jump" - ) - ((= v1-30 (board-tricks lightjak-swoop)) - "lightjak-swoop" - ) - ((= v1-30 (board-tricks board-nosegrab)) - "board-nosegrab" - ) - ((= v1-30 (board-tricks board-board-spin)) - "board-board-spin" - ) - ((= v1-30 (board-tricks board-kickflip)) - "board-kickflip" - ) - ((= v1-30 (board-tricks lightjak-regen)) - "lightjak-regen" - ) - ((= v1-30 (board-tricks board-method)) - "board-method" - ) - ((= v1-30 (board-tricks board-spin)) - "board-spin" - ) - ((= v1-30 (board-tricks board-kickspin)) - "board-kickspin" - ) - ((= v1-30 (board-tricks board-boost)) - "board-boost" - ) - ((= v1-30 (board-tricks darkjak)) - "darkjak" - ) - ((= v1-30 (board-tricks lightjak)) - "lightjak" - ) - ((= v1-30 (board-tricks board-method-cross)) - "board-method-cross" - ) - ((= v1-30 (board-tricks board-duck-jump)) - "board-duck-jump" - ) - ((= v1-30 (board-tricks board-airwalk)) - "board-airwalk" - ) - ((= v1-30 (board-tricks lightjak-shield)) - "lightjak-shield" - ) - ((= v1-30 (board-tricks board-backgrab)) - "board-backgrab" - ) - ((= v1-30 (board-tricks board-board-flip)) - "board-board-flip" - ) - ((= v1-30 (board-tricks board-rail)) - "board-rail" - ) - ((= v1-30 (board-tricks none)) - "none" - ) - ((= v1-30 (board-tricks lightjak-freeze)) - "lightjak-freeze" - ) - ((= v1-30 (board-tricks darkjak-bomb0)) - "darkjak-bomb0" - ) - ((= v1-30 (board-tricks board-quick-jump)) - "board-quick-jump" - ) - ((= v1-30 (board-tricks darkjak-smack)) - "darkjak-smack" - ) - ((= v1-30 (board-tricks board-noseflip)) - "board-noseflip" - ) - ((= v1-30 (board-tricks darkjak-bomb1)) - "darkjak-bomb1" - ) - ((= v1-30 (board-tricks board-jump)) - "board-jump" - ) - ((= v1-30 (board-tricks board-flip)) - "board-flip" - ) - (else - "*unknown*" - ) - ) + trick-name + arg1 s4-0 + (lerp-scale 1.0 0.1 (the float s4-0) 2.0 6.0) s3-1 ) ) - (when (nonzero? (-> this trick-count)) - (format #t " + combo ~,,0f" (-> this trick-points-array (+ (-> this trick-count) -1))) - (+! (-> this trick-points-array (+ (-> this trick-count) -1)) - (-> this trick-points-array (+ (-> this trick-count) -1)) - ) - ) - (format #t "~%") - (set! (-> this trick-array (-> this trick-count)) arg0) - (set! (-> this trick-points-array (-> this trick-count)) s3-1) + ;; og:preserve-this jetboard trick tracker + (let ((total-points s3-1)) + (when (nonzero? (-> this trick-count)) + (format #t " + combo ~,,0f" (-> this trick-points-array (+ (-> this trick-count) -1))) + (+! total-points (-> this trick-points-array (+ (-> this trick-count) -1))) + (+! (-> this trick-points-array (+ (-> this trick-count) -1)) + (-> this trick-points-array (+ (-> this trick-count) -1)) + ) + ) + (format #t "~%") + (set! (-> this trick-array (-> this trick-count)) arg0) + (set! (-> this trick-points-array (-> this trick-count)) s3-1) + (#when PC_PORT + (add-trick-to-combo! *board-trick-tracker* arg0 total-points))) ) ) (+! (-> this trick-count) 1) @@ -3102,7 +3111,9 @@ ) (send-event (ppointer->process (-> this process)) 'get-pickup (pickup-type trick-point) f30-0) (sound-play "trick-score") - ) + ;; og:preserve-this jetboard trick tracker + (#when PC_PORT + (end-combo! *board-trick-tracker*))) ) (set! (-> this trick-count) 0) 0 diff --git a/goal_src/jak3/engine/ui/text-h.gc b/goal_src/jak3/engine/ui/text-h.gc index ffd592fe6a..6f4ed4e613 100644 --- a/goal_src/jak3/engine/ui/text-h.gc +++ b/goal_src/jak3/engine/ui/text-h.gc @@ -1553,25 +1553,7 @@ (progress-fps-disclaimer-warning #x1314) (progress-fps-disclaimer #x1315) (progress-highscores-local-score #x1316) - (trick-board-none #x1320) - (trick-board-spin #x1321) - (trick-board-boost #x1322) - (trick-board-flip #x1323) - (trick-board-rail #x1324) - (trick-board-rail-jump #x1325) - (trick-board-nosegrab #x1326) - (trick-board-method #x1327) - (trick-board-board-spin #x1328) - (trick-board-board-flip #x1329) - (trick-board-noseflip #x132a) - (trick-board-kickflip #x132b) - (trick-board-jump #x132c) - (trick-board-duck-jump #x132d) - (trick-board-quick-jump #x132e) - (trick-darkjak #x132f) - (trick-darkjak-bomb0 #x1330) - (trick-darkjak-bomb1 #x1331) - (trick-darkjak-giant #x1332) + ;; gap here if you want to use it (progress-graphics-ps2 #x1333) (progress-graphics-actor-culling #x1334) (progress-graphics-force-envmap #x1335) @@ -1601,6 +1583,36 @@ (progress-misc-fix-projectile-focus #x134d) (progress-controller-options-pacman-dpad #x134e) (progress-controller-options-analog-sensitivity #x134f) + (trick-board-none #x1350) + (trick-board-board-spin #x1351) + (trick-board-board-boost #x1352) + (trick-board-board-flip #x1353) + (trick-board-board-rail #x1354) + (trick-board-board-rail-jump #x1355) + (trick-board-board-nosegrab #x1356) + (trick-board-board-board-spin #x1357) + (trick-board-board-board-flip #x1358) + (trick-board-board-noseflip #x1359) + (trick-board-board-kickflip #x135a) + (trick-board-board-kickspin #x135b) + (trick-board-board-method #x135c) + (trick-board-board-method-cross #x135d) + (trick-board-board-backgrab #x135e) + (trick-board-board-airwalk #x135f) + (trick-board-board-jump #x1360) + (trick-board-board-duck-jump #x1361) + (trick-board-board-quick-jump #x1362) + (trick-board-darkjak #x1363) + (trick-board-darkjak-bomb0 #x1364) + (trick-board-darkjak-bomb1 #x1365) + (trick-board-darkjak-smack #x1366) + (trick-board-darkjak-tracking #x1367) + (trick-board-lightjak #x1368) + (trick-board-lightjak-regen #x1369) + (trick-board-lightjak-swoop #x136a) + (trick-board-lightjak-freeze #x136b) + (trick-board-lightjak-shield #x136c) + ) ;; ---text-id diff --git a/goal_src/jak3/levels/city/ctywide-obs.gc b/goal_src/jak3/levels/city/ctywide-obs.gc index 43db5dba18..d6efbcbad8 100644 --- a/goal_src/jak3/levels/city/ctywide-obs.gc +++ b/goal_src/jak3/levels/city/ctywide-obs.gc @@ -2769,6 +2769,17 @@ (none) ) + +;; og:preserve-this override to increase stack for jetboard trick tracker +(defmethod init! ((this task-manager-bbush-board)) + (stack-size-set! (-> this main-thread) 1024) + (let ((t9-0 (method-of-type task-manager init!))) + (t9-0 this) + ) + 0 + (none) + ) + (defmethod set-time-limit ((this task-manager-bbush-board)) (let ((t9-0 (method-of-type task-manager set-time-limit))) (t9-0 this) diff --git a/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc b/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc index cbf06402de..12673c8779 100644 --- a/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc +++ b/goal_src/jak3/levels/wascity/wasstadium/wasstadb-obs.gc @@ -1124,6 +1124,8 @@ ) (defmethod init! ((this task-manager-arena-training)) + ;; og:preserve-this increase stack for jetboard trick tracker + (stack-size-set! (-> this main-thread) 1024) (let ((t9-0 (method-of-type task-manager init!))) (t9-0 this) )