Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
d2f4f000f8 |
Binary file not shown.
@ -15,7 +15,7 @@ namespace itemValueMod
|
||||
[PatchPostfix]
|
||||
private static void PatchPostFix(ref Item __instance, string id, ItemTemplate template)
|
||||
{
|
||||
ItemValue.AddItemValue(ref __instance, id, template);
|
||||
ItemValue.AddItemValue(ref __instance, template);
|
||||
}
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ namespace itemValueMod
|
||||
[PatchPostfix]
|
||||
private static void PatchPostFix(ref BulletClass __instance, string id, AmmoTemplate template)
|
||||
{
|
||||
ItemValue.AddItemValue(ref __instance, id, template);
|
||||
ItemValue.AddItemValue(ref __instance, template);
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ namespace itemValueMod
|
||||
[PatchPostfix]
|
||||
private static void PatchPostFix(ref GrenadeClass __instance, string id, ThrowableWeaponClass template)
|
||||
{
|
||||
ItemValue.AddItemValue(ref __instance, id, template);
|
||||
ItemValue.AddItemValue(ref __instance, template);
|
||||
}
|
||||
}
|
||||
|
||||
@ -57,7 +57,7 @@ namespace itemValueMod
|
||||
[PatchPostfix]
|
||||
private static void PatchPostFix(ref ItemContainerClass __instance, string id, SecureContainerTemplateClass template)
|
||||
{
|
||||
ItemValue.AddItemValue(ref __instance, id, template);
|
||||
ItemValue.AddItemValue(ref __instance, template);
|
||||
}
|
||||
}
|
||||
}
|
@ -4,261 +4,220 @@ using EFT.InventoryLogic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Net;
|
||||
using System.Threading;
|
||||
using UnityEngine;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using Comfort.Common;
|
||||
|
||||
namespace itemValueMod
|
||||
{
|
||||
public class ItemValue
|
||||
{
|
||||
public static void AddItemValue<T>(ref T __instance, string id, ItemTemplate template) where T : Item
|
||||
public static void AddItemValue<T>(ref T __instance, ItemTemplate template) where T : Item
|
||||
{
|
||||
var atts = new List<ItemAttributeClass>();
|
||||
atts.AddRange(__instance.Attributes);
|
||||
__instance.Attributes = atts;
|
||||
|
||||
ItemAttributeClass attr1 = new ItemAttributeClass(EItemAttributeId.MoneySum)
|
||||
{
|
||||
StringValue = new Func<string>(__instance.TraderPrice),
|
||||
FullStringValue = new Func<string>(__instance.TraderName),
|
||||
Name = "TRADER",
|
||||
DisplayType = new Func<EItemAttributeDisplayType>(() => EItemAttributeDisplayType.Compact)
|
||||
};
|
||||
__instance.SetupShit();
|
||||
//var atts = new List<ItemAttributeClass>();
|
||||
//atts.AddRange(__instance.Attributes);
|
||||
//__instance.Attributes = atts;
|
||||
|
||||
__instance.Attributes.Add(attr1);
|
||||
//var attr1 = new ItemAttributeClass(EItemAttributeId.MoneySum)
|
||||
//{
|
||||
// StringValue = __instance.TraderPrice(template),
|
||||
// FullStringValue = __instance.TraderName,
|
||||
// Name = "TRADER",
|
||||
// DisplayType = () => EItemAttributeDisplayType.Compact
|
||||
//};
|
||||
|
||||
//__instance.Attributes.Add(attr1);
|
||||
}
|
||||
}
|
||||
|
||||
public static class ValueExtension
|
||||
{
|
||||
static public Dictionary<string, JsonClass> itemDictionary = new Dictionary<string, JsonClass>();
|
||||
static object lockObject = new object();
|
||||
public static ItemFactory ItemFactoryInstance;
|
||||
|
||||
public static JsonClass GetData(String itemId)
|
||||
public static void SetupShit(this Item item)
|
||||
{
|
||||
var json = RequestHandler.GetJson($"/cwx/seeitemvalue/{itemId}");
|
||||
var jsonClass = Json.Deserialize<JsonClass>(json);
|
||||
ItemFactoryInstance = Singleton<ItemFactory>.Instance;
|
||||
var itemTemplate = ItemFactoryInstance.ItemTemplates.Values.First(x => x._id == item.TemplateId).Name;
|
||||
|
||||
itemDictionary.Add(itemId, jsonClass);
|
||||
|
||||
return jsonClass;
|
||||
|
||||
|
||||
Debug.LogError($"[itemTemplate] {itemTemplate}");
|
||||
|
||||
}
|
||||
|
||||
public static string TraderPrice(this Item item)
|
||||
{
|
||||
string itemId = item.Template._id;
|
||||
JsonClass jsonClass;
|
||||
bool lockWasTaken = false;
|
||||
double alteredPrice = 1;
|
||||
//public static Func<string> TraderPrice(this Item item, ItemTemplate template)
|
||||
//{
|
||||
// string itemId = item.Template._id;
|
||||
// JsonClass jsonClass;
|
||||
// double alteredPrice = 1;
|
||||
|
||||
try
|
||||
{
|
||||
Monitor.Enter(lockObject, ref lockWasTaken);
|
||||
// if (jsonClass.price != 1)
|
||||
// {
|
||||
// alteredPrice = DurabilityCheck(item, jsonClass);
|
||||
// }
|
||||
|
||||
if(!itemDictionary.TryGetValue(itemId, out jsonClass))
|
||||
{
|
||||
jsonClass = GetData(item.Template._id);
|
||||
}
|
||||
}
|
||||
catch (WebException)
|
||||
{
|
||||
return $"[SeeItemValue] Issue happened whilst getting Item from server";
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (lockWasTaken)
|
||||
{
|
||||
Monitor.Exit(lockObject);
|
||||
}
|
||||
}
|
||||
|
||||
if (jsonClass.price != 1)
|
||||
{
|
||||
alteredPrice = DurabilityCheck(item, jsonClass);
|
||||
}
|
||||
|
||||
double _price = alteredPrice * jsonClass.multiplier;
|
||||
|
||||
return Math.Round(_price).ToString();
|
||||
}
|
||||
|
||||
public static string TraderName(this Item item)
|
||||
{
|
||||
string itemId = item.Template._id;
|
||||
JsonClass jsonClass;
|
||||
bool lockWasTaken = false;
|
||||
|
||||
try
|
||||
{
|
||||
Monitor.Enter(lockObject, ref lockWasTaken);
|
||||
|
||||
if (!itemDictionary.TryGetValue(itemId, out jsonClass))
|
||||
{
|
||||
jsonClass = GetData(item.Template._id);
|
||||
}
|
||||
}
|
||||
catch (WebException)
|
||||
{
|
||||
return $"[SeeItemValue] Issue happened whilst getting Item from server";
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (lockWasTaken)
|
||||
{
|
||||
Monitor.Exit(lockObject);
|
||||
}
|
||||
}
|
||||
|
||||
return jsonClass.traderName;
|
||||
}
|
||||
|
||||
public static double DurabilityCheck(this Item item, JsonClass jsonClass)
|
||||
{
|
||||
double editedPrice = jsonClass.price;
|
||||
double originalMax = jsonClass.originalMax;
|
||||
|
||||
DebugMode($" Entered DurabilityCheck() - starting price is: {editedPrice}");
|
||||
|
||||
var medKit = item.GetItemComponent<MedKitComponent>();
|
||||
if (medKit != null && medKit.HpResource != 0 && medKit.MaxHpResource != 0)
|
||||
{
|
||||
DebugMode($" Medkit Check - HpResource is: {medKit.HpResource}");
|
||||
DebugMode($" Medkit Check - MaxHpResource is: {medKit.MaxHpResource}");
|
||||
|
||||
editedPrice *= medKit.HpResource / medKit.MaxHpResource;
|
||||
}
|
||||
|
||||
DebugMode($" After Medkit Check - price is: {editedPrice}");
|
||||
|
||||
var repair = item.GetItemComponent<RepairableComponent>();
|
||||
if (repair != null)
|
||||
{
|
||||
if (repair.Durability > 0)
|
||||
{
|
||||
DebugMode($" repairable Check - Durability is: {repair.Durability}");
|
||||
DebugMode($" Medkit Check - originalMax is: {originalMax}");
|
||||
|
||||
editedPrice *= repair.Durability / originalMax;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugMode($" repairable Check - Durability is 0");
|
||||
|
||||
editedPrice = 1;
|
||||
}
|
||||
}
|
||||
|
||||
DebugMode($" After repairable Check - price is: {editedPrice}");
|
||||
|
||||
var dogtag = item.GetItemComponent<DogtagComponent>();
|
||||
if (dogtag != null && dogtag.Level != 0)
|
||||
{
|
||||
DebugMode($" dogtag Check - level is: {dogtag.Level}");
|
||||
|
||||
editedPrice *= dogtag.Level;
|
||||
}
|
||||
|
||||
DebugMode($" After dogtag Check - price is: {editedPrice}");
|
||||
|
||||
var repairKit = item.GetItemComponent<RepairKitComponent>();
|
||||
if (repairKit != null)
|
||||
{
|
||||
if (repairKit.Resource > 0)
|
||||
{
|
||||
DebugMode($" repairkit Check - Resource is: {repairKit.Resource}");
|
||||
DebugMode($" repairkit Check - originalMax is: {originalMax}");
|
||||
|
||||
editedPrice *= repairKit.Resource / originalMax;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugMode($" repairkit Check - Resource is 0");
|
||||
|
||||
editedPrice = 1;
|
||||
}
|
||||
}
|
||||
|
||||
DebugMode($" After repairkit Check - price is: {editedPrice}");
|
||||
|
||||
var resource = item.GetItemComponent<ResourceComponent>();
|
||||
if (resource != null && resource.Value != 0 && resource.MaxResource != 0)
|
||||
{
|
||||
DebugMode($" resource Check - Resource is: {resource.Value}");
|
||||
DebugMode($" resource Check - MaxResource is: {resource.MaxResource}");
|
||||
|
||||
editedPrice *= resource.Value / resource.MaxResource;
|
||||
}
|
||||
|
||||
DebugMode($" After resource Check - price is: {editedPrice}");
|
||||
|
||||
var foodDrink = item.GetItemComponent<FoodDrinkComponent>();
|
||||
if (foodDrink != null && foodDrink.HpPercent != 0)
|
||||
{
|
||||
GInterface234 ginterface234_0 = (GInterface234)foodDrink.GetType().GetField("ginterface234_0", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(foodDrink);
|
||||
|
||||
DebugMode($" foodDrink Check - HpPercent is: {foodDrink.HpPercent}");
|
||||
DebugMode($" foodDrink Check - MaxResource is: {ginterface234_0.MaxResource}");
|
||||
|
||||
editedPrice *= foodDrink.HpPercent / ginterface234_0.MaxResource;
|
||||
}
|
||||
|
||||
DebugMode($" After foodDrink Check - price is: {editedPrice}");
|
||||
|
||||
var keys = item.GetItemComponent<KeyComponent>();
|
||||
if (keys != null)
|
||||
{
|
||||
GInterface238 template = (GInterface238)keys.GetType().GetField("Template", BindingFlags.Public | BindingFlags.Instance).GetValue(keys);
|
||||
|
||||
if (keys.NumberOfUsages > 0)
|
||||
{
|
||||
double totalMinusUsed = Convert.ToDouble(template.MaximumNumberOfUsage - keys.NumberOfUsages);
|
||||
double multi = totalMinusUsed / template.MaximumNumberOfUsage;
|
||||
|
||||
DebugMode($" foodDrink Check - totalMinusUsed is: {totalMinusUsed}");
|
||||
DebugMode($" foodDrink Check - multi is: {multi}");
|
||||
|
||||
editedPrice *= multi;
|
||||
}
|
||||
}
|
||||
|
||||
DebugMode($" After keys Check - price is: {editedPrice}");
|
||||
|
||||
var sideEffect = item.GetItemComponent<SideEffectComponent>();
|
||||
if (sideEffect != null && sideEffect.Value != 0)
|
||||
{
|
||||
DebugMode($" sideEffect Check - resource is: {sideEffect.Value}");
|
||||
DebugMode($" sideEffect Check - MaxResource is: {sideEffect.MaxResource}");
|
||||
|
||||
editedPrice *= sideEffect.Value / sideEffect.MaxResource;
|
||||
}
|
||||
|
||||
DebugMode($" After sideEffect Check - price is: {editedPrice}");
|
||||
|
||||
DebugMode($"Ending price: {editedPrice}");
|
||||
|
||||
return editedPrice;
|
||||
}
|
||||
|
||||
public static void DebugMode(String str)
|
||||
{
|
||||
var directory = Directory.GetCurrentDirectory();
|
||||
|
||||
var modDirectory = new DirectoryInfo(directory + "/user/mods/");
|
||||
DirectoryInfo[] dirsInDir = modDirectory.GetDirectories("*" + "SeeItemValue" + "*.*");
|
||||
|
||||
if (dirsInDir.Length == 1)
|
||||
{
|
||||
var json = File.ReadAllText(dirsInDir[0].ToString() + "/src/config.json");
|
||||
|
||||
var configJson = Json.Deserialize<ConfigClass>(json);
|
||||
|
||||
if (configJson != null && configJson.DebugMode)
|
||||
{
|
||||
Debug.LogError(str);
|
||||
}
|
||||
}
|
||||
}
|
||||
// double _price = alteredPrice * jsonClass.multiplier;
|
||||
|
||||
// return Math.Round(_price).ToString();
|
||||
//}
|
||||
|
||||
//public static string TraderName(this Item item)
|
||||
//{
|
||||
// string itemId = item.Template._id;
|
||||
// JsonClass jsonClass;
|
||||
|
||||
// return jsonClass.traderName;
|
||||
//}
|
||||
|
||||
//public static double DurabilityCheck(this Item item, JsonClass jsonClass)
|
||||
//{
|
||||
// double editedPrice = jsonClass.price;
|
||||
// double originalMax = jsonClass.originalMax;
|
||||
|
||||
// DebugMode($" Entered DurabilityCheck() - starting price is: {editedPrice}");
|
||||
|
||||
// var medKit = item.GetItemComponent<MedKitComponent>();
|
||||
// if (medKit != null && medKit.HpResource != 0 && medKit.MaxHpResource != 0)
|
||||
// {
|
||||
// DebugMode($" Medkit Check - HpResource is: {medKit.HpResource}");
|
||||
// DebugMode($" Medkit Check - MaxHpResource is: {medKit.MaxHpResource}");
|
||||
|
||||
// editedPrice *= medKit.HpResource / medKit.MaxHpResource;
|
||||
// }
|
||||
|
||||
// DebugMode($" After Medkit Check - price is: {editedPrice}");
|
||||
|
||||
// var repair = item.GetItemComponent<RepairableComponent>();
|
||||
// if (repair != null)
|
||||
// {
|
||||
// if (repair.Durability > 0)
|
||||
// {
|
||||
// DebugMode($" repairable Check - Durability is: {repair.Durability}");
|
||||
// DebugMode($" Medkit Check - originalMax is: {originalMax}");
|
||||
|
||||
// editedPrice *= repair.Durability / originalMax;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// DebugMode($" repairable Check - Durability is 0");
|
||||
|
||||
// editedPrice = 1;
|
||||
// }
|
||||
// }
|
||||
|
||||
// DebugMode($" After repairable Check - price is: {editedPrice}");
|
||||
|
||||
// var dogtag = item.GetItemComponent<DogtagComponent>();
|
||||
// if (dogtag != null && dogtag.Level != 0)
|
||||
// {
|
||||
// DebugMode($" dogtag Check - level is: {dogtag.Level}");
|
||||
|
||||
// editedPrice *= dogtag.Level;
|
||||
// }
|
||||
|
||||
// DebugMode($" After dogtag Check - price is: {editedPrice}");
|
||||
|
||||
// var repairKit = item.GetItemComponent<RepairKitComponent>();
|
||||
// if (repairKit != null)
|
||||
// {
|
||||
// if (repairKit.Resource > 0)
|
||||
// {
|
||||
// DebugMode($" repairkit Check - Resource is: {repairKit.Resource}");
|
||||
// DebugMode($" repairkit Check - originalMax is: {originalMax}");
|
||||
|
||||
// editedPrice *= repairKit.Resource / originalMax;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// DebugMode($" repairkit Check - Resource is 0");
|
||||
|
||||
// editedPrice = 1;
|
||||
// }
|
||||
// }
|
||||
|
||||
// DebugMode($" After repairkit Check - price is: {editedPrice}");
|
||||
|
||||
// var resource = item.GetItemComponent<ResourceComponent>();
|
||||
// if (resource != null && resource.Value != 0 && resource.MaxResource != 0)
|
||||
// {
|
||||
// DebugMode($" resource Check - Resource is: {resource.Value}");
|
||||
// DebugMode($" resource Check - MaxResource is: {resource.MaxResource}");
|
||||
|
||||
// editedPrice *= resource.Value / resource.MaxResource;
|
||||
// }
|
||||
|
||||
// DebugMode($" After resource Check - price is: {editedPrice}");
|
||||
|
||||
// var foodDrink = item.GetItemComponent<FoodDrinkComponent>();
|
||||
// if (foodDrink != null && foodDrink.HpPercent != 0)
|
||||
// {
|
||||
// GInterface234 ginterface234_0 = (GInterface234)foodDrink.GetType().GetField("ginterface234_0", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(foodDrink);
|
||||
|
||||
// DebugMode($" foodDrink Check - HpPercent is: {foodDrink.HpPercent}");
|
||||
// DebugMode($" foodDrink Check - MaxResource is: {ginterface234_0.MaxResource}");
|
||||
|
||||
// editedPrice *= foodDrink.HpPercent / ginterface234_0.MaxResource;
|
||||
// }
|
||||
|
||||
// DebugMode($" After foodDrink Check - price is: {editedPrice}");
|
||||
|
||||
// var keys = item.GetItemComponent<KeyComponent>();
|
||||
// if (keys != null)
|
||||
// {
|
||||
// GInterface238 template = (GInterface238)keys.GetType().GetField("Template", BindingFlags.Public | BindingFlags.Instance).GetValue(keys);
|
||||
|
||||
// if (keys.NumberOfUsages > 0)
|
||||
// {
|
||||
// double totalMinusUsed = Convert.ToDouble(template.MaximumNumberOfUsage - keys.NumberOfUsages);
|
||||
// double multi = totalMinusUsed / template.MaximumNumberOfUsage;
|
||||
|
||||
// DebugMode($" foodDrink Check - totalMinusUsed is: {totalMinusUsed}");
|
||||
// DebugMode($" foodDrink Check - multi is: {multi}");
|
||||
|
||||
// editedPrice *= multi;
|
||||
// }
|
||||
// }
|
||||
|
||||
// DebugMode($" After keys Check - price is: {editedPrice}");
|
||||
|
||||
// var sideEffect = item.GetItemComponent<SideEffectComponent>();
|
||||
// if (sideEffect != null && sideEffect.Value != 0)
|
||||
// {
|
||||
// DebugMode($" sideEffect Check - resource is: {sideEffect.Value}");
|
||||
// DebugMode($" sideEffect Check - MaxResource is: {sideEffect.MaxResource}");
|
||||
|
||||
// editedPrice *= sideEffect.Value / sideEffect.MaxResource;
|
||||
// }
|
||||
|
||||
// DebugMode($" After sideEffect Check - price is: {editedPrice}");
|
||||
|
||||
// DebugMode($"Ending price: {editedPrice}");
|
||||
|
||||
// return editedPrice;
|
||||
//}
|
||||
|
||||
//public static void DebugMode(String str)
|
||||
//{
|
||||
// var directory = Directory.GetCurrentDirectory();
|
||||
|
||||
// var modDirectory = new DirectoryInfo(directory + "/user/mods/");
|
||||
// DirectoryInfo[] dirsInDir = modDirectory.GetDirectories("*" + "SeeItemValue" + "*.*");
|
||||
|
||||
// if (dirsInDir.Length == 1)
|
||||
// {
|
||||
// var json = File.ReadAllText(dirsInDir[0].ToString() + "/src/config.json");
|
||||
|
||||
// var configJson = Json.Deserialize<ConfigClass>(json);
|
||||
|
||||
// if (configJson != null && configJson.DebugMode)
|
||||
// {
|
||||
// Debug.LogError(str);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user