diff options
| author | Zed <Zed@zed.zed> | 2016-03-06 23:39:41 +0100 |
|---|---|---|
| committer | Zed <Zed@zed.zed> | 2016-03-06 23:39:41 +0100 |
| commit | 39cafa71dbfb45cb177a2687752c775ce17ff274 (patch) | |
| tree | cf5ac9c4b0eae50cf6c45008174f0bf68611e805 | |
| parent | 2f4a6f30aa54430d86a7e4cc6d94a3aee4e5eb7d (diff) | |
| download | tempelschubsen-39cafa71dbfb45cb177a2687752c775ce17ff274.tar.gz tempelschubsen-39cafa71dbfb45cb177a2687752c775ce17ff274.zip | |
Make numerous adjustments to file names, titles and formatting
Also translate most leftover German bits (excluding those in the actual script) into English
62 files changed, 166 insertions, 173 deletions
diff --git a/TemplePushing.c4s/DescDE.rtf b/TemplePushing.c4s/DescDE.rtf Binary files differindex 851f653..b7bc0e7 100644 --- a/TemplePushing.c4s/DescDE.rtf +++ b/TemplePushing.c4s/DescDE.rtf diff --git a/TemplePushing.c4s/DescUS.rtf b/TemplePushing.c4s/DescUS.rtf Binary files differindex 1176bc3..5bf051c 100644 --- a/TemplePushing.c4s/DescUS.rtf +++ b/TemplePushing.c4s/DescUS.rtf diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescDE.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescDE.txt index 1e86f99..a274344 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescDE.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescDE.txt @@ -1,3 +1 @@ -Eine Regel, die den Schnee nur effektmäßig fallen lässt. - -Original von bernhard Bonigl(boni)
\ No newline at end of file +Eine Regel, welche den Schnee nur effektmäßig fallen lässt.
\ No newline at end of file diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescUS.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescUS.txt index 75bc8e0..780c510 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescUS.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/DescUS.txt @@ -1,4 +1 @@ -An rule which let the snow fall down just like an effect. - - -Made by Bernhard Bonigl(boni).
\ No newline at end of file +Makes snow fall without creating material.
\ No newline at end of file diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Names.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Names.txt index af18263..ab8eeb6 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Names.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Names.txt @@ -1,2 +1,2 @@ DE:Schneeeffekt -US:Snoweffect +US:Snow effect diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Script.c b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Script.c index 4719aa5..98bf370 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Script.c +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Schnee-Effekt --*/ +/*-- Snow effect --*/ #strict diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Graphics.png b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Graphics.png Binary files differindex a8871b3..a8871b3 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Graphics.png +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Graphics.png diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Names.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Names.txt index 2de86ab..2de86ab 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Names.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Names.txt diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Particle.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Particle.txt index f7918cd..f7918cd 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee.c4d/Particle.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow.c4d/Particle.txt diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Graphics.png b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Graphics.png Binary files differindex a8871b3..a8871b3 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Graphics.png +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Graphics.png diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Names.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Names.txt index 2de86ab..2de86ab 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Names.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Names.txt diff --git a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Particle.txt b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Particle.txt index d3ee890..d3ee890 100644 --- a/TemplePushing.c4s/Environment.c4d/Snow.c4d/Schnee2.c4d/Particle.txt +++ b/TemplePushing.c4s/Environment.c4d/Snow.c4d/Snow2.c4d/Particle.txt diff --git a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/DescUS.txt b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/DescUS.txt index e694245..b6cb585 100644 --- a/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/DescUS.txt +++ b/TemplePushing.c4s/Misc.c4d/SetupMenu.c4d/DescUS.txt @@ -1 +1 @@ -Setup menu shown at the beginning of the scenario.
\ No newline at end of file +Setup menu for the beginning of the round.
\ No newline at end of file diff --git a/TemplePushing.c4s/Misc.c4d/Snowball.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/Snowball.c4d/Script.c index f5bf91b..57ba981 100644 --- a/TemplePushing.c4s/Misc.c4d/Snowball.c4d/Script.c +++ b/TemplePushing.c4s/Misc.c4d/Snowball.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Schneeball --*/ +/*-- Snowball --*/ #strict 2 diff --git a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DefCore.txt b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DefCore.txt index a0a887c..a22ac19 100644 --- a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DefCore.txt +++ b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DefCore.txt @@ -1,6 +1,6 @@ [DefCore] id=APCE -Name=Apocalypse +Name=Apocalyptic Version=4,9,5 Category=C4D_StaticBack Width=1 diff --git a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescDE.txt b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescDE.txt index 907f5df..d2c6086 100644 --- a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescDE.txt +++ b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescDE.txt @@ -1 +1 @@ -Feuerregen und keine Spawnpoints. Dafür unendlich Teraflints.
\ No newline at end of file +Keine Spawnpoints. Dafür unendlich Teraflints.
\ No newline at end of file diff --git a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescUS.txt b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescUS.txt index e803d8b..70f7342 100644 --- a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescUS.txt +++ b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/DescUS.txt @@ -1 +1 @@ -Fire rain and unlimited teraflints instead of spawnpoints.
\ No newline at end of file +Unlimited teraflints instead of spawnpoints.
\ No newline at end of file diff --git a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/Script.c b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/Script.c index e026efa..6ed5738 100644 --- a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/Script.c +++ b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Apocalyptic --*/ +/*-- Apocalyptic Mode --*/ #strict 2 diff --git a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/StringTblUS.txt b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/StringTblUS.txt index 78690e2..8489fd9 100644 --- a/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/StringTblUS.txt +++ b/TemplePushing.c4s/Modes.c4d/ApocalypticPushing.c4d/StringTblUS.txt @@ -1 +1 @@ -ModeName=<c b20000>Apocalyptical</c> +ModeName=<c b20000>Apocalyptic</c> diff --git a/TemplePushing.c4s/Modes.c4d/ClassicPushing.c4d/Script.c b/TemplePushing.c4s/Modes.c4d/ClassicPushing.c4d/Script.c index 36389f0..08b185b 100644 --- a/TemplePushing.c4s/Modes.c4d/ClassicPushing.c4d/Script.c +++ b/TemplePushing.c4s/Modes.c4d/ClassicPushing.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Classic --*/ +/*-- Classic Mode --*/ #strict 2 diff --git a/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/Script.c b/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/Script.c index cea0302..5ccc3f4 100644 --- a/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/Script.c +++ b/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Festive --*/ +/*-- Festive Mode --*/ #strict 2 diff --git a/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/StringTblUS.txt b/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/StringTblUS.txt index 1f9bcd4..09b3fab 100644 --- a/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/StringTblUS.txt +++ b/TemplePushing.c4s/Modes.c4d/FestivePushing.c4d/StringTblUS.txt @@ -1 +1 @@ -ModeName=<c f0ffff>Winterly</c> +ModeName=<c f0ffff>Festive</c> diff --git a/TemplePushing.c4s/Modes.c4d/MagicalPushing.c4d/Script.c b/TemplePushing.c4s/Modes.c4d/MagicalPushing.c4d/Script.c index 655af9a..420efe7 100644 --- a/TemplePushing.c4s/Modes.c4d/MagicalPushing.c4d/Script.c +++ b/TemplePushing.c4s/Modes.c4d/MagicalPushing.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Magical --*/ +/*-- Magical Mode --*/ #strict 2 diff --git a/TemplePushing.c4s/Modes.c4d/MedievalPushing.c4d/Script.c b/TemplePushing.c4s/Modes.c4d/MedievalPushing.c4d/Script.c index 0d3258b..535221a 100644 --- a/TemplePushing.c4s/Modes.c4d/MedievalPushing.c4d/Script.c +++ b/TemplePushing.c4s/Modes.c4d/MedievalPushing.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Medieval --*/ +/*-- Medieval Mode --*/ #strict 2 diff --git a/TemplePushing.c4s/Rules.c4d/Deathmatch.c4d/StringTblUS.txt b/TemplePushing.c4s/Rules.c4d/Deathmatch.c4d/StringTblUS.txt index 939cc92..66e7914 100644 --- a/TemplePushing.c4s/Rules.c4d/Deathmatch.c4d/StringTblUS.txt +++ b/TemplePushing.c4s/Rules.c4d/Deathmatch.c4d/StringTblUS.txt @@ -1,2 +1,2 @@ -InfoMessage=The team that kills %d enemies first wins the game. +InfoMessage=The team which kills %d enemies first wins the game. Win=Win diff --git a/TemplePushing.c4s/Rules.c4d/DescUS.txt b/TemplePushing.c4s/Rules.c4d/DescUS.txt index 1ff9f2f..9be99fb 100644 --- a/TemplePushing.c4s/Rules.c4d/DescUS.txt +++ b/TemplePushing.c4s/Rules.c4d/DescUS.txt @@ -1 +1 @@ -Rule objects affect the gameplay by introducing handicaps or benefiting the players. +Rule objects affect the gameplay by introducing handicaps or perks. diff --git a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c index de61ef5..32d7e9c 100644 --- a/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c +++ b/TemplePushing.c4s/Rules.c4d/OutFader.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Out-Fader --*/ +/*-- Outfader --*/ #strict 2 diff --git a/TemplePushing.c4s/Rules.c4d/ToggleBackgroundMusic.c4d/Script.c b/TemplePushing.c4s/Rules.c4d/ToggleBackgroundMusic.c4d/Script.c index ef9b34e..b83b857 100644 --- a/TemplePushing.c4s/Rules.c4d/ToggleBackgroundMusic.c4d/Script.c +++ b/TemplePushing.c4s/Rules.c4d/ToggleBackgroundMusic.c4d/Script.c @@ -1,4 +1,4 @@ -/*-- Rule: Toggle background music --*/ +/*-- Rule for toggling ambient music --*/ #strict 2 diff --git a/TemplePushing.c4s/Scenario.txt b/TemplePushing.c4s/Scenario.txt index 1c9bbd6..3f36efa 100644 --- a/TemplePushing.c4s/Scenario.txt +++ b/TemplePushing.c4s/Scenario.txt @@ -37,4 +37,4 @@ Crew=CLNK=1 Crew=CLNK=1
[Player4]
-Crew=CLNK=1
+Crew=CLNK=1
\ No newline at end of file diff --git a/TemplePushing.c4s/Script.c b/TemplePushing.c4s/Script.c index 4cada7f..b01d6e4 100644 --- a/TemplePushing.c4s/Script.c +++ b/TemplePushing.c4s/Script.c @@ -674,4 +674,4 @@ func ToggleAmbienceSounds(int player) SetPlrExtraData(player, PlrData_EnableAmbienceSounds, preference); DoAmbienceSounds(player); -} +}
\ No newline at end of file diff --git a/TemplePushing.c4s/StringTblDE.txt b/TemplePushing.c4s/StringTblDE.txt index 457bf8a..6250fbe 100644 --- a/TemplePushing.c4s/StringTblDE.txt +++ b/TemplePushing.c4s/StringTblDE.txt @@ -11,4 +11,4 @@ Kills=Kills WinScore=Ziel MsgDeathmatchWin=<c %x>Team %s</c> erringt den Sieg. Win=Sieg -Rematch=Startet eine weitere Runde Tempelschubsen. +Rematch=Startet eine weitere Runde Tempelschubsen.
\ No newline at end of file diff --git a/TemplePushing.c4s/StringTblUS.txt b/TemplePushing.c4s/StringTblUS.txt index d6ef77a..98deff7 100644 --- a/TemplePushing.c4s/StringTblUS.txt +++ b/TemplePushing.c4s/StringTblUS.txt @@ -4,12 +4,11 @@ TeamThree=Ghardûr TeamFour=Qul'tar MsgRelaunch=You have <c 00ff00>%d</c> relaunches remaining. MsgOneRelaunch=You only have <c ffff00>one</c> relaunch remaining. -MsgLastRelaunch=This was your <c ff0000>last</c> relaunch. +MsgLastRelaunch=That was your <c ff0000>last</c> relaunch. Death=<i><c ff0000>Out</c></i> -Load=Loading Landscape... +Load=Loading landscape... Kills=Kills WinScore=Goal MsgDeathmatchWin=<c %x>Team %s</c> wins the match. Win=Win -Rematch=Starts another round of Temple Pushing. - +Rematch=Starts another round of Temple Pushing.
\ No newline at end of file diff --git a/TemplePushing.c4s/System.c4g/ApocalypseEffects.c b/TemplePushing.c4s/System.c4g/ApocalypseEffects.c index 04df82a..0e6ad59 100644 --- a/TemplePushing.c4s/System.c4g/ApocalypseEffects.c +++ b/TemplePushing.c4s/System.c4g/ApocalypseEffects.c @@ -1,4 +1,4 @@ -/*-- Apocalypse Effects --*/ +/*-- Apocalypse effects --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/BigRock.c b/TemplePushing.c4s/System.c4g/BigRock.c index 30d3555..4cf3dca 100644 --- a/TemplePushing.c4s/System.c4g/BigRock.c +++ b/TemplePushing.c4s/System.c4g/BigRock.c @@ -1,4 +1,4 @@ -/*-- Big rocks from rock strike don't hit friends --*/
+/*-- Big rocks from rock strike don't hit allies --*/
#appendto BIRK
#strict 2
diff --git a/TemplePushing.c4s/System.c4g/Blackout.c b/TemplePushing.c4s/System.c4g/Blackout.c index 5f3a397..5920651 100644 --- a/TemplePushing.c4s/System.c4g/Blackout.c +++ b/TemplePushing.c4s/System.c4g/Blackout.c @@ -1,4 +1,4 @@ -/*-- Kill tracking Blackout --*/ +/*-- Blackout kill tracking --*/ #appendto MBOT #strict 2 diff --git a/TemplePushing.c4s/System.c4g/CurseFall.c b/TemplePushing.c4s/System.c4g/CurseFall.c index 3b8c451..cd1d8df 100644 --- a/TemplePushing.c4s/System.c4g/CurseFall.c +++ b/TemplePushing.c4s/System.c4g/CurseFall.c @@ -1,4 +1,4 @@ -/*-- Kill tracking falling curse --*/ +/*-- Falling curse kill tracking --*/ #strict 2 #appendto CFAL diff --git a/TemplePushing.c4s/System.c4g/Dragonbreath.c b/TemplePushing.c4s/System.c4g/Dragonbreath.c new file mode 100644 index 0000000..010cdc4 --- /dev/null +++ b/TemplePushing.c4s/System.c4g/Dragonbreath.c @@ -0,0 +1,16 @@ +/*-- Dont set caster on fire --*/
+#strict 2
+#appendto MDBT
+
+public func ActivateAngle(object pCaller, int iAngle)
+{
+ if (GetAction(pCaller) == "HoverCast") return 0;
+
+ /*if (!GetDir(pCaller) && iAngle>0) CreateFireBreath(pCaller, 40, Sin(iAngle, 10), -Cos(iAngle, 10) - (Abs(iAngle) > 90) * 4, -Abs(iAngle)-90);
+ else*/ CreateFireBreath(pCaller, 40, Sin(iAngle, 6), -Cos(iAngle, 8) - /*(Abs(iAngle) > 90) **/ 4, iAngle);
+
+ Sound("DragonFire");
+
+ RemoveObject();
+ return 1;
+}
diff --git a/TemplePushing.c4s/System.c4g/Explode.c b/TemplePushing.c4s/System.c4g/Explode.c index 39b4c4a..e1b87aa 100644 --- a/TemplePushing.c4s/System.c4g/Explode.c +++ b/TemplePushing.c4s/System.c4g/Explode.c @@ -1,4 +1,4 @@ -/* Fix kill-tracking for Explosionspunkt +/* Fix kill-tracking for "Explosionspunkt" * (only moved SetController under Fling) */ #strict diff --git a/TemplePushing.c4s/System.c4g/FBreath.c b/TemplePushing.c4s/System.c4g/FBreath.c deleted file mode 100644 index ce0b116..0000000 --- a/TemplePushing.c4s/System.c4g/FBreath.c +++ /dev/null @@ -1,105 +0,0 @@ -/*-- Dont inflame caster --*/
-#strict 2
-#appendto FBRT
-
-local pTarget;
-
-func Activate(pTrg,iTime,iXPos,iYPos,iAngle,iAngleDir,int iExtraSpeed, bool fDeadly) {
- iLifetime=iTime; // Zeit bis das Ding gelöscht wird
- iX=iXPos; // Von der Mitte abweichende Position (X)
- iY=iYPos; // Von der Mitte abweichende Position (Y)
- iSpeed = FBRT_BaseSpeed + iExtraSpeed;// Geschwindigkeit: Basisgeschwindigkeit + Zusatz
- SetR(iAngle);
- SetRDir(iAngleDir); // Rotationsgeschwindigkeit
- SetAction("Exist",pTrg); // Objekt an dass es pseudo-attached wird
- fLethal = fDeadly;
- pTarget = pTrg;
-}
-
-protected func InflameTimer()
-{
- DoCon(+20);
- // In Material, was Feuer löscht (Wasser): löschen
- if(GetMaterialVal("Extinguisher","Material",GetMaterial(0,0)))
- {
- Smoke(0, 0, 24);
- return RemoveObject();
- }
- // Zeug anzünden
- var obj;
- while (obj = FindObject(0, 0,1, 0,0, OCF_Inflammable, 0,0, NoContainer(), obj))
- if (!OnFire(obj) && obj != pTarget) if (!Random(GetDefContactIncinerate(GetID(obj))))
- Incinerate(obj);
-}
-
-func Timer() { // alle 4 Frames
- var iXDir,iYDir,iAngle;
- var pActTarget = GetActionTarget();
- // Kein Feuer-Spucker: löschen
- if(!pActTarget) return(RemoveObject());
- // Magischer Feuerspucker muss die ganze Zeit zaubern
- var iMLength=GetActMapVal("Length",GetAction(pActTarget),GetID(pActTarget));
- if(GetActMapVal("Name","Magic",GetID(pActTarget))) {
- // z.B. während des Zauberns durch einen Stein getroffen
- if(!DoesMagic(pActTarget)) return(RemoveObject());
- // Zauberaktion für das zaubernde Objekt: Es wird angenommen, dass diese
- // in einem Raum von etwa 2/6 bis 5/6 der Zauberaktion spielt
- if(GetPhase(pActTarget) >= iMLength*5/6) SetPhase(iMLength*2/6,pActTarget);
- }
-
- // In Material, was Feuer löscht (Wasser): löschen
- if(GetMaterialVal("Extinguisher","Material",GetMaterial(0,0)))
- {
- Sound("Pshshsh");
- return RemoveObject();
- }
- // löschen
- if(GetActTime()>iLifetime) return(RemoveObject());
-
- // Pseudo-Attach
- SetPosition(GetX(pActTarget),GetY(pActTarget));
-
- // Größe+Drehung des Zielobjektes in die Position einbeziehen
- var iX2 = (Cos(GetR(pActTarget), iX*GetCon(pActTarget)) - Sin(GetR(pActTarget), iY*GetCon(pActTarget)))/100;
- var iY2 = (Sin(GetR(pActTarget), iX*GetCon(pActTarget)) + Cos(GetR(pActTarget), iY*GetCon(pActTarget)))/100;
-
- // Optionales Vertex-Attachment am Trägerobjekt (überschreibt vorhergehende Ausrichtungsfunktionen)
- if (fVertexAttach)
- {
- iX2 = pActTarget->GetVertex(iAttachVertex, 0);
- iY2 = pActTarget->GetVertex(iAttachVertex, 1);
- }
-
- for(var i=iSpeed/60+1; i>0 ;--i) {
-
- iAngle=RandomX(-12,+12);
-
- // Winkel usw berechnen
- if(!Random(3)) iAngle=RandomX(-12,+12);
- iXDir=Sin(GetR()+iAngle,iSpeed) + GetXDir(GetActionTarget());
- iYDir=-Cos(GetR()+iAngle,iSpeed) + GetYDir(GetActionTarget());
-
- // Effekt
- CreateParticle("DBFire",iX2,iY2,iXDir,iYDir,RandomX(50,100),RGB(255,255,255));
-
- // Anzünd-Objekte in die Richtung verschießen
- var inflamer = CreateObject(FBRT,
- iX2+Sin(GetR()+iAngle,10),
- iY2-Cos(GetR()+iAngle,18),
- GetOwner());
- LocalN("pTarget", inflamer) = pTarget;
- inflamer->ActivateInflamer(iXDir, iYDir, fLethal);
- }
-}
-
-func QueryOwnCatchBlow(object target)
-{
- if (target == pTarget) return true;
- else return _inherited(target, ...);
-}
-
-func QueryIncinerateObject(object target)
-{
- if (target == pTarget) return true;
- else return _inherited(target, ...);
-}
diff --git a/TemplePushing.c4s/System.c4g/Find_Criterions.c b/TemplePushing.c4s/System.c4g/Find_Criteria.c index 406bb5a..406bb5a 100644 --- a/TemplePushing.c4s/System.c4g/Find_Criterions.c +++ b/TemplePushing.c4s/System.c4g/Find_Criteria.c diff --git a/TemplePushing.c4s/System.c4g/Firebreath.c b/TemplePushing.c4s/System.c4g/Firebreath.c index bd53fb2..d7edc01 100644 --- a/TemplePushing.c4s/System.c4g/Firebreath.c +++ b/TemplePushing.c4s/System.c4g/Firebreath.c @@ -1,16 +1,105 @@ -/*-- Dont inflame caster --*/
+/*-- Dont set caster on fire --*/
#strict 2
-#appendto MDBT
+#appendto FBRT
-public func ActivateAngle(object pCaller, int iAngle)
+local pTarget;
+
+func Activate(pTrg,iTime,iXPos,iYPos,iAngle,iAngleDir,int iExtraSpeed, bool fDeadly) {
+ iLifetime=iTime; // Zeit bis das Ding gelöscht wird
+ iX=iXPos; // Von der Mitte abweichende Position (X)
+ iY=iYPos; // Von der Mitte abweichende Position (Y)
+ iSpeed = FBRT_BaseSpeed + iExtraSpeed;// Geschwindigkeit: Basisgeschwindigkeit + Zusatz
+ SetR(iAngle);
+ SetRDir(iAngleDir); // Rotationsgeschwindigkeit
+ SetAction("Exist",pTrg); // Objekt an dass es pseudo-attached wird
+ fLethal = fDeadly;
+ pTarget = pTrg;
+}
+
+protected func InflameTimer()
{
- if (GetAction(pCaller) == "HoverCast") return 0;
+ DoCon(+20);
+ // In Material, was Feuer löscht (Wasser): löschen
+ if(GetMaterialVal("Extinguisher","Material",GetMaterial(0,0)))
+ {
+ Smoke(0, 0, 24);
+ return RemoveObject();
+ }
+ // Zeug anzünden
+ var obj;
+ while (obj = FindObject(0, 0,1, 0,0, OCF_Inflammable, 0,0, NoContainer(), obj))
+ if (!OnFire(obj) && obj != pTarget) if (!Random(GetDefContactIncinerate(GetID(obj))))
+ Incinerate(obj);
+}
+
+func Timer() { // alle 4 Frames
+ var iXDir,iYDir,iAngle;
+ var pActTarget = GetActionTarget();
+ // Kein Feuer-Spucker: löschen
+ if(!pActTarget) return(RemoveObject());
+ // Magischer Feuerspucker muss die ganze Zeit zaubern
+ var iMLength=GetActMapVal("Length",GetAction(pActTarget),GetID(pActTarget));
+ if(GetActMapVal("Name","Magic",GetID(pActTarget))) {
+ // z.B. während des Zauberns durch einen Stein getroffen
+ if(!DoesMagic(pActTarget)) return(RemoveObject());
+ // Zauberaktion für das zaubernde Objekt: Es wird angenommen, dass diese
+ // in einem Raum von etwa 2/6 bis 5/6 der Zauberaktion spielt
+ if(GetPhase(pActTarget) >= iMLength*5/6) SetPhase(iMLength*2/6,pActTarget);
+ }
+
+ // In Material, was Feuer löscht (Wasser): löschen
+ if(GetMaterialVal("Extinguisher","Material",GetMaterial(0,0)))
+ {
+ Sound("Pshshsh");
+ return RemoveObject();
+ }
+ // löschen
+ if(GetActTime()>iLifetime) return(RemoveObject());
+
+ // Pseudo-Attach
+ SetPosition(GetX(pActTarget),GetY(pActTarget));
+
+ // Größe+Drehung des Zielobjektes in die Position einbeziehen
+ var iX2 = (Cos(GetR(pActTarget), iX*GetCon(pActTarget)) - Sin(GetR(pActTarget), iY*GetCon(pActTarget)))/100;
+ var iY2 = (Sin(GetR(pActTarget), iX*GetCon(pActTarget)) + Cos(GetR(pActTarget), iY*GetCon(pActTarget)))/100;
+
+ // Optionales Vertex-Attachment am Trägerobjekt (überschreibt vorhergehende Ausrichtungsfunktionen)
+ if (fVertexAttach)
+ {
+ iX2 = pActTarget->GetVertex(iAttachVertex, 0);
+ iY2 = pActTarget->GetVertex(iAttachVertex, 1);
+ }
- /*if (!GetDir(pCaller) && iAngle>0) CreateFireBreath(pCaller, 40, Sin(iAngle, 10), -Cos(iAngle, 10) - (Abs(iAngle) > 90) * 4, -Abs(iAngle)-90);
- else*/ CreateFireBreath(pCaller, 40, Sin(iAngle, 6), -Cos(iAngle, 8) - /*(Abs(iAngle) > 90) **/ 4, iAngle);
+ for(var i=iSpeed/60+1; i>0 ;--i) {
- Sound("DragonFire");
+ iAngle=RandomX(-12,+12);
- RemoveObject();
- return 1;
+ // Winkel usw berechnen
+ if(!Random(3)) iAngle=RandomX(-12,+12);
+ iXDir=Sin(GetR()+iAngle,iSpeed) + GetXDir(GetActionTarget());
+ iYDir=-Cos(GetR()+iAngle,iSpeed) + GetYDir(GetActionTarget());
+
+ // Effekt
+ CreateParticle("DBFire",iX2,iY2,iXDir,iYDir,RandomX(50,100),RGB(255,255,255));
+
+ // Anzünd-Objekte in die Richtung verschießen
+ var inflamer = CreateObject(FBRT,
+ iX2+Sin(GetR()+iAngle,10),
+ iY2-Cos(GetR()+iAngle,18),
+ GetOwner());
+ LocalN("pTarget", inflamer) = pTarget;
+ inflamer->ActivateInflamer(iXDir, iYDir, fLethal);
+ }
+}
+
+func QueryOwnCatchBlow(object target)
+{
+ if (target == pTarget) return true;
+ else return _inherited(target, ...);
+}
+
+func QueryIncinerateObject(object target)
+{
+ if (target == pTarget) return true;
+ else return _inherited(target, ...);
}
diff --git a/TemplePushing.c4s/System.c4g/Freeze.c b/TemplePushing.c4s/System.c4g/Freeze.c index d10457e..879a05a 100644 --- a/TemplePushing.c4s/System.c4g/Freeze.c +++ b/TemplePushing.c4s/System.c4g/Freeze.c @@ -1,4 +1,4 @@ -/*-- Freeze --*/ +/*-- Damage adjustment to Freeze --*/ #strict diff --git a/TemplePushing.c4s/System.c4g/Frostwave.c b/TemplePushing.c4s/System.c4g/Frostwave.c index 682e502..dbf3c2b 100644 --- a/TemplePushing.c4s/System.c4g/Frostwave.c +++ b/TemplePushing.c4s/System.c4g/Frostwave.c @@ -1,4 +1,4 @@ -/*-- Frostwave --*/ +/*-- Allow custom radius for Frostwave spells --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Gravity.c b/TemplePushing.c4s/System.c4g/Gravity.c index 3763e9f..5d0220e 100644 --- a/TemplePushing.c4s/System.c4g/Gravity.c +++ b/TemplePushing.c4s/System.c4g/Gravity.c @@ -1,4 +1,4 @@ -/*-- Neues Script --*/
+/*-- Optimize Gravity spell --*/
#strict 2
#appendto GVTY
diff --git a/TemplePushing.c4s/System.c4g/Ice.c b/TemplePushing.c4s/System.c4g/Ice.c index 9bfdc89..f34825e 100644 --- a/TemplePushing.c4s/System.c4g/Ice.c +++ b/TemplePushing.c4s/System.c4g/Ice.c @@ -1,4 +1,4 @@ -/*--- Eisklumpen ---*/ +/*--- Ice chunk creates frost wave upon impact ---*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/IceBall.c b/TemplePushing.c4s/System.c4g/IceBall.c index ba11967..658ee13 100644 --- a/TemplePushing.c4s/System.c4g/IceBall.c +++ b/TemplePushing.c4s/System.c4g/IceBall.c @@ -1,4 +1,4 @@ -/*-- Iceball --*/ +/*-- Make Ice Ball compatible with scrolls and aimer --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Icestrike.c b/TemplePushing.c4s/System.c4g/Icestrike.c index ccff6a9..1704ef8 100644 --- a/TemplePushing.c4s/System.c4g/Icestrike.c +++ b/TemplePushing.c4s/System.c4g/Icestrike.c @@ -1,4 +1,4 @@ -/*-- Icestrike --*/ +/*-- Make Ice Strike compatible with scrolls and Aimer --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/LavaRain.c b/TemplePushing.c4s/System.c4g/LavaRain.c index b2c1552..4057c72 100644 --- a/TemplePushing.c4s/System.c4g/LavaRain.c +++ b/TemplePushing.c4s/System.c4g/LavaRain.c @@ -1,4 +1,4 @@ -/*-- Lavaregen --*/ +/*-- Ambient rain effect for Liquid Temple --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Lenseflare.c b/TemplePushing.c4s/System.c4g/Lenseflare.c index 6de037a..74adbc8 100644 --- a/TemplePushing.c4s/System.c4g/Lenseflare.c +++ b/TemplePushing.c4s/System.c4g/Lenseflare.c @@ -1,4 +1,4 @@ -/* Lenseflare */ +/* Adjust Lenseflare effect */ #strict diff --git a/TemplePushing.c4s/System.c4g/MagicAir.c b/TemplePushing.c4s/System.c4g/MagicAir.c index 2c4a60d..c5d3ec1 100644 --- a/TemplePushing.c4s/System.c4g/MagicAir.c +++ b/TemplePushing.c4s/System.c4g/MagicAir.c @@ -1,4 +1,4 @@ -/*-- No color-modulation for scrolls --*/
+/*-- No color modulation for air scrolls --*/
#strict 2
#appendto ABLA
#appendto MBOT
diff --git a/TemplePushing.c4s/System.c4g/MagicEarth.c b/TemplePushing.c4s/System.c4g/MagicEarth.c index 4ac1463..66ace1f 100644 --- a/TemplePushing.c4s/System.c4g/MagicEarth.c +++ b/TemplePushing.c4s/System.c4g/MagicEarth.c @@ -1,4 +1,4 @@ -/*-- Green color for scrolls --*/
+/*-- Green color modulation for earth scrolls --*/
#strict 2
#appendto MSSH
#appendto MARK
diff --git a/TemplePushing.c4s/System.c4g/MagicFire.c b/TemplePushing.c4s/System.c4g/MagicFire.c index 9e51fcf..a8bdbbf 100644 --- a/TemplePushing.c4s/System.c4g/MagicFire.c +++ b/TemplePushing.c4s/System.c4g/MagicFire.c @@ -1,4 +1,4 @@ -/*-- Red color for scrolls --*/
+/*-- Red color modulation for fire scrolls --*/
#strict 2
#appendto MDBT
#appendto MFRB
diff --git a/TemplePushing.c4s/System.c4g/MagicLightning.c b/TemplePushing.c4s/System.c4g/MagicLightning.c index 59aacf9..0e9c13c 100644 --- a/TemplePushing.c4s/System.c4g/MagicLightning.c +++ b/TemplePushing.c4s/System.c4g/MagicLightning.c @@ -1,4 +1,4 @@ -/* Magic Lighting doesn't disappear --*/ +/* Prevent Magic Lighting scroll from disappearing --*/ #strict diff --git a/TemplePushing.c4s/System.c4g/MagicWater.c b/TemplePushing.c4s/System.c4g/MagicWater.c index 49c9dd4..659d0a0 100644 --- a/TemplePushing.c4s/System.c4g/MagicWater.c +++ b/TemplePushing.c4s/System.c4g/MagicWater.c @@ -1,4 +1,4 @@ -/*-- Blue color for scrolls --*/
+/*-- Blue color modulation for scrolls --*/
#strict 2
#appendto MFWV
#appendto ICNL
diff --git a/TemplePushing.c4s/System.c4g/Plague.c b/TemplePushing.c4s/System.c4g/Plague.c index e70560f..5895a2c 100644 --- a/TemplePushing.c4s/System.c4g/Plague.c +++ b/TemplePushing.c4s/System.c4g/Plague.c @@ -1,4 +1,4 @@ -/*-- Plague --*/ +/*-- Adjust Plague damage --*/ #strict diff --git a/TemplePushing.c4s/System.c4g/Rain.c b/TemplePushing.c4s/System.c4g/Rain.c index ed48a6d..85289ca 100644 --- a/TemplePushing.c4s/System.c4g/Rain.c +++ b/TemplePushing.c4s/System.c4g/Rain.c @@ -1,4 +1,4 @@ -/*-- Regen --*/ +/*-- Ambient rain effect for Temple Ruins --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/ShootInventory.c b/TemplePushing.c4s/System.c4g/ShootInventory.c index dd4ce1f..234f6b1 100644 --- a/TemplePushing.c4s/System.c4g/ShootInventory.c +++ b/TemplePushing.c4s/System.c4g/ShootInventory.c @@ -1,4 +1,4 @@ -/*-- Shoot inventory object --*/ +/*-- Make Clonks able to shoot certain objects --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Stoneshield.c b/TemplePushing.c4s/System.c4g/Stoneshield.c index 32478f5..8d2b236 100644 --- a/TemplePushing.c4s/System.c4g/Stoneshield.c +++ b/TemplePushing.c4s/System.c4g/Stoneshield.c @@ -1,4 +1,4 @@ -/*-- Show selector, but only if targets are available --*/
+/*-- Only show selector if targets are available and recolour particles by team --*/
#strict 2
#appendto MSSH
diff --git a/TemplePushing.c4s/System.c4g/Sun.c b/TemplePushing.c4s/System.c4g/Sun.c index 7ad69a8..a0d0af0 100644 --- a/TemplePushing.c4s/System.c4g/Sun.c +++ b/TemplePushing.c4s/System.c4g/Sun.c @@ -1,4 +1,4 @@ -/*-- Sun --*/ +/*-- Adjust sun location --*/ #strict diff --git a/TemplePushing.c4s/Teams.txt b/TemplePushing.c4s/Teams.txt index 477f3ba..dd10b4b 100644 --- a/TemplePushing.c4s/Teams.txt +++ b/TemplePushing.c4s/Teams.txt @@ -30,5 +30,4 @@ TeamDistribution=Host Name=$TeamFour$ PlrStartIndex=4 Color=22015 - IconSpec=TMS1:3 -
\ No newline at end of file + IconSpec=TMS1:3
\ No newline at end of file diff --git a/TemplePushing.c4s/Title.txt b/TemplePushing.c4s/Title.txt index 0dfc389..f444406 100644 --- a/TemplePushing.c4s/Title.txt +++ b/TemplePushing.c4s/Title.txt @@ -1,2 +1,2 @@ DE:Tempelschubsen r0.93 -US:Temple Pushing r0.93 +US:Temple Pushing r0.93
\ No newline at end of file diff --git a/TemplePushing.c4s/Version.txt b/TemplePushing.c4s/Version.txt index 21b1438..b8601f3 100644 --- a/TemplePushing.c4s/Version.txt +++ b/TemplePushing.c4s/Version.txt @@ -1 +1 @@ -r0.93 +r0.93
\ No newline at end of file |
