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

Revert "Merge remote-tracking branch 'upstream/master'"

Browse Source 
This reverts commit 369ece8ecc, reversing
changes made to ddffe98299.
This commit is contained in:
RisTanA
2020-06-07 02:15:55 -07:00
parent 369ece8ecc
commit 9058eae8db
70 changed files with 1124 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/ai/beast_control_device.java
+8 -8
View File
@@ -260,7 +260,7 @@ public class beast_control_device extends script.base_script
String currentHappiness = utils.packStringId(beast_lib.convertHappinessString(self));
if (currentHappiness != null)
{
attribs[idx] = String.valueOf(currentHappiness);
attribs[idx] = "" + currentHappiness;
idx++;
if (idx >= names.length)
{
@@ -271,7 +271,7 @@ public class beast_control_device extends script.base_script
String currentLoyalty = utils.packStringId(beast_lib.convertLoyaltyString(self));
if (currentLoyalty != null)
{
attribs[idx] = String.valueOf(currentLoyalty);
attribs[idx] = "" + currentLoyalty;
idx++;
if (idx >= names.length)
{
@@ -283,7 +283,7 @@ public class beast_control_device extends script.base_script
if (trainingPoints > 0)
{
names[idx] = "bm_single_max_training_points";
attribs[idx] = String.valueOf(trainingPoints);
attribs[idx] = "" + trainingPoints;
idx++;
if (idx >= names.length)
{
@@ -294,7 +294,7 @@ public class beast_control_device extends script.base_script
if (pointsSpent > 0)
{
names[idx] = "bm_points_spent";
attribs[idx] = String.valueOf(pointsSpent);
attribs[idx] = "" + pointsSpent;
idx++;
if (idx >= names.length)
{
@@ -305,7 +305,7 @@ public class beast_control_device extends script.base_script
if (maxAvailableTrainingPoints > 0)
{
names[idx] = "bm_points_available";
attribs[idx] = String.valueOf(maxAvailableTrainingPoints);
attribs[idx] = "" + maxAvailableTrainingPoints;
idx++;
if (idx >= names.length)
{
@@ -325,13 +325,13 @@ public class beast_control_device extends script.base_script
if (!name.equals("block_value_bonus"))
{
names[idx] = beast_lib.DISPLAY_NAMES[i];
attribs[idx] = String.valueOf(utils.roundFloatByDecimal(incubationBonuses[i] * beast_lib.DISPLAY_OBJVAR_CONVERSION_RATES[i])) + "%";
attribs[idx] = "" + utils.roundFloatByDecimal(incubationBonuses[i] * beast_lib.DISPLAY_OBJVAR_CONVERSION_RATES[i]) + "%";
idx++;
}
else
{
names[idx] = beast_lib.DISPLAY_NAMES[i];
attribs[idx] = String.valueOf(incubationBonuses[i]);
attribs[idx] = "" + incubationBonuses[i];
idx++;
}
continue;
@@ -339,7 +339,7 @@ public class beast_control_device extends script.base_script
else
{
names[idx] = beast_lib.DISPLAY_NAMES[i];
attribs[idx] = String.valueOf(incubationBonuses[i]);
attribs[idx] = "" + incubationBonuses[i];
idx++;
continue;
}