Merge pull request #78649 from RenechCDDA/kill_test_error_2

Don't assign missions during testing, for real this time
CleverRaven · Dec 19, 2024 · 53fb1e9 · 53fb1e9
2 parents eed3ee5 + 7e7f469
commit 53fb1e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json
@@ -982,19 +982,6 @@
     "effect": [ { "remove_active_mission": "MISSION_CAMP_LEADERSHIP_CHANGE" }, { "u_lose_var": "time_of_last_succession" } ],
     "deactivate_condition": { "not": { "compare_string": [ "yes", { "u_val": "time_of_last_succession" } ] } }
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_FACTION_SUCCESSION_CHANGE_INIT",
-    "eoc_type": "EVENT",
-    "required_event": "game_start",
-    "effect": [
-      { "remove_active_mission": "MISSION_CAMP_LEADERSHIP_CHANGE" },
-      {
-        "assign_mission": "MISSION_CAMP_LEADERSHIP_CHANGE",
-        "deadline": { "math": [ "time('now') + time_between_succession" ] }
-      }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_FACTION_SUCCESSION_CHANGE_REINIT",
@@ -1016,13 +1003,6 @@
     "required_event": "game_begin",
     "effect": [ { "run_eocs": "EOC_FACTION_SUCCESSION_COOLDOWN" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_FACTION_SUCCESSION_COOLDOWN_GAMESTART_CHECK",
-    "eoc_type": "EVENT",
-    "required_event": "game_start",
-    "effect": [ { "run_eocs": "EOC_FACTION_SUCCESSION_COOLDOWN" } ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_FACTION_SUCCESSION_COOLDOWN",

diff --git a/data/mods/TEST_DATA/missions.json b/data/mods/TEST_DATA/missions.json
@@ -31,17 +31,9 @@
   {
     "//COMMENT": "Dummy EOCs to prevent the startup chain from triggering missions in the test environment.",
     "type": "effect_on_condition",
-    "id": "EOC_FACTION_SUCCESSION_COOLDOWN_GAMEBEGIN_CHECK",
+    "id": "EOC_FACTION_SUCCESSION_CHANGE_REINIT",
     "eoc_type": "EVENT",
-    "required_event": "game_begin",
-    "effect": [  ]
-  },
-  {
-    "//COMMENT": "Dummy EOCs to prevent the startup chain from triggering missions in the test environment.",
-    "type": "effect_on_condition",
-    "id": "EOC_FACTION_SUCCESSION_COOLDOWN_GAMESTART_CHECK",
-    "eoc_type": "EVENT",
-    "required_event": "game_start",
+    "required_event": "game_avatar_new",
     "effect": [  ]
   }
 ]