Merge pull request #1 from sayterdarkwynd/master

Testing.

.metadata

@@ -7,5 +7,5 @@
   "name" : "FrackinUniverse",
   "requires" : [],
   "steamContentId" : "729480149",
-  "version" : "5.0.7"
+  "version" : "5.0.8"
 }

behaviors/npc/combat/melee.behavior

@@ -10,10 +10,10 @@
     "/scripts/actions/time.lua"
   ],
   "parameters": {
-    "switchToRangedCooldown": 3,
+    "switchToRangedCooldown": 1,
     "liquidHesitationTime": 2.5,
     "forceRunRange": 15,
-    "leapCooldown": 3.5,
+    "leapCooldown": 2.5,
     "leapChance": 0.5
   },
   "root": {

behaviors/npc/combat/ranged.behavior

@@ -15,8 +15,8 @@
   "parameters": {
     "rangedAimTime": 0.01,
     "rangedWindupTime": 0.05,
-    "rangedMinFireTime": 0.5,
-    "rangedMaxFireTime": 1,
+      "rangedMinFireTime": 0.1,
+      "rangedMaxFireTime": 5,  
     "bowDrawTime": 1,
     "arrowSpeed": 62.5
   },
@@ -462,7 +462,7 @@
                                   "type": "action",
                                   "name": "primaryFire",
                                   "parameters": {}
-                                },
+                                },                              
                                 {
                                   "title": "sequence",
                                   "type": "composite",

biomes/surface/moon_desert.biome

@@ -2,7 +2,7 @@
   "name" : "moon_desert",
   "friendlyName" : "Moon",
   "airless" : true,
-  "statusEffects" : [ "biolecold1", "biomeairless" ],
+  "statusEffects" : [ "ffbiomecold1", "biomeairless" ],
 
   "spawnProfile" : {
     "groups" : [

celestial/names.config.patch

@@ -1,6 +1,7 @@
 [
 	{"op":"remove","path":"/systemNames/8"},
 	{"op":"remove","path":"/systemNames/94"},
+	{"op":"add","path":"/systemNames/-","value":[1,"Cunning"]},
 	{"op":"add","path":"/systemNames/-","value":[1,"Nyani"]},
 	{"op":"add","path":"/systemNames/-","value":[1,"Corellia"]},
 	{"op":"add","path":"/systemNames/-","value":[1,"Kain"]},
@@ -106,6 +107,67 @@
 {"op":"add","path":"/systemNames/-","value":[1,"Xing Tian"]},
 {"op":"add","path":"/systemNames/-","value":[1,"Zeus"]},
 {"op":"add","path":"/systemNames/-","value":[1,"Zhong Kui"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Noodle"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Whorelax"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Stinky"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Small"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Enormous"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Throbbing"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Moist"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Dental"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Grandma's"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Uncle's"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Tim's"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Dave's"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Meaty"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Prostitute"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Vexxa"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Sexy"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Bacon"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Einstein"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Rosenburg"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Vicalla"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Simmons"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Whale"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Overweight"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Fat"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Moronic"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Butthurt"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Donkytonsil"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Tit"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Valuable"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Perplexing"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Nude"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Stupid"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Forgettable"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Rancid"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Hawking"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Endowed"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Micro"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Rectal"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Obese"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Annoying"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Fartsteve"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Invitro"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Wagner"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Kurt"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Power"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Weakness"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Parody"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Parodius"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Toxic"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Samurai"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Butt"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Pirate"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Rectal"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Choir"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Nickleback"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Lick"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Ass"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Sister"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Youra"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Deceptivus"]},
+{"op":"add","path":"/systemNames/-","value":[1,"Rotting"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
@@ -114,6 +176,12 @@
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,""]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Crotch"]},	
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Linguist"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Ass"]},	
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Champion"]},	
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Choir"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Pirate"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Nether"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Noire"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Flinch"]},
@@ -135,5 +203,79 @@
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Shine"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Borealis"]},
 	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Kappa"]},
-	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Periadus"]}
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Periadus"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Noodle"]},
+        {"op":"add","path":"/systemSuffixNames/-","value":[1,"Shart"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Wart"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Dude"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Juvenile"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Dentist"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Orthodontist"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Mexican"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Stench"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Buttfart"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Analgland"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Urethra"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Clown"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Meathammer"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Bacon"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Corpse"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Prostitute"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Putresence"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Wiener"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Wang"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Gristle"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Putresence"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Hall"]},	
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"KX2"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"X1"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"1256"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"756C"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"67876B"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"22T"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"4353B"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"234A"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"556YKK"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"TY6"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"54764"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"55C"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"12456"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"8565"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"43LLI"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"77KN"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"66744"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"4576"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"125KIY"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"3442"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"567"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"3247"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"778VV"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Delight"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Usuck"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"99"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"1"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"2"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"3"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"77"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"65"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"11221"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Dunkirk"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"923"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"TT887"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"77-98"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"GX-87"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Ninja"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"222"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"BX1"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Nin"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Vulturus"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"55TR"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"KL-994"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"66C-ZZ4"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"12"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"76"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Slurper"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Yellow"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Dumbass"]},
+	{"op":"add","path":"/systemSuffixNames/-","value":[1,"Cheese"]}
 ]

interface/itemdescriptions/gun2.itemdescription

@@ -0,0 +1,173 @@
+{
+  "moneyIcon" : {
+    "type" : "image",
+    "position" : [125, 0],
+    "file" : "/interface/money.png"
+  },
+  "priceLabel" : {
+    "type" : "label",
+    "position" : [140, 0],
+    "hAnchor" : "left",
+    "value" : "tree"
+  },
+
+  "descriptionLabel" : {
+    "type" : "label",
+    "position" : [16, 92],
+    "hAnchor" : "left",
+    "vAnchor" : "top",
+    "wrapWidth" : 140,
+    "fontSize" : 7
+  },
+
+    "levelTitleLabel" : {
+      "type" : "label",
+      "position" : [139, 152],
+      "hAnchor" : "left",
+      "vAnchor" : "top",
+      "wrapWidth" : 134,
+      "value" : "Lvl "
+    },  
+    "levelLabel" : {
+      "type" : "label",
+      "position" : [152, 152],
+      "hAnchor" : "left",
+      "vAnchor" : "top",
+      "wrapWidth" : 134
+  },   
+
+  "critChanceTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 152],
+    "hAnchor" : "left",
+    "vAnchor" : "top",
+    "wrapWidth" : 134,
+    "value" : "^orange;Crit %^reset;"
+  },  
+  "critChanceLabel" : {
+    "type" : "label",
+    "position" : [26, 142],
+    "hAnchor" : "left",
+    "vAnchor" : "top",
+    "wrapWidth" : 134
+  },  
+  "critBonusTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 132],
+    "hAnchor" : "left",
+    "vAnchor" : "top",
+    "wrapWidth" : 134,
+    "value" : "^yellow;Dmg +^reset;"
+  },  
+  "critBonusLabel" : {
+    "type" : "label",
+    "position" : [26, 122],
+    "hAnchor" : "left",
+    "vAnchor" : "top",
+    "wrapWidth" : 134
+  },  
+
+  "speedTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 42],
+    "hAnchor" : "left",
+    "value" : "Rate of Fire:"
+  },
+  "speedLabel" : {
+    "type" : "label",
+    "position" : [154, 42],
+    "hAnchor" : "right",
+    "wrapWidth" : 140
+  },
+  "damagePerShotTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 33],
+    "hAnchor" : "left",
+    "value" : "Damage Per Shot:"
+  },
+  "damagePerShotLabel" : {
+    "type" : "label",
+    "position" : [154, 33],
+    "hAnchor" : "right",
+    "wrapWidth" : 140
+  },
+  "energyPerShotTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 24],
+    "hAnchor" : "left",
+    "value" : "Energy Per Shot:"
+  },
+  "energyPerShotLabel" : {
+    "type" : "label",
+    "position" : [154, 24],
+    "hAnchor" : "right",
+    "wrapWidth" : 140
+  },
+  "altAbilityTitleLabel" : {
+    "type" : "label",
+    "position" : [16, 15],
+    "hAnchor" : "left",
+    "value" : ""
+  },
+  "altAbilityLabel" : {
+    "type" : "label",
+    "position" : [154, 15],
+    "hAnchor" : "right",
+    "centered" : true,
+    "wrapWidth" : 140
+  },
+  "handednessLabel" : {
+    "type" : "label",
+    "position" : [90, 150],
+    "hAnchor" : "mid",
+    "centered" : true,
+    "wrapWidth" : 122
+  },
+
+  "rarityLabel" : {
+    "type" : "label",
+    "position" : [16, 0],
+    "hAnchor" : "left",
+    "centered" : true,
+    "wrapWidth" : 126
+  },
+  "damageKindImage" : {
+    "type" : "image",
+    "position" : [150, 105],
+    "file" : "",
+    "centered" : true,
+    "maxSize" : [16, 16],
+    "minSize" : [16, 16]
+  },
+  "objectImage" : {
+    "type" : "image",
+    "position" : [85, 120],
+    "file" : "",
+    "centered" : true,
+    "maxSize" : [60, 60],
+    "minSize" : [60, 60]
+  },
+  "title" : {
+    "type" : "label",
+    "position" : [35, 179],
+    "hAnchor" : "left",
+    "value" : ""
+  },
+  "subTitle" : {
+    "type" : "label",
+    "position" : [35, 169],
+    "hAnchor" : "left",
+    "color" : [185, 181, 178],
+    "value" : ""
+  },
+  "titleIcon" : {
+    "type" : "itemslot",
+    "position" : [9, 167],
+    "callback" : "null",
+    "iconMode" : true,
+    "backingImage" : "/interface/inventory/portrait.png",
+    "showRarity" : false,
+    "showBackingImageWhenFull" : true
+  }
+
+}