Skip to content

Commit

Permalink
0.10 luasockets | for more info, check commit
Browse files Browse the repository at this point in the history
update that added and fixed a few things here and there but also added a whole lot of new bugs:

translatable UI text
original savegame and mission buttons replaced with client and server buttons
the game window is changing now (not much useful)
fixed onEnterVehicle where you could enter a vehicle even if there was someone already sitting in it
added multiplayer players to map
disabled vehicle sounds for now
improved vehicle events
fixed combine update
added client connection timeout
fixed server savegame saving in ingamemenu and removed save button for clients
fixed sending chat messages with no content
it's no longer possible to connect to server with the same name as the server host
modifyMPSettings no longer prints contents of saved file to log
  • Loading branch information
TheMorc committed Dec 6, 2020
1 parent 9c09cd0 commit 68ca655
Show file tree
Hide file tree
Showing 7 changed files with 3,401 additions and 121 deletions.
Binary file modified LS2008MP/data/menu/MP_client.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LS2008MP/data/menu/MP_server.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
422 changes: 314 additions & 108 deletions LS2008MP/data/scripts/mainMP.lua

Large diffs are not rendered by default.

3,070 changes: 3,070 additions & 0 deletions LS2008MP/data/scripts/multiplayer/farmer.i3d

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions LS2008MP/data/scripts/multiplayer/serverMenu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ function serverMenu:render()

self.selectedOverlay:setPosition(self.spacingLeft, self.selectedPositionBase+(4-self.selectedIndex+(self.startIndex-1))*(self.imageSpacing+self.imageSize));

local numSavegames = table.getn(self.savegames);
local numSavegames = 5;
for i=1, table.getn(self.overlays) do
self.overlays[i]:render();

Expand All @@ -158,10 +158,6 @@ function serverMenu:render()
overlay:setPosition(self.spacingLeft + 0.015, 1 - (self.spacingTop+(self.imageSize+self.imageSpacing)*(i-self.startIndex) + self.imageSize));
overlay:render();

if g_isDemo then
self.demoLockedOverlay:setPosition(self.spacingLeft + 0.015, 1 - (self.spacingTop+(self.imageSize+self.imageSpacing)*(i-self.startIndex) + self.imageSize));
self.demoLockedOverlay:render();
end;

local savegameName = g_i18n:getText("Savegame") .. " " .. i;

Expand Down Expand Up @@ -202,7 +198,7 @@ function serverMenu:addButton(overlayButton)
end;

function serverMenu:setSelectedIndex(index)
local numSavegames = table.getn(self.savegames);
local numSavegames = 5;
self.selectedIndex = math.max(math.min(index, numSavegames), 1);

if self.selectedIndex > self.startIndex+3 then
Expand Down Expand Up @@ -250,6 +246,7 @@ function serverMenu:startSelectedGame()
serverLoadingScreenMode();
MPinitSrvCli = false
MPenabled = not MPenabled
setCaption("LS2008MP v" .. MPversion .. " | Server | ".. MPplayerName)
end;

function serverMenu:deleteSelectedGame()
Expand Down
21 changes: 14 additions & 7 deletions LS2008MP/multiplayer.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--LS2008MP Multiplayer Settings
--LS2008MP Settings

--Server IP
MPip = "176.101.178.133"
Expand All @@ -9,25 +9,32 @@ MPport = 2008
--Player Name
MPplayerName = "Player"

--add random numbers to your name
--Random numbers on end of your name
MPplayerNameRndNums = false

--render the text on top
--Render text on top
MPrenderDebugText = true

--use the new LS2008 logo?
--Use the new LS2008 logo
MPuseNewLogo = true

--chat key binding (either ASCII key numbers or look in InputBindings.xml or /shared/scripts/foundation/input.lua)
--Chat key binding (either ASCII key numbers or look in InputBindings.xml or /shared/scripts/foundation/input.lua)
MPchatKey = Input.KEY_t

--Main menu buttons
MPclientButtonPath = "data/menu/MP_client.png"
MPserverButtonPath = "data/menu/MP_server.png"
MPmainMenuButtonsText = false

--if you want to use generic buttons in the main menu instead of the stock game themed buttons, remove those two "--" comment symbols in front of lines below
--and also you can comment the three lines above if you want, it's not necessary

--MPclientButtonPath = "data/missions/hud_env_base.png"
--MPserverButtonPath = "data/missions/hud_env_base.png"
--MPmainMenuButtonsText = true
--MPmainMenuButtonsText = true

--LS2008 translatable strings
MPmenuPlayerText = "Player name"
MPmenuIPText = " IP address"
MPmenuPortText = "Port number"
MPmenuWaitText = "Wait.."
MPsyncingDataText = "Syncing game data with %s\n Please wait..."

0 comments on commit 68ca655

Please sign in to comment.