3.6.1

gta3/SCM.INI

@@ -964,13 +964,13 @@ DATE=2020-11-11
 05de=-1,stream_custom_script %1s%
 05df=4,write_memory %1d% size %2d% value %3d% virtual_protect %4d%
 05e0=4,%4d% = read_memory %1d% size %2d% virtual_protect %3d%
-05e1=-1,call %1d% num_params %2h% pop %3h%
-05e2=-1,call_function %1d% num_params %2h% pop %3h%
+05e1=-1,call_function %1d% num_params %2h% pop %3h%
+05e2=-1,call_function_return %1d% num_params %2h% pop %3h%
 05e3=-1,call_method %1d% struct %2d% num_params %3h% pop %4h%
-05e4=-1,call_function_method %1d% struct %2d% num_params %3h% pop %4h%
+05e4=-1,call_method_return %1d% struct %2d% num_params %3h% pop %4h%
 05e5=1,%1d% = game_version
-05e6=2,%2d% = actor %1h% struct
-05e7=2,%2d% = car %1h% struct
+05e6=2,%2d% = ped %1h% struct
+05e7=2,%2d% = vehicle %1h% struct
 05e8=2,%2d% = object %1h% struct
 05e9=2,%2h% = ped_struct %1d% handle
 05ea=2,%2h% = vehicle_struct %1d% handle
@@ -982,10 +982,10 @@ DATE=2020-11-11
 05f0=7,%7d% = random_vehicle_near_point %1d% %2d% %3d% in_radius %4d% find_next %5h% pass_wrecked %6h% // IF and SET
 05f1=6,%6d% = random_object_near_point %1d% %2d% %3d% in_radius %4d% find_next %5h% // IF and SET
 05f2=1,%1d% = pop_float
-05f3=3,%3d% = %1d% exp %2d% //all floats
+05f3=3,%3d% = pow %1d% base %2d% // all floats
 05f4=3,%3d% = log %1d% base %2d% //all floats
-05f5=-1,call_scm_func %1p% params_count %2d%
-05f6=-1,ret %1d%
+05f5=-1,cleo_call %1p% params_count %2d%
+05f6=-1,cleo_return %1d%
 
 ; CLEO 2.0 - https://github.com/cleolibrary/III.VC.CLEO
 04C2=7,create_coordinate %5d% %6d% %7d% from_object %1d% offset %2d% %3d% %4d% ;0400 in VC
@@ -1078,18 +1078,24 @@ DATE=2020-11-11
 0AEC=2,%2d% = object_struct %1d% handle
 0AEE=3,%3d% = pow %1d% base %2d% // all floats
 0AEF=3,%3d% = log %1d% base %2d% // all floats
+
+; CLEO 2.0 IniFiles.cleo
 0AF0=4,%4d% = read_int_from_ini_file %1s% section %2s% key %3s%
 0AF1=4,write_int %1d% to_ini_file %2s% section %3s% key %4s%
 0AF2=4,%4d% = read_float_from_ini_file %1s% section %2s% key %3s%
 0AF3=4,write_float %1d% to_ini_file %2s% section %3s% key %4s%
 0AF4=4,%4d% = read_string_from_ini_file %1s% section %2s% key %3s%
 0AF5=4,write_string %1s% to_ini_file %2s% section %3s% key %4s%
+
+; CLEO 2.0 FileSystemOperations.cleo
 0B00=1,delete_file %1d% ;; IF and SET
 0B01=2,delete_directory %1d% with_all_files_and_subdirectories %2d% ;; IF and SET
 0B02=2,move_file %1d% to %2d% ;; IF and SET
 0B03=2,move_directory %1d% to %2d% ;; IF and SET
 0B04=2,copy_file %1d% to %2d% ;; IF and SET
 0B05=2,copy_directory %1d% to %2d% ;; IF and SET
+
+; CLEO 2.0 IntOperations.cleo
 0B10=3,%3d% = %1d% AND %2d%
 0B11=3,%3d% = %1d% OR %2d%
 0B12=3,%3d% = %1d% XOR %2d%
@@ -1100,12 +1106,16 @@ DATE=2020-11-11
 0B17=2,%1d% &= %2d%
 0B18=2,%1d% |= %2d%
 0B19=2,%1d% ^= %2d%
-0B1A=1,~%1d%
+0B1A=1,~ %1d%
 0B1B=2,%1d% %= %2d%
 0B1C=2,%1d% >>= %2d%
 0B1D=2,%1d% <<= %2d%
+
+; CLEO 2.0 ClipboardControl.cleo
 0B20=2,read_clipboard_data %1d% size %2d%
 0B21=2,write_clipboard_data %1d% size %2d%
+
+; CLEO 2.0 MemoryModule.cleo
 0BA2=2,%2h% = memory_load_library %1s%
 0BA3=1,memory_free_library %1h%
 0BA4=3,%3d% = memory_get_proc_address %1s% library %2d%

gta3/extensions.txt

@@ -941,33 +941,33 @@
 047e=default
 0481=default
 0482=default
-05dc=CLEO 1.1
-05dd=CLEO 1.1
-05de=CLEO 1.1
-05df=CLEO 1.1
-05e0=CLEO 1.1
-05e1=CLEO 1.1
-05e2=CLEO 1.1
-05e3=CLEO 1.1
-05e4=CLEO 1.1
-05e5=CLEO 1.1
-05e6=CLEO 1.1
-05e7=CLEO 1.1
-05e8=CLEO 1.1
-05e9=CLEO 1.1
-05ea=CLEO 1.1
-05eb=CLEO 1.1
-05ec=CLEO 1.1
-05ed=CLEO 1.1
-05ee=CLEO 1.1
-05ef=CLEO 1.1
-05f0=CLEO 1.1
-05f1=CLEO 1.1
-05f2=CLEO 1.1
-05f3=CLEO 1.1
-05f4=CLEO 1.1
-05f5=CLEO 1.1
-05f6=CLEO 1.1
+05dc=CLEO
+05dd=CLEO
+05de=CLEO
+05df=CLEO
+05e0=CLEO
+05e1=CLEO
+05e2=CLEO
+05e3=CLEO
+05e4=CLEO
+05e5=CLEO
+05e6=CLEO
+05e7=CLEO
+05e8=CLEO
+05e9=CLEO
+05ea=CLEO
+05eb=CLEO
+05ec=CLEO
+05ed=CLEO
+05ee=CLEO
+05ef=CLEO
+05f0=CLEO
+05f1=CLEO
+05f2=CLEO
+05f3=CLEO
+05f4=CLEO
+05f5=CLEO
+05f6=CLEO
 04C2=CLEO
 04C3=CLEO
 04C4=CLEO

gta3/keywords.txt

@@ -25,6 +25,28 @@
 
 ; CLEO 2.0 for GTA III
 ; https://github.com/thelink2012/gta3sc/blob/36e0a3ee852159ce6e5e164f495e6d7e83bece85/config/gtasa/cleo.xml
+05E5=get_game_version
+04C2=get_offset_from_object_in_world_coords
+04C3=get_offset_from_car_in_world_coords
+04C4=get_offset_from_char_in_world_coords
+046F=get_current_player_weapon
+04DD=get_char_armour
+04C9=is_player_in_flying_vehicle
+04A8=is_player_in_any_boat
+04AA=is_player_in_any_heli
+047E=is_player_on_any_bike
+0485=is_pc_version
+059A=is_australian_game
+0601=is_button_pressed_with_sensitivity
+0602=emulate_button_press_with_sensitivity
+0603=is_camera_in_widescreen_mode
+0604=get_weapontype_model
+0605=get_model_from_weapontype
+0606=set_memory_offset
+0607=get_current_weather
+0608=display_text_string
+0609=display_text_formatted
+0673=play_animation
 0A8C=write_memory
 0A8D=read_memory
 ; int 4@ = 5@ + 6@

gta3/opcodes.txt

@@ -738,6 +738,33 @@
 8443:   not player $PLAYER_CHAR sitting_in_any_car
 8447:   not player $PLAYER_CHAR lifting_a_phone
 8448:   not actor $EIGHTBALL sitting_in_car $CAR_EIGHTBALL
+05DC: terminate_this_custom_script
+05DD: terminate_all_custom_scripts_with_this_name 'BENZIN'
+05DE: stream_custom_script 'ShowTextBox.s'
+05DF: write_memory 0xC0BC15 size 1 value 1 virtual_protect 0
+05E0: $result = read_memory 1@ size 4 virtual_protect 0
+05E1: call_function $hPROC num_params 1 pop 1 $param
+05E2: call_function_return 0x569660 num_params 2 pop 2 $COORD_Y $COORD_X $GROUND
+05E3: call_method $Destroy struct $CarStruct num_params 0 pop 0
+05E4: call_method_return 0x4048E0 struct 0xB74494 num_params 1 pop 0 $MyCar 0@
+05E5: 0@ = game_version
+05E6: $ActorStruct = ped $PLAYER_ACTOR struct
+05E7: $CarStruct = vehicle $MyCar struct
+05E8: $ObjectStruct = object 0@ struct
+05E9: $actor = ped_struct $ped_struct handle
+05EA: $car = vehicle_struct $vehicle_struct handle
+05EB: $object = object_struct $object_struct handle
+05EC: 0@ = get_this_script_struct
+05ED: 0@ = get_script_struct_named 'OTB'
+05EE:   key_pressed 74
+05EF: $actor = random_actor_near_point 0@ 1@ 2@ in_radius 10.0 find_next 1 pass_deads 1 //IF and SET
+05F0: $car = random_vehicle_near_point 0@ 1@ 2@ in_radius 10.0 find_next 1 pass_wrecked 1 //IF and SET
+05F1: $object = random_object_near_point 0@ 1@ 2@ in_radius 10.0 find_next 1 //IF and SET
+05F2: 0@ = pop_float
+05F3: 0@ = pow 2.0 base 0.5 //all floats
+05F4: 0@ = log 10.0 base 2.718281828459045 //all floats
+05F5: cleo_call @GetSQR params_count 1 10 $result
+05F6: cleo_return 1 0@
 04C2: create_coordinate 0@ 1@ 2@ from_object 11@ offset -0.277 -16.662 3.152 ;0400 in VC
 04C3: create_coordinate 0@ 1@ 2@ from_car 10@ offset 0.0 -20.0 0.0 ;0407 in VC
 04C4: create_coordinate 0@ 1@ 2@ from_actor $PLAYER_ACTOR offset 0.0 1.2 0.0
@@ -826,7 +853,7 @@
 0AEA: $actor = ped_struct $ped_struct handle
 0AEB: $car = vehicle_struct $vehicle_struct handle
 0AEC: $object = object_struct $object_struct handle
-0AEE: 0@ = 2.0 pow 0.5 //all floats
+0AEE: 0@ = pow 2.0 base 0.5 //all floats
 0AEF: 0@ = log 10.0 base 2.718281828459045 //all floats
 0AF0: 0@ = read_int_from_ini_file "cleo\config.ini" section "SectionName" key "intKey"
 0AF1: write_int 16 to_ini_file "cleo\config.ini" section "SectionName" key "intKey"
@@ -850,7 +877,7 @@
 0B17: 0@ &= 1@
 0B18: 0@ |= 1@
 0B19: 0@ ^= 1@
-0B1A: ~0@
+0B1A: ~ 0@
 0B1B: 0@ %= 1@
 0B1C: 0@ >>= 1@
 0B1D: 0@ <<= 1@

sa/CustomLabels_v2.ini

@@ -12,7 +12,7 @@
 ; THREAD [MAIN]
 61148=Case_Video_Game
 61276=MS_Game_TheyCrawledFromUranus
-61294=MS_Game_Dualuty
+61294=MS_Game_Duality
 61312=MS_Game_GoGoSpaceMonkey
 61330=MS_Game_LetsGetReadyToBumble
 61348=MS_Game_Poker

sa/SASCM.INI

@@ -2071,25 +2071,40 @@ DATE=2020-11-11
 0AED=3,%3d% = float %1d% to_string_format %2d%
 0AEE=3,%3d% = pow %1d% base %2d% // all floats
 0AEF=3,%3d% = log %1d% base %2d% // all floats
+
+; CLEO 4 IniFiles.cleo
 0AF0=4,%4d% = read_int_from_ini_file %1s% section %2s% key %3s%
 0AF1=4,write_int %1d% to_ini_file %2s% section %3s% key %4s%
 0AF2=4,%4d% = read_float_from_ini_file %1s% section %2s% key %3s%
 0AF3=4,write_float %1d% to_ini_file %2s% section %3s% key %4s%
 0AF4=4,%4d% = read_string_from_ini_file %1s% section %2s% key %3s%
 0AF5=4,write_string %1s% to_ini_file %2s% section %3s% key %4s%
+
+; CLEO 4 FileSystemOperations.cleo
 0B00=1,delete_file %1d% ;; IF and SET
 0B01=2,delete_directory %1d% with_all_files_and_subdirectories %2d% ;; IF and SET
 0B02=2,move_file %1d% to %2d% ;; IF and SET
 0B03=2,move_directory %1d% to %2d% ;; IF and SET
 0B04=2,copy_file %1d% to %2d% ;; IF and SET
 0B05=2,copy_directory %1d% to %2d% ;; IF and SET
+
+; CLEO 4 IntOperations.cleo
 0B10=3,%3d% = %1d% AND %2d%
 0B11=3,%3d% = %1d% OR %2d%
 0B12=3,%3d% = %1d% XOR %2d%
 0B13=2,%2d% = NOT %1d%
 0B14=3,%3d% = %1d% MOD %2d%
 0B15=3,%3d% = %1d% SHR %2d%
 0B16=3,%3d% = %1d% SHL %2d%
+0B17=2,%1d% &= %2d%
+0B18=2,%1d% |= %2d%
+0B19=2,%1d% ^= %2d%
+0B1A=1,~ %1d%
+0B1B=2,%1d% %= %2d%
+0B1C=2,%1d% >>= %2d%
+0B1D=2,%1d% <<= %2d%
+
+; Deji's ClipboardCommands.cleo
 0B20=2,read_clipboard_data %1d% size %2d%
 0B21=2,write_clipboard_data %1d% size %2d%
 
@@ -2192,22 +2207,22 @@ DATE=2020-11-11
 0D5F=7,get_vehicle %1d% dummy_element %2d% position %3d% to %5d% %6d% %7d% invert_x %4d% // IF and SET
 0D60=10,create_projectile_type %1d% launched_from_entity %2d% origin %3d% %4d% %5d% target %6d% %7% %8d% target_entity %9d% force %10d%
 0D61=3, %3d% = load_texture_bmp_from %1s% with_mask %2s% // IF and SET
-0D62=2,set_car %1d% remap_texture %2d%
-0D63=5,set_car %1d% color %2d% RGB %3d% %4d% %5d%
+;0D62=2,set_car %1d% remap_texture %2d%
+;0D63=5,set_car %1d% color %2d% RGB %3d% %4d% %5d%
 0D64=2, %2d% = load_texture_png_from %1s% // IF and SET
 0D65=6,print %1s% at %2d% %3d% scale %4d% %5d% style %6d%
 0D66=25,print %1s% at %2d% %3d% scale %4d% %5d% style %6d% prop %7d% align %8d% wrap %9d% justify %10d% color %11d% %12d% %13d% %14d% outline %15d% shadow %16d% dropColor %17d% %18d% %19d% %20d% background %21d% backColor %22d% %23d% %24d% %25d%
-0D67=2,set_audiostream %1d% position_time %2d%
-0D68=2,%2d% = get_audiostream %1d% position_time
-0D69=4,%4d% = set_audiostream %1d% effect %2d% priority %3d%
-0D6A=2,remove_audiostream %1d% effect %2d%
-0D6B=2,set_audiostream_effect %1d% parameters_from_buf %2d%
-0D6C=2,get_audiostream_effect %1d% parameters_to_buf %2d%
-0D6D=1,reset_audiostream_effect %1d%
-0D6E=3,set_audiostream %1d% attribute %2d% to %3d%
-0D6F=3,%3d% = get_audiostream %1d% attribute %2d%
-0D70=7,set_3d_audiostream %1d% _3d_attributes_mode %2d% min %3d% max %4d% iangle %5d% oangle %6d% outvol %7d%
-0D71=7,get_3d_audiostream %1d% _3d_attributes_mode_to %2d% min_to %3d% max_to %4d% iangle_to %5d% oangle_to %6d% outvol_to %7d%
+;0D67=2,set_audiostream %1d% position_time %2d%
+;0D68=2,%2d% = get_audiostream %1d% position_time
+;0D69=4,%4d% = set_audiostream %1d% effect %2d% priority %3d%
+;0D6A=2,remove_audiostream %1d% effect %2d%
+;0D6B=2,set_audiostream_effect %1d% parameters_from_buf %2d%
+;0D6C=2,get_audiostream_effect %1d% parameters_to_buf %2d%
+;0D6D=1,reset_audiostream_effect %1d%
+;0D6E=3,set_audiostream %1d% attribute %2d% to %3d%
+;0D6F=3,%3d% = get_audiostream %1d% attribute %2d%
+;0D70=7,set_3d_audiostream %1d% _3d_attributes_mode %2d% min %3d% max %4d% iangle %5d% oangle %6d% outvol %7d%
+;0D71=7,get_3d_audiostream %1d% _3d_attributes_mode_to %2d% min_to %3d% max_to %4d% iangle_to %5d% oangle_to %6d% outvol_to %7d%
 0D72=3,get_sfx_volume_to %2d% radio_volume_to %3d% type %1d%
 0D73=3,get_screen_width_to %2d% height_to %3d% type %1d%
 0D74=2,%2d% = component %1d% parent_component
@@ -2252,8 +2267,8 @@ DATE=2020-11-11
 ;0D39=2,%2d% = get_char_max_health %1d% // keep NewOpcodes order
 ;0D3A=20,get_collision_between_points %1d% %2d% %3d% and %4d% %5d% %6d% flags %7d% %8d% %9d% %10d% %11d% %12d% %13d% %14d% ignore_entity %15d% store_point_to %17d% %18d% %19d% entity_to %20d% colpoint_data_to %16d% // keep NewOpcodes order
 ;0D3B=4,get_colpoint_normal_vector %1d% store_to %2d% %3d% %4d%
-;0D3C=2,get_colpoint_depth %1d% store_to %2d%
-;0D3D=2,get_colpoint_surface %1d% store_to %2d%
+;0D3C=2,get_colpoint_surface %1d% store_to %2d%
+;0D3E=2,get_colpoint_depth %1d% store_to %2d%
 ;0D4C=2,%2d% = string %1s% length // keep NewOpcodes order
 ;0D4D=2,copy_string %1s% to %2d%
 ;0D4E=4,%4d% = read_struct %1d% offset %2d% size %3d% // keep newOpcodes ordering for SB
@@ -2468,22 +2483,22 @@ DATE=2020-11-11
 0ECE=2,get_time_char_is_dead %1d% store_to %2d%
 0ECF=2,get_time_car_is_dead %1d% store_to %2d%
 0ED0=0,return_script_event
-0ED1=3,set_script_event_save_confirmation %1d% label %2p% args %3d%
-0ED2=3,set_script_event_char_delete %1d% label %2p% args %3d%
-0ED3=3,set_script_event_char_create %1d% label %2p% args %3d%
-0ED4=3,set_script_event_car_delete %1d% label %2p% args %3d%
-0ED5=3,set_script_event_car_create %1d% label %2p% args %3d%
-0ED6=3,set_script_event_object_delete %1d% label %2p% args %3d%
-0ED7=3,set_script_event_object_create %1d% label %2p% args %3d%
-0ED8=3,set_script_event_on_menu %1d% label %2p% %3d%
+0ED1=3,set_script_event_save_confirmation %1d% label %2p% var_slot %3d%
+0ED2=3,set_script_event_char_delete %1d% label %2p% var_char %3d%
+0ED3=3,set_script_event_char_create %1d% label %2p% var_char %3d%
+0ED4=3,set_script_event_car_delete %1d% label %2p% var_car %3d%
+0ED5=3,set_script_event_car_create %1d% label %2p% var_car %3d%
+0ED6=3,set_script_event_object_delete %1d% label %2p% var_object %3d%
+0ED7=3,set_script_event_object_create %1d% label %2p% var_object %3d%
+0ED8=3,set_script_event_on_menu %1d% label %2p% var_just_paused %3d%
 0ED9=2,set_char_ignore_damage_anims %1d% %2d%
-0EDA=3,set_script_event_char_process %1d% label %2p% args %3d%
-0EDB=3,set_script_event_car_process %1d% label %2p% args %3d%
-0EDC=3,set_script_event_object_process %1d% label %2p% args %3d%
-0EDD=3,set_script_event_building_process %1d% label %2p% args %3d%
-0EDE=3,set_script_event_char_damage %1d% label %2p% args %3d%
-0EDF=3,set_script_event_car_weapon_damage %1d% label %2p% args %3d%
-0EE0=6,set_script_event_bullet_impact %1d% label %2p% args %3d% %4d% %5d% %6d%
+0EDA=3,set_script_event_char_process %1d% label %2p% var_char %3d%
+0EDB=3,set_script_event_car_process %1d% label %2p% var_car %3d%
+0EDC=3,set_script_event_object_process %1d% label %2p% var_object %3d%
+0EDD=3,set_script_event_building_process %1d% label %2p% var_building %3d%
+0EDE=3,set_script_event_char_damage %1d% label %2p% var_char %3d%
+0EDF=3,set_script_event_car_weapon_damage %1d% label %2p% var_car %3d%
+0EE0=6,set_script_event_bullet_impact %1d% label %2p% var_owner %3d% var_victim %4d% var_weapon %5d% var_colpoint %6d%
 0EE1=4,get_colpoint_coordinates %1d% store_to %2d% %3d% %4d%
 0EE2=-1,read_struct_offset_multi %1d% offset %2d% total %3d% size %4d%
 0EE3=-1,write_struct_offset_multi %1d% offset %2d% count %3d% size %4d%

sa/extensions.txt

@@ -2070,6 +2070,13 @@
 0B14=bitwise
 0B15=bitwise
 0B16=bitwise
+0B17=bitwise
+0B18=bitwise
+0B19=bitwise
+0B1A=bitwise
+0B1B=bitwise
+0B1C=bitwise
+0B1D=bitwise
 0B20=clipboard
 0B21=clipboard
 0D00=newOpcodes
@@ -2170,22 +2177,9 @@
 0D5F=newOpcodes
 0D60=newOpcodes
 0D61=newOpcodes
-0D62=newOpcodes
-0D63=newOpcodes
 0D64=newOpcodes
 0D65=newOpcodes
 0D66=newOpcodes
-0D67=newOpcodes
-0D68=newOpcodes
-0D69=newOpcodes
-0D6A=newOpcodes
-0D6B=newOpcodes
-0D6C=newOpcodes
-0D6D=newOpcodes
-0D6E=newOpcodes
-0D6F=newOpcodes
-0D70=newOpcodes
-0D71=newOpcodes
 0D72=newOpcodes
 0D73=newOpcodes
 0D74=newOpcodes
@@ -2229,7 +2223,7 @@
 0D3A=CLEO+
 0D3B=CLEO+
 0D3C=CLEO+
-0D3D=CLEO+
+0D3E=CLEO+
 0D4C=CLEO+
 0D4D=CLEO+
 0D4E=CLEO+