Skip to content

Commit 9151613

Browse files
xesdoogxesdoog
authored
Merge pull request YimMenu-Lua#128 from YimMenu-Lua/fix_stuff
fix: some fixes
2 parents 9d85a1a + 3fbeae7 commit 9151613

125 files changed

Lines changed: 5221 additions & 4206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/zip-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ jobs:
159159
- name: Bump Version
160160
if: steps.check_changes.outputs.should_proceed == 'true'
161161
run: |
162-
sed -i "s|return \".*\"|return \"${{steps.increment_tag.outputs.no_prefix}}\"|" SSV2/includes/version.lua
163-
sed -i "s|https://img.shields.io/badge/Script%20Version-v[0-9]\+\.[0-9]\+\.[0-9]\+-blue|https://img.shields.io/badge/Script%20Version-${{steps.increment_tag.outputs.version_number}}-blue|g" README.md
162+
sed -i "s|return \".*\"|return \"${{ steps.increment_tag.outputs.no_prefix }}\"|" SSV2/includes/version.lua
163+
sed -i "s|https://img.shields.io/badge/Script%20Version-v[0-9]\+\.[0-9]\+\.[0-9]\+-blue|https://img.shields.io/badge/Script%20Version-${{ steps.increment_tag.outputs.version_number }}-blue|g" README.md
164164
git config user.name "github-actions[bot]"
165165
git config user.email "github-actions[bot]@users.noreply.github.com"
166166
git add SSV2/includes/version.lua README.md
@@ -173,7 +173,7 @@ jobs:
173173
with:
174174
type: 'zip'
175175
filename: "Samurais_Scripts_${{ steps.increment_tag.outputs.version_number }}.zip"
176-
exclusions: /.git* /scripts* /docs* *.json *.md *.editorconfig *.py *.txt LICENSE
176+
exclusions: /.git* /dev* /docs* **.json **.md **.editorconfig **.py **.txt *.ps1 .gitignore LICENSE
177177

178178
- name: Upload Release
179179
if: steps.check_changes.outputs.should_proceed == 'true'

‎SSV2/includes/classes/Vector2.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
---@operator eq(vec2): boolean
2626
---@operator le(vec2): boolean
2727
---@operator lt(vec2): boolean
28-
vec2 = {}
28+
vec2 = { __type = "vec2" }
2929
vec2.__index = vec2
30-
vec2.__type = "vec2"
3130

3231

3332
--------------------------------------

‎SSV2/includes/classes/Vector4.lua‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
---@operator eq(vec4): boolean
2828
---@operator le(vec4): boolean
2929
---@operator lt(vec4): boolean
30-
vec4 = {}
30+
vec4 = { __type = "vec4" }
3131
vec4.__index = vec4
32-
vec4.__type = "vec4"
3332

3433

3534
--------------------------------------

‎SSV2/includes/classes/gta/CBaseSubHandlingData.lua‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ local CStructView = require("includes.classes.gta.CStructView")
1313
--------------------------------------
1414
-- Class: CBaseSubHandlingData
1515
--------------------------------------
16+
---@generic T
1617
---@class CBaseSubHandlingData : CStructBase<CBaseSubHandlingData>
1718
---@field protected m_ptr pointer
18-
---@field protected m_handling_type pointer<int32_t> -- 0x00C8
19+
---@field private m_handling_type pointer<int32_t> -- 0x00C8
20+
---@field public GetHandlingType fun(self: CBaseSubHandlingData): eHandlingType
1921
---@overload fun(ptr: pointer): CBaseSubHandlingData
2022
local CBaseSubHandlingData = CStructView("CBaseSubHandlingData", 0x00CC)
2123

‎SSV2/includes/classes/gta/CBikeHandlingData.lua‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,38 @@
77
-- * Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
88

99

10-
local CStructView = require("includes.classes.gta.CStructView")
10+
local CStructView = require("includes.classes.gta.CStructView")
11+
local CBaseSubHandlingData = require("includes.classes.gta.CBaseSubHandlingData")
1112

1213

1314
--------------------------------------
1415
-- Class: CBikeHandlingData
1516
--------------------------------------
16-
---@class CBikeHandlingData : CStructBase<CBikeHandlingData>
17-
---@field m_lean_fwd_com_mult pointer<float> -- 0x0008
18-
---@field m_lean_fwd_force_mult pointer<float> -- 0x000C
19-
---@field m_lean_back_com_mult pointer<float> -- 0x0010
20-
---@field m_lean_back_force_mult pointer<float> -- 0x0014
21-
---@field m_max_bank_angle pointer<float> -- 0x0018
22-
---@field m_anim_angle pointer<float> -- 0x001C
23-
---@field m_anim_angle_inv pointer<float> -- 0x0020
24-
---@field m_unk_0024 pointer<float> -- 0x0024
25-
---@field m_lean_mult pointer<float> -- 0x0028
26-
---@field m_brake_force_mult pointer<float> -- 0x002C
27-
---@field m_air_steer_mult pointer<float> -- 0x0030
28-
---@field m_wheelie_balance_point pointer<float> -- 0x0034
29-
---@field m_stoppie_balance_mult pointer<float> -- 0x0038
30-
---@field m_wheelie_steer_mult pointer<float> -- 0x003C
31-
---@field m_rear_balance_mult pointer<float> -- 0x0040
32-
---@field m_front_balance_mult pointer<float> -- 0x0044
33-
---@field m_ground_side_friction_mult pointer<float> -- 0x0048
34-
---@field m_wheel_ground_side_friction_mult pointer<float> -- 0x004C
35-
---@field m_unk_angle_0050 pointer<float> -- 0x0050
36-
---@field m_unk_angle_0054 pointer<float> -- 0x0054
37-
---@field m_jump_force_mult pointer<float> -- 0x0058
17+
---@class CBikeHandlingData : CBaseSubHandlingData
18+
---@field protected m_ptr pointer
19+
---@field public m_lean_fwd_com_mult pointer<float> -- 0x0008
20+
---@field public m_lean_fwd_force_mult pointer<float> -- 0x000C
21+
---@field public m_lean_back_com_mult pointer<float> -- 0x0010
22+
---@field public m_lean_back_force_mult pointer<float> -- 0x0014
23+
---@field public m_max_bank_angle pointer<float> -- 0x0018
24+
---@field public m_anim_angle pointer<float> -- 0x001C
25+
---@field public m_anim_angle_inv pointer<float> -- 0x0020
26+
---@field public m_unk_0024 pointer<float> -- 0x0024
27+
---@field public m_lean_mult pointer<float> -- 0x0028
28+
---@field public m_brake_force_mult pointer<float> -- 0x002C
29+
---@field public m_air_steer_mult pointer<float> -- 0x0030
30+
---@field public m_wheelie_balance_point pointer<float> -- 0x0034
31+
---@field public m_stoppie_balance_mult pointer<float> -- 0x0038
32+
---@field public m_wheelie_steer_mult pointer<float> -- 0x003C
33+
---@field public m_rear_balance_mult pointer<float> -- 0x0040
34+
---@field public m_front_balance_mult pointer<float> -- 0x0044
35+
---@field public m_ground_side_friction_mult pointer<float> -- 0x0048
36+
---@field public m_wheel_ground_side_friction_mult pointer<float> -- 0x004C
37+
---@field public m_unk_angle_0050 pointer<float> -- 0x0050
38+
---@field public m_unk_angle_0054 pointer<float> -- 0x0054
39+
---@field public m_jump_force_mult pointer<float> -- 0x0058
3840
---@overload fun(ptr: pointer): CBikeHandlingData
39-
local CBikeHandlingData = CStructView("CBikeHandlingData", 0x005C)
41+
local CBikeHandlingData = Class("CBikeHandlingData", { parent = CBaseSubHandlingData, pointer_ctor = true })
4042

4143
---@param ptr pointer
4244
---@return CBikeHandlingData

‎SSV2/includes/classes/gta/CBoatHandlingData.lua‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88

99

1010
local CStructView = require("includes.classes.gta.CStructView")
11+
local CBaseSubHandlingData = require("includes.classes.gta.CBaseSubHandlingData")
1112

1213

1314
--------------------------------------
1415
-- Class: CBoatHandlingData
1516
--------------------------------------
16-
---@class CBoatHandlingData : CStructBase<CBoatHandlingData>
17+
---@class CBoatHandlingData : CBaseSubHandlingData
1718
---@overload fun(ptr: pointer): CBoatHandlingData
18-
local CBoatHandlingData = CStructView("CBoatHandlingData")
19+
local CBoatHandlingData = Class("CBoatHandlingData", { parent = CBaseSubHandlingData, pointer_ctor = true })
1920

2021
return CBoatHandlingData

‎SSV2/includes/classes/gta/CCarHandlingData.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
-- * Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
88

99

10-
local atArray = require("includes.classes.gta.atArray")
11-
local CStructView = require("includes.classes.gta.CStructView")
10+
local atArray = require("includes.classes.gta.atArray")
11+
local CBaseSubHandlingData = require("includes.classes.gta.CBaseSubHandlingData")
1212

1313

1414
--------------------------------------
1515
-- Class: CCarHandlingData
1616
--------------------------------------
17-
---@class CCarHandlingData : CStructBase<CCarHandlingData>
17+
---@class CCarHandlingData : CBaseSubHandlingData
1818
---@field protected m_ptr pointer
1919
---@field private m_size uint16_t
2020
---@field public m_back_end_popup_car_impulse_mult pointer<float> -- 0x0008
@@ -31,7 +31,7 @@ local CStructView = require("includes.classes.gta.CStructView")
3131
---@field public m_advanced_flags pointer<uint32_t> -- 0x003C
3232
---@field public m_advanced_data atArray<CAdvancedData> -- 0x0040
3333
---@overload fun(ptr: pointer): CCarHandlingData
34-
local CCarHandlingData = CStructView("CCarHandlingData", 0x0048)
34+
local CCarHandlingData = Class("CCarHandlingData", { parent = CBaseSubHandlingData, pointer_ctor = true })
3535

3636
---@param ptr pointer
3737
---@return CCarHandlingData

‎SSV2/includes/classes/gta/CEntity.lua‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ local fwDrawData = require("includes.classes.gta.fwDrawData")
2121
---@class CEntity: ClassMeta<CEntity>
2222
---@field protected m_ptr pointer
2323
---@field m_model_info pointer<CBaseModelInfo> -- 0x0020
24-
---@field m_entity_type uint8_t -- 0x0028
25-
---@field m_model_type pointer<uint8_t> -- CBaseModelInfo + 0x009D
26-
---@field m_flags pointer<uint32_t> -- 0x002D
27-
---@field m_draw_data fwDrawData -- 0x0048
28-
---@field m_transform_matrix pointer<fMatrix44> -- 0x0060
29-
---@field m_render_focus_distance pointer<uint32_t> -- 0x00A8
30-
---@field m_shadow_flags pointer<uint32_t> -- 0x00B0
31-
---@field m_damage_bits pointer<uint32_t> -- 0x0188
32-
---@field m_hostility pointer<uint8_t> -- 0x018C
33-
---@field m_health pointer<float> -- 0x0280
34-
---@field m_max_health pointer<float> -- 0x0284
35-
---@field m_attackers pointer<CAttackers> -- 0x0288
24+
---@field m_entity_type uint8_t
25+
---@field m_model_type pointer<eModelType> CBaseModelInfo + 0x009D
26+
---@field m_flags pointer<uint32_t> `FLAG_ISVISIBLE = 1 << 0`
27+
---@field m_draw_data fwDrawData
28+
---@field m_transform_matrix pointer<fMatrix44>
29+
---@field m_render_focus_distance pointer<uint32_t>
30+
---@field m_shadow_flags pointer<uint32_t>
31+
---@field m_damage_bits pointer<uint32_t>
32+
---@field m_hostility pointer<uint8_t>
33+
---@field m_health pointer<float>
34+
---@field m_max_health pointer<float>
35+
---@field m_attackers pointer_ref<CAttackers> -- 0x0288
3636
---@overload fun(entity: handle): CEntity
37-
local CEntity = Class("CEntity", { symbolic_size = 0x28C })
37+
local CEntity = Class("CEntity", { symbolic_size = 0x028C })
3838

3939
---@param entity handle
4040
---@return CEntity

‎SSV2/includes/classes/gta/CFlyingHandlingData.lua‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,59 @@
77
-- * Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
88

99

10-
local CStructView = require("includes.classes.gta.CStructView")
10+
local CStructView = require("includes.classes.gta.CStructView")
11+
local CBaseSubHandlingData = require("includes.classes.gta.CBaseSubHandlingData")
1112

1213

1314
--------------------------------------
1415
-- Class: CFlyingHandlingData
1516
--------------------------------------
16-
---@class CFlyingHandlingData : CStructBase<CFlyingHandlingData>
17-
---@field m_thrust pointer<float> -- 0x0008
18-
---@field m_thrust_falloff pointer<float> -- 0x000C
19-
---@field m_thrust_vectoring pointer<float> -- 0x0010
20-
---@field m_initial_thrust pointer<float> -- 0x0014
21-
---@field m_initial_thrust_falloff pointer<float> -- 0x0018
22-
---@field m_yaw_mult pointer<float> -- 0x001C
23-
---@field m_yaw_stability_mult pointer<float> -- 0x0020
24-
---@field m_side_slip_mult pointer<float> -- 0x0024
25-
---@field m_initial_yaw_mult pointer<float> -- 0x0028
26-
---@field m_roll_mult pointer<float> -- 0x002C
27-
---@field m_roll_stability_mult pointer<float> -- 0x0030
28-
---@field m_initial_roll_mult pointer<float> -- 0x0034
29-
---@field m_pitch_mult pointer<float> -- 0x0038
30-
---@field m_pitch_stability_mult pointer<float> -- 0x003C
31-
---@field m_initial_pitch_mult pointer<float> -- 0x0040
32-
---@field m_lift_mult pointer<float> -- 0x0044
33-
---@field m_unk_0048 pointer<float> -- 0x0048
34-
---@field m_dive_mult pointer<float> -- 0x004C
35-
---@field m_gear_down_drag_mult pointer<float> -- 0x0050
36-
---@field m_gear_down_lift_mult pointer<float> -- 0x0054
37-
---@field m_wind_force_mult pointer<float> -- 0x0058
38-
---@field m_move_resistance pointer<float> -- 0x005C
39-
---@field m_turn_resistance pointer<vec3> -- 0x0060
40-
---@field m_speed_resistance pointer<vec3> -- 0x0070
41-
---@field m_gear_door_front_state pointer<float> -- 0x0080
42-
---@field m_gear_door_rl_state pointer<float> -- 0x0084
43-
---@field m_gear_door_rr_state pointer<float> -- 0x0088
44-
---@field m_gear_door_rm_state pointer<float> -- 0x008C
45-
---@field m_turbulence_mag_max pointer<float> -- 0x0090
46-
---@field m_turbulence_force_mult pointer<float> -- 0x0094
47-
---@field m_turbulence_roll_torque_mult pointer<float> -- 0x0098
48-
---@field m_turbulence_pitch_torque_mult pointer<float> -- 0x009C
49-
---@field m_body_damage_control_effect_mult pointer<float> -- 0x00A0
50-
---@field m_unk_00A4 pointer<float> -- 0x00A4
51-
---@field m_ground_yaw_speed_max pointer<float> -- 0x00A8
52-
---@field m_ground_yaw_speed_cap pointer<float> -- 0x00AC
53-
---@field m_glide_mult pointer<float> -- 0x00B0
54-
---@field m_afterburner_effect_radius pointer<float> -- 0x00B4
55-
---@field m_afterburner_effect_dist pointer<float> -- 0x00B8
56-
---@field m_afterburner_effect_force_mult pointer<float> -- 0x00BC
57-
---@field m_submerge_level pointer<float> -- 0x00C0
58-
---@field m_unk_lift_00C4 pointer<float> -- 0x00C4
17+
---@class CFlyingHandlingData : CBaseSubHandlingData
18+
---@field protected m_ptr pointer
19+
---@field public m_thrust pointer<float> -- 0x0008
20+
---@field public m_thrust_falloff pointer<float> -- 0x000C
21+
---@field public m_thrust_vectoring pointer<float> -- 0x0010
22+
---@field public m_initial_thrust pointer<float> -- 0x0014
23+
---@field public m_initial_thrust_falloff pointer<float> -- 0x0018
24+
---@field public m_yaw_mult pointer<float> -- 0x001C
25+
---@field public m_yaw_stability_mult pointer<float> -- 0x0020
26+
---@field public m_side_slip_mult pointer<float> -- 0x0024
27+
---@field public m_initial_yaw_mult pointer<float> -- 0x0028
28+
---@field public m_roll_mult pointer<float> -- 0x002C
29+
---@field public m_roll_stability_mult pointer<float> -- 0x0030
30+
---@field public m_initial_roll_mult pointer<float> -- 0x0034
31+
---@field public m_pitch_mult pointer<float> -- 0x0038
32+
---@field public m_pitch_stability_mult pointer<float> -- 0x003C
33+
---@field public m_initial_pitch_mult pointer<float> -- 0x0040
34+
---@field public m_lift_mult pointer<float> -- 0x0044
35+
---@field public m_unk_0048 pointer<float> -- 0x0048
36+
---@field public m_dive_mult pointer<float> -- 0x004C
37+
---@field public m_gear_down_drag_mult pointer<float> -- 0x0050
38+
---@field public m_gear_down_lift_mult pointer<float> -- 0x0054
39+
---@field public m_wind_force_mult pointer<float> -- 0x0058
40+
---@field public m_move_resistance pointer<float> -- 0x005C
41+
---@field public m_turn_resistance pointer<vec3> -- 0x0060
42+
---@field public m_speed_resistance pointer<vec3> -- 0x0070
43+
---@field public m_gear_door_front_state pointer<float> -- 0x0080
44+
---@field public m_gear_door_rl_state pointer<float> -- 0x0084
45+
---@field public m_gear_door_rr_state pointer<float> -- 0x0088
46+
---@field public m_gear_door_rm_state pointer<float> -- 0x008C
47+
---@field public m_turbulence_mag_max pointer<float> -- 0x0090
48+
---@field public m_turbulence_force_mult pointer<float> -- 0x0094
49+
---@field public m_turbulence_roll_torque_mult pointer<float> -- 0x0098
50+
---@field public m_turbulence_pitch_torque_mult pointer<float> -- 0x009C
51+
---@field public m_body_damage_control_effect_mult pointer<float> -- 0x00A0
52+
---@field public m_unk_00A4 pointer<float> -- 0x00A4
53+
---@field public m_ground_yaw_speed_max pointer<float> -- 0x00A8
54+
---@field public m_ground_yaw_speed_cap pointer<float> -- 0x00AC
55+
---@field public m_glide_mult pointer<float> -- 0x00B0
56+
---@field public m_afterburner_effect_radius pointer<float> -- 0x00B4
57+
---@field public m_afterburner_effect_dist pointer<float> -- 0x00B8
58+
---@field public m_afterburner_effect_force_mult pointer<float> -- 0x00BC
59+
---@field public m_submerge_level pointer<float> -- 0x00C0
60+
---@field public m_unk_lift_00C4 pointer<float> -- 0x00C4
5961
---@overload fun(ptr: pointer): CFlyingHandlingData
60-
local CFlyingHandlingData = CStructView("CFlyingHandlingData", 0x00C8)
62+
local CFlyingHandlingData = Class("CFlyingHandlingData", { parent = CBaseSubHandlingData, pointer_ctor = true })
6163

6264
---@param ptr pointer
6365
---@return CFlyingHandlingData

0 commit comments

Comments
 (0)