Mtn v3 - more fixes

locale/en/rpg.cfg

@@ -152,9 +152,9 @@ tidal_wave=Tidal Wave
 pointy_explosives=Detonate Chest
 repair_aoe=Repair AOE
 charge=Charge
-eternal_blades=[WIP] Eternal Blades
-drone_enemy=[WIP] Drone - Enemy
-drone_mine=[WIP] Drone - Mine
+eternal_blades=Eternal Blades
+drone_enemy=Drone - Enemy
+drone_mine=Drone - Mine
 
 
 

maps/mountain_fortress_v3/locomotive/spawn_locomotive.lua

@@ -258,6 +258,11 @@ function Public.locomotive_spawn(surface, position, reversed)
         end
     end
 
+    local all_the_fish = Public.get('all_the_fish')
+    if all_the_fish then
+        this.locomotive_cargo.get_inventory(defines.inventory.cargo_wagon).insert({name = 'raw-fish', count = 999999})
+    end
+
     Task.set_timeout_in_ticks(15, place_tiles_token, {surface = surface, position = position})
     Task.set_timeout_in_ticks(50, set_loco_cargo, data)
 

maps/mountain_fortress_v3/stateful/table.lua

@@ -6,15 +6,12 @@ local Task = require 'utils.task_token'
 local shuffle = table.shuffle_table
 local WD = require 'modules.wave_defense.table'
 local format_number = require 'util'.format_number
-local ICW = require 'maps.mountain_fortress_v3.icw.main'
 local ICWF = require 'maps.mountain_fortress_v3.icw.functions'
 local ICWT = require 'maps.mountain_fortress_v3.icw.table'
 local Core = require 'utils.core'
 local Public = require 'maps.mountain_fortress_v3.table'
 local Alert = require 'utils.alert'
-local IC = require 'maps.mountain_fortress_v3.ic.table'
 local RPG = require 'modules.rpg.table'
-local BiterHealthBooster = require 'modules.biter_health_booster_v2'
 local Beam = require 'modules.render_beam'
 local Discord = require 'utils.discord'
 local Difficulty = require 'modules.difficulty_vote_by_amount'
@@ -1180,15 +1177,6 @@ local function apply_buffs()
                             discord = buff.discord
                         }
                     end
-
-                    local locomotive_cargo = Public.get('locomotive_cargo')
-                    if not locomotive_cargo then
-                        break
-                    end
-                    if not locomotive_cargo.valid then
-                        break
-                    end
-                    locomotive_cargo.get_inventory(defines.inventory.cargo_wagon).insert({name = 'raw-fish', count = 999999})
                 end
                 if buff.modifier == 'tech' then
                     if not this.buffs_collected['techs'] then

maps/mountain_fortress_v3/terrain.lua

@@ -2702,17 +2702,17 @@ local zones = {
     zone_3 = {fn = zone_3, weight = 100, tags = {'zone_3'}},
     zone_4 = {fn = zone_4, weight = 100, tags = {'zone_4'}},
     zone_5 = {fn = zone_5, weight = 100, tags = {'zone_5'}},
-    zone_forest_1 = {fn = zone_forest_1, weight = 100, tags = {'forest'}},
-    zone_forest_2 = {fn = zone_forest_2, weight = 100, tags = {'forest'}},
-    zone_scrap_1 = {fn = zone_scrap_1, weight = 100, tags = {'scrap'}},
-    zone_scrap_2 = {fn = zone_scrap_2, weight = 100, tags = {'scrap'}},
+    zone_forest_1 = {fn = zone_forest_1, weight = 100, tags = {'forest_1'}},
+    zone_forest_2 = {fn = zone_forest_2, weight = 100, tags = {'forest_2'}},
+    zone_scrap_1 = {fn = zone_scrap_1, weight = 100, tags = {'scrap_1'}},
+    zone_scrap_2 = {fn = zone_scrap_2, weight = 100, tags = {'scrap_2'}},
     zone_7 = {fn = zone_7, weight = 100, tags = {'zone_7'}},
     zone_9 = {fn = zone_9, weight = 100, tags = {'zone_8'}},
-    zone_10 = {fn = zone_10, weight = 100, tags = {'forest'}},
+    zone_10 = {fn = zone_10, weight = 100, tags = {'forest_3'}},
     zone_11 = {fn = zone_11, weight = 100, tags = {'zone_11'}},
     zone_12 = {fn = zone_12, weight = 100, tags = {'zone_12'}},
     zone_13 = {fn = zone_13, weight = 100, tags = {'zone_13'}},
-    zone_14 = {fn = zone_14, weight = 100, tags = {'forest'}}
+    zone_14 = {fn = zone_14, weight = 100, tags = {'forest_4'}}
 }
 
 local function shuffle_terrains(adjusted_zones, new_zone)

modules/rpg/spells.lua

@@ -757,7 +757,8 @@ spells[#spells + 1] = {
     force = 'player',
     level = 50,
     type = 'item',
-    mana_cost = 250,
+    mana_cost = 150,
+    enforce_cooldown = true,
     cooldown = 200,
     enabled = true,
     log_spell = true,
@@ -777,7 +778,8 @@ spells[#spells + 1] = {
     level = 70,
     type = 'item',
     mana_cost = 400,
-    cooldown = 200,
+    enforce_cooldown = true,
+    cooldown = 150,
     enabled = true,
     log_spell = true,
     sprite = 'recipe/uranium-cannon-shell',
@@ -862,7 +864,7 @@ spells[#spells + 1] = {
     level = 45,
     type = 'special',
     mana_cost = 400,
-    cooldown = 2400,
+    cooldown = 500,
     enabled = true,
     enforce_cooldown = true,
     log_spell = true,
@@ -909,7 +911,7 @@ spells[#spells + 1] = {
     level = 50,
     type = 'special',
     mana_cost = 700,
-    cooldown = 2500,
+    cooldown = 500,
     enabled = true,
     enforce_cooldown = true,
     sprite = 'virtual-signal/signal-S',
@@ -987,7 +989,8 @@ spells[#spells + 1] = {
     level = 50,
     type = 'special',
     mana_cost = 140,
-    cooldown = 320,
+    enforce_cooldown = true,
+    cooldown = 150,
     enabled = true,
     sprite = 'item/raw-fish',
     special_sprite = 'item=raw-fish',
@@ -1009,7 +1012,8 @@ spells[#spells + 1] = {
     level = 25,
     type = 'special',
     mana_cost = 140,
-    cooldown = 320,
+    enforce_cooldown = true,
+    cooldown = 150,
     enabled = true,
     sprite = 'item/explosives',
     special_sprite = 'item=explosives',
@@ -1029,7 +1033,8 @@ spells[#spells + 1] = {
     level = 60,
     type = 'special',
     mana_cost = 150,
-    cooldown = 320,
+    enforce_cooldown = true,
+    cooldown = 150,
     enabled = true,
     log_spell = true,
     sprite = 'entity/compilatron',
@@ -1058,7 +1063,8 @@ spells[#spells + 1] = {
     level = 50,
     type = 'special',
     mana_cost = 220,
-    cooldown = 320,
+    enforce_cooldown = true,
+    cooldown = 150,
     enabled = true,
     sprite = 'recipe/distractor-capsule',
     special_sprite = 'recipe=distractor-capsule',
@@ -1078,8 +1084,9 @@ spells[#spells + 1] = {
     force = 'player',
     level = 55,
     type = 'special',
+    enforce_cooldown = true,
     mana_cost = 250,
-    cooldown = 320,
+    cooldown = 150,
     enabled = true,
     sprite = 'recipe/defender-capsule',
     special_sprite = 'recipe=defender-capsule',
@@ -1098,8 +1105,9 @@ spells[#spells + 1] = {
     force = 'player',
     level = 60,
     type = 'special',
+    enforce_cooldown = true,
     mana_cost = 300,
-    cooldown = 320,
+    cooldown = 150,
     enabled = true,
     sprite = 'recipe/destroyer-capsule',
     special_sprite = 'recipe=destroyer-capsule',
@@ -1115,6 +1123,7 @@ spells[#spells + 1] = {
     force = 'player',
     level = 60,
     type = 'special',
+    enforce_cooldown = true,
     mana_cost = 340,
     cooldown = 2000,
     enabled = true,
@@ -1173,7 +1182,7 @@ spells[#spells + 1] = {
         end
 
         Task.set_timeout_in_ticks(5, repeat_sound_token, {player_index = player.index})
-        Task.set_timeout_in_ticks(300, x_marks_the_spot_token, {player_index = player.index, old_position = old_position, old_surface_index = surface.index})
+        Task.set_timeout_in_ticks(600, x_marks_the_spot_token, {player_index = player.index, old_position = old_position, old_surface_index = surface.index})
         Public.remove_mana(player, 340)
         Public.cast_spell(player)
         return true
@@ -1188,7 +1197,7 @@ spells[#spells + 1] = {
     level = 100,
     type = 'special',
     mana_cost = 340,
-    cooldown = 1000,
+    cooldown = 100,
     enforce_cooldown = true,
     check_if_active = false,
     enabled = true,
@@ -1257,13 +1266,13 @@ spells[#spells + 1] = {
     level = 200,
     type = 'special',
     mana_cost = 350,
-    cooldown = 1000,
+    cooldown = 300,
     enabled = true,
     enforce_cooldown = true,
     log_spell = true,
     sprite = 'virtual-signal/signal-info',
     special_sprite = 'virtual-signal=signal-info',
-    tooltip = 'Damages enemies in radius when cast. This is a WIP spell that might get disabled.',
+    tooltip = 'Damages enemies in radius when cast. Scales with player level.',
     callback = function(data)
         local self = data.self
         local player = data.player
@@ -1329,7 +1338,7 @@ local drone_enemy = {
     log_spell = true,
     sprite = 'virtual-signal/signal-info',
     special_sprite = 'virtual-signal=signal-info',
-    tooltip = 'Creates a drone that searches for enemies and destroys them. This is a WIP spell that might get disabled.',
+    tooltip = 'Creates a drone that searches for enemies and destroys them.',
     callback = function(data)
         local self = data.self
         local player = data.player
@@ -1361,7 +1370,7 @@ local drone_mine = {
     log_spell = true,
     sprite = 'virtual-signal/signal-info',
     special_sprite = 'virtual-signal=signal-info',
-    tooltip = 'Creates a drone that mines entities around you. This is a WIP spell that might get disabled.',
+    tooltip = 'Creates a drone that mines entities around you.',
     callback = function(data)
         local self = data.self
         local player = data.player
@@ -1379,14 +1388,14 @@ local drone_mine = {
 
 spells[#spells + 1] = drone_mine
 
-if _DEBUG then
-    for i = 1, #spells do
-        local spell = spells[i]
-        spell.mana_cost = 1
-        spell.level = 1
-        spell.cooldown = 1
-    end
-end
+-- if _DEBUG then
+--     for i = 1, #spells do
+--         local spell = spells[i]
+--         spell.mana_cost = 1
+--         spell.level = 1
+--         spell.cooldown = 1
+--     end
+-- end
 
 Public.projectile_types = {
     ['explosives'] = {name = 'grenade', count = 0.5, max_range = 32, tick_speed = 1},