Skip to content

Development #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Sep 13, 2018
Merged

Development #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80ede64
Updated Aliases
Lewimaron Aug 25, 2018
ac80495
Added S+ and Jamon Stacks Support
Lewimaron Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ArkBot/WebApi/Controllers/PlayerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ internal static List<ElectricalGeneratorViewModel> BuildElectricalGeneratorViewM
return new ElectricalGeneratorViewModel(x.Location)
{
Activated = x.Activated,
//FuelTime = x.FuelTime,
//FuelTime = x.FuelTime, PrimalItemResource_Gasoline_C , PrimalItemResource_Gasoline_JStacks_C
GasolineQuantity = (int)(x.Inventory?.Where(y => y.ClassName.Equals("PrimalItemResource_Gasoline_C", StringComparison.Ordinal)).Sum(y => y.Quantity) ?? 0)
};
}).OrderBy(x => x.Latitude).ThenBy(x => x.Longitude).ToList();
Expand Down
24 changes: 21 additions & 3 deletions ArkBot/WebApi/Model/CropPlotViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,32 @@ public class CropPlotViewModel : StructureBase
{ "PrimalItemConsumable_Seed_Tintoberry_C", "Tintoberry" },
{ "PrimalItemConsumable_Seed_Mejoberry_C", "Mejoberry" },
{ "PrimalItemConsumable_Seed_Stimberry_C", "Stimberry" },
{ "PrimalItemConsumable_Seed_Narcoberry_C", "Narcoberry" }
{ "PrimalItemConsumable_Seed_Narcoberry_C", "Narcoberry" },
{ "PrimalItemConsumable_Seed_PlantSpeciesZ_C", "Plant Species Z" },
{ "PrimalItemConsumable_Seed_Amarberry_JStacks_C", "Amarberry" },
{ "PrimalItemConsumable_Seed_Azulberry_JStacks_C", "Azulberry" },
{ "PrimalItemConsumable_Seed_Citronal_JStacks_C", "Citronal" },
{ "PrimalItemConsumable_Seed_DefensePlant_JStacks_C", "Plant Species X" },
{ "PrimalItemConsumable_Seed_Longrass_JStacks_C", "Longrass" },
{ "PrimalItemConsumable_Seed_Mejoberry_JStacks_C", "Mejoberry" },
{ "PrimalItemConsumable_Seed_Narcoberry_JStacks_C", "Narcoberry" },
{ "PrimalItemConsumable_Seed_Rockarrot_JStacks_C", "Rockarrot" },
{ "PrimalItemConsumable_Seed_Savoroot_JStacks_C", "Savoroot" },
{ "PrimalItemConsumable_Seed_Stimberry_JStacks_C", "Stimberry" },
{ "PrimalItemConsumable_Seed_Tintoberry_JStacks_C", "Tintoberry" },
{ "PrimalItemConsumable_Seed_PlantSpeciesY_JStacks_C", "Plant Species Y" },
{ "PrimalItemConsumable_Seed_PlantSpeciesZ_JStacks_C", "Plant Species Z" }

};

static readonly private Dictionary<string, string> _sizes = new Dictionary<string, string>
{
{ "CropPlotSmall_SM_C", "Small" },
{ "CropPlotMedium_SM_C", "Medium" },
{ "CropPlotLarge_SM_C", "Large" }
{ "CropPlotLarge_SM_C", "Large" },
{ "BP_CropPlot_Small_C", "Small" },
{ "BP_CropPlot_Medium_C", "Medium" },
{ "BP_CropPlot_Large_C", "Large" }
};

public CropPlotViewModel(ArkSavegameToolkitNet.Domain.ArkLocation location) : base(location)
Expand All @@ -38,7 +56,7 @@ public CropPlotViewModel(ArkSavegameToolkitNet.Domain.ArkLocation location) : ba
public string ClassName { get; set; }
//public float FertilizerAmount { get; set; }
public int FertilizerQuantity { get; set; }
public int FertilizerMax => 54000 * 10;
public int FertilizerMax => 54000 * 30;
public float WaterAmount { get; set; }
public string PlantedCropClassName { get; set; }
public string PlantedCropName
Expand Down
Loading