Merge pull request #88 from the-hideout/more-item-props

add more item properties

Author: Razzmatazzz

index.js

@@ -44,13 +44,31 @@ async function getSchema(data) {
         });
     }
     loadingSchema = true;
-    return dynamicTypeDefs(data).then(dynamicTypeDefs => {
-        schema = makeExecutableSchema({typeDefs: mergeTypeDefs([typeDefs, dynamicTypeDefs]), resolvers: resolvers});
-        loadingSchema = false;
-        return schema;
-    }).catch(error => {
+    return dynamicTypeDefs(data).catch(error => {
         loadingSchema = false;
+        console.log('Error loading dynamic type definitions', error);
         return Promise.reject(error);
+    }).then(dynamicTypeDefs => {
+        let mergedDefs;
+        try {
+            mergedDefs = mergeTypeDefs([typeDefs, dynamicTypeDefs]);
+        } catch (error) {
+            console.log('Error merging type defs', error);
+            return Promise.reject(error);
+        }
+        try {
+            schema = makeExecutableSchema({typeDefs: mergedDefs, resolvers: resolvers});
+            loadingSchema = false;
+            return schema;
+        } catch (error) {
+            console.log('Error making schema executable');
+            if (!error.message) {
+                console.log('Check type names in resolvers');
+            } else {
+                console.log(error.message);
+            }
+            return Promise.reject(error);
+        }
     });
 }
 

resolvers/itemResolver.js

@@ -202,6 +202,14 @@ module.exports = {
             return context.util.getLocale(data, 'zones', info);
         }
     },
+    ItemPropertiesArmorAttachment: {
+        material(data, args, context) {
+            return context.data.item.getArmorMaterial(data.armor_material_id);
+        },
+        headZones(data, args, context, info) {
+            return context.util.getLocale(data, 'headZones', info);
+        }
+    },
     ItemPropertiesChestRig: {
         material(data, args, context) {
             return context.data.item.getArmorMaterial(data.armor_material_id);

schema.js

@@ -14,8 +14,10 @@ type Ammo {
   ricochetChance: Float!
   penetrationChance: Float!
   penetrationPower: Int!
-  accuracy: Int!
-  recoil: Int
+  accuracy: Int @deprecated(reason: "Use accuracyModifier instead.")
+  accuracyModifier: Float
+  recoil: Int @deprecated(reason: "Use recoilModifier instead.")
+  recoilModifier: Float
   initialSpeed: Int!
   lightBleedModifier: Float!
   heavyBleedModifier: Float!
@@ -271,11 +273,15 @@ type ItemPropertiesAmmo {
   ricochetChance: Float
   penetrationChance: Float
   penetrationPower: Int
-  accuracy: Int
-  recoil: Float
+  accuracy: Int @deprecated(reason: "Use accuracyModifier instead.")
+  accuracyModifier: Float
+  recoil: Float @deprecated(reason: "Use recoilModifier instead.")
+  recoilModifier: Float
   initialSpeed: Int
   lightBleedModifier: Float
   heavyBleedModifier: Float
+  durabilityBurnFactor: Float
+  heatFactor: Float
 }
 
 type ItemPropertiesArmor {
@@ -298,6 +304,7 @@ type ItemPropertiesArmorAttachment {
   ergoPenalty: Int
   headZones: [String]
   material: ArmorMaterial
+  blindnessProtection: Float
 }
 
 type ItemPropertiesBackpack {
@@ -367,7 +374,8 @@ type ItemPropertiesKey {
 
 type ItemPropertiesMagazine {
   ergonomics: Float
-  recoil: Float
+  recoil: Float @deprecated(reason: "Use recoilModifier instead.")
+  recoilModifier: Float
   capacity: Int
   loadModifier: Float
   ammoCheckModifier: Float
@@ -389,6 +397,12 @@ type ItemPropertiesMedKit {
   hpCostHeavyBleeding: Int
 }
 
+type ItemPropertiesMelee {
+  slashDamage: Int
+  stabDamage: Int
+  hitRadius: Float
+}
+
 type ItemPropertiesNightVision {
   intensity: Float
   noiseIntensity: Float
@@ -414,7 +428,8 @@ type ItemPropertiesPreset {
 
 type ItemPropertiesScope {
   ergonomics: Float
-  recoil: Float
+  recoil: Float @deprecated(reason: "Use recoilModifier instead.")
+  recoilModifier: Float
   zoomLevels: [[Float]]
 }
 
@@ -454,7 +469,9 @@ type ItemPropertiesWeapon {
 
 type ItemPropertiesWeaponMod {
   ergonomics: Float
-  recoil: Float
+  recoil: Float @deprecated(reason: "Use recoilModifier instead.")
+  recoilModifier: Float
+  accuracyModifier: Float
 }
 
 union ItemProperties = 
@@ -471,6 +488,7 @@ union ItemProperties =
   ItemPropertiesKey | 
   ItemPropertiesMagazine | 
   ItemPropertiesMedicalItem | 
+  ItemPropertiesMelee | 
   ItemPropertiesMedKit | 
   ItemPropertiesNightVision | 
   ItemPropertiesPainkiller | 

schema_dynamic.js

@@ -1,13 +1,13 @@
 module.exports = async (data) => {
     const itemTypes = await data.item.getTypes();
     const categories = await data.item.getCategories();
-	const languageCodes = await data.item.getLanguageCodes();
+    const languageCodes = await data.item.getLanguageCodes();
     return `
 enum ItemType {
-  ${itemTypes.join('\n ')}
+    ${itemTypes.join('\n ')}
 }
 enum ItemCategoryName {
-  ${categories.map(cat => cat.enumName).sort().join('\n  ')}
+    ${categories.map(cat => cat.enumName).sort().join('\n  ')}
 }
 enum LanguageCode {
 	${languageCodes.join('\n ')}