Merge branch 'master' into 'master'

Mos Eisley Cantina Pilot Trainers and City Registrations Tatooine



See merge request !20
This commit is contained in:
swgnoobs
2015-11-12 17:44:00 -05:00
7 changed files with 8 additions and 0 deletions
@@ -195,3 +195,4 @@ i i h i f f f f f f f s p
-488894869 0 object/tangible/spawning/city_sign_spawner.iff 0 836.314 75 1679.08 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s01.iff|$|
-1572050364 0 object/tangible/spawning/city_sign_spawner.iff 0 922.333 75 1736.76 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s01.iff|$|
-572442897 0 object/tangible/spawning/city_sign_spawner.iff 0 1110.59 75 1573.73 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s01.iff|$|
-19844661 0 object/tangible/planet_map_location/city.iff 0 1054.89 74.983 1598.26 0.938444 0 0.345432 0 $|
@@ -161,3 +161,4 @@ i i h i f f f f f f f s p
-1700441728 1255997 object/tangible/ground_spawning/area_spawner.iff 2 4.49039 -0.478888 1.85887 -0.660527 0 0.750802 0 systems.spawning.spawner_area fltMaxSpawnTime|2|3.000000|fltMinSpawnTime|2|2.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|Watto|strSpawnerType|4|area|strSpawns|4|tatooine/watto|$|
-722415110 1255997 object/tangible/collection/flower_10.iff 2 5.11234 -0.314693 5.35275 0.708712 -0.297259 -0.417895 0.484488 systems.collections.consume_click collection.slotName|4|col_flower_01:flower_10|$|
1255998 1255995 object/cell/cell.iff 3 0 0 0 1 0 0 0 $|
-19844660 0 object/tangible/planet_map_location/city.iff 0 1267.22 5 31.6096 0.938444 0 0.345432 0 $|
@@ -561,3 +561,4 @@ i i h i f f f f f f f s p
-1 0 object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff 0 0 195 0 1 0 0 0 $|
-734008155 0 object/tangible/ground_spawning/area_spawner.iff 0 898.604 98 192.217 -0.550922 0 0.834557 0 systems.spawning.spawner_area fltMaxSpawnTime|2|3.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|imp_title_grant|strSpawnerType|4|area|strSpawns|4|imp_title_grant|$|
-1222028289 0 object/tangible/space/content_infrastructure/generic_egg_small.iff 0 831.041 12 469.54 1 0 0 0 systems.dungeon_sequencer.sequence_controller:systems.gcw.gcw_city worldLoc|0|1|instance.data_table|4|datatables/gcw/gcw_city_bestine.iff|$|
-19844659 0 object/tangible/planet_map_location/city.iff 0 671.846 12 519.774 0.938444 0 0.345432 0 $|
@@ -97,3 +97,4 @@ i i h i f f f f f f f s p
-2 0 object/tangible/ground_spawning/area_spawner.iff 0 110.167 52 712.896 0.999103 0 0.0423359 0 systems.spawning.spawner_area fltMaxSpawnTime|2|5.000000|fltMinSpawnTime|2|4.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|anchorjobs_ordo|strSpawnerType|4|area|strSpawns|4|tatooine/anchorjobs_ordo|$|
-1 0 object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff 0 0 195 0 1 0 0 0 $|
-2011490768 0 object/tangible/ground_spawning/area_spawner.iff 0 122.516 52 774.644 -0.404974 0 0.914328 0 systems.spawning.spawner_area fltMaxSpawnTime|2|3.000000|fltMinSpawnTime|2|1.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|reb_title_grant|strSpawnerType|4|area|strSpawns|4|reb_title_grant|$|
-19844658 0 object/tangible/planet_map_location/city.iff 0 47.5333 52 825.093 0.938444 0 0.345432 0 $|
@@ -156,3 +156,4 @@ i i h i f f f f f f f s p
-111343362 0 object/tangible/spawning/city_sign_spawner.iff 0 1425.44 7 1477.56 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s03.iff|$|
-1622709074 0 object/tangible/spawning/city_sign_spawner.iff 0 1635.9 6.83316 1436.43 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s03.iff|$|
-1599410942 0 object/tangible/spawning/city_sign_spawner.iff 0 1821.33 7 1137.18 1 0 0 0 systems.spawning.spawn_tangible spawn.object|4|object/tangible/sign/all_sign_city_s03.iff|$|
-19844657 0 object/tangible/planet_map_location/city.iff 0 1238.18 7 1013.85 0.938444 0 0.345432 0 $|
@@ -1326,3 +1326,4 @@ i i h i f f f f f f f s p
1187927 1187917 object/cell/cell.iff 10 0 0 0 1 0 0 0 $|
1187928 1187917 object/cell/cell.iff 11 0 0 0 1 0 0 0 $|
1187929 1187917 object/cell/cell.iff 12 0 0 0 1 0 0 0 $|
-19844656 0 object/tangible/planet_map_location/city.iff 0 1570.98 5 1342.91 0.938444 0 0.345432 0 $|
@@ -53,7 +53,9 @@ i i h i f f f f f f f s p
1082884 1082874 object/cell/cell.iff 10 0 0 0 1 0 0 0 $|
1082885 1082874 object/cell/cell.iff 11 0 0 0 1 0 0 0 $|
1082886 1082874 object/cell/cell.iff 12 0 0 0 1 0 0 0 $|
5566049 1082886 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 12 -40.7 -0.9 30.5 0.11057 0 0.993868 0 space.content_tools.npc_spawner $|
1082887 1082874 object/cell/cell.iff 13 0 0 0 1 0 0 0 $|
8245397 1082887 object/tangible/space/content_infrastructure/ground_npc_spawner.iff 13 -45.7 -0.5 17.8 0.11057 0 0.993868 0 space.content_tools.npc_spawner $|
1082888 1082874 object/cell/cell.iff 14 0 0 0 1 0 0 0 $|
1082889 1082874 object/cell/cell.iff 15 0 0 0 1 0 0 0 $|
1095499 0 object/building/military/military_outpost_guard_house_imperial.iff 0 1852.24 180 1611.52 0.637152 0 0.770739 0 $|