Fixed merge issues.

This commit is contained in:
Cekis
2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
+38 -38
View File
@@ -1,38 +1,38 @@
package script.beta;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.utils;
import script.library.features;
public class featuretest extends script.base_script
{
public featuretest()
{
}
public static final int SWG_BASE_GAME = 0x00000001;
public static final int SWG_COLLECTORS_GAME = 0x00000002;
public int OnAttach(obj_id self) throws InterruptedException
{
debugSpeakMsg(self, "feature test script attached");
return SCRIPT_CONTINUE;
}
public int OnSpeaking(obj_id self, String text) throws InterruptedException
{
if (text.equals("featuretest"))
{
sendSystemMessageTestingOnly(self, "getGameFeatures(): " + getGameFeatureBits(self));
sendSystemMessageTestingOnly(self, "getSubFeatures(): " + getSubscriptionFeatureBits(self));
sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_BASE_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME));
sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_COLLECTORS_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME));
sendSystemMessageTestingOnly(self, "isCollectorEdition" + features.isCollectorEdition(self));
}
return SCRIPT_CONTINUE;
}
}
package script.beta;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.utils;
import script.library.features;
public class featuretest extends script.base_script
{
public featuretest()
{
}
public static final int SWG_BASE_GAME = 0x00000001;
public static final int SWG_COLLECTORS_GAME = 0x00000002;
public int OnAttach(obj_id self) throws InterruptedException
{
debugSpeakMsg(self, "feature test script attached");
return SCRIPT_CONTINUE;
}
public int OnSpeaking(obj_id self, String text) throws InterruptedException
{
if (text.equals("featuretest"))
{
sendSystemMessageTestingOnly(self, "getGameFeatures(): " + getGameFeatureBits(self));
sendSystemMessageTestingOnly(self, "getSubFeatures(): " + getSubscriptionFeatureBits(self));
sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_BASE_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME));
sendSystemMessageTestingOnly(self, "utils.checkBit( SWG_COLLECTORS_GAME ): " + utils.checkBit(getGameFeatureBits(self), SWG_COLLECTORS_GAME));
sendSystemMessageTestingOnly(self, "isCollectorEdition" + features.isCollectorEdition(self));
}
return SCRIPT_CONTINUE;
}
}