vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into moStuff

Browse Source 
# Conflicts:
#	Barotrauma/BarotraumaShared/BarotraumaShared.projitems
#	Barotrauma/BarotraumaShared/Data/clientpermissions.xml
This commit is contained in:
Alex Noir
2017-12-23 17:33:24 +03:00
parent 60329fb0d1 ac53c5f80d
commit b3eaa6bd17
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+1 -1
View File
@@ -436,7 +436,7 @@ namespace Barotrauma
InfoFrame.FindChild("showlog").Visible = GameMain.Server != null; InfoFrame.FindChild("showlog").Visible = GameMain.Server != null;
campaignViewButton = new GUIButton(new Rectangle(0, 0, 130, 30), "Campaign view", Alignment.BottomRight, "", defaultModeContainer); campaignViewButton = new GUIButton(new Rectangle(-80, 0, 120, 30), "Campaign view", Alignment.BottomRight, "", defaultModeContainer);
campaignViewButton.OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; }; campaignViewButton.OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; };
campaignViewButton.Visible = false; campaignViewButton.Visible = false;
Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+1 -1
View File
@@ -743,7 +743,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="$(MSBuildThisFileDirectory)Data\clientpermissions.xml"> <Content Include="$(MSBuildThisFileDirectory)Data\clientpermissions.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.7.xml"> <Content Include="$(MSBuildThisFileDirectory)Data\ContentPackages\Vanilla 0.7.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Barotrauma/BarotraumaShared/Data/clientpermissions.xml
+3 -4
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Permissions> <ClientPermissions>
</ClientPermissions>
</Permissions>
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+7 -1
View File
@@ -373,7 +373,7 @@ namespace Barotrauma
if (GameMain.Client != null) return; if (GameMain.Client != null) return;
if (!DoesBleed) return; if (!DoesBleed) return;
float newBleeding = MathHelper.Clamp(value, 0.0f, 5.0f); float newBleeding = MathHelper.Clamp(value, 0.0f, 5.0f);
if (newBleeding == bleeding) return; if (newBleeding == bleeding) return;
bleeding = newBleeding; bleeding = newBleeding;
@@ -466,6 +466,12 @@ namespace Barotrauma
get { return focusedItem; } get { return focusedItem; }
} }
public Item PickingItem
{
get;
set;
}
public virtual AIController AIController public virtual AIController AIController
{ {
get { return null; } get { return null; }
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs
+9 -5
View File
@@ -13,7 +13,6 @@ namespace Barotrauma.Items.Components
private float pickTimer; private float pickTimer;
public List<InvSlotType> AllowedSlots public List<InvSlotType> AllowedSlots
{ {
get { return allowedSlots; } get { return allowedSlots; }
@@ -55,13 +54,15 @@ namespace Barotrauma.Items.Components
public override bool Pick(Character picker) public override bool Pick(Character picker)
{ {
//return if someone is already trying to pick the item //return if someone is already trying to pick the item
if (pickTimer>0.0f) return false; if (pickTimer > 0.0f) return false;
if (picker == null || picker.Inventory == null) return false; if (picker == null || picker.Inventory == null) return false;
if (PickingTime>0.0f) if (PickingTime > 0.0f)
{ {
CoroutineManager.StartCoroutine(WaitForPick(picker, PickingTime)); if (picker.PickingItem == null)
{
CoroutineManager.StartCoroutine(WaitForPick(picker, PickingTime));
}
return false; return false;
} }
else else
@@ -104,6 +105,8 @@ namespace Barotrauma.Items.Components
private IEnumerable<object> WaitForPick(Character picker, float requiredTime) private IEnumerable<object> WaitForPick(Character picker, float requiredTime)
{ {
picker.PickingItem = item;
var leftHand = picker.AnimController.GetLimb(LimbType.LeftHand); var leftHand = picker.AnimController.GetLimb(LimbType.LeftHand);
var rightHand = picker.AnimController.GetLimb(LimbType.RightHand); var rightHand = picker.AnimController.GetLimb(LimbType.RightHand);
@@ -151,6 +154,7 @@ namespace Barotrauma.Items.Components
private void StopPicking(Character picker) private void StopPicking(Character picker)
{ {
picker.AnimController.Anim = AnimController.Animation.None; picker.AnimController.Anim = AnimController.Animation.None;
picker.PickingItem = null;
pickTimer = 0.0f; pickTimer = 0.0f;
} }