Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: map s2 tokens #237

Draft
wants to merge 17 commits into
base: dev
Choose a base branch
from
Draft

feat: map s2 tokens #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c63164d
feat: map s2 tokens
Lierrmm Jan 24, 2025
77cbef0
feat: s2 tokens for _persistence
Lierrmm Jan 24, 2025
18891b1
feat: s2 tokens and methods
Lierrmm Jan 24, 2025
b5ae914
fix: update token_count size
Lierrmm Jan 24, 2025
094ec6c
chore: s2 token mapping
Lierrmm Jan 24, 2025
a23f5a5
chore: s2 token mapping
Lierrmm Jan 24, 2025
9f14e09
chore: s2 token mapping
Lierrmm Jan 24, 2025
3a74405
fix: ensure lowercase on functions
Lierrmm Jan 25, 2025
d7249a1
Merge branch 'xensik:dev' into dev
Lierrmm Jan 26, 2025
84cd42a
feat: s2 token mapping
Lierrmm Jan 26, 2025
8e84311
fix(s2): update token count
Lierrmm Jan 26, 2025
c4a05b7
feat: s2 token mapping
Lierrmm Jan 26, 2025
989f2c4
feat: s2 token mapping
Lierrmm Jan 26, 2025
c223122
feat: s2 token mapping
Lierrmm Jan 26, 2025
cb96394
fix(s2): correct token count
Lierrmm Jan 26, 2025
e243d3d
chore: s2 token mapping
Lierrmm Feb 1, 2025
fe1edf6
chore: s2 update token count
Lierrmm Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/xsk/gsc/engine/s2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace xsk::gsc::s2
constexpr usize code_count = 155;
constexpr usize func_count = 1000;
constexpr usize meth_count = 1700;
constexpr usize token_count = 5;
constexpr usize token_count = 826;
constexpr u32 max_string_id = 0xACEE;

struct context : public gsc::context
Expand Down
98 changes: 49 additions & 49 deletions src/gsc/engine/s2_func.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x031, "_func_031" },
{ 0x032, "_func_032" },
{ 0x033, "_func_033" },
{ 0x034, "_func_034" },
{ 0x034, "setdvar" },
{ 0x035, "_func_035" },
{ 0x036, "_func_036" },
{ 0x036, "setdvarifuninitialized" },
{ 0x037, "_func_037" },
{ 0x038, "_func_038" },
{ 0x039, "_func_039" },
{ 0x03A, "_func_03A" },
{ 0x03B, "_func_03B" },
{ 0x039, "getdvar" },
{ 0x03A, "getdvarint" },
{ 0x03B, "getdvarfloat" },
{ 0x03C, "_func_03C" },
{ 0x03D, "_func_03D" },
{ 0x03D, "gettime" },
{ 0x03E, "_func_03E" },
{ 0x03F, "_func_03F" },
{ 0x040, "_func_040" },
Expand Down Expand Up @@ -113,8 +113,8 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x065, "_func_065" },
{ 0x066, "_func_066" },
{ 0x067, "_func_067" },
{ 0x068, "_func_068" },
{ 0x069, "_func_069" },
{ 0x068, "spawn" },
{ 0x069, "bullettrace" },
{ 0x06A, "_func_06A" },
{ 0x06B, "_func_06B" },
{ 0x06C, "_func_06C" },
Expand Down Expand Up @@ -171,7 +171,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x09F, "_func_09F" },
{ 0x0A0, "_func_0A0" },
{ 0x0A1, "_func_0A1" },
{ 0x0A2, "_func_0A2" },
{ 0x0A2, "randomint" },
{ 0x0A3, "_func_0A3" },
{ 0x0A4, "_func_0A4" },
{ 0x0A5, "_func_0A5" },
Expand All @@ -181,7 +181,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x0A9, "_func_0A9" },
{ 0x0AA, "_func_0AA" },
{ 0x0AB, "_func_0AB" },
{ 0x0AC, "_func_0AC" },
{ 0x0AC, "int" },
{ 0x0AD, "_func_0AD" },
{ 0x0AE, "_func_0AE" },
{ 0x0AF, "_func_0AF" },
Expand Down Expand Up @@ -220,28 +220,28 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x0D0, "_func_0D0" },
{ 0x0D1, "_func_0D1" },
{ 0x0D2, "_func_0D2" },
{ 0x0D3, "_func_0D3" },
{ 0x0D3, "max" },
{ 0x0D4, "_func_0D4" },
{ 0x0D5, "_func_0D5" },
{ 0x0D6, "_func_0D6" },
{ 0x0D7, "_func_0D7" },
{ 0x0D8, "_func_0D8" },
{ 0x0D9, "_func_0D9" },
{ 0x0DA, "_func_0DA" },
{ 0x0DB, "_func_0DB" },
{ 0x0DB, "clamp" },
{ 0x0DC, "_func_0DC" },
{ 0x0DD, "_func_0DD" },
{ 0x0DE, "_func_0DE" },
{ 0x0DF, "_func_0DF" },
{ 0x0E0, "_func_0E0" },
{ 0x0E0, "distance" },
{ 0x0E1, "_func_0E1" },
{ 0x0E2, "_func_0E2" },
{ 0x0E3, "_func_0E3" },
{ 0x0E2, "distancesquared" },
{ 0x0E3, "length" },
{ 0x0E4, "_func_0E4" },
{ 0x0E5, "_func_0E5" },
{ 0x0E6, "_func_0E6" },
{ 0x0E7, "_func_0E7" },
{ 0x0E8, "_func_0E8" },
{ 0x0E8, "vectordot" },
{ 0x0E9, "_func_0E9" },
{ 0x0EA, "_func_0EA" },
{ 0x0EB, "_func_0EB" },
Expand Down Expand Up @@ -272,24 +272,24 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x104, "_func_104" },
{ 0x105, "_func_105" },
{ 0x106, "_func_106" },
{ 0x107, "_func_107" },
{ 0x108, "_func_108" },
{ 0x107, "vectornormalize" },
{ 0x108, "vectortoangles" },
{ 0x109, "_func_109" },
{ 0x10A, "_func_10A" },
{ 0x10B, "_func_10B" },
{ 0x10C, "_func_10C" },
{ 0x10D, "_func_10D" },
{ 0x10E, "_func_10E" },
{ 0x10C, "anglestoup" },
{ 0x10D, "anglestoright" },
{ 0x10E, "anglestoforward" },
{ 0x10F, "_func_10F" },
{ 0x110, "_func_110" },
{ 0x111, "_func_111" },
{ 0x112, "_func_112" },
{ 0x113, "_func_113" },
{ 0x114, "_func_114" },
{ 0x114, "issubstr" },
{ 0x115, "_func_115" },
{ 0x116, "_func_116" },
{ 0x116, "getsubstr" },
{ 0x117, "_func_117" },
{ 0x118, "_func_118" },
{ 0x118, "strtok" },
{ 0x119, "_func_119" },
{ 0x11A, "_func_11A" },
{ 0x11B, "_func_11B" },
Expand All @@ -300,8 +300,8 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x120, "_func_120" },
{ 0x121, "_func_121" },
{ 0x122, "_func_122" },
{ 0x123, "_func_123" },
{ 0x124, "_func_124" },
{ 0x123, "setmatchdata" },
{ 0x124, "getmatchdata" },
{ 0x125, "_func_125" },
{ 0x126, "_func_126" },
{ 0x127, "_func_127" },
Expand All @@ -326,24 +326,24 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x13A, "_func_13A" },
{ 0x13B, "_func_13B" },
{ 0x13C, "_func_13C" },
{ 0x13D, "_func_13D" },
{ 0x13D, "precachemodel" },
{ 0x13E, "_func_13E" },
{ 0x13F, "_func_13F" },
{ 0x140, "_func_140" },
{ 0x141, "_func_141" },
{ 0x140, "precachestring" },
{ 0x141, "precachemenu" },
{ 0x142, "_func_142" },
{ 0x143, "_func_143" },
{ 0x144, "_func_144" },
{ 0x145, "_func_145" },
{ 0x146, "_func_146" },
{ 0x145, "loadfx" },
{ 0x146, "playfx" },
{ 0x147, "_func_147" },
{ 0x148, "_func_148" },
{ 0x149, "_func_149" },
{ 0x14A, "_func_14A" },
{ 0x14B, "_func_14B" },
{ 0x14C, "_func_14C" },
{ 0x14D, "_func_14D" },
{ 0x14E, "_func_14E" },
{ 0x14E, "setfxkillondelete" },
{ 0x14F, "_func_14F" },
{ 0x150, "_func_150" },
{ 0x151, "_func_151" },
Expand All @@ -366,7 +366,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x162, "_func_162" },
{ 0x163, "_func_163" },
{ 0x164, "_func_164" },
{ 0x165, "_func_165" },
{ 0x165, "exitlevel" },
{ 0x166, "_func_166" },
{ 0x167, "_func_167" },
{ 0x168, "_func_168" },
Expand All @@ -389,7 +389,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x179, "_func_179" },
{ 0x17A, "_func_17A" },
{ 0x17B, "_func_17B" },
{ 0x17C, "_func_17C" },
{ 0x17C, "radiusdamage" },
{ 0x17D, "_func_17D" },
{ 0x17E, "_func_17E" },
{ 0x17F, "_func_17F" },
Expand All @@ -408,23 +408,23 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x18C, "_func_18C" },
{ 0x18D, "_func_18D" },
{ 0x18E, "_func_18E" },
{ 0x18F, "_func_18F" },
{ 0x18F, "getentarray" },
{ 0x190, "_func_190" },
{ 0x191, "_func_191" },
{ 0x191, "spawnstruct" },
{ 0x192, "_func_192" },
{ 0x193, "_func_193" },
{ 0x193, "isalive" },
{ 0x194, "_func_194" },
{ 0x195, "_func_195" },
{ 0x196, "_func_196" },
{ 0x197, "_func_197" },
{ 0x198, "_func_198" },
{ 0x199, "_func_199" },
{ 0x19A, "_func_19A" },
{ 0x19A, "newhudelem" },
{ 0x19B, "_func_19B" },
{ 0x19C, "_func_19C" },
{ 0x19D, "_func_19D" },
{ 0x19E, "_func_19E" },
{ 0x19F, "_func_19F" },
{ 0x19F, "isplayer" },
{ 0x1A0, "_func_1A0" },
{ 0x1A1, "_func_1A1" },
{ 0x1A2, "_func_1A2" },
Expand All @@ -435,10 +435,10 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x1A7, "_func_1A7" },
{ 0x1A8, "_func_1A8" },
{ 0x1A9, "_func_1A9" },
{ 0x1AA, "_func_1AA" },
{ 0x1AA, "weaponclass" },
{ 0x1AB, "getnextarraykey" },
{ 0x1AC, "_func_1AC" },
{ 0x1AD, "_func_1AD" },
{ 0x1AD, "tablelookup" },
{ 0x1AE, "_func_1AE" },
{ 0x1AF, "_func_1AF" },
{ 0x1B0, "_func_1B0" },
Expand All @@ -463,7 +463,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x1C3, "_func_1C3" },
{ 0x1C4, "_func_1C4" },
{ 0x1C5, "_func_1C5" },
{ 0x1C6, "_func_1C6" },
{ 0x1C6, "getarraykeys" },
{ 0x1C7, "getfirstarraykey" },
{ 0x1C8, "_func_1C8" },
{ 0x1C9, "_func_1C9" },
Expand All @@ -472,15 +472,15 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x1CC, "_func_1CC" },
{ 0x1CD, "_func_1CD" },
{ 0x1CE, "_func_1CE" },
{ 0x1CF, "_func_1CF" },
{ 0x1CF, "objective_delete" },
{ 0x1D0, "_func_1D0" },
{ 0x1D1, "_func_1D1" },
{ 0x1D2, "_func_1D2" },
{ 0x1D3, "_func_1D3" },
{ 0x1D4, "_func_1D4" },
{ 0x1D4, "weaponinventorytype" },
{ 0x1D5, "_func_1D5" },
{ 0x1D6, "_func_1D6" },
{ 0x1D7, "_func_1D7" },
{ 0x1D7, "weaponaltweaponname" },
{ 0x1D8, "_func_1D8" },
{ 0x1D9, "_func_1D9" },
{ 0x1DA, "_func_1DA" },
Expand All @@ -503,7 +503,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x1EB, "_func_1EB" },
{ 0x1EC, "_func_1EC" },
{ 0x1ED, "_func_1ED" },
{ 0x1EE, "_func_1EE" },
{ 0x1EE, "isbot" },
{ 0x1EF, "_func_1EF" },
{ 0x1F0, "_func_1F0" },
{ 0x1F1, "_func_1F1" },
Expand Down Expand Up @@ -630,7 +630,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x26A, "_func_26A" },
{ 0x26B, "_func_26B" },
{ 0x26C, "_func_26C" },
{ 0x26D, "_func_26D" },
{ 0x26D, "istestclient" },
{ 0x26E, "_func_26E" },
{ 0x26F, "_func_26F" },
{ 0x270, "_func_270" },
Expand Down Expand Up @@ -731,7 +731,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x2CF, "_func_2CF" },
{ 0x2D0, "_func_2D0" },
{ 0x2D1, "_func_2D1" },
{ 0x2D2, "_func_2D2" },
{ 0x2D2, "isdefined" },
{ 0x2D3, "_func_2D3" },
{ 0x2D4, "_func_2D4" },
{ 0x2D5, "_func_2D5" },
Expand Down Expand Up @@ -834,7 +834,7 @@ extern std::array<std::pair<u16, char const*>, func_count> const func_list
{ 0x336, "_func_336" },
{ 0x337, "_func_337" },
{ 0x338, "_func_338" },
{ 0x339, "_func_339" },
{ 0x339, "playsoundatpos" },
{ 0x33A, "_func_33A" },
{ 0x33B, "_func_33B" },
{ 0x33C, "_func_33C" },
Expand Down
Loading