Index: ps/trunk/binaries/data/mods/public/maps/random/danubius.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/danubius.js
+++ ps/trunk/binaries/data/mods/public/maps/random/danubius.js
@@ -1,14 +1,14 @@
RMS.LoadLibrary("rmgen");
// Spawn ships away from the shoreline, but patrol close to the shoreline
-const triggerPointShipSpawn = "special/trigger_point_A";
-const triggerPointShipPatrol = "special/trigger_point_B";
-const triggerPointShipUnloadLeft = "special/trigger_point_C";
-const triggerPointShipUnloadRight = "special/trigger_point_D";
-const triggerPointLandPatrolLeft = "special/trigger_point_E";
-const triggerPointLandPatrolRight = "special/trigger_point_F";
-const triggerPointCCAttackerPatrolLeft = "special/trigger_point_G";
-const triggerPointCCAttackerPatrolRight = "special/trigger_point_H";
+const triggerPointShipSpawn = "trigger/trigger_point_A";
+const triggerPointShipPatrol = "trigger/trigger_point_B";
+const triggerPointShipUnloadLeft = "trigger/trigger_point_C";
+const triggerPointShipUnloadRight = "trigger/trigger_point_D";
+const triggerPointLandPatrolLeft = "trigger/trigger_point_E";
+const triggerPointLandPatrolRight = "trigger/trigger_point_F";
+const triggerPointCCAttackerPatrolLeft = "trigger/trigger_point_G";
+const triggerPointCCAttackerPatrolRight = "trigger/trigger_point_H";
// Terrain textures
const tRoad = "steppe_river_rocks";
Index: ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
+++ ps/trunk/binaries/data/mods/public/maps/random/polar_sea.js
@@ -296,7 +296,7 @@
// Create trigger points where wolves spawn
createObjectGroupsDeprecated(
- new SimpleGroup([new SimpleObject("special/trigger_point_A", 1, 1, 0, 0)], true, clWolf),
+ new SimpleGroup([new SimpleObject("trigger/trigger_point_A", 1, 1, 0, 0)], true, clWolf),
0,
avoidClasses(clWater, 2, clMetal, 4, clRock, 4, clPlayer, 15, clHill, 2, clWolf, 20),
1000,
Index: ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest.js
+++ ps/trunk/binaries/data/mods/public/maps/random/survivalofthefittest.js
@@ -34,11 +34,11 @@
const oCivicCenter = "skirmish/structures/default_civil_centre";
const oCitizenInfantry = "skirmish/units/default_infantry_melee_b";
-const triggerPointAttacker = "special/trigger_point_A";
+const triggerPointAttacker = "trigger/trigger_point_A";
const triggerPointTreasures = [
- "special/trigger_point_B",
- "special/trigger_point_C",
- "special/trigger_point_D"
+ "trigger/trigger_point_B",
+ "trigger/trigger_point_C",
+ "trigger/trigger_point_D"
];
InitMap();
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Campaign Test Map.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Campaign Test Map.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Campaign Test Map.xml
@@ -2032,61 +2032,61 @@
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
- special/territory_pull
+ other/territory_pull
0
@@ -4938,37 +4938,37 @@
- special/territory_pull
+ other/territory_pull
4
- special/territory_pull
+ other/territory_pull
4
- special/territory_pull
+ other/territory_pull
4
- special/territory_pull
+ other/territory_pull
4
- special/territory_pull
+ other/territory_pull
4
- special/territory_pull
+ other/territory_pull
4
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Triggers_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Triggers_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Triggers_demo.xml
@@ -14996,21 +14996,21 @@
- special/trigger_point_A
+ trigger/trigger_point_A
1
- special/trigger_point_A
+ trigger/trigger_point_A
1
- special/trigger_point_A
+ trigger/trigger_point_A
1
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Gallic Fields (3).xml
@@ -21674,63 +21674,63 @@
- special/trigger_point_A
+ trigger/trigger_point_A
1
- special/trigger_point_A
+ trigger/trigger_point_A
3
- special/trigger_point_A
+ trigger/trigger_point_A
2
- special/trigger_point_B
+ trigger/trigger_point_B
2
- special/trigger_point_C
+ trigger/trigger_point_C
2
- special/trigger_point_B
+ trigger/trigger_point_B
1
- special/trigger_point_C
+ trigger/trigger_point_C
1
- special/trigger_point_C
+ trigger/trigger_point_C
3
- special/trigger_point_B
+ trigger/trigger_point_B
3
Index: ps/trunk/binaries/data/mods/public/simulation/templates/other/territory_pull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/other/territory_pull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/other/territory_pull.xml
@@ -0,0 +1,38 @@
+
+
+
+ 5
+ 0
+ 0
+
+
+
+ 0
+ upright
+ false
+ 6.0
+
+
+
+
+
+ circle/128x128.png
+ circle/128x128_mask.png
+
+
+
+
+ 5
+
+
+ false
+ 32
+ 30000
+
+
+ false
+ true
+ props/special/common/waypoint_flag.xml
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/territory_pull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/territory_pull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/territory_pull.xml
@@ -1,38 +0,0 @@
-
-
-
- 5
- 0
- 0
-
-
-
- 0
- upright
- false
- 6.0
-
-
-
-
-
- circle/128x128.png
- circle/128x128_mask.png
-
-
-
-
- 5
-
-
- false
- 32
- 30000
-
-
- false
- true
- props/special/common/waypoint_flag.xml
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_A.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_A.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_A.xml
@@ -1,9 +0,0 @@
-
-
-
- A
-
-
- props/special/common/marker_object_char_a.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_B.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_B.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_B.xml
@@ -1,9 +0,0 @@
-
-
-
- B
-
-
- props/special/common/marker_object_char_b.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_C.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_C.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_C.xml
@@ -1,9 +0,0 @@
-
-
-
- C
-
-
- props/special/common/marker_object_char_c.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_D.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_D.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_D.xml
@@ -1,9 +0,0 @@
-
-
-
- D
-
-
- props/special/common/marker_object_char_d.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_E.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_E.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_E.xml
@@ -1,9 +0,0 @@
-
-
-
- E
-
-
- props/special/common/marker_object_char_e.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_F.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_F.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_F.xml
@@ -1,9 +0,0 @@
-
-
-
- F
-
-
- props/special/common/marker_object_char_f.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_G.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_G.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_G.xml
@@ -1,9 +0,0 @@
-
-
-
- G
-
-
- props/special/common/marker_object_char_g.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_H.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_H.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_H.xml
@@ -1,9 +0,0 @@
-
-
-
- H
-
-
- props/special/common/marker_object_char_h.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_I.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_I.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_I.xml
@@ -1,9 +0,0 @@
-
-
-
- I
-
-
- props/special/common/marker_object_char_i.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_J.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_J.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_J.xml
@@ -1,9 +0,0 @@
-
-
-
- J
-
-
- props/special/common/marker_object_char_j.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_K.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_K.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/trigger_point_K.xml
@@ -1,9 +0,0 @@
-
-
-
- K
-
-
- props/special/common/marker_object_char_k.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_A.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_A.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_A.xml
@@ -0,0 +1,9 @@
+
+
+
+ A
+
+
+ props/special/common/marker_object_char_a.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_B.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_B.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_B.xml
@@ -0,0 +1,9 @@
+
+
+
+ B
+
+
+ props/special/common/marker_object_char_b.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_C.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_C.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_C.xml
@@ -0,0 +1,9 @@
+
+
+
+ C
+
+
+ props/special/common/marker_object_char_c.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_D.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_D.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_D.xml
@@ -0,0 +1,9 @@
+
+
+
+ D
+
+
+ props/special/common/marker_object_char_d.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_E.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_E.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_E.xml
@@ -0,0 +1,9 @@
+
+
+
+ E
+
+
+ props/special/common/marker_object_char_e.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_F.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_F.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_F.xml
@@ -0,0 +1,9 @@
+
+
+
+ F
+
+
+ props/special/common/marker_object_char_f.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_G.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_G.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_G.xml
@@ -0,0 +1,9 @@
+
+
+
+ G
+
+
+ props/special/common/marker_object_char_g.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_H.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_H.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_H.xml
@@ -0,0 +1,9 @@
+
+
+
+ H
+
+
+ props/special/common/marker_object_char_h.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_I.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_I.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_I.xml
@@ -0,0 +1,9 @@
+
+
+
+ I
+
+
+ props/special/common/marker_object_char_i.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_J.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_J.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_J.xml
@@ -0,0 +1,9 @@
+
+
+
+ J
+
+
+ props/special/common/marker_object_char_j.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_K.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_K.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/trigger/trigger_point_K.xml
@@ -0,0 +1,9 @@
+
+
+
+ K
+
+
+ props/special/common/marker_object_char_k.xml
+
+