From 8e3179f3d53e47345c840518b5fca4a2a952e82a Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 30 Oct 2015 13:19:14 -0500
Subject: [PATCH] fixing borked scripts

---
 sku.0/sys.server/compiled/game/script/combat_engine.java    | 2 +-
 .../game/script/content_tools/content_generation.script     | 2 +-
 .../compiled/game/script/event/dianoga_dumpster.script      | 2 +-
 .../event/housepackup/sarlacc_furniture_terminal.script     | 2 +-
 .../compiled/game/script/gm/space_dungeon_utility.script    | 2 +-
 .../game/script/item/tool/reverse_engineering_tool.script   | 2 +-
 .../compiled/game/script/library/beast_lib.scriptlib        | 4 ++--
 .../compiled/game/script/library/collection.scriptlib       | 2 +-
 .../compiled/game/script/library/combat.scriptlib           | 4 ++--
 .../compiled/game/script/library/factions.scriptlib         | 2 +-
 sku.0/sys.server/compiled/game/script/library/hq.scriptlib  | 2 +-
 .../compiled/game/script/library/instance.scriptlib         | 6 +++---
 sku.0/sys.server/compiled/game/script/library/poi.scriptlib | 2 +-
 .../compiled/game/script/library/static_item.scriptlib      | 6 +++---
 .../compiled/game/script/library/stealth.scriptlib          | 6 +++---
 .../compiled/game/script/library/storyteller.scriptlib      | 0
 .../script/npc/skillteacher/theater_trainer_spawner.script  | 0
 .../compiled/game/script/player/veteran_rewards.script      | 0
 .../script/space/content_tools/content_generation.script    | 2 +-
 .../script/systems/event_perk/promoter_hotel_spawner.script | 0
 .../game/script/systems/storyteller/blueprint.script        | 0
 .../game/script/systems/storyteller/blueprint_blank.script  | 0
 .../game/script/systems/storyteller/npc_token.script        | 0
 .../compiled/game/script/test/qaprofession.script           | 2 +-
 .../game/script/theme_park/dathomir/set_level_80.script     | 0
 .../game/script/theme_park/imperial/retreatspawner.script   | 0
 .../game/script/theme_park/meatlump/target_map_puzzle.java  | 0
 27 files changed, 25 insertions(+), 25 deletions(-)
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/library/storyteller.scriptlib
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/npc/skillteacher/theater_trainer_spawner.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/player/veteran_rewards.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/systems/event_perk/promoter_hotel_spawner.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/theme_park/dathomir/set_level_80.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/theme_park/imperial/retreatspawner.script
 mode change 100755 => 100644 sku.0/sys.server/compiled/game/script/theme_park/meatlump/target_map_puzzle.java

diff --git a/sku.0/sys.server/compiled/game/script/combat_engine.java b/sku.0/sys.server/compiled/game/script/combat_engine.java
index 52c450aa6..ddb91930d 100644
--- a/sku.0/sys.server/compiled/game/script/combat_engine.java
+++ b/sku.0/sys.server/compiled/game/script/combat_engine.java
@@ -906,7 +906,7 @@ public class combat_engine
 				attacker.aims=3;
 			}
 			String strAimMod = getWeaponStringType(weapon.weaponType);
-			strAimMod.concat("_aim");
+			strAimMod = strAimMod.concat("_aim");
 			int intBaseAimMod = base_class.getSkillStatisticModifier(attacker.id, "aim");
 			aimsMod = attacker.aims * (base_class.getSkillStatisticModifier(attacker.id, strAimMod)+intBaseAimMod);
 
diff --git a/sku.0/sys.server/compiled/game/script/content_tools/content_generation.script b/sku.0/sys.server/compiled/game/script/content_tools/content_generation.script
index ee4fbc46a..990f11f8f 100644
--- a/sku.0/sys.server/compiled/game/script/content_tools/content_generation.script
+++ b/sku.0/sys.server/compiled/game/script/content_tools/content_generation.script
@@ -1223,7 +1223,7 @@ messageHandler makeSpaceStation()
 	{
 		for(int intI = 0; intI< strAdditionalScripts.length; intI++)
 		{
-			if(strAdditionalScripts!="")
+			if(strAdditionalScripts[intI]!="")
 			{
 				attachScript(objStation, strAdditionalScripts[intI]);
 			}
diff --git a/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.script b/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.script
index 2f48f986d..e58ef1bd2 100644
--- a/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.script
+++ b/sku.0/sys.server/compiled/game/script/event/dianoga_dumpster.script
@@ -1170,7 +1170,7 @@ string getSarlaccCollectionColumn(obj_id self)
 
 	for(int i = 0; i < foodList.length-1; i++)
 	{
-		if(foodList[i] == null || foodList.equals(""))
+		if(foodList[i] == null || foodList[i].equals(""))
 			continue;
 
 		allEdibles.add(foodList[i]);
diff --git a/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.script b/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.script
index d23e3696f..45b2d8cfc 100644
--- a/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.script
+++ b/sku.0/sys.server/compiled/game/script/event/housepackup/sarlacc_furniture_terminal.script
@@ -1243,7 +1243,7 @@ string getSarlaccCollectionColumn(obj_id self)
 
 	for(int i = 0; i < foodList.length-1; i++)
 	{
-		if(foodList[i] == null || foodList.equals(""))
+		if(foodList[i] == null || foodList[i].equals(""))
 			continue;
 
 		allEdibles.add(foodList[i]);
diff --git a/sku.0/sys.server/compiled/game/script/gm/space_dungeon_utility.script b/sku.0/sys.server/compiled/game/script/gm/space_dungeon_utility.script
index 8f9f39229..58e67d5dd 100644
--- a/sku.0/sys.server/compiled/game/script/gm/space_dungeon_utility.script
+++ b/sku.0/sys.server/compiled/game/script/gm/space_dungeon_utility.script
@@ -33,7 +33,7 @@ trigger OnSpeaking(string text)
 		i++;
 	}
 
-	text.toLowerCase();
+	text = text.toLowerCase();
 
 	if (text.startsWith("dungeonticket"))
 	{
diff --git a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.script b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.script
index 88be14667..db8988bf6 100644
--- a/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.script
+++ b/sku.0/sys.server/compiled/game/script/item/tool/reverse_engineering_tool.script
@@ -1033,7 +1033,7 @@ void prependModNameToObject(obj_id object, string modSIDreference)
 
 	string[] parsedString = split(baseName, ':');
 
-	if(!modName.startsWith("[") && !modName.startsWith("@") && !modName.equals("") && !modName.equals(null) && parsedString.length > 1)
+	if(!modName.startsWith("[") && !modName.startsWith("@") && !modName.equals("") && parsedString.length > 1)
 	{
 		string stfFile = parsedString[0];
 		string reference = parsedString[1];
diff --git a/sku.0/sys.server/compiled/game/script/library/beast_lib.scriptlib b/sku.0/sys.server/compiled/game/script/library/beast_lib.scriptlib
index e23a5ee40..cf5ed72ac 100644
--- a/sku.0/sys.server/compiled/game/script/library/beast_lib.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/beast_lib.scriptlib
@@ -3718,7 +3718,7 @@ boolean canPerformCommand(obj_id player, obj_id pet, string command)
 	string[] abilityList = getTrainedSkills(pet);
 	for(int i=0;i<abilityList.length;i++)
 	{
-		if(abilityList == "")
+		if(abilityList[i] == "")
 			continue;
 
 		if(abilityList[i].equals(command) && i <= additionalAbilitySlot)
@@ -3799,7 +3799,7 @@ int calculateTrainingPointsSpent(obj_id pet, string passedAbility)
 
 	for(int i = 0; i < attackList.length; i++)
 	{
-		if(attackList == "empty")
+		if(attackList[i] == "empty")
 			continue;
 
 
diff --git a/sku.0/sys.server/compiled/game/script/library/collection.scriptlib b/sku.0/sys.server/compiled/game/script/library/collection.scriptlib
index 2e22b4da2..7d6251368 100644
--- a/sku.0/sys.server/compiled/game/script/library/collection.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/collection.scriptlib
@@ -337,7 +337,7 @@ boolean updateCraftingSlot(obj_id player, string template)
 
 	string[] collectionTemplateCol = dataTableGetStringColumn(COLLECTION_REWARD_TABLE, CRAFTING_TEMPLATE );
 
-	if (collectionTemplateCol == null || collectionTemplateCol.equals(""))
+	if (collectionTemplateCol == null || collectionTemplateCol[0].equals(""))
 		return false;
 
 	int row = dataTableSearchColumnForString(template, CRAFTING_TEMPLATE, COLLECTION_REWARD_TABLE);
diff --git a/sku.0/sys.server/compiled/game/script/library/combat.scriptlib b/sku.0/sys.server/compiled/game/script/library/combat.scriptlib
index ece9cba89..38f98f4a3 100644
--- a/sku.0/sys.server/compiled/game/script/library/combat.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/combat.scriptlib
@@ -3807,7 +3807,7 @@ float getAttackerBlockReduction(obj_id attacker)
 
 int getBlockAmmount(obj_id player)
 {
-	int blockAmmount = isPlayer(player) || beast_lib.isBeast(player) ? 25 : Math.round(getLevel(player) * 2);
+	int blockAmmount = isPlayer(player) || beast_lib.isBeast(player) ? 25 : Math.round((getLevel(player) * 2));
 
 	float blockStat = 0.0f;
 	blockStat += (float)getEnhancedSkillStatisticModifierUncapped(player, "strength_modified");
@@ -4668,4 +4668,4 @@ boolean hasPrescience(obj_id attacker, obj_id defender, combat_data actionData)
 	}
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/sku.0/sys.server/compiled/game/script/library/factions.scriptlib b/sku.0/sys.server/compiled/game/script/library/factions.scriptlib
index ae175232b..a9a3e8cf0 100644
--- a/sku.0/sys.server/compiled/game/script/library/factions.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/factions.scriptlib
@@ -685,7 +685,7 @@ void delegateFactionPoints(obj_id self, obj_id target, string params)
 		prose.setDI(ppSuiTitle, available);
 		string prompt = " \0" + packOutOfBandProsePackage(null, ppSuiTitle);
 
-		int pid = sui.transfer(self, self, prompt, title, utils.packStringId(SID_SUI_DELEGATE_FACTION_TITLE), Math.round(available), utils.packStringId(SID_SUI_DELEGATE_FACTION_CAT), 0, "handleDelegateSui", ratioFrom, ratioTo);
+		int pid = sui.transfer(self, self, prompt, title, utils.packStringId(SID_SUI_DELEGATE_FACTION_TITLE), available, utils.packStringId(SID_SUI_DELEGATE_FACTION_CAT), 0, "handleDelegateSui", ratioFrom, ratioTo);
 		if ( pid > -1 )
 		{
 			utils.setScriptVar(self, "delegate.pid", pid);
diff --git a/sku.0/sys.server/compiled/game/script/library/hq.scriptlib b/sku.0/sys.server/compiled/game/script/library/hq.scriptlib
index 77d25fd19..5ce4c2c50 100644
--- a/sku.0/sys.server/compiled/game/script/library/hq.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/hq.scriptlib
@@ -356,7 +356,7 @@ obj_id[] spawnExterior(obj_id hq, string tbl)
 		string colName = dataTableGetColumnName(tbl, i);
 
 		string[] locs = dataTableGetStringColumnNoDefaults(tbl, i);
-		if ( locs != null && !locs.equals("") )
+		if ( locs != null)
 		{
 			for ( int n = 0; n < locs.length; n++ )
 			{
diff --git a/sku.0/sys.server/compiled/game/script/library/instance.scriptlib b/sku.0/sys.server/compiled/game/script/library/instance.scriptlib
index 465464edc..edf3fbe5d 100644
--- a/sku.0/sys.server/compiled/game/script/library/instance.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/instance.scriptlib
@@ -493,10 +493,10 @@ void removeFromPlayerList(obj_id instance_id, obj_id player, int group)
 
 	for (int i=0;i<groupSplit.length;i++)
 	{
-		if (groupSplit.equals(""+player))
+		if (groupSplit[i].equals(""+player))
 			continue;
 
-		newList.concat("_"+groupSplit);
+		newList = newList.concat("_"+groupSplit);
 	}
 
 	if (newList == "")
@@ -506,7 +506,7 @@ void removeFromPlayerList(obj_id instance_id, obj_id player, int group)
 	}
 
 	if (newList.startsWith("_"))
-		newList.substring(1);
+		newList = newList.substring(1);
 
 	utils.setScriptVar(instance_id, PLAYER_LIST+"_"+group, newList);
 }
diff --git a/sku.0/sys.server/compiled/game/script/library/poi.scriptlib b/sku.0/sys.server/compiled/game/script/library/poi.scriptlib
index fd570c75c..caccb9199 100644
--- a/sku.0/sys.server/compiled/game/script/library/poi.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/poi.scriptlib
@@ -1089,7 +1089,7 @@ boolean quickSay( obj_id npc, string speech )
 {
 	// Get reference to base.
 	obj_id poiBaseObject = getBaseObject( npc );
-	if ( (poiBaseObject == null) || (poiBaseObject == obj_id.NULL_ID) )
+	if ( (poiBaseObject == obj_id.NULL_ID) )
 		return false;
 
 	// Load convo file.
diff --git a/sku.0/sys.server/compiled/game/script/library/static_item.scriptlib b/sku.0/sys.server/compiled/game/script/library/static_item.scriptlib
index 0cb49cdcb..bf8aaa57a 100644
--- a/sku.0/sys.server/compiled/game/script/library/static_item.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/static_item.scriptlib
@@ -1182,7 +1182,7 @@ void checkForAddSetBonus(obj_id item, obj_id player)
 	int numberOfSetItems = getNumSetItems(player, item, setBonusIndex);
 	string setBonusBuffName = getSetBonusBuffName(item, setBonusIndex, numberOfSetItems);
 
-	if(!setBonusBuffName.equals(null) && !setBonusBuffName.equals("none"))
+	if(!setBonusBuffName.equals("none"))
 	{
 		if(!buff.hasBuff(player, setBonusBuffName))
 		{
@@ -1209,7 +1209,7 @@ void checkForRemoveSetBonus(obj_id item, obj_id player)
 	if(utils.hasScriptVar(item, NO_SET_ITEM_EQUIP_SPAM))
 		utils.removeScriptVar(item, NO_SET_ITEM_EQUIP_SPAM);
 	
-	if(!setBonusBuffName.equals(null) && !setBonusBuffName.equals("none"))
+	if(!setBonusBuffName.equals("none"))
 	{
 		if(buff.hasBuff(player, setBonusBuffName))
 			buff.removeBuff(player, setBonusBuffName);
@@ -2598,4 +2598,4 @@ string_id getStaticItemStringIdName(obj_id object)
 	string staticItemName = getStaticItemName(object);
 	
 	return new string_id(STATIC_ITEM_NAME, staticItemName);
-}
\ No newline at end of file
+}
diff --git a/sku.0/sys.server/compiled/game/script/library/stealth.scriptlib b/sku.0/sys.server/compiled/game/script/library/stealth.scriptlib
index 008c802e3..96f760a20 100644
--- a/sku.0/sys.server/compiled/game/script/library/stealth.scriptlib
+++ b/sku.0/sys.server/compiled/game/script/library/stealth.scriptlib
@@ -292,7 +292,7 @@ void createRangerLoot(obj_id mob, int level, string object, obj_id container)
 int getNumLootItems(int level, obj_id destContainer)
 {
 	float lvl = level;
-	int numItems = 1 + (int)Math.ceil(level/30);
+	int numItems = 1 + (int)Math.ceil((level/30));
 
 	int free = getVolumeFree(destContainer);
 	if(free < numItems)
@@ -336,12 +336,12 @@ obj_id createHEPObject(obj_id container, int power, int count)
 		{
 			setObjVar(hep, HEP_BASE_POWER, power);
 			setCount(hep, power);
-			setObjVar(hep, HEP_EFFECTIVENESS, Math.round(power / 2));
+			setObjVar(hep, HEP_EFFECTIVENESS, Math.round((power / 2));
 		}
 		else
 		{
 			setObjVar(hep, HEP_EFFECTIVENESS, power);
-			power = Math.round(power/2);
+			power = Math.round((power/2));
 			setObjVar(hep, HEP_BASE_POWER, power);
 			setCount(hep, power);
 		}
diff --git a/sku.0/sys.server/compiled/game/script/library/storyteller.scriptlib b/sku.0/sys.server/compiled/game/script/library/storyteller.scriptlib
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/npc/skillteacher/theater_trainer_spawner.script b/sku.0/sys.server/compiled/game/script/npc/skillteacher/theater_trainer_spawner.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/player/veteran_rewards.script b/sku.0/sys.server/compiled/game/script/player/veteran_rewards.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/space/content_tools/content_generation.script b/sku.0/sys.server/compiled/game/script/space/content_tools/content_generation.script
index 8b5219d57..500e4b171 100644
--- a/sku.0/sys.server/compiled/game/script/space/content_tools/content_generation.script
+++ b/sku.0/sys.server/compiled/game/script/space/content_tools/content_generation.script
@@ -1965,7 +1965,7 @@ messageHandler makeSpaceStation()
 	{
 		for(int intI = 0; intI< strAdditionalScripts.length; intI++)
 		{
-			if(strAdditionalScripts!="")
+			if(strAdditionalScripts[intI]!="")
 			{
 				attachScript(objStation, strAdditionalScripts[intI]);
 			}
diff --git a/sku.0/sys.server/compiled/game/script/systems/event_perk/promoter_hotel_spawner.script b/sku.0/sys.server/compiled/game/script/systems/event_perk/promoter_hotel_spawner.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.script b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.script b/sku.0/sys.server/compiled/game/script/systems/storyteller/blueprint_blank.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.script b/sku.0/sys.server/compiled/game/script/systems/storyteller/npc_token.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/test/qaprofession.script b/sku.0/sys.server/compiled/game/script/test/qaprofession.script
index 44c36c56f..7a39083c6 100644
--- a/sku.0/sys.server/compiled/game/script/test/qaprofession.script
+++ b/sku.0/sys.server/compiled/game/script/test/qaprofession.script
@@ -490,7 +490,7 @@ messageHandler handleAbilitySelection()
 								//GET AN ARRAY OF ALL THE SKILLS BASED ON THE PROFESSION
 								string[] professionSkillCodes = getProfessionSkillCodes( self, professionCodeSelection );
 								
-								if (professionSkillCodes != "")
+								if (professionSkillCodes[0] != "")
 								{
 									//sendSystemMessageTestingOnly(self, "professionSkillCodes == something");
 																		
diff --git a/sku.0/sys.server/compiled/game/script/theme_park/dathomir/set_level_80.script b/sku.0/sys.server/compiled/game/script/theme_park/dathomir/set_level_80.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/theme_park/imperial/retreatspawner.script b/sku.0/sys.server/compiled/game/script/theme_park/imperial/retreatspawner.script
old mode 100755
new mode 100644
diff --git a/sku.0/sys.server/compiled/game/script/theme_park/meatlump/target_map_puzzle.java b/sku.0/sys.server/compiled/game/script/theme_park/meatlump/target_map_puzzle.java
old mode 100755
new mode 100644