seefoe/dsrc
1
0
Fork 0
mirror of https://bitbucket.org/seefoe/dsrc.git synced 2026-09-11 21:45:23 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15 in SWGNXT/dsrc from miscFixes to nge-content

Browse Source 
* commit 'edcacc5d86e7697a32f13aee0ad3e32873f819f1':
  Added OnAttach trigger in order to allow for script to function in other spawning methods.
  Added OnAttach trigger in order to allow for script to function in other spawning methods.
  Added OnAttach trigger in order to allow for script to function in other spawning methods.
  Added OnAttach trigger in order to allow for script to function in other spawning methods.
  Added missing NPCs to cantina spawner table.  All NPCs that spawned originally in the cantina should now be there.
  Fixed issue with shuttleport not working. Attached necessary cantina scripts and vard to cantina building. Added cantina spawner table for Life Day and normal NPCs.
  Fixed issue with shuttleport not working
This commit is contained in:
prisoncamp
2014-12-19 02:48:04 -05:00
parent f3d3c117a2 9abbd26dbd
commit 2332ebd02c
7 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_3_5_ws.tab
+1 -1
View File
@@ -60,7 +60,7 @@ i i h i f f f f f f f s p
1263618 0 object/building/tatooine/filler_building_block_64x32_style_01.iff 0 1216.99 5.03478 1868.07 0.0741333 0 0.997248 0 $|
1263634 0 object/static/structure/tatooine/wall_archway_tatooine_wide_style_01.iff 0 1358.39 5 1988.19 0.940945 0 0.33856 0 $|
1263643 0 object/static/structure/tatooine/wall_archway_tatooine_wide_style_01.iff 0 1379.94 5 2021.14 0.973578 0 0.228353 0 $|
1263648 0 object/building/tatooine/shuttleport_tatooine.iff 0 1204.05 5 1914.09 0.792806 0 0.609474 0 structure.municipal.starport:planet_map.map_loc travel.cost|0|200|travel.ground_time|0|300|travel.is_shuttleport|0|1|travel.point_name|4|Mos Espa Shuttleport|travel.shuttle_available|0|1|travel.version|0|3|$|
1263648 0 object/building/tatooine/shuttleport_tatooine.iff 0 1204.05 5 1914.09 0.792806 0 0.609474 0 structure.municipal.starport:planet_map.map_loc travel.cost|0|200|travel.ground_time|0|300|travel.is_shuttleport|0|1|travel.point_name|4|Mos Espa Shuttleport South|travel.shuttle_available|0|1|travel.version|0|3|$|
1263649 0 object/building/tatooine/filler_building_tatt_style01_09.iff 0 1307.41 5 1909.81 0.143704 0 0.989621 0 $|
1263664 0 object/static/structure/tatooine/pillar_ruined_small_style_01.iff 0 1305.67 4.99944 1838.63 0.933554 0 -0.358437 0 $|
1263666 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1281.69 5 1870.21 0.380925 0 0.924606 0 $|
sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_3_6_ws.tab
+3 -3
View File
@@ -97,9 +97,9 @@ i i h i f f f f f f f s p
1255985 0 object/building/tatooine/guild_combat_tatooine_style_01.iff 0 1081.2 5 375.071 0.779711 0 0.62614 0 $|
1255999 0 object/static/structure/tatooine/wall_junkshop_watto.iff 0 1227.69 5 352.874 -0.0157956 0 0.999876 0 $|
1256002 0 object/static/structure/tatooine/wall_junkshop_watto.iff 0 1250.56 5 393.681 -0.493228 0 0.8699 0 $|
1256013 0 object/building/tatooine/shuttleport_tatooine.iff 0 964.492 5 124.013 0.124675 0 0.992197 0 $|
1256013 0 object/building/tatooine/shuttleport_tatooine.iff 0 964.492 5 124.013 0.124675 0 0.992197 0 structure.municipal.starport:planet_map.map_loc travel.cost|0|200|travel.ground_time|0|300|travel.is_shuttleport|0|1|travel.point_name|4|Mos Espa Shuttleport West|travel.shuttle_available|0|1|travel.version|0|3|$|
1256014 0 object/building/tatooine/guild_university_tatooine_style_01.iff 0 1038.2 5 13.4253 0.990327 0 -0.138751 0 $|
1256055 0 object/building/tatooine/cantina_tatooine.iff 0 1094.78 5 124.168 0.803179 0 0.595738 0 $|
1256055 0 object/building/tatooine/cantina_tatooine.iff 0 1094.78 5 124.168 0.803179 0 0.595738 0 planet_map.map_loc:structure.municipal.cantina:theme_park.dungeon.ep3_clone_relics_generic_spawner spawn_table|4|datatables/spawning/building_spawns/mos_espa_cantina.iff|healing.canhealshock|0|1|safeLogout|0|1|$|
1257855 0 object/static/structure/tatooine/pillar_ruined_small_style_01.iff 0 1101.84 5 555.138 0.173324 0 0.984865 0 $|
1257872 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1077.38 5 509.195 0.908966 0 -0.416871 0 $|
1257874 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1084.9 5 502.598 0.924909 0 -0.380189 0 $|
@@ -235,7 +235,7 @@ i i h i f f f f f f f s p
1261433 0 object/static/structure/tatooine/pillar_pristine_large_style_01.iff 0 1292.6 5 296.502 -0.693686 0 0.720279 0 $|
1261434 0 object/static/structure/tatooine/pillar_pristine_large_style_01.iff 0 1291.23 5 266.727 0.847676 0 -0.530514 0 $|
1261651 0 object/building/tatooine/starport_tatooine.iff 0 1267.22 5 31.6096 0.877581 0 -0.479429 0 structure.municipal.starport:theme_park.dungeon.generic_spawner travel.air_time|0|60|travel.cost|0|150|travel.ground_time|0|300|travel.point_name|4|Mos Espa Starport|travel.shuttle_available|0|1|travel.version|0|3|spawn_table|4|datatables/spawning/building_spawns/mos_espa_starport.iff|$|
1261667 0 object/building/tatooine/shuttleport_tatooine.iff 0 1296.78 5 115.43 0.779214 0 0.626758 0 $|
1261667 0 object/building/tatooine/shuttleport_tatooine.iff 0 1296.78 5 115.43 0.779214 0 0.626758 0 structure.municipal.starport:planet_map.map_loc travel.cost|0|200|travel.ground_time|0|300|travel.is_shuttleport|0|1|travel.point_name|4|Mos Espa Shuttleport East|travel.shuttle_available|0|1|travel.version|0|3|$|
1261668 0 object/building/tatooine/filler_building_tatt_style01_06.iff 0 1314.84 5 84.916 0.953847 0 0.300293 0 $|
1261670 0 object/building/tatooine/filler_building_tatt_style01_07.iff 0 1363.72 5 83.1404 -0.296281 0 0.955101 0 $|
1261672 0 object/building/tatooine/filler_building_tatt_style01_08.iff 0 1377.49 5 58.4358 -0.272313 0 0.962209 0 $|
sku.0/sys.server/compiled/game/datatables/spawning/building_spawns/mos_espa_cantina.tab
+5
View File
@@ -7,3 +7,8 @@ object/static/item/item_wrapped_candy.iff lifeday foyer1 37.6 0.1 -7.8 163 1
object/static/item/item_wrapped_candy.iff lifeday foyer2 31.7 0.1 -1.5 19 10
object/static/item/item_wrapped_candy.iff lifeday cantina 26.4 -0.9 8.8 -92 10
object/static/item/item_wrapped_candy.iff lifeday cantina 26.4 -0.9 9.9 19 10
jilljoo_jab Jilljoo Jab none cantina 10.5758 -0.895 -3.564 -90 npc.static_quest.quest_convo nervous 10 string:quest_table=jilljoo_jab
commoner_human_male none cantina -6.0075 -0.895 -5.3522 -90 conversation.c_prof_ent_espacontact 10
object/tangible/spawning/spawn_egg.iff none alcove3 1.0656 -0.895 -14.9672 175 city.interior_2_convo
object/tangible/spawning/spawn_egg.iff none private_room -19.6545 -0.895 25.0112 175 city.interior_2_convo
object/tangible/spawning/spawn_egg.iff none cantina 11.1732 -0.895 2.9361 175 city.interior_2_convo
sku.0/sys.server/compiled/game/script/city/city_convo.script
+9 -1
View File
@@ -11,6 +11,14 @@ trigger OnInitialize ()
return SCRIPT_CONTINUE;
}
trigger OnAttach ()
{
beginSpawning( self );
messageTo( self, "handleChatting", null, 10, false );
messageTo( self, "checkForScripts", null, 10, false );
return SCRIPT_CONTINUE;
}
messageHandler handleChatting()
{
obj_id guy1 = getObjIdObjVar( self, "guy1" );
@@ -129,4 +137,4 @@ messageHandler checkForScripts()
detachScript (self, "theme_park.poi.launch");
}
return SCRIPT_CONTINUE;
}
}
sku.0/sys.server/compiled/game/script/city/interior_2_convo.script
+11 -1
View File
@@ -13,6 +13,16 @@ trigger OnInitialize()
return SCRIPT_CONTINUE;
}
trigger OnAttach()
{
spawnGuyOne( self );
spawnGuyTwo( self );
messageTo( self, "checkForScripts", null, 5, false );
messageTo( self, "handleChatting", null, 10, false );
return SCRIPT_CONTINUE;
}
messageHandler handleChatting()
{
obj_id guy1 = getObjIdObjVar( self, "guy1" );
@@ -48,4 +58,4 @@ messageHandler checkForScripts()
detachScript (self, "theme_park.poi.launch");
}
return SCRIPT_CONTINUE;
}
}
sku.0/sys.server/compiled/game/script/city/interior_3_convo.script
+11 -1
View File
@@ -14,6 +14,16 @@ trigger OnInitialize ()
return SCRIPT_CONTINUE;
}
trigger OnAttach()
{
spawnGuyOne( self );
spawnGuyTwo( self );
messageTo( self, "checkForScripts", null, 5, false );
messageTo( self, "handleChatting", null, 10, false );
return SCRIPT_CONTINUE;
}
messageHandler handleChatting()
{
obj_id guy1 = getObjIdObjVar( self, "guy1" );
@@ -58,4 +68,4 @@ messageHandler checkForScripts()
detachScript (self, "theme_park.poi.launch");
}
return SCRIPT_CONTINUE;
}
}
sku.0/sys.server/compiled/game/script/city/interior_4_convo.script
+11 -1
View File
@@ -15,6 +15,16 @@ trigger OnInitialize ()
return SCRIPT_CONTINUE;
}
trigger OnAttach()
{
spawnGuyOne( self );
spawnGuyTwo( self );
messageTo( self, "checkForScripts", null, 5, false );
messageTo( self, "handleChatting", null, 10, false );
return SCRIPT_CONTINUE;
}
messageHandler handleChatting()
{
obj_id guy1 = getObjIdObjVar( self, "guy1" );
@@ -67,4 +77,4 @@ messageHandler checkForScripts()
detachScript (self, "theme_park.poi.launch");
}
return SCRIPT_CONTINUE;
}
}