Skip to content

Commit

Permalink
Spelling Corrections.
Browse files Browse the repository at this point in the history 
Patch from forum member Forgon.
Fixes ticket:4617.
  • Loading branch information
@KJeff01
KJeff01 committed Aug 29, 2017
1 parent d67b34e commit 2ce9492
Show file tree
Hide file tree
Showing 125 changed files with 329 additions and 323 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -36,7 +36,7 @@ those bugs we require that you follow these rules:
clicking "Details" in the crash error message)
A self created backtrace is just as useful.
2. Give as much information about what you were doing before the crash/bug
occured.
occurred.
3. Try to reproduce the bug and add a description of the process to your bug-
report.
4. You may even upload save-games. These consist of one or two file(s) and
Expand Down
2 changes: 1 addition & 1 deletion build_tools/autorevision
View file
Expand Up @@ -19,7 +19,7 @@ usage: ./autorevision {-t output-type | -s symbol} [-o cache-file [-f] ] [-V]
-V = emit version and exit
-? = help message
The folowing are valid output types:
The following are valid output types:
h = Header for use with c/c++
xcode = Header useful for populating info.plist files
sh = Bash sytax
Expand Down
2 changes: 1 addition & 1 deletion data/base/messages/strings/names.txt
View file
Expand Up @@ -432,7 +432,7 @@ R-Wpn-MissileSlow-Damage03 _("HEAP Missile Warhead Mk3")
R-Wpn-MissileSlow-ROF01 _("Improved Missile Loading System")

//R-Wpn-Missile-ASM-AT "*Missile-ASM-AT*"
//R-Wpn-Misisile-ASM-BB _("Devastator Missile")
//R-Wpn-Missile-ASM-BB _("Devastator Missile")
//R-Wpn-Missile-SAM "*R-Wpn-Missile-SAM*"


Expand Down
2 changes: 1 addition & 1 deletion data/base/messages/strings/resstrings.txt
View file
Expand Up @@ -863,7 +863,7 @@ RES_W_MG_ROF2_MSG4 _("All machineguns upgraded automatically")

//R-Wpn-Missile-ASM-AT Scourge Missile

//R-Wpn-Misisile-ASM-BB Devastator Missile
//R-Wpn-Missile-ASM-BB Devastator Missile

//R-Wpn-Missile-LtSAM Avenger SAM

Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam2-1x.js
View file
Expand Up @@ -117,7 +117,7 @@ function updateTransportUnits()
preDamageUnits();
}

//Checks if the downed tranport has been destroyed and issues a game lose. This
//Checks if the downed transport has been destroyed and issues a game lose. This
//likely will never happen as with the WZ Script version.
function checkCrashedTeam()
{
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam2-a.js
View file
Expand Up @@ -66,7 +66,7 @@ function getDroidsForCOLZ()
return droids;
}

//Send Collective tranport units
//Send Collective transport units
function sendCOTransporter()
{
var tPos = getObject("COTransportPos");
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam2-end.js
View file
Expand Up @@ -75,7 +75,7 @@ function eventMissionTimeout()
camCallOnce("playLastVideo");
}

// Allow win if at least one tranport launched.
// Allow win if at least one transport launched.
function eventTransporterLaunch(transport)
{
if (transport.player === CAM_HUMAN_PLAYER)
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/data/cam3a-d1.vlo
View file
Expand Up @@ -59,7 +59,7 @@ LZX[1] int 9 //coords of Gamma base LZ in tile units
LZY[1] int 184
*/
ReinforceTime INT -1 //-1 for no reinforcements
timeLimit INT 72000 //2hrs for no time limit (needs to be done if previous misison had a time limit!)
timeLimit INT 72000 //2hrs for no time limit (needs to be done if previous mission had a time limit!)
//noTimeLimit BOOL TRUE //don't use time limit as a fail in GenExp

/* Transport exit and entry */
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/data/cam3a-d2.vlo
View file
Expand Up @@ -55,7 +55,7 @@ LZX[1] int 56 //coords of LZ in tile units
LZY[1] int 120

ReinforceTime INT -1 //-1 for no reinforcements
timeLimit INT 3000 //5mins for no time limit (needs to be done if previous misison had a time limit!)
timeLimit INT 3000 //5mins for no time limit (needs to be done if previous mission had a time limit!)
//noTimeLimit BOOL TRUE //don't use time limit as a fail in GenExp

/* Transport exit and entry */
Expand Down
8 changes: 4 additions & 4 deletions data/base/script/text/genexp.slo
View file
Expand Up @@ -1038,7 +1038,7 @@ event sectorGroups(sectorGroupsTrig)
resetStructTargets();
if (random(100) < 10)
{
setStructTarPref(ST_WALL); //pick walls occassionally
setStructTarPref(ST_WALL); //pick walls occasionally
}
hitStruc = structTargetInArea(player, grpPlayer[count], grpGroup[count].x - targetRange, grpGroup[count].y - targetRange,
grpGroup[count].x + targetRange, grpGroup[count].y + targetRange);
Expand Down Expand Up @@ -1155,7 +1155,7 @@ event targetGroups(targetGroupsTrig)
resetStructTargets();
if (random(100) < 10)
{
setStructTarPref(ST_WALL); //pick walls occassionally
setStructTarPref(ST_WALL); //pick walls occasionally
}
hitStruc = structTargetInArea(player, grpPlayer[count2], grpGroup[count2].x - targetRange, grpGroup[count2].y - targetRange,
grpGroup[count2].x + targetRange, grpGroup[count2].y + targetRange);
Expand Down Expand Up @@ -1703,7 +1703,7 @@ event buildDerrick(inactive) //only used if trucks found!
{
tempX = feature.x;
tempY = feature.y;
orderDroidStatsLoc(testDroid, DORDER_BUILD, strucStat[1], tempX, tempY); //build a derick
orderDroidStatsLoc(testDroid, DORDER_BUILD, strucStat[1], tempX, tempY); //build a derrick
testDroid = NULLOBJECT;
}
else
Expand Down Expand Up @@ -1829,7 +1829,7 @@ event sensorTarget(every, 67)
resetStructTargets();
if (random(100) < 10)
{
setStructTarPref(ST_WALL); //pick walls occassionally
setStructTarPref(ST_WALL); //pick walls occasionally
}
hitStruc = structTargetInArea(player, droids[count].player, droids[count].x - 768, droids[count].y - 768, droids[count].x + 768, droids[count].y + 768);
if (hitStruc != NULLOBJECT)
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/text/reinforcement.slo
View file
Expand Up @@ -77,7 +77,7 @@ event loadTrans(inactive)
//counts how many transport loads the player has brought in
event countReinforcements(CALL_TRANSPORTER_LANDED, playerGroup, transPlayer)
{
// count how many times the player's tranpsorter has landed
// count how many times the player's transporter has landed
if (transPlayer == player)
{
transCount = transCount + 1;
Expand Down
4 changes: 2 additions & 2 deletions data/base/script/text/tutorial3.slo
View file
Expand Up @@ -644,7 +644,7 @@ event researchCentreBuilt(CALL_RESEARCH_BUILT)
// Wait
pause(30);

// PlaySound "to resarch the artefact.."
// PlaySound "to research the artefact.."
playSound(SND_TUT22,0);

// Set the event that catches this
Expand Down Expand Up @@ -722,7 +722,7 @@ event researchCompleted(CALL_RESEARCHCOMPLETED, ref researchDone, ref structure,
// Flash Icon
flashOn(IDRET_DESIGN);

// PlaySound "Left click the deisgn icon"
// PlaySound "Left click the design icon"
playSound(SND_TUT29,0);

pause(30);
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/text/vtols.slo
View file
Expand Up @@ -181,7 +181,7 @@ event targetFound(CALL_OBJ_SEEN, padPlayer, ref targetObj, ref viewerObj)
{
attackCluster[group] = targetObj.clusterID;
// clusterID can be 0 for droids - especially near start
// when they havn't moved yet
// when they haven't moved yet
if (attackCluster[group] != 0)
{
targetObj2 = targetInCluster(targetObj.clusterID, padPlayer);
Expand Down
2 changes: 1 addition & 1 deletion data/base/script/text/vtols2.slo
View file
Expand Up @@ -154,7 +154,7 @@ event targetFound(CALL_OBJ_SEEN, padPlayer, ref targetObj, ref viewerObj)
{
attackCluster[group] = targetObj.clusterID;
// clusterID can be 0 for droids - especially near start
// when they havn't moved yet
// when they haven't moved yet
if (attackCluster[group] != 0)
{
targetObj2 = targetInCluster(targetObj.clusterID, padPlayer);
Expand Down
2 changes: 1 addition & 1 deletion data/base/shaders/tcmask.vert
View file
Expand Up @@ -29,7 +29,7 @@ void main()
lightDir = lightPosition.xyz - vVertex;
eyeVec = -vVertex;

// Implement building stretching to accomodate terrain
// Implement building stretching to accommodate terrain
if (vertex.y <= 0.0) // use vertex here directly to help shader compiler optimization
{
position.y -= stretch;
Expand Down
2 changes: 1 addition & 1 deletion data/mp/messages/strings/names.txt
View file
Expand Up @@ -543,7 +543,7 @@ R-Wpn-MissileSlow-Damage03 _("HEAP Missile Warhead Mk3")
R-Wpn-MissileSlow-ROF01 _("Improved Missile Loading System")

//R-Wpn-Missile-ASM-AT "*Missile-ASM-AT*"
//R-Wpn-Misisile-ASM-BB _("Devastator Missile")
//R-Wpn-Missile-ASM-BB _("Devastator Missile")
//R-Wpn-Missile-SAM "*R-Wpn-Missile-SAM*"


Expand Down
10 changes: 5 additions & 5 deletions data/mp/multiplay/skirmish/nb_rulesets/standard.js
View file
Expand Up @@ -300,7 +300,7 @@ const weaponStats = {
],
extras: [
"R-Wpn-Cannon-ROF06",
"R-Vehicle-Engine09", // cannons are heeeeavy
"R-Vehicle-Engine09", // cannons are heavy
"R-Wpn-Rail-Damage03", // sure it's required by gauss, but what if our AI uses only cyborgs and vtols?
"R-Wpn-Rail-ROF03",
],
Expand Down Expand Up @@ -360,17 +360,17 @@ const weaponStats = {
micro: MICRO.DUMB,
weapons: [
{ res: "R-Wpn-Mortar01Lt", stat: "Mortar1Mk1", weight: WEIGHT.HEAVY }, // duplicate stat!
{ res: "R-Wpn-Mortar-Incenediary", stat: "Mortar-Incenediary", weight: WEIGHT.HEAVY },
{ res: "R-Wpn-Howitzer-Incenediary", stat: "Howitzer-Incenediary", weight: WEIGHT.ULTRAHEAVY },
{ res: "R-Wpn-Mortar-Incendiary", stat: "Mortar-Incendiary", weight: WEIGHT.HEAVY },
{ res: "R-Wpn-Howitzer-Incendiary", stat: "Howitzer-Incendiary", weight: WEIGHT.ULTRAHEAVY },
],
vtols: [
{ res: "R-Wpn-Bomb03", stat: "Bomb3-VTOL-LtINC", weight: WEIGHT.LIGHT },
{ res: "R-Wpn-Bomb04", stat: "Bomb4-VTOL-HvyINC", weight: WEIGHT.HEAVY },
{ res: "R-Wpn-Bomb05", stat: "Bomb5-VTOL-Plasmite", weight: WEIGHT.HEAVY },
],
defenses: [
{ res: "R-Defense-MortarPit-Incenediary", stat: "Emplacement-MortarPit-Incenediary", defrole: DEFROLE.STANDALONE },
{ res: "R-Defense-Howitzer-Incenediary", stat: "Emplacement-Howitzer-Incenediary", defrole: DEFROLE.ARTY },
{ res: "R-Defense-MortarPit-Incendiary", stat: "Emplacement-MortarPit-Incendiary", defrole: DEFROLE.STANDALONE },
{ res: "R-Defense-Howitzer-Incendiary", stat: "Emplacement-Howitzer-Incendiary", defrole: DEFROLE.ARTY },
],
templates: [],
extras: [
Expand Down
36 changes: 18 additions & 18 deletions data/mp/multiplay/skirmish/nexus.slo
View file
Expand Up @@ -98,7 +98,7 @@ public STRUCTURESTAT vtolTarget[10],rebuildStat[TECHS][2];
private int baseX,baseY,minx,miny,maxx,maxy;
public int numStructs,numIncendrys,numDefStructs,numExtraStructs[TECHS],numWallWeaps,numBaseStruct,numLightCyborgs,numFundamental;
private STRUCTURESTAT structChoice[5];
public STRUCTURESTAT incendrys[8],structs[13],defStructs[26],extraStructs[TECHS][6],wallWeaps[11];
public STRUCTURESTAT incendiaries[8],structs[13],defStructs[26],extraStructs[TECHS][6],wallWeaps[11];
public STRUCTURESTAT sensorTower,wall,cornerWall,resLab,powGen,playerHQ,lassat,factory,derrick,cybFactory,
vtolDefStruct[5],vtolPad,vtolFactory,uplink,baseStruct[8];
public STRUCTURESTAT powModule,facModule,resModule,vtolModule;
Expand Down Expand Up @@ -183,7 +183,7 @@ trigger repairDroidsTr (every, 2600);
trigger basedetailsTr (every, 600 );
trigger buildDerrickTr (every, 80 );
trigger buildOilDefenseOrRetreatTr (every, 120 );
trigger incendryTr (every, 250 );
trigger incendiaryTr (every, 250 );
trigger buildPowerGeneratorsTr (every, 80 );
trigger buildBaseTr (every, 150 );
trigger finishStructsTr (every, 210);
Expand Down Expand Up @@ -611,7 +611,7 @@ function bool aiResponsibleForPlayer(int _player)
}

/////////////////////////////////////////////////////////////////////
// keep details about the size and postion of the ai players base
// keep details about the size and position of the ai players base
event basedetails(basedetailsTr)
{
// clear old extremities.
Expand Down Expand Up @@ -738,7 +738,7 @@ event buildDerrick(buildDerrickTr)
}
if (_closestOil != NULLOBJECT)
{
orderDroidStatsLoc(droid, DORDER_BUILD, derrick, _closestOil.x, _closestOil.y); // build a derick
orderDroidStatsLoc(droid, DORDER_BUILD, derrick, _closestOil.x, _closestOil.y); // build a derrick
if (idleGroup(buildGroup) > 0)
{
setEventTrigger(buildDerrick, slowloadTr); // do it again for next droid
Expand Down Expand Up @@ -843,7 +843,7 @@ event buildOilDefenseOrRetreat(buildOilDefenseOrRetreatTr)

/////////////////////////////////////////////////////////////////////
//mortar etc.. rules. build sensor towers and emplacements.
event incendry(incendryTr)
event incendiary(incendiaryTr)
{
if (not isStructureAvailable(sensorTower, me))
{
Expand Down Expand Up @@ -926,7 +926,7 @@ event incendry(incendryTr)
}
else
{
// find a sensor tower with least incencdry structs around it..
// find a sensor tower with least incendiary structs around it..
buildX = 0;
buildY = 0;

Expand All @@ -935,12 +935,12 @@ event incendry(incendryTr)
count = 999;
while(structure != NULLOBJECT)
{
// count incendrys near this tower.
// count incendiaries near this tower.
result = 0;
count2 = 0;
while(count2 < numIncendrys)
{
structure2 = structureBuiltInRange(incendrys[count2], structure.x, structure.y,(4*128), me);
structure2 = structureBuiltInRange(incendiaries[count2], structure.x, structure.y,(4*128), me);
if(structure2 != NULLOBJECT)
{
result = result + 1;
Expand All @@ -965,7 +965,7 @@ event incendry(incendryTr)
result = 99;
while(count >= 0 )
{
if(isStructureAvailable(incendrys[count],me))
if(isStructureAvailable(incendiaries[count],me))
{
result = count;
count = -1;
Expand All @@ -977,22 +977,22 @@ event incendry(incendryTr)
}


// find a unit and build an incendry device.
// find a unit and build an incendiary device.
if(result != 99)
{
boolResult = pickStructLocation(incendrys[result], ref buildX, ref buildY,me); // pick spot.
boolResult = pickStructLocation(incendiaries[result], ref buildX, ref buildY,me); // pick spot.
if(boolResult == TRUE)
{
initIterateGroup(buildGroup);
droid = iterateGroup(buildGroup);

boolResult = (numBuildSameBuilding(incendrys[result], buildX, buildY) > 0); //anyone building there already?
boolResult = (numBuildSameBuilding(incendiaries[result], buildX, buildY) > 0); //anyone building there already?

while(droid != NULLOBJECT and (not boolResult))
{
if ((droid.order == DORDER_NONE or droid.order == DORDER_RTB) and droidCanReach(droid, buildX, buildY))
{
orderDroidStatsLoc(droid, DORDER_BUILD,incendrys[result], buildX,buildY);
orderDroidStatsLoc(droid, DORDER_BUILD,incendiaries[result], buildX,buildY);
boolResult = TRUE; //only 1 truck
}
droid = iterateGroup(buildGroup);
Expand Down Expand Up @@ -1310,7 +1310,7 @@ event newfortify(fortifyTr)
{
if (droid.order != DORDER_BUILD and droid.order != DORDER_LINEBUILD and droid.order != DORDER_HELPBUILD)
{
boolResult = TRUE; // dont do this again!
boolResult = TRUE; // don't do this again!

tempx = baseX;
tempy = baseY;
Expand Down Expand Up @@ -2491,7 +2491,7 @@ event difficultyModifier(difficultyModifierTr)
/////////////////////////////////////////////////////////////////////
// vtols.
/////////////////////////////////////////////////////////////////////
// build vtol strucutures.
// build vtol structures.
event vtolStructs(inactive)
{
local int _numVtolFacs,_numRearmPads;
Expand Down Expand Up @@ -3015,7 +3015,7 @@ function void shutDownAI()
setEventTrigger(basedetails, inactive);
setEventTrigger(buildDerrick, inactive);
setEventTrigger(buildOilDefenseOrRetreat, inactive);
setEventTrigger(incendry, inactive);
setEventTrigger(incendiary, inactive);
setEventTrigger(buildPowerGenerators, inactive);
setEventTrigger(buildBase, inactive);
setEventTrigger(buildExpand,inactive);
Expand Down Expand Up @@ -3071,7 +3071,7 @@ function void reassignAI()
setEventTrigger(basedetails,basedetailsTr);
setEventTrigger(buildDerrick,buildDerrickTr);
setEventTrigger(buildOilDefenseOrRetreat,buildOilDefenseOrRetreatTr);
setEventTrigger(incendry,incendryTr);
setEventTrigger(incendiary,incendiaryTr);
setEventTrigger(buildPowerGenerators,buildPowerGeneratorsTr);
setEventTrigger(buildBase,buildBaseTr );
setEventTrigger(buildExpand,buildExpandTr );
Expand Down Expand Up @@ -3350,7 +3350,7 @@ function void helpPlayer(int _playerToHelp, int _helpX, int _helpY)
defendLocation(_helpX, _helpY, tHelpTimeout, (_playerToHelp == me));
}

/* Returns a random affirmative responce */
/* Returns a random affirmative response */
function string m_affirmative()
{
local int _rnd;
Expand Down
18 changes: 9 additions & 9 deletions data/mp/multiplay/skirmish/nexus.vlo
View file
Expand Up @@ -104,16 +104,16 @@ run
maxVTOLs[0] int 5
maxVTOLs[1] int 70

// incendry emplacements.
// incendiary emplacements.
numIncendrys int 8
incendrys[0] STRUCTURESTAT "Emplacement-MortarPit01"
incendrys[1] STRUCTURESTAT "Emplacement-MortarPit02"
incendrys[2] STRUCTURESTAT "Emplacement-MortarPit-Incenediary"
incendrys[3] STRUCTURESTAT "Emplacement-RotMor"
incendrys[4] STRUCTURESTAT "Emplacement-Howitzer105"
incendrys[5] STRUCTURESTAT "Emplacement-Howitzer150"
incendrys[6] STRUCTURESTAT "Emplacement-Howitzer-Incenediary"
incendrys[7] STRUCTURESTAT "Emplacement-RotHow"
incendiaries[0] STRUCTURESTAT "Emplacement-MortarPit01"
incendiaries[1] STRUCTURESTAT "Emplacement-MortarPit02"
incendiaries[2] STRUCTURESTAT "Emplacement-MortarPit-Incendiary"
incendiaries[3] STRUCTURESTAT "Emplacement-RotMor"
incendiaries[4] STRUCTURESTAT "Emplacement-Howitzer105"
incendiaries[5] STRUCTURESTAT "Emplacement-Howitzer150"
incendiaries[6] STRUCTURESTAT "Emplacement-Howitzer-Incendiary"
incendiaries[7] STRUCTURESTAT "Emplacement-RotHow"

//anti a.
vtolDefStruct[0] STRUCTURESTAT "AASite-QuadMg1" //1
Expand Down

0 comments on commit 2ce9492

Please sign in to comment.