Skip to content
This repository has been archived by the owner on Sep 29, 2020. It is now read-only.

Commit

Permalink
v20.1.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
xAranaktu committed Mar 21, 2020
1 parent dc576f0 commit 2ab1937
Show file tree
Hide file tree
Showing 6 changed files with 973 additions and 935 deletions.
1,862 changes: 942 additions & 920 deletions source/Live Editor.CETRAINER

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion source/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,4 +323,8 @@ v20.1.3.4:
v20.1.3.5:
- Added 21 new faces added in last game update to "update_player_headmodels.lua" script.
- Fixed Schedule Editor


v20.1.3.6:
- Added 2 new faces added in last game update to "update_player_headmodels.lua" script.
- Fixed copying player from "My Career"
- Fixed "Gameplay" script
10 changes: 5 additions & 5 deletions source/lua/GUI/forms/playerseditorform/helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1247,11 +1247,6 @@ function FillPlayerEditForm(playerid)
if playerid ~= nil then
find_player_by_id(playerid)
end
if CACHED_PLAYERS and CACHED_PLAYERS[tonumber(playerid)] then
PlayersEditorForm.PlayerNameLabel.Caption = CACHED_PLAYERS[tonumber(playerid)]['knownas']
else
PlayersEditorForm.PlayerNameLabel.Caption = ""
end

local new_val = 0
for i=0, PlayersEditorForm.ComponentCount-1 do
Expand Down Expand Up @@ -1370,6 +1365,11 @@ function FillPlayerEditForm(playerid)
PlayersEditorForm.Crest64x64.stretch=true

local iPlayerID = tonumber(PlayersEditorForm.PlayerIDEdit.Text)
if CACHED_PLAYERS and CACHED_PLAYERS[iPlayerID] then
PlayersEditorForm.PlayerNameLabel.Caption = CACHED_PLAYERS[iPlayerID]['knownas']
else
PlayersEditorForm.PlayerNameLabel.Caption = ""
end

local is_cm_loaded = is_cm_loaded()
if is_cm_loaded then
Expand Down
21 changes: 15 additions & 6 deletions source/lua/commons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ function delete_directory(dir)
end

function getfield (f)
if DEBUG_MODE then
do_log("getfield - f: " .. f)
end
local v = _G -- start with the table of globals
for w in string.gmatch(f, "[%w_]+") do
if v == nil then
Expand All @@ -53,14 +56,20 @@ function getfield (f)
end

function setfield (f, v)
if DEBUG_MODE then
do_log("setfield - f: " .. f .. " v: " .. v)
end
local t = _G -- start with the table of globals
for w, d in string.gmatch(f, "([%w_]+)(.?)") do
if d == "." then -- not last field?
t[w] = t[w] or {} -- create table if absent
t = t[w] -- get the table
else -- last field
t[w] = v -- do the assignment
end
if d == "." then -- not last field?

t[w] = t[w] or {} -- create table if absent
t = t[w] -- get the table

if (type(t) == "string") then return end
else -- last field
t[w] = v -- do the assignment
end
end
end

Expand Down
3 changes: 2 additions & 1 deletion source/lua/helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ function after_attach()
end
writeInteger("IsCMCached", 0)
MainFormRemoveLoadingPanel()
getMainForm().Visible = true

do_log('Ready to use.', 'INFO')
update_status_label("Program is ready to use.")
Expand Down Expand Up @@ -929,7 +930,7 @@ function load_aobs()
AOB_MatchTimer = '8B 41 50 89 47 10',
AOB_MatchScore = '0F 10 48 10 0F 11 49 10 41 8B 55',
AOB_UnlimitedSubstitutions = '8B 84 01 74 8F 00 00',
AOB_DisableSubstitutions = '42 8B BC 2B 84 97 00 00 46',
AOB_DisableSubstitutions = '41 8B BC 1C 84 97 00 00 45',
AOB_NegStatusCheck = '49 8B CE FF 90 00 01 00 00 89',
AOB_ContractNeg = '04 48 8B 41 20 4C 8B 41 18 48 8B 50 38 0F 10 42 B4',
AOB_IntJobOffer = '48 2B 81 80 01 00 00 48 C1 F8 06 85',
Expand Down
6 changes: 4 additions & 2 deletions source/users lua scripts/update_player_headmodels.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- This script will update head models in your current save.
--- Head models added in Patches 5,6,7,8,9,10,11,12
--- Head models added in Patches 5,6,7,8,9,10,11,12,13

--- HOW TO USE:
--- https://i.imgur.com/xZMqzTc.gifv
Expand Down Expand Up @@ -269,7 +269,9 @@ local new_headmodels = {
233493,
235732,
242118,
244835
244835,
162409,
190720
}

function has_new(playerid)
Expand Down

0 comments on commit 2ab1937

Please sign in to comment.