The following has been fixed:

*Removed unnecessary options in the faction QA tool
*Fixed Empire/Remembrance Day Ceremonies.  They now work.
*Killing a player through the event tool should now work
*Removed unecessary comments from base_player script
*Fixed the badge QA tool
*Fixed the location bug in several different methods
*Fixed the Exar Kun first boss sparks to accurately choose a target
*Life Day and Love Day now work and spawn correctly
This commit is contained in:
PrisonCamp
2015-02-20 23:24:16 -08:00
parent af96886b93
commit 254ac20beb
14 changed files with 68 additions and 68 deletions
@@ -6,8 +6,8 @@ Chu-Gon Dar Cube Tool Go Overt (Special Forces) FS Village Exit Quests
Cybernetic Tool Go On Leave
Damage Tool Go Neutral
Datapad Tool Manipulate NPC Factions
Dynamic Loot Tool Get Factional HQ's and Supplies
Experience Tool Galactic Civil War Testing
Dynamic Loot Tool
Experience Tool
Factional Tool
Inventory Tool
Master Item Tool
@@ -15,7 +15,7 @@ messageHandler spawnStormtroopers()
string spawn = "stormtrooper_novatrooper";
location here = getLocation(self);
location outsideLoc = here;
location outsideLoc = (location)here.clone();
outsideLoc.z += 15;
for(int i = 0; i < 10; i++)
@@ -29,9 +29,9 @@ messageHandler spawnStormtroopers()
obj_id room1Cell = getCellId(self, "room1");
obj_id room2Cell = getCellId(self, "room2");
obj_id room3Cell = getCellId(self, "room3");
location room1Loc = here;
location room2Loc = here;
location room3Loc = here;
location room1Loc = (location)here.clone();
location room2Loc = (location)here.clone();
location room3Loc = (location)here.clone();
room1Loc.x = 2.1f;
room1Loc.z = 1.5f;
room1Loc.cell = room1Cell;
@@ -79,4 +79,4 @@ trigger OnAboutToReceiveItem (obj_id destinationCell, obj_id transferrer, obj_id
}
return SCRIPT_CONTINUE;
}
}
@@ -103,7 +103,7 @@ trigger OnInitialize()
}
CustomerServiceLog("holidayEvent", "emperor_statue.OnInitialize: Preparing Parade.");
messageTo(self, "prepareParade", null, 10.0f, false);
messageTo(self, "prepareParade", null, 30.0f, false);
return SCRIPT_CONTINUE;
}
@@ -460,7 +460,7 @@ messageHandler spawnDarkTroopers1()
obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M);
location spawnLoc = getLocation(spawnPoint);
location tempLoc = spawnLoc;
location tempLoc = (location)spawnLoc.clone();
for (int i=0;i<squad.length;i++)
{
@@ -488,7 +488,7 @@ messageHandler spawnDarkTroopers2()
obj_id spawnPoint = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M);
location spawnLoc = getLocation(spawnPoint);
location tempLoc = spawnLoc;
location tempLoc = (location)spawnLoc.clone();
for (int i=0;i<squad.length;i++)
{
@@ -566,7 +566,7 @@ messageHandler moveParade()
if(isIdValid(pathPoint1) && exists(pathPoint1))
{
location pathLoc1 = getLocation(pathPoint1);
location tempLoc1 = pathLoc1;
location tempLoc1 = (location)pathLoc1.clone();
tempLoc1.z = pathLoc1.z-i*2;
pathTo (squad1[i], tempLoc1);
}
@@ -575,7 +575,7 @@ messageHandler moveParade()
if(isIdValid(pathPoint2) && exists(pathPoint2))
{
location pathLoc2 = getLocation(pathPoint2);
location tempLoc2 = pathLoc2;
location tempLoc2 = (location)pathLoc2.clone();
tempLoc2.z = pathLoc2.z-i*2;
pathTo (squad2[i], tempLoc2);
}
@@ -628,7 +628,7 @@ messageHandler launchRandomNonFactionalFirework()
CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomFirework: messageHandler initialized.");
location statue = getLocation(self);
location here = statue;
location here = (location)statue.clone();
here.z = statue.z+20;
location there = utils.getRandomLocationInRing(here, 0, 10);
@@ -663,7 +663,7 @@ messageHandler launchRandomNonFactionalFirework()
messageHandler launchFactionalFirework()
{
location statue = getLocation(self);
location here = statue;
location here = (location)statue.clone();
here.z = statue.z+20;
location there = utils.getRandomLocationInRing(here, 0, 10);
@@ -767,14 +767,14 @@ messageHandler finalMarch()
{
obj_id pathPoint1 = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark1", holiday.OBJECT_NEAR_CHECK_RANGE_100M);
location pathLoc1 = getLocation(pathPoint1);
location tempLoc1 = pathLoc1;
location tempLoc1 = (location)pathLoc1.clone();
tempLoc1.z = pathLoc1.z+i*2;
pathTo (squad1[i], tempLoc1);
obj_id pathPoint2 = holiday.getEmpireDayWaypointObjectObjId(self, "spawnDark2", holiday.OBJECT_NEAR_CHECK_RANGE_100M);
location pathLoc2 = getLocation(pathPoint2);
location tempLoc2 = pathLoc2;
location tempLoc2 = (location)pathLoc2.clone();
tempLoc2.z = pathLoc2.z+i*2;
pathTo (squad2[i], tempLoc2);
@@ -113,7 +113,7 @@ trigger OnInitialize()
}
CustomerServiceLog("holidayEvent", "yoda_fountain.OnInitialize: Preparing Parade.");
messageTo(self, "prepareParade", null, 10.0f, false);
messageTo(self, "prepareParade", null, 30.0f, false);
return SCRIPT_CONTINUE;
}
@@ -1207,7 +1207,7 @@ messageHandler launchRandomNonFactionalFirework()
CustomerServiceLog("holidayEvent", "emperor_statue.launchRandomFirework: messageHandler initialized.");
location statue = getLocation(self);
location here = statue;
location here = (location)statue.clone();
here.z = statue.z-30;
location there = utils.getRandomLocationInRing(here, 0, 10);
@@ -1243,7 +1243,7 @@ messageHandler launchRandomNonFactionalFirework()
messageHandler launchFactionalFirework()
{
location statue = getLocation(self);
location here = statue;
location here = (location)statue.clone();
here.z = statue.z-30;
location there = utils.getRandomLocationInRing(here, 0, 10);
@@ -921,7 +921,8 @@ commandHandler eventStorePet()
messageHandler killTargetPlayer()
{
obj_id myTarget = params.getObjId("myTarget");
pclib.killPlayer(myTarget, myTarget);
setPosture(myTarget, POSTURE_INCAPACITATED);
pclib.coupDeGrace(myTarget, myTarget, true, true);
return SCRIPT_CONTINUE;
}
@@ -2622,7 +2622,7 @@ location[] shuffleByIndex(string type, location[] ppl, int idx)
for (int q=0;q<idx;q++)
{
newPpl.addElement(oldPpl[q]);
newPpl.addElement(((location)(oldPpl[q])));
}
}
@@ -3407,4 +3407,4 @@ int getTokenTotal(obj_id player, string token)
}
}
return tokenCount;
}
}
@@ -542,7 +542,7 @@ boolean buildNpcInPlayerStructure(obj_id controller, obj_id owner, string npcTyp
if(where == null)
loc = getLocation(owner);
else
loc = where;
loc = (location)where.clone();
if(loc == null)
{
@@ -637,7 +637,7 @@ messageHandler updateGCWStanding()
trigger OnSkillRevoked(string strSkill)
{
// 2/2006 mhalash: No more armor hindrance
//No more armor hindrance
// armor.calculateArmorHinderances( self );
//cleanup assorted spacequest things if the player is surrendering their novice pilot skill:
if ( strSkill.equals( "pilot_rebel_navy_novice" ) || strSkill.equals( "pilot_imperial_navy_novice" ) || strSkill.equals( "pilot_neutral_novice" ) )
@@ -863,7 +863,7 @@ trigger OnInitialize()
removeObjVar(self, "clickRespec");
removeObjVar(self, "npcRespec");
// 2/2006 mhalash: No more armor hindrance
// No more armor hindrance
// armor.calculateArmorHinderances(self);
// Calculate speed mods for weapon type
@@ -1996,7 +1996,7 @@ trigger OnLogin()
}
}
/* COMMENTED OUT AS PART OF NPE/CLICKY-COMBAT CHANGES -- RcT -- 10/11/05
/* COMMENTED OUT AS PART OF NPE/CLICKY-COMBAT CHANGES
// Force Sensitive Kick off
if (!isJediState(self, JEDI_STATE_FORCE_SENSITIVE) && !isJedi(self))
{
@@ -2245,7 +2245,7 @@ trigger OnLogin()
messageTo(self, "applySmugglingBonuses", null, 1.0f, false);
}
//Update 8 - City Citizen Messages
//City Citizen Messages
int cityId = getCitizenOfCityId(self);
if(cityId > 0 && !utils.hasScriptVar(self, "recieved_city_motd"))
{
@@ -2671,7 +2671,7 @@ trigger OnNewbieTutorialResponse(string action)
//Give everyone the uniform crate
static_item.createNewItemFunction("item_npe_uniform_crate_01_01", objInv);
//11/9: wwallace: changed this to use the library function
//changed this to use the library function
npe.giveProfessionWeapon(self);
@@ -5575,7 +5575,6 @@ commandHandler cmdCorpse()
return SCRIPT_CONTINUE;
/*
// JEFF DOESN'T KNOW WHAT THE FUCK
debugConsoleMsg( self, "*********************** CORPSE\n" );
resizeable obj_id[] movedCorpses = new obj_id[0];
@@ -8596,7 +8595,7 @@ trigger OnSkillGranted(string skillName)
// and "does the player already have it?"
badge.grantMasterSkillBadge( self, skillName );
// 2/2006 mhalash: No more armor hindrance
// No more armor hindrance
// armor.calculateArmorHinderances(self);
//check for worn item effects we may now qualify for
@@ -1130,7 +1130,7 @@ commandHandler cmdFind()
{
min = dist;
locIdx = n;
there = tmpLoc;
there = (location)tmpLoc.clone();
}
}
@@ -1228,7 +1228,7 @@ commandHandler cmdFind()
if ( isIdValid(start.cell) )
start = getBuildingEjectLocation(getTopMostContainer(self));
location destination = there;
location destination = (location)there.clone();
obj_id tId = map_locs[locIdx].getLocationId();
if ( isIdValid(tId) && tId.isLoaded() )
@@ -1243,7 +1243,7 @@ commandHandler cmdFind()
}
if ( destination == null )
destination = there;
destination = (location)there.clone();
//debugSpeakMsg(self, "Attempting to create client path...");
if ( !createClientPath(self, start, destination) )
@@ -4273,7 +4273,7 @@ messageHandler openSparkHandler()
}
location selfLoc = getLocation(self);
location tesla = selfLoc;
location tesla = (location)selfLoc.clone();
tesla.x = -11.7f;
tesla.y = 11.0f;
tesla.z = -64.6f;
@@ -5908,4 +5908,4 @@ int gcwMiniTurretAddBuffHandler(obj_id self, string effectName, string subtype,
int gcwMiniTurretRemoveBuffHandler(obj_id self, string effectName, string subtype, float duration, float value, string buffName, obj_id caster)
{
return SCRIPT_CONTINUE;
}
}
@@ -292,7 +292,7 @@ obj_id createDestructionMissionDataFromLocation(obj_id objMissionData, obj_id ob
if(locGoodLocation != null)
{
locMissionDestination = locGoodLocation; // we can mangle now that its a good loc
locMissionDestination = (location)locGoodLocation.clone(); // we can mangle now that its a good loc
rgnCities = getRegionsWithMunicipalAtPoint(locMissionDestination, regions.MUNI_TRUE); // check the destination
region[] rgnCities2 = getRegionsWithGeographicalAtPoint(locMissionDestination, regions.GEO_CITY);
@@ -488,7 +488,7 @@ obj_id createDestructionMissionDataFromLocation(obj_id objMissionData, obj_id ob
//LOG("mission_spam", "Transferred credits, we should get a callback any minute now");
location locSpawnLocation = locMissionDestination;
location locSpawnLocation = (location)locMissionDestination.clone();
setMissionStartLocation(objMissionData, locSpawnLocation);
@@ -934,7 +934,7 @@ obj_id createDynamicBountyMission(obj_id objMissionData, obj_id objCreator, int
setMissionReward(objMissionData, intReward);
dictionary dctParams = new dictionary();
location locSpawnLocation = locMissionDestination;
location locSpawnLocation = (location)locMissionDestination.clone();
setObjVar(objMissionData, "locSpawnLocation", locSpawnLocation);
@@ -1443,7 +1443,7 @@ void moveMissionStartLocation(obj_id objMission)
location locStartLocation = getLocationObjVar(objMission, "location.locMissionStart");
int intDistance = rand(MIN_DISTANCE_FOR_RETRY, MAX_DISTANCE_FOR_RETRY);
location locNewLocation = locSpawnLocation;
location locNewLocation = (location)locSpawnLocation.clone();
locNewLocation.x = locSpawnLocation.x - locStartLocation.x;
locNewLocation.z = locSpawnLocation.z - locStartLocation.z;
@@ -1457,7 +1457,7 @@ void moveMissionStartLocation(obj_id objMission)
////LOG("missions", "locNewLocation2 is "+locNewLocation);
location locFinalLocation = locSpawnLocation;
location locFinalLocation = (location)locSpawnLocation.clone();
locFinalLocation.x = locSpawnLocation.x + (float) (locNewLocation.x * intDistance);
locFinalLocation.z = locSpawnLocation.z + (float) (locNewLocation.z * intDistance);
@@ -3320,7 +3320,7 @@ obj_id createReconMission(obj_id objMissionData, obj_id objCreator, location loc
return null;
}
location locSpawnLocation = locMissionDestination;
location locSpawnLocation = (location)locMissionDestination.clone();
location locCreator = getMissionLocation(objCreator);
float fltDistance = 0;
@@ -3626,7 +3626,7 @@ obj_id createEscortToCreatorMission(obj_id objMissionData, obj_id objCreator, lo
location locCreatorLocation = getMissionLocation(objCreator);
locEndLocation = locCreatorLocation;
locEndLocation = (location)locCreatorLocation.clone();
if(intDifficulty < ESCORT_DIFFICULTY_EASY)
{
@@ -3755,7 +3755,7 @@ obj_id createEscortTargetMission(obj_id objMissionData, obj_id objCreator, locat
location locCreatorLocation = getMissionLocation(objCreator);
locEndLocation = locCreatorLocation;
locEndLocation = (location)locCreatorLocation.clone();
if(intDifficulty < ESCORT_DIFFICULTY_EASY)
{
@@ -5262,8 +5262,8 @@ location[] getAssassinMissionLocation()
region rgnStartRegion = rgnCities[rand(0, rgnCities.length - 1)];
location locStartLocation = locations.getRegionCenter(rgnStartRegion);
location locSpawnLocation = locations.getGoodCityLocation(rgnStartRegion, strPlanet);
locMissionLocations[0] = locStartLocation;
locMissionLocations[1] = locSpawnLocation;
locMissionLocations[0] = (location)locStartLocation.clone();
locMissionLocations[1] = (location)locSpawnLocation.clone();
return locMissionLocations;
}
@@ -511,7 +511,7 @@ messageHandler probe_Droid_Response()
{
tmpLocation = getLocation(topmost);
}
locSpawnLocation = tmpLocation;
locSpawnLocation = (location)tmpLocation.clone();
}
else
{
@@ -792,7 +792,7 @@ messageHandler moveTarget()
if(fltDistance<128)
{
setObjVar(self, "locSpawnLocation", locDestination);
locSpawnLocation = locDestination;
locSpawnLocation = (location)locDestination.clone();
removeObjVar(self, "locDestination");
}
setupSpawn(self, locSpawnLocation);
@@ -95,8 +95,8 @@ void spawnBithBand (obj_id self)
float bandMemberYaw = webster.getFloat("yaw");
location bandMemberLoc = tempLoc;
location omni_box_loc = tempLoc;
location bandMemberLoc = (location)tempLoc.clone();
location omni_box_loc = (location)tempLoc.clone();
if ( myYaw != 0 )
{
bandMemberLoc = storyteller.rotateLocationXZ(here, tempLoc, myYaw);
@@ -209,7 +209,7 @@ location rotateXZ(location locOrigin, location locPoint, float fltAngle)
float fltC = (float)Math.cos(fltRadians);
float fltS = (float) Math.sin(fltRadians);
location locNewOffset = locOrigin;
location locNewOffset = (location)locOrigin.clone();
locNewOffset.x += (dx * fltC) + (dz * fltS);
locNewOffset.y = locPoint.y;
@@ -2617,30 +2617,30 @@ messageHandler toolMainMenu()
{
case BADGETOOL_MENUOPTION: //Badge tool
// Create a String array that has all badge types in it, with no duplications
Vector vectorMenuArray = new Vector();
vectorMenuArray.addElement("*Add All Badges*");
vectorMenuArray.addElement("*Remove All Badges*");
Vector vectorMenuArray = new Vector();
vectorMenuArray.addElement("*Add All Badges*");
vectorMenuArray.addElement("*Remove All Badges*");
string[] badgeCategories = getAllCollectionSlotCategoriesInBook("badge_book");
if ((badgeCategories != null) && (badgeCategories.length > 0))
string[] badgePages = getAllCollectionPagesInBook("badge_book");
if ((badgePages != null) && (badgePages.length > 0))
{
for (int i = 0; i < badgePages.length; ++i)
{
for (int i = 0; i < badgeCategories.length; ++i)
{
if (badgeCategories[i] != "accumulation")
vectorMenuArray.addElement(badgeCategories[i]);
}
if (!badgePages[i].equals("bdg_accumulation"))
vectorMenuArray.addElement(badgePages[i]);
}
}
String[] badgeMenuArray = new String[vectorMenuArray.size()];
vectorMenuArray.toArray(badgeMenuArray);
String[] badgeMenuArray = new String[vectorMenuArray.size()];
vectorMenuArray.toArray(badgeMenuArray);
utils.setScriptVar(player, "qabadge.mainMenu", badgeMenuArray);
utils.setScriptVar(self, "qabadge.mainMenu", badgeMenuArray);
if (badgeMenuArray.length < 1)
sendSystemMessageTestingOnly(self, "Badge UI creation failed.");
if (badgeMenuArray.length < 1)
sendSystemMessageTestingOnly(self, "Badge UI creation failed.");
utils.setScriptVar(self, "qabadge.mainMenu", badgeMenuArray);
qa.refreshMenu(player, "Choose the Badge", "Badge Granter", badgeMenuArray, "mainMenuOptions", "qabadge.pid", sui.OK_CANCEL_REFRESH);
utils.setScriptVar(self, "qabadge.mainMenu", badgeMenuArray);
qa.refreshMenu(self, "Choose the Badge", "Badge Granter", badgeMenuArray, "mainMenuOptions", "qabadge.pid", sui.OK_CANCEL_REFRESH);
break;
case BUFFTOOL_MENUOPTION: //Buff Tool
string[] allBuffs = dataTableGetStringColumn(BUFF_TABLE, "NAME");
@@ -4609,7 +4609,7 @@ int commandKill(obj_id self, obj_id target)
}
else if (target==self)
{
sendSystemMessageTestingOnly(self,"Kill Command Failed. Cannot Kill self.");
sendSystemMessageTestingOnly(self,"Kill Command Failed. Cannot Kill self. Use /qatool suicide.");
return SCRIPT_CONTINUE;
}
else if (isPlayer(target))