rifles

GuyBronson · Aug 7, 2020 · cbd90da · cbd90da
1 parent a842785
commit cbd90da
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 36 deletions.
diff --git a/_FUversioning.config b/_FUversioning.config
@@ -8,7 +8,22 @@ ______________________________________________
   -- Misc --
   * added check for FR. if players have FR installed, they will not really be able to leave their ship until they uninstall it. They'll just keep getting beamed back and messaged again. (Kherae)
   * Thelusian Flag retextured (Lucifers Vermin)
-
+  * update meleeslash: if an activeitem does not have the 'weapon' tag, it will not drain energy. Bug Nets will no longer drain you with use. (Kherae)
+  * revised sapling buildscript to be more flexible. now uses a json config to load from, allowing extenal mod support. (Kherae)
+  * updated Fertilizer descriptions (kukagres)
+  * 'reliable' type sniper rifles have been improved
+
+  -- Dungeons -- (Rylasasin)
+  * Those weird Apex Slave encounters have been remade in Tiled. Slaves are now in dedicated buildings or a cave, and are not just wandering about willy-nilly. The 'slaver guild' building isn't made out of packed bones that collapse when farted at anymore.
+  * Also included 'fire' versions of 2 and three which swaps the normal roofing and wood for copper roofing and stone.
+
+  -- Bugs --
+  * Mech Fuel should all empty properly, including nuclear cores (Kherae)
+  * Harvester Beamgun no longer messes up tilling certain soils (kukagres)
+  * due to uninit not being called and penalties becoming stuck, changed implementation of meleeslash's energy-based damage penalty. it is now applied as part of damage calculation, rather than as a persistent stat modifier. (Kherae)
+  * corrected incorrect word in harvester beamgun series: tilt -> till (Kherae)
+______________________________________________
+  * further fixes toward energy related errors in meleecombo (Kherae)
 ______________________________________________
   ^cyan;New in version 5.6.4241^reset;
 

diff --git a/items/active/weapons/ranged/unique/rifleaegisaltfu.activeitem b/items/active/weapons/ranged/unique/rifleaegisaltfu.activeitem
@@ -46,8 +46,8 @@
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
     "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.7,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifledurasteelfu.activeitem b/items/active/weapons/ranged/unique/rifledurasteelfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 1.2,
-    "baseDps" : 5.65,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.8,
+    "baseDps" : 8.5,
+    "energyUsage" : 30.0,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifleeffigiumfu.activeitem b/items/active/weapons/ranged/unique/rifleeffigiumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.7,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.8,
+    "baseDps" : 8,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifleferoziumfu.activeitem b/items/active/weapons/ranged/unique/rifleferoziumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.75,
+    "baseDps" : 8.1,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifleironfu.activeitem b/items/active/weapons/ranged/unique/rifleironfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.85,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifleirradiumfu.activeitem b/items/active/weapons/ranged/unique/rifleirradiumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.85,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/riflequietusfu.activeitem b/items/active/weapons/ranged/unique/riflequietusfu.activeitem
@@ -46,8 +46,8 @@
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
     "fireTime" : 1.85,
-    "baseDps" : 5.5,
-    "energyUsage" : 40.0,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifletitaniumfu.activeitem b/items/active/weapons/ranged/unique/rifletitaniumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.84,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifletriangliumfu.activeitem b/items/active/weapons/ranged/unique/rifletriangliumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 1.75,
-    "baseDps" : 5.34,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.8,
+    "baseDps" : 8,
+    "energyUsage" : 30.0,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/rifletungstenfu.activeitem b/items/active/weapons/ranged/unique/rifletungstenfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 2,
-    "baseDps" : 5.6,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.85,
+    "baseDps" : 8.5,
+    "energyUsage" : 25.5,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/riflevioliumfu.activeitem b/items/active/weapons/ranged/unique/riflevioliumfu.activeitem
@@ -45,9 +45,9 @@
   "primaryAbility" : {
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
-    "fireTime" : 1.9,
-    "baseDps" : 5.4,
-    "energyUsage" : 40.0,
+    "fireTime" : 1.80,
+    "baseDps" : 8,
+    "energyUsage" : 25.0,
     "inaccuracy" : 0,
 
     "projectileCount" : 1,

diff --git a/items/active/weapons/ranged/unique/telebriumsniperrifle.activeitem b/items/active/weapons/ranged/unique/telebriumsniperrifle.activeitem
@@ -57,8 +57,8 @@
     "scripts" : ["/items/active/weapons/ranged/gunfire.lua"],
     "class" : "GunFire",
     "fireTime" : 2,
-    "baseDps" : 8,
-    "energyUsage" : 50.0,
+    "baseDps" : 7.75,
+    "energyUsage" : 30.5,
     "inaccuracy" : 0,
     "projectileCount" : 1,
     "fireType" : "auto",

diff --git a/treasure/cropharvest.treasurepools.patch b/treasure/cropharvest.treasurepools.patch
@@ -5,7 +5,7 @@
 	"value" : [ [0, {
 			"pool" : [
 			{"weight" : 0.95, "item" : "phasefruit"},
-			{"weight" : 0.04, "item" : "phasefruitseed"},
+			{"weight" : 0.50, "item" : "phasefruitseed"},
 			{"weight" : 0.01, "item" : "plantfibre"}
                           ],
 			"poolRounds" : [ [0.2, 1], [0.6, 2], [0.2, 3] ] 
@@ -41,7 +41,7 @@
 	"value" : [ [0, {
 			"pool" : [
 			{"weight" : 0.85, "item" : "solusberry"},
-			{"weight" : 0.05, "item" : "solusberryseed"},
+			{"weight" : 0.50, "item" : "solusberryseed"},
 			{"weight" : 0.10, "item" : "coalore"}
                           ],
 			"poolRounds" : [ [0.2, 1], [0.6, 2], [0.2, 3] ]