diff --git a/WebfrontCore/Views/Penalty/_Penalty.cshtml b/WebfrontCore/Views/Penalty/_Penalty.cshtml
index 07e0d8760..213ba3ce3 100644
--- a/WebfrontCore/Views/Penalty/_Penalty.cshtml
+++ b/WebfrontCore/Views/Penalty/_Penalty.cshtml
@@ -34,7 +34,7 @@
@Html.ActionLink(Model.OffenderName, "ProfileAsync", "Client", new { id = Model.OffenderId }, new { @class = "link-inverse" })
diff --git a/WebfrontCore/Views/Shared/_Layout.cshtml b/WebfrontCore/Views/Shared/_Layout.cshtml
index 2266d6020..9c12d99c1 100644
--- a/WebfrontCore/Views/Shared/_Layout.cshtml
+++ b/WebfrontCore/Views/Shared/_Layout.cshtml
@@ -6,7 +6,7 @@
@ViewBag.Title | IW4MAdmin
-
+
diff --git a/WebfrontCore/wwwroot/css/profile.css b/WebfrontCore/wwwroot/css/profile.css
index fdf6db4ae..342d75941 100644
--- a/WebfrontCore/wwwroot/css/profile.css
+++ b/WebfrontCore/wwwroot/css/profile.css
@@ -100,7 +100,7 @@
}
#profile_aliases_btn {
- position: absolute;
+ position: relative;
top: auto;
margin-top: 0.7em;
font-size: 0.5em;
diff --git a/WebfrontCore/wwwroot/images/banner1.svg b/WebfrontCore/wwwroot/images/banner1.svg
deleted file mode 100644
index 1ab32b60b..000000000
--- a/WebfrontCore/wwwroot/images/banner1.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/WebfrontCore/wwwroot/images/banner2.svg b/WebfrontCore/wwwroot/images/banner2.svg
deleted file mode 100644
index 9679c604d..000000000
--- a/WebfrontCore/wwwroot/images/banner2.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/WebfrontCore/wwwroot/images/banner3.svg b/WebfrontCore/wwwroot/images/banner3.svg
deleted file mode 100644
index 9be2c2503..000000000
--- a/WebfrontCore/wwwroot/images/banner3.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/WebfrontCore/wwwroot/images/banner4.svg b/WebfrontCore/wwwroot/images/banner4.svg
deleted file mode 100644
index 38b3d7cd1..000000000
--- a/WebfrontCore/wwwroot/images/banner4.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/WebfrontCore/wwwroot/images/icon.png b/WebfrontCore/wwwroot/images/icon.png
new file mode 100644
index 000000000..e9ca45ceb
Binary files /dev/null and b/WebfrontCore/wwwroot/images/icon.png differ
diff --git a/_customcallbacks.gsc b/_customcallbacks.gsc
index d2d01f9af..60ef68166 100644
--- a/_customcallbacks.gsc
+++ b/_customcallbacks.gsc
@@ -9,6 +9,56 @@ init()
level.callbackPlayerKilled = ::Callback_PlayerKilled;
}
+hitLocationToBone(hitloc)
+{
+ switch(hitloc)
+ {
+ case "helmet":
+ return "j_helmet";
+ case "head":
+ return "j_head";
+ case "neck":
+ return "j_neck";
+ case "torso_upper":
+ return "j_spineupper";
+ case "torso_lower":
+ return "j_spinelower";
+ case "right_arm_upper":
+ return "j_shoulder_ri";
+ case "left_arm_upper":
+ return "j_shoulder_le";
+ case "right_arm_lower":
+ return "j_elbow_ri";
+ case "left_arm_lower":
+ return "j_elbow_le";
+ case "right_hand":
+ return "j_wrist_ri";
+ case "left_hand":
+ return "j_wrist_le";
+ case "right_leg_upper":
+ return "j_hip_ri";
+ case "left_leg_upper":
+ return "j_hip_le";
+ case "right_leg_lower":
+ return "j_knee_ri";
+ case "left_leg_lower":
+ return "j_knee_le";
+ case "right_foot":
+ return "j_ankle_ri";
+ case "left_foot":
+ return "j_ankle_le";
+ default:
+ return "tag_origin";
+ }
+}
+
+VectorScale(vector)
+{
+ vector[0] = vector[0]*100000;
+ vector[1] = vector[1]*100000;
+ vector[2] = vector[2]*100000;
+ return vector;
+}
Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
{
@@ -19,6 +69,11 @@ Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vD
else if(!isPlayer(attacker) && sMeansOfDeath == "MOD_FALLING")
_attacker = victim;
- logPrint("ScriptKill;" + _attacker.guid + ";" + victim.guid + ";" + _attacker.origin + ";" + victim.origin + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + vDir + ";" + gettime() + "\n");
+ location = victim GetTagOrigin(hitLocationToBone(sHitLoc));
+ //attacker iPrintLnBold(location);
+ //attacker iPrintLnBold(attacker.origin[0]);
+
+ /*BulletTrace(_attacker GetTagOrigin("tag_eye"), VectorScale(anglesToForward(attacker getPlayerAngles())), true, attacker)["entity"]*/
+ logPrint("ScriptKill;" + _attacker.guid + ";" + victim.guid + ";" + _attacker GetTagOrigin("tag_eye") + ";" + location + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + gettime() + "\n");
self maps\mp\gametypes\_damage::Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration );
}
\ No newline at end of file
|