From 23b461bc3fc39d8f27688a19b80361d4accca844 Mon Sep 17 00:00:00 2001 From: Cekis Date: Tue, 3 Nov 2020 01:03:51 -0500 Subject: [PATCH] Backed out changes to spawner and fixed Tatooine spawn TABs --- .../ground_spawning/types/tatooine/tatooine_bantha.tab | 1 - .../types/tatooine/tatooine_dunestalkers.tab | 1 - .../ground_spawning/types/tatooine/tatooine_krayt.tab | 1 - .../types/tatooine/tatooine_newbie_gunrunner_leader.tab | 2 -- .../types/tatooine/tatooine_newbie_gunrunner_sentry.tab | 2 -- .../types/tatooine/tatooine_newbie_gunrunners.tab | 2 -- .../ground_spawning/types/tatooine/tatooine_rockmites.tab | 1 - .../types/tatooine/tatooine_tempest_rills.tab | 1 - .../ground_spawning/types/tatooine/tatooine_terrorist.tab | 1 - .../ground_spawning/types/tatooine/tatooine_worrts.tab | 1 - .../game/script/systems/spawning/spawner_area.java | 8 ++++---- 11 files changed, 4 insertions(+), 17 deletions(-) diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_bantha.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_bantha.tab index 56df88482..67a39d841 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_bantha.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_bantha.tab @@ -1,4 +1,3 @@ strItem fltSize s f bantha 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_dunestalkers.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_dunestalkers.tab index 46a34c042..cab0a547d 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_dunestalkers.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_dunestalkers.tab @@ -2,4 +2,3 @@ strItem fltSize s f dune_stalker 4 dune_stalker_scavenger 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_krayt.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_krayt.tab index 11dcc531d..d647d02f0 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_krayt.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_krayt.tab @@ -2,4 +2,3 @@ strItem fltSize s f canyon_krayt_dragon 4 giant_canyon_krayt_dragon 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_leader.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_leader.tab index 27d96b237..7b6acf441 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_leader.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_leader.tab @@ -1,5 +1,3 @@ strItem fltSize s f gunrunner_newbie_leader 4 - - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_sentry.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_sentry.tab index 6f3191c1d..3aea10bad 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_sentry.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunner_sentry.tab @@ -1,5 +1,3 @@ strItem fltSize s f gunrunner_newbie_sentry 4 - - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunners.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunners.tab index c517373fc..9d88f4523 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunners.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_newbie_gunrunners.tab @@ -1,5 +1,3 @@ strItem fltSize s f gunrunner_newbie 4 - - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_rockmites.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_rockmites.tab index ac4813a10..5a5ea50a3 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_rockmites.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_rockmites.tab @@ -1,4 +1,3 @@ strItem fltSize s f rockmite 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_tempest_rills.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_tempest_rills.tab index 0e1bb6c5b..86fed83f7 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_tempest_rills.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_tempest_rills.tab @@ -1,4 +1,3 @@ strItem fltSize s f rill_tempest 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_terrorist.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_terrorist.tab index 35a311653..41a4c5d61 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_terrorist.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_terrorist.tab @@ -1,4 +1,3 @@ strItem fltSize s f terrorist 4 - diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_worrts.tab b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_worrts.tab index 86d44b7cb..a3bd5c61a 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_worrts.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/ground_spawning/types/tatooine/tatooine_worrts.tab @@ -1,4 +1,3 @@ strItem fltSize s f worrt 4 - diff --git a/sku.0/sys.server/compiled/game/script/systems/spawning/spawner_area.java b/sku.0/sys.server/compiled/game/script/systems/spawning/spawner_area.java index 9a94975d8..b124fefd2 100755 --- a/sku.0/sys.server/compiled/game/script/systems/spawning/spawner_area.java +++ b/sku.0/sys.server/compiled/game/script/systems/spawning/spawner_area.java @@ -60,23 +60,23 @@ public class spawner_area extends script.base_script if (dataTableOpen(strFileName)) { String[] strSpawns = dataTableGetStringColumnNoDefaults(strFileName, "strItem"); - float[] fltSizes = dataTableGetFloatColumnNoDefaults(strFileName, "fltSize"); + float[] fltSizes = dataTableGetFloatColumn(strFileName, "fltSize"); if (strSpawns == null || strSpawns.length == 0) { setName(self, "Mangled spawner. strFileName is " + strFileName + " I couldnt find any spawns in that file."); - return SCRIPT_CONTINUE; } if (fltSizes.length == 0) { setName(self, "Missing spawn sizes in " + strFileName); - return SCRIPT_CONTINUE; } if (fltSizes.length != strSpawns.length) { setName(self, "MISSING VALUES: Each spawn must have an associated size (" + strFileName + ")"); - return SCRIPT_CONTINUE; } int intRoll = rand(0, strSpawns.length - 1); + if(intRoll >= fltSizes.length) { + intRoll = fltSizes.length - 1; + } strSpawn = strSpawns[intRoll]; fltSize = fltSizes[intRoll]; }