mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-09 20:21:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v/format-jak1

Browse Source
This commit is contained in:
Tyler Wilding
2024-06-05 21:01:53 -04:00
parent c528cf9ec3 37762c5fb7
commit 209a997717
184 changed files with 27805 additions and 27243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/CMakeLists.txt
+1 -1
View File
@@ -51,7 +51,7 @@ add_library(common
repl/config.cpp
repl/nrepl/ReplClient.cpp
repl/nrepl/ReplServer.cpp
repl/util.cpp
repl/repl_wrapper.cpp
serialization/subtitles/subtitles_v1.cpp
serialization/subtitles/subtitles_v2.cpp
serialization/subtitles/subtitles.cpp
common/cross_sockets/XSocketClient.cpp
+2 -2
View File
@@ -5,6 +5,8 @@
#include "common/cross_sockets/XSocket.h"
#include "common/log/log.h"
#include "fmt/core.h"
// clang-format off
#ifdef _WIN32
#define NOMINMAX
@@ -13,9 +15,7 @@
#include <WinSock2.h>
#include <WS2tcpip.h>
#endif
#include "common/repl/nrepl/ReplServer.h"
#include "fmt/core.h"
// clang-format on
XSocketClient::XSocketClient(int _tcp_port) {
common/cross_sockets/XSocketServer.cpp
+12 -4
View File
@@ -35,7 +35,7 @@ void XSocketServer::shutdown_server() {
close_server_socket();
}
bool XSocketServer::init_server() {
bool XSocketServer::init_server(bool failure_may_occur) {
listening_socket = open_socket(AF_INET, SOCK_STREAM, 0);
if (listening_socket < 0) {
listening_socket = -1;
@@ -76,19 +76,27 @@ bool XSocketServer::init_server() {
addr.sin_port = htons(tcp_port);
if (bind(listening_socket, (sockaddr*)&addr, sizeof(addr)) < 0) {
lg::error("[XSocketServer:{}] failed to bind", tcp_port);
if (failure_may_occur) {
lg::debug("[XSocketServer:{}] failed to bind", tcp_port);
} else {
lg::error("[XSocketServer:{}] failed to bind", tcp_port);
}
close_server_socket();
return false;
}
if (listen(listening_socket, 0) < 0) {
lg::error("[XSocketServer:{}] failed to listen", tcp_port);
if (failure_may_occur) {
lg::debug("[XSocketServer:{}] failed to listen", tcp_port);
} else {
lg::error("[XSocketServer:{}] failed to listen", tcp_port);
}
close_server_socket();
return false;
}
server_initialized = true;
lg::info("[XSocketServer:{}] initialized", tcp_port);
lg::debug("[XSocketServer:{}] initialized", tcp_port);
post_init();
return true;
}
common/cross_sockets/XSocketServer.h
+1 -1
View File
@@ -20,7 +20,7 @@ class XSocketServer {
XSocketServer(const XSocketServer&) = delete;
XSocketServer& operator=(const XSocketServer&) = delete;
bool init_server();
bool init_server(bool failure_may_occur = false);
void shutdown_server();
void close_server_socket();
common/custom_data/TFrag3Data.cpp
+1
View File
@@ -492,6 +492,7 @@ void MercDraw::serialize(Serializer& ser) {
ser.from_ptr(&first_index);
ser.from_ptr(&index_count);
ser.from_ptr(&num_triangles);
ser.from_ptr(&no_strip);
}
void Blerc::serialize(Serializer& ser) {
common/custom_data/Tfrag3Data.h
+3 -1
View File
@@ -18,7 +18,7 @@ namespace tfrag3 {
// - if changing any large things (vertices, vis, bvh, colors, textures) update get_memory_usage
// - if adding a new category to the memory usage, update extract_level to print it.
constexpr int TFRAG3_VERSION = 40;
constexpr int TFRAG3_VERSION = 41;
enum MemoryUsageCategory {
TEXTURE,
@@ -530,6 +530,8 @@ struct MercDraw {
u32 first_index;
u32 index_count;
u32 num_triangles;
// no strip hack for custom models
bool no_strip = false;
void serialize(Serializer& ser);
};
common/goos/Reader.cpp
-1
View File
@@ -12,7 +12,6 @@
#include "Reader.h"
#include "common/log/log.h"
#include "common/repl/util.h"
#include "common/util/FileUtil.h"
#include "common/util/FontUtils.h"
common/goos/Reader.h
+1 -1
View File
@@ -18,7 +18,7 @@
#include "common/goos/Object.h"
#include "common/goos/TextDB.h"
#include "common/repl/util.h"
#include "common/repl/repl_wrapper.h"
#include "common/util/Assert.h"
namespace goos {
common/log/log.cpp
+3 -3
View File
@@ -163,7 +163,7 @@ void set_file(const std::string& filename,
file_util::find_files_in_dir(fs::path(complete_filename).parent_path(),
std::regex(fmt::format("{}\\.(\\d\\.)?log", filename)));
for (const auto& file : old_log_files) {
lg::info("removing {}", file.string());
lg::debug("removing {}", file.string());
fs::remove(file);
}
// remove the oldest log file if there are more than LOG_ROTATE_MAX
@@ -172,9 +172,9 @@ void set_file(const std::string& filename,
// sort the names and remove them
existing_log_files = file_util::sort_filepaths(existing_log_files, true);
if (existing_log_files.size() > (LOG_ROTATE_MAX - 1)) {
lg::info("removing {} log files", existing_log_files.size() - (LOG_ROTATE_MAX - 1));
lg::debug("removing {} log files", existing_log_files.size() - (LOG_ROTATE_MAX - 1));
for (int i = 0; i < (int)existing_log_files.size() - (LOG_ROTATE_MAX - 1); i++) {
lg::info("removing {}", existing_log_files.at(i).string());
lg::debug("removing {}", existing_log_files.at(i).string());
fs::remove(existing_log_files.at(i));
}
}
common/repl/config.cpp
+9
View File
@@ -7,15 +7,21 @@
namespace REPL {
void to_json(json& j, const Config& obj) {
j = json{
{"nreplPort", obj.nrepl_port},
{"gameVersionFolder", obj.game_version_folder},
{"numConnectToTargetAttempts", obj.target_connect_attempts},
{"asmFileSearchDirs", obj.asm_file_search_dirs},
{"keybinds", obj.keybinds},
{"perGameHistory", obj.per_game_history},
{"permissiveRedefinitions", obj.permissive_redefinitions},
};
}
void from_json(const json& j, Config& obj) {
// TODO - make a camelCase variant of json_serialize/deserialize macros
if (j.contains("nreplPort")) {
j.at("nreplPort").get_to(obj.nrepl_port);
}
if (j.contains("gameVersionFolder")) {
j.at("gameVersionFolder").get_to(obj.game_version_folder);
}
@@ -55,6 +61,9 @@ void from_json(const json& j, Config& obj) {
if (j.contains("perGameHistory")) {
j.at("perGameHistory").get_to(obj.per_game_history);
}
if (j.contains("permissiveRedefinitions")) {
j.at("permissiveRedefinitions").get_to(obj.permissive_redefinitions);
}
// if there is game specific configuration, override any values we just set
if (j.contains(version_to_game_name(obj.game_version))) {
from_json(j.at(version_to_game_name(obj.game_version)), obj);
common/repl/config.h
+11
View File
@@ -26,11 +26,14 @@ struct KeyBind {
void to_json(json& j, const KeyBind& obj);
void from_json(const json& j, KeyBind& obj);
// TODO - per-game config
struct Config {
GameVersion game_version;
Config(GameVersion _game_version) : game_version(_game_version){};
// this is the default REPL configuration
int nrepl_port = 8181;
int temp_nrepl_port = -1;
std::string game_version_folder;
int target_connect_attempts = 30;
std::vector<std::string> asm_file_search_dirs = {};
@@ -45,6 +48,14 @@ struct Config {
{KeyBind::Modifier::CTRL, "B", "Displays the most recently caught backtrace", "(:di)"},
{KeyBind::Modifier::CTRL, "N", "Full build of the game", "(mi)"}};
bool per_game_history = true;
bool permissive_redefinitions = false;
int get_nrepl_port() {
if (temp_nrepl_port != -1) {
return temp_nrepl_port;
}
return nrepl_port;
}
};
void to_json(json& j, const Config& obj);
void from_json(const json& j, Config& obj);
common/repl/nrepl/ReplServer.cpp
+60 -29
View File
@@ -27,7 +27,18 @@ ReplServer::~ReplServer() {
void ReplServer::post_init() {
// Add the listening socket to our set of sockets
lg::info("[nREPL:{}:{}] awaiting connections", tcp_port, listening_socket);
lg::debug("[nREPL:{}:{}] awaiting connections", tcp_port, listening_socket);
}
void ReplServer::error_response(int socket, const std::string& error) {
std::string msg = fmt::format("[ERROR]: {}", error);
auto resp = write_to_socket(socket, msg.c_str(), msg.size());
if (resp == -1) {
lg::warn("[nREPL:{}] Client Disconnected: {}", tcp_port, address_to_string(addr),
ntohs(addr.sin_port), socket);
close_socket(socket);
client_sockets.erase(socket);
}
}
void ReplServer::ping_response(int socket) {
@@ -48,7 +59,6 @@ std::optional<std::string> ReplServer::get_msg() {
// Add the server's main listening socket (where we accept clients from)
FD_SET(listening_socket, &read_sockets);
int max_sd = listening_socket;
for (const int& sock : client_sockets) {
if (sock > max_sd) {
@@ -60,12 +70,11 @@ std::optional<std::string> ReplServer::get_msg() {
}
// Wait for activity on _something_, with a timeout so we don't get stuck here on exit.
struct timeval timeout;
timeout.tv_sec = 0;
timeout.tv_usec = 100000;
struct timeval timeout = {0, 100000};
auto activity = select(max_sd + 1, &read_sockets, NULL, NULL, &timeout);
if (activity < 0) { // TODO - || error!
if (activity < 0 && errno != EINTR) {
lg::error("[nREPL:{}] select error, returned: {}, errno: {}", tcp_port, activity,
strerror(errno));
return std::nullopt;
}
@@ -74,44 +83,46 @@ std::optional<std::string> ReplServer::get_msg() {
socklen_t addr_len = sizeof(addr);
auto new_socket = accept_socket(listening_socket, (sockaddr*)&addr, &addr_len);
if (new_socket < 0) {
// TODO - handle error
if (new_socket != -1) {
lg::error("[nREPL:{}] accept error, returned: {}, errono: {}", tcp_port, new_socket,
strerror(errno));
}
} else {
lg::info("[nREPL:{}]: New socket connection: {}:{}:{}", tcp_port, address_to_string(addr),
ntohs(addr.sin_port), new_socket);
// Say hello
ping_response(new_socket);
// Track the new socket
if ((int)client_sockets.size() < max_clients) {
client_sockets.insert(new_socket);
} else {
// TODO - Respond with NO
// Respond with NO and close the socket
lg::warn("[nREPL:{}]: Maximum clients reached. Rejecting connection.", tcp_port);
error_response(new_socket, "Maximum clients reached. Rejecting connection.");
close_socket(new_socket);
}
}
}
// otherwise (and no matter what) check all the clients to see if they have sent us anything
// else its some IO operation on some other socket
//
// RACE - the first client wins
// TODO - there are ways to do this with iterators but, couldn't figure it out!
std::vector<int> sockets_to_scan(client_sockets.begin(), client_sockets.end());
for (const int& sock : sockets_to_scan) {
// Check all clients for activity
for (auto it = client_sockets.begin(); it != client_sockets.end();) {
int sock = *it;
if (FD_ISSET(sock, &read_sockets)) {
// Attempt to read a header
// TODO - should this be in a loop?
auto req_bytes = read_from_socket(sock, header_buffer.data(), header_buffer.size());
if (req_bytes == 0) {
// Socket disconnected
if (req_bytes <= 0) {
// TODO - add a queue of messages in the REPL::Wrapper so we can print _BEFORE_ the prompt
// is output
lg::warn("[nREPL:{}] Client Disconnected: {}", tcp_port, address_to_string(addr),
ntohs(addr.sin_port), sock);
if (req_bytes == 0) {
lg::warn("[nREPL:{}] Client Disconnected: {}", tcp_port, address_to_string(addr));
} else {
lg::warn("[nREPL:{}] Error reading from socket on {}: {}", tcp_port,
address_to_string(addr), strerror(errno));
}
// Cleanup the socket and remove it from our set
close_socket(sock);
client_sockets.erase(sock);
it = client_sockets.erase(it); // Erase and move to the next element
continue;
} else {
// Otherwise, process the message
auto* header = (ReplServerHeader*)(header_buffer.data());
@@ -119,7 +130,12 @@ std::optional<std::string> ReplServer::get_msg() {
int expected_size = header->length;
int got = 0;
int tries = 0;
bool skip_to_next_socket = false;
while (got < expected_size) {
if (want_exit_callback()) {
lg::warn("[nREPL:{}] Terminating nREPL early", tcp_port);
return std::nullopt;
}
tries++;
if (tries > 100) {
break;
@@ -131,11 +147,25 @@ std::optional<std::string> ReplServer::get_msg() {
tcp_port, got, expected_size, buffer.size());
return std::nullopt;
}
auto x = read_from_socket(sock, buffer.data() + got, expected_size - got);
if (want_exit_callback()) {
return std::nullopt;
auto bytes_read = read_from_socket(sock, buffer.data() + got, expected_size - got);
if (bytes_read <= 0) {
if (bytes_read == 0) {
lg::warn("[nREPL:{}] Client Disconnected: {}", tcp_port, address_to_string(addr));
} else {
lg::warn("[nREPL:{}] Error reading from socket on {}: {}", tcp_port,
address_to_string(addr), strerror(errno));
}
close_socket(sock);
it = client_sockets.erase(it); // Erase and move to the next element
skip_to_next_socket = true;
break;
}
got += x > 0 ? x : 0;
got += bytes_read;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
if (skip_to_next_socket) {
continue;
}
switch (header->type) {
@@ -149,6 +179,7 @@ std::optional<std::string> ReplServer::get_msg() {
}
}
}
++it;
}
return std::nullopt;
}
common/repl/nrepl/ReplServer.h
+1
View File
@@ -27,5 +27,6 @@ class ReplServer : public XSocketServer {
fd_set read_sockets;
std::set<int> client_sockets = {};
void error_response(int socket, const std::string& error);
void ping_response(int socket);
};
common/repl/util.cpp → common/repl/repl_wrapper.cpp
+65 -31
View File
@@ -1,4 +1,4 @@
#include "util.h"
#include "repl_wrapper.h"
#include "common/util/FileUtil.h"
#include "common/util/json_util.h"
@@ -8,36 +8,66 @@
#include "fmt/color.h"
#include "fmt/core.h"
#include "third-party/replxx/include/replxx.hxx"
// TODO - expand a list of hints (ie. a hint for defun to show at a glance how to write a function,
// or perhaps, show the docstring for the current function being used?)
namespace REPL {
void Wrapper::clear_screen() {
repl.clear_screen();
}
void Wrapper::print_welcome_message() {
// TODO - dont print on std-out
// Welcome message / brief intro for documentation
std::string ascii;
ascii += " _____ _____ _____ _____ __ \n";
ascii += "| |___ ___ ___| __| | _ | | \n";
ascii += "| | | . | -_| | | | | | | |__ \n";
ascii += "|_____| _|___|_|_|_____|_____|__|__|_____|\n";
ascii += " |_| \n";
fmt::print(fmt::emphasis::bold | fg(fmt::color::orange), ascii);
fmt::print("Welcome to OpenGOAL {}.{}!\n", versions::GOAL_VERSION_MAJOR,
versions::GOAL_VERSION_MINOR);
fmt::print("Run {} or {} for help with common commands and REPL usage.\n",
fmt::styled("(repl-help)", fmt::emphasis::bold | fg(fmt::color::cyan)),
fmt::styled("(repl-keybinds)", fmt::emphasis::bold | fg(fmt::color::cyan)));
fmt::print("Run ");
fmt::print(fmt::emphasis::bold | fg(fmt::color::cyan), "(lt)");
fmt::print(" to connect to the local target.\n");
fmt::print("Run ");
fmt::print(fmt::emphasis::bold | fg(fmt::color::cyan), "(mi)");
fmt::print(" to rebuild the entire game.\n\n");
void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_projects) {
std::string message;
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " ..:::::..\n");
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .:-----------:.\n");
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-----.");
message += fmt::format(fmt::emphasis::bold, " Welcome to OpenGOAL {}.{} [{}]",
versions::GOAL_VERSION_MAJOR, versions::GOAL_VERSION_MINOR,
fmt::format(fg(fmt::color::gray), "{}", build_revision()));
if (!username.empty() && username != "#f" && username != "unknown") {
message += fmt::format(fg(fmt::color::light_green), " {}", username);
}
message += "!\n";
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .---.");
if (repl_config.game_version == GameVersion::Jak1) {
message += fmt::format(" [{}]: ", fmt::format(fg(fmt::color::orange), "jak1"));
} else if (repl_config.game_version == GameVersion::Jak2) {
message += fmt::format(" [{}]: ", fmt::format(fg(fmt::color::purple), "jak2"));
} else if (repl_config.game_version == GameVersion::Jak3) {
message += fmt::format(" [{}]: ", fmt::format(fg(fmt::color::gold), "jak3"));
} else {
message += fmt::format(" [{}]: ", fmt::format(fg(fmt::color::magenta), "jakx"));
}
const auto loaded_projects_str = fmt::format("{}", fmt::join(loaded_projects, ","));
message += fmt::format(fg(fmt::color::gray), "{}\n", loaded_projects_str);
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " . --- .");
message +=
fmt::format(" Project Path: {}\n",
fmt::format(fg(fmt::color::gray), file_util::get_jak_project_dir().string()));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " - :===: -");
message += " nREPL:";
if (!nrepl_alive) {
message += fmt::format(fg(fmt::color::red), "DISABLED\n");
} else {
message += fmt::format(fg(fmt::color::light_green), " Listening on {}\n",
repl_config.get_nrepl_port());
}
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " --. .--: :--. .--");
message += " Source File Search Dirs: ";
const auto search_dir_string =
fmt::format("{}", fmt::join(repl_config.asm_file_search_dirs, ","));
message += fmt::format("[{}]\n", fmt::format(fg(fmt::color::gray), search_dir_string));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .=======. =======.");
message += fmt::format(" {} or {} for basic help and usage\n",
fmt::format(fg(fmt::color::cyan), "(repl-help)"),
fmt::format(fg(fmt::color::cyan), "(repl-keybinds)"));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-=====-. .-=====-");
message +=
fmt::format(" {} to connect to the game\n", fmt::format(fg(fmt::color::cyan), "(lt)"));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-===========-.");
message += fmt::format(" {} to recompile the active project.\n",
fmt::format(fg(fmt::color::cyan), "(mi)"));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-===-.\n");
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .\n");
fmt::print("{}", message);
}
void Wrapper::print_to_repl(const std::string& str) {
@@ -242,20 +272,24 @@ StartupFile load_user_startup_file(const std::string& username, const GameVersio
return startup_file;
}
REPL::Config load_repl_config(const std::string& username, const GameVersion game_version) {
REPL::Config load_repl_config(const std::string& username,
const GameVersion game_version,
const int nrepl_port) {
auto repl_config_path =
file_util::get_jak_project_dir() / "goal_src" / "user" / username / "repl-config.json";
REPL::Config loaded_config(game_version);
if (file_util::file_exists(repl_config_path.string())) {
try {
REPL::Config config(game_version);
auto repl_config_data =
parse_commented_json(file_util::read_text_file(repl_config_path), "repl-config.json");
from_json(repl_config_data, config);
return config;
from_json(repl_config_data, loaded_config);
loaded_config.temp_nrepl_port = nrepl_port;
return loaded_config;
} catch (std::exception& e) {
REPL::Config config(game_version);
// do nothing
}
}
return REPL::Config(game_version);
loaded_config.temp_nrepl_port = nrepl_port;
return loaded_config;
}
} // namespace REPL
common/repl/util.h → common/repl/repl_wrapper.h
+11 -6
View File
@@ -17,18 +17,20 @@ struct StartupFile {
};
class Wrapper {
replxx::Replxx repl;
public:
std::string username;
Config repl_config;
StartupFile startup_file;
bool nrepl_alive = false;
std::vector<std::string> examples{};
std::vector<std::pair<std::string, replxx::Replxx::Color>> regex_colors{};
Wrapper(GameVersion version) : repl_config(version) {}
Wrapper(const std::string& _username, const Config& config, const StartupFile& startup)
: username(_username), repl_config(config), startup_file(startup) {}
Wrapper(const std::string& _username,
const Config& config,
const StartupFile& startup,
bool nrepl_alive)
: username(_username), repl_config(config), startup_file(startup), nrepl_alive(nrepl_alive) {}
replxx::Replxx& get_repl() { return repl; }
void init_settings();
void reload_startup_file();
@@ -36,7 +38,7 @@ class Wrapper {
// Functionality / Commands
void clear_screen();
void print_to_repl(const std::string& str);
void print_welcome_message();
void print_welcome_message(const std::vector<std::string>& loaded_projects);
void set_history_max_size(size_t len);
const char* readline(const std::string& prompt);
void add_to_history(const std::string& line);
@@ -47,11 +49,14 @@ class Wrapper {
std::pair<std::string, bool> get_current_repl_token(std::string const& context);
private:
replxx::Replxx repl;
replxx::Replxx::key_press_handler_t commit_text_action(std::string text_to_commit);
std::vector<REPL::KeyBind> keybindings = {};
};
std::string find_repl_username();
StartupFile load_user_startup_file(const std::string& username, const GameVersion game_version);
REPL::Config load_repl_config(const std::string& username, const GameVersion game_version);
REPL::Config load_repl_config(const std::string& username,
const GameVersion game_version,
const int nrepl_port);
} // namespace REPL
common/serialization/subtitles/subtitles_v2.cpp
+3 -1
View File
@@ -89,7 +89,9 @@ const std::unordered_map<std::string, u16> jak2_speaker_name_to_enum_val = {
{"citizen-male", 31},
{"citizen-female", 32},
{"oracle", 33},
{"precursor", 34}};
{"precursor", 34},
{"metalkor-before-consite", 35},
{"metalkor-intro", 36}};
GameSubtitlePackage read_json_files_v2(const GameSubtitleDefinitionFile& file_info) {
GameSubtitlePackage package;
common/util/FileUtil.cpp
+16 -8
View File
@@ -185,9 +185,11 @@ std::optional<std::string> try_get_jak_project_path() {
return try_get_project_path_from_path(get_current_executable_path());
}
std::optional<fs::path> try_get_data_dir() {
std::optional<fs::path> try_get_data_dir(bool skip_logs) {
fs::path my_path = get_current_executable_path();
lg::info("Current executable directory - {}", my_path.string());
if (!skip_logs) {
lg::debug("Current executable directory - {}", my_path.string());
}
auto data_dir = my_path.parent_path() / "data";
if (fs::exists(data_dir) && fs::is_directory(data_dir)) {
return std::make_optional(data_dir);
@@ -196,7 +198,7 @@ std::optional<fs::path> try_get_data_dir() {
}
}
bool setup_project_path(std::optional<fs::path> project_path_override) {
bool setup_project_path(std::optional<fs::path> project_path_override, bool skip_logs) {
if (g_file_path_info.initialized) {
return true;
}
@@ -204,16 +206,20 @@ bool setup_project_path(std::optional<fs::path> project_path_override) {
if (project_path_override) {
g_file_path_info.path_to_data_folder = fs::absolute(project_path_override.value());
g_file_path_info.initialized = true;
lg::info("Using explicitly set project path: {}",
g_file_path_info.path_to_data_folder.string());
if (!skip_logs) {
lg::debug("Using explicitly set project path: {}",
g_file_path_info.path_to_data_folder.string());
}
return true;
}
auto data_path = try_get_data_dir();
auto data_path = try_get_data_dir(skip_logs);
if (data_path) {
g_file_path_info.path_to_data_folder = *data_path;
g_file_path_info.initialized = true;
lg::info("Using data path: {}", data_path->string());
if (!skip_logs) {
lg::debug("Using data path: {}", data_path->string());
}
return true;
}
@@ -221,7 +227,9 @@ bool setup_project_path(std::optional<fs::path> project_path_override) {
if (development_repo_path) {
g_file_path_info.path_to_data_folder = *development_repo_path;
g_file_path_info.initialized = true;
lg::info("Using development repo path: {}", *development_repo_path);
if (!skip_logs) {
lg::debug("Using development repo path: {}", *development_repo_path);
}
return true;
}
common/util/FileUtil.h
+1 -1
View File
@@ -43,7 +43,7 @@ bool create_dir_if_needed_for_file(const std::string& path);
bool create_dir_if_needed_for_file(const fs::path& path);
std::string get_current_executable_path();
std::optional<std::string> try_get_project_path_from_path(const std::string& path);
bool setup_project_path(std::optional<fs::path> project_path_override);
bool setup_project_path(std::optional<fs::path> project_path_override, bool skip_logs = false);
void override_user_config_dir(fs::path user_config_dir_override,
bool use_overridden_config_dir_for_saves);
std::string get_file_path(const std::vector<std::string>& path);
common/util/FontUtils.cpp
+3
View File
@@ -985,6 +985,8 @@ static std::vector<ReplaceInfo> s_replace_info_jak2 = {
{"o~Y~-26H~-4V'~Z", "ó"},
{"U~Y~-24H~-3V'~Z", "Ú"},
{"u~Y~-24H~-3V'~Z", "ú"},
{"Z~Y~-24H~-3V'~Z", "Ź"},
{"z~Y~-24H~-3V'~Z", "ź"},
// circumflex
{"A~Y~-20H~-4V^~Z", "Â"},
@@ -1015,6 +1017,7 @@ static std::vector<ReplaceInfo> s_replace_info_jak2 = {
{"a~Y~-25H~-5V¨~Z", "ä"},
{"E~Y~-20H~-5V¨~Z", "Ë"},
{"I~Y~-19H~-5V¨~Z", "Ï"},
{"i~Y~-26H~-4V¨~Z", "ï"},
{"O~Y~-26H~-8V¨~Z", "Ö"},
{"o~Y~-26H~-4V¨~Z", "ö"},
{"U~Y~-25H~-8V¨~Z", "Ü"},
custom_assets/jak1/models/test-actor.glb
BIN
View File
Binary file not shown.
decompiler/config/jak1/all-types.gc
+10 -10
View File
@@ -22303,20 +22303,20 @@
;; - Functions
(define-extern calculate-rotation-and-color-for-slice (function int float int int int hud-particle none))
(define-extern part-hud-health-01-func (function basic basic hud-particle none)) ;; TODO - i figured this out on another branch...all these particle functions get called by the particle system with the same beginning types iirc
(define-extern part-hud-health-02-func (function basic basic hud-particle none))
(define-extern part-hud-health-03-func (function basic basic hud-particle none))
(define-extern calculate-rotation-and-color-for-slice (function int float int int int matrix none))
(define-extern part-hud-health-01-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-health-02-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-health-03-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern fuel-cell-hud-orbit-callback (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern fuel-cell-hud-starburst-3-callback (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern fuel-cell-hud-starburst-4-callback (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern fuel-cell-hud-center-callback (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-buzzer-func (function basic basic hud-particle none))
(define-extern part-hud-eco-timer-01-func (function basic basic hud-particle none))
(define-extern part-hud-eco-timer-02-func (function basic basic hud-particle none))
(define-extern part-hud-eco-timer-03-func (function basic basic hud-particle none))
(define-extern part-hud-eco-timer-backing-func (function basic basic hud-particle none))
(define-extern part-hud-eco-timer-func (function basic basic hud-particle none))
(define-extern part-hud-buzzer-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-eco-timer-01-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-eco-timer-02-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-eco-timer-03-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-eco-timer-backing-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern part-hud-eco-timer-func (function sparticle-system sparticle-cpuinfo matrix none))
(define-extern show-hud (function none))
;; - Unknowns
decompiler/config/jak3/all-types.gc
+157 -167
View File
@@ -7555,37 +7555,27 @@
:type uint32
:bitfield #t
(lf0 0)
(lf1 1)
(lf2 2)
(lf3 3)
(lf4 4)
(lf5 5)
(lf6 6)
(lf7 7)
(lf8 8)
(lf9 9)
(not-physical 1)
(ctycar 2)
(ctypes 3)
(external 4)
(title 5)
(borrow-load 6)
(end-mode 7)
(flut 8)
(sky 9)
(use-camera-other 10)
(lf11 11)
(lf12 12)
(lf13 13)
(display-wait 11)
(ocean-near-translucent 12)
(ocean-far 13)
(low-res-hfrag 14)
(lf15 15)
(lf16 16)
(lf17 17)
(lf18 18)
(lf19 19)
(lf20 20)
(city-borrow-available 15)
(mech 16)
(allow-unloaded 17)
(check-taskname-for-continue 18)
(city-borrow-high-priority 19)
(ocean-all 20)
(desert 21)
(lf22 22)
(lf23 23)
(lf24 24)
(lf25 25)
(lf26 26)
(lf27 27)
(lf28 28)
(lf29 29)
(lf30 30)
(lf31 31)
)
;; ---level-h:level-flags
@@ -9115,18 +9105,18 @@
(credits-03a1 #x03a1)
(credits-03b5 #x03b5)
(credits-03be #x03be)
(text-03bf #x03bf)
(text-03c0 #x03c0)
(text-03c1 #x03c1)
(text-03c2 #x03c2)
(text-03c3 #x03c3)
(text-03c4 #x03c4)
(text-03c5 #x03c5)
(text-03c6 #x03c6)
(text-03c7 #x03c7)
(scatter-gun #x03bf)
(blaster #x03c0)
(vulcan-fury #x03c1)
(peace-maker #x03c2)
(stadium #x03c3)
(class-1-reverse #x03c4)
(class-2-reverse #x03c5)
(class-3-reverse #x03c6)
(peace-maker-gun-course #x03c7)
(progress-missions-todo-icon #x03c8)
(progress-missions-complete-icon #x03c9)
(text-03d1 #x03d1)
(blaster-training-peace-maker-training #x03d1)
(credits-03e4 #x03e4)
(credits-03e5 #x03e5)
(credits-03e7 #x03e7)
@@ -9144,13 +9134,13 @@
(credits-0401 #x0401)
(credits-0403 #x0403)
(credits-0404 #x0404)
(text-0408 #x0408)
(text-0409 #x0409)
(text-040a #x040a)
(text-040b #x040b)
(text-040c #x040c)
(text-040d #x040d)
(text-040e #x040e)
(press-to-jump #x0408)
(roll-how-to #x0409)
(double-jump-how-to #x040a)
(press-or-to-attack #x040b)
(roll-jump-how-to #x040c)
(ground-pound-how-to #x040d)
(high-jump-how-to #x040e)
(credits-040f #x040f)
(progress-missions-mine-explore #x0443)
(progress-missions-mine-blow #x0444)
@@ -9560,12 +9550,12 @@
(progress-controls-lightjak-wings #x06ba)
(empty-string #x06bb)
(progress-demo-return-to-title #x06bc)
(text-06bd #x06bd)
(text-06bd #x06bd) ;; "::" ?
(meet-old-friends #x06be)
(talk-to-torn-hq #x06bf)
(wascity-defend-return-to-spargus #x06c0)
(progress-audio-language #x06c1)
(text-06c2 #x06c2)
(text-06c2 #x06c2) ;; empty-string-2
(progress-inventory-v-turtle #x06c3)
(progress-inventory-v-snake #x06c4)
(progress-inventory-v-scorpion #x06c5)
@@ -9593,8 +9583,8 @@
(credits-06db #x06db)
(credits-06dc #x06dc)
(credits-06dd #x06dd)
(text-06de #x06de)
(text-06df #x06df)
(protect-civilians #x06de)
(activate-statue-by-punching-kicking-nose #x06df)
(progress-inventory-gun-red-1 #x06e0)
(progress-inventory-gun-red-2 #x06e1)
(progress-inventory-gun-red-3 #x06e2)
@@ -9611,14 +9601,14 @@
(progress-inventory-armor1 #x06ed)
(progress-inventory-armor2 #x06ee)
(progress-inventory-armor3 #x06ef)
(text-06f0 #x06f0)
(text-06f1 #x06f1)
(text-06f2 #x06f2)
(text-06f3 #x06f3)
(text-06f4 #x06f4)
(text-06f5 #x06f5)
(text-06f6 #x06f6)
(text-06f7 #x06f7)
(progress-inventory-tough-puppy #x06f0)
(progress-inventory-sand-shark #x06f1)
(progress-inventory-gila-stomper #x06f2)
(progress-inventory-dune-hopper #x06f3)
(progress-inventory-heat-seeker #x06f4)
(progress-inventory-slam-dozer #x06f5)
(progress-inventory-dust-demon #x06f6)
(progress-inventory-desert-screamer #x06f7)
(progress-inventory-board #x06f8)
(progress-inventory-artifact-invis #x06f9)
(progress-inventory-dark-strike #x06fa)
@@ -9626,9 +9616,9 @@
(progress-inventory-lightjak-freeze #x06fc)
(progress-inventory-lightjak-shield #x06fd)
(progress-inventory-lightjak-swoop #x06fe)
(text-06ff #x06ff)
(text-0700 #x0700)
(text-0701 #x0701)
(progress-inventory-first-war-amulet #x06ff)
(progress-inventory-second-war-amulet #x0700)
(progress-inventory-complete-war-amulet #x0701)
(progress-inventory-pass-wascity #x0702)
(progress-inventory-seal-of-mar #x0703)
(progress-inventory-pass-factory #x0704)
@@ -9640,9 +9630,9 @@
(progress-inventory-light-eco-crystal #x070a)
(progress-inventory-dark-eco-crystal #x070b)
(progress-inventory-eco-sphere #x070c)
(text-070d #x070d)
(text-070e #x070e)
(text-070f #x070f)
(progress-inventory-scatter-gun #x070d)
(progress-inventory-wave-concussor #x070e)
(progress-inventory-plasmite-rpg #x070f)
(credits-0710 #x0710)
(credits-0711 #x0711)
(credits-0712 #x0712)
@@ -9740,13 +9730,13 @@
(credits-0772 #x0772)
(credits-0773 #x0773)
(credits-0774 #x0774)
(text-0775 #x0775)
(text-0776 #x0776)
(map-data-unavailable #x0775)
(light-jak-shield-how-to #x0776)
(scene-catacomb-get-shield #x0778)
(text-0779 #x0779)
(press-to-use #x0779)
(mission-fail-marauders-escaped #x077a)
(text-077b #x077b)
(text-077c #x077c)
(press-to-grab-objects #x077b)
(press-to-throw-held-objects #x077c)
(credits-077d #x077d)
(credits-077e #x077e)
(credits-077f #x077f)
@@ -9792,22 +9782,22 @@
(credits-07b1 #x07b1)
(credits-07b2 #x07b2)
(progress-secrets-unlimited-turbos #x07b3)
(text-07b4 #x07b4)
(text-07b5 #x07b5)
(dark-strike-how-to #x07b4)
(vehicle-destroyed #x07b5)
(credits-07b6 #x07b6)
(progress-language-portuguese #x07b8)
(text-07b9 #x07b9)
(text-07ba #x07ba)
(text-07bb #x07bb)
(text-07bc #x07bc)
(text-07bd #x07bd)
(text-07be #x07be)
(text-07bf #x07bf)
(text-07c0 #x07c0)
(text-07c1 #x07c1)
(text-07c2 #x07c2)
(text-07c3 #x07c3)
(text-07c4 #x07c4)
(hold-to-increase-speed #x07b9)
(you-can-now-afford-to-purchase-new-secrets #x07ba)
(museum-jak-one #x07bb)
(museum-jak #x07bc)
(museum-jakc #x07bd)
(museum-daxter #x07be)
(museum-pecker #x07bf)
(museum-torn #x07c0)
(museum-ashelin #x07c1)
(museum-tess #x07c2)
(use-the-wave-concussor #x07c3)
(hold-to-charge-and-then-release-to-fire-bigger-blast #x07c4)
(credits-07c5 #x07c5)
(credits-07c6 #x07c6)
(progress-language-commentary #x07c7)
@@ -9815,36 +9805,36 @@
(credits-07c9 #x07c9)
(credits-07ca #x07ca)
(progress-inventory #x07cb)
(text-07cc #x07cc)
(text-07cd #x07cd)
(text-07ce #x07ce)
(text-07cf #x07cf)
(out-of-time #x07cc)
(total-rolls #x07cd)
(total-distance #x07ce)
(best-distance #x07cf)
(progress-footer-next-r1 #x07d0)
(progress-footer-prev-l1 #x07d1)
(progress-title-commentary #x07d2)
(text-07d3 #x07d3)
(text-07d4 #x07d4)
(progress-title-animator-commentary #x07d3)
(progress-title-creative-director-commentary #x07d4)
(progress-secrets-fast-movie #x07d5)
(progress-secrets-slow-movie #x07d6)
(text-07d7 #x07d7)
(text-07d8 #x07d8)
(progress-secrets-game-statistics #x07d7)
(progress-secrets-kleivers-diaper #x07d8)
(progress-secrets-red-ammo-capacity #x07d9)
(progress-secrets-yellow-ammo-capacity #x07da)
(progress-secrets-blue-ammo-capacity #x07db)
(progress-secrets-dark-ammo-capacity #x07dc)
(text-07dd #x07dd)
(progress-secrets-gravity-well-mod #x07dd)
(progress-secrets-gungame-ratchet #x07de)
(progress-secrets-endless-light #x07df)
(progress-secrets-bad-weather #x07e0)
(text-07e1 #x07e1)
(text-07e2 #x07e2)
(progress-secrets-fast-time-of-day #x07e1)
(progress-secrets-play-as-jak-ii #x07e2)
(progress-title-jak3-mdl-viewer #x07e3)
(progress-title-jak2-mdl-viewer #x07e4)
(progress-title-jak1-mdl-viewer #x07e5)
(text-07e6 #x07e6)
(text-07e7 #x07e7)
(text-07e8 #x07e8)
(text-07e9 #x07e9)
(press-to-play-wave-concussor-training #x07e6)
(press-to-play-beam-reflexor-training #x07e7)
(wave-concussor-training-ratchet-gun-course #x07e8)
(beam-reflexor-training-clank-gun-course #x07e9)
(progress-secrets-kleever-diaper #x07ea)
(credits-07eb #x07eb)
(credits-07ec #x07ec)
@@ -9857,24 +9847,24 @@
(credits-07f3 #x07f3)
(credits-07f4 #x07f4)
(credits-07f5 #x07f5)
(text-07f6 #x07f6)
(text-07f7 #x07f7)
(text-07f8 #x07f8)
(text-07f9 #x07f9)
(text-07fa #x07fa)
(text-07fb #x07fb)
(text-07fc #x07fc)
(text-07fd #x07fd)
(text-07fe #x07fe)
(text-07ff #x07ff)
(text-0800 #x0800)
(text-0801 #x0801)
(text-0802 #x0802)
(text-0803 #x0803)
(text-0804 #x0804)
(text-0805 #x0805)
(text-0806 #x0806)
(text-0807 #x0807)
(kills #x07f6)
(museum-kleever #x07f7)
(museum-samos #x07f8)
(museum-seem #x07f9)
(museum-keira #x07fa)
(museum-ottsel-dummy #x07fb)
(museum-ottsel-tess #x07fc)
(museum-sig #x07fd)
(museum-ottsel-leader #x07fe)
(museum-ottsel-surfer #x07ff)
(museum-ottsel-veger #x0800)
(museum-onin #x0801)
(museum-damus #x0802)
(museum-jinx #x0803)
(museum-cyber-errol #x0804)
(museum-veger #x0805)
(credits-starring #x0806)
(press-to-place-held-objects #x0807)
(progress-controls-pad-cross-square-cross #x0808)
(progress-controls-pad-l1-square #x0809)
(progress-controls-super-flop #x080a)
@@ -9889,43 +9879,43 @@
(credits-0813 #x0813)
(credits-0814 #x0814)
(credits-0815 #x0815)
(text-0816 #x0816)
(text-0817 #x0817)
(text-0818 #x0818)
(text-0819 #x0819)
(text-081a #x081a)
(text-081b #x081b)
(text-081c #x081c)
(text-081d #x081d)
(text-081e #x081e)
(text-081f #x081f)
(text-0820 #x0820)
(text-0821 #x0821)
(text-0822 #x0822)
(text-0823 #x0823)
(text-0824 #x0824)
(text-0825 #x0825)
(text-0826 #x0826)
(text-0827 #x0827)
(text-0828 #x0828)
(text-0829 #x0829)
(text-082a #x082a)
(text-082b #x082b)
(text-082c #x082c)
(text-082d #x082d)
(text-082e #x082e)
(text-082f #x082f)
(text-0830 #x0830)
(text-0831 #x0831)
(text-0832 #x0832)
(text-0833 #x0833)
(museum-baron #x0816)
(museum-youngsamos #x0817)
(museum-brutter #x0818)
(museum-red-crimson-guard #x0819)
(museum-flutflut #x081a)
(museum-mayor #x081b)
(museum-redsage #x081c)
(museum-sculptor #x081d)
(museum-sidekick-human #x081e)
(museum-yellowsage #x081f)
(museum-warrior #x0820)
(museum-geologist #x0821)
(museum-gambler #x0822)
(museum-minershort #x0823)
(museum-minertall #x0824)
(museum-ogreboss #x0825)
(museum-bird-lady #x0826)
(museum-bluesage #x0827)
(museum-evilbro #x0828)
(museum-evilsis #x0829)
(museum-explorer #x082a)
(museum-farmer #x082b)
(museum-fisher #x082c)
(museum-crocadog #x082d)
(museum-kid #x082e)
(museum-kor #x082f)
(museum-errol #x0830)
(museum-babak #x0831)
(museum-billy #x0832)
(your-distance #x0833)
(progress-secrets-weapon-upgrades #x0834)
(progress-secrets-cheats #x0835)
(progress-secrets-vehicle-upgrades #x0836)
(progress-secrets-crazy-stuff #x0837)
(progress-secrets-art-gallery #x0838)
(progress-secrets-expert-options #x0839)
(text-083a #x083a)
(unavailable #x083a)
(progress-secrets-gun-upgrade-red-1 #x083b)
(progress-secrets-gun-upgrade-red-2 #x083c)
(progress-secrets-gun-upgrade-red-3 #x083d)
@@ -9954,20 +9944,20 @@
(credits-0854 #x0854)
(credits-0855 #x0855)
(progress-secrets-price #x0856)
(text-0857 #x0857)
(text-0858 #x0858)
(text-085a #x085a)
(new-secrets-available #x0857)
(secrets-still-available #x0858)
(dark-bomb-how-to #x085a)
(credits-085b #x085b)
(credits-085c #x085c)
(credits-085d #x085d)
(credits-085e #x085e)
(text-085f #x085f)
(text-0860 #x0860)
(text-0861 #x0861)
(text-0862 #x0862)
(text-0863 #x0863)
(text-0864 #x0864)
(text-0866 #x0866)
(bring-sand-shark #x085f)
(bring-sand-shark-heat-seeker-dust-demon-desert-screamer #x0860)
(extra-time #x0861)
(hold-to-auto-fire #x0862)
(used-precursor-artifacts #x0863)
(hold-to-use-shield #x0864)
(score #x0866)
(progress-inventory-vehicles #x0867)
(progress-inventory-armor #x0868)
(progress-inventory-darkjak #x0869)
@@ -9997,10 +9987,10 @@
(credits-0882 #x0882)
(progress-controls-pad-l2-lanalog #x0883)
(progress-controls-board-grab #x0884)
(text-0885 #x0885)
(text-0886 #x0886)
(text-0887 #x0887)
(text-0888 #x0888)
(hold-to-charge-and-then-release-to-fire-blast #x0885)
(press-again-to-make-gyro-burster-hover-in-place #x0886)
(locked #x0887)
(use-turbo-to-break-obstacles #x0888)
(credits-0889 #x0889)
(progress-controls-pad-360-spin #x088a)
(progress-controls-pad-triangle-2 #x088b)
@@ -10009,14 +9999,14 @@
(commentary-intro-palace #x088e)
(commentary-intro-rescue #x088f)
(commentary-intro-training #x0891)
(text-0892 #x0892)
(text-0893 #x0893)
(text-0894 #x0894)
(text-0895 #x0895)
(text-0896 #x0896)
(text-0897 #x0897)
(congrats-600-orbs-new-duds #x0892)
(museum-krew #x0893)
(museum-vin #x0894)
(you-finished #x0895)
(save-hero-mode-file #x0896)
(hero-mode-how-to #x0897)
(talk-to-ashelin #x0898)
(text-0899 #x0899)
(press-to-accept #x0899)
(credits-089c #x089c)
(credits-089d #x089d)
(credits-089e #x089e)
decompiler/config/jak3/ntsc_v1/inputs.jsonc
+15 -3
View File
@@ -349,9 +349,21 @@
"animated_textures": [
// dark jak
"jakc-arm", "jakc-eyebrow", "jakc-face", "jakc-finger", "jakc-hair",
"jakc-arm-norm", "jakc-eyebrow-norm", "jakc-face-norm", "jakc-finger-norm", "jakc-hair-norm",
"jakc-arm-dark", "jakc-eyebrow-dark", "jakc-face-dark", "jakc-finger-dark", "jakc-hair-dark",
"jakc-arm",
"jakc-eyebrow",
"jakc-face",
"jakc-finger",
"jakc-hair",
"jakc-arm-norm",
"jakc-eyebrow-norm",
"jakc-face-norm",
"jakc-finger-norm",
"jakc-hair-norm",
"jakc-arm-dark",
"jakc-eyebrow-dark",
"jakc-face-dark",
"jakc-finger-dark",
"jakc-hair-dark",
// Skull Gem
"skull-gem-dest",
decompiler/config/jak3/ntsc_v1/stack_structures.jsonc
+6 -1
View File
@@ -2508,5 +2508,10 @@
[16, "vector"],
[32, "vector"]
],
"texture-anim-layer-draw": [[16, "matrix"], [80, "matrix"], [144, "matrix"], [208, "matrix"]]
"texture-anim-layer-draw": [
[16, "matrix"],
[80, "matrix"],
[144, "matrix"],
[208, "matrix"]
]
}
decompiler/config/jak3/ntsc_v1/type_casts.jsonc
+3 -9
View File
@@ -10851,9 +10851,7 @@
["_stack_", 76, "float"],
["_stack_", 100, "float"]
],
"real-wang-texture-anim-func": [
[[3, 31], "v1", "mood-context"]
],
"real-wang-texture-anim-func": [[[3, 31], "v1", "mood-context"]],
"(method 24 sky-work)": [
[256, "s4", "(pointer int32)"],
[261, "s4", "(pointer int32)"]
@@ -11120,9 +11118,7 @@
[64, "a1", "(pointer gs-alpha)"],
[66, "a1", "(pointer gs-reg64)"]
],
"texture-anim-layer-draw": [
[[24, 182], "s4", "(pointer uint128)"]
],
"texture-anim-layer-draw": [[[24, 182], "s4", "(pointer uint128)"]],
"update-texture-anim": [
[213, "v1", "(pointer uint128)"],
[[214, 230], "t0", "vector4w"],
@@ -11264,7 +11260,5 @@
[[191, 249], "gp", "shadow-dcache"],
[96, "v1", "shadow-dcache"]
],
"real-fog-texture-anim-func": [
[[6, 160], "s2", "(pointer uint32)"]
]
"real-fog-texture-anim-func": [[[6, 160], "s2", "(pointer uint32)"]]
}
docs/progress-notes/jak1/code_status.md
+8 -8
View File
@@ -11,7 +11,7 @@
- This file generates no code.
## `gkernel-h`: **Done**
- The types `cpu-thread` and `catch-frame` have a slightly different layout in OpenGOAL to back up x86-64 registers
- The types `cpu-thread` and `catch-frame` have a slightly different layout in OpenGOAL to back up x86-64 registers.
## `gkernel`:
- Many changes for x86-64/OpenGOAL
@@ -57,7 +57,7 @@
- No comments
## `euler-h`: **Done**
- Uses boxed arrays
- Uses boxed arrays.
## `transform-h`: **Done**
- No comments
@@ -69,7 +69,7 @@
- Empty
## `transformq-h`: waiting on stack stuff
- Needs stack stuff
- Needs stack stuff.
## `bounding-box`: asm
@@ -84,7 +84,7 @@
## `geometry`: asm
## `trigonometry`: **Done**
- `sincos!` and `sincos-rad!` have a bug where cosine is slightly off
- `sincos!` and `sincos-rad!` have a bug where cosine is slightly off.
## `gsound-h`: **Done**
@@ -116,19 +116,19 @@
## `dma-disasm`: In progress
- Unused, but possibly useful debugging utilities for printing DMA chains.
- Needs stack stuff to do the last two functions
- Needs stack stuff to do the last two functions.
- Needs static data disassembler for a lookup table.
## `pad`: **Done**
## `gs`: **Done**
- Missing bitfields
- Missing bitfields.
## `display-h`: **Done**
## `vector`: asm
- Largely decompiled successfully and compiles!
- Functions are currently undocumented and still with rough variable names
- Functions are currently undocumented and still with rough variable names.
- Some functions are currently failing to decompile:
- `rand-vu-sphere-point!`
- `vector-deg-lerp-clamp!`
@@ -158,4 +158,4 @@
## `fileio`: **Done**
## `loader-h`: **Done**
- Good one for playing with inlined basics.
- Good one for playing with inlined basics.
game/assets/jak1/subtitle/subtitle_lines_ca-ES.json
+1479 -1479
View File
File diff suppressed because it is too large Load Diff
game/assets/jak1/subtitle/subtitle_lines_da-DK.json
+376 -376
View File
File diff suppressed because it is too large Load Diff
game/assets/jak1/subtitle/subtitle_lines_hu-HU.json
+1493 -1493
View File
File diff suppressed because it is too large Load Diff
game/assets/jak1/subtitle/subtitle_lines_nl-NL.json
+1247 -1247
View File
File diff suppressed because it is too large Load Diff
game/assets/jak1/subtitle/subtitle_lines_pt-BR.json
+55 -55
View File
@@ -84,9 +84,9 @@
"AGORA VÃO PARA A ILHA DAS NÉVOAS, EU VOU ENVIAR O ZOOMER PARA LÁ."
],
"assistant-village2-introduction": [
"WHOA!",
"UAU!",
"ACHO QUE NUNCA VOU ME ACOSTUMAR COM ESSE FORMIGAMENTO DO TELEPORTE.",
"HEY!",
"EI!",
"PARECE QUE O SÁBIO AZUL DEU UMA FESTA.",
"MINHA NOSSA! VILA DA PEDRA ESTÁ EM CHAMAS!",
"UMA BELA FESTA.",
@@ -200,8 +200,8 @@
"bird-lady-beach-resolution": [
"NOSSA!, EU ESPERO QUE O COITADINHO ESTEJA BEM,",
"TOMA, UMA POWER CELL PELA SUA CORAGEM.",
"MAMA!",
"MAMA!",
"MAMÃE!",
"MAMÃE!",
"OH NÃO! NÃO, NÃO, NÃO, NÃO!",
"OLHA SÓ... NÃO É FOFO? ELE ACHA QUE VOCÊ É A MÃE DELE.",
"EH? EU NÃO SOU TUA MÃE! TÁ VENDO ALGUMA PENA AQUI?",
@@ -290,14 +290,14 @@
"BONS SONHOS, JAK!"
],
"evilbro-misty-end": [
"THOSE TWO COULD PROVE TO BE TROUBLE.",
"DON'T WORRY DEAR BROTHER, I'LL DISPATCH MY LURKER ARMY TO DEAL WITH THEM.",
"JUST MAKE SURE THEY DON'T GET TOO CLOSE TO OUR NORTHERN OPERATIONS.",
"I DOUBT THEY'LL GET THAT FAR...",
"BUT IF THEY DO, A SURPRISE WILL BE WAITING FOR THEM IN ROCK VILLAGE.",
"SO...YOU'RE GOING TO LET...KLAWW OUT OF HIS CAGE?",
"I THINK IT'S WORTH THE RISK.",
"INDEED..."
"ESSES DOIS PODEM SE TORNAR UM PROBLEMA.",
"NÃO SE PREOCUPE, QUERIDO IRMÃO, ENVIAREI MINHA TROPA DE LURKERS PARA LIDAR COM ELES.",
"SÓ GARANTA QUE ELES NÃO VÃO CHEGAR PERTO DEMAIS DAS OPERAÇÕES AO NORTE.",
"EU DUVIDO QUE ELES CHEGUEM TÃO LONGE...",
"MAS SE CHEGAREM, TERÃO UMA SURPRESA NA VILA DA PEDRA.",
"ENTÃO... VOCÊ VAI DEIXAR... O KLAWW SAIR DA GAIOLA?",
"ACHO QUE VALE O RISCO.",
"DE FATO..."
],
"explorer-introduction": [
"OLÁ MEU QUERIDO MENINO.",
@@ -486,7 +486,7 @@
"PARECE QUE ELES COMBINARAM PARTES FUNCIONAIS DO ROBÔ PRECURSOR",
"COM ARTEFATOS RECOLHIDOS PELO MUNDO.",
"E ELES ADICIONARAM MECANISMOS DIABÓLICOS PRÓPRIOS,",
"CRIANDO ALGO CAPAZ DE ABRIR OS RESERVATÓRIOS DE ECO NEGRO.",
"CRIANDO ALGO CAPAZ DE ABRIR OS RESERVATÓRIOS DE ECO SOMBRIO.",
"SE VOCÊS PUDEREM LIBERTAR NÓS 4, PODEMOS USAR NOSSOS PODERES COMBINADOS",
"PARA QUEBRAR O CAMPO DE FORÇA EM VOLTA DO ROBÔ,",
"ANTES QUE ELES O USEM PARA DESTRUIR O MUNDO."
@@ -507,7 +507,7 @@
"NADA DISSO SERIA POSSÍVEL.",
"HM-HM-HM. TALVEZ TENHAMOS ACHADO UMA NOVA SÁBIA AGORA",
"QUE GOL E MAIA SE FORAM...",
"SIM, GOL E MAIA... O ECO NEGRO PROVAVELMENTE DESTRUIU ELES.",
"SIM, GOL E MAIA... O ECO SOMBRIO PROVAVELMENTE DESTRUIU ELES.",
"EH, PROVAVELMENTE...",
"QUEM LIGA? DEIXA VIR, A GENTE APAGA ELES DE NOVO NÉ, JAK?",
"EU DISSE, NÉ, JAK?",
@@ -532,10 +532,10 @@
],
"green-sagecage-outro-preboss": [
"TARDE DEMAIS, SAMOS.",
"ASSIM QUE EU TIVER ECO NEGRO ILIMITADO,",
"ASSIM QUE EU TIVER ECO SOMBRIO ILIMITADO,",
"EU TEREI A CHAVE PARA A PRÓPRIA CRIAÇÃO!",
"ISSO É LOUCURA!",
"LIBERAR AQUELE TANTO DE ECO NEGRO IRÁ DESTRUIR TUDO QUE CONHECEMOS!",
"LIBERAR AQUELE TANTO DE ECO SOMBRIO IRÁ DESTRUIR TUDO QUE CONHECEMOS!",
"OLHE O QUE ELE FEZ COM VOCÊ!",
"NOS TROUXE BELEZA ALÉM DA SUA COMPREENSÃO.",
"BELEZA? VOCÊS SE OLHARAM NO ESPELHO RECENTEMENTE?",
@@ -651,7 +651,7 @@
"WILLARD!!"
],
"minershort-reminder-2-orbs": [
"DUH, GORDY?",
"UÉ, GORDY?",
"90 ORBES POR UMA POWER CELL, WILLARD! URGH!"
],
"minershort-resolution-1-orbs": [
@@ -730,7 +730,7 @@
"BEM, A SITUAÇÃO AQUI TÁ FEDENDO MAIS QUE SOVACO DE LURKER.",
"ANTES DO SUMIÇO DO SÁBIO AZUL,",
"ELE REGISTROU PROBLEMAS SIGNIFICATIVOS EM TODA REGIÃO EM VOLTA.",
"DE INTERESSE PARTICULAR MEU, ESTÁ A INFESTAÇÃO DE ECO NEGRO",
"DE INTERESSE PARTICULAR MEU, ESTÁ A INFECÇÃO DE ECO SOMBRIO",
"EM PLANTAS INOCENTES NA BACIA PRECURSOR.",
"KEIRA IRÁ TELEPORTAR O ZOOMER PARA O TRANS-PAD MAIS PRÓXIMO.",
"LEVE O ZOOMER PARA UMA FONTE DE ECO VERDE,",
@@ -754,7 +754,7 @@
"sage-bluehut-reminder-1-crop-dusting": [
"MEUS OLHOS DEVEM ESTAR ME ENGANANDO!",
"PORQUE VOCÊS DOIS COM CERTEZA ESTÃO NA BACIA PRECURSOR,",
"SALVANDO AS PLANTAS INFECTADAS COM ECO NEGRO."
"SALVANDO AS PLANTAS INFECTADAS COM ECO SOMBRIO."
],
"sage-bluehut-reminder-1-prec-arm": [
"O QUE VOCÊS ESTÃO FAZENDO VOLTANDO AQUI?",
@@ -793,14 +793,14 @@
"NO ÚNICO LUGAR QUE EU DISSE PARA NÃO IREM: ILHA DAS NÉVOAS!",
"FOI ISSO MESMO! E ENTÃ-",
"E ENTÃO, DAXTER, VOCÊ FINALMENTE TOMOU UM BANHO,",
"MAS FOI EM UM POÇO DE ECO NEGRO.",
"MAS FOI EM UM POÇO DE ECO SOMBRIO.",
"ESCUTA AQUI, COROA, VOCÊ VAI FICAR DANDO ESPORRO,",
"OU VOCÊ VAI ME AJUDAR A SAIR DESSA?",
"VOU FICAR DANDO ESPORRO! PORQUE NA MINHA OPINIÃO PROFISSIONAL,",
"A MUDANÇA FOI UMA MELHORIA.",
"E ALÉM DISSO... EU NÃO PODERIA TE AJUDAR MESMO SE QUISESSE",
"QUÊ!?",
"SÓ EXISTE UMA PESSOA QUE ESTUDOU O ECO NEGRO POR TEMPO O BASTANTE",
"SÓ EXISTE UMA PESSOA QUE ESTUDOU O ECO SOMBRIO POR TEMPO O BASTANTE",
"PARA TER UMA CHANCE DE TE TRAZER A SUA FORMA ANTIGA:",
"GOL ACHERON, O SÁBIO.",
"MAS ELE VIVE AO NORTE. LONGE, BEM LONGE AO NORTE.",
@@ -832,7 +832,7 @@
"VOCÊS DOIS NÃO CONSEGUIRIAM NEM SAIR DA VILA SEM TREINAMENTO",
"ANTES DE QUALQUER COISA, VOCÊS VÃO ENTRAR NO TELEPORTADOR",
"E TREINAR NA GEYSER ROCK .",
"UH, NÃO VAI TER NENHUM ECO NEGRO GOSMENTO LÁ NÉ?",
"UH, NÃO VAI TER NENHUM ECO SOMBRIO GOSMENTO LÁ NÉ?",
"PORQUE EU ODIARIA CAIR NELE DE NOVO E TRANSFORMAR EM VOCÊ!",
"VÃO LÁ AGORA! ANTES QUE EU TRANSFORME VOCÊS DOIS EM SAMAMBAIAS"
],
@@ -854,7 +854,7 @@
"ÓTIMO, EU QUERIA FALAR COM VOCÊS SOBRE ALGO SÉRIO.",
"PARECE HAVER BASTANTE CIRCULAÇÃO DE LURKERS NA ILHA DAS NÉVOAS.",
"EU CONSIGO VÊ-LOS BOMBARDEANDO O ARMAZÉM PRECURSOR PELA MINHA TORRE DE VIGIA.",
"SE OS LURKERS CONSEGUIREM ABRIR E LIBERAR O ECO NEGRO, NÓS PODEMOS",
"SE OS LURKERS CONSEGUIREM ABRIR E LIBERAR O ECO SOMBRIO, NÓS PODEMOS",
"ACABAR TENDO QUE ANDAR POR AÍ IGUAL A ESSE PEQUENO ESPÉCIME.",
"JAK, É HORA DE VOCÊ PROVAR O SEU VALOR.",
"PEÇA EMPRESTADO O BARCO DO PESCADOR PARA IR À ILHA DAS NÉVOAS",
@@ -895,22 +895,22 @@
"NÃO FOI NEM UM POUCO DIVERTIDO.",
"GOL? É VOCÊ?",
"VOCÊ FINALMENTE CHEGOU NO FUNDO DO POÇO, EH?",
"E, MAIA! EU DISSE QUE O ECO NEGRO IRIA AFETAR VOCÊS DOIS!",
"E, MAIA! EU DISSE QUE O ECO SOMBRIO AFETARIA VOCÊS DOIS!",
"HNG, NINGUÉM DÁ OUVIDOS AO VELHO SAMOS...",
"O QUE VOCÊS FIZERAM COM OS SÁBIOS AZUL E VERMELHO?",
"NÃO SE PREOCUPE COM SEUS AMIGOS COLORIDOS, SEU VELHO TOLO.",
"ELES ESTÃO PERFEITAMENTE SEGUROS NA NOSSA CIDADELA. SÃO NOSSOS CONVIDADOS ESPECIAIS.",
"ELES GRACIOSAMENTE CONCORDARAM EM NOS AJUDAR EM NOSSO PEQUENO PROJETO.",
"VOCÊ ESTAVA ERRADO, SAMOS. O ECO NEGRO PODE SER CONTROLADO!",
"VOCÊ ESTAVA ERRADO, SAMOS. O ECO SOMBRIO PODE SER CONTROLADO!",
"NÓS DESCOBRIMOS SEUS SEGREDOS, E AGORA PODEMOS REFAZER O MUNDO AO NOSSO GOSTO.",
"NÃO SE PODE CONTROLAR O ECO NEGRO POR CONTA PRÓPRIA, NEM OS PRECURSORES CONSEGUIAM",
"NÃO SE PODE CONTROLAR O ECO SOMBRIO POR CONTA PRÓPRIA, NEM OS PRECURSORES CONSEGUIAM",
"ATÉ AGORA, TIVEMOS QUE NOS VIRAR COM O",
"POUCO QUE ACHÁVAMOS NA SUPERFÍCIE.",
"MAS EM BREVE, TEREMOS ACESSO AS VASTAS RESERVAS",
"DE ECO NEGRO ESCONDIDA NO FUNDO DO SUBSOLO.",
"DE ECO SOMBRIO ESCONDIDA NO FUNDO DO SUBSOLO.",
"NÃO OS RESERVATÓRIOS!",
"SIM, OS RESERVATÓRIOS!",
"ELES SERÃO ABERTOS, E TODO ECO NEGRO DO MUNDO SERÁ NOSSO!",
"ELES SERÃO ABERTOS, E TODO ECO SOMBRIO DO MUNDO SERÁ NOSSO!",
"MAS ISSO É IMPOSSÍVEL! APENAS UM ROBÔ PRECURSOR PODERIA-",
"OH, NÃO FIQUE TÃO CHATEADO, SAMOS.",
"TEMOS GRANDES PLANOS PARA VOCÊ.",
@@ -921,7 +921,7 @@
"GOL É O CARA QUE TÁ TENTANDO NOS MATAR?!",
"TÔ PERDIDO.",
"TALVEZ ESTEJAMOS TODOS PERDIDOS.",
"SE ELES ABRIREM OS RESERVATÓRIOS, O ECO NEGRO IRÁ",
"SE ELES ABRIREM OS RESERVATÓRIOS, O ECO SOMBRIO IRÁ",
"CORROMPER E DESTRUIR TUDO QUE TOCAR!",
"NÓS PRECISAMOS IR À CIDADELA E IMPEDI-LOS!",
"O CAMINHO MAIS RÁPIDO ATÉ LÁ É PELO TÚNEL DE LAVA",
@@ -938,7 +938,7 @@
"DEIXA EU ADIVINHAR. TEM ARANHAS NA CAVERNA DAS ARANHAS, NÉ?",
"É CLARO QUE TEM ARANHAS NA CAVERNA DAS ARANHAS!",
"MAS ESSE É O MENOR DOS PROBLEMAS!",
"OS LURKERS ESTÃO ATRÁS DE CRISTAIS DE ECO NEGRO CONCENTRADO.",
"OS LURKERS ESTÃO ATRÁS DE CRISTAIS DE ECO SOMBRIO CONCENTRADO.",
"VOCÊS PRECISAM DESTRUIR OS CRISTAIS ANTES QUE",
"OS MONSTROS CONSIGAM LEVÁ-LOS!",
"É PRA ONTEM!"
@@ -946,12 +946,12 @@
"sage-village3-introduction-rams": [
"QUE BOM QUE VOCÊS DOIS ESTÃO AQUI, HÁ UMA MOVIMENTAÇÃO LURKER NAS MONTANHAS.",
"PARECE QUE ELES ACHARAM E AGORA ESTÃO TENTANDO LEVAR,",
"ALGUMS TANQUES DE ECO NEGRO CONGELADOS NAS GELEIRAS.",
"ALGUMS TANQUES DE ECO SOMBRIO CONGELADOS NAS GELEIRAS.",
"QUANDO ESTIVEREM LÁ RODANDO ATRÁS DE POWER CELLS, IMPEÇAM OS LURKERS,",
"E TIREM MAIS UM POUCO DE ECO NEGRO DA MÃO DO GOL."
"E TIREM MAIS UM POUCO DE ECO SOMBRIO DA MÃO DO GOL."
],
"sage-village3-reminder-1-dark-eco": [
"VOCÊ PRECISA DESTRUIR OS CRISTAIS DE ECO NEGRO NA CAVERNA DAS ARANHAS!"
"VOCÊ PRECISA DESTRUIR OS CRISTAIS DE ECO SOMBRIO NA CAVERNA DAS ARANHAS!"
],
"sage-village3-reminder-1-rams": [
"NÃO PODEMOS DEIXAR OS LURKERS BOTAREM AS MÃOS NOS TANQUES DE ECO.",
@@ -988,7 +988,7 @@
],
"sidekick-human-intro-sequence-c": [
"O QUE ESTAMOS FAZENDO AQUI, JAK? ESSE LUGAR DÁ MO MEDO!",
"HUH?",
"HÃ?",
"PORCARIA PRECURSOR IDIOTA!",
"EEK! QUE LAMA NEGRA É ESSA? NÃO PARECE MUITO AMIGÁVEL.",
"O SÁBIO FALA TODA HORA SOBRE OS PRECURSORES QUE CONSTRUÍRAM ESSE LUGAR.",
@@ -1039,7 +1039,7 @@
"EU NÃO QUERO ALINHAR ESSAS PONTES TÃO CEDO."
],
"warrior-resolution": [
"OH.",
"AH.",
"MARAVILHA.",
"VOCÊS ME TROUXERAM AS ORBES PRECURSORAS. (CHORA)",
"TÁ CERTO.",
@@ -1179,7 +1179,7 @@
"PEGOU ELE."
],
"BIL-TA09": [
"YEEHAW!"
"UHUU!"
],
"BIL-TA1A": [
"PEGA ELES!"
@@ -1215,7 +1215,7 @@
"VAMOS LÁ, EMPURRE O OVO DO PENHASCO!"
],
"BIR-AM06": [
"OHH!"
"AHH!"
],
"BIR-AM07": [
"OH, AQUI, PASSARIN PASSARIN. AQUI, PASSARIN PASSARIN."
@@ -1479,7 +1479,7 @@
"VOCÊ SÓ NÃO DESISTE, NÃO É?"
],
"GOL-AM02": [
"EM BREVE, O ECO NEGRO SERÁ NOSSO!"
"EM BREVE, O ECO SOMBRIO SERÁ NOSSO!"
],
"GOL-AM03": [
"ACABE COM ELES!"
@@ -1700,16 +1700,16 @@
"ISSO NÃO É BOM."
],
"SAGELP32": [
"CRISTAIS DE ECO NEGRO?"
"CRISTAIS DE ECO SOMBRIO?"
],
"SAGELP33": [
"MAIA E GOL PERDERAM A CABEÇA!"
],
"SAGELP34": [
"HNG, O PODER DO ECO NEGRO NÃO PODE SER CONTROLADO!"
"HNG, O PODER DO ECO SOMBRIO NÃO PODE SER CONTROLADO!"
],
"SAGELP35": [
"ECO NEGRO NAS GELEIRAS?"
"ECO SOMBRIO NAS GELEIRAS?"
],
"SAGELP36": [
"AH! TEM TROPAS LURKERS NAS MONTANHAS!"
@@ -1951,7 +1951,7 @@
"EU TENHO QUE ADMITIR, ESTOU SURPRESO. VOCÊS DOIS NÃO ESTRAGARAM TUDO!",
"AGORA QUE OS LURKERS NÃO CONSEGUEM ABRIR O ARMAZÉM,",
"ELES NÃO PODEM INUNDAR O MUNDO",
"EM ECO NEGRO E CAUSAR UMA DESTRUIÇÃO INIMAGINÁVEL.",
"EM ECO SOMBRIO E CAUSAR UMA DESTRUIÇÃO INIMAGINÁVEL.",
"TIRA ESSE SORRISO RIDÍCULO DA CARA, DAXTER,",
"VOCÊS DOIS TEM MUITO O QUE FAZER.",
"AGORA MÃOS À OBRA!"
@@ -2045,7 +2045,7 @@
"HEY! AQUELA DELÍCINHA DA KEIRA TINHA RAZÃO, TEM TRANS-PADS AQUI."
],
"sksp0002": [
"CONFIA EM MIM, ESSAS CAIXAS DE ECO NEGRO SÃO PROBLEMA!"
"CONFIA EM MIM, ESSAS CAIXAS DE ECO SOMBRIO SÃO PROBLEMA!"
],
"sksp0003": [
"APOSTO QUE SE ACHARMOS TODAS ESSAS MOSCAS DE BUSCA FOFINHAS EM CADA ÁREA",
@@ -2114,7 +2114,7 @@
"YEAH HA HA HA HA HA!! WOO HO HO HO!"
],
"sksp0023": [
"WOOHOO!"
"UUUHUU!"
],
"sksp0024": [
"YEAH HA HA! YEAH!"
@@ -2232,7 +2232,7 @@
"NÓS PRECISAMOS DE ECO AZUL PRA ENERGIZAR ESSA PLATAFORMA!"
],
"sksp0076": [
"JAK! HIT SOME JUMPS TO KEEP US OFF THE HOT GROUND."
"JAK! DÊ ALGUNS SALTOS PARA NOS MANTER LONGE DO SOLO QUENTE."
],
"sksp0077": [
"BALÕES BOM, MAGMA QUENTE FLAMEJANTE RUIM!"
@@ -2251,7 +2251,7 @@
"AHH! TALVEZ EU DEVESSE PILOTAR!"
],
"sksp0082": [
"VOCÊ TÁ TENTANDO EVITAR AS CAIXAS DE ECO NEGRO, NÉ?!"
"VOCÊ TÁ TENTANDO EVITAR AS CAIXAS DE ECO SOMBRIO, NÉ?!"
],
"sksp0083": [
"OOH! VÊ SE DÁ PRA PEGAR IMPULSO BATENDO NOS LURKERS!"
@@ -2302,7 +2302,7 @@
"AEEE, MAIS ORBES!"
],
"sksp009c": [
"FAZ FAVOR E FICA LONGE DAS CAIXAS DE ECO NEGRO"
"FAZ FAVOR E FICA LONGE DAS CAIXAS DE ECO SOMBRIO"
],
"sksp009d": [
"YEAH-HA-HA-HA!"
@@ -2330,7 +2330,7 @@
],
"sksp0110": [
"EU JÁ FALEI ANTES, VOU FALAR DE NOVO...",
"EVITE AS CAIXAS DE ECO NEGRO!"
"EVITE AS CAIXAS DE ECO SOMBRIO!"
],
"sksp0111": [
"VAMOS LEVAR ESSAS TOUPEIRAS DE VOLTA AO SUBSOLO."
@@ -2385,10 +2385,10 @@
"CHUTA O CARINHA NO TOPO!"
],
"sksp0128": [
"JAK! CORRE! O ECO NEGRO ESTÁ SUBINDO!"
"JAK! CORRE! O ECO SOMBRIO ESTÁ SUBINDO!"
],
"sksp0129": [
"AHH! O ECO NEGRO TÁ CHEGANDO PERTO"
"AHH! O ECO SOMBRIO TÁ CHEGANDO PERTO"
],
"sksp0130": [
"UH, ACHO QUE TEMOS QUE ATIVAR TODAS AS PLATAFORMAS."
@@ -2559,16 +2559,16 @@
"CONSEGUIMOS! IMPEDIMOS ELES DE DETONAR A PASSAGEM!"
],
"sksp0327": [
"ACHO QUE ESSE FOI O ÚLTIMO CRISTAL DE ECO NEGRO!"
"ACHO QUE ESSE FOI O ÚLTIMO CRISTAL DE ECO SOMBRIO!"
],
"sksp0328": [
"TALVEZ A GENTE ATIRE MELHOR SE VOCÊ MIRAR COM A SUA LENTE."
],
"sksp0329": [
"OH, NÃO! MAIS ECO NEGRO!"
"OH, NÃO! MAIS ECO SOMBRIO!"
],
"sksp0330": [
"NÃO ACHO QUE PEGAMOS TODOS OS CRISTAIS DE ECO NEGRO."
"NÃO ACHO QUE PEGAMOS TODOS OS CRISTAIS DE ECO SOMBRIO."
],
"sksp0331": [
"ATIRE NOS LURKERS COMENDO AS PILARES!"
@@ -2655,7 +2655,7 @@
"DESVIE OU ATIRE NAS MINAS, JAK!"
],
"sksp0367": [
"ACHE UM CAMINHO ENTRE OS BARRIS DE ECO NEGRO!"
"ACHE UM CAMINHO ENTRE OS BARRIS DE ECO SOMBRIO!"
],
"sksp0368": [
"CONTINUE ACERTANDO ESSES BALÕES DE RESFRIAMENTO!"
@@ -2854,7 +2854,7 @@
"KEIRA": "KEIRA",
"MAIA": "MAIA",
"MAYOR": "PREFEITO",
"MINER": "MINER",
"MINER": "MINEIRO",
"OLD MAN": "VELHO",
"ORACLE": "ORÁCULO",
"RED SAGE": "SÁBIO VERMELHO",
game/assets/jak1/subtitle/subtitle_lines_pt-PT.json
+1 -1
View File
@@ -41,7 +41,7 @@
"THIS IS TERRIBLE! FATHER IS MISSING!",
"I THINK GOL AND MAIA MAY HAVE KIDNAPPED HIM AS WELL!",
"RELAX, SWEETHEART. I GOT EVERYTHING UNDER CONTROL.",
"UNDER CONTROL?!",
"SOBRE CONTROLO?!",
"LURKER ARMIES CONTINUE TO GROW ACROSS THE LAND,",
"THE SAGES HAVE BEEN KIDNAPPED,",
"GOL AND MAIA HAVE GATHERED ENOUGH ECO",
game/assets/jak1/text/game_custom_text_ca-ES.json
+181 -181
View File
@@ -1,85 +1,85 @@
{
"1000": "KAMERAN ASETUKSET",
"1000": "CONFIGURACIÓ DE LA CÀMERA",
"1001": "NORMAL",
"1002": "INVERTED",
"1003": "1ST-PERSON HORIZONTAL CAMERA",
"1004": "1ST-PERSON VERTICAL CAMERA",
"1005": "3RD-PERSON HORIZONTAL CAMERA",
"1006": "3RD-PERSON VERTICAL CAMERA",
"1007": "RESTORE DEFAULTS",
"1010": "ACCESSIBILITY",
"1011": "PRECURSOR ORB GLOW",
"1020": "PS2 OPTIONS",
"1021": "PS2 LOAD SPEED",
"1022": "PARTICLE CULLING",
"1023": "MUSIC FADE-OUT",
"1024": "MUSIC FADE-IN",
"1002": "INVERTIDA",
"1003": "CÀMARA HORIZONTAL EN 1º PERSONA",
"1004": "CÀMARA VERTICAL 1º PERSONA",
"1005": "CÀMERA HORIZONTAL EN 3º PERSONA",
"1006": "CÀMERA VERTICAL EN 3º PERSONA",
"1007": "RESTAURAR ELS VALORS PREDETERMINATS",
"1010": "ACCESSIBILITAT",
"1011": "ORBE PRECURSOR BRILLANT",
"1020": "OPCIONS PS2",
"1021": "VELOCITAT DE CÀRREGA PS2",
"1022": "COLLANT DE PARTÍCULES",
"1023": "FADE-OUT DE LA MÚSICA",
"1024": "FADE-IN DE LA MÚSICA",
"1025": "ACTOR CULLING",
"1026": "BACKGROUND CULLING",
"1027": "FORCE ENVIRONMENT MAPPING",
"1030": "DISCORD RICH-PRESENCE",
"1031": "DISPLAY MODE",
"1032": "WINDOWED",
"1033": "BORDERLESS",
"1034": "FULLSCREEN",
"1035": "GAME RESOLUTION",
"1026": "CULLING DE FONAMENTS",
"1027": "CARTOGRAFIA DE L'AMBIENT DE FORÇA",
"1030": "DISCORD RICA-PRESÈNCIA",
"1031": "MODE DE PANTALLA",
"1032": "FINESTRES",
"1033": "SENSE BORDES",
"1034": "PANTALLA COMPLETA",
"1035": "RESOLUCIÓ DEL JOC",
"1036": "~D X ~D",
"1037": "PS2 ASPECT RATIO",
"1038": "WHEN PS2 ASPECT RATIO IS ENABLED, ONLY 4X3 AND 16X9 ASPECT RATIO CAN BE SELECTED. CONTINUE?",
"1039": "ASPECT RATIO (PS2)",
"1040": "SUBTITLES ENABLED",
"1041": "SUBTITLES DISABLED",
"1042": "TEXT LANGUAGE",
"1043": "DISPLAY",
"1044": "DISPLAY ~D",
"1037": "RELACIÓ D'ASPECTES PS2",
"1038": "QUAN ESTÀ HABILITAT LA RELACIÓ D'ASPECTES PS2, NOMÉS ES POT SELECCIONAR LA RELACIÓ D'ASPECTES 4X3 I 16X9. CONTINUAR?",
"1039": "RELACIÓ D'ASPECT (PS2)",
"1040": "SUBTÍTOLS ACTIVATS",
"1041": "SUBTÍTOLS DISCAPACITATS",
"1042": "LLENGUATGE DE TEXT",
"1043": "VISUALITZACIÓ",
"1044": "PANTALLA ~D",
"1050": "MSAA",
"1051": "~DX",
"1052": "2X",
"1053": "4X",
"1054": "8X",
"1055": "16X",
"1060": "FRAME RATE (EXPERIMENTAL)",
"1060": "VELOCITAT DE FRAMES (EXPERIMENTAL)",
"1061": "60",
"1062": "100",
"1063": "150",
"1070": "LEVEL OF DETAIL (BACKGROUND)",
"1071": "LEVEL OF DETAIL (FOREGROUND)",
"1072": "MAXIMUM",
"1073": "HIGH",
"1074": "MEDIUM",
"1075": "LOW",
"1076": "MINIMUM",
"1070": "NIVELL DE DETALLS (FONDS)",
"1071": "NIVELL DE DETALL (PRIMER PLA)",
"1072": "MÀXIM",
"1073": "ALTA",
"1074": "MITJÀ",
"1075": "BAIX",
"1076": "MINIM",
"1077": "PS2",
"1078": "SUBTITLES",
"1079": "HINT SUBTITLES",
"1080": "CHEATS",
"1078": "SUBTÍTOLS",
"1079": "SUBTÍTOLS CONSELLS",
"1080": "TRAMPES",
"1081": "SECRETS",
"1082": "SELECT TRACK",
"1083": "SELECT FLAVOR",
"1084": "FINAL BOSS",
"1085": "CREDITS",
"1082": "SELECCIONA LA PISTA",
"1083": "SELECCIONA EL SABOR",
"1084": "CAP FINAL",
"1085": "CRÈDITS",
"1086": "?????",
"1087": "KLAWW",
"1088": "FISHING MINI-GAME",
"1089": "CHALLENGE THEME",
"1090": "INFINITE BLUE ECO",
"1091": "INFINITE RED ECO",
"1092": "INFINITE GREEN ECO",
"1093": "INFINITE YELLOW ECO",
"1094": "ALTERNATE DAXTER",
"1095": "INVINCIBILITY",
"1096": "ALL MUSIC TRACKS",
"1097": "REAL TIME OF DAY",
"1098": "REACH 100% COMPLETION",
"1099": "BEAT THE GAME",
"1100": "YELLOW SAGE",
"1101": "RED SAGE",
"1102": "BLUE SAGE",
"1103": "CITADEL HUB",
"1104": "MIDDLE OF THE BOSS",
"1105": "END OF THE BOSS",
"1106": "FLAVOR 1",
"1107": "FLAVOR 2",
"1088": "MINI-JOC DE PESCA",
"1089": "TEMA REPTE",
"1090": "ECO BLAU INFINIT",
"1091": "VERMELL INFINIT ECO",
"1092": "ECO VERD INFINIT",
"1093": "GROC INFINIT ECO",
"1094": "DAXTER ALTERN",
"1095": "INVENCIBILITAT",
"1096": "TOTES LES PETS DE MÚSICA",
"1097": "HORA REAL DEL DIA",
"1098": "ACONSEGUIR EL 100% COMPLET",
"1099": "GANA EL JOC",
"1100": "SALVIA GROC",
"1101": "SALVIA VERMELLA",
"1102": "SALVIA BLAU",
"1103": "CENTRE CIUTADELLA",
"1104": "MITJÀ DEL CAP",
"1105": "FINAL DEL CAP",
"1106": "SABOR 1",
"1107": "SABOR 2",
"1110": "ENGLISH (UK)",
"1111": "PORTUGUÊS",
"1112": "PORTUGUÊS (BRASIL)",
@@ -93,135 +93,135 @@
"111a": "ÍSLANDSKA",
"111b": "POLSKI",
"111c": "LIETUVIŲ KALBA",
"1500": "SPEEDRUNNER MODE",
"138": "PLEASE DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
"161": "WHILE THIS ICON IS ON SCREEN, DO NOT REMOVE OR INSERT ANY PERIPHERALS, TURN OFF YOUR SYSTEM OR SHUT DOWN THE GAME",
"100c": "AUTO-SAVE DISABLED",
"100d": "ARE YOU SURE YOU WANT TO DISABLE AUTO-SAVE?",
"100e": "DISABLE AUTO-SAVE",
"100f": "MISCELLANEOUS",
"103a": "FIT TO SCREEN",
"1500": "MODE SPEEDRUNNER",
"138": "SI US PLAU, NO TREURES NI INSERIS CAP PERIFÈRIC, NO APAGIS EL SISTEMA NI TANGAS EL JOC",
"161": "MENTRE AQUESTA ICONA ESTÀ A LA PANTALLA, NO TREURES NI INSEIXIS CAP PERIFÈRIC, NO APAGIS EL SISTEMA NI TANGAS EL JOC",
"100c": "DESA AUTOMÀTIC DESACTIVAT",
"100d": "ESTEU SEGUR QUE VOLEU DESACTIVAR EL DESA AUTOMÀTIC?",
"100e": "DESACTIVAR DESA AUTOMÀTIC",
"100f": "DIVERS",
"103a": "AJUSTE A LA PANTALLA",
"103b": "V-SYNC",
"103c": "4X3 (PS2)",
"103d": "16X9 (PS2)",
"103e": "~DX~D",
"103f": "PRESS <PAD_SQUARE> TO TOGGLE SUBTITLES",
"107a": "SUBTITLE LANGUAGE",
"107b": "SHOW SPEAKER IN SUBTITLE",
"107c": "ALWAYS",
"107d": "NEVER",
"107e": "OFF-SCREEN",
"107f": "HINT LOG",
"109a": "BIG HEAD JAK",
"109b": "SMALL HEAD JAK",
"109c": "BIG FIST JAK",
"109d": "BIG HEAD CHARACTERS",
"109e": "NO TEXTURES MODE",
"109f": "MIRRORED WORLD",
"10a0": "HUGE HEAD JAK",
"10c0": "MUSIC PLAYER",
"10c1": "SCENE PLAYER",
"10c2": "PLAY CREDITS",
"10c3": "SCRAPBOOK",
"10d0": "DEFAULT",
"10d1": "UNUSED",
"10d2": "SAGE",
"10d3": "SAGE'S HUT",
"10d4": "BIRDWATCHER",
"10d5": "FARMER",
"103f": "PREMEU <PAD_SQUARE> PER CANVIAR SUBTÍTOLS",
"107a": "LLENGUA DEL SUBTÍTOL",
"107b": "MOSTRA L'ORADOR EN EL SUBTÍTOL",
"107c": "SEMPRE",
"107d": "MAI",
"107e": "FORA DE PANTALLA",
"107f": "REGISTRE DE CONSELLS",
"109a": "CAP GRAN JAK",
"109b": "CAP PETIT JAK",
"109c": "GRAN PUNT COM",
"109d": "PERSONATGES DE CAP GRAN",
"109e": "MODE SENSE TEXTURES",
"109f": "MÓN ESPIRAL",
"10a0": "CAP ENORME JAK",
"10c0": "REPRODUCTOR DE MÚSICA",
"10c1": "REPRODUCTOR D'ESCENA",
"10c2": "CRÈDITS DE JOC",
"10c3": "LLIBRE DE RECORDS",
"10d0": "PER DEFECTE",
"10d1": "NO UTILITZAT",
"10d2": "SALVI",
"10d3": "CABANA DEL SAVI",
"10d4": "OBSERVADOR D'OCELLS",
"10d5": "GRANGER",
"10d6": "KEIRA",
"10d7": "MAYOR",
"10d8": "SCULPTOR",
"10d9": "JAK'S UNCLE",
"10d7": "ALCALDE",
"10d8": "ESCULTOR",
"10d9": "L'ONLE DE JAK",
"10da": "DOCK",
"10db": "FORBIDDEN TEMPLE EXIT",
"10dc": "LURKER MACHINE",
"10dd": "TOP OF THE TOWER",
"10de": "BLUE VENT SWITCH",
"10df": "UNUSED",
"10e0": "SENTINELS",
"10e1": "LURKER CANNON",
"10e2": "GROTTO",
"10e3": "UNUSED 1",
"10e4": "LURKER BOAT",
"10e5": "UNUSED 2",
"10e6": "ZOOMER",
"10e7": "FLUT FLUT",
"10e8": "UNUSED",
"10e9": "WARRIOR",
"10ea": "GEOLOGIST",
"10eb": "GAMBLER",
"10ec": "LEVITATOR MACHINE",
"10ed": "UNUSED 1",
"10ee": "LAUNCHER TRAPS",
"10ef": "UNUSED 2",
"10f0": "DEAD MAN'S GORGE",
"10f1": "MIDDLE OF THE PASS",
"10f2": "END OF THE PASS",
"10f3": "TO SPIDER CAVE",
"10f4": "TO SNOWY MOUNTAIN",
"10db": "SORTIDA PROHIBIDA DEL TEMPLE",
"10dc": "MÀQUINA LURKER",
"10dd": "TOP DE LA TORRE",
"10de": "INTERRUPTOR BLAU DE VENT",
"10df": "NO UTILITZAT",
"10e0": "SENTINELLES",
"10e1": "CANON LURKER",
"10e2": "GROTTA",
"10e3": "NO UTILITZAT 1",
"10e4": "BARCA LURKER",
"10e5": "NO UTILITZAT 2",
"10e6": "ZOOM",
"10e7": "INUNDACIÓ",
"10e8": "NO UTILITZAT",
"10e9": "GUERRER",
"10ea": "GEÒLOGA",
"10eb": "JUGADOR",
"10ec": "MÀQUINA LEVITADORA",
"10ed": "NO UTILITZAT 1",
"10ee": "TRAMPES DE LLANÇADOR",
"10ef": "NO UTILITZAT 2",
"10f0": "GORGA DEL MORTE",
"10f1": "MITJÀ DEL PAS",
"10f2": "FI DEL PAS",
"10f3": "A LA COVA DE L'ARANYA",
"10f4": "A LA MUNTANYA NEVADA",
"10f5": "MINERS",
"10f6": "ROBOT CAVE SCAFFOLDING",
"10f7": "PRECURSOR ROBOT TOP",
"10f8": "MAIN CAVE",
"10f9": "DARK CAVE",
"10fa": "UNUSED",
"10fb": "HIDDEN CAVE",
"10f6": "BASTIDIA DE LA COVA DEL ROBOT",
"10f7": "TOP ROBOT PRECURSOR",
"10f8": "COVA PRINCIPAL",
"10f9": "COVA FOSC",
"10fa": "NO UTILITZAT",
"10fb": "COVA OCULTA",
"10fc": "LURKER FORT",
"10fd": "SNOWBALLS",
"10fe": "MIDDLE OF THE TUBE",
"10ff": "END OF THE TUBE",
"1501": "CUTSCENE SKIPS",
"1502": "CHECKPOINT SELECT",
"1503": "SPEEDRUN OPTIONS",
"1504": "CAUTION: THESE OPTIONS WILL AUTO SAVE IN YOUR FIRST SAVE SLOT!",
"1505": "RESET CURRENT SPEEDRUN",
"1506": "NEW FULL GAME RUN",
"150e": "NEW INDIVIDUAL LEVEL RUN",
"10fd": "BOLES DE NEU",
"10fe": "MITJÀ DEL TUBO",
"10ff": "EXTREM DEL TUBO",
"1501": "SALTS DE CORTE",
"1502": "SELECCIONAR PUNT DE CONTROL",
"1503": "OPCIONS DE VELOCITAT",
"1504": "ATENCIÓ: AQUESTES OPCIONS ES DESARAN AUTOMÀTICAMENT A LA VOSTRA PRIMER RANURA DE DESA.",
"1505": "RESTABLEIX LA VELOCITAT ACTUAL",
"1506": "NOVA JORNADA COMPLETA",
"150e": "NOU CURSA DE NIVELL INDIVIDUAL",
"150f": "GEYSER ROCK IL",
"1510": "SANDOVER VILLAGE IL",
"1511": "SENTINEL BEACH IL",
"1512": "FORBIDDEN JUNGLE IL",
"1513": "MISTY ISLAND IL",
"1514": "FIRE CANYON IL",
"1515": "ROCK VILLAGE IL",
"1516": "LOST PRECURSOR CITY IL",
"1517": "BOGGY SWAMP IL",
"1518": "PRECURSOR BASIN IL",
"1519": "MOUNTAIN PASS IL",
"151a": "VOLCANIC CRATER IL",
"151b": "SNOWY MOUNTAIN IL",
"151c": "SPIDER CAVE IL",
"151d": "LAVA TUBE IL",
"151e": "GOL AND MAIA'S CITADEL IL",
"151f": "NEW CATEGORY EXTENSION RUN",
"1511": "PLATJA SENTINELLA IL",
"1512": "SELVA PROHIBIDA IL",
"1513": "ILLA BOIRA IL",
"1514": "CANÓ DE FOC IL",
"1515": "ROCK VILLAGE IT",
"1516": "CIUTAT PIONERA PERDUDA IL",
"1517": "BOGGY SAMP IL",
"1518": "CONCA DEL PRECURSOR IL",
"1519": "COLL DE MUNTANYA IL",
"151a": "CRÀTER VOLCÀNIC IL",
"151b": "MUNTANYA NEVADA IL",
"151c": "COVA DE L'ARANYA IL",
"151d": "LAVA TUBE IT",
"151e": "GOL I CIUTADELLA DE MAIA IL",
"151f": "NOVA EXTENSIÓ DE CATEGORIA",
"1520": "NG+",
"1521": "HUB 1 100%",
"1522": "HUB 2 100%",
"1523": "HUB 3 100%",
"1524": "ALL CUTSCENES",
"1600": "INPUT OPTIONS",
"1601": "SELECT CONTROLLER",
"1602": "ANALOG DEADZONE",
"1603": "IGNORE IF WINDOW UNFOCUSED",
"1604": "CONTROLLER LED FOR HP",
"1605": "CONTROLLER LED FOR ECO",
"1606": "TRACK CAMERA",
"1607": "HORIZONTAL SENSITIVITY",
"1608": "VERTICAL SENSITIVITY",
"1609": "PLAYER MOVEMENT",
"160a": "CONTROLLER BINDS",
"160b": "KEYBOARD BINDS",
"160c": "MOUSE BINDS",
"160d": "CONTROLLER OPTIONS",
"160e": "ENABLE KEYBOARD",
"160f": "ENABLE MOUSE",
"1610": "MOUSE OPTIONS",
"1611": "REASSIGN BINDS",
"1612": "CONTROLLER ~D",
"1613": "AUTO HIDE CURSOR",
"1524": "TOTES LES ESCENES DE CORTE",
"1600": "OPCIONS D'ENTRADA",
"1601": "SELECCIONA EL CONTROLADOR",
"1602": "ZONA MORTA ANALÒGICA",
"1603": "IGNOREU SI LA FINESTRA ESTÀ DESENFOCADA",
"1604": "LED CONTROLADOR PER HP",
"1605": "CONTROLADOR LED PER ECO",
"1606": "CÀMARA DE PISTA",
"1607": "SENSIBILITAT HORIZONTAL",
"1608": "SENSIBILITAT VERTICAL",
"1609": "MOVIMENT DEL JUGADOR",
"160a": "EL CONTROLADOR VINCULA",
"160b": "ENLLAÇOS DE TECLAT",
"160c": "ENLLAÇOS DEL RATOLÍ",
"160d": "OPCIONS DEL CONTROLADOR",
"160e": "HABILITA EL TECLAT",
"160f": "HABILITA EL RATOLÍ",
"1610": "OPCIONS DEL RATOLÍ",
"1611": "REASSIGNAR VINCULATS",
"1612": "CONTROLADOR ~D",
"1613": "AMAGA EL CURSOR AUTOMÀTIC",
"1614": "UNSET",
"1615": "UNKNOWN",
"1616": "NO OTHER OPTIONS FOR ASPECT RATIO",
"1617": "CONTROLLER LED FOR HEAT"
"1615": "DESCONEGUT",
"1616": "CAP ALTRES OPCIONS PER A LA RELACIÓ D'ASPECT",
"1617": "LED CONTROLADOR DE CALOR"
}
game/assets/jak1/text/game_custom_text_de-DE.json
+1 -1
View File
@@ -219,7 +219,7 @@
"1610": "MAUS OPTIONEN",
"1611": "TASTENBELEGUNG ÄNDERN",
"1612": "CONTROLLER ~D",
"1613": "CURSOR VERSTECKEN",
"1613": "CURSOR AUTOMATISCH VERSTECKEN",
"1614": "UNBELEGT",
"1615": "UNBEKANNT",
"1616": "KEINE WEITEREN OPTIONEN FÜR SEITENVERHÄLTNIS",
game/assets/jak2/subtitle/subtitle_lines_ca-ES.json
+2821 -2819
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_da-DK.json
+2668 -2666
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_de-DE.json
+2859 -2857
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_en-GB.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_en-US.json
+2
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
game/assets/jak2/subtitle/subtitle_lines_es-ES.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Kor Cabezachapa",
"metalkor-before-consite": "Jefe Cabezachapa",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oráculo",
@@ -7852,4 +7854,4 @@
"youngsamos": "Joven Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_fi-FI.json
+812 -810
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_fr-FR.json
+32 -6
View File
@@ -800,12 +800,6 @@
"bb13win": [
"C'était exactement ça, beau travail."
],
"bb14int": [
"Jak, we have an Agent waiting for a package delivery.",
"Guard spies are watching this guy,",
"so if you don't get to him fast, he'll be arrested.",
"Take the package to him before it's too late."
],
"bb14fail": [
"Trop tard, Jak ! L'agent s'est décommandé.",
"Tu dois le rejoindre au plus vite !"
@@ -2071,6 +2065,36 @@
"cityv197": [
"Les scanners indiquent des oeufs de Métal Heads toujours actifs."
],
"daxm001": [
"Shoot the platform, Jak."
],
"daxm002": [
"We need something to get through that gate!"
],
"daxm003": [
"Shoot the Metal Head when he moves his shield!"
],
"daxm004": [
"Hit him in his stomach!"
],
"daxm005": [
"Whoa! That path dropped like uh... a rock!"
],
"daxm006": [
"Smack the box, baby!"
],
"daxm007": [
"That's what I call a rocky road!"
],
"daxm008": [
"We gotta get to the top!"
],
"daxm009": [
"We made it!!"
],
"daxm010": [
"Rock 'n roll!"
],
"ds001": [
"On doit trouver le Baron, Jak."
],
@@ -7843,6 +7867,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
game/assets/jak2/subtitle/subtitle_lines_hu-HU.json
+2840 -2838
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_is-IS.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_it-IT.json
+2887 -2885
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_ja-JP.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_jp-JP.json
+2
View File
@@ -120,6 +120,8 @@
"kor": "コール",
"krew": "クルー",
"metalkor": "メタルコール",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "モッグ",
"onin": "オニン",
"oracle": "オラクル",
game/assets/jak2/subtitle/subtitle_lines_ko-KR.json
+2
View File
@@ -24,6 +24,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
game/assets/jak2/subtitle/subtitle_lines_lt-LT.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Koras",
"krew": "Krew",
"metalkor": "Metalinis Koras",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mogas",
"onin": "Oninas",
"oracle": "Oraklė",
@@ -7852,4 +7854,4 @@
"youngsamos": "Jaunasis Samosas",
"youngsamos-before-rescue": "Samosas"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_nl-NL.json
+2867 -2865
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_no-NO.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_pl-PL.json
+920 -918
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_pt-BR.json
+1021 -1019
View File
File diff suppressed because it is too large Load Diff
game/assets/jak2/subtitle/subtitle_lines_pt-PT.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oráculo",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/subtitle/subtitle_lines_sv-SE.json
+3 -1
View File
@@ -7839,6 +7839,8 @@
"kor": "Kor",
"krew": "Krew",
"metalkor": "Metal Kor",
"metalkor-before-consite": "Metal Head Leader",
"metalkor-intro": "???",
"mog": "Mog",
"onin": "Onin",
"oracle": "Oracle",
@@ -7852,4 +7854,4 @@
"youngsamos": "Young Samos",
"youngsamos-before-rescue": "Samos"
}
}
}
game/assets/jak2/text/game_custom_text_ca-ES.json
+178 -178
View File
@@ -1,46 +1,46 @@
{
"1a3": "Please Do Not Remove Or Insert Any Peripherals, Turn Off Your System Or Shut Down The Game",
"1b5": "While This Icon Is On Screen, Do Not Remove Or Insert Any Peripherals, Turn Off Your System Or Shut Down The Game",
"1100": "Not in a mission",
"1101": "Playing a bonus mission",
"1102": "Scatter Gun Training Course",
"1103": "Blaster Training Course",
"1104": "Vulcan Fury Training Course",
"1105": "Peace Maker Training Course",
"1106": "Onin Game",
"1107": "Metal Head Mash",
"1200": "Display Mode",
"1201": "Windowed",
"1202": "Fullscreen",
"1203": "Borderless",
"1204": "Automatic",
"1205": "Custom",
"1a3": "Si us plau, no traieu ni introduïu cap perifèric, apagueu el vostre sistema o apagueu el joc",
"1b5": "Mentre aquesta icona estigui a la pantalla, no traieu ni inseriu cap perifèric, apagueu el vostre sistema o apagueu el joc",
"1100": "No en una missió",
"1101": "Jugant a una missió extra",
"1102": "Curs de formació de pistola de dispersió",
"1103": "Curs de formació Blaster",
"1104": "Curs de formació de la fúria vulcaniana",
"1105": "Curs de Formació Peace Maker",
"1106": "Sóc el Joc",
"1107": "Puré de cap de metall",
"1200": "Mode de visualització",
"1201": "Finestrat",
"1202": "Pantalla completa",
"1203": "Sense fronteres",
"1204": "Automàtic",
"1205": "Personalitzat",
"1206": "4x3 (PS2)",
"1207": "16x9 (PS2)",
"1208": "Choose width and height ratio",
"1209": "Press <PAD_X> to confirm and exit.",
"120a": "Press <PAD_CIRCLE> to confirm and exit.",
"120b": "Ratio must not be lower than 4x3!",
"120c": "Music Player",
"120d": "V-Sync",
"120e": "Text Language",
"120f": "OpenGOAL Secrets",
"1210": "Width",
"1211": "Height",
"1208": "Trieu la relació d'amplada i alçada",
"1209": "Premeu <PAD_X> per confirmar i sortir.",
"120a": "Premeu <PAD_CIRCLE> per confirmar i sortir.",
"120b": "La relació no ha de ser inferior a 4x3!",
"120c": "Reproductor de música",
"120d": "Sincronització V",
"120e": "Llenguatge del text",
"120f": "Secrets d'OpenGOAL",
"1210": "Amplada",
"1211": "Alçada",
"1212": "??????????",
"1213": "Now playing...",
"1214": "No Track",
"1215": "Default",
"1213": "Ara jugant...",
"1214": "Sense pista",
"1215": "Per defecte",
"1216": "Morph Gun",
"1217": "JET-Board",
"1218": "Titan Suit",
"1219": "Dark Jak",
"1218": "Vestit Titan",
"1219": "Jak fosc",
"121a": "Vehicle",
"121b": "Danger",
"121c": "None",
"121d": "Low",
"121e": "Medium",
"121f": "High",
"121b": "Perill",
"121c": "Cap",
"121d": "baix",
"121e": "Mitjana",
"121f": "Alt",
"1220": "Haven Exploration",
"1221": "Guard Pursuit",
"1222": "Ram Head Battle (Alt)",
@@ -65,137 +65,137 @@
"1235": "Weapons Factory",
"1236": "Arena Race",
"1237": "Dead Town",
"1238": "Window Size",
"1239": "Select Window Size",
"123a": "Game Resolution",
"123b": "Select Game Resolution",
"123c": "Level Of Detail (Background)",
"123d": "Level Of Detail (Foreground)",
"123f": "Show Speaker In Subtitle",
"1240": "Never",
"1241": "Off-Screen",
"1242": "Always",
"1243": "Game Territory",
"1244": "America (SCEA)",
"1245": "Europe (SCEE)",
"1246": "Japan (SCEI)",
"1247": "Korea (SCEK)",
"1238": "Mida de la finestra",
"1239": "Seleccioneu Mida de la finestra",
"123a": "Resolució del joc",
"123b": "Seleccioneu Resolució del joc",
"123c": "Nivell de detall (de fons)",
"123d": "Nivell de detall (primer pla)",
"123f": "Mostra l'altaveu al subtítol",
"1240": "Mai",
"1241": "Fora de la pantalla",
"1242": "Sempre",
"1243": "Territori de joc",
"1244": "Amèrica (SCEA)",
"1245": "Europa (SCEE)",
"1246": "Japó (SCEI)",
"1247": "Corea (SCEK)",
"1248": "MSAA",
"1249": "~DX",
"124a": "Controller LED Options",
"124b": "Show Player State",
"124c": "Show Amount of Health",
"124d": "Disable Auto-Save",
"124e": "Auto-Save Disabled",
"124f": "Are You Sure You Want To Disable Auto-Save?",
"1250": "Turbo JET-Board in Haven City",
"1251": "Enemy Health Bars",
"1252": "Vehicle Health Bars",
"1253": "Vehicle Invulnerability",
"1254": "Statistics",
"1255": "Automatically Grab Collectables",
"1256": "Music Player",
"1257": "No Textures Mode",
"1258": "Fast Movies",
"1259": "Slow Movies",
"125a": "Fast Gameplay",
"125b": "Slow Gameplay",
"125c": "Instant Travel in Haven City",
"124a": "Opcions de LED del controlador",
"124b": "Mostra l'estat del jugador",
"124c": "Mostra la quantitat de salut",
"124d": "Desactivar l'emmagatzematge automàtic",
"124e": "Desa automàticament desactivat",
"124f": "Esteu segur que voleu desactivar el desament automàtic?",
"1250": "Turbo JET-Board a Haven City",
"1251": "Barres de salut de l'enemic",
"1252": "Barres de salut de vehicles",
"1253": "Invulnerabilitat del vehicle",
"1254": "Estadístiques",
"1255": "Agafa automàticament objectes de col-lecció",
"1256": "Reproductor de música",
"1257": "Mode sense textures",
"1258": "Pel-lícules ràpides",
"1259": "Pel-lícules lentes",
"125a": "Joc ràpid",
"125b": "Joc lent",
"125c": "Viatge instantani a Haven City",
"125d": "Precursor Orb Tracker",
"125e": "Real Time Of Day",
"125e": "Hora real del dia",
"125f": "Pacified Haven City",
"1260": "JET-Board Trick Display",
"1261": "Bad Weather",
"1262": "Nice Weather",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1280": "Camera Options",
"1281": "Left/Right (1st Person)",
"1282": "Up/Down (1st Person)",
"1283": "Left/Right (3rd Person)",
"1284": "Up/Down (3rd Person)",
"1285": "Reset to Default",
"1260": "Pantalla de trucs JET-Board",
"1261": "Mal temps",
"1262": "Bon temps",
"1263": "Línies de veu de segrest de vehicles",
"1264": "Tancat",
"1265": "Premeu les 3 vàlvules i trobeu l'estàtua de Mar a \"~S\" en menys de ~D segons",
"1266": "Redueix el recompte de població de Haven City en ~D",
"1267": "Redueix el recompte de vehicles de Haven City en ~D",
"1268": "Caça totes les espècies de Cap de metall",
"1269": "Utilitzeu el JET-Board per trencar els contenidors",
"126a": "Transporteu el Rift Rider mentre deixeu Samos i Young Samos il-lesos",
"1280": "Opcions de la càmera",
"1281": "Esquerra/Dreta (1a persona)",
"1282": "Amunt/avall (1a persona)",
"1283": "Esquerra/Dreta (3a persona)",
"1284": "Amunt/avall (3a persona)",
"1285": "Restableix al valor predeterminat",
"1286": "Normal",
"1287": "Inverted",
"1288": "Particle Culling",
"1289": "Discord Rich-Presence",
"128a": "Default",
"128b": "Low",
"128c": "High",
"128d": "Credits",
"128e": "Frame Rate",
"128f": "Miscellaneous",
"1290": "Speedrunner Mode",
"1291": "Input Options",
"1292": "Restore Defaults",
"1293": "Controller Options",
"1294": "Select Controller",
"1295": "Analog Deadzone",
"1296": "Ignore If Window Unfocused",
"1297": "Controller Led For Hp",
"1298": "Use LED for Other States",
"1299": "Enable Keyboard",
"129a": "Enable Mouse",
"129b": "Mouse Options",
"129c": "Track Camera",
"129d": "Horizontal Sensitivity",
"129e": "Vertical Sensitivity",
"129f": "Player Movement",
"12a0": "Object Shadows",
"1287": "Invertit",
"1288": "Eliminació de partícules",
"1289": "Presència rica en discòrdia",
"128a": "Per defecte",
"128b": "baix",
"128c": "Alt",
"128d": "Crèdits",
"128e": "Velocitat de fotogrames",
"128f": "Divers",
"1290": "Mode Speedrunner",
"1291": "Opcions d'entrada",
"1292": "Restaurar els valors predeterminats",
"1293": "Opcions del controlador",
"1294": "Seleccioneu Controlador",
"1295": "Zona morta analògica",
"1296": "Ignora si la finestra no està enfocada",
"1297": "Controlador LED per a Hp",
"1298": "Utilitzeu LED per a altres estats",
"1299": "Activa el teclat",
"129a": "Activa el ratolí",
"129b": "Opcions del ratolí",
"129c": "Càmera de seguiment",
"129d": "Sensibilitat horitzontal",
"129e": "Sensibilitat vertical",
"129f": "Moviment del jugador",
"12a0": "Ombres d'objectes",
"12a1": "Normal",
"12a2": "Extended",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12a2": "Estesa",
"12a3": "No s'han trobat resolucions vàlides.",
"12a4": "Automàtic",
"12a5": "Bestiari",
"12a6": "Altres estadístiques",
"12a7": "Total de morts",
"12a8": "Matat per Jak",
"12a9": "Matat per Dark Jak",
"12aa": "Matat per Daxter",
"12ab": "Matat per uns altres",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12ad": "Pistola de dispersió",
"12ae": "Fúria Vulcana",
"12af": "Pacificador",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b1": "Truc de JET-Board",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b3": "Cos de vestit Titan",
"12b4": "Gunpod",
"12b5": "Punch",
"12b5": "Punxada",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12c4": "Sig",
"12b8": "Girar",
"12b9": "Rotlla",
"12bf": "Bomba fosca",
"12c0": "Explosió fosca",
"12c3": "Guàrdia Krimzon",
"12c4": "Digues",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"1300": "Auto Hide Cursor",
"1301": "Reassign Binds",
"1302": "Controller Binds",
"1303": "Keyboard Binds",
"1304": "Mouse Binds",
"1305": "No Options",
"1306": "Waiting",
"1307": "Unset",
"1308": "Unknown",
"1309": "High-Resolution Sky",
"130a": "Fast Airlocks and Doors",
"130b": "Fast Elevators",
"12c9": "Caps metàl-lics",
"12ca": "Altres Amics",
"12cb": "Altres Enemics",
"1300": "Oculta automàticament el cursor",
"1301": "Reassignar enllaços",
"1302": "El controlador enllaça",
"1303": "Enllaços de teclat",
"1304": "Enllaços del ratolí",
"1305": "Sense Opcions",
"1306": "Esperant",
"1307": "Desactivat",
"1308": "Desconegut",
"1309": "Cel d'alta resolució",
"130a": "Tancaments i portes ràpides",
"130b": "Ascensors ràpids",
"130c": "Speedrun",
"130d": "Any%",
"130e": "Any% - Hoverless",
@@ -203,34 +203,34 @@
"1310": "100%",
"1311": "Any% - All Orbs",
"1312": "Any% - Hero Mode",
"1313": "Local Time",
"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",
"1313": "Hora local",
"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": "Flip",
"1324": "Rail Grind",
"1325": "Rail Jump",
"1326": "Nosegrab",
"1327": "Method",
"1328": "Board Spin",
"1329": "Board Flip",
"132a": "Noseflip",
"1325": "Salt de ferrocarril",
"1326": "Agafar el nas",
"1327": "Mètode",
"1328": "Tauler de gir",
"1329": "Tauler Flip",
"132a": "Flip nasal",
"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",
"1336": "Fast Progress Menu",
"1337": "PS2 LOD Distance",
"1338": "Off",
"1339": "Display"
"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",
"1336": "Menú de progrés ràpid",
"1337": "Distància LOD PS2",
"1338": "Apagat",
"1339": "Mostra"
}
game/assets/jak2/text/game_custom_text_da-DK.json
+48 -48
View File
@@ -3,29 +3,29 @@
"1b5": "Mens Dette Ikon Er På Skærmen, Må Du Ikke Fjerne Eller Indsætte Nogen Ekstra Enheder, Slukke Systemet Eller Slukke Spillet",
"1100": "Ikke i en mission",
"1101": "Spiller en bonus mission",
"1102": "Scatter Gun Training Course",
"1103": "Blaster Training Course",
"1104": "Vulcan Fury Training Course",
"1105": "Peace Maker Training Course",
"1102": "Scatter Gun træningskursus",
"1103": "Blaster træningskursus",
"1104": "Vulcan Fury træningskursus",
"1105": "Peace Maker Træningskursus",
"1106": "Onin-spillet",
"1107": "Metal-kræ Mash",
"1200": "Skærmindstilling",
"1201": "Vindue",
"1202": "Fuld Skærm",
"1203": "Rammeløs",
"1204": "Automatic",
"1205": "Custom",
"1204": "Automatisk",
"1205": "Brugerdefinerede",
"1206": "4x3 (PS2)",
"1207": "16x9 (PS2)",
"1208": "Choose width and height ratio",
"1209": "Press <PAD_X> to confirm and exit.",
"120a": "Press <PAD_CIRCLE> to confirm and exit.",
"120b": "Ratio must not be lower than 4x3!",
"1208": "Vælg bredde og højdeforhold",
"1209": "Tryk på <PAD_X> for at bekræfte og afslutte.",
"120a": "Tryk på <PAD_CIRCLE> for at bekræfte og afslutte.",
"120b": "Forholdet må ikke være lavere end 4x3!",
"120c": "Musik Afspiller",
"120d": "V-Sync",
"120e": "Tekst Sprog",
"120f": "OpenGOAL Hemmeligheder",
"1210": "Brede",
"1210": "Bred",
"1211": "Højde",
"1212": "??????????",
"1213": "Spiller nu...",
@@ -36,7 +36,7 @@
"1218": "Titan Dragt",
"1219": "Mørke Jak",
"121a": "Fartøj",
"121b": "Fare",
"121b": "Billetpris",
"121c": "Ingen",
"121d": "Lav",
"121e": "Medium",
@@ -92,10 +92,10 @@
"1251": "Fjenders Sundhedsbjælker",
"1252": "Fartøjs Sundhedsbjælker",
"1253": "Fartøj Udødelighed",
"1254": "Statistik",
"1254": "Statistikker",
"1255": "Automatisk Grib Samleobjekter",
"1256": "Musik Spiller",
"1257": "Ingen Teksturer Mode",
"1257": "Ingen teksturtilstand",
"1258": "Hurtige Film",
"1259": "Langsomme Film",
"125a": "Hurtig Gameplay",
@@ -107,30 +107,30 @@
"1260": "JET-bræt trick Viser",
"1261": "Dårligt Vejr",
"1262": "Godt Vejr",
"1263": "Vehicle Hijack Voice Lines",
"1263": "Vognkapring Voice Lines",
"1264": "Låst",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1265": "Tryk på alle 3 ventiler og find Mar's Statue i \"~S\" på under ~D sekunder",
"1266": "Reducer Haven Citys befolkningstal med ~D",
"1267": "Reducer Haven Citys køretøjantal med ~D",
"1268": "Jagt alle arter af metalhoveder",
"1269": "Brug JET-Board til at bryde beholdere op",
"126a": "Transporter Rift Rider, mens du forlader Samos og Young Samos uskadt",
"1280": "Kamera Indstillinger",
"1281": "Left/Right (1st Person)",
"1282": "Up/Down (1st Person)",
"1283": "Left/Right (3rd Person)",
"1284": "Up/Down (3rd Person)",
"1281": "Venstre/Højre (1. person)",
"1282": "Op/Ned (1. person)",
"1283": "Venstre/Højre (3. person)",
"1284": "Op/Ned (3. person)",
"1285": "Nulstil til Standard",
"1286": "Normal",
"1287": "Omvendt",
"1288": "Partikkel Culling",
"1288": "Partikeludskæring",
"1289": "Discord Rig-Tilstedeværelse",
"128a": "Standard",
"128b": "Lav",
"128c": "Høj",
"128d": "Krediteringer",
"128e": "Billedehastighed",
"128f": "Diverse",
"128f": "Alsidig",
"1290": "Speedrunner Tilstand",
"1291": "Input Indstillinger",
"1292": "Gendan Standardindstillinger",
@@ -140,20 +140,20 @@
"1296": "Ignorer Hvis Vindue Er Fravalgt",
"1297": "Controller Led Viser Hp",
"1298": "Brug LED til anden Status",
"1299": "Aktiver Tastatur",
"129a": "Aktiver Mus",
"1299": "Aktivt tastatur",
"129a": "Aktiv Mus",
"129b": "Mus Indstillinger",
"129c": "Følg Kamera",
"129d": "Vandret Følsomhed",
"129e": "Lodret Følsomhed",
"129f": "Spillerbevægelse",
"12a0": "Objekt Skygger",
"12a0": "Objektskygger",
"12a1": "Normal",
"12a2": "Udvidet",
"12a3": "Ingen gyldig opløsning fundet.",
"12a4": "Automatisk",
"12a5": "Bestiary",
"12a6": "Andre Statistikker",
"12a6": "Anden statistik",
"12a7": "Total Dræbt",
"12a8": "Dræbt af Jak",
"12a9": "Dræbt af mørke Jak",
@@ -162,7 +162,7 @@
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12af": "Fredsstifter",
"12b0": "JET-bræt",
"12b1": "JET-Board Trick",
"12b2": "Titan dragt Slag",
@@ -173,13 +173,13 @@
"12b7": "Uppercut",
"12b8": "Drej",
"12b9": "Rul",
"12bf": "Dark Bomb",
"12bf": "Mørk bombe",
"12c0": "Dark Blast",
"12c3": "Krimzon-gardist",
"12c3": "Krimzon vagtmand",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c7": "Barsk",
"12c8": "Mog",
"12c9": "Metal-Kræ",
"12ca": "Andre Venner",
@@ -188,10 +188,10 @@
"1301": "Omvælg Bindinger",
"1302": "Controller Bindinger",
"1303": "Tastaturbindinger",
"1304": "Musebindinger",
"1304": "Musebinder",
"1305": "Ingen valgmuligheder",
"1306": "Venter",
"1307": "Uindfattet",
"1307": "Ikke indeholdt",
"1308": "Ukendt",
"1309": "Høj Opløsning Himmel",
"130a": "Hurtige Luftsluser og Døre",
@@ -203,27 +203,27 @@
"1310": "100%",
"1311": "Any% - All Orbs",
"1312": "Any% - Hero Mode",
"1313": "Lokal Tid",
"1313": "Lokal tid",
"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",
"1316": "Lokal score",
"1320": "Ingen",
"1321": "Drej",
"1322": "Boost",
"1323": "Vend",
"1324": "Rail Grind",
"1325": "Skinnehop",
"1326": "Nosegrab",
"1327": "Method",
"1326": "Næsegreb",
"1327": "Metode",
"1328": "Board Spin",
"1329": "Board Flip",
"132a": "Noseflip",
"132a": "Næseklip",
"132b": "Kickflip",
"132c": "Jump",
"132d": "Duck Jump",
"132e": "Quick Jump",
"132f": "Dark Jak",
"1330": "Dark Bomb",
"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",
@@ -232,5 +232,5 @@
"1336": "Hurtig Fremskridt Menu",
"1337": "PS2 LOD Afstand",
"1338": "Fra",
"1339": "Visning"
"1339": "Skærm"
}
game/assets/jak2/text/game_custom_text_de-DE.json
+45 -45
View File
@@ -3,12 +3,12 @@
"1b5": "Während dieses Symbol angezeigt wird, entferne oder verbinde kein Zubehör und schalte nicht das System oder das Spiel aus",
"1100": "Nicht in einer Mission",
"1101": "Spielt eine Bonusmission",
"1102": "Streuwaffen-Trainingskurs",
"1102": "Blaster-Trainingskurs",
"1103": "Blaster-Trainingskurs",
"1104": "Vulcan-Fury-Trainingskurs",
"1105": "Friedensstifter-Trainingskurs",
"1106": "Onins Spiel",
"1107": "Metal Head Mash",
"1107": "Metal Head Matsch",
"1200": "Anzeigemodus",
"1201": "Fenster",
"1202": "Vollbild",
@@ -83,7 +83,7 @@
"1248": "MSAA",
"1249": "~DX",
"124a": "Controller-LED Optionen",
"124b": "Show Player State",
"124b": "Spielerstatistik anzeigen",
"124c": "Gesundheitsmenge anzeigen",
"124d": "Auto-Speichern Ausschalten",
"124e": "Auto-Speichern Aus",
@@ -92,7 +92,7 @@
"1251": "Gegner-Gesundheitsbalken",
"1252": "Fahrzeug-Gesundheitsbalken",
"1253": "Fahrzeug Unverwundbarkeit",
"1254": "Statistics",
"1254": "Statistiken",
"1255": "Collectibles automatisch aufheben",
"1256": "Musik-Player",
"1257": "Keine Texturen-Modus",
@@ -100,21 +100,21 @@
"1259": "Langsame Filme",
"125a": "Schnelles Gameplay",
"125b": "Langsames Gameplay",
"125c": "Instant Travel in Haven City",
"125c": "Zu Haven City teleportieren",
"125d": "Precursor Orb-Tracker",
"125e": "Tag-Nacht-Zyklus In Echtzeit",
"125f": "Pacified Haven City",
"1260": "JET-Board Trick Display",
"125f": "Friedliches Haven City",
"1260": "Jet-Board Trick Display",
"1261": "Schlechtes Wetter",
"1262": "Schönes Wetter",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1263": "Fahrzeugentführung Sprachleitungen",
"1264": "Gesperrt",
"1265": "Triff alle 3 Ventile und finde Mar's Statue in \"~S\" in unter ~D Sekunden",
"1266": "Verringern Sie die Einwohnerzahl von Haven City um ~D",
"1267": "Verringerung der Anzahl der Fahrzeuge in Haven City um ~D",
"1268": "Jage alle Arten von Metal Head",
"1269": "Benutze das JET-Board, um Objekte zu zerstören",
"126a": "Transportiere den Spaltreiter und lass Samos und den jungen Samos unversehrt.",
"1280": "Kameraoptionen",
"1281": "Links/Rechts (1. Person)",
"1282": "Hoch/Runter (1. Person)",
@@ -139,7 +139,7 @@
"1295": "Stick Deadzone",
"1296": "Ignoriere Wenn Unfokusiert",
"1297": "Controller Led Für Leben",
"1298": "Use LED for Other States",
"1298": "Verwenden Sie LED für andere Staaten",
"1299": "Tastatur Aktivieren",
"129a": "Maus Aktivieren",
"129b": "Maus Optionen",
@@ -150,40 +150,40 @@
"12a0": "Objekt-Schatten",
"12a1": "Normal",
"12a2": "Erweitert",
"12a3": "No valid resolutions found.",
"12a3": "Keine gültige Auflösung gefunden.",
"12a4": "Automatisch",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12a5": "Bestarium",
"12a6": "Weitere Statistiken",
"12a7": "Insgesamt getötet",
"12a8": "Getötet von Jak",
"12a9": "Getötet von Dark Jak",
"12aa": "Getötet von Daxter",
"12ab": "Getötet von anderen",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12ad": "Streuwaffe",
"12ae": "Vulkanischer Zorn",
"12af": "Friedensstifter",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12b2": "Titan-Anzug Schlag",
"12b3": "Titan-Anzug Körper",
"12b4": "Kanonenfutter",
"12b5": "Schlag",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12b7": "Aufwärtshaken",
"12b8": "Drehung",
"12b9": "Rolle",
"12bf": "Dunkelbombe",
"12c0": "Dunkle Explosion",
"12c3": "Krimzon-Wache",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"12ca": "Andere Freunde",
"12cb": "Andere Gegner",
"1300": "Cursor Verstecken",
"1301": "Tastenbelegung Ändern",
"1302": "Controller Belegung",
@@ -194,7 +194,7 @@
"1307": "Unbelegt",
"1308": "Unbekannt",
"1309": "Hochauflösender Himmel",
"130a": "Fast Airlocks and Doors",
"130a": "Schnelle Luftschleusen und Türen",
"130b": "Schnelle Aufzüge",
"130c": "Speedrun",
"130d": "Any%",
@@ -206,8 +206,8 @@
"1313": "Lokalzeit",
"1314": "Warnung!",
"1315": "Diese Einstellung ist hoch-experimentell. Bei anderen Werten als 60 Bilder pro Sekunde können visuelle und spielerische Fehler auftreten.",
"1316": "Local Score",
"1320": "None",
"1316": "Lokales Ergebnis",
"1320": "Nichts",
"1321": "Drehung",
"1322": "Boost",
"1323": "Salto",
@@ -227,9 +227,9 @@
"1331": "Dunkle Explosion",
"1332": "Dunkler Riese",
"1333": "PS2-Optionen",
"1334": "Actor Culling",
"1335": "Force Environment Mapping",
"1336": "Fast Progress Menu",
"1334": "Schauspieler-Auswahl",
"1335": "Erzwingen der Umgebungsabbildung",
"1336": "Schnelles Fortschrittsmenü",
"1337": "PS2 LOD-Distanz",
"1338": "Aus",
"1339": "Anzeige"
game/assets/jak2/text/game_custom_text_es-ES.json
+36 -36
View File
@@ -1,27 +1,27 @@
{
"1a3": "Por favor no quites o insertes ningún periférico, apagues el sistema ni cierres el juego",
"1b5": "Mientras este icono esté en pantalla, no quites o insertes ningún periférico, apagues el sistema ni cierres el juego",
"1a3": "Por favor, no conectes o desconectes ningún dispositivo, apagues el sistema o cierres el juego",
"1b5": "Cuando este icono aparezca, no quites o conectes ningún dispositivo, no apagues el sistema ni cierres el juego.",
"1100": "Fuera de misión",
"1101": "Jugando misión extra",
"1101": "Jugando a una misión extra",
"1102": "Circuito de Dispersora",
"1103": "Circuito de Bláster",
"1104": "Circuito de Cañón Vulcan",
"1104": "Circuito de Furia Volcánica",
"1105": "Circuito de Pacificador",
"1106": "Juego de Onin",
"1107": "Machacachapa",
"1200": "Modo de pantalla",
"1201": "Ventana",
"1202": "Completa",
"1203": "Sin Bordes",
"1201": "En ventana",
"1202": "Pantalla completa",
"1203": "Ventana sin bordes",
"1204": "Auto",
"1205": "Personalizado",
"1206": "4x3 (PS2)",
"1207": "16x9 (PS2)",
"1208": "Elige el ratio entre ancho y alto",
"1208": "Elige la proporción de alto y ancho",
"1209": "Pulsa <PAD_X> para confirmar y salir.",
"120a": "Pulsa <PAD_CIRCLE> para confirmar y salir.",
"120b": "¡El ratio no debe ser menor que 4x3!",
"120c": "Reproductor de Musica",
"120b": "¡La proporción no debe ser menor a 4x3!",
"120c": "Reproductor de música",
"120d": "V-Sync",
"120e": "Idioma del Texto",
"120f": "Secretos de OpenGOAL",
@@ -83,32 +83,32 @@
"1248": "MSAA",
"1249": "~DX",
"124a": "Ajustes del LED del mando",
"124b": "Mostrar Estado",
"124c": "Mostrar Vida",
"124d": "Desactivar Autoguardado",
"124b": "Mostrar estado",
"124c": "Mostrar vida",
"124d": "Desactivar autoguardado",
"124e": "Autoguardado Desactivado",
"124f": "¿Quieres Desactivar el Autoguardado?",
"124f": "¿Estás seguro de que quieres desactivar el autoguardado?",
"1250": "Super Turbo-Tabla en Villa Refugio",
"1251": "Vida de Enemigos",
"1252": "Vida de Vehículos",
"1253": "Vehículos Invencibles",
"1251": "Vida de enemigos",
"1252": "Vida de vehículos",
"1253": "Invencibilidad del vehículo",
"1254": "Estadísticas",
"1255": "Autorecoger Coleccionables",
"1256": "Reproductor de Musica",
"1257": "Modo Sin Texturas",
"1258": "Cinemáticas Rápidas",
"1259": "Cinemáticas Lentas",
"125a": "Jugabilidad Rápida",
"125b": "Jugabilidad Lenta",
"125c": "Viaje Instantáneo en Villa Refugio",
"125d": "Contador de Esferas",
"125e": "Hora del Día Real",
"1255": "Autorecoger coleccionables",
"1256": "Reproductor de música",
"1257": "Modo sin texturas",
"1258": "Cinemáticas rápidas",
"1259": "Cinemáticas lentas",
"125a": "Juego rápido",
"125b": "Juego lento",
"125c": "Viaje instantáneo en Villa Refugio",
"125d": "Contador de esferas",
"125e": "Hora del día real",
"125f": "Villa Refugio Pacífica",
"1260": "Ver Trucos de Turbo-Tabla",
"1261": "Mal Tiempo",
"1262": "Buen Tiempo",
"1263": "Diálogos de Robo de Vehículos",
"1264": "Bloqueado",
"1261": "Mal tiempo",
"1262": "Buen tiempo",
"1263": "Diálogos de robo de vehículos",
"1264": "Cerrado",
"1265": "Golpea las 3 válvulas y encuentra la Estatua de Mar en \"~S\" en menos de ~D segundos",
"1266": "Reduce el recuento de población de Villa Refugio en ~D",
"1267": "Reduce el recuento de vehículos de Villa Refugio en ~D",
@@ -131,13 +131,13 @@
"128d": "Créditos",
"128e": "Tasa de Fotogramas",
"128f": "Otros",
"1290": "Modo de Speedrunner",
"1291": "Ajustes de Entrada",
"1290": "Modo Speedrun",
"1291": "Ajustes de entrada",
"1292": "Restaurar Valores por Defecto",
"1293": "Ajustes del Mando",
"1294": "Elegir Mando",
"1293": "Ajustes del mando",
"1294": "Elegir mando",
"1295": "Zone Muerta del Joystick",
"1296": "Ignorar al Tabular",
"1296": "Ignorar al hacer ALT+TAB",
"1297": "LED del Mando para la Salud",
"1298": "LED del Mando para Estados",
"1299": "Habilitar Teclado",
game/assets/jak2/text/game_custom_text_fi-FI.json
+6 -6
View File
@@ -91,7 +91,7 @@
"1250": "Turbo JET-lauta Haven Cityssä",
"1251": "Vihollisten terveyspalkit",
"1252": "Ajoneuvojen terveyspalkit",
"1253": "Ajoneuvon haavoittumattomuus",
"1253": "Ajoneuvojen haavoittumattomuus",
"1254": "Tilastot",
"1255": "Kerää kerättävät automaattisesti",
"1256": "Musiikkisoitin",
@@ -114,7 +114,7 @@
"1267": "Vähennä Haven Cityn ajoneuvojen määrää ~D kappaleella",
"1268": "Metsästä jokaista Metallipäälajia",
"1269": "Käytä JET-lautaa rikkoaksesi säiliöt auki",
"126a": "Kuljeta Rift Rider jättäen Samos ja Young Samos vaurioitta",
"126a": "Siirrä repeämäkuljetin jättäen Samos ja nuori Samos vaurioitta",
"1280": "Kuvakulma-asetukset",
"1281": "Vasen/oikea (ensimmäinen persoona)",
"1282": "Ylös/alas (ensimmäinen persoona)",
@@ -139,7 +139,7 @@
"1295": "Analogisauvan katvealue",
"1296": "Älä huomioi, kun ikkuna ei aktiivinen",
"1297": "Ohjaimen LED terveydelle",
"1298": "Ohjaimen LED muissa tiloissa",
"1298": "Ohjaimen LED muihin tiloihin",
"1299": "Salli näppäimistö",
"129a": "Salli hiiri",
"129b": "Hiiriasetukset",
@@ -164,9 +164,9 @@
"12ae": "Vulkanusraivo",
"12af": "Rauhantekijä",
"12b0": "JET-lauta",
"12b1": "JET-lauta temppu",
"12b2": "Titaanin puvun isku",
"12b3": "Titaanin puvun runko",
"12b1": "JET-lautatemppu",
"12b2": "Titaaniasun isku",
"12b3": "Titaaniasun runko",
"12b4": "Tykki",
"12b5": "Isku",
"12b6": "Lyyhistyi",
game/assets/jak2/text/game_custom_text_fr-FR.json
+17 -17
View File
@@ -16,7 +16,7 @@
"1204": "Adapté à la fenêtre",
"1205": "Personnalisé",
"1206": "4x3",
"1207": "16x9 (4x3 zoomé en vertical)",
"1207": "16x9",
"1208": "Choisissez le rapport entre la largeur/hauteur",
"1209": "Appuyer sur <PAD_X> pour confirmer.",
"120a": "Appuyer <PAD_CIRCLE> pour confirmer.",
@@ -27,7 +27,7 @@
"120f": "Secrets OpenGoal",
"1210": "Largeur",
"1211": "Hauteur",
"1212": "Non débloqué",
"1212": "??????????",
"1213": "Lecture en cours :",
"1214": "Pas de musique",
"1215": "Normal",
@@ -41,29 +41,29 @@
"121d": "Faible",
"121e": "Moyen",
"121f": "Élevé",
"1220": "Abriville",
"1220": "Exploration d'Abriville",
"1221": "Course-poursuite",
"1222": "Inutilisé (Jak 3)",
"1223": "Araignée géante",
"1222": "Chasse-taupes (Alt)",
"1223": "Le tombeau de Mar",
"1224": "Le défi d'Onin",
"1225": "Praxis / Métal Kor",
"1225": "Métal Kor",
"1226": "Combat contre Krew",
"1227": "Praxis au tombeau",
"1228": "Éboulement",
"1229": "Bombes plasmites",
"1227": "Combat contre le Baron",
"1228": "Bouncing Boulders",
"1229": "Eco explosive",
"122a": "Tank de la forteresse",
"122b": "Station de pompage",
"122c": "Protéger Sig",
"122d": "Mine à ciel ouvert",
"122e": "Abriforêt",
"122f": "Abriforêt 2 / Crédits",
"122e": "Forêt d'Abriville",
"122f": "Dragons de la foret",
"1230": "La forteresse",
"1231": "La forteresse 2",
"1232": "Temple montagne",
"1233": "Rhinocéros",
"1234": "Palais",
"1231": "Fuite",
"1232": "Temple de la montagne",
"1233": "Chasse-taupe",
"1234": "Palais du baron Praxis",
"1235": "Usine d'armes",
"1236": "Les courses",
"1236": "Course d'arène",
"1237": "Ville morte",
"1238": "Taille de la fenêtre",
"1239": "Sélectionnez une taille",
@@ -206,9 +206,9 @@
"1313": "Heure locale",
"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",
"1316": "Score Local",
"1322": "Boost",
"1323": "Flip",
"1324": "Rail Grind",
game/assets/jak2/text/game_custom_text_hu-HU.json
+42 -42
View File
@@ -92,7 +92,7 @@
"1251": "Ellenség Életerő",
"1252": "Jármű Életerő",
"1253": "Jármű Sebezhetetlenség",
"1254": "Statistics",
"1254": "Statisztika",
"1255": "Gyűjthető Tárgyak Automatikus Felszedése",
"1256": "Zenelejátszó",
"1257": "Textúramentes Mód",
@@ -101,20 +101,20 @@
"125a": "Gyors Játékmenet",
"125b": "Lassú Játékmenet",
"125c": "Azonnali utazás Haven Cityben",
"125d": "Precursor Orb Tracker",
"125d": "Orb Tracker elődje",
"125e": "Valós Napszak",
"125f": "Pacified Haven City",
"1260": "JET-Board Trick Display",
"1260": "JET-Board trükk kijelző",
"1261": "Rossz Időjárás",
"1262": "Jó Időjárás",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1264": "Zárt",
"1265": "Nyomja meg mind a 3 szelepet, és ~D másodperc alatt találja meg Mar szobrát \"~S\"-ben",
"1266": "Csökkentse Haven City lakosságának számát ~D-vel",
"1267": "Csökkentse Haven City járművei számát ~D-vel",
"1268": "Vadássz minden fémfejfajtát",
"1269": "Használja a JET-Board-ot a nyitott tartályok feltörésére",
"126a": "Szállítsd a Rift Ridert, miközben Samost és Young Samost sértetlenül hagyod",
"1280": "Kamera Opciók",
"1281": "Bal/Jobb (belsőnézet)",
"1282": "Fel/Le (belsőnézet)",
@@ -123,7 +123,7 @@
"1285": "Visszaállítás alaphelyzetbe",
"1286": "Normál",
"1287": "Fordított",
"1288": "Particle Culling",
"1288": "Részecske selejtezés",
"1289": "Discord Rich-Presence",
"128a": "Alapértelmezett",
"128b": "Alacsony",
@@ -137,7 +137,7 @@
"1293": "Játékvezérlő Beállítások",
"1294": "Játékvezérlő Kiválasztása",
"1295": "Analóg holttér",
"1296": "Ignore If Window Unfocused",
"1296": "Figyelmen kívül hagyása, ha az ablak nincs fókuszban",
"1297": "Led Reflect Hp",
"1298": "LED Használata Más Állapotokhoz",
"1299": "Billentyűzet Engedélyezése",
@@ -150,40 +150,40 @@
"12a0": "Objektum Árnyékok",
"12a1": "Normál",
"12a2": "Kiterjesztett",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a3": "Nem található érvényes állásfoglalás.",
"12a4": "Automatikus",
"12a5": "Bestiárium",
"12a6": "Egyéb statisztikák",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12a8": "Jak ölte meg",
"12a9": "Dark Jak ölte meg",
"12aa": "Daxter ölte meg",
"12ab": "Mások ölték meg",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12af": "Békéltető",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b1": "JET-Board trükk",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12b5": "Puncs",
"12b6": "Flop",
"12b7": "Uppercut",
"12b7": "Felüt",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12c4": "Sig",
"12b9": "Tekercs",
"12bf": "Sötét bomba",
"12c0": "Sötét robbanás",
"12c3": "Krimzon gárda",
"12c4": "Mond",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c6": "Vészmadár",
"12c7": "Zord",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"12c9": "Fém fejek",
"12ca": "Más barátok",
"12cb": "Más ellenségek",
"1300": "Kurzor Automatikus Elrejtése",
"1301": "Gombkiosztások Újraosztása",
"1302": "Játékvezérlő Gombkiosztás",
@@ -206,31 +206,31 @@
"1313": "Helyi idő",
"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": "Local Score",
"1316": "Helyi pontszám",
"1320": "Egyik sem",
"1321": "Pörgés",
"1322": "Gyorsító",
"1323": "Forgatás",
"1324": "Rail Grind",
"1325": "Rail Jump",
"1326": "Nosegrab",
"1327": "Method",
"1326": "Orrfogó",
"1327": "Módszer",
"1328": "Board Spin",
"1329": "Board Flip",
"132a": "Noseflip",
"132a": "Orrflip",
"132b": "Kickflip",
"132c": "Ugrás",
"132d": "Duck Jump",
"132d": "Kacsaugrás",
"132e": "Gyors Ugrás",
"132f": "Sötét Jak",
"1330": "Sötét Bomba",
"1331": "Dark Blast",
"1331": "Sötét robbanás",
"1332": "Sötét Óriás",
"1333": "PS2 Beállítások",
"1334": "Actor Culling",
"1334": "Culling színész",
"1335": "Force Environment Mapping",
"1336": "Gyors Fejlődési Menü",
"1337": "PS2 LOD Távolság",
"1338": "Ki",
"1338": "Nak nek",
"1339": "Megjelenítés"
}
game/assets/jak2/text/game_custom_text_it-IT.json
+28 -28
View File
@@ -8,7 +8,7 @@
"1104": "Percorso di addestramento Vulcan",
"1105": "Percorso di addestramento Peace Maker",
"1106": "Sfida di Onin",
"1107": "Acchiappa la Testa di Metallo",
"1107": "Picchia-il-Metallo",
"1200": "Modalità schermo",
"1201": "In finestra",
"1202": "Schermo intero",
@@ -85,12 +85,12 @@
"124a": "Opzioni LED controller",
"124b": "Mostra stato giocatore",
"124c": "Mostra quantità HP",
"124d": "Disattiva autosalvataggio",
"124e": "Autosalvataggio disattivato",
"124f": "Vuoi davvero disattivare l'autosalvataggio?",
"124d": "Disattiva salvataggio automatico",
"124e": "Salvataggio automatico disattivato",
"124f": "Vuoi davvero disattivare il salvataggio automatico?",
"1250": "Jet Board Turbo a Haven City",
"1251": "Barre salute nemici",
"1252": "Barre integrità veicoli",
"1251": "Barra salute nemici",
"1252": "Barra integrità veicoli",
"1253": "Indistruttibilità veicoli",
"1254": "Statistiche",
"1255": "Cattura collezionabili automaticamente",
@@ -101,19 +101,19 @@
"125a": "Gioco veloce",
"125b": "Gioco lento",
"125c": "Viaggi istantanei a Haven City",
"125d": "Cerca-sfere precursor",
"125d": "Cerca-Sfere Precursor",
"125e": "Ora del giorno reale",
"125f": "Haven City pacifica",
"1260": "Indicatore acrobazie Jet Board",
"1261": "Brutto tempo",
"1262": "Bel tempo",
"1263": "Vehicle Hijack Voice Lines",
"1263": "Linee vocali per furti d'auto",
"1264": "Bloccato",
"1265": "Colpisci tutte e 3 le valvole e trova la Statua di Mar in \"~S\" entro ~D secondi",
"1266": "Riduce il numero di abitanti di Haven City di ~D",
"1267": "Riduce il numero di veicoli di Haven City di ~D",
"1268": "Uccidi ogni tipo di Testa di Metallo",
"1269": "Use the JET-Board to break open containers",
"1269": "Usa il Jet Board per spaccare le casse",
"126a": "Trasporta il Rift Rider senza che Samos e il Giovane Samos subiscano danni",
"1280": "Opzioni telecamera",
"1281": "Destra/Sinistra (prima persona)",
@@ -128,7 +128,7 @@
"128a": "Predefinito",
"128b": "Basso",
"128c": "Alto",
"128d": "Crediti",
"128d": "Titoli di coda",
"128e": "Frequenza di aggiornamento",
"128f": "Varie",
"1290": "Modalità Speedrun",
@@ -139,7 +139,7 @@
"1295": "Zona morta analogico",
"1296": "Ignora se in secondo piano",
"1297": "Usa il LED per gli HP",
"1298": "Use LED for Other States",
"1298": "Usa il LED per altri stati",
"1299": "Attiva la tastiera",
"129a": "Attiva il mouse",
"129b": "Opzioni mouse",
@@ -150,7 +150,7 @@
"12a0": "Ombre oggetti",
"12a1": "Normale",
"12a2": "Esteso",
"12a3": "No valid resolutions found.",
"12a3": "Nessuna soluzione valida trovata.",
"12a4": "Automatico",
"12a5": "Bestiario",
"12a6": "Altre statistiche",
@@ -163,10 +163,10 @@
"12ad": "Scatter Gun",
"12ae": "Cannone Vulcan",
"12af": "Peacemaker",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b0": "Jet Board",
"12b1": "Acrobazia Jet Board",
"12b2": "Pugno del Titan Suit",
"12b3": "Corpo del Titan Suit",
"12b4": "Gunpod",
"12b5": "Pugno",
"12b6": "Flop",
@@ -175,16 +175,16 @@
"12b9": "Rotola",
"12bf": "Bomba oscura",
"12c0": "Esplosione oscura",
"12c3": "Guardia Krimzi",
"12c3": "Guardia Kremizi",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c8": "Mog",
"12c9": "Teste di Metallo",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"1300": "Nascondi cursore automaticamente",
"12ca": "Altri amici",
"12cb": "Altri nemici",
"1300": "Nascondi automaticamente cursore",
"1301": "Riassegna tasti",
"1302": "Tasti controller",
"1303": "Tasti tastiera",
@@ -206,22 +206,22 @@
"1313": "Ora locale",
"1314": "Attenzione!",
"1315": "Questa impostazione è sperimentale. Quando non è impostata su 60 FPS, potresti riscontrare problemi grafici e di gameplay.",
"1316": "Local Score",
"1320": "None",
"1316": "Punteggio locale",
"1320": "Nessuno",
"1321": "Giro",
"1322": "Boost",
"1323": "Capriola",
"1324": "Rail Grind",
"1325": "Rail Jump",
"1324": "Rail grind",
"1325": "Rail jump",
"1326": "Nosegrab",
"1327": "Method",
"1328": "Board Spin",
"1329": "Board Flip",
"1328": "Board spin",
"1329": "Board flip",
"132a": "Noseflip",
"132b": "Kickflip",
"132c": "Salto",
"132d": "Duck Jump",
"132e": "Quick Jump",
"132d": "Duck jump",
"132e": "Quick jump",
"132f": "Dark Jak",
"1330": "Bomba oscura",
"1331": "Esplosione oscura",
game/assets/jak2/text/game_custom_text_lt-LT.json
+45 -45
View File
@@ -8,7 +8,7 @@
"1104": "Vulcan Fury mokymo kursas",
"1105": "Taikos kūrėjo mokymo kursai",
"1106": "Onin žaidimas",
"1107": "Metalo galvos mišinys",
"1107": "Metalo galvų mušimas",
"1200": "Ekrano režimas",
"1201": "Windowed",
"1202": "Visas ekranas",
@@ -92,7 +92,7 @@
"1251": "Priešų gyvybės juostos",
"1252": "Transporto priemonių būsenos juostos",
"1253": "Transporto priemonės nepažeidžiamumas",
"1254": "Statistics",
"1254": "Statistikos",
"1255": "Automatiškai paimti kolekcionuojamus daiktus",
"1256": "Muzikos grotuvas",
"1257": "Jokių tekstūrų režimas",
@@ -107,14 +107,14 @@
"1260": "JET lentos triukų ekranas",
"1261": "Blogas oras",
"1262": "Gražus oras",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1263": "Transporto priemonės užgrobimo balso linijos",
"1264": "Užrakinta",
"1265": "Pataikykite į visus 3 vožtuvus ir suraskite Mar'so statulą per \"~S\" mažiau nei ~D sekundžių",
"1266": "Sumažinti Haveno miesto gyventojų skaičių iki ~D",
"1267": "Sumažinti Haveno miesto transporto priemonių skaičių iki ~D",
"1268": "Sumedžiokite visas metalo galvų rūšis",
"1269": "Naudokite JET-Lenta sudaužyti konteinerius",
"126a": "Transportuoti Plyšio raitelį, paliekant Samosą ir jaunąjį Samosą nepaliestus",
"1280": "Kameros parinktys",
"1281": "Kairė/dešinė (1-as asmuo)",
"1282": "Aukštyn/žemyn (1-as asmuo)",
@@ -150,40 +150,40 @@
"12a0": "Objekto šešėliai",
"12a1": "Normalus",
"12a2": "Išplėstas",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"12a3": "Nerasta tinkamų raiškų.",
"12a4": "Automatinis",
"12a5": "Bestiariumas",
"12a6": "Kitos Statistikos",
"12a7": "Iš viso nužudyta",
"12a8": "Nužudytas Jako",
"12a9": "Nužudytas Tamsaus Jako",
"12aa": "Nužudyta Daxterio",
"12ab": "Nužudytas kitų",
"12ac": "Blasteris",
"12ad": "Skleidiklinis Ginklas",
"12ae": "Vulkano Rūstybė",
"12af": "Taikos kūrėjas",
"12b0": "JET-lenta",
"12b1": "JET-Lentos Triukas",
"12b2": "Titano Kostiumo Smūgis",
"12b3": "Titano Kostiumo Kūnas",
"12b4": "Ginklo kapsulė",
"12b5": "Smūgis",
"12b6": "Flopas",
"12b7": "Aukštutinis pjūvis",
"12b8": "Suktis",
"12b9": "Ridentis",
"12bf": "Tamsos bomba",
"12c0": "Tamsos smūgis",
"12c3": "Krimzono sargybinis",
"12c4": "Sigas",
"12c5": "Ašlina",
"12c6": "Jinksas",
"12c7": "Grimas",
"12c8": "Mogas",
"12c9": "Metalo galvos",
"12ca": "Kiti draugai",
"12cb": "Kiti priešai",
"1300": "Automatinis žymeklio slėpimas",
"1301": "Iš naujo priskirti sąsajas",
"1302": "Kontrolerio sąsajos",
@@ -206,7 +206,7 @@
"1313": "Vietinis laikas",
"1314": "Įspėjimas!",
"1315": "Šis nustatymas yra labai eksperimentinis. Jei žaidžiama ne 60 kadrų per sekundę sparta, gali kilti vaizdo ir žaidimo problemų.",
"1316": "Local Score",
"1316": "Vietinis balas",
"1320": "Jokio",
"1321": "Suktis",
"1322": "Sustiprinti",
game/assets/jak2/text/game_custom_text_nl-NL.json
+146 -146
View File
@@ -1,46 +1,46 @@
{
"1a3": "Gelieve Geen Randapparatuur Te Verwijderen Of Aan Te Sluiten, Uw Systeem Niet Uit Te Schakelen En Het Spel Niet Af Te Sluiten",
"1b5": "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",
"1100": "Not in a mission",
"1101": "Playing a bonus mission",
"1102": "Scatter Gun Training Course",
"1103": "Blaster Training Course",
"1104": "Vulcan Fury Training Course",
"1105": "Peace Maker Training Course",
"1106": "Onin Game",
"1107": "Metal Head Mash",
"1100": "Niet in een missie",
"1101": "Een bonusmissie spelen",
"1102": "Trainingscursus voor verstrooiingswapens",
"1103": "Blaster-opleiding",
"1104": "Vulcan Fury-training",
"1105": "Training voor vredestichters",
"1106": "Ik ben Spel",
"1107": "Metalen kop puree",
"1200": "Weergavemodus",
"1201": "In-Venster",
"1202": "Volledig Scherm",
"1203": "Randloos Venster",
"1204": "Automatic",
"1205": "Custom",
"1203": "Randloos venster",
"1204": "Automatisch",
"1205": "Aangepast",
"1206": "4x3 (PS2)",
"1207": "16x9 (PS2)",
"1208": "Choose width and height ratio",
"1209": "Press <PAD_X> to confirm and exit.",
"120a": "Press <PAD_CIRCLE> to confirm and exit.",
"120b": "Ratio must not be lower than 4x3!",
"1208": "Kies de breedte- en hoogteverhouding",
"1209": "Druk op <PAD_X> om te bevestigen en af te sluiten.",
"120a": "Druk op <PAD_CIRCLE> om te bevestigen en af te sluiten.",
"120b": "De verhouding mag niet lager zijn dan 4x3!",
"120c": "Muziekspeler",
"120d": "V-Synch",
"120e": "Teksttaal",
"120f": "OpenGOAL Secrets",
"1210": "Width",
"1211": "Height",
"120d": "V-synchronisatie",
"120e": "Tekst taal",
"120f": "OpenGOAL-geheimen",
"1210": "Breedte",
"1211": "Hoogte",
"1212": "??????????",
"1213": "Now playing...",
"1214": "No Track",
"1213": "Nu spelen...",
"1214": "Geen spoor",
"1215": "Standaard",
"1216": "Morph Gun",
"1216": "Morphing-pistool",
"1217": "JET-Board",
"1218": "Titan Suit",
"1219": "Dark Jak",
"121a": "Vehicle",
"121b": "Danger",
"121c": "None",
"121d": "Low",
"1218": "Titan-pak",
"1219": "Donker Jak",
"121a": "Voertuig",
"121b": "Gevaar",
"121c": "Geen",
"121d": "Laag",
"121e": "Medium",
"121f": "High",
"121f": "Hoog",
"1220": "Haven Exploration",
"1221": "Guard Pursuit",
"1222": "Ram Head Battle (Alt)",
@@ -65,81 +65,81 @@
"1235": "Weapons Factory",
"1236": "Arena Race",
"1237": "Dead Town",
"1238": "Window Size",
"1239": "Select Window Size",
"1238": "Venstergrootte",
"1239": "Selecteer Venstergrootte",
"123a": "Spelresolutie",
"123b": "Select Game Resolution",
"123b": "Selecteer Spelresolutie",
"123c": "Detailniveau (Achtergrond)",
"123d": "Detailniveau (Voorgrond)",
"123f": "Toon Spreker In Subtitel",
"1240": "Nooit",
"1241": "Buiten Beeld",
"1242": "Altijd",
"1243": "Game Territory",
"1244": "America (SCEA)",
"1245": "Europe (SCEE)",
"1243": "Spelgebied",
"1244": "Amerika (SCEA)",
"1245": "Europa (SCEE)",
"1246": "Japan (SCEI)",
"1247": "Korea (SCEK)",
"1248": "MSAA",
"1249": "~DX",
"124a": "Controller LED Options",
"124b": "Show Player State",
"124c": "Show Amount of Health",
"124a": "Controller LED-opties",
"124b": "Toon spelerstatus",
"124c": "Toon hoeveelheid gezondheid",
"124d": "Automatisch Opslaan Uitschakelen",
"124e": "Automatich Opslaan Uitgeschakeld",
"124f": "Weet U Zeker Dat U Automatisch Opslaan Wilt Uitschakelen?",
"1250": "Turbo JET-Board in Haven City",
"1251": "Enemy Health Bars",
"1252": "Vehicle Health Bars",
"1253": "Vehicle Invulnerability",
"1254": "Statistics",
"1255": "Automatically Grab Collectables",
"1256": "Music Player",
"1257": "No Textures Mode",
"1258": "Fast Movies",
"1259": "Slow Movies",
"125a": "Fast Gameplay",
"125b": "Slow Gameplay",
"125c": "Instant Travel in Haven City",
"125d": "Precursor Orb Tracker",
"1251": "Vijandelijke gezondheidsbalken",
"1252": "Voertuiggezondheidsbalken",
"1253": "Onkwetsbaarheid van voertuigen",
"1254": "Statistieken",
"1255": "Verzamel automatisch verzamelobjecten",
"1256": "Muziekspeler",
"1257": "Geen texturenmodus",
"1258": "Snelle films",
"1259": "Langzame films",
"125a": "Snelle gameplay",
"125b": "Langzame gameplay",
"125c": "Direct reizen in Haven City",
"125d": "Voorloper Orb-tracker",
"125e": "Werkelijke Tijd",
"125f": "Pacified Haven City",
"1260": "JET-Board Trick Display",
"1261": "Bad Weather",
"1262": "Nice Weather",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"125f": "Gepacificeerde Havenstad",
"1260": "JET-Board-trucweergave",
"1261": "Slecht weer",
"1262": "Mooi weer",
"1263": "Spraaklijnen voor voertuigkaping",
"1264": "Op slot",
"1265": "Raak alle drie de kranen en vind Mar's standbeeld in \"~S\" in minder dan ~D seconden",
"1266": "Verminder het aantal inwoners van Haven City met ~D",
"1267": "Verminder het aantal voertuigen van Haven City met ~D",
"1268": "Jaag op elke soort Metal Head",
"1269": "Gebruik het JET-Board om containers open te breken",
"126a": "Vervoer de Rift Rider terwijl je Samos en Young Samos ongedeerd achterlaat",
"1280": "Cameraopties",
"1281": "Left/Right (1st Person)",
"1282": "Up/Down (1st Person)",
"1283": "Left/Right (3rd Person)",
"1284": "Up/Down (3rd Person)",
"1285": "Reset to Default",
"1281": "Links/rechts (1e persoon)",
"1282": "Omhoog/omlaag (1e persoon)",
"1283": "Links/Rechts (3e persoon)",
"1284": "Omhoog/omlaag (3e persoon)",
"1285": "Terugzetten naar standaard",
"1286": "Normaal",
"1287": "Omgekeerd",
"1288": "Particle Culling",
"1288": "Deeltjes ruimen",
"1289": "Weergave In Discord",
"128a": "Default",
"128b": "Low",
"128c": "High",
"128d": "Credits",
"128e": "Frame Rate",
"128a": "Standaard",
"128b": "Laag",
"128c": "Hoog",
"128d": "Kredieten",
"128e": "Frame rate",
"128f": "Allerlei",
"1290": "Speedrunner Modus",
"1290": "Speedrunner-modus",
"1291": "Invoeropties",
"1292": "Standaardwaarden Herstellen",
"1293": "Controller Opties",
"1294": "Selecteer Controller",
"1295": "Analoge Deadzone",
"1295": "Analoge dode zone",
"1296": "Negeer Als Venster Niet In Focus Is",
"1297": "Controller Led Voor Hp",
"1298": "Use LED for Other States",
"1298": "Gebruik LED voor andere staten",
"1299": "Activeer Toetsenbord",
"129a": "Activeer Muis",
"129b": "Computermuis Opties",
@@ -147,90 +147,90 @@
"129d": "Horizontale Gevoeligheid",
"129e": "Verticale Gevoeligheid",
"129f": "Speler Beweging",
"12a0": "Object Shadows",
"12a1": "Normal",
"12a2": "Extended",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12a0": "Objectschaduwen",
"12a1": "Normaal",
"12a2": "Verlengd",
"12a3": "Geen geldige resoluties gevonden.",
"12a4": "Automatisch",
"12a5": "Bestiarium",
"12a6": "Andere statistieken",
"12a7": "Totaal gedood",
"12a8": "Gedood door Jak",
"12a9": "Gedood door Donkere Jak",
"12aa": "Gedood door Daxter",
"12ab": "Gedood door anderen",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12ad": "Verstrooiingspistool",
"12ae": "Vulcan woede",
"12af": "Vredestichter",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12b1": "JET-Board-truc",
"12b2": "Titan Suit-punch",
"12b3": "Titan-paklichaam",
"12b4": "Geweerpod",
"12b5": "Pons",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12b7": "Bovensnede",
"12b8": "Draai",
"12b9": "Rollen",
"12bf": "Donkere bom",
"12c0": "Donkere explosie",
"12c3": "Krimzon-wacht",
"12c4": "Inspraak",
"12c5": "Asjelin",
"12c6": "Vervloekt",
"12c7": "Grimmig",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"1300": "Verberg Cursor Automatisch",
"12c9": "Metalhoofden",
"12ca": "Andere vrienden",
"12cb": "Andere vijanden",
"1300": "Cursor automatisch verbergen",
"1301": "Toetsenbindingen Opnieuw Toewijzen",
"1302": "Toetencombinaties Voor Controller",
"1303": "Toetsencombinaties Voor Toetsenbord",
"1304": "Toetsencombinaties Voor Muis",
"1305": "No Options",
"1306": "Waiting",
"1305": "Geen opties",
"1306": "Aan het wachten",
"1307": "Niet Toegewezen",
"1308": "Onbekend",
"1309": "High-Resolution Sky",
"130a": "Fast Airlocks and Doors",
"130b": "Fast Elevators",
"130c": "Speedrun",
"1309": "Lucht met hoge resolutie",
"130a": "Snelle luchtsluizen en deuren",
"130b": "Snelle liften",
"130c": "Snelheidsrun",
"130d": "Any%",
"130e": "Any% - Hoverless",
"130f": "All Missions",
"1310": "100%",
"1311": "Any% - All Orbs",
"1312": "Any% - Hero Mode",
"1313": "Local Time",
"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",
"1313": "Lokale tijd",
"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": "Boost",
"1323": "Flip",
"1324": "Rail Grind",
"1325": "Rail Jump",
"1326": "Nosegrab",
"1327": "Method",
"1328": "Board Spin",
"1329": "Board Flip",
"132a": "Noseflip",
"1323": "Omdraaien",
"1324": "Spoorwegslijpen",
"1325": "Spoorsprong",
"1326": "Neusgrijper",
"1327": "Methode",
"1328": "Bord draaien",
"1329": "Bord omdraaien",
"132a": "Neusbeweging",
"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",
"1336": "Fast Progress Menu",
"1337": "PS2 LOD Distance",
"1338": "Off",
"1339": "Display"
"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",
"1336": "Snel voortgangsmenu",
"1337": "PS2 LOD-afstand",
"1338": "Uit",
"1339": "Weergave"
}
game/assets/jak2/text/game_custom_text_pl-PL.json
+102 -102
View File
@@ -3,12 +3,12 @@
"1b5": "Kiedy ta ikona jest na ekranie, proszę nie odłączać ani podłączać żadnych urządzeń, wyłączać systemu oraz nie wyłączać gry",
"1100": "Poza misją",
"1101": "Grasz w misje bonusową",
"1102": "Kurs szkoleniowy Broni Rozpryskowej",
"1103": "Kurs szkoleniowy Blastera",
"1104": "Kurs szkoleniowy Furii Wulkanu",
"1105": "Kurs szkoleniowy Twórcy Pokoju",
"1102": "Kurs Szkoleniowy Broni Rozpryskowej",
"1103": "Kurs Szkoleniowy Blastera",
"1104": "Kurs Szkoleniowy Furii Wulkanu",
"1105": "Kurs Szkoleniowy Rozjemcy",
"1106": "Gra Onina",
"1107": "Metal Head Mash",
"1107": "Zmiażdżone Metalowe Łby",
"1200": "Tryb Wyświetlania",
"1201": "W Oknie",
"1202": "Pełny Ekran",
@@ -17,10 +17,10 @@
"1205": "Własna",
"1206": "4x3 (PS2)",
"1207": "16x9 (PS2)",
"1208": "Wybierz stosunek szerokości i wysokości",
"1208": "Wybierz proporcję szerokości i wysokości",
"1209": "Naciśnij <PAD_X> żeby potwierdzić i wyjść.",
"120a": "Naciśnij <PAD_CIRCLE> żeby potwierdzić i wyjść.",
"120b": "Rozdzielczość nie może być mniejsza niż 4x3!",
"120b": "Proporcja nie może być mniejsza niż 4x3!",
"120c": "Odtwarzacz Muzyki",
"120d": "Synchronizacja Pionowa",
"120e": "Język Tekstu",
@@ -28,19 +28,19 @@
"1210": "Szerokość",
"1211": "Wysokość",
"1212": "??????????",
"1213": "Now playing...",
"1213": "Teraz odtwarzane...",
"1214": "Brak utworu",
"1215": "Domyślne",
"1216": "Morph Gun",
"1216": "Karabin Przemianowy",
"1217": "Deska Odrzutowa",
"1218": "Strój Tytana",
"1219": "Mroczny Jak",
"121a": "Pojazd",
"121b": "Niebezpieczeństwo",
"121c": "None",
"121d": "Low",
"121e": "Medium",
"121f": "High",
"121c": "Brak",
"121d": "Niskie",
"121e": "Średnie",
"121f": "Wysokie",
"1220": "Haven Exploration",
"1221": "Guard Pursuit",
"1222": "Ram Head Battle (Alt)",
@@ -75,61 +75,61 @@
"1240": "Nigdy",
"1241": "Poza Ekranem",
"1242": "Zawsze",
"1243": "Game Territory",
"1243": "Terytorium gry",
"1244": "Ameryka (SCEA)",
"1245": "Europa (SCEE)",
"1246": "Japonia (SCEI)",
"1247": "Korea (SCEK)",
"1248": "MSAA",
"1249": "~DX",
"124a": "Controller LED Options",
"124a": "Opcje LED kontrolera",
"124b": "Pokaż stan gracza",
"124c": "Pokaż ilość życia",
"124d": "Wyłącz Autozapis",
"124e": "Autozapis Wyłączony",
"124f": "Czy na pewnochcesz wyłączyć autozapis?",
"1250": "Turbo JET-Board in Haven City",
"1251": "Paski życia wrogów",
"1252": "Paski zdrowia pojazdów",
"1250": "Przyspieszenie odrzutowej deski w Haven City",
"1251": "Paski zdrowia wrogów",
"1252": "Paski życia pojazdów",
"1253": "Niewrażliwość pojazdu",
"1254": "Statistics",
"1255": "Automatically Grab Collectables",
"1254": "Statystyki",
"1255": "Automatyczne zbieranie znajdziek",
"1256": "Odtwarzacz Muzyki",
"1257": "Tryb braku tekstur",
"1258": "Szybkie filmy",
"1259": "Slow Movies",
"125a": "Fast Gameplay",
"125b": "Slow Gameplay",
"125c": "Instant Travel in Haven City",
"125d": "Precursor Orb Tracker",
"1259": "Spowolnione filmy",
"125a": "Szybka rozgrywka",
"125b": "Wolna rozgrywka",
"125c": "Natychmiastowa podróż w mieście Haven",
"125d": "Lokalizator Kul Prekursorów",
"125e": "Rzeczywista Pora Dnia",
"125f": "Pacified Haven City",
"1260": "JET-Board Trick Display",
"1261": "Bad Weather",
"1262": "Nice Weather",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"125f": "Spacyfikowane Miasto Haven",
"1260": "Wyświetlanie trików na odrzutowej desce",
"1261": "Zła pogoda",
"1262": "Ładna pogoda",
"1263": "Linie dialogowe przejęcia pojazdu",
"1264": "Zablokowane",
"1265": "Uderz wszystkie 3 zawory i znajdź posąg Mara w \"~S\" w mniej niż ~D sekund",
"1266": "Zmniejsz populację przechodniów Miasta Haven o ~D",
"1267": "Zmniejsz ilość pojazdów Miasta Haven o ~D",
"1268": "Upoluj każdy rodzaj Metalowych Łbów",
"1269": "Użyj odrzutowej deski, aby otworzyć pojemniki",
"126a": "Przetransportuj Jeźdźca Rozpadlin oraz odstaw Samosa i Młodego Samosa bez szwanku",
"1280": "Opcje Kamery",
"1281": "Left/Right (1st Person)",
"1282": "Up/Down (1st Person)",
"1283": "Left/Right (3rd Person)",
"1284": "Up/Down (3rd Person)",
"1285": "Reset to Default",
"1281": "Lewo/Prawo (pierwsza osoba)",
"1282": "Góra/Dół (pierwsza osoba)",
"1283": "Lewo/Prawo (trzecia osoba)",
"1284": "Góra/Dół (trzecia osoba)",
"1285": "Zresetuj do ustawień domyślnych",
"1286": "Normalna",
"1287": "Odwrócona",
"1288": "Particle Culling",
"1288": "Optymalizacja cząsteczek",
"1289": "Bogata Obecność Discord",
"128a": "Default",
"128b": "Low",
"128c": "High",
"128d": "Credits",
"128e": "Frame Rate",
"128a": "Domyślny",
"128b": "Niskie",
"128c": "Wysokie",
"128d": "Napisy końcowe",
"128e": "Liczba klatek na sekundę",
"128f": "Różne",
"1290": "Tryb Speedrunnera",
"1291": "Opcje Wejścia",
@@ -139,7 +139,7 @@
"1295": "Martwa Strefa Gałki Analogowej",
"1296": "Ignoruj, jeśli Okno nie jest Aktywne",
"1297": "Led Kontrolera pokazuje Zdrowie",
"1298": "Use LED for Other States",
"1298": "Użyj LED dla innych stanów",
"1299": "Użycie Klawiatury",
"129a": "Użycie Myszy",
"129b": "Opcje Myszy",
@@ -147,55 +147,55 @@
"129d": "Czułość Pozioma",
"129e": "Czułość Pionowa",
"129f": "Poruszanie Się",
"12a0": "Object Shadows",
"12a1": "Normal",
"12a2": "Extended",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12a0": "Cienie obiektów",
"12a1": "Normalny",
"12a2": "Rozszerzony",
"12a3": "Nie znaleziono prawidłowych rozdzielczości.",
"12a4": "Automatyczny",
"12a5": "Bestiariusz",
"12a6": "Inne statystyki",
"12a7": "Całkowita liczba zabitych",
"12a8": "Zabitych przez Jaka",
"12a9": "Zabitych przez Mrocznego Jaka",
"12aa": "Zabitych przez Daxtera",
"12ab": "Zabitych przez innych",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12ad": "Broń Rozpryskowa",
"12ae": "Wulkaniczna Furia",
"12af": "Rozjemca",
"12b0": "Deska Odrzutowa",
"12b1": "Trik na Desce Odrzutowej",
"12b2": "Uderzenie Stroju Tytana",
"12b3": "Pancerz Stroju Tytana",
"12b4": "Wieżyczka",
"12b5": "Uderzenie",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12b7": "Podbródkowy",
"12b8": "Obrót",
"12b9": "Przewrót",
"12bf": "Mroczna Bomba",
"12c0": "Mroczny Ładunek",
"12c3": "Strażnik Krimzon",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"12c9": "Metalowe Łby",
"12ca": "Inni sojusznicy",
"12cb": "Inni wrogowie",
"1300": "Automatycznie Chowaj Kursor",
"1301": "Przypisz Przyciski",
"1302": "Przyciski Kontrolera",
"1303": "Przyciski Klawiatury",
"1304": "Przyciski Myszy",
"1305": "No Options",
"1306": "Waiting",
"1305": "Brak opcji",
"1306": "Oczekuje",
"1307": "Nieprzypisane",
"1308": "Nieznane",
"1309": "High-Resolution Sky",
"130a": "Fast Airlocks and Doors",
"130b": "Fast Elevators",
"1309": "Niebo o wysokiej rozdzielczości",
"130a": "Szybkie zawory i drzwi",
"130b": "Szybkie windy",
"130c": "Speedrun",
"130d": "Any%",
"130e": "Any% - Hoverless",
@@ -203,20 +203,20 @@
"1310": "100%",
"1311": "Any% - All Orbs",
"1312": "Any% - Hero Mode",
"1313": "Local Time",
"1313": "Czas lokalny",
"1314": "Ostrzeżenie!",
"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",
"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": "Board Spin",
"1329": "Board Flip",
"1328": "Wirowanie deską",
"1329": "Obrót deską",
"132a": "Noseflip",
"132b": "Kickflip",
"132c": "Skok",
@@ -226,11 +226,11 @@
"1330": "Mroczna Bomba",
"1331": "Mroczny Ładunek",
"1332": "Mroczny Gigant",
"1333": "PS2 Options",
"1334": "Actor Culling",
"1335": "Force Environment Mapping",
"1336": "Fast Progress Menu",
"1337": "PS2 LOD Distance",
"1338": "Off",
"1339": "Display"
"1333": "Opcje PS2",
"1334": "Optymalizacja aktorów",
"1335": "Wymuś mapowanie środowiska",
"1336": "Szybkie Menu Postępu",
"1337": "Odległość rysowania PS2",
"1338": "Wył.",
"1339": "Wyświetlacz"
}
game/assets/jak2/text/game_custom_text_pt-BR.json
+54 -54
View File
@@ -32,7 +32,7 @@
"1214": "Nenhuma Trilha",
"1215": "Padrão",
"1216": "Arma Metamórfica",
"1217": "TURBO-Prancha",
"1217": "JET-Board",
"1218": "Armadura Titã",
"1219": "Jak Sombrio",
"121a": "Veículo",
@@ -88,11 +88,11 @@
"124d": "Desabilitar Salvamento Automático",
"124e": "Salvamento Automático Desabilitado",
"124f": "Tem certeza que quer desabilitar o salvamento automático?",
"1250": "Super TURBO-Prancha na Cidade Bastião",
"1250": "Super JET-Board na Cidade Bastião",
"1251": "Barras de Vida do Inimigo",
"1252": "Barras de Vida do Veículo",
"1253": "Invulnerabilidade do Veículo",
"1254": "Statistics",
"1254": "Estatísticas",
"1255": "Coletar Automaticamente os Colecionáveis",
"1256": "Reprodutor de Música",
"1257": "Modo Sem Texturas",
@@ -104,17 +104,17 @@
"125d": "Contador de Orbe Precursor",
"125e": "Tempo Real do Dia",
"125f": "Cidade Bastião Pacificada",
"1260": "Tela de Truques da TURBO-Prancha",
"1260": "Tela de Truques da JET-Board",
"1261": "Clima Ruim",
"1262": "Clima Bom",
"1263": "Vehicle Hijack Voice Lines",
"1264": "Locked",
"1265": "Hit all 3 valves and find Mar's Statue in \"~S\" in under ~D seconds",
"1266": "Reduce Haven City's population count by ~D",
"1267": "Reduce Haven City's vehicle count by ~D",
"1268": "Hunt every species of Metal Head",
"1269": "Use the JET-Board to break open containers",
"126a": "Transport the Rift Rider while leaving Samos and Young Samos unscathed",
"1263": "Linhas de Voz de Veículos",
"1264": "Bloqueado",
"1265": "Acerte todas as 3 válvulas e encontre a Estátua de Mar em \"~S\" em menos de ~D segundos",
"1266": "Reduzir a população da Cidade de Haven em ~D",
"1267": "Reduzir o número de veículos da Cidade de Haven em ~D",
"1268": "Cace cada espécie de Cabeça de Metal",
"1269": "Use a JET-Board para quebrar contêineres",
"126a": "Transporte o Rift Rider, deixando Samos e o Jovem Samos ilesos",
"1280": "Opções de Câmera",
"1281": "Esquerda/Direita (1º Pessoa)",
"1282": "Cima/Baixo (1º Pessoa)",
@@ -147,43 +147,43 @@
"129d": "Sensibilidade Horizontal",
"129e": "Sensibilidade Vertical",
"129f": "Movimento do Jogador",
"12a0": "Object Shadows",
"12a0": "Sombras de Objeto",
"12a1": "Normal",
"12a2": "Extended",
"12a3": "No valid resolutions found.",
"12a4": "Automatic",
"12a5": "Bestiary",
"12a6": "Other Statistics",
"12a7": "Total Killed",
"12a8": "Killed by Jak",
"12a9": "Killed by Dark Jak",
"12aa": "Killed by Daxter",
"12ab": "Killed by Others",
"12ac": "Blaster",
"12ad": "Scatter Gun",
"12ae": "Vulcan Fury",
"12af": "Peacemaker",
"12a2": "Estendido",
"12a3": "Não foram encontradas resoluções válidas.",
"12a4": "Automático",
"12a5": "Bestiário",
"12a6": "Outras Estatísticas",
"12a7": "Total Eliminado",
"12a8": "Morto por Jak",
"12a9": "Morto por Jak Sombrio",
"12aa": "Morto por Daxter",
"12ab": "Morto por Outros",
"12ac": "Demolidor",
"12ad": "Arma de Dispersão",
"12ae": "Fúria Vulcana",
"12af": "Pacificador",
"12b0": "JET-Board",
"12b1": "JET-Board Trick",
"12b2": "Titan Suit Punch",
"12b3": "Titan Suit Body",
"12b4": "Gunpod",
"12b5": "Punch",
"12b6": "Flop",
"12b7": "Uppercut",
"12b8": "Spin",
"12b9": "Roll",
"12bf": "Dark Bomb",
"12c0": "Dark Blast",
"12c3": "Krimzon Guard",
"12b1": "Manobra da JET-Board",
"12b2": "Soco do Traje Titã",
"12b3": "Corpo do Traje Titã",
"12b4": "Contêiner de armas",
"12b5": "Soco",
"12b6": "Fracasso",
"12b7": "Gancho",
"12b8": "Girar",
"12b9": "Rolar",
"12bf": "Bomba Sombria",
"12c0": "Explosão Sombria",
"12c3": "Guarda Krimzon",
"12c4": "Sig",
"12c5": "Ashelin",
"12c6": "Jinx",
"12c7": "Grim",
"12c7": "Sinistro",
"12c8": "Mog",
"12c9": "Metal Heads",
"12ca": "Other Friends",
"12cb": "Other Enemies",
"12c9": "Cabeças de Metal",
"12ca": "Outros Amigos",
"12cb": "Outros Inimigos",
"1300": "Ocultar Automaticamente o Cursor",
"1301": "Reatribuir Mapeamento",
"1302": "Mapeamento do Controle",
@@ -205,12 +205,12 @@
"1312": "Any% - Hero Mode",
"1313": "Tempo Local",
"1314": "Aviso!",
"1315": "Esta configuração é altamente experimental. Quando não jogado a 60 quadros por segundo, problemas visuais e de jogabilidade podem surgir como resultado.",
"1316": "Local Score",
"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": "Spin",
"1321": "Girar",
"1322": "Impulso",
"1323": "Flip",
"1323": "Virar",
"1324": "Grind no Trilho",
"1325": "Salto no Trilho",
"1326": "Nosegrab",
@@ -226,11 +226,11 @@
"1330": "Bomba Sombria",
"1331": "Explosão Sombria",
"1332": "Gigante Sombrio",
"1333": "PS2 Options",
"1334": "Actor Culling",
"1335": "Force Environment Mapping",
"1336": "Fast Progress Menu",
"1337": "PS2 LOD Distance",
"1338": "Off",
"1339": "Display"
"1333": "Opções do PS2",
"1334": "Descarte de Ator",
"1335": "Forçar Mapeamento Ambiental",
"1336": "Menu de Progresso rápido",
"1337": "Distância LOD PS2",
"1338": "Desligado",
"1339": "Tela"
}
game/assets/sdl_controller_db.txt
+5 -1
View File
@@ -1478,6 +1478,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000d62000000228000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
03000000c62400001a54000001010000,PowerA Xbox One Mini Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
03000000d62000000b20000001010000,PowerA Xbox Series X Controller,a:b0,b:b1,x:b2,y:b3,back:b6,guide:b8,start:b7,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux,
03000000d62000000f20000001010000,PowerA Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
030000006d040000d2ca000011010000,Precision Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
03000000ff1100004133000010010000,PS2 Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
@@ -1570,7 +1571,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000a306000020f6000011010000,Saitek PS2700 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
05000000e804000000a000001b010000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
03000000d81d00000e00000010010000,Savior,a:b0,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b9,x:b4,y:b5,platform:Linux,
03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,x:b2,y:b3,dpleft:h0.8,dpright:h0.2,dpup:h0.1,dpdown:h0.4,leftx:a0,lefty:a1,leftstick:b8,rightx:a2,righty:a5,rightstick:b9,leftshoulder:b4,lefttrigger:a3,rightshoulder:b,righttrigger:a4,back:b6,start:b7,guide:b10,platform:Linux,
03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
03000000952e00004d43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
03000000952e00004e43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
03000000a30c00002500000011010000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Linux,
03000000790000001100000011010000,Sega Saturn,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Linux,
03000000790000002201000011010000,Sega Saturn,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
@@ -1802,6 +1805,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
417374726f2063697479206d696e6920,Astro City Mini,a:b23,b:b22,back:b29,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
35643263313264386134376362363435,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,start:b6,platform:Android,
32353831643566306563643065356239,Atari VCS Modern Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
4f64696e20436f6e74726f6c6c657200,AYN Odin,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b14,dpright:b13,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:+a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
32303165626138343962363666346165,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
38383337343564366131323064613561,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
34313430343161653665353737323365,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
game/graphics/opengl_renderer/foreground/Merc2.cpp
+3 -2
View File
@@ -1093,6 +1093,7 @@ Merc2::Draw* Merc2::alloc_normal_draw(const tfrag3::MercDraw& mdraw,
draw->first_bone = first_bone;
draw->light_idx = lights;
draw->num_triangles = mdraw.num_triangles;
draw->no_strip = mdraw.no_strip;
if (ignore_alpha) {
draw->flags |= IGNORE_ALPHA;
}
@@ -1283,8 +1284,8 @@ void Merc2::do_draws(const Draw* draw_array,
prof.add_tri(draw.num_triangles);
glBindBufferRange(GL_UNIFORM_BUFFER, 1, m_bones_buffer,
sizeof(math::Vector4f) * draw.first_bone, 128 * sizeof(ShaderMercMat));
glDrawElements(GL_TRIANGLE_STRIP, draw.index_count, GL_UNSIGNED_INT,
(void*)(sizeof(u32) * draw.first_index));
glDrawElements(draw.no_strip ? GL_TRIANGLES : GL_TRIANGLE_STRIP, draw.index_count,
GL_UNSIGNED_INT, (void*)(sizeof(u32) * draw.first_index));
}
if (!normal_vtx_buffer_bound) {
game/graphics/opengl_renderer/foreground/Merc2.h
+2
View File
@@ -190,6 +190,8 @@ class Merc2 {
u8 flags;
ModBuffers mod_vtx_buffer;
u8 fade[4];
// no strip hack for custom models
u8 no_strip;
};
struct LevelDrawBucket {
game/graphics/opengl_renderer/sprite/Sprite3.cpp
+7 -1
View File
@@ -846,7 +846,13 @@ void Sprite3::do_block_common(SpriteMode mode,
vert1.xyz_sx = m_vec_data_2d[sprite_idx].xyz_sx;
vert1.quat_sy = m_vec_data_2d[sprite_idx].flag_rot_sy;
vert1.rgba = m_vec_data_2d[sprite_idx].rgba / 255;
// ftoi'd in the original game, and I believe the VIF would discard the upper bits on pack
vert1.rgba = m_vec_data_2d[sprite_idx].rgba;
vert1.rgba.x() = (int)vert1.rgba.x() & 0xff;
vert1.rgba.y() = (int)vert1.rgba.y() & 0xff;
vert1.rgba.z() = (int)vert1.rgba.z() & 0xff;
vert1.rgba.w() = (int)vert1.rgba.w() & 0xff;
vert1.rgba /= 255;
vert1.flags_matrix[0] = m_vec_data_2d[sprite_idx].flag();
vert1.flags_matrix[1] = m_vec_data_2d[sprite_idx].matrix();
vert1.info[0] = 0; // hack
game/kernel/jak2/kboot.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "common/goal_constants.h"
#include "common/log/log.h"
#include "common/repl/util.h"
#include "common/repl/repl_wrapper.h"
#include "common/util/Timer.h"
#include "game/common/game_common_types.h"
game/kernel/jak3/kboot.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <cstring>
#include "common/log/log.h"
#include "common/repl/util.h"
#include "common/repl/repl_wrapper.h"
#include "common/util/Timer.h"
#include "game/common/game_common_types.h"
game/main.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ int main(int argc, char** argv) {
// or because it's portable mode)
if (enable_portable) {
lg::info("Portable mod enabled");
user_config_dir_override = file_util::get_current_executable_path();
user_config_dir_override = fs::path(file_util::get_current_executable_path()).parent_path();
}
if (!user_config_dir_override.empty()) {
lg::info("Overriding config directory with: {}", user_config_dir_override.string());
game/overlord/jak2/srpc.cpp
+7 -16
View File
@@ -472,11 +472,6 @@ void* RPC_Loader(unsigned int /*fno*/, void* data, int size) {
}
int VBlank_Handler(void*) {
bool bVar1;
int iVar2;
int iVar3;
uint8_t uVar4;
IopTicks = IopTicks + 1;
if (gSoundEnable == 0) {
return 1;
@@ -543,18 +538,14 @@ LAB_00008d9c:
info.diskspeed[1] = 0 /*DAT_00013488*/;
info.lastspeed = 0 /*gLastSpeed*/;
info.dupseg = 0 /*gDupSeg*/;
iVar2 = 1;
do {
iVar3 = snd_GetVoiceStatus(iVar2);
uVar4 = '\0';
if (iVar3 == 1) {
uVar4 = 0xff;
for (int i = 0; i < 48; i++) {
if (snd_GetVoiceStatus(i) == 1) {
info.chinfo[i] = -1;
} else {
info.chinfo[i] = 0;
}
info.chinfo[iVar2] = uVar4;
bVar1 = iVar2 < 0x30;
iVar2 = iVar2 + 1;
} while (bVar1);
LookupSound(0x29a); // lol idk
}
LookupSound(666); // music
/*
local_38 = &info;
game/tools/subtitle_editor/subtitle_editor.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ void SubtitleEditor::draw_repl_options() {
ImGui::Text("REPL Connected, should be good to go!");
ImGui::PopStyleColor();
} else {
if (ImGui::Button("Connect to REPL")) {
if (ImGui::Button("Connect to REPL on Port 8181")) {
m_repl.connect();
if (!m_repl.is_connected()) {
ImGui::PushStyleColor(ImGuiCol_Text, m_error_text_color);
game/tools/subtitle_editor/subtitle_editor_repl_client.cpp
-3
View File
@@ -8,9 +8,6 @@
SubtitleEditorReplClient::SubtitleEditorReplClient() {
int port = 8181;
if (g_game_version == GameVersion::Jak2) {
port = 8182;
}
m_repl = std::make_unique<ReplClient>(port);
}
goal_src/goal-lib.gc
-3
View File
@@ -1263,14 +1263,11 @@
(#cond
((eq? GAME_VERSION 'jak1)
(asm-file "goal_src/jak1/compiler-setup.gc")
(seval (fmt #t "Jak 1 Mode\n"))
)
((eq? GAME_VERSION 'jak2)
(asm-file "goal_src/jak2/compiler-setup.gc")
(seval (fmt #t "Jak 2 Mode\n"))
)
((eq? GAME_VERSION 'jak3)
(asm-file "goal_src/jak3/compiler-setup.gc")
(seval (fmt #t "Jak 3 Mode\n"))
)
)
goal_src/goos-lib.gs
+2 -2
View File
@@ -471,7 +471,7 @@
;; *user* is defined when goos starts!
(when *user*
(fmt #t "Loading user scripts for user: {}...\n" *user*)
;; (fmt #t "Loading user scripts for user: {}...\n" *user*)
;; i'm not sure what naming scheme to use here. user/<name>/user.gs?
;; the GOAL one is loaded in Compiler.cpp
(try-load-file (fmt #f "goal_src/user/{}/user.gs" *user*))
@@ -512,4 +512,4 @@
(define *default-territory* GAME_TERRITORY_SCEA)
;; whether to enable ps3 test levels for jak 2
(define USE_PS3_LEVELS #f)
(define USE_PS3_LEVELS #f)
goal_src/jak1/engine/ui/hud-classes.gc
+199 -85
View File
@@ -233,37 +233,61 @@
(deftype hud-health (hud)
((scale float)))
(defun part-hud-health-01-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* health 0 scale))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(defun part-hud-health-01-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* health 0 scale)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
(cond
((and *target* (< (-> *target* fact health) 1.0)) (set! (-> arg2 prev-pos x) 32.0))
((and *target* (< (-> *target* fact health) 1.0))
(set! (-> arg2 vector 2 w) 32.0)
)
(else
(let ((f0-3 128.0))
;; low health flashing
;; og:preserve-this modified to support high fps
(when (and *target* (= (-> *target* fact health) 1.0))
(let* ((scaled-frame-counter (the int (* DISPLAY_FPS_RATIO (-> *display* integral-frame-counter))))
(v1-16 (logand scaled-frame-counter 7)))
(set! f0-3
(if (zero? (logand scaled-frame-counter 8))
(+ 128.0 (* 18.142857 (the float v1-16)))
(- 255.0 (* 18.142857 (the float v1-16)))))))
(set! (-> arg2 pos y) f0-3)
(set! (-> arg2 pos z) f0-3)
(set! (-> arg2 pos w) f0-3))
(set! (-> arg2 prev-pos x) 128.0)))
(let ((f0-3 128.0))
;; low health flashing
;; og:preserve-this modified to support high fps
(when (and *target* (= (-> *target* fact health) 1.0))
(let* ((scaled-frame-counter (the int (* DISPLAY_FPS_RATIO (-> *display* integral-frame-counter))))
(v1-16 (logand scaled-frame-counter 7)))
(set! f0-3 (if (not (logtest? scaled-frame-counter 8))
(+ 128.0 (* 18.142857 (the float v1-16)))
(- 255.0 (* 18.142857 (the float v1-16)))
)
)
)
)
(set! (-> arg2 vector 2 x) f0-3)
(set! (-> arg2 vector 2 y) f0-3)
(set! (-> arg2 vector 2 z) f0-3)
)
(set! (-> arg2 vector 2 w) 128.0)
)
)
0
(none))
(defun part-hud-health-02-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* health 0 scale))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(if (and *target* (< (-> *target* fact health) 2.0)) (set! (-> arg2 prev-pos x) 32.0) (set! (-> arg2 prev-pos x) 128.0))
(defun part-hud-health-02-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* health 0 scale)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
(if (and *target* (< (-> *target* fact health) 2.0))
(set! (-> arg2 vector 2 w) 32.0)
(set! (-> arg2 vector 2 w) 128.0)
)
0
(none))
(defun part-hud-health-03-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* health 0 scale))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(if (and *target* (< (-> *target* fact health) 3.0)) (set! (-> arg2 prev-pos x) 32.0) (set! (-> arg2 prev-pos x) 128.0))
(defun part-hud-health-03-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* health 0 scale)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
(if (and *target* (< (-> *target* fact health) 3.0))
(set! (-> arg2 vector 2 w) 32.0)
(set! (-> arg2 vector 2 w) 128.0)
)
0
(none))
@@ -1058,9 +1082,14 @@
((scale float)
(text-y-offset int32)))
(defun part-hud-buzzer-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* buzzers 0 scale))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(none))
(defun part-hud-buzzer-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* buzzers 0 scale)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
(none)
)
(defmethod draw-hud ((this hud-buzzers))
(let ((t9-0 (method-of-type hud draw-hud))) (t9-0 this))
@@ -1247,96 +1276,181 @@
(scale-backing float)
(scale-blue float)))
(defun calculate-rotation-and-color-for-slice ((arg0 int) (arg1 float) (arg2 int) (arg3 int) (arg4 int) (arg5 hud-particle))
(defun calculate-rotation-and-color-for-slice ((arg0 int) (arg1 float) (arg2 int) (arg3 int) (arg4 int) (arg5 matrix))
(cond
((>= 0.0 arg1) (set! (-> arg5 init-pos w) -16566.045))
((>= 0.0 arg1)
(set! (-> arg5 vector 1 z) -16566.045)
)
(else
(let ((v1-1 arg0))
(cond
((zero? v1-1)
(if (< 1.0 arg1)
(set! (-> arg5 init-pos w) 910.2222)
(set! (-> arg5 init-pos w) (* 182.04445 (+ 5.0 (* 263.0 (- 1.0 arg1)))))))
((= v1-1 1)
(if (< 0.6666667 arg1)
(set! (-> arg5 init-pos w) 17294.223)
(set! (-> arg5 init-pos w) (* 182.04445 (+ 95.0 (* 173.0 (- 1.0 (* 1.5 arg1))))))))
((= v1-1 2)
(if (< 0.33333334 arg1)
(set! (-> arg5 init-pos w) 33678.223)
(set! (-> arg5 init-pos w) (* 182.04445 (+ 185.0 (* 83.0 (- 1.0 (* 3.0 arg1))))))))))))
(let ((v1-1 arg0))
(cond
((zero? v1-1)
(if (< 1.0 arg1)
(set! (-> arg5 vector 1 z) 910.2222)
(set! (-> arg5 vector 1 z) (* 182.04445 (+ 5.0 (* 263.0 (- 1.0 arg1)))))
)
)
((= v1-1 1)
(if (< 0.6666667 arg1)
(set! (-> arg5 vector 1 z) 17294.223)
(set! (-> arg5 vector 1 z) (* 182.04445 (+ 95.0 (* 173.0 (- 1.0 (* 1.5 arg1))))))
)
)
((= v1-1 2)
(if (< 0.33333334 arg1)
(set! (-> arg5 vector 1 z) 33678.223)
(set! (-> arg5 vector 1 z) (* 182.04445 (+ 185.0 (* 83.0 (- 1.0 (* 3.0 arg1))))))
)
)
)
)
)
)
;; low eco flashing
;; og:preserve-this modified to support high fps
(if (and (< 0.0 arg1)
(and (< arg1 0.2) (zero? (logand (the int (* DISPLAY_FPS_RATIO (-> *display* integral-frame-counter))) 4))))
(set! arg3 (* arg3 2)))
(set! (-> arg5 pos y) (the float arg2))
(set! (-> arg5 pos z) (the float arg3))
(set! (-> arg5 pos w) (the float arg4))
(if (and (< 0.0 arg1) (and (< arg1 0.2) (zero? (logand (the int (* DISPLAY_FPS_RATIO (-> *display* integral-frame-counter))) 4))))
(set! arg3 (* arg3 2))
)
(set! (-> arg5 vector 2 x) (the float arg2))
(set! (-> arg5 vector 2 y) (the float arg3))
(set! (-> arg5 vector 2 z) (the float arg4))
0
(none))
(defun part-hud-eco-timer-01-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-2 (/ (the float
(the-as uint
(- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time))))))
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))))
(defun part-hud-eco-timer-01-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-2
(/ (the float
(the-as uint (- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time)))
)
)
)
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))
)
)
(a2-1 0)
(a3-0 64)
(t0-0 128))
(case (-> *target* fact eco-type)
(((pickup-type eco-yellow)) (set! a2-1 128) (set! a3-0 96) (set! t0-0 0))
(((pickup-type eco-red)) (set! a2-1 128) (set! a3-0 32) (set! t0-0 0))
(((pickup-type eco-green)) (set! a2-1 0) (set! a3-0 128) (set! t0-0 32)))
(calculate-rotation-and-color-for-slice 0 f0-2 a2-1 a3-0 t0-0 arg2))
(let ((f0-3 (-> *hud-parts* power 0 scale-blue))) (set! (-> arg2 init-pos x) f0-3) (set! (-> arg2 pos x) f0-3))
(((pickup-type eco-yellow))
(set! a2-1 128)
(set! a3-0 96)
(set! t0-0 0)
)
(((pickup-type eco-red))
(set! a2-1 128)
(set! a3-0 32)
(set! t0-0 0)
)
(((pickup-type eco-green))
(set! a2-1 0)
(set! a3-0 128)
(set! t0-0 32)
)
)
(calculate-rotation-and-color-for-slice 0 f0-2 a2-1 a3-0 t0-0 arg2)
)
(let ((f0-3 (-> *hud-parts* power 0 scale-blue)))
(set! (-> arg2 vector 0 w) f0-3)
(set! (-> arg2 vector 1 w) f0-3)
)
0
(none))
(defun part-hud-eco-timer-02-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-2 (/ (the float
(the-as uint
(- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time))))))
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))))
(defun part-hud-eco-timer-02-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-2
(/ (the float
(the-as uint (- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time)))
)
)
)
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))
)
)
(a2-1 0)
(a3-0 64)
(t0-0 128))
(case (-> *target* fact eco-type)
(((pickup-type eco-yellow)) (set! a2-1 128) (set! a3-0 96) (set! t0-0 0))
(((pickup-type eco-red)) (set! a2-1 128) (set! a3-0 32) (set! t0-0 0))
(((pickup-type eco-green)) (set! a2-1 0) (set! a3-0 128) (set! t0-0 32)))
(calculate-rotation-and-color-for-slice 1 f0-2 a2-1 a3-0 t0-0 arg2))
(let ((f0-3 (-> *hud-parts* power 0 scale-blue))) (set! (-> arg2 init-pos x) f0-3) (set! (-> arg2 pos x) f0-3))
(((pickup-type eco-yellow))
(set! a2-1 128)
(set! a3-0 96)
(set! t0-0 0)
)
(((pickup-type eco-red))
(set! a2-1 128)
(set! a3-0 32)
(set! t0-0 0)
)
(((pickup-type eco-green))
(set! a2-1 0)
(set! a3-0 128)
(set! t0-0 32)
)
)
(calculate-rotation-and-color-for-slice 1 f0-2 a2-1 a3-0 t0-0 arg2)
)
(let ((f0-3 (-> *hud-parts* power 0 scale-blue)))
(set! (-> arg2 vector 0 w) f0-3)
(set! (-> arg2 vector 1 w) f0-3)
)
0
(none))
(defun part-hud-eco-timer-03-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-2 (/ (the float
(the-as uint
(- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time))))))
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))))
(defun part-hud-eco-timer-03-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-2
(/ (the float
(the-as uint (- (-> *target* fact eco-timeout)
(the-as uint (- (-> *display* game-frame-counter) (-> *target* fact eco-pickup-time)))
)
)
)
(the float (the-as uint (-> *FACT-bank* eco-full-timeout)))
)
)
(a2-1 0)
(a3-0 64)
(t0-0 128))
(case (-> *target* fact eco-type)
(((pickup-type eco-yellow)) (set! a2-1 128) (set! a3-0 96) (set! t0-0 0))
(((pickup-type eco-red)) (set! a2-1 128) (set! a3-0 32) (set! t0-0 0))
(((pickup-type eco-green)) (set! a2-1 0) (set! a3-0 128) (set! t0-0 32)))
(calculate-rotation-and-color-for-slice 2 f0-2 a2-1 a3-0 t0-0 arg2))
(let ((f0-3 (-> *hud-parts* power 0 scale-blue))) (set! (-> arg2 init-pos x) f0-3) (set! (-> arg2 pos x) f0-3))
(((pickup-type eco-yellow))
(set! a2-1 128)
(set! a3-0 96)
(set! t0-0 0)
)
(((pickup-type eco-red))
(set! a2-1 128)
(set! a3-0 32)
(set! t0-0 0)
)
(((pickup-type eco-green))
(set! a2-1 0)
(set! a3-0 128)
(set! t0-0 32)
)
)
(calculate-rotation-and-color-for-slice 2 f0-2 a2-1 a3-0 t0-0 arg2)
)
(let ((f0-3 (-> *hud-parts* power 0 scale-blue)))
(set! (-> arg2 vector 0 w) f0-3)
(set! (-> arg2 vector 1 w) f0-3)
)
0
(none))
(defun part-hud-eco-timer-backing-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* power 0 scale-backing))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(defun part-hud-eco-timer-backing-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* power 0 scale-backing)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
0
(none))
(defun part-hud-eco-timer-func ((arg0 basic) (arg1 basic) (arg2 hud-particle))
(let ((f0-0 (-> *hud-parts* power 0 scale-timer))) (set! (-> arg2 init-pos x) f0-0) (set! (-> arg2 pos x) f0-0))
(defun part-hud-eco-timer-func ((arg0 sparticle-system) (arg1 sparticle-cpuinfo) (arg2 matrix))
(let ((f0-0 (-> *hud-parts* power 0 scale-timer)))
(set! (-> arg2 vector 0 w) f0-0)
(set! (-> arg2 vector 1 w) f0-0)
)
0
(none))
goal_src/jak1/game.gp
+4 -3
View File
@@ -224,9 +224,9 @@
:tool 'build-level
:out '(,(string-append "$OUT/obj/" name ".go")))))
(defmacro build-actor (name)
(defmacro build-actor (name &key (gen-mesh #f))
(let* ((path (string-append "custom_assets/jak1/models/" name ".glb")))
`(defstep :in ,path
`(defstep :in '(,path ,(symbol->string gen-mesh))
:tool 'build-actor
:out '(,(string-append "$OUT/obj/" name "-ag.go")))))
@@ -1660,7 +1660,8 @@
;; generate the art group for a custom actor.
;; requires a .glb model file in custom_assets/jak1/models
(build-actor "test-actor")
;; to also generate a collide-mesh, add :gen-mesh #t
(build-actor "test-actor" :gen-mesh #t)
;;;;;;;;;;;;;;;;;;;;;
;; Game Engine Code
goal_src/jak1/levels/test-zone/test-zone-obs.gc
+69 -40
View File
@@ -23,25 +23,44 @@
:bounds (static-spherem 0 0 0 4.5)
:texture-level 2)
(defskelgroup *test-actor-sg* test-actor test-actor-lod0-jg test-actor-idle-ja
((test-actor-lod0-mg (meters 9999999)))
:bounds (static-spherem 0 0 0 5)
:texture-level 2
)
(defmethod init-collision! ((this test-actor))
(let ((cshape (new 'process 'collide-shape-moving this (collide-list-enum hit-by-player))))
(set! (-> cshape dynam) (copy *standard-dynamics* 'process))
(set! (-> cshape reaction) default-collision-reaction)
(set! (-> cshape no-reaction) (the (function collide-shape-moving collide-shape-intersect vector vector none) nothing))
;; (let ((mesh (new 'process 'collide-shape-prim-mesh cshape (the uint 0) (the uint 0))))
;; (set! (-> mesh prim-core collide-as) (collide-kind enemy))
;; (set! (-> mesh collide-with) (collide-kind target))
;; (set! (-> mesh transform-index) 6)
;; (set-vector! (-> mesh local-sphere) 0.0 0.0 0.0 (meters 4.5))
;; (set-root-prim! cshape mesh)
;; )
(let ((sphere (new 'process 'collide-shape-prim-sphere cshape (the uint 0))))
(set! (-> sphere prim-core collide-as) (collide-kind enemy))
(set! (-> sphere collide-with) (collide-kind target))
(set! (-> sphere prim-core action) (collide-action solid))
(set! (-> sphere prim-core offense) (collide-offense normal-attack))
(set-vector! (-> sphere local-sphere) 0.0 0.0 0.0 (meters 2))
(set-root-prim! cshape sphere))
(set! (-> cshape no-reaction)
(the (function collide-shape-moving collide-shape-intersect vector vector none) nothing)
)
(let ((cgroup (new 'process 'collide-shape-prim-group cshape (the uint 1) 0)))
(set! (-> cgroup prim-core collide-as) (collide-kind ground-object))
(set! (-> cgroup collide-with) (collide-kind target))
(set! (-> cgroup prim-core action) (collide-action solid rider-plat-sticky))
(set! (-> cgroup transform-index) 0)
(set-vector! (-> cgroup local-sphere) 0.0 0.0 0.0 (meters 5))
(set-root-prim! cshape cgroup)
(let ((mesh (new 'process 'collide-shape-prim-mesh cshape (the uint 0) (the uint 0))))
(set! (-> mesh prim-core collide-as) (collide-kind ground-object))
(set! (-> mesh collide-with) (collide-kind target))
(set! (-> mesh prim-core action) (collide-action solid rider-plat-sticky))
(set! (-> mesh prim-core offense) (collide-offense indestructible))
(set! (-> mesh transform-index) 0)
(set-vector! (-> mesh local-sphere) 0.0 (meters 0) 0.0 (meters 5))
(append-prim cgroup mesh)
)
; (let ((sphere (new 'process 'collide-shape-prim-sphere cshape (the uint 0))))
; (set! (-> sphere prim-core collide-as) (collide-kind enemy))
; (set! (-> sphere collide-with) (collide-kind target))
; (set! (-> sphere prim-core action) (collide-action solid))
; (set! (-> sphere prim-core offense) (collide-offense normal-attack))
; (set-vector! (-> sphere local-sphere) 0.0 0.0 0.0 (meters 2))
; (set-root-prim! cshape sphere)
; )
)
(set! (-> cshape nav-radius) (* 0.75 (-> cshape root-prim local-sphere w)))
(backup-collide-with-as cshape)
(set! (-> this root) cshape))
@@ -82,28 +101,38 @@
(defstate idle (test-actor)
:virtual #t
:event
(behavior ((proc process) (argc int) (message symbol) (block event-message-block))
(case message
(('attack 'touch)
(if (= (-> proc type) target)
(send-event proc 'attack #f (static-attack-info ((shove-up (meters 2.5)) (shove-back (meters 7.5)))))))))
:code
(behavior ()
(loop
(quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (degrees 45) (seconds-per-frame)))
(let ((bob (-> self bob-amount)))
(when (< 0.0 bob)
(set! (-> self root trans y)
(+ (-> self base y)
(* bob
(sin (* 109.22667 (the float (mod (+ (- (current-time) (-> self birth-time)) (-> self bob-offset)) (seconds 2))))))))
(update-transforms! (-> self root))))
; (dotimes (i (-> self node-list length))
; (let* ((joint (-> self node-list data i)) (jpos (vector<-cspace! (new-stack-vector0) joint)))
; (add-debug-sphere #t (bucket-id debug) jpos (meters 0.1) (static-rgba 0 #xff 0 #x40))
; (add-debug-text-sphere (!= (-> joint joint) #f) (bucket-id debug) jpos (meters 0.1) (-> joint joint name) (static-rgba 0 #xff 0 #x40))
; )
; )
(suspend)))
:post transform-post)
:event (behavior ((proc process) (argc int) (message symbol) (block event-message-block))
(case message
(('attack 'touch)
; (if (= (-> proc type) target)
; (send-event proc 'attack #f (static-attack-info ((shove-up (meters 2.5)) (shove-back (meters 7.5)))))
; )
#t
)
)
)
:code (behavior ()
(loop
(quaternion-rotate-y! (-> self root quat) (-> self root quat) (* (degrees 45) (seconds-per-frame)))
(let ((bob (-> self bob-amount)))
(when (< 0.0 bob)
(set! (-> self root trans y)
(+ (-> self base y)
(* bob (sin (* 109.22667 (the float (mod (+ (- (current-time) (-> self birth-time)) (-> self bob-offset)) (seconds 2))))))
)
)
(update-transforms! (-> self root))
)
)
; (debug-draw-tris (-> (res-lump-struct (-> self draw art-group data 0 extra) 'collide-mesh-group (array collide-mesh)) 0) self 2)
; (dotimes (i (-> self node-list length))
; (let* ((joint (-> self node-list data i)) (jpos (vector<-cspace! (new-stack-vector0) joint)))
; (add-debug-sphere #t (bucket-id debug) jpos (meters 0.1) (static-rgba 0 #xff 0 #x40))
; (add-debug-text-sphere (!= (-> joint joint) #f) (bucket-id debug) jpos (meters 0.1) (-> joint joint name) (static-rgba 0 #xff 0 #x40))
; )
; )
(suspend)
)
)
:post transform-post
)
goal_src/jak2/engine/debug/default-menu.gc
+66 -1
View File
@@ -3055,6 +3055,13 @@
#f
)
(defun dm-game-opengoal-cheat-toggle-pick-func ((arg0 int) (arg1 debug-menu-msg))
(if (= arg1 (debug-menu-msg press))
(logxor! (-> *pc-settings* cheats) (the-as uint (/ arg0 8)))
)
(logtest? (-> *pc-settings* cheats) (/ arg0 8))
)
(defun debug-menu-context-make-default-menus ((arg0 debug-menu-context))
(local-vars (sv-16 debug-menu-context))
(let ((s5-0 (new 'debug 'debug-menu arg0 "Main menu")))
@@ -3205,6 +3212,40 @@
)
(function "Continue Start" #f ,(lambda () (start 'play (-> *game-info* current-continue))))
(function "Kiosk Reset" #f ,(lambda () (auto-save-command 'restore 0 0 *default-pool* #f) (none)))
;; og:preserve-this new menu option
(function "Give Ammo and Collectables" #f ,(lambda () (send-event *target* 'get-pickup (pickup-type ammo-yellow) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-red) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-blue) 1000.0) (send-event *target* 'get-pickup (pickup-type ammo-dark) 1000.0) (send-event *target* 'get-pickup (pickup-type eco-pill-dark) 1000.0) (send-event *target* 'get-pickup (pickup-type skill) 1000.0) (send-event *target* 'get-pickup (pickup-type gem) 5000.0)))
(function "Unlock Everything" #f ,(lambda () (logior! (-> *game-info* features) (game-feature gun gun-yellow gun-red gun-blue gun-dark gun-upgrade-speed gun-upgrade-ammo gun-upgrade-damage pass-red pass-green pass-yellow pass-blue board darkjak darkjak-bomb0 darkjak-bomb1 darkjak-invinc darkjak-giant))))
(function "Finish Story" #f ,(lambda () (task-node-close! (game-task-node city-win-introduction))))
(function "Finish Optional Missions"
#f
,(lambda ()
(task-node-close! (game-task-node city-oracle-level3-training))
(task-node-close! (game-task-node city-burning-bush-ring-1-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-1-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-2-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-3-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-4-resolution))
(task-node-close! (game-task-node city-burning-bush-collection-1-resolution))
(task-node-close! (game-task-node city-burning-bush-racepoint-1-resolution))
(task-node-close! (game-task-node city-burning-bush-ring-2-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-5-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-6-resolution))
(task-node-close! (game-task-node city-burning-bush-shuttle-1-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-7-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-8-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-9-resolution))
(task-node-close! (game-task-node city-burning-bush-collection-2-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-10-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-11-resolution))
(task-node-close! (game-task-node city-burning-bush-ring-3-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-12-resolution))
(task-node-close! (game-task-node city-burning-bush-bombbot-1-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-13-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-14-resolution))
(task-node-close! (game-task-node city-burning-bush-get-to-15-resolution))
(task-node-close! (game-task-node city-burning-bush-collection-3-resolution))
(task-node-close! (game-task-node city-burning-bush-race-errol-resolution))
(task-node-close! (game-task-node city-burning-bush-race-port-resolution))))
(menu
"Secrets"
(flag "toggle-beard" 1 dm-game-secret-toggle-pick-func)
@@ -3218,7 +3259,7 @@
(flag "level-select" 256 dm-game-secret-toggle-pick-func)
(flag "scrap-book-1" 512 dm-game-secret-toggle-pick-func)
(flag "scrap-book-2" 1024 dm-game-secret-toggle-pick-func)
;; ;; og:preserve-this they missed one!
;; og:preserve-this they missed one!
(flag "scrap-book-3" 2048 dm-game-secret-toggle-pick-func)
(flag "gungame-blue" 4096 dm-game-secret-toggle-pick-func)
(flag "gungame-dark" 8192 dm-game-secret-toggle-pick-func)
@@ -3227,6 +3268,30 @@
(flag "big-head" 65536 dm-game-secret-toggle-pick-func)
(flag "little-head" 131072 dm-game-secret-toggle-pick-func)
)
;; og:preserve-this new menu
(menu
"OpenGOAL Cheats"
(flag "turbo-board" 1 dm-game-opengoal-cheat-toggle-pick-func)
(flag "health-bars" 2 dm-game-opengoal-cheat-toggle-pick-func)
(flag "vehicle-health-bars" 4 dm-game-opengoal-cheat-toggle-pick-func)
(flag "vehicle-invuln" 8 dm-game-opengoal-cheat-toggle-pick-func)
(flag "statistics" 16 dm-game-opengoal-cheat-toggle-pick-func)
(flag "suck-in-all" 32 dm-game-opengoal-cheat-toggle-pick-func)
(flag "music-player" 64 dm-game-opengoal-cheat-toggle-pick-func)
(flag "no-textures" 128 dm-game-opengoal-cheat-toggle-pick-func)
(flag "fast-movies" 256 dm-game-opengoal-cheat-toggle-pick-func)
(flag "slow-movies" 512 dm-game-opengoal-cheat-toggle-pick-func)
(flag "fast-speed" 1024 dm-game-opengoal-cheat-toggle-pick-func)
(flag "slow-speed" 2048 dm-game-opengoal-cheat-toggle-pick-func)
(flag "fast-travel" 4096 dm-game-opengoal-cheat-toggle-pick-func)
(flag "orb-tracker" 8192 dm-game-opengoal-cheat-toggle-pick-func)
(flag "real-time-of-day" 16384 dm-game-opengoal-cheat-toggle-pick-func)
(flag "city-peace" 32768 dm-game-opengoal-cheat-toggle-pick-func)
(flag "board-tricks" 65536 dm-game-opengoal-cheat-toggle-pick-func)
(flag "weather-bad" 131072 dm-game-opengoal-cheat-toggle-pick-func)
(flag "weather-good" 262144 dm-game-opengoal-cheat-toggle-pick-func)
(flag "hijack-lines" 524288 dm-game-opengoal-cheat-toggle-pick-func)
)
(menu "Continue")
(menu
"Settings"
goal_src/jak2/pc/subtitle2-h.gc
+5
View File
@@ -93,6 +93,9 @@
(citizen-female)
(oracle)
(precursor)
(metalkor-before-consite)
(metalkor-intro)
(max))
@@ -352,6 +355,8 @@
(set-subtitle-speaker-color! citizen-male (static-rgba #x70 #x70 #x70 #x80))
(set-subtitle-speaker-color! citizen-female (static-rgba #x70 #x70 #x70 #x80))
(set-subtitle-speaker-color<-speaker! metalkor-before-consite metalkor)
(set-subtitle-speaker-color<-speaker! metalkor-intro metalkor)
(set-subtitle-speaker-color<-speaker! kid jak)
(set-subtitle-speaker-color<-speaker! guard-a guard)
(set-subtitle-speaker-color<-speaker! guard-b guard)
goal_src/jak3/engine/ambient/ambient-h.gc
+49 -46
View File
@@ -25,6 +25,11 @@
(define-extern talker-surpress! (function int))
(define-extern voicebox-spawn (function process-drawable vector (pointer process)))
(declare-type talker-speech-class structure)
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id))
(declare-type talker process)
(define-extern talker-init (function talker-speech-class vector region none :behavior talker))
;; DECOMP BEGINS
(deftype talker-speech-class (structure)
@@ -51,7 +56,6 @@
)
)
(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id))
(deftype talker (process)
((trans vector :inline)
@@ -78,7 +82,6 @@
)
)
(define-extern talker-init (function talker-speech-class vector region none :behavior talker))
(define *talker-speech* (new 'static 'inline-array talker-speech-class 365
(new 'static 'talker-speech-class :name "none")
@@ -89,7 +92,7 @@
:speech #x1
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0408)
:text-message (text-id press-to-jump)
:on-close #f
:camera #f
)
@@ -100,7 +103,7 @@
:speech #x2
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-040a)
:text-message (text-id double-jump-how-to)
:on-close #f
:camera #f
)
@@ -111,7 +114,7 @@
:speech #x3
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-040b)
:text-message (text-id press-or-to-attack)
:on-close #f
:camera #f
)
@@ -122,7 +125,7 @@
:speech #x4
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-040b)
:text-message (text-id press-or-to-attack)
:on-close #f
:camera #f
)
@@ -142,7 +145,7 @@
:speech #x6
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-040d)
:text-message (text-id ground-pound-how-to)
:on-close #f
:camera #f
)
@@ -162,7 +165,7 @@
:speech #x8
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0409)
:text-message (text-id roll-how-to)
:on-close #f
:camera #f
)
@@ -173,7 +176,7 @@
:speech #x9
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -184,7 +187,7 @@
:speech #xa
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -195,7 +198,7 @@
:speech #xb
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040e)
:text-message (text-id high-jump-how-to)
:on-close #f
:camera #f
)
@@ -206,7 +209,7 @@
:speech #xc
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040e)
:text-message (text-id high-jump-how-to)
:on-close #f
:camera #f
)
@@ -235,7 +238,7 @@
:speech #xf
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-0408)
:text-message (text-id press-to-jump)
:on-close #f
:camera #f
)
@@ -246,7 +249,7 @@
:speech #x10
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040a)
:text-message (text-id double-jump-how-to)
:on-close #f
:camera #f
)
@@ -257,7 +260,7 @@
:speech #x11
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040a)
:text-message (text-id double-jump-how-to)
:on-close #f
:camera #f
)
@@ -268,7 +271,7 @@
:speech #x12
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-0409)
:text-message (text-id roll-how-to)
:on-close #f
:camera #f
)
@@ -288,7 +291,7 @@
:speech #x14
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -330,7 +333,7 @@
:speech #x18
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040d)
:text-message (text-id ground-pound-how-to)
:on-close #f
:camera #f
)
@@ -742,7 +745,7 @@
:speech #x44
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-0408)
:text-message (text-id press-to-jump)
:on-close #f
:camera #f
)
@@ -753,7 +756,7 @@
:speech #x45
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-0408)
:text-message (text-id press-to-jump)
:on-close #f
:camera #f
)
@@ -764,7 +767,7 @@
:speech #x46
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-0409)
:text-message (text-id roll-how-to)
:on-close #f
:camera #f
)
@@ -786,7 +789,7 @@
:speech #x48
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040a)
:text-message (text-id double-jump-how-to)
:on-close #f
:camera #f
)
@@ -808,7 +811,7 @@
:speech #x4a
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040e)
:text-message (text-id high-jump-how-to)
:on-close #f
:camera #f
)
@@ -819,7 +822,7 @@
:speech #x4b
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040e)
:text-message (text-id high-jump-how-to)
:on-close #f
:camera #f
)
@@ -830,7 +833,7 @@
:speech #x4c
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -841,7 +844,7 @@
:speech #x4d
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -852,7 +855,7 @@
:speech #x4e
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040d)
:text-message (text-id ground-pound-how-to)
:on-close #f
:camera #f
)
@@ -863,7 +866,7 @@
:speech #x4f
:text-duration (seconds 1)
:neg #x1
:text-message (text-id text-040d)
:text-message (text-id ground-pound-how-to)
:on-close #f
:camera #f
)
@@ -993,7 +996,7 @@
:speech #x5c
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0888)
:text-message (text-id use-turbo-to-break-obstacles)
:on-close #f
:camera #f
)
@@ -1119,7 +1122,7 @@
:speech #x69
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-06df)
:text-message (text-id activate-statue-by-punching-kicking-nose)
:on-close #f
:camera #f
)
@@ -1474,7 +1477,7 @@
:text-duration (seconds 5)
:delay (seconds 1)
:neg #x1
:text-message (text-id text-07ba)
:text-message (text-id you-can-now-afford-to-purchase-new-secrets)
:on-close #f
:camera #f
)
@@ -1486,7 +1489,7 @@
:text-duration (seconds 5)
:delay (seconds 1)
:neg #x1
:text-message (text-id text-0857)
:text-message (text-id new-secrets-available)
:on-close #f
:camera #f
)
@@ -1498,7 +1501,7 @@
:text-duration (seconds 5)
:delay (seconds 1)
:neg #x1
:text-message (text-id text-0858)
:text-message (text-id secrets-still-available)
:on-close #f
:camera #f
)
@@ -1510,7 +1513,7 @@
:text-duration (seconds 10)
:delay (seconds 1)
:neg #x1
:text-message (text-id text-0892)
:text-message (text-id congrats-600-orbs-new-duds)
:on-close #f
:camera #f
)
@@ -1678,7 +1681,7 @@
:text-duration (seconds 5)
:pos #x3
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -1689,7 +1692,7 @@
:text-duration (seconds 5)
:pos #x3
:neg #x1
:text-message (text-id text-040e)
:text-message (text-id high-jump-how-to)
:on-close #f
:camera #f
)
@@ -1700,7 +1703,7 @@
:text-duration (seconds 5)
:pos #x3
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -1711,7 +1714,7 @@
:text-duration (seconds 5)
:pos #x3
:neg #x1
:text-message (text-id text-040c)
:text-message (text-id roll-jump-how-to)
:on-close #f
:camera #f
)
@@ -3232,7 +3235,7 @@
:speech #x15c
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-077b)
:text-message (text-id press-to-grab-objects)
:on-close #f
:camera #f
)
@@ -3243,7 +3246,7 @@
:speech #x15d
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0807)
:text-message (text-id press-to-place-held-objects)
:on-close #f
:camera #f
)
@@ -3254,7 +3257,7 @@
:speech #x15e
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0864)
:text-message (text-id hold-to-use-shield)
:on-close #f
:camera #f
)
@@ -3284,7 +3287,7 @@
:speech #x161
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-07b4)
:text-message (text-id dark-strike-how-to)
:on-close #f
:camera #f
)
@@ -3295,7 +3298,7 @@
:speech #x162
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-07c3)
:text-message (text-id use-the-wave-concussor)
:on-close #f
:camera #f
)
@@ -3306,7 +3309,7 @@
:speech #x163
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-07c4)
:text-message (text-id hold-to-charge-and-then-release-to-fire-bigger-blast)
:on-close #f
:camera #f
)
@@ -3371,7 +3374,7 @@
:speech #x16a
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0862)
:text-message (text-id hold-to-auto-fire)
:on-close #f
:camera #f
)
@@ -3391,7 +3394,7 @@
:speech #x16c
:text-duration (seconds 5)
:neg #x1
:text-message (text-id text-0886)
:text-message (text-id press-again-to-make-gyro-burster-hover-in-place)
:on-close #f
:camera #f
)
goal_src/jak3/engine/common-obs/airlock.gc
+8 -4
View File
@@ -720,7 +720,8 @@
(goto cfg-42)
)
(suspend)
(ja :num! (seek! 0.0 (-> self close-speed-multiplier)))
;; og:preserve-this added speed modifier
(ja :num! (seek! 0.0 (* (get-airlock-close-speed *pc-settings*) (-> self close-speed-multiplier))))
(transform-post)
)
(label cfg-42)
@@ -887,7 +888,8 @@
)
(rotate-gear! self 65536.0)
(suspend)
(ja :num! (seek! (ja-aframe (-> self lock-frame) 0) (-> self pre-open-speed)))
;; og:preserve-this added speed modifier
(ja :num! (seek! (ja-aframe (-> self lock-frame) 0) (* (get-airlock-speed *pc-settings*) (-> self pre-open-speed))))
(transform-post)
)
(when (nonzero? (-> self sound-id))
@@ -917,7 +919,8 @@
)
(rotate-gear! self 65536.0)
(suspend)
(ja :num! (seek! (ja-aframe (-> self open-frame) 0) 2.0))
;; og:preserve-this added speed modifier
(ja :num! (seek! (ja-aframe (-> self open-frame) 0) (* (get-airlock-speed *pc-settings*) 2.0)))
(transform-post)
)
(when (nonzero? (-> self sound-id))
@@ -970,7 +973,8 @@
(while (not (ja-max? 0))
(rotate-gear! self 65536.0)
(suspend)
(ja :num! (seek!))
;; og:preserve-this added speed modifier
(ja :num! (seek! max (get-airlock-speed *pc-settings*)))
(transform-post)
)
(when (nonzero? (-> self sound-id))
goal_src/jak3/engine/common-obs/collectables.gc
+7
View File
@@ -2410,6 +2410,13 @@
(if arg5
(mem-copy! (&-> sv-56 type) (&-> arg5 type) 40)
)
;; og:preserve-this pc port cheat
(#when PC_PORT
(when (and (pc-cheats? (-> *pc-settings* cheats) suck-in-all)
(!= arg1 (pickup-type skill)))
(logior! (-> sv-56 options) (actor-option suck-in))
)
)
(set! (-> sv-56 pickup-type) s2-0)
(if (not (logtest? (actor-option dont-override-fact) (-> sv-56 options)))
(set! (-> sv-56 pickup-spawn-amount) 1.0)
goal_src/jak3/engine/gfx/foreground/foreground.gc
+1 -1
View File
@@ -2367,6 +2367,6 @@
(define *foreground* (new 'global 'foreground-globals))
(define *foreground-draw-engine* (new 'global 'engine 'draw 768 connection))
(define *foreground-draw-engine* (new 'global 'engine 'draw PROCESS_HEAP_MAX connection))
(kmemclose)
goal_src/jak3/engine/gfx/mood/time-of-day.gc
+1 -1
View File
@@ -530,7 +530,7 @@
(dotimes (v1-19 (-> *level* length))
(let ((a0-52 (-> *level* level v1-19)))
(when (= (-> a0-52 status) 'active)
(if (logtest? (-> a0-52 info level-flags) (level-flags lf9))
(if (logtest? (-> a0-52 info level-flags) (level-flags sky))
(set! (-> arg0 sky) #t)
)
(if (and (= (-> a0-52 display?) 'display) (-> a0-52 info special-mood))
goal_src/jak3/engine/gfx/ocean/ocean.gc
+5 -3
View File
@@ -1275,7 +1275,7 @@
(let ((s5-0 (-> *level* draw-level v1-2)))
(when (and s5-0 (= (-> s5-0 status) 'active))
(when (= (-> s5-0 display?) 'display)
(if (logtest? (-> s5-0 info level-flags) (level-flags lf13))
(if (logtest? (-> s5-0 info level-flags) (level-flags ocean-far))
(set! (-> this far-on) #t)
)
(let ((a0-13 (-> s5-0 info ocean)))
@@ -1289,10 +1289,12 @@
((and a0-13 (nonzero? (-> a0-13 value)))
(set! *ocean-map* (the-as ocean-map (-> a0-13 value)))
(set-height! *ocean-map* (-> s5-0 info ocean-height))
(if (logtest? (level-flags lf20) (-> s5-0 info level-flags))
(if (logtest? (level-flags ocean-all) (-> s5-0 info level-flags))
(set! (-> this all-on) #t)
)
(set! (-> this ocean-near-translucent?) (logtest? (-> s5-0 info level-flags) (level-flags lf12)))
(set! (-> this ocean-near-translucent?)
(logtest? (-> s5-0 info level-flags) (level-flags ocean-near-translucent))
)
(goto cfg-24)
)
)
goal_src/jak3/engine/gfx/sky/sky-tng.gc
+19 -28
View File
@@ -265,11 +265,6 @@
(defmethod draw-clouds ((this sky-work) (arg0 dma-buffer))
(local-vars (v1-19 float) (sv-16 cloud-vert-array) (sv-20 (inline-array sky-vertex)) (sv-32 int))
(when (zero? *sky-texture-anim-array*) ;; added
(return #f)
)
(rlet ((vf23 :class vf)
(vf27 :class vf)
)
@@ -549,40 +544,36 @@
)
(defmethod draw-fog ((this sky-work) (arg0 dma-buffer))
(when (zero? *sky-texture-anim-array*) ;; added
(return #f)
)
(let ((s4-0 (-> *sky-texture-anim-array* array-data 8 tex)))
(if s4-0
(dma-buffer-add-gs-set arg0
(tex0-1 (new 'static 'gs-tex0
:tcc #x1
:cld #x1
:psm (the-as int (-> s4-0 psm))
:cpsm (-> s4-0 clutpsm)
:cbp (-> s4-0 clutdest)
:th (log2 (-> s4-0 h))
:tw (log2 (-> s4-0 w))
:tbw (-> s4-0 width 0)
:tbp0 (-> s4-0 dest 0)
)
:tcc #x1
:cld #x1
:psm (the-as int (-> s4-0 psm))
:cpsm (-> s4-0 clutpsm)
:cbp (-> s4-0 clutdest)
:th (log2 (-> s4-0 h))
:tw (log2 (-> s4-0 w))
:tbw (-> s4-0 width 0)
:tbp0 (-> s4-0 dest 0)
)
)
(tex1-1 (new 'static 'gs-tex1 :mmag #x1 :mmin #x1))
(test-1 (new 'static 'gs-test
:ate #x1
:atst (gs-atest greater-equal)
:aref #x70
:afail #x3
:zte #x1
:ztst (gs-ztest greater-equal)
)
:ate #x1
:atst (gs-atest greater-equal)
:aref #x70
:afail #x3
:zte #x1
:ztst (gs-ztest greater-equal)
)
)
(clamp-1 (new 'static 'gs-clamp :wms (gs-tex-wrap-mode clamp) :wmt (gs-tex-wrap-mode clamp)))
(alpha-1 (new 'static 'gs-alpha :b #x1 :d #x1))
)
)
)
(let* ((v1-26 (the-as (inline-array qword) (-> arg0 base)))
(a0-22 *fog-texture-work*)
(f0-0 (-> a0-22 min-corner y))
@@ -651,7 +642,7 @@
(dotimes (a0-1 (-> *level* length))
(let ((a1-3 (-> *level* level a0-1)))
(when (= (-> a1-3 status) 'active)
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags lf9)))
(if (and (= (-> a1-3 display?) 'display) (logtest? (-> a1-3 info level-flags) (level-flags sky)))
(set! v1-0 #t)
)
)
@@ -677,7 +668,7 @@
(let ((s4-1 (the-as sky-work *fake-scratchpad-data*)))
(mem-copy! (the-as pointer s4-1) (the-as pointer this) #x2814)
(setup-stars s4-1 (-> s4-1 star-mat) (-> this upload-data))
(when (nonzero? (-> s4-1 star-colors 0 x))
(if (nonzero? (-> s4-1 star-colors 0 x))
(stars-transform-asm s4-1)
)
(cond
goal_src/jak3/engine/gfx/texture/texture-anim-tables.gc
-8
View File
@@ -5,14 +5,6 @@
;; name in dgo: texture-anim-tables
;; dgos: GAME
(define-extern *sky-texture-anim-array* (texture-anim-array texture-anim))
(define-extern *darkjak-texture-anim-array* (texture-anim-array texture-anim))
(define-extern *darkjak-highres-texture-anim-array* (texture-anim-array texture-anim))
(define-extern *skull-gem-texture-anim-array* (texture-anim-array texture-anim))
(define-extern *default-water-texture-anim-array* (texture-anim-array texture-anim))
(define-extern *default-warp-texture-anim-array* (texture-anim-array texture-anim))
(define-extern set-darkjak-texture-morph! (function float none))
;; DECOMP BEGINS
(define *sky-texture-anim-array*
goal_src/jak3/engine/level/level-h.gc
+18 -28
View File
@@ -172,37 +172,27 @@
:type uint32
:bitfield #t
(lf0 0)
(lf1 1)
(lf2 2)
(lf3 3)
(lf4 4)
(lf5 5)
(lf6 6)
(lf7 7)
(lf8 8)
(lf9 9)
(not-physical 1)
(ctycar 2)
(ctypes 3)
(external 4)
(title 5)
(borrow-load 6)
(end-mode 7)
(flut 8)
(sky 9)
(use-camera-other 10)
(lf11 11)
(lf12 12)
(lf13 13)
(display-wait 11)
(ocean-near-translucent 12)
(ocean-far 13)
(low-res-hfrag 14)
(lf15 15)
(lf16 16)
(lf17 17)
(lf18 18)
(lf19 19)
(lf20 20)
(city-borrow-available 15)
(mech 16)
(allow-unloaded 17)
(check-taskname-for-continue 18)
(city-borrow-high-priority 19)
(ocean-all 20)
(desert 21)
(lf22 22)
(lf23 23)
(lf24 24)
(lf25 25)
(lf26 26)
(lf27 27)
(lf28 28)
(lf29 29)
(lf30 30)
(lf31 31)
)
;; ---level-flags
goal_src/jak3/engine/level/level-info.gc
+359 -358
View File
File diff suppressed because it is too large Load Diff
goal_src/jak3/engine/level/level.gc
+12 -26
View File
@@ -478,15 +478,11 @@
it will kick out levels as needed to make a free slot, and set up a new level, and start
the load. This should only be used when you might want to start a load."
(local-vars (s5-1 level))
(start-debug "level-get-for-use: ~A ~A~%" arg0 arg1)
(init-level-system this #f)
(let* ((s2-0 (lookup-level-info arg0))
(s1-0 (remap-level-name s2-0))
)
(start-debug " remapped name: ~A~%" s1-0)
(let ((s5-0 (level-get this s1-0)))
(start-debug " existing? ~A~%" s5-0)
(when s5-0
(level-status-update! s5-0 arg1)
(set! s5-1 s5-0)
@@ -494,7 +490,6 @@
)
)
(let ((a0-7 (level-get-most-disposable this)))
(start-debug " most disposable: ~A~%" a0-7)
(set! s5-1 (if a0-7
(level-status-update! a0-7 'inactive)
a0-7
@@ -509,7 +504,7 @@
(let ((s0-0 (-> s2-0 master-level)))
(when s0-0
(let ((a0-10 (lookup-level-info s0-0)))
(when (not (logtest? (level-flags lf17) (-> a0-10 level-flags)))
(when (not (logtest? (level-flags allow-unloaded) (-> a0-10 level-flags)))
(dotimes (v1-16 (-> this length))
(let ((a0-15 (-> this level v1-16)))
(when (or (= (-> a0-15 status) 'active) (= (-> a0-15 status) 'alive) (= (-> a0-15 status) 'loaded))
@@ -606,7 +601,7 @@
(while (and (> s4-1 0) (car s5-1))
(when (and (!= (car s5-1) 'dummy)
(or (= arg1 'all) (let ((a0-31 (lookup-level-info (the-as symbol (car s5-1)))))
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags lf15))))
(and a0-31 (not (logtest? (-> a0-31 level-flags) (level-flags city-borrow-available))))
)
)
)
@@ -632,7 +627,6 @@
This can do both loading, linking, login, and activation.
This is somewhat similar to level-get-for-use, but requires that you already have the level object.
This function is the way to transition from loaded to alive/active."
(start-debug "level-status-update: ~A ~A (current ~A)~%" this arg0 (-> this status))
(case arg0
(('inactive)
(-> this status)
@@ -1696,7 +1690,7 @@
)
)
(-> this borrow-from-level)
(logtest? (-> this info level-flags) (level-flags lf6))
(logtest? (-> this info level-flags) (level-flags borrow-load))
)
(set! (-> this load-buffer-mode) (level-memory-mode borrow))
(let ((t0-2 (logand -64 (&+ (-> this heap current) 63))))
@@ -1750,10 +1744,8 @@
(defmethod login-begin ((this level))
"Start logging in loaded level data."
(set! (-> *texture-pool* allocate-func) texture-page-default-allocate)
(format 0 "LOGIN-BEGIN: ~A~%" this)
(cond
((-> this bsp)
(format 0 " and with a bsp too~%")
(let ((s5-0 (-> this bsp)))
(set! (-> s5-0 level tfrag-gs-test)
(if (logtest? (-> s5-0 texture-flags 0) (texture-page-flag alpha-enable))
@@ -2250,7 +2242,7 @@
"Remove level from memory."
(deactivate this)
(when (!= (-> this status) 'inactive)
(when (not (logtest? (level-flags lf17) (-> this info level-flags)))
(when (not (logtest? (level-flags allow-unloaded) (-> this info level-flags)))
(dotimes (s5-0 (-> *level* length))
(let ((v1-10 (-> *level* level s5-0)))
(when (or (= (-> v1-10 status) 'active) (= (-> v1-10 status) 'alive) (= (-> v1-10 status) 'loaded))
@@ -2530,7 +2522,6 @@
(defmethod init-level-system ((this level-group) (arg0 symbol))
"If needed, initialize the level system by loading common/art packages and allocating level heaps."
(when (zero? (-> *level* heap base))
(start-debug "allocating levels~%")
(kmemopen global "level-heaps")
(when (nmember "game" *kernel-packages*)
(set! *kernel-packages* (cons "art" *kernel-packages*))
@@ -2657,7 +2648,7 @@
(dotimes (a0-3 (-> this length))
(let ((a1-3 (-> this level a0-3)))
(when (= (-> a1-3 status) 'active)
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags lf1))))
(if (and (= (-> a1-3 name) v1-1) (not (logtest? (-> a1-3 info level-flags) (level-flags not-physical))))
(return a1-3)
)
)
@@ -2669,7 +2660,7 @@
(dotimes (a0-5 (-> this length))
(let ((a1-8 (-> this level a0-5)))
(when (= (-> a1-8 status) 'active)
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags lf1))))
(if (and (= (-> a1-8 name) v1-5) (not (logtest? (-> a1-8 info level-flags) (level-flags not-physical))))
(return a1-8)
)
)
@@ -2683,7 +2674,7 @@
(when (= (-> s2-0 status) 'active)
(let ((f0-0 (vector-vector-distance (-> s2-0 bsp bsphere) s5-0)))
(if (and (-> s2-0 inside-boxes?)
(not (logtest? (-> s2-0 info level-flags) (level-flags lf1)))
(not (logtest? (-> s2-0 info level-flags) (level-flags not-physical)))
(or (not s4-0) (< f0-0 f30-0))
)
(set! s4-0 s2-0)
@@ -2701,7 +2692,7 @@
(dotimes (v1-26 (-> this length))
(let ((a0-11 (-> this level v1-26)))
(when (= (-> a0-11 status) 'active)
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags lf1))))
(if (and (-> a0-11 meta-inside?) (not (logtest? (-> a0-11 info level-flags) (level-flags not-physical))))
(return a0-11)
)
)
@@ -2712,7 +2703,7 @@
(dotimes (v1-29 (-> this length))
(let ((a0-16 (-> this level v1-29)))
(when (= (-> a0-16 status) 'active)
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags lf1))))
(if (and (not v0-1) (not (logtest? (-> a0-16 info level-flags) (level-flags not-physical))))
(set! v0-1 a0-16)
)
)
@@ -2825,7 +2816,6 @@
(defun play ((arg0 symbol) (arg1 symbol))
"Start (or restart) the game!
This will start up the display process, and load the initial level."
(start-debug "call to play!~%")
(kmemopen global "level-boot")
(when *kernel-boot-level*
(bg (string->symbol (the-as string *kernel-boot-level*)))
@@ -3429,7 +3419,7 @@
(set! (-> s3-2 display?) (-> this target s5-2 display?))
)
(else
(if (and (logtest? (-> s3-2 info level-flags) (level-flags lf11))
(if (and (logtest? (-> s3-2 info level-flags) (level-flags display-wait))
(!= (-> this target s5-2 display?) 'display-no-wait)
)
(send-event *target* 'loading)
@@ -3492,7 +3482,7 @@
(if (= (-> a2-32 name) (-> this vis-nick))
(goto cfg-137)
)
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags lf1))))
(if (or (not v1-131) (not (logtest? (-> a2-32 info level-flags) (level-flags not-physical))))
(set! v1-131 a2-32)
)
(+! a0-55 1)
@@ -3615,7 +3605,7 @@
)
(or (-> *level* border?) (logtest? (-> *game-info* current-continue flags) (continue-flags change-continue)))
(and (or (and (!= (-> s3-0 name) (-> *game-info* current-continue level))
(or (not (logtest? (level-flags lf18) (-> s3-0 info level-flags)))
(or (not (logtest? (level-flags check-taskname-for-continue) (-> s3-0 info level-flags)))
(!= (-> s3-0 info taskname) (-> (lookup-level-info (-> *game-info* current-continue level)) taskname))
)
)
@@ -3895,8 +3885,6 @@
(none)
)
(format 0 "about to start level stuff...~%")
(when (zero? (-> *level* level0 art-group))
(kmemopen global "level-struct")
(let ((gp-0 *level*))
@@ -3942,5 +3930,3 @@
)
(kmemclose)
)
(format 0 "done level stuff...~%")
goal_src/jak3/engine/load/loader.gc
+1 -1
View File
@@ -392,7 +392,7 @@
)
((and (!= (-> *level* loading-level) (-> *level* level-default))
(or (< 81920.0 (-> this load-file-priority))
(logtest? (-> *level* loading-level info level-flags) (level-flags lf4))
(logtest? (-> *level* loading-level info level-flags) (level-flags external))
)
)
)
goal_src/jak3/engine/scene/scene.gc
+8 -2
View File
@@ -906,7 +906,7 @@
:virtual #t
:enter (behavior ((arg0 symbol))
(format 0 "scene-player: skipping scene~%")
(go-virtual release)
(set! (-> self aborted?) #t)
(set-time! (-> self state-time))
(if (= (-> *game-info* demo-state) 101)
(set-setting! 'audio-language #f 0.0 5)
@@ -1158,6 +1158,7 @@
)
)
)
(not (-> self aborted?))
)
(set-blackout-frames (seconds 0.1))
(suspend)
@@ -1234,7 +1235,8 @@
(disable *screen-filter*)
(deactivate self)
)
(when (< (-> self scene-index) (+ (-> self scene-list length) -1))
;; og:preserve-this there is a bug here. scene-index has already been advanced by this point, so we need to backtrack when checking things
(when (< (#if PC_PORT (1- (-> self scene-index)) (-> self scene-index)) (+ (-> self scene-list length) -1))
(set! (-> self scene-index) (+ (-> self scene-list length) -1))
(scene-player-method-24 self (-> self scene-list (-> self scene-index)) #t)
)
@@ -1575,6 +1577,10 @@
)
)
)
(#when PC_PORT ;; og:preserve-this until overlord2 is done
(backup-load-state-and-set-cmds *load-state* (-> self anim command-list))
(restore-load-state-and-cleanup *load-state*)
)
(if (and (-> self wait) *target* (focus-test? *target* grabbed))
(go-virtual release)
)
goal_src/jak3/engine/target/flut/target-flut.gc
+2 -2
View File
@@ -1138,12 +1138,12 @@
(set! (-> self flut entity) (-> v1-41 entity))
)
)
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags lf8)))
(when (not (and (-> self flut entity) (logtest? (-> self flut entity extra level info level-flags) (level-flags flut)))
)
(dotimes (v1-49 (-> *level* length))
(let ((a0-40 (-> *level* level v1-49)))
(when (= (-> a0-40 status) 'active)
(when (logtest? (-> a0-40 info level-flags) (level-flags lf8))
(when (logtest? (-> a0-40 info level-flags) (level-flags flut))
(let ((a0-42 (-> a0-40 entity data 0 entity)))
(when a0-42
(set! (-> self flut entity) (the-as entity-actor a0-42))
goal_src/jak3/engine/target/logic-target.gc
+7
View File
@@ -36,6 +36,13 @@
(set! (-> self control current-surface target-speed) (* (-> self control current-surface target-speed) f0-11))
(set! (-> self control current-surface transv-max) (* (-> self control current-surface transv-max) f0-11))
)
;; og:preserve-this turbo jet board cheat
(#when PC_PORT
(when (cheat-state-flag? turbo-board)
(*! (-> self control current-surface target-speed) (-> *pc-cheat-state* turbo-board-speed))
(*! (-> self control current-surface transv-max) (-> *pc-cheat-state* turbo-board-speed))
)
)
(let ((s5-0 (new-stack-vector0)))
(vector-z-quaternion! s5-0 (-> self control quat-for-control))
(when (logtest? (-> self control mod-surface flags) (surface-flag xz-local))
goal_src/jak3/engine/target/mech/mech.gc
+2 -2
View File
@@ -456,11 +456,11 @@
(defbehavior mech-target-init mech ((arg0 vector) (arg1 quaternion) (arg2 entity-actor))
(process-entity-set! self arg2)
(when (not (and (-> self level) (logtest? (level-flags lf16) (-> self level info level-flags))))
(when (not (and (-> self level) (logtest? (level-flags mech) (-> self level info level-flags))))
(dotimes (v1-4 (-> *level* length))
(let ((a0-7 (-> *level* level v1-4)))
(when (= (-> a0-7 status) 'active)
(when (logtest? (level-flags lf16) (-> a0-7 info level-flags))
(when (logtest? (level-flags mech) (-> a0-7 info level-flags))
(set! (-> self level) a0-7)
(goto cfg-12)
)

Some files were not shown because too many files have changed in this diff Show More