4.12.4 with menu to delay waves

Author: ProditorMagnus

Ravana_changelog.txt

@@ -387,6 +387,10 @@ Replace khalifate with dunefolk
 4.12.3
 Update for ageless 4.25
 
+4.12.4
+Update for ageless 4.27
+Experimental menu item in top left corner to delay all waves 1 turn
+
 4.x todo
 dependencies=Ageless_Era,XP_Modification,Plan_Your_Advancements_Mod,Switch_Leader,Color_Modification,Ally_Village_Modification
 

lua/_init.lua

@@ -13,8 +13,6 @@ ORM.debug = {}
 ORM.event = {}
 ORM.event.once = {}
 
-ORM.win_turn = 46
-
 function Ravana()
 	return wesnoth.have_file("~add-ons/DBG_Modification/_main.cfg")
 	-- return type(rawget(_G,"AE_condition_use_beta_features")) == "function" and AE_condition_use_beta_features()

lua/events.lua

@@ -19,19 +19,22 @@ function ORM.event.new_turn()
 	if V.ORM_difficulty_mode == "ultrahardcore" then
 		ORM.fun.increment_hpmultiplier()
 	end
-	if wesnoth.current.turn == 30 and V.ORM_difficulty_mode == "normal" then
+	if ORM.fun.get_effective_turn_number() == 30 and V.ORM_difficulty_mode == "normal" then
 		-- So that charge, magical and backstab wont be too low
 		V.ORM_difficulty_setting = V.ORM_difficulty_setting + 0.4
 	end
 	if V.ORM_map_setting == "swamp" then
-		wesnoth.game_config.poison_amount = 10 + wesnoth.current.turn / 4
+		wesnoth.game_config.poison_amount = 10 + ORM.fun.get_effective_turn_number() / 4
 	end
 	ORM.fun.spawn_wave() -- calls unit spawning, label creation, turn bonus
 	ORM.fun.show_setting_labels() -- remakes labels against bonusspam
 end
 
 function ORM.event.start()
 	V.Rav_DBG_1 = true -- AI side, so able to undroid it and use commands
+	V.ORM_turn_offset = 0
+	ORM.win_turn = 46
+	ORM.turns_to_win_from_last_wave = 6
 
 	if V.ORM_hpmultiplier_setting == nil then V.ORM_hpmultiplier_setting = 0 end
 	V.ORM_hpmultiplier_setting = V.ORM_hpmultiplier_setting * 0.01
@@ -42,10 +45,36 @@ function ORM.event.start()
 
 	ORM.fun.remove_turn_limit()
 	ORM.fun.initialise_difficulty_modes()
+
+	wesnoth.wml_actions.set_menu_item{
+		id='ORM_delay_waves',
+		description='Make all future waves come 1 turn later',
+		T.filter_location{
+			x=1,
+			y=1
+		},
+		T.command{
+			T.lua{
+				code='V.ORM_turn_offset = V.ORM_turn_offset + 1'
+			},
+			T.lua{
+				code='wesnoth.message("Use wave delaying at your own risk, and note that if you delay enough times (such as right after wave spawned), you can have previously spawned wave spawn again - effectively endless game mode. Current delay: "..V.ORM_turn_offset.." turn(s)")'
+			}
+		}
+	}
 end
 
 function ORM.event.side_1_turn_refresh()
 	ORM.fun.apply_hpmultiplier()
 	-- ORM.fun.apply_rush_mod() -- !!!! OOS, so moved to WML
 end
+
+function ORM.event.side_turn()
+	if ORM.fun.get_effective_turn_number() == ORM.win_turn and V.side_number ~= 1 then
+		wesnoth.wml_actions.endlevel{result="victory"}
+	end
+	if ORM.fun.get_effective_turn_number() > ORM.win_turn - ORM.turns_to_win_from_last_wave and #wesnoth.get_units{side=1} < 2 then
+		wesnoth.wml_actions.end_turn{}
+	end
+end
 -->>

lua/helper_functions.lua

@@ -302,4 +302,8 @@ function ORM.fun.show_setting_labels()
 	})
 end
 
+function ORM.fun.get_effective_turn_number()
+	return wesnoth.current.turn - V.ORM_turn_offset
+end
+
 -->>

lua/spawn_functions.lua

@@ -63,8 +63,8 @@ function ORM.fun.spawn_unit_set(level, location, original_type)
 end
 
 function ORM.fun.spawn_wave()
-	if ORM.waves["t"..wesnoth.current.turn] ~= nil then
-		for _,v in ipairs(ORM.waves["t"..wesnoth.current.turn]) do
+	if ORM.waves["t"..ORM.fun.get_effective_turn_number()] ~= nil then
+		for _,v in ipairs(ORM.waves["t"..ORM.fun.get_effective_turn_number()]) do
 			ORM.fun.spawn_unit_set(v.random_level, v.location, v.original_type)
 		end
 		ORM.fun.update_spawn_labels()
@@ -73,12 +73,12 @@ function ORM.fun.spawn_wave()
 end
 
 function ORM.fun.apply_wave_modifications()
-	if ORM.unit_bonuses["t"..wesnoth.current.turn] == nil then return end
+	if ORM.unit_bonuses["t"..ORM.fun.get_effective_turn_number()] == nil then return end
 
 	local difficulty = V.ORM_difficulty_mode
 
-	if V.ORM_wave_choice_setting == "core_predefined" and (difficulty == "normal" or difficulty=="hardcore") and ORM.unit_bonuses["t"..wesnoth.current.turn]["predefined"] ~= nil then difficulty = "predefined" end
-	local bonus = ORM.unit_bonuses["t"..wesnoth.current.turn][difficulty]
+	if V.ORM_wave_choice_setting == "core_predefined" and (difficulty == "normal" or difficulty=="hardcore") and ORM.unit_bonuses["t"..ORM.fun.get_effective_turn_number()]["predefined"] ~= nil then difficulty = "predefined" end
+	local bonus = ORM.unit_bonuses["t"..ORM.fun.get_effective_turn_number()][difficulty]
 	local units = wesnoth.get_units { side = 1 }
 	if bonus == nil then return	end
 	for _,u in ipairs(units) do
@@ -106,8 +106,8 @@ function ORM.fun.update_spawn_labels()
 	local waveSetting = V.ORM_wave_choice_setting
 
 	-- remove labels after spawning
-	if ORM.waves["t"..wesnoth.current.turn] ~= nil then
-		for _,v in ipairs(ORM.waves["t"..wesnoth.current.turn]) do
+	if ORM.waves["t"..ORM.fun.get_effective_turn_number()] ~= nil then
+		for _,v in ipairs(ORM.waves["t"..ORM.fun.get_effective_turn_number()]) do
 			for _,loc in ipairs(v.location) do
 				if wesnoth.sides[loc.for_side].controller ~= "null" or V.ORM_spawn_for_empty then
 					ORM.fun.backport_label({
@@ -123,12 +123,12 @@ function ORM.fun.update_spawn_labels()
 		end
 	end
 
-	local next_wave = wesnoth.current.turn+1
+	local next_wave = ORM.fun.get_effective_turn_number()+1
 	local wave_trial_limit = next_wave + 10
 	while ORM.waves["t"..next_wave] == nil do
 		next_wave = next_wave+1
 		if next_wave > wave_trial_limit then
-			if wesnoth.current.turn ~= ORM.win_turn then
+			if ORM.fun.get_effective_turn_number() ~= ORM.win_turn then
 				helper.wml_error("ORM.fun.update_spawn_labels() finding next wave failed")
 			end
 			return
@@ -159,13 +159,13 @@ function ORM.fun.update_spawn_labels()
 			x=14,
 			y=2,
 			color="255,127,0",
-			text="Turn "..next_wave..": " .. spawn_label_text
+			text="Turn "..next_wave+V.ORM_turn_offset..": " .. spawn_label_text
 		})
 		ORM.fun.backport_label({
 			x=14,
 			y=21,
 			color="255,127,0",
-			text="Turn "..next_wave..": " .. spawn_label_text
+			text="Turn "..next_wave+V.ORM_turn_offset..": " .. spawn_label_text
 		})
 	end
 

scenarios/OrociaRandomMod.cfg

@@ -17,7 +17,7 @@ Ultra hardcore is designed to be ultra, balance has not been tested, noone is kn
     {DEFAULT_MUSIC_PLAYLIST}
     {ORM_SHRINE_UPGRADE}
     [options]
-        [combo]
+        [choice]
             id=ORM_difficulty_mode
             default=normal
             name=_"Difficulty mode"
@@ -38,8 +38,8 @@ Ultra hardcore is designed to be ultra, balance has not been tested, noone is kn
                 name="Easy"
                 value=easy
             [/item]
-        [/combo]
-        [combo]
+        [/choice]
+        [choice]
             id=ORM_upgrade_setting
             default=2
             name=_"Upgrade type"
@@ -67,8 +67,8 @@ Ultra hardcore is designed to be ultra, balance has not been tested, noone is kn
                 name=_"Mega Chaos (Zonk/res/hp/dmg/mv/str/def)"
                 value=4
             [/item]
-        [/combo]
-        [combo]
+        [/choice]
+        [choice]
             id=ORM_map_setting
             default=default
             name=_"Map type"
@@ -93,8 +93,8 @@ Ultra hardcore is designed to be ultra, balance has not been tested, noone is kn
                 name="Frozen"
                 value=frozen
             [/item]
-        [/combo]
-        [combo]
+        [/choice]
+        [choice]
             id=ORM_wave_choice_setting
             default=ageless_random_full
             name=_"Wavetype"
@@ -124,7 +124,7 @@ Ultra hardcore is designed to be ultra, balance has not been tested, noone is kn
                 value=debug
             [/item]
 #endif
-        [/combo]
+        [/choice]
         [checkbox]
             id=ORM_individualupgrade_setting
             default=yes
@@ -378,7 +378,5 @@ A unit at the shrine could receive an empowerment.
         {OROCIARM_WEAPON_ARSENAL 25 9}
     [/event]
 
-    {OROCIARM_TURN46}
-
     {OROCIARM_HERO_DIES}
 [/multiplayer]

utils/lua_init.cfg

@@ -68,6 +68,16 @@ ORM.event.once.new_turn()
         [lua]
             code=<<
 ORM.event.start()
+>>
+        [/lua]
+    [/event]
+
+    [event]
+        name=side turn
+        first_time_only=no
+        [lua]
+            code=<<
+ORM.event.side_turn()
 >>
         [/lua]
     [/event]

utils/start_end_s.cfg

@@ -1,32 +1,5 @@
 #textdomain wesnoth-OrociaRandomMod
 
-#define OROCIARM_TURN46
-    [event]
-        name=side 2 turn 46
-        [endlevel]
-            result=victory
-        [/endlevel]
-    [/event]
-    [event]
-        name=side turn
-        first_time_only=no
-        [filter_condition]
-            [variable]
-                name=turn_number
-                greater_than=40
-            [/variable]
-            [not]
-                [have_unit]
-                    count=2-99999
-                    side=1
-                [/have_unit]
-            [/not]
-        [/filter_condition]
-        [end_turn]
-        [/end_turn]
-    [/event]
-#enddef
-
 #define OROCIARM_HERO_DIES
     [event]
         name=last breath
@@ -38,7 +11,6 @@
         [message]
             speaker=unit
             message= _ "It was not meant to be..."
-            duration=5
         [/message]
     [/event]
 #enddef

utils/version.cfg

@@ -1,6 +1,6 @@
 #wmlindent: start ignoring
 #define OROCIARM_VERSION
-4.12.3 by Ravana
+4.12.4 by Ravana
 Leave feedback in is.gd/laelamp
 #enddef
 #wmlindent: stop ignoring