swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-05 21:12:59 -04:00
Code Issues Projects Releases Wiki Activity

more fixes, and more to come later based on error logs

Browse Source
This commit is contained in:
DarthArgus
2015-11-01 06:12:36 -06:00
parent 572366003a
commit 24cb3b012c
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab
+3 -3
View File
@@ -122,7 +122,7 @@ i i h i f f f f f f f s p
1106344 0 object/building/tatooine/filler_building_tatt_style01_03.iff 0 1289.31 5 1298.06 -0.334238 0 0.942489 0 $|
1106346 0 object/building/tatooine/filler_building_tatt_style01_02.iff 0 1339.74 5 1258.36 0.94441 0 0.328769 0 $|
1106352 0 object/building/tatooine/filler_building_tatt_style01_03.iff 0 1316.02 5 1275.64 0.939373 0 0.342898 0 $|
1106368 0 object/building/tatooine/starport_tatooine.iff 0 1570.98 5 1342.91 -0.700285 0 0.713864 0 structure.municipal.starport:theme_park.script_spawner.spawner_methods.script_spawner_default:theme_park.script_spawner.spawner_methods.gcw_spawner spawn_table|4|datatables/spawning/building_spawns/mos_eisley_staport.iff|ravel.air_time|0|60|travel.cost|0|150|travel.ground_time|0|300|travel.point_name|4|Mos Eisley Starport|travel.shuttle_available|0|1|travel.version|0|3|$|
1106368 0 object/building/tatooine/starport_tatooine.iff 0 1570.98 5 1342.91 -0.700285 0 0.713864 0 structure.municipal.starport.script_spawner_default:theme_park.script_spawner.spawner_methods.gcw_spawner:theme_park.script_spawner.spawner_methods spawn_table|4|datatables/spawning/building_spawns/mos_eisley_starport.iff|ravel.air_time|0|60|travel.cost|0|150|travel.ground_time|0|300|travel.point_name|4|Mos Eisley Starport|travel.shuttle_available|0|1|travel.version|0|3|$|
1106369 1106368 object/cell/cell.iff 1 0 0 0 1 0 0 0 $|
1106370 1106368 object/cell/cell.iff 2 0 0 0 1 0 0 0 $|
1106371 1106368 object/cell/cell.iff 3 0 0 0 1 0 0 0 $|
@@ -453,7 +453,7 @@ i i h i f f f f f f f s p
1189532 0 object/building/tatooine/filler_building_block_64x16_style_01.iff 0 1158.52 5 1485.41 0.957264 0 0.289216 0 $|
1189542 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1395.77 5 1644.09 0.100626 0 0.994924 0 $|
1189550 0 object/static/structure/tatooine/pillar_ruined_large_style_01.iff 0 1404.62 5 1647.23 0.993395 0 -0.114747 0 $|
1189571 0 object/building/tatooine/guild_university_tatooine_style_01.iff 0 1292.03 5 1439.98 0.474332 0 0.880346 0 theme_park.script_spawner.spawner_methods.script_spawner_default $|
1189571 0 object/building/tatooine/guild_university_tatooine_style_01.iff 0 1292.03 5 1439.98 0.474332 0 0.880346 0 $|
1189572 1189571 object/cell/cell.iff 1 0 0 0 1 0 0 0 $|
1189573 1189571 object/cell/cell.iff 2 0 0 0 1 0 0 0 $|
1189574 1189571 object/cell/cell.iff 3 0 0 0 1 0 0 0 $|
@@ -487,7 +487,7 @@ i i h i f f f f f f f s p
1189605 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1328.97 5 1418.91 0.958244 0 0.285952 0 $|
1189606 0 object/static/structure/tatooine/pillar_pristine_small_style_01.iff 0 1328.83 5 1423.42 0.958244 0 0.285952 0 $|
1189607 0 object/static/structure/tatooine/guild_statue_free_style_01.iff 0 1437.88 5 1435.89 0.466913 0 0.884304 0 $|
1189630 0 object/building/tatooine/guild_combat_tatooine_style_01.iff 0 1418 5 1468.59 0.476432 0 0.879211 0 spawn_table|4|datatables/spawning/building_spawns/tatooine_mos_eisley_war_guild.iff|$| $|
1189630 0 object/building/tatooine/guild_combat_tatooine_style_01.iff 0 1418 5 1468.59 0.476432 0 0.879211 0 theme_park.script_spawner.spawner_methods.script_spawner_default spawn_table|4|datatables/spawning/building_spawns/tatooine_mos_eisley_war_guild.iff|$|
1189631 1189630 object/cell/cell.iff 1 0 0 0 1 0 0 0 $|
1189632 1189630 object/cell/cell.iff 2 0 0 0 1 0 0 0 $|
1189633 1189630 object/cell/cell.iff 3 0 0 0 1 0 0 0 $|
sku.0/sys.server/compiled/game/script/theme_park/script_spawner/spawner_methods/script_spawner_default.script
-9
View File
@@ -8,14 +8,12 @@ const int MAX_SPAWN_TRIES = 5;
trigger OnAttach ()
{
//debugSpeakMsg (self, "STARTED SPAWNING");
messageTo ( self, "beginSpawn", null, 1, false );
return SCRIPT_CONTINUE;
}
trigger OnInitialize ()
{
//debugSpeakMsg (self, "STARTED SPAWNING");
messageTo ( self, "beginSpawn", null, 1, false );
return SCRIPT_CONTINUE;
}
@@ -31,7 +29,6 @@ messageHandler beginSpawn ()
}
int numberOfCreaturesToSpawn = dataTableGetNumRows (datatable);
// LOG("SCRIPT_SPAWNER_DEFAULT_beginSpawn", "Number of Creatures to Spawn is: " + numberOfCreaturesToSpawn);
if ( numberOfCreaturesToSpawn <= 0 )
return SCRIPT_CONTINUE;
@@ -45,22 +42,18 @@ messageHandler beginSpawn ()
boolean failed = false;
for (int i = 0; i < spawned.length; ++i)
{
// LOG("SCRIPT_SPAWNER_BEGINSPAWN", "Spawned[i] = " + spawned[i]);
if ( spawned[i] == obj_id.NULL_ID || spawned[i] == null)
{
spawned[i] = spawnActor(datatable, i);
if (spawned[i] == obj_id.NULL_ID)
{
failed = true;
// CustomerServiceLog("Spawn", "Could not spawn object " + dataTableGetString (datatable, i, "spawns") +
// " from datatable" + datatable + ", spawn egg = " + self);
}
}
}
if ( failed )
{
// LOG("SCRIPT_SPAWNER_DEFAULT_beginSpawn", "Cycle failed, resending call to spawn");
spawnedCount++;
if (spawnedCount <= MAX_SPAWN_TRIES)
messageTo ( self, "beginSpawn", null, 1, false );
@@ -78,8 +71,6 @@ messageHandler tellingMomIDied() {
string datatable = getStringObjVar (self, "spawn_table");
obj_id[] spawned = utils.getObjIdArrayScriptVar (self, "spawnList");
// LOG("SCRIPT_SPAWNER_TELLINGMOMIDIED", "Validate public corpse is equal to ID passed from respawn script: " + corpse + " =? " + corpseObjId);
if (datatable == null)
{