Restyle ship stat upgrades.

vacuum_gambit.p8

@@ -916,10 +916,12 @@ blast_gun = mknew(gun_base.new{
  maxammo = 5,
  munition = blast,
  hdr = "bLASTER",
- body= [[plasma orb
+ body= [[-----------GUN
+
+ plasma orb
 cuts through
-enemies.
-slow.
+  enemies.
+    slow.
 
 ammo: 5
 rate: 1/2sec
@@ -988,9 +990,11 @@ protron_gun_p = mknew(protron_gun_e.new{
  maxammo = 20,
  cooldown = 0x0.0018,
  hdr = "pROTRON",
- body = [[spray shots
-in a dense
-arc.
+ body = [[-----------GUN
+
+ spray shots
+ in a dense
+    arc.
 
 ammo: 20
 rate: 2/sec
@@ -1049,9 +1053,10 @@ vulcan_gun_p = mknew(vulcan_gun_e.new{
  munition=vulcan_p,
  maxammo = 100,
  hdr = "vULCAN",
- body = [[rapid fire
-in a v
-shape.
+ body = [[-----------GUN
+
+rapid fire in
+ a v shape.
 
 ammo: 100
 rate: 20/sec
@@ -1142,7 +1147,11 @@ function player:small_upgrade_opts()
  local ret = {{
   icon=53,
   hdr="hull",
-  body=[[    armor
+  body=[[----------SHIP
+
+survive more
+ unshielded
+     hits.
 
     +2 hp]],
   action=function()
@@ -1151,8 +1160,13 @@ function player:small_upgrade_opts()
   end,
  },{
   icon=52,
-  hdr="shield",
-  body=[[  capacity
+  hdr="capacity",
+  body=[[--------SHIELD
+
+shield can
+absorb more
+hits before
+recharging.
 
     +1 hp]],
   action=function()
@@ -1162,10 +1176,10 @@ function player:small_upgrade_opts()
  },{
   icon=1,
   hdr="thrusters",
-  body=[[performance
+  body=[[----------SHIP
 
 move faster,
-steer faster]],
+steer faster.]],
  action=function()
   --maxspd thrust drag
   self.maxspd += 0.5
@@ -1174,12 +1188,12 @@ steer faster]],
  end,
  },{
   icon=20,
-  hdr="hull",
-  body=[[   magnet
+  hdr="magnet",
+  body=[[----------SHIP
 
  pick up xp
 from further
-   away]],
+   away.]],
   action=function ()
    self.magnet += 2
   end,
@@ -1188,8 +1202,12 @@ from further
  if cdr > 0 then
   add(ret, {
    icon = 6,
-   hdr = "shield",
-   body=[[charge rate
+   hdr = "recharge",
+   body=[[--------SHIELD
+
+shield energy
+ refill rate
+  improves.
  
   ]] .. tostr(ceil(100 * cdr / self.shieldcooldown)) .. "% faster",
    action = function()
@@ -1201,8 +1219,14 @@ from further
  if pr > 0 then
   add(ret, {
    icon = 6,
-   hdr = "shield",
-   body=[[disruption
+   hdr = "recovery",
+   body=[[--------SHIELD
+
+ reduce the
+delay before
+shield starts
+ recovering
+after a hit.
  
  ]] .. tostr(ceil(100 * pr / self.shieldpenalty)) .. "% shorter",
    action = function()
@@ -1863,7 +1887,11 @@ end
 -- ordinary upgrades
 function small_opts()
  -- todo: include gun opts
- return pick(primary_ship:small_upgrade_opts(), 2)
+ if(not primary_ship.special_guns) return pick(primary_ship:small_upgrade_opts(), 2)
+ local opts = {rnd(primary_ship:small_upgrade_opts())}
+ for g in all(primary_ship.special_guns) do
+  add(opts, rnd(g:small_upgrade_opts()))
+ end
 end
 
 -->8