Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Nanotransen > Nanotrasen

Browse Source 
As decreed by PJB
https://discord.com/channels/310555209753690112/675078881425752124/784878237850402826
This commit is contained in:
DrSmugleaf
2020-12-05 21:48:11 +01:00
parent 7265c53391
commit 639cc86d91
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.GameObjects.Components.AI
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataReadWriteFunction( serializer.DataReadWriteFunction(
"factions", "factions",
new List<Faction>(), new List<Faction>(),
@@ -40,10 +40,10 @@ namespace Content.Server.GameObjects.Components.AI
public enum Faction public enum Faction
{ {
None = 0, None = 0,
NanoTransen = 1 << 0, NanoTrasen = 1 << 0,
SimpleHostile = 1 << 1, SimpleHostile = 1 << 1,
SimpleNeutral = 1 << 2, SimpleNeutral = 1 << 2,
Syndicate = 1 << 3, Syndicate = 1 << 3,
Xeno = 1 << 4, Xeno = 1 << 4,
} }
} }

8
Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
View File

@@ -19,19 +19,19 @@ namespace Content.Server.GameObjects.EntitySystems.AI
private readonly Dictionary<Faction, Faction> _hostileFactions = new() private readonly Dictionary<Faction, Faction> _hostileFactions = new()
{ {
{Faction.NanoTransen, {Faction.NanoTrasen,
Faction.SimpleHostile | Faction.Syndicate | Faction.Xeno}, Faction.SimpleHostile | Faction.Syndicate | Faction.Xeno},
{Faction.SimpleHostile, {Faction.SimpleHostile,
Faction.NanoTransen | Faction.Syndicate Faction.NanoTrasen | Faction.Syndicate
}, },
// What makes a man turn neutral? // What makes a man turn neutral?
{Faction.SimpleNeutral, {Faction.SimpleNeutral,
Faction.None Faction.None
}, },
{Faction.Syndicate, {Faction.Syndicate,
Faction.NanoTransen | Faction.SimpleHostile | Faction.Xeno}, Faction.NanoTrasen | Faction.SimpleHostile | Faction.Xeno},
{Faction.Xeno, {Faction.Xeno,
Faction.NanoTransen | Faction.Syndicate}, Faction.NanoTrasen | Faction.Syndicate},
}; };
public Faction GetFactions(IEntity entity) => public Faction GetFactions(IEntity entity) =>

2
Resources/Prototypes/Catalog/Research/technologies.yml
View File

@@ -6,7 +6,7 @@
- type: technology - type: technology
name: "basic research technology" name: "basic research technology"
id: BasicResearch id: BasicResearch
description: Nanotransen basic research technologies. description: Nanotrasen basic research technologies.
icon: Constructible/Power/server.rsi/server-on.png icon: Constructible/Power/server.rsi/server-on.png
requiredPoints: 250 requiredPoints: 250

2
Resources/Prototypes/Entities/Mobs/NPCs/human.yml
View File

@@ -12,7 +12,7 @@
startingGear: AssistantGear startingGear: AssistantGear
- type: AiFactionTag - type: AiFactionTag
factions: factions:
- NanoTransen - NanoTrasen
- type: entity - type: entity
save: false save: false

2
Resources/Prototypes/Entities/Mobs/Player/human.yml
View File

@@ -19,4 +19,4 @@
- type: HumanInventoryController - type: HumanInventoryController
- type: AiFactionTag - type: AiFactionTag
factions: factions:
- NanoTransen - NanoTrasen

2
SpaceStation14.sln.DotSettings
View File

@@ -153,7 +153,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Thermite/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Thermite/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Thonk/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Thonk/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=tickrate/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=tickrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Transen/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Trasen/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unanchor/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=unanchor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Uncuff/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Uncuff/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=underplating/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=underplating/@EntryIndexedValue">True</s:Boolean>