Skip to content

Commit

Permalink
Merge pull request #64 from steam-test1/master
Browse files Browse the repository at this point in the history
Sync to U164 network_settings - Version 2.46
Game methods 6 modified, 10 added. Biglobby methods, 2 modified, 1 added.
BLT 2.0 support + bug fixes.
  • Loading branch information
polarathene authored Dec 10, 2017
2 parents e7b106e + 3fa6be7 commit fb6796f
Show file tree
Hide file tree
Showing 8 changed files with 2,428 additions and 24 deletions.
Binary file modified BigLobby - original + biglobby__ prefix - set 128 max player.pdmod
Binary file not shown.
2 changes: 1 addition & 1 deletion biglobby/l10n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"bkin_bl__allow_more_bots__title" : "Allow more bots in lobby",
"bkin_bl__allow_more_bots__desc" : "Allows additional bots up to the set lobby size.",
"bkin_bl__set_num_bots__title" : "Set max bots",
"bkin_bl__set_num_bots__desc" : "How many bots will you allow to spawn.",
"bkin_bl__set_num_bots__desc" : "How many bots will you allow to spawn."
}
7 changes: 4 additions & 3 deletions biglobby/lua/_custom/biglobby_globals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ if not _G.BigLobbyGlobals then

-- Semantic versioning
function BigLobbyGlobals:version()
return "2.45"
return "2.46"
end


-- GameVersion for matchmaking, integer is expected
function BigLobbyGlobals:gameversion()
return 245
return 246
end


Expand All @@ -89,7 +89,8 @@ if not _G.BigLobbyGlobals then
'draw_preplanning_event',
'sync_explode_bullet',
'sync_flame_bullet',
'sync_crime_spree_level'
'sync_crime_spree_level',
'sync_player_installed_mod'
}

local unit_network_handler_funcs = {
Expand Down
4 changes: 2 additions & 2 deletions biglobby/lua/_custom/menu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function bkin_bl__menu:RegisterHooks()
desc = "bkin_bl__set_num_bots__desc",
callback = "bkin_bl__set_num_bots__clbk",
value = self._data.num_bots,
min = 4,
min = 3,
max = 128,
step = 1,
show_value = true,
Expand All @@ -134,6 +134,6 @@ function bkin_bl__menu:RegisterHooks()

Hooks:Add("MenuManagerBuildCustomMenus", "MenuManagerBuildCustomMenus__bkin_bl", function(menu_manager, nodes)
nodes[self.menu_id] = MenuHelper:BuildMenu( self.menu_id )
MenuHelper:AddMenuItem( MenuHelper.menus.lua_mod_options_menu, self.menu_id, "bkin_bl__menu__title", "bkin_bl__menu__desc", 1 )
MenuHelper:AddMenuItem( nodes["blt_options"], self.menu_id, "bkin_bl__menu__title", "bkin_bl__menu__desc", 1 )
end)
end
5 changes: 3 additions & 2 deletions biglobby/mod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
"description": "Increase the player limit of a lobby from the original 4.",
"author": "Polarathene",
"contact": "no@support.com",
"version": "2.45",
"version": "2.46",
"blt_version": 2,
"priority" : 400,
"updates": [
{
"revision": 2.45,
"revision": 2.46,
"identifier": "bkin-biglobby"
}
],
Expand Down
4 changes: 2 additions & 2 deletions pdmod src/BigLobby - Set Player limit to 128.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@Name BigLobby - Set Player limit to 128 v2.45
@Name BigLobby - Set Player limit to 128 v2.46
@Author Kwhali
@Description Original file + All peer max id and the preplanning colour index have been set from 4 to 128, marked with `biglobby__` prefix.
@Version 1.15

;Files included in this project
settings/network.network_settings : mod/network.network_settings
settings/network.network_settings : mod\network.network_settings
102 changes: 88 additions & 14 deletions pdmod src/mod/network.network_settings
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<message name="kick_peer" delivery="ordered" receiver="connection" check="server_to_client">
<param type="int" min="1" max="15" /> <!-- Peer id -->
<param type="int" min="0" max="2" /> <!-- Message id -->
<param type="int" min="0" max="15" /> <!-- Message id -->
</message>

<message name="remove_peer_confirmation" delivery="ordered" receiver="connection" check="client_to_server">
Expand Down Expand Up @@ -41,7 +41,7 @@
</message>

<message name="join_request_reply" delivery="ordered" receiver="connection">
<param type="int" min="0" max="9" /> <!-- Reply info 0 == may not join, 1 == ok, 2 == kicked, 3 == game started, 4 = map not owned, 5 = full, 6 = low lvl, 7 = wrong game version, 8 = authentication failed, 9 = banned -->
<param type="int" min="0" max="15" /> <!-- Reply info 0 == may not join, 1 == ok, 2 == kicked, 3 == game started, 4 = map not owned, 5 = full, 6 = low lvl, 7 = wrong game version, 8 = authentication failed, 9 = banned, 10 == modded -->
<param type="int" min="0" max="15" /> <!-- Peer id ~=0 when accepted -->
<param type="string" /> <!-- My character -->
<param type="int" min="1" max="127" /> <!-- level index -->
Expand Down Expand Up @@ -282,7 +282,7 @@

<!-- LOOT DROP -->
<message name="feed_lootdrop" delivery="ordered" receiver="connection">
<param type="int" min="1" max="64" /> <!-- global value -->
<param type="int" min="1" max="128" /> <!-- global value -->
<param type="string" /> <!-- item category -->
<param type="string" /> <!-- item id -->
<param type="int" min="1" max="10" /> <!-- max pc -->
Expand Down Expand Up @@ -434,6 +434,15 @@
<param type="unit" />
<param type="int" min="0" max="4" />
</message>


<message name="set_weapon_gadget_color" delivery="ordered" receiver="unit">
<param type="unit" />
<param type="int" min="0" max="255" /> <!-- r -->
<param type="int" min="0" max="255" /> <!-- g -->
<param type="int" min="0" max="255" /> <!-- b -->
</message>


<message name="set_look_dir" delivery="unreliable" receiver="unit">
<param type="unit" />
Expand Down Expand Up @@ -612,6 +621,13 @@
<param type="vector3" />
</message>

<message name="player_action_walk_nav_point" delivery="ordered" receiver="unit">
<param type="unit" />
<param type="vector3" />
<param type="float" min="0" max="1" step="0.01" exact="false" />
</message>


<message name="action_change_speed" delivery="ordered" receiver="unit">
<param type="unit" />
<param type="float" />
Expand Down Expand Up @@ -1311,6 +1327,11 @@
<param type="int" min="0" max="31" /> <!-- Amount of grenades -->
<param type="int" min="0" max="15" /> <!-- Peer id -->
</message>

<message name="sync_grenades_cooldown" delivery="ordered" receiver="unit">
<param type="float" step="0.001"/> <!-- end time -->
<param type="float" step="0.001"/> <!-- duration -->
</message>

<message name="sync_ammo_amount" delivery="ordered" receiver="unit">
<param type="int" min="1" max="3" /> <!-- Selection index -->
Expand Down Expand Up @@ -1438,6 +1459,7 @@

<message name="server_unlock_asset" delivery="ordered" receiver="unit" check="client_to_server">
<param type="string" /> <!-- Asset id -->
<param type="bool"/> <!-- show chat notification -->
</message>

<message name="sync_unlock_asset" delivery="ordered" receiver="unit" check="server_to_client">
Expand All @@ -1446,7 +1468,7 @@
</message>

<message name="sync_heist_time" delivery="ordered" receiver="unit" check="server_to_client">
<param type="float" min="0" step="0.1" exact="false" />
<param type="float" min="-1800" step="0.1" exact="false"/>
</message>

<message name="run_mission_door_sequence" delivery="ordered" receiver="unit" check="server_to_client">
Expand Down Expand Up @@ -2050,15 +2072,11 @@
</message>

<message name="sync_ability_hud" receiver="unit" delivery="ordered">
<param type="int" /> <!-- the id of the temporary ability -->
<param type="int" /> <!-- how long the ability should be active -->
</message>

<message name="sync_ability_hud_cooldown" receiver="unit" delivery="ordered">
<param type="int" /> <!-- the id of the temporary ability -->
<param type="int" /> <!-- cooldown left -->
<param type="float" step="0.001" /> <!-- end time -->
<param type="float" step="0.001" /> <!-- duration -->
</message>


<message name="sync_underbarrel_switch" receiver="unit" delivery="reliable">
<param type="int" /> <!-- Weapon slot -->
<param type="string" /> <!-- Underbarrel weapon id -->
Expand Down Expand Up @@ -2192,6 +2210,56 @@
<param type="int" /> <!-- distance -->
<param type="unit" /> <!-- attacker -->
</message>


<message name="sync_carry_set_position_and_throw" delivery="ordered" receiver="unit" check="server_to_client">
<param type="unit" /> <!-- Unit -->
<param type="vector3" step="0.01" /> <!-- pos -->
<param type="vector3" step="0.01" /> <!-- dir -->
<param type="float" step="0.1" /> <!-- force -->
</message>



<message name="sync_player_installed_mod" delivery="reliable" receiver="connection">
<param type="int" min="0" max="15" /> <!-- Player -->
<param type="string" step="0.01" /> <!-- Mod id -->
<param type="longstring" step="0.01" /> <!-- Mod friendly name -->
</message>



<message name="sync_phalanx_vip_achievement_unlocked" delivery="reliable" receiver="connection" check="server_to_client">
<param type="string" /> <!-- achievement id -->
</message>










<message name="sync_tag_team" receiver="unit">
<param type="unit" /> <!-- tagged unit -->
<param type="unit" /> <!-- owner unit -->
</message>
<message name="end_tag_team" receiver="unit">
<param type="unit" /> <!-- tagged unit -->
<param type="unit" /> <!-- owner unit -->
</message>



<message name="sync_delayed_damage_hud" receiver="unit">
<param type="float" step="0.001" /> <!-- delayed damage -->
</message>

<message name="sync_damage_absorption_hud" receiver="unit">
<param type="float" step="0.001" /> <!-- damage absorption amount -->
</message>
</rpc>


Expand All @@ -2202,15 +2270,15 @@
<rpc>
<message name="biglobby__kick_peer" delivery="ordered" receiver="biglobby__connection" check="server_to_client">
<param type="int" min="1" max="128" /> <!-- Peer id -->
<param type="int" min="0" max="2" /> <!-- Message id -->
<param type="int" min="0" max="15" /> <!-- Message id -->
</message>

<message name="biglobby__remove_peer_confirmation" delivery="ordered" receiver="biglobby__connection" check="client_to_server">
<param type="int" min="1" max="128" /> <!-- Peer id -->
</message>

<message name="biglobby__join_request_reply" delivery="ordered" receiver="biglobby__connection">
<param type="int" min="0" max="9" /> <!-- Reply info 0 == may not join, 1 == ok, 2 == kicked, 3 == game started, 4 = map not owned, 5 = full, 6 = low lvl, 7 = wrong game version, 8 = authentication failed, 9 = banned -->
<param type="int" min="0" max="15" /> <!-- Reply info 0 == may not join, 1 == ok, 2 == kicked, 3 == game started, 4 = map not owned, 5 = full, 6 = low lvl, 7 = wrong game version, 8 = authentication failed, 9 = banned, 10 == modded -->
<param type="int" min="0" max="128" /> <!-- Peer id ~=0 when accepted -->
<param type="string" /> <!-- My character -->
<param type="int" min="1" max="127" /> <!-- level index -->
Expand Down Expand Up @@ -2312,6 +2380,12 @@
<param type="int" min="0" max="16384" /> <!-- Damage -->
<param type="int" min="1" max="128" /> <!-- server_to_client: Peer ID | client_to_server: Player weapon selection index -->
</message>

<message name="biglobby__sync_player_installed_mod" delivery="reliable" receiver="biglobby__connection">
<param type="int" min="0" max="128" /> <!-- Player -->
<param type="string" step="0.01" /> <!-- Mod id -->
<param type="longstring" step="0.01" /> <!-- Mod friendly name -->
</message>
</rpc>

<!-- END OF NETWORK BASE --> <!-- END OF NETWORK BASE --> <!-- END OF NETWORK BASE -->
Expand Down Expand Up @@ -2496,4 +2570,4 @@
</message>
</rpc>

</network>
</network>
Loading

0 comments on commit fb6796f

Please sign in to comment.