Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@DARwins1
DARwins1 committed Oct 15, 2023
1 parent 1c5a05c commit 28ddfa1
Show file tree
Hide file tree
Showing 24 changed files with 1,003 additions and 563 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
View file

This file was deleted.

16 changes: 16 additions & 0 deletions Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
v1.0.5
- Replaced the objectively terrible Hyper Velocity Cannon and Tank Killer Emplacements with cooler bunker versions.
- Un-banished the Lancer Bunker from the void.
- Widened a bunch of chokepoints and high-traffic areas.
- Assault Cannon and Hyper Velocity Cannon weights have been swapped.
- Royalists now prefer the Hyper Velocity Cannon for hover units.
- Royalists now prefer the Assault Cannon for tracked units.
- Added an extra pathway to the Royalist main base.
- The Resistance now properly cover up any evidence of having Sarissas when allied.
- Tweaked the Command Turret's visual effects.
- Added a warning transmission about crossing the Hellraiser bridge too early.
- Fixed some typos in various transmissions.
- Made the Super Auto-Cannon Cyborg's weapon actually look like the Assault Cannon, instead of the Hyper Velocity Cannon.
- Made cyborg weapons in the research menu display the actual cyborg weapon.
- Allying with a faction will grant (a brief) vision of all their units and structures.

v1.0.4
- Fixed some Royalist VTOL CB towers being incorrectly rebuilt as VTOL Strike towers when destroyed.
- Fixed transports flying back and forth forever when an LZ is destroyed while a transport is en route.
Expand Down
144 changes: 85 additions & 59 deletions components/weapons/sc_asscn.pie
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PIE 2
TYPE 10200
TEXTURE 0 page-17-droid-weapons.png 256 256
TEXTURE 0 page-17-droid-weapons.png 0 0
LEVELS 1
LEVEL 1
POINTS 34
POINTS 47
55 -21 3
39 -6 15
33 2 -4
Expand All @@ -15,30 +15,43 @@ POINTS 34
50 -22 0
57 -16 0
45 -4 7
2 0 -14
-4 6 -9
-4 6 -41
2 0 -41
-11 0 -4
-11 0 -41
-4 -6 -9
-4 -6 -41
-6 26 5
-13 24 7
-12 22 -5
-5 25 -7
-10 7 -6
1 11 -9
-11 10 9
1 13 6
1 -17 21
1 -13 -13
-10 -9 -6
-11 -14 20
1 15 21
1 11 -13
-11 12 20
POLYGONS 44
-2.1306 0.7528 -17.2083
-5.7306 -2.8472 -17.2083
-5.7306 -2.8472 -39.7083
-2.1306 0.7528 -39.7083
-10.2306 0.7528 -17.2083
-10.2306 0.7528 -39.7083
-5.7306 4.3528 -17.2083
-5.7306 4.3528 -39.7083
-1.2306 5.2528 -17.2083
-1.2306 -3.7472 -17.2083
-10.2306 -3.7472 -17.2083
-10.2306 5.2528 -17.2083
-10.2306 -3.7472 -10.0083
-10.2306 5.2528 -10.0083
1.4695 14.2528 15.1917
1.4695 -13.6472 15.1917
1.4694 -10.0472 -17.2083
1.4694 11.5528 -17.2083
-11.1306 16.9528 -9.1083
-11.1306 18.7528 1.6917
-4.8306 21.4528 0.7917
-3.9306 19.6528 -11.8083
1.4694 11.5528 -12.7083
-10.2306 4.3528 -10.0083
-10.2306 6.1528 3.4917
1.4694 13.3528 0.7917
-10.2306 -3.7472 -10.0083
-11.1305 -5.5472 13.3917
-11.1305 7.0528 13.3917
1.4694 11.5528 -13.6083
-10.2306 16.0528 -9.1083
-10.2306 7.0528 13.3917
1.4694 12.4528 0.7917
-10.2306 5.2528 2.5917
1.4694 11.5528 -11.8083
1.4694 12.4528 -4.6083
POLYGONS 57
200 3 0 1 2 133 255 149 255 149 240
200 3 0 2 3 133 255 149 240 133 240
200 3 3 2 1 133 240 149 240 149 255
Expand All @@ -51,37 +64,50 @@ POLYGONS 44
200 3 6 9 10 16 142 2 148 16 148
200 3 10 9 8 16 148 2 148 2 142
200 3 10 8 6 16 148 2 142 16 142
200 3 14 13 12 96 73 102 73 102 63
200 3 14 12 11 96 73 102 63 96 64
200 3 13 16 15 96 73 102 73 102 62
200 3 13 15 12 96 73 102 62 96 63
200 3 16 18 17 96 73 102 73 102 63
200 3 16 17 15 96 73 102 63 96 62
200 3 18 14 11 96 73 102 73 102 64
200 3 18 11 17 96 73 102 64 96 63
200 3 18 16 13 12 60 16 60 16 64
200 3 18 13 14 12 60 16 64 12 64
200 3 22 21 20 5 46 8 41 18 40
200 3 22 20 19 5 46 18 40 17 46
200 3 21 22 24 2 30 0 35 16 37
200 3 21 24 23 2 30 16 37 17 29
200 3 20 21 23 2 208 1 196 15 193
200 3 20 23 25 2 208 15 193 16 205
200 3 22 19 26 18 45 17 39 0 40
200 3 22 26 24 18 45 0 40 2 47
200 3 19 20 25 17 45 16 40 0 38
200 3 19 25 26 17 45 0 38 0 47
200 3 30 29 28 24 20 24 20 25 27
200 3 30 28 27 24 20 25 27 0 27
200 3 28 32 31 14 19 2 19 0 0
200 3 28 31 27 14 19 0 0 16 0
200 3 29 23 32 14 29 4 29 2 37
200 3 29 32 28 14 29 2 37 16 37
200 3 33 30 27 16 38 2 38 0 47
200 3 33 27 31 16 38 0 47 18 47
200 3 23 33 31 5 21 24 20 25 27
200 3 23 31 32 5 21 25 27 0 27
200 3 30 33 23 2 19 16 19 13 0
200 3 30 23 29 2 19 13 0 4 0
200 3 14 12 13 44 48 47 60 47 48
200 3 14 11 12 44 48 44 60 47 60
200 3 13 15 16 44 48 47 60 47 48
200 3 13 12 15 44 48 44 60 47 60
200 3 16 17 18 44 48 47 60 47 48
200 3 16 15 17 44 48 44 60 47 60
200 3 18 11 14 44 48 47 60 47 48
200 3 18 17 11 44 48 44 60 47 60
200 3 18 13 16 65 66 76 67 70 61
200 3 18 14 13 65 66 71 72 76 67
200 3 22 20 21 9 190 0 182 0 190
200 3 22 19 20 9 190 9 182 0 182
200 3 23 21 20 0 182 0 190 9 190
200 3 21 24 22 9 190 0 182 0 190
200 3 21 23 24 9 190 9 182 0 182
200 3 24 19 22 9 182 0 190 9 190
200 3 33 45 46 2 47 2 46 0 43
200 3 34 43 40 5 21 13 27 2 27
200 3 34 44 43 5 21 15 20 13 27
200 3 32 46 45 18 45 0 43 2 46
200 3 32 36 46 18 45 0 40 0 43
200 3 32 31 36 18 45 17 39 0 40
200 3 30 36 31 16 40 0 47 17 45
200 3 30 35 36 16 40 0 38 0 47
200 3 25 44 42 25 27 15 20 24 20
200 3 25 43 44 25 27 13 27 15 20
200 3 35 41 34 16 205 1 195 15 193
200 3 35 30 41 16 205 2 208 1 195
200 3 39 42 34 24 20 24 20 5 21
200 3 39 37 38 16 19 4 0 2 19
200 3 39 34 37 16 19 13 0 4 0
200 3 32 30 31 5 46 18 40 17 46
200 3 32 29 30 5 46 8 41 18 40
200 3 29 41 30 1 196 1 195 2 208
200 3 32 34 29 0 35 17 29 2 30
200 3 32 33 34 0 35 16 37 17 29
200 3 28 34 40 0 27 5 21 2 27
200 3 34 27 37 4 29 16 37 14 29
200 3 34 28 27 4 29 2 37 16 37
200 3 38 25 39 2 38 18 47 16 38
200 3 38 26 25 2 38 0 47 18 47
200 3 28 26 27 2 37 18 28 16 37
200 3 28 25 26 2 37 0 28 18 28
200 3 37 26 38 5 21 25 27 24 20
200 3 37 27 26 5 21 0 27 25 27
CONNECTORS 1
-4 -43 0
-6 -41 1
1 change: 1 addition & 0 deletions messages/briefk.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AMPBTRYMSG,0,1,1,dummy.ogv,9,INCOMTRAN,AMPPID,AMPBTRYMSG1,AMPBTRYMSG2,AMPBTRYMSG
ROYAMPAMSG,0,1,1,dummy.ogv,10,INCOMTRAN,ROYID,ROYAMPAMSG1,ROYAMPAMSG2,ROYAMPAMSG3,ROYAMPAMSG4,ROYAMPAMSG5,ROYAMPAMSG6,ROYAMPAMSG7,ENDTRAN,0,0000
ROYAMPEMSG,0,1,1,dummy.ogv,12,INCOMTRAN,ROYID,ROYAMPEMSG1,ROYAMPEMSG2,ROYAMPEMSG3,ROYAMPEMSG4,ROYAMPEMSG5,ROYAMPEMSG6,ROYAMPEMSG7,ROYAMPEMSG8,ROYAMPEMSG9,ENDTRAN,0,0000
RESHELMSG,0,1,1,dummy.ogv,13,NEWINTEL,RESID,RESHELMSG1,RESHELMSG2,RESHELMSG3,RESHELMSG4,RESHELMSG5,RESHELMSG6,RESHELMSG7,RESHELMSG8,RESHELMSG9,RESHELMSG10,ENDREPORT,0,0000
RESHELWARN,0,1,1,dummy.ogv,6,NEWINTEL,RESID,RESHELWARN1,RESHELWARN2,RESHELWARN3,ENDREPORT,0,0000
HELPITCHMSG,0,1,1,dummy.ogv,12,INCOMTRAN,UNKWNID,HELPITCHMSG1,HELPITCHMSG2,HELPITCHMSG3,HELPITCHMSG4,HELPITCHMSG5,HELPITCHMSG6,HELPITCHMSG7,HELPITCHMSG8,HELPITCHMSG9,ENDTRAN,0,0000
HELNEGOMSG,0,1,1,dummy.ogv,8,INCOMTRAN,HELID,HELNEGOMSG1,HELNEGOMSG2,HELNEGOMSG3,HELNEGOMSG4,HELNEGOMSG5,ENDTRAN,0,0000
HELAGGRMSG,0,1,1,dummy.ogv,8,INCOMTRAN,HELID,HELAGGRMSG1,HELAGGRMSG2,HELAGGRMSG3,HELAGGRMSG4,HELAGGRMSG5,ENDTRAN,0,0000
Expand Down
11 changes: 11 additions & 0 deletions messages/resmessages1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,17 @@
"Defensive Strength: Bunker"
]
},
"RES_PB_ATR2": {
"id": "RES_PB_ATR2",
"imdName": "MICAPSUL.pie",
"sequenceName": "res_struttech.ogg",
"text": [
"New Defensive Structure Available",
"Armored bunker with Lancer AT rocket",
"Automatically targets enemies within sensor range",
"Defensive Strength: Bunker"
]
},
"RES_PB_FL": {
"id": "RES_PB_FL",
"imdName": "MICAPSUL.pie",
Expand Down
12 changes: 6 additions & 6 deletions messages/resmessages2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
"sequenceName": "res_struttech.ogg",
"text": [
"New Defensive Structure Available",
"Armored strongpoint with Hyper-Velocity Cannon",
"Armored bunker with Hyper-Velocity Cannon",
"Automatically targets enemies in range",
"Defensive Strength: Hard"
"Defensive Strength: Bunker"
]
},
"RES_EMP_HVATR": {
Expand All @@ -140,9 +140,9 @@
"sequenceName": "res_struttech.ogg",
"text": [
"New Defensive Structure Available",
"Armored strongpoint with Tank Killer rocket",
"Armored bunker with Tank Killer rocket",
"Automatically targets enemies in range",
"Defensive Strength: Hard"
"Defensive Strength: Bunker"
]
},
"RES_EMP_BALAT": {
Expand All @@ -162,9 +162,9 @@
"sequenceName": "res_struttech.ogg",
"text": [
"New Defensive Structure Available",
"Armored strongpoint with Inferno Flamer",
"Armored bunker with Inferno Flamer",
"Automatically targets enemies in range",
"Defensive Strength: Hard"
"Defensive Strength: Bunker"
]
},
"RES_EMP_HvHOW": {
Expand Down
4 changes: 2 additions & 2 deletions messages/resmessages3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@
"sequenceName": "res_struttech.ogg",
"text": [
"New Defensive Structure Available",
"Armored strongpoint with Flashlight laser",
"Armored bunker with Flashlight laser",
"Automatically targets enemies in range",
"Defensive Strength: Hard"
"Defensive Strength: Bunker"
]
},
"RES_EMP_PulseLas": {
Expand Down
13 changes: 9 additions & 4 deletions messages/strings/cam1strings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ ROYAMPEMSG5 _("What? Did you really think that alliance was going to last?")
ROYAMPEMSG6 _("AMPHOS was not loyal to me, they only had their own interests in mind.")
ROYAMPEMSG7 _("And there is only one cure for that.")
ROYAMPEMSG8 _("...")
ROYAMPEMSG9 _("Oh, don't worry Commander. Your turn is comming up soon.")
ROYAMPEMSG9 _("Oh, don't worry Commander. Your turn is coming up soon.")

/* Hellraiser Introduction (From Resistance) */
RESHELMSG1 _("Careful, those structures in the hills belong to the Hellraisers.")
Expand All @@ -204,6 +204,11 @@ RESHELMSG8 _("Those cragged hills don't leave much room for maneuvering around
RESHELMSG9 _("Their patrols are armed with flamethrowers, and they've placed bunkers around every corner.")
RESHELMSG10 _("They've even modified their mortars to leave burning areas where they hit.")

/* Hellraiser Bridge Warning (From Resistance) */
RESHELWARN1 _("Heads up Commander, that bridge leads straight into Royalist territory.")
RESHELWARN2 _("We should probably deal with the Hellraisers before trying to pick fights with the Royalists.")
RESHELWARN3 _("Otherwise we might end up with more trouble on our hands than we can handle.")

/* Hellraiser Pitch */
HELPITCHMSG1 _("Attention interlopers!")
HELPITCHMSG2 _("This is the Warchief of the Hellraiser clan speaking.")
Expand All @@ -226,7 +231,7 @@ HELNEGOMSG5 _("Once they are complete, we can then join our forces and inciner
HELAGGRMSG1 _("Well, it seems you have made the wrong choice!")
HELAGGRMSG2 _("You are very brave, Commander. But also very foolish if you think you can best us.")
HELAGGRMSG3 _("These transgressions of yours shall not go unpunished!")
HELAGGRMSG4 _("We will purge your forces from our land like a wilfire tearing through a forest.")
HELAGGRMSG4 _("We will purge your forces from our land like a wildfire tearing through a forest.")
HELAGGRMSG5 _("Perhaps once we've razed your vile base down to smoldering piles of ash, we will hear you beg for our mercy!")

/* Hellraiser Betrayal Message */
Expand Down Expand Up @@ -535,8 +540,8 @@ RESALERTMSG1 _("Heads up, we've intercepted some Royalist radio transmissions i
RESALERTMSG2 _("Brace yourself, Commander. I think things are about to get nasty.")

/* AMPHOS Assault Alert */
AMPALERTMSG1 _("We have detected a large Royalist force amassing within their base.")
AMPALERTMSG2 _("Their size and composition is unkown, but it is likely that they're preparing to launch an assault against us.")
AMPALERTMSG1 _("We have detected signs that a large Royalist force amassing within their base.")
AMPALERTMSG2 _("Their size and composition is unknown, but it is likely that they're preparing to launch an assault against us.")
AMPALERTMSG3 _("Any assistance in dealing with this would be greatly appreciated, Commander.")

/* Hellraiser Assault Alert */
Expand Down
34 changes: 34 additions & 0 deletions script/campaign/kingdom.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1577,6 +1577,38 @@ function adaptFactionColours()
}
}

// Grant the player momentary vision of all allied objects
function viewAlliedObjects()
{
let objList = [];

if (gameState.resistance.allianceState === "ALLIED")
{
objList = objList.concat(enumStruct(THE_RESISTANCE));
objList = objList.concat(enumDroid(THE_RESISTANCE));
}
if (gameState.amphos.allianceState === "ALLIED")
{
objList = objList.concat(enumStruct(AMPHOS));
objList = objList.concat(enumDroid(AMPHOS));
}
if (gameState.hellraisers.allianceState === "ALLIED")
{
objList = objList.concat(enumStruct(HELLRAISERS));
objList = objList.concat(enumDroid(HELLRAISERS));
}
if (gameState.coalition.allianceState === "ALLIED")
{
objList = objList.concat(enumStruct(THE_COALITION));
objList = objList.concat(enumDroid(THE_COALITION));
}

for (let i = 0; i < objList.length; i++)
{
addSpotter(objList[i].x, objList[i].y, CAM_HUMAN_PLAYER, 512, false, gameTime + camSecondsToMilliseconds(1));
}
}

// Check if the player has the big debt
function recessionCheck()
{
Expand Down Expand Up @@ -1973,6 +2005,8 @@ function eventStartLevel()
camUpgradeOnMapStructures("WallTower-TwinAssaultGun", "CO-WallTower-TwinAssaultGun", ROYALISTS);
camUpgradeOnMapStructures("A0HardcreteMk1Wall", "CollectiveWall", ROYALISTS);
camUpgradeOnMapStructures("Emplacement-RotMor", "CO-Emp-RotMor", ROYALISTS);
camUpgradeOnMapStructures("Emplacement-HvyATrocket", "CO-PillBoxTK", ROYALISTS);
camUpgradeOnMapStructures("Emplacement-HPVcannon", "CO-PillBoxHPC", ROYALISTS);
// camUpgradeOnMapStructures("Emplacement-HvyATrocket", "Emplacement-Ballista", ROYALISTS);
if (difficulty === INSANE)
{
Expand Down
Loading

0 comments on commit 28ddfa1

Please sign in to comment.