Skip to content

Commit

Permalink
#285 - Gopro fix and minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sortileges authored Sep 21, 2019
1 parent 535c129 commit 2c9992f
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 22 deletions.
22 changes: 11 additions & 11 deletions Cinematic mod/maps/mp/_actor.gsc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* SASS' CINEMATIC MOD --- "Actors" file
* Version : #283
* Version : #285
*
* GitHub : https://github.com/sasseries/iw4-cine-mod
* Discord : sass#1997
Expand Down Expand Up @@ -31,12 +31,12 @@ actor()
level.gopro.linked = 0;
level.gopro enablelinkto();
wait 0.05;
level.gopro.model = spawn("script_model", (9999, 9999, 9999));
level.gopro.model setModel("projectile_rpg7");
level.gopro.model.origin = level.gopro.origin;
level.gopro.model.angles = (level.gopro.angles - (15, 0, 0));
level.gopro.object = spawn("script_model", (9999, 9999, 9999));
level.gopro.object setModel("projectile_rpg7");
level.gopro.object.origin = level.gopro.origin;
level.gopro.object.angles = (level.gopro.angles - (15, 0, 0));
wait 0.05;
level.gopro.model linkTo(level.gopro, "tag_origin");
level.gopro.object linkTo(level.gopro, "tag_origin");

level thread OnPlayerConnect();
}
Expand Down Expand Up @@ -519,21 +519,21 @@ ActorGoPro()
self.sessionstate = "playing";
self allowSpectateTeam("freelook", false);
}
else if (arguments[0] == "set")
else
{
foreach(actor in level.actor)
{
if (actor.name == arguments[1])
if (actor.name == arguments[0])
{
if (level.gopro.linked == 1)
{
level.gopro unlink();
level.gopro.linked = 0;
}
level.gopro.origin = actor GetTagOrigin(arguments[2]);
level.gopro.angles = actor GetTagAngles(arguments[2]);
level.gopro.origin = actor GetTagOrigin(arguments[1]);
level.gopro.angles = actor GetTagAngles(arguments[1]);
wait 0.05;
level.gopro linkTo(actor, arguments[2], (int(arguments[3]), int(arguments[4]), int(arguments[5])), (int(arguments[6]), int(arguments[7]), int(arguments[8])));
level.gopro linkTo(actor, arguments[1], (int(arguments[2]), int(arguments[3]), int(arguments[4])), (int(arguments[5]), int(arguments[6]), int(arguments[7])));
level.gopro.linked = 1;
}
}
Expand Down
36 changes: 25 additions & 11 deletions Cinematic mod/maps/mp/_misc.gsc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* SASS' CINEMATIC MOD --- "Misc" file
* Version : #283
* Version : #285
*
* GitHub : https://github.com/sasseries/iw4-cine-mod
* Discord : sass#1997
Expand Down Expand Up @@ -35,12 +35,12 @@ MiscConnect()
setDvar("sv_hostname", "SASS ^3MVM ^7- ^2LOCAL SERVER");
setDvar("g_TeamName_Allies", "allies");
setDvar("g_TeamName_Axis", "axis");
setDvar("con_gameMsgWindow0MsgTime", "9");
setDvar("con_gameMsgWindow0MsgTime", "5");
setDvar("con_gameMsgWindow0LineCount", "9");
setDvar("cg_weaponHintsCOD1Style", "0");

setObjectiveText(game["attackers"], "Sass' ^3 Cinematic ^7Mod \n Version : ^3#283 \n ^7Custom :" + level.patch);
setObjectiveText(game["defenders"], "Sass' ^3 Cinematic ^7Mod \n Version : ^3#283 \n ^7Custom :" + level.patch);
setObjectiveText(game["attackers"], "Sass' ^3 Cinematic ^7Mod \n Version : ^3#285 \n ^7Custom :" + level.patch);
setObjectiveText(game["defenders"], "Sass' ^3 Cinematic ^7Mod \n Version : ^3#285 \n ^7Custom :" + level.patch);
setObjectiveHintText("allies", " ");
setObjectiveHintText("axis", " ");

Expand Down Expand Up @@ -76,6 +76,7 @@ MiscSpawn()
thread earfquake();
thread thermal();
thread watermark();
thread discord();
}
}

Expand Down Expand Up @@ -139,21 +140,20 @@ MsgAbout()
{
self waittill("about");

self IPrintLnBold("Sass/Civil ^3MW2 Movie ^7Mod");
self IPrintLnBold("^3Sass/Civil ^7MW2 Movie Mod");
wait 1.5;
self IPrintLnBold("Version : ^7#283");
self IPrintLnBold("^3Version ^7: #285");
wait 1.5;
self IPrintLnBold("Custom ^3scripts ^7: " + level.patch);
self IPrintLnBold("^3Custom ^7scripts : " + level.patch);
wait 1.5;
self IPrintLnBold("^3Thanks ^7for downloading !");
self IPrintLn("^1Thanks to / Credits :");
self IPrintLn("- case, ozzie and jayy for their coolness");
self IPrintLn("- luckyy & CoDTVMM team for base help");
self IPrintLn("- Lasko for the menus");
self IPrintLn("- Lasko for the menus (on old versions)");
self IPrintLn("- You and everybody who supported the project :D");
wait 10;
self IPrintLn("Don't forget to join the ^3discord server ^7:");
self IPrintLn("^3>>> ^7discord.gg/wgRJDJJ");
wait 1.4;
self IPrintLnBold("^3Discord server link ^7: discord.gg/wgRJDJJ");
}
}

Expand Down Expand Up @@ -301,3 +301,17 @@ watermark()
watermark setText("Sass' Cinematic Mod");

}

discord()
{
self endon("disconnect");
self endon("death");

setDvarIfUninitialized("discord", "Discord server link");
self notifyOnplayerCommand("discord", "discord");
for (;;)
{
self waittill("discord");
self IPrintLnBold("^3Discord link ^7: discord.gg/wgRJDJJ");
}
}

0 comments on commit 2c9992f

Please sign in to comment.