Skip to content

Commit 1e35b89

Browse files
authored
p34.14 (#516)
1 parent ffad9a4 commit 1e35b89

File tree

10 files changed

+345
-140
lines changed

10 files changed

+345
-140
lines changed

src/Perpetuum.Bootstrapper/PerpetuumBootstrapper.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,11 @@ private void InitRelayManager()
596596
});
597597
_ = _builder.RegisterType<AccountTransactionLogger>();
598598
_ = _builder.RegisterType<EpForActivityLogger>();
599+
600+
_ = _builder.RegisterType<MarketAutoOrdersManager>().SingleInstance().AutoActivate().OnActivated(e =>
601+
{
602+
e.Context.Resolve<IProcessManager>().AddProcess(e.Instance.ToAsync().AsTimed(TimeSpan.FromMinutes(1)));
603+
});
599604
}
600605

601606
private IRegistrationBuilder<TRequestHandler, ConcreteReflectionActivatorData, SingleRegistrationStyle>

src/Perpetuum/Modules/DrillerModule.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ remoteControlledCreature.CommandRobot is Player ownerPlayer
173173
Debug.Assert(player != null, "player != null");
174174
foreach (ItemInfo material in extractedMaterials)
175175
{
176+
Db.Query()
177+
.CommandText("exec sp_RecordResourceGathered @gathered_on, @resource_name, @quantity")
178+
.SetParameter("@gathered_on", DateTime.UtcNow)
179+
.SetParameter("@resource_name", material.EntityDefault.Name)
180+
.SetParameter("@quantity", material.Quantity)
181+
.ExecuteNonQuery();
182+
176183
Item item = (Item)Factory.CreateWithRandomEID(material.Definition);
177184

178185
item.Owner = Owner;

src/Perpetuum/Modules/HarvesterModule.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,16 @@ remoteControlledCreature.CommandRobot is Player ownerPlayer
127127
: ParentRobot as Player;
128128

129129
Debug.Assert(player != null, "player != null");
130+
130131
foreach (ItemInfo extractedMaterial in harvestedPlants)
131132
{
133+
Db.Query()
134+
.CommandText("exec sp_RecordResourceGathered @gathered_on, @resource_name, @quantity")
135+
.SetParameter("@gathered_on", DateTime.UtcNow)
136+
.SetParameter("@resource_name", extractedMaterial.EntityDefault.Name)
137+
.SetParameter("@quantity", extractedMaterial.Quantity)
138+
.ExecuteNonQuery();
139+
132140
Item item = (Item)Factory.CreateWithRandomEID(extractedMaterial.Definition);
133141
item.Owner = Owner;
134142
item.Quantity = extractedMaterial.Quantity;

src/Perpetuum/Modules/LargeDrillerModule.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Perpetuum.Zones.Terrains;
1010
using Perpetuum.Zones.Terrains.Materials;
1111
using Perpetuum.Zones.Terrains.Materials.Minerals;
12+
using System;
1213
using System.Collections.Generic;
1314
using System.Diagnostics;
1415
using System.Linq;
@@ -59,6 +60,7 @@ public override void DoExtractMinerals(IZone zone)
5960

6061
extractedMaterials
6162
.AddRange(RareMaterialHandler.GenerateRareMaterials(materialInfo.EntityDefault.Definition));
63+
6264
CreateBeam(position.Center, BeamState.AlignToTerrain);
6365
using (TransactionScope scope = Db.CreateTransaction())
6466
{
@@ -70,6 +72,13 @@ public override void DoExtractMinerals(IZone zone)
7072
Debug.Assert(player != null, "player != null");
7173
foreach (ItemInfo material in extractedMaterials)
7274
{
75+
Db.Query()
76+
.CommandText("exec sp_RecordResourceGathered @gathered_on, @resource_name, @quantity")
77+
.SetParameter("@gathered_on", DateTime.UtcNow)
78+
.SetParameter("@resource_name", material.EntityDefault.Name)
79+
.SetParameter("@quantity", material.Quantity)
80+
.ExecuteNonQuery();
81+
7382
Item item = (Item)Factory.CreateWithRandomEID(material.Definition);
7483
item.Owner = Owner;
7584
item.Quantity = material.Quantity;

src/Perpetuum/Modules/LargeHarvesterModule.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Perpetuum.Zones.Terrains;
1111
using Perpetuum.Zones.Terrains.Materials.Plants;
1212
using Perpetuum.Zones.Terrains.Materials.Plants.Harvesters;
13+
using System;
1314
using System.Collections.Generic;
1415
using System.Diagnostics;
1516
using System.Linq;
@@ -68,8 +69,16 @@ remoteControlledCreature.CommandRobot is Player ownerPlayer
6869
: ParentRobot as Player;
6970

7071
Debug.Assert(player != null, "player != null");
72+
7173
foreach (ItemInfo extractedMaterial in harvestedPlants)
7274
{
75+
Db.Query()
76+
.CommandText("exec sp_RecordResourceGathered @gathered_on, @resource_name, @quantity")
77+
.SetParameter("@gathered_on", DateTime.UtcNow)
78+
.SetParameter("@resource_name", extractedMaterial.EntityDefault.Name)
79+
.SetParameter("@quantity", extractedMaterial.Quantity)
80+
.ExecuteNonQuery();
81+
7382
Item item = (Item)Factory.CreateWithRandomEID(extractedMaterial.Definition);
7483
item.Owner = Owner;
7584
item.Quantity = extractedMaterial.Quantity;

src/Perpetuum/Perpetuum.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@
425425
<Compile Include="Services\EventServices\EventProcessors\EventProcessor.cs" />
426426
<Compile Include="Services\EventServices\EventProcessors\NpcSpawnEventHandlers\OreNPCSpawner.cs" />
427427
<Compile Include="Services\Mail\PreMadeMailNames.cs" />
428+
<Compile Include="Services\MarketEngine\MarketAutoOrdersManager.cs" />
428429
<Compile Include="Services\MissionEngine\DisplayMissionSpotsProcess.cs" />
429430
<Compile Include="Services\MissionEngine\MissionResolveTester.cs" />
430431
<Compile Include="Services\MissionEngine\OneLocationTest.cs" />

0 commit comments

Comments
 (0)