mirror of
https://github.com/SWG-Source/dsrc.git
synced 2026-10-10 01:12:58 -04:00
more script fixes
This commit is contained in:
@@ -1345,7 +1345,7 @@ trigger OnIncapacitated(obj_id attacker)
|
||||
{
|
||||
obj_id[] haters = getHateList(self);
|
||||
|
||||
if (haters != null || haters.length > 0)
|
||||
if (haters.length > 0)
|
||||
{
|
||||
for(int i=0;i<haters.length;i++)
|
||||
{
|
||||
|
||||
@@ -137,7 +137,7 @@ trigger OnIncapacitated(obj_id attacker)
|
||||
{
|
||||
obj_id[] haters = getHateList(self);
|
||||
|
||||
if (haters != null || haters.length > 0)
|
||||
if (haters.length > 0)
|
||||
{
|
||||
for(int i=0;i<haters.length;i++)
|
||||
{
|
||||
@@ -151,4 +151,4 @@ trigger OnIncapacitated(obj_id attacker)
|
||||
clearCondition(self, CONDITION_INTERESTING);
|
||||
|
||||
return SCRIPT_CONTINUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ trigger OnIncapacitated(obj_id attacker)
|
||||
{
|
||||
obj_id[] haters = getHateList(self);
|
||||
|
||||
if (haters != null || haters.length > 0)
|
||||
if (haters.length > 0)
|
||||
{
|
||||
for(int i=0;i<haters.length;i++)
|
||||
{
|
||||
@@ -213,4 +213,4 @@ trigger OnIncapacitated(obj_id attacker)
|
||||
clearCondition(self, CONDITION_INTERESTING);
|
||||
|
||||
return SCRIPT_CONTINUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ messageHandler handleDecoyCleanup()
|
||||
{
|
||||
obj_id[] haters = getHateList(self);
|
||||
|
||||
if (haters != null || haters.length > 0)
|
||||
if (haters.length > 0)
|
||||
{
|
||||
for(int i=0;i<haters.length;i++)
|
||||
{
|
||||
@@ -88,4 +88,4 @@ messageHandler queue_ad()
|
||||
{
|
||||
queueCommand(self, ##"sp_avoid_damage", self, "", COMMAND_PRIORITY_DEFAULT);
|
||||
return SCRIPT_CONTINUE;
|
||||
}
|
||||
}
|
||||
|
||||
+16
@@ -2519,20 +2519,28 @@ string getRandomMissionCreatorName()
|
||||
{
|
||||
case 1:
|
||||
strTemplate = "object/creature/player/bothan_male.iff";
|
||||
break;
|
||||
case 2:
|
||||
strTemplate = "object/creature/player/moncal_male.iff";
|
||||
break;
|
||||
case 3:
|
||||
strTemplate = "object/creature/player/trandoshan_male.iff";
|
||||
break;
|
||||
case 4:
|
||||
strTemplate = "object/creature/player/twilek_male.iff";
|
||||
break;
|
||||
case 5:
|
||||
strTemplate = "object/creature/player/rodian_male.iff";
|
||||
break;
|
||||
case 6:
|
||||
strTemplate = "object/creature/player/zabrak_male.iff";
|
||||
break;
|
||||
case 7:
|
||||
strTemplate = "object/creature/player/wookiee_male.iff";
|
||||
break;
|
||||
case 8:
|
||||
strTemplate = "object/creature/player/human_male.iff";
|
||||
break;
|
||||
}
|
||||
|
||||
//PROFILER_START("Actual name call");
|
||||
@@ -2555,20 +2563,28 @@ string getRandomSpeciesName(string strSpecies)
|
||||
{
|
||||
case 1:
|
||||
strTemplate = "object/creature/player/bothan_male.iff";
|
||||
break;
|
||||
case 2:
|
||||
strTemplate = "object/creature/player/moncal_male.iff";
|
||||
break;
|
||||
case 3:
|
||||
strTemplate = "object/creature/player/trandoshan_male.iff";
|
||||
break;
|
||||
case 4:
|
||||
strTemplate = "object/creature/player/twilek_male.iff";
|
||||
break;
|
||||
case 5:
|
||||
strTemplate = "object/creature/player/rodian_male.iff";
|
||||
break;
|
||||
case 6:
|
||||
strTemplate = "object/creature/player/zabrak_male.iff";
|
||||
break;
|
||||
case 7:
|
||||
strTemplate = "object/creature/player/wookiee_male.iff";
|
||||
break;
|
||||
case 8:
|
||||
strTemplate = "object/creature/player/human_male.iff";
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user