diff --git a/planet/MicroMelee.c4f/Melee1.c4s/Chest.c4d/DefCore.txt b/planet/MicroMelee.c4f/Melee1.c4s/Chest.c4d/DefCore.txt index 207071bfd..9e456361f 100644 --- a/planet/MicroMelee.c4f/Melee1.c4s/Chest.c4d/DefCore.txt +++ b/planet/MicroMelee.c4f/Melee1.c4s/Chest.c4d/DefCore.txt @@ -2,17 +2,16 @@ id=Chest Version=4,10,0,0 Category=C4D_Vehicle -Width=20 -Height=24 -Offset=-10,-12 -Vertices=4 -VertexX=-8,-8,8,8 -VertexY=-2,11,-2,11 -VertexCNAT=5,9,6,10 -VertexFriction=50,50,100,100 -Value=15 +Width=20 +Height=24 +Offset=-10,-12 +Vertices=4 +VertexX=-8,-8,8,8 +VertexY=-2,11,-2,11 +VertexCNAT=5,9,6,10 +VertexFriction=50,50,100,100 +Value=15 Mass=10 -Grab=2 -GrabPutGet=C4D_GrabGet|C4D_GrabPut -ContainBlast=1 - +Grab=2 +GrabPutGet=C4D_GrabGet|C4D_GrabPut +ContainBlast=1 \ No newline at end of file diff --git a/planet/MicroMelee.c4f/Melee1.c4s/Teams.txt b/planet/MicroMelee.c4f/Melee1.c4s/Teams.txt deleted file mode 100644 index 02b150c55..000000000 --- a/planet/MicroMelee.c4f/Melee1.c4s/Teams.txt +++ /dev/null @@ -1,5 +0,0 @@ -[Teams] -Active=false -Custom=false -AllowHostilityChange=true -AutoGenerateTeams=true diff --git a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/DeathIcon.c4d/DefCore.txt b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/DeathIcon.c4d/DefCore.txt index d1f91ab65..4e56dd8e4 100644 --- a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/DeathIcon.c4d/DefCore.txt +++ b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/DeathIcon.c4d/DefCore.txt @@ -1,4 +1,4 @@ -[DefCore] +[DefCore] id=MicroMelee_Death Version=4,10,0,0 Category=C4D_StaticBack diff --git a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/KillIcon.c4d/DefCore.txt b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/KillIcon.c4d/DefCore.txt index 3dbb8a4ad..c410bb939 100644 --- a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/KillIcon.c4d/DefCore.txt +++ b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/KillIcon.c4d/DefCore.txt @@ -1,4 +1,4 @@ -[DefCore] +[DefCore] id=MicroMelee_Kill Version=4,10,0,0 Category=C4D_StaticBack diff --git a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/RelaunchIcon.c4d/DefCore.txt b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/RelaunchIcon.c4d/DefCore.txt index 5e91585d1..0f5380e60 100644 --- a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/RelaunchIcon.c4d/DefCore.txt +++ b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/RelaunchIcon.c4d/DefCore.txt @@ -1,4 +1,4 @@ -[DefCore] +[DefCore] id=MicroMelee_Relaunch Version=4,10,0,0 Category=C4D_StaticBack diff --git a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/Script.c b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/Script.c index c757c814f..a88c8dbcb 100644 --- a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/Script.c +++ b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/Script.c @@ -18,10 +18,10 @@ static const MIME_KillsToRelaunch = 4; // Number of kills one needs to make befo static const MIME_ShowBoardTime = 5; // Duration in seconds the scoreboard will be shown to a player on an event. static const MIME_ScoreString = "MIME_Score"; -static const MIME_ScoreDif = 2500; // Ab dieser Differenz halbiert sich der Punktebonus -static const MIME_ScoreBase = 0; // Startpunkte -static const MIME_ScoreGain = 50; // Punkte pro getöteten Clonk bei gleichem Punktestand -static const MIME_ScoreGainMin = 1; // Minimale Punkte pro Kill +static const MIME_ScoreDif = 2500; // Ab dieser Differenz halbiert sich der Punktebonus +static const MIME_ScoreBase = 0; // Startpunkte +static const MIME_ScoreGain = 50; // Punkte pro getöteten Clonk bei gleichem Punktestand +static const MIME_ScoreGainMin = 1; // Minimale Punkte pro Kill static const MIME_ScoreGainMax = 200; // Maximale Punkte pro Kill // Lists used to keep track of statistics. @@ -166,8 +166,8 @@ private func GiveScore(int killer, int victim, bool teamkill) var score_dif = score_list[killer] - score_list[victim]; var score_factor; if (score_dif > 0) - score_factor = 1000 * MIME_ScoreDif / (score_dif + MIME_ScoreDif); - else + score_factor = 1000 * MIME_ScoreDif / (score_dif + MIME_ScoreDif); + else score_factor = 1000 * (MIME_ScoreDif - score_dif) / MIME_ScoreDif; var score_change = BoundBy(score_factor * MIME_ScoreGain / 1000, MIME_ScoreGainMin, MIME_ScoreGainMax); diff --git a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/StringTblUS.txt b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/StringTblUS.txt index 18dd77e96..29e81d6d4 100644 --- a/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/StringTblUS.txt +++ b/planet/Objects.c4d/Rules.c4d/MicroMelee.c4d/StringTblUS.txt @@ -1,10 +1,10 @@ -Name=Micromelee - -MsgKill=%s was killed by %s, and has -MsgSelfKill=%s died, and has -MsgTeamKill=%s was killed by its teammate %s, and has - -MsgRelaunch0=no relaunches left. -MsgRelaunch1=one relaunch left. -MsgRelaunchX=%d relaunches left. +Name=Micromelee + +MsgKill=%s was killed by %s, and has +MsgSelfKill=%s died, and has +MsgTeamKill=%s was killed by its teammate %s, and has + +MsgRelaunch0=no relaunches left. +MsgRelaunch1=one relaunch left. +MsgRelaunchX=%d relaunches left. MsgFail=lost. \ No newline at end of file