Skip to content

Commit

Permalink
Scavenger stat naming consistency for base.
Browse files Browse the repository at this point in the history 
Scavenger stats follow a similar naming convention.

Closes ticket:4674. Changes from forum member Hironaru.
  • Loading branch information
@KJeff01
KJeff01 committed Nov 27, 2017
1 parent 6e0a611 commit 25de299
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion data/base/script/campaign/cam2-c.js
View file
Expand Up @@ -149,7 +149,7 @@ function captureCivilians()
for (var i = 0; i < num; ++i) for (var i = 0; i < num; ++i)
{ {
addDroid(CIVILIAN, currPos.x, currPos.y, "Civilian", addDroid(CIVILIAN, currPos.x, currPos.y, "Civilian",
"B1BaBaPerson01", "BaBaLegs", "", "", "BaBaMG"); "B1BaBaPerson01", "BaBaLegs", "", "", "BabaMG");
} }


//Only count civilians that are not in the the transporter base. //Only count civilians that are not in the the transporter base.
Expand Down
12 changes: 6 additions & 6 deletions data/base/script/campaign/templates.js
View file
Expand Up @@ -2,10 +2,10 @@ var camTemplates = {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////


// CAM_1A // CAM_1A
bloke: { body: "B1BaBaPerson01", prop: "BaBaLegs", weap: "BaBaMG" }, bloke: { body: "B1BaBaPerson01", prop: "BaBaLegs", weap: "BabaMG" },
trike: { body: "B4body-sml-trike01", prop: "BaBaProp", weap: "bTrikeMG" }, trike: { body: "B4body-sml-trike01", prop: "BaBaProp", weap: "BabaTrikeMG" },
buggy: { body: "B3body-sml-buggy01", prop: "BaBaProp", weap: "BuggyMG" }, buggy: { body: "B3body-sml-buggy01", prop: "BaBaProp", weap: "BabaBuggyMG" },
bjeep: { body: "B2JeepBody", prop: "BaBaProp", weap: "BJeepMG" }, bjeep: { body: "B2JeepBody", prop: "BaBaProp", weap: "BabaJeepMG" },


// SUB_1_2 // SUB_1_2
rbjeep: { body: "B2RKJeepBody", prop: "BaBaProp", weap: "BabaRocket" }, rbjeep: { body: "B2RKJeepBody", prop: "BaBaProp", weap: "BabaRocket" },
Expand All @@ -18,8 +18,8 @@ npsmc: { body: "Body8MBT", prop: "HalfTrack", weap: "Cannon2A-TMk1" },


// CAM_1C // CAM_1C
npsens: { body: "Body4ABT", prop: "wheeled01", weap: "SensorTurret1Mk1" }, npsens: { body: "Body4ABT", prop: "wheeled01", weap: "SensorTurret1Mk1" },
buscan: { body: "BusBody", prop: "BaBaProp", weap: "BusCannon" }, buscan: { body: "BusBody", prop: "BaBaProp", weap: "BabaBusCannon" },
firecan: { body: "FireBody", prop: "BaBaProp", weap: "BusCannon" }, firecan: { body: "FireBody", prop: "BaBaProp", weap: "BabaBusCannon" },
npslc: { body: "Body8MBT", prop: "HalfTrack", weap: "Cannon1Mk1" }, npslc: { body: "Body8MBT", prop: "HalfTrack", weap: "Cannon1Mk1" },
npmor: { body: "Body8MBT", prop: "HalfTrack", weap: "Mortar1Mk1" }, npmor: { body: "Body8MBT", prop: "HalfTrack", weap: "Mortar1Mk1" },
npsmct: { body: "Body8MBT", prop: "tracked01", weap: "Cannon2A-TMk1" }, npsmct: { body: "Body8MBT", prop: "tracked01", weap: "Cannon2A-TMk1" },
Expand Down
6 changes: 3 additions & 3 deletions data/base/stats/structure.json
View file
Expand Up @@ -100,7 +100,7 @@
], ],
"type": "DEFENSE", "type": "DEFENSE",
"weapons": [ "weapons": [
"BuggyMG" "BabaTowerMG"
], ],
"width": 1 "width": 1
}, },
Expand All @@ -122,7 +122,7 @@
], ],
"type": "DEFENSE", "type": "DEFENSE",
"weapons": [ "weapons": [
"BuggyMG" "BabaTowerMG"
], ],
"width": 1 "width": 1
}, },
Expand Down Expand Up @@ -267,7 +267,7 @@
], ],
"type": "DEFENSE", "type": "DEFENSE",
"weapons": [ "weapons": [
"BaBaCannon" "BabaCannon"
], ],
"width": 1 "width": 1
}, },
Expand Down
12 changes: 6 additions & 6 deletions data/base/stats/templates.json
View file
Expand Up @@ -43,7 +43,7 @@
"propulsion": "BaBaLegs", "propulsion": "BaBaLegs",
"type": "PERSON", "type": "PERSON",
"weapons": [ "weapons": [
"BaBaMG" "BabaMG"
] ]
}, },
"BabaBusCan": { "BabaBusCan": {
Expand All @@ -53,7 +53,7 @@
"propulsion": "BaBaProp", "propulsion": "BaBaProp",
"type": "DROID", "type": "DROID",
"weapons": [ "weapons": [
"BusCannon" "BabaBusCannon"
] ]
}, },
"BabaFireCan": { "BabaFireCan": {
Expand All @@ -63,7 +63,7 @@
"propulsion": "BaBaProp", "propulsion": "BaBaProp",
"type": "DROID", "type": "DROID",
"weapons": [ "weapons": [
"BusCannon" "BabaBusCannon"
] ]
}, },
"BabaFireTruck": { "BabaFireTruck": {
Expand All @@ -83,7 +83,7 @@
"propulsion": "BaBaProp", "propulsion": "BaBaProp",
"type": "DROID", "type": "DROID",
"weapons": [ "weapons": [
"BJeepMG" "BabaJeepMG"
] ]
}, },
"BabaPickUp": { "BabaPickUp": {
Expand All @@ -110,7 +110,7 @@
"propulsion": "BaBaProp", "propulsion": "BaBaProp",
"type": "DROID", "type": "DROID",
"weapons": [ "weapons": [
"BuggyMG" "BabaBuggyMG"
] ]
}, },
"BarbarianRKBuggy": { "BarbarianRKBuggy": {
Expand All @@ -130,7 +130,7 @@
"propulsion": "BaBaProp", "propulsion": "BaBaProp",
"type": "DROID", "type": "DROID",
"weapons": [ "weapons": [
"bTrikeMG" "BabaTrikeMG"
] ]
}, },
"CO-H-COM-H": { "CO-H-COM-H": {
Expand Down
32 changes: 16 additions & 16 deletions data/base/stats/weapons.json
View file
Expand Up @@ -42,7 +42,7 @@
"weaponWav": "medcan.ogg", "weaponWav": "medcan.ogg",
"weight": 10000 "weight": 10000
}, },
"BJeepMG": { "BabaJeepMG": {
"buildPoints": 16, "buildPoints": 16,
"buildPower": 4, "buildPower": 4,
"damage": 14, "damage": 14,
Expand All @@ -53,7 +53,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXMETHIT.PIE", "hitGfx": "FXMETHIT.PIE",
"hitpoints": 1, "hitpoints": 1,
"id": "BJeepMG", "id": "BabaJeepMG",
"longHit": 50, "longHit": 50,
"longRange": 960, "longRange": 960,
"maxElevation": 90, "maxElevation": 90,
Expand All @@ -73,18 +73,18 @@
"weaponWav": "mgbar2.ogg", "weaponWav": "mgbar2.ogg",
"weight": 1 "weight": 1
}, },
"BTowerMG": { "BabaTowerMG": {
"buildPoints": 16, "buildPoints": 16,
"buildPower": 12, "buildPower": 12,
"damage": 16, "damage": 16,
"effectSize": 100, "effectSize": 100,
"facePlayer": 1, "facePlayer": 1,
"firePause": 5, "firePause": 5,
"flightGfx": "FXTracRD.PIE", "flightGfx": "FXTracer.PIE",
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXMETHIT.PIE", "hitGfx": "FXMETHIT.PIE",
"hitpoints": 1, "hitpoints": 1,
"id": "BTowerMG", "id": "BabaTowerMG",
"longHit": 50, "longHit": 50,
"longRange": 960, "longRange": 960,
"maxElevation": 90, "maxElevation": 90,
Expand All @@ -101,10 +101,10 @@
"weaponClass": "KINETIC", "weaponClass": "KINETIC",
"weaponEffect": "ANTI PERSONNEL", "weaponEffect": "ANTI PERSONNEL",
"weaponSubClass": "MACHINE GUN", "weaponSubClass": "MACHINE GUN",
"weaponWav": "mgtower.ogg", "weaponWav": "mgbar2.ogg",
"weight": 1 "weight": 1
}, },
"BaBaCannon": { "BabaCannon": {
"buildPoints": 10, "buildPoints": 10,
"buildPower": 10, "buildPower": 10,
"damage": 28, "damage": 28,
Expand All @@ -116,7 +116,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXGRDexl.PIE", "hitGfx": "FXGRDexl.PIE",
"hitpoints": 10, "hitpoints": 10,
"id": "BaBaCannon", "id": "BabaCannon",
"lightWorld": 1, "lightWorld": 1,
"longHit": 40, "longHit": 40,
"longRange": 960, "longRange": 960,
Expand All @@ -137,7 +137,7 @@
"weaponWav": "smlcan.ogg", "weaponWav": "smlcan.ogg",
"weight": 10 "weight": 10
}, },
"BaBaMG": { "BabaMG": {
"buildPoints": 1, "buildPoints": 1,
"buildPower": 1, "buildPower": 1,
"damage": 10, "damage": 10,
Expand All @@ -148,7 +148,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXMETHIT.PIE", "hitGfx": "FXMETHIT.PIE",
"hitpoints": 1, "hitpoints": 1,
"id": "BaBaMG", "id": "BabaMG",
"longHit": 40, "longHit": 40,
"longRange": 960, "longRange": 960,
"maxElevation": 90, "maxElevation": 90,
Expand Down Expand Up @@ -478,7 +478,7 @@
"weaponWav": "hwtzflgt.ogg", "weaponWav": "hwtzflgt.ogg",
"weight": 9000 "weight": 9000
}, },
"BuggyMG": { "BabaBuggyMG": {
"buildPoints": 11, "buildPoints": 11,
"buildPower": 3, "buildPower": 3,
"damage": 16, "damage": 16,
Expand All @@ -489,7 +489,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXMETHIT.PIE", "hitGfx": "FXMETHIT.PIE",
"hitpoints": 1, "hitpoints": 1,
"id": "BuggyMG", "id": "BabaBuggyMG",
"longHit": 50, "longHit": 50,
"longRange": 960, "longRange": 960,
"maxElevation": 90, "maxElevation": 90,
Expand All @@ -509,7 +509,7 @@
"weaponWav": "mgbar2.ogg", "weaponWav": "mgbar2.ogg",
"weight": 1 "weight": 1
}, },
"BusCannon": { "BabaBusCannon": {
"buildPoints": 10, "buildPoints": 10,
"buildPower": 10, "buildPower": 10,
"damage": 28, "damage": 28,
Expand All @@ -521,7 +521,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXGRDexl.PIE", "hitGfx": "FXGRDexl.PIE",
"hitpoints": 10, "hitpoints": 10,
"id": "BusCannon", "id": "BabaBusCannon",
"lightWorld": 1, "lightWorld": 1,
"longHit": 50, "longHit": 50,
"longRange": 960, "longRange": 960,
Expand Down Expand Up @@ -3325,7 +3325,7 @@
"weaponEffect": "ANTI PERSONNEL", "weaponEffect": "ANTI PERSONNEL",
"weaponSubClass": "MACHINE GUN" "weaponSubClass": "MACHINE GUN"
}, },
"bTrikeMG": { "BabaTrikeMG": {
"buildPoints": 11, "buildPoints": 11,
"buildPower": 2, "buildPower": 2,
"damage": 13, "damage": 13,
Expand All @@ -3336,7 +3336,7 @@
"flightSpeed": 1000, "flightSpeed": 1000,
"hitGfx": "FXMETHIT.PIE", "hitGfx": "FXMETHIT.PIE",
"hitpoints": 1, "hitpoints": 1,
"id": "bTrikeMG", "id": "BabaTrikeMG",
"longHit": 50, "longHit": 50,
"longRange": 960, "longRange": 960,
"maxElevation": 90, "maxElevation": 90,
Expand Down

1 comment on commit 25de299

@SteveStaubach
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woot!

Thank you for considering and approving these changes. As we move forward in project bomb, I will try to find other ways we can organize data to make it either more consistent or easier to read.

Please sign in to comment.