1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-11-25 22:32:18 +02:00

RPG - fix dupe of levels

This commit is contained in:
Gerkiz
2023-11-05 21:12:38 +01:00
parent 89fa093c9e
commit 6cb966c879
2 changed files with 23 additions and 23 deletions

View File

@@ -142,26 +142,6 @@ function Public.reset_map()
OfflinePlayers.set_enabled(true) OfflinePlayers.set_enabled(true)
-- OfflinePlayers.set_offline_players_surface_removal(true) -- OfflinePlayers.set_offline_players_surface_removal(true)
RPG.rpg_reset_all_players()
RPG.set_surface_name({game.surfaces[this.active_surface_index].name, 'boss_room'})
RPG.enable_health_and_mana_bars(true)
RPG.enable_wave_defense(true)
RPG.enable_mana(true)
RPG.personal_tax_rate(0.4)
RPG.enable_stone_path(true)
RPG.enable_aoe_punch(true)
RPG.enable_aoe_punch_globally(false)
RPG.enable_range_buffs(true)
RPG.enable_auto_allocate(true)
RPG.enable_explosive_bullets_globally(true)
RPG.enable_explosive_bullets(false)
RPG_Progression.toggle_module(false)
RPG_Progression.set_dataset('mtn_v3_rpg_prestige')
if Public.get('prestige_system_enabled') then
RPG_Progression.restore_xp_on_reset()
end
Group.reset_groups() Group.reset_groups()
Group.alphanumeric_only(false) Group.alphanumeric_only(false)
@@ -288,12 +268,33 @@ function Public.reset_map()
this.market_announce = game.tick + 1200 this.market_announce = game.tick + 1200
this.game_lost = false this.game_lost = false
RPG.reset_table()
Public.stateful.enable(true) Public.stateful.enable(true)
Public.stateful.create() Public.stateful.create()
Public.stateful.reset_stateful(true, true) Public.stateful.reset_stateful(true, true)
Public.stateful.increase_enemy_damage_and_health() Public.stateful.increase_enemy_damage_and_health()
Public.stateful.apply_startup_settings() Public.stateful.apply_startup_settings()
RPG.rpg_reset_all_players()
RPG.set_surface_name({game.surfaces[this.active_surface_index].name, 'boss_room'})
RPG.enable_health_and_mana_bars(true)
RPG.enable_wave_defense(true)
RPG.enable_mana(true)
RPG.personal_tax_rate(0.4)
RPG.enable_stone_path(true)
RPG.enable_aoe_punch(true)
RPG.enable_aoe_punch_globally(false)
RPG.enable_range_buffs(true)
RPG.enable_auto_allocate(true)
RPG.enable_explosive_bullets_globally(true)
RPG.enable_explosive_bullets(false)
RPG_Progression.toggle_module(false)
RPG_Progression.set_dataset('mtn_v3_rpg_prestige')
if Public.get('prestige_system_enabled') then
RPG_Progression.restore_xp_on_reset()
end
if _DEV_MODE then if _DEV_MODE then
Collapse.disable_collapse(true) Collapse.disable_collapse(true)
WD.disable_spawning_biters(true) WD.disable_spawning_biters(true)

View File

@@ -1232,6 +1232,7 @@ function Public.rpg_reset_player(player, one_time_reset)
rpg_t.xp = round(old_xp) rpg_t.xp = round(old_xp)
rpg_t.level = old_level rpg_t.level = old_level
else else
rpg_t =
Public.set_new_player_tbl( Public.set_new_player_tbl(
player.index, player.index,
{ {
@@ -1275,8 +1276,6 @@ function Public.rpg_reset_player(player, one_time_reset)
} }
) )
rpg_t = Public.get_value_from_player(player.index)
if rpg_t and rpg_extra.grant_xp_level and not rpg_t.granted_xp_level then if rpg_t and rpg_extra.grant_xp_level and not rpg_t.granted_xp_level then
rpg_t.granted_xp_level = true rpg_t.granted_xp_level = true
local to_grant = Public.experience_levels[rpg_t.level + rpg_extra.grant_xp_level] local to_grant = Public.experience_levels[rpg_t.level + rpg_extra.grant_xp_level]