Skip to content

Commit c4ac308

Browse files
4.13.0 initial changes for 1.16
1 parent 9ae3042 commit c4ac308

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ Icon
3838
.Spotlight-V100
3939
.Trashes
4040

41-
*.pbl
41+
*.pbl
42+
*.iml

Ravana_changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,10 @@ Experimental menu item in top left corner to delay all waves 1 turn
394394
4.12.4a
395395
Fix error message after reloading
396396

397+
4.13.0
398+
Update for 1.16
399+
400+
397401
4.x todo
398402
consider hp multiplier and delayed waves
399403
dependencies=Ageless_Era,XP_Modification,Plan_Your_Advancements_Mod,Switch_Leader,Color_Modification,Ally_Village_Modification

lua/adaptive_difficulty.lua

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
function ORM.fun.init_adaptive_difficulty()
44
local result = 0
5-
if wesnoth.game_config.mp_settings.active_mods:find("StealingWeaponsMode") then
5+
-- another way - f=wesnoth.require "functional", f.find(wesnoth.scenario.modifications, function (e) return e.id=="plan_unit_advance" end)
6+
local modifications = ORM.fun.map(function(mod) return mod.id end, wesnoth.scenario.modifications)
7+
if ORM.fun.table_contains(modifications, "StealingWeaponsMode") then
68
result = result + 0.2
79
end
8-
if wesnoth.game_config.mp_settings.active_mods:find("BonusSpam") then
10+
if ORM.fun.table_contains(modifications, "BonusSpam") then
911
result = result + 0.5
1012
end
11-
if wesnoth.game_config.mp_settings.active_mods:find("CanBeOnlyOne") then
13+
if ORM.fun.table_contains(modifications, "CanBeOnlyOne") then
1214
result = result + 6.66
1315
end
14-
if wesnoth.game_config.mp_settings.active_mods:find("EXI_Heroic_Mod") then
16+
if ORM.fun.table_contains(modifications, "EXI_Heroic_Mod") then
1517
result = result + 0.1
1618
end
17-
if wesnoth.game_config.mp_settings.active_mods:find("EXI_Rush_Mod") then
19+
if ORM.fun.table_contains(modifications, "EXI_Rush_Mod") then
1820
result = result + 0.1 -- maybe for the future find other solutions like better movecosts
1921
end
20-
if wesnoth.game_config.mp_settings.active_mods:find("Xara_Magic_Mod") then
22+
if ORM.fun.table_contains(modifications, "Xara_Magic_Mod") then
2123
result = result + 0.3
2224
end
2325

@@ -59,8 +61,8 @@ function ORM.fun.init_adaptive_difficulty()
5961
result = result - 0.4
6062
end
6163

62-
if (wesnoth.game_config.mp_settings.mp_era == "era_default" or wesnoth.game_config.mp_settings.mp_era == "era_heroes" or
63-
wesnoth.game_config.mp_settings.mp_era == "era_dunefolk" or wesnoth.game_config.mp_settings.mp_era == "era_dunefolk_heroes") then
64+
if (wesnoth.scenario.era.id == "era_default" or wesnoth.scenario.era.id == "era_heroes" or
65+
wesnoth.scenario.era.id == "era_dunefolk" or wesnoth.scenario.era.id == "era_dunefolk_heroes") then
6466
result = result - 0.4
6567
if (V.ORM_random_ageless_waves) then
6668
result = result - 0.2

lua/events.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function ORM.event.start()
4141

4242
V.ORM_random_ageless_waves = ORM.fun.table_contains({"ageless_random_full", "ageless_random_mirrored"}, V.ORM_wave_choice_setting)
4343

44-
V.ORM_agelessunits_available = wesnoth.game_config.mp_settings.mp_era:find("Ageless") or V.ORM_wave_choice_setting:find("ageless") or false
44+
V.ORM_agelessunits_available = wesnoth.scenario.era.id:find("Ageless") or V.ORM_wave_choice_setting:find("ageless") or false
4545

4646
ORM.fun.remove_turn_limit()
4747
ORM.fun.initialise_difficulty_modes()

utils/version.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#wmlindent: start ignoring
22
#define OROCIARM_VERSION
3-
4.12.4a by Ravana
3+
4.13.0 by Ravana
44
Leave feedback in is.gd/laelamp
55
#enddef
66
#wmlindent: stop ignoring

0 commit comments

Comments
 (0)