Merge pull request #1 from sayterdarkwynd/master

Test

.metadata

@@ -8,5 +8,5 @@
   "requires" : [],
   "steamContentId" : "729480149",
   "tags" : "Crafting and Building|Miscellaneous|Planets and Environments|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|User Interface|Furniture and Objects|Food and Farming|Mechanics|Vehicles and Mounts|Armor and Clothes",
-  "version" : "5.6.4094"
+  "version" : "5.6.411"
 }

_FUversioning.config

@@ -1,7 +1,26 @@
 {
-	"version" : "5.6.409",
+	"version" : "5.6.411",
 	"changelog" : "
 
+______________________________________________
+  ^cyan;New in version 5.6.411^reset;
+
+  -- Missions --
+  * the Tattered Grimoire is removed as a craftable, and is now located in a new secret location somewhere in a vanilla mission. Hints have been placed within existing narratives.
+
+  -- Weapons --
+  * Quietus ranged weapons rebalanced
+  * old Quietus Rifle renamed and repurposed
+  * Aetherium Scythe alt fixed
+  * Aetherium Broadsword alt completely changed
+  * corrected several erroneous effect calls from new elements
+
+  -- Bugs --
+  * Paintings will generate madness more reliably, with a much longer AFK ceiling than other sources
+  * fixed electron microscope '2' unlock (Kherae)
+  * corrected missing % in broken master manipulator tooltip (Kherae)
+  * fixed an uninit goof in dreamer armor's regenerating shield (Kherae)
+  * made adjustments to several ranged weapon altfires, mostly implementing support for the flavor element variants, but also ensuring they properly use the weapon's element and removing some cases of PGI generation (Kherae)
 ______________________________________________
   ^cyan;New in version 5.6.410^reset;
 
@@ -13,8 +32,13 @@ ______________________________________________
   * slime armor set 2 (black slime) now summons tar slimes that apply tar slow. (Kherae)
 
   -- Weapons --
-  * Improved firing particles of several ranged weapons (Kherae)
+  * Improved firing particles of several ranged weapons
   * Effigium Broadsword added (Kherae)
+  * Bouncing Orbitals now fires 2 less bouncers and it has had its base DPS reduced by a full point (from 3.5 to 2.5)
+  * added Quietus ranged weapons (Shinigami Apples)
+
+  -- Bees --
+  * Queen lifespans should be effectively doubled in actual game time. Their stats will display as they previously have.
 
   -- Misc --
   * updated tooltips for several vanilla and FU augments (Kherae)
@@ -27,7 +51,10 @@ ______________________________________________
   * added keyed precursor buttons and switches to loot (Kherae)
   * crucible no longer increases fire rate or attack speed. gave it an ever so slight increase to base damage (Kherae)
   * Anyone with Tungsten and Titianium longswords will need to replace them, as the IDs were changed
-
+  * Madness gained from paintings will no longer produce when AFK.
+  * reformatted player.config.patch (Kherae)
+  * added test ops to categories.config.patch (Kherae)
+  * changed vanilla raygun to 'energy' category, so it sorts into weapons with bk3k (Kherae)
 
   -- Bugs --
   * fixed duplicate rad res in hazard set (Kherae)

bees/apiary.lua

@@ -204,6 +204,9 @@ function init()
 	
 	-- Init timer, and offset update delta to reduce potential lag spikes when they all update at the same time
 	beeUpdateTimer = beeData.beeUpdateInterval
+
+
+
 	local timerIncrement = config.getParameter("scriptDelta") * 0.01
 	
 	local sameTimers
@@ -692,17 +695,10 @@ function ageQueen(amount)
 	if not queen.parameters.lifespan or queen.parameters.lifespan < 0 then 
 	  queen.parameters.lifespan = 500 
 	end
-	
-	-- original
-	--queen.parameters.lifespan = queen.parameters.lifespan - (amount or 1)
-	--world.containerTakeAt(entity.id(), queenSlot-1)
-	
-	--updated
-	self.randQueenAge = math.random(0,1)  --kill queens half as fast as before
-	if self.randQueenAge == 1 then
-		queen.parameters.lifespan = queen.parameters.lifespan - (amount or 1)
-		world.containerTakeAt(entity.id(), queenSlot-1)	
-	end
+
+
+	queen.parameters.lifespan = queen.parameters.lifespan - (amount or 1)
+	world.containerTakeAt(entity.id(), queenSlot-1)	
 	
 	if (queen.parameters.lifespan > 0) then
 		world.containerPutItemsAt(entity.id(), queen, queenSlot-1)

bees/beeBuilder.lua

@@ -83,10 +83,10 @@ function build(directory, config, parameters, level, seed)
 	-- Add lifespan counter for queens based on their lifespan stat and update their lifebar if their genome was inspected
 	if root.itemHasTag(config.itemName, "queen") then
 		require "/bees/genomeLibrary.lua"
-		local fullLifespan = genelib.statFromGenomeToValue(parameters.genome, "queenLifespan")
-		
+		local fullLifespan = genelib.statFromGenomeToValue(parameters.genome, "queenLifespan") * 2
+
 		if not parameters.lifespan then
-			parameters.lifespan = fullLifespan
+			parameters.lifespan = fullLifespan -- added a x2 so queen duration is 2x as high as previously due to overwhelming demand for longer-lived monarchs
 		end
 
 		if parameters.genomeInspected then