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

Some more fabricable chemicals, made cargo missions more common, items in characters' inventories aren't affected by fire

Browse Source
This commit is contained in:
Regalis
2016-04-24 20:33:33 +03:00
parent c08029dea8
commit 45e3bed07c
9 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Content/Items/Fabricators/fabricators.xml
+9 -1
View File
@@ -118,7 +118,15 @@
<RequiredSkill name="Medical" level="40"/> <RequiredSkill name="Medical" level="40"/>
</fabricableitem> </fabricableitem>
<fabricableitem name="Auxiliorizine" requireditems="Corrigodone, Flash Powder" requiredtime="25"> <fabricableitem name="Auxiliorizine" requireditems="Corrigodone, Erythrozine, Flash Powder" requiredtime="25">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
<fabricableitem name="Hyperzine" requireditems="Phosphorus, Uranium Powder" requiredtime="25">
<RequiredSkill name="Medical" level="60"/>
</fabricableitem>
<fabricableitem name="Morbusine" requireditems="Sulphuric Acid, Auxiliorizine" requiredtime="30">
<RequiredSkill name="Medical" level="60"/> <RequiredSkill name="Medical" level="60"/>
</fabricableitem> </fabricableitem>
Subsurface/Content/Items/Fabricators/materials.xml
+5
View File
@@ -29,6 +29,11 @@
canbepicked="true" canbepicked="true"
price="100"> price="100">
<Deconstruct time="5">
<Item name="Uranium Powder"/>
<Item name="Uranium Powder"/>
</Deconstruct>
<Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/> <Sprite texture ="materials.png" sourcerect="0,0,24,12" depth="0.55"/>
<Body width="24" height="12" density="60"/> <Body width="24" height="12" density="60"/>
Subsurface/Content/Items/Medical/medical.xml
+40 -2
View File
@@ -194,7 +194,7 @@
<Body width="25" height="5" density="20"/> <Body width="25" height="5" density="20"/>
<Holdable slots="Any,RightHand,LeftHand"> <Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="5.0" Oxygen="20.0" Bleeding="-0.1" duration="5.0"> <StatusEffect type="OnUse" target="Character" Health="1.0" Oxygen="2.0" Bleeding="-0.05" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/> <RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect> </StatusEffect>
</Holdable> </Holdable>
@@ -352,12 +352,50 @@
</Holdable> </Holdable>
</Item> </Item>
<Item
name="Uranium Powder"
category="Material"
spritecolor="0.2,0.35,0.06,1.0"
Tags="smallitem,chem,medical"
pickdistance="150">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="25" height="5" density="15"/>
<Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" Health="-5.0" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Holdable>
</Item>
<Item
name="Hyperzine"
category="Material"
spritecolor="0.8,0.3,0.8,1.0"
Tags="smallitem,chem,medical"
pickdistance="150"
description="A potent muscle stimulant.">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
<Body width="25" height="5" density="15"/>
<Holdable slots="Any,RightHand,LeftHand">
<StatusEffect type="OnUse" target="Character" SpeedMultiplier="1.5" setvalue="true" duration="60.0">
<RequiredItem name="Medical Syringe" type="Container"/>
</StatusEffect>
</Holdable>
</Item>
<Item <Item
name="Morbusine" name="Morbusine"
category="Material" category="Material"
spritecolor="0.0,0.0,0.0,1.0" spritecolor="0.0,0.0,0.0,1.0"
Tags="smallitem,chem,medical" Tags="smallitem,chem,medical"
pickdistance="150"> pickdistance="150"
description="A highly potent neurotoxin.">
<Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/> <Sprite texture ="med.png" sourcerect="24,16,8,16" depth="0.6"/>
Subsurface/Content/Jobs.xml
+1 -1
View File
@@ -79,7 +79,7 @@
<Skill name="Weapons" level="10,20"/> <Skill name="Weapons" level="10,20"/>
<Skill name="Construction" level="10,20"/> <Skill name="Construction" level="10,20"/>
<Skill name="Electrical Engineering" level="10,20"/> <Skill name="Electrical Engineering" level="10,20"/>
<Skill name="Medical" level="50,70"/> <Skill name="Medical" level="55,70"/>
</Skills> </Skills>
<Items> <Items>
<Item name="ID Card"/> <Item name="ID Card"/>
Subsurface/Content/Missions.xml
+5 -5
View File
@@ -70,7 +70,7 @@
<CargoMission <CargoMission
name="Explosive cargo" name="Explosive cargo"
description="A local arms dealer is offering 200 credits in exchange for delivering two crates of high explosives to a customer in [location2]." description="A local arms dealer is offering 200 credits in exchange for delivering two crates of high explosives to a customer in [location2]."
commonness="5" commonness="10"
reward="500" reward="500"
successmessage="The explosives have been successfully delivered."> successmessage="The explosives have been successfully delivered.">
<Items> <Items>
@@ -88,7 +88,7 @@
<CargoMission <CargoMission
name="Explosive cargo" name="Explosive cargo"
description="A local arms dealer is offering 200 credits in exchange for delivering two crates of high explosives to a customer in [location2]." description="A local arms dealer is offering 200 credits in exchange for delivering two crates of high explosives to a customer in [location2]."
commonness="2" commonness="5"
reward="200" reward="200"
successmessage="The explosives have been successfully delivered."> successmessage="The explosives have been successfully delivered.">
<Items> <Items>
@@ -109,7 +109,7 @@
<CargoMission <CargoMission
name="Chemical shipment" name="Chemical shipment"
description="Reseachers of [location1] need someone to deliver some dangerous chemicals to [location2] for a reward of 200 credits." description="Reseachers of [location1] need someone to deliver some dangerous chemicals to [location2] for a reward of 200 credits."
commonness="5" commonness="10"
reward="200" reward="200"
successmessage="The chemicals have been successfully delivered."> successmessage="The chemicals have been successfully delivered.">
<Items> <Items>
@@ -128,7 +128,7 @@
<CargoMission <CargoMission
name="Handle with care" name="Handle with care"
description="Local reseachers are offering 2000 credits for delivering a large amount of nitroglycerine to [location2]." description="Local reseachers are offering 2000 credits for delivering a large amount of nitroglycerine to [location2]."
commonness="5" commonness="15"
reward="2000" reward="2000"
successmessage="The chemicals have been successfully delivered."> successmessage="The chemicals have been successfully delivered.">
<Items> <Items>
@@ -144,7 +144,7 @@
<CargoMission <CargoMission
name="Praise the Honkmother" name="Praise the Honkmother"
description="A local clown syndicate is offering 100 credits for delivering a shipment of clowning supplies to [location2]." description="A local clown syndicate is offering 100 credits for delivering a shipment of clowning supplies to [location2]."
commonness="1" commonness="2"
reward="100" reward="100"
successmessage="The clown gear has been successfully delivered."> successmessage="The clown gear has been successfully delivered.">
<Items requireddeliveryamount="35"> <Items requireddeliveryamount="35">
Subsurface/Source/Characters/AICharacter.cs
+3 -3
View File
@@ -98,7 +98,7 @@ namespace Barotrauma
message.Write(AnimController.RefLimb.SimPosition.X); message.Write(AnimController.RefLimb.SimPosition.X);
message.Write(AnimController.RefLimb.SimPosition.Y); message.Write(AnimController.RefLimb.SimPosition.Y);
message.Write(AnimController.RefLimb.Rotation); //message.Write(AnimController.RefLimb.Rotation);
message.WriteRangedSingle(MathHelper.Clamp(AnimController.StunTimer, 0.0f, 60.0f), 0.0f, 60.0f, 8); message.WriteRangedSingle(MathHelper.Clamp(AnimController.StunTimer, 0.0f, 60.0f), 0.0f, 60.0f, 8);
message.Write((byte)((health / maxHealth) * 255.0f)); message.Write((byte)((health / maxHealth) * 255.0f));
@@ -148,7 +148,7 @@ namespace Barotrauma
limbPos.X = message.ReadFloat(); limbPos.X = message.ReadFloat();
limbPos.Y = message.ReadFloat(); limbPos.Y = message.ReadFloat();
rotation = message.ReadFloat(); //rotation = message.ReadFloat();
} }
catch (Exception e) catch (Exception e)
{ {
@@ -161,7 +161,7 @@ namespace Barotrauma
if (AnimController.RefLimb.body != null) if (AnimController.RefLimb.body != null)
{ {
AnimController.RefLimb.body.TargetPosition = limbPos; AnimController.RefLimb.body.TargetPosition = limbPos;
AnimController.RefLimb.body.TargetRotation = rotation; //AnimController.RefLimb.body.TargetRotation = rotation;
} }
float newStunTimer = 0.0f, newHealth = 0.0f, newBleeding = 0.0f; float newStunTimer = 0.0f, newHealth = 0.0f, newBleeding = 0.0f;
Subsurface/Source/Items/Inventory.cs
+1 -1
View File
@@ -313,7 +313,7 @@ namespace Barotrauma
selectedSlot = containerRect.Contains(PlayerInput.MousePosition) && !Locked ? slotIndex : -1; selectedSlot = containerRect.Contains(PlayerInput.MousePosition) && !Locked ? slotIndex : -1;
GUI.DrawRectangle(spriteBatch, containerRect, Color.Black * 0.8f, true); GUI.DrawRectangle(spriteBatch, new Rectangle(containerRect.X, containerRect.Y, containerRect.Width, containerRect.Height - 50), Color.Black * 0.8f, true);
GUI.DrawRectangle(spriteBatch, containerRect, Color.White); GUI.DrawRectangle(spriteBatch, containerRect, Color.White);
Item[] containedItems = null; Item[] containedItems = null;
Subsurface/Source/Map/FireSource.cs
+1 -1
View File
@@ -250,7 +250,7 @@ namespace Barotrauma
foreach (Item item in Item.ItemList) foreach (Item item in Item.ItemList)
{ {
if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue; if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;
//if (item.ParentInventory != null) return; if (item.ParentInventory != null && item.ParentInventory.Owner is Character) return;
float range = (float)Math.Sqrt(size.X) * 10.0f; float range = (float)Math.Sqrt(size.X) * 10.0f;
if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue; if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue;
Subsurface/Source/Networking/NetworkMember.cs
+10 -2
View File
@@ -340,8 +340,16 @@ namespace Barotrauma.Networking
if (EndVoteCount > 0) if (EndVoteCount > 0)
{ {
GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 140.0f, 40), if (GameMain.NetworkMember.myCharacter == null)
"Votes (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont); {
GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 180.0f, 20),
"Votes to end the round (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont);
}
else
{
GUI.DrawString(spriteBatch, new Vector2(GameMain.GraphicsWidth - 140.0f, 40),
"Votes (y/n): " + EndVoteCount + "/" + (EndVoteMax - EndVoteCount), Color.White, null, 0, GUI.SmallFont);
}
} }
} }