Merge pull request #182 from hanakocz/master

rpg fix for getting xp, bonus hp -> bonus xp even if killed by turret

control.lua

@@ -66,6 +66,7 @@ require 'modules.autostash'
 --require 'modules.immersive_cargo_wagons.main'
 --require 'modules.wave_defense.main'
 --require 'modules.fjei.main'
+--require 'modules.charging_station'
 -----------------------------
 
 ---- enable maps here ---- (maps higher up in the list may be more actually playable)

locale/en/modules.cfg

@@ -0,0 +1,2 @@
+[modules]
+charging_station_tooltip=Charge your armor equipment from nearby accumulators!\nWorks only with those that have more than 3MJ of power.

modules/charging_station.lua

@@ -0,0 +1,79 @@
+--made by Hanakocz
+--charge your armor equipment from nearby accumulators!
+--change global.charging_station_multiplier if you want different conversion rate than 1:1.
+local Event = require 'utils.event'
+
+local function draw_charging_gui()
+	for _, player in pairs(game.connected_players) do
+		if not player.gui.top.charging_station then
+			player.gui.top.add({type = "sprite-button", name = "charging_station", sprite = "item/battery-mk2-equipment", tooltip = {"modules.charging_station_tooltip"}})
+		end
+	end
+end
+
+local function discharge_accumulators(surface, position, force, power_needs)
+  local accumulators = surface.find_entities_filtered{name = "accumulator", force = force, position = position, radius = 13}
+  local power_drained = 0
+  power_needs = power_needs * global.charging_station_multiplier
+  for _,accu in pairs(accumulators) do
+    if accu.valid then
+      if accu.energy > 3000000 and power_needs > 0 then
+        if power_needs >= 2000000 then
+          power_drained = power_drained + 2000000
+          accu.energy = accu.energy - 2000000
+          power_needs = power_needs - 2000000
+        else
+          power_drained = power_needs
+          accu.energy = accu.energy - power_needs
+        end
+      elseif power_needs <= 0 then
+        break
+      end
+    end
+  end
+  return power_drained / global.charging_station_multiplier
+end
+
+local function charge(player)
+  local armor_inventory = player.get_inventory(defines.inventory.character_armor)
+  if not armor_inventory.valid then return end
+  local armor = armor_inventory[1]
+  if not armor.valid_for_read then return end
+  local grid = armor.grid
+  if not grid or not grid.valid then return end
+  local equip = grid.equipment
+  for _,piece in pairs(equip) do
+    if piece.valid then
+      local energy_needs = piece.max_energy - piece.energy
+      if energy_needs > 0 then
+        local energy = discharge_accumulators(player.surface, player.position, player.force, energy_needs)
+        if energy > 0 then
+          piece.energy = piece.energy + energy
+        end
+      end
+    end
+  end
+end
+
+local function on_player_joined_game(event)
+	draw_charging_gui()
+end
+
+local function on_gui_click(event)
+	if not event then return end
+	if not event.element then return end
+	if not event.element.valid then return end
+	local player = game.players[event.element.player_index]
+	if event.element.name == "charging_station" then
+		charge(player)
+		return
+	end
+end
+
+local function on_init()
+	global.charging_station_multiplier = 1
+end
+
+Event.on_init(on_init)
+Event.add(defines.events.on_player_joined_game, on_player_joined_game)
+Event.add(defines.events.on_gui_click, on_gui_click)

modules/rpg_v2.lua

@@ -672,7 +672,7 @@ local function add_to_global_pool(amount, personal_tax)
     end
 
     rpg_extra.global_pool = rpg_extra.global_pool + fee
-    return fee
+    return amount - fee
 end
 
 local function global_pool(players, count)
@@ -907,6 +907,13 @@ local function on_entity_died(event)
             if rpg_xp_yield[event.entity.name] then
                 local amount = rpg_xp_yield[event.entity.name]
                 amount = amount / 5
+                if global.biter_health_boost then
+                  local health_pool = global.biter_health_boost_units[event.entity.unit_number]
+                  if health_pool then
+                    amount = amount * (1 / health_pool[2])
+                  end
+                end
+
                 if rpg_extra.turret_kills_to_global_pool then
                     add_to_global_pool(amount, false)
                 end