From 79a50aeb4201f2b856afadaabcd1d0fb615f0747 Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 7 Mar 2016 03:07:34 +0100 Subject: Make more title adjustments to System.c4g files --- TemplePushing.c4s/System.c4g/Aimer.c | 2 +- TemplePushing.c4s/System.c4g/Airblast.c | 2 +- TemplePushing.c4s/System.c4g/ApocalypseEffects.c | 2 +- TemplePushing.c4s/System.c4g/Arrow.c | 2 +- TemplePushing.c4s/System.c4g/Arrowpack.c | 2 +- TemplePushing.c4s/System.c4g/BigRock.c | 2 +- TemplePushing.c4s/System.c4g/Blackout.c | 2 +- TemplePushing.c4s/System.c4g/CurseFall.c | 2 +- TemplePushing.c4s/System.c4g/Dragonbreath.c | 2 +- TemplePushing.c4s/System.c4g/Explode.c | 4 +-- TemplePushing.c4s/System.c4g/FindCriteria.c | 38 ++++++++++++++++++++++++ TemplePushing.c4s/System.c4g/Find_Criteria.c | 38 ------------------------ TemplePushing.c4s/System.c4g/FireBall.c | 1 + TemplePushing.c4s/System.c4g/Firebreath.c | 2 +- TemplePushing.c4s/System.c4g/Freeze.c | 2 +- TemplePushing.c4s/System.c4g/Goblet.c | 2 +- TemplePushing.c4s/System.c4g/GravityStops.c | 2 +- TemplePushing.c4s/System.c4g/Ice.c | 2 +- TemplePushing.c4s/System.c4g/IceBall.c | 1 + TemplePushing.c4s/System.c4g/Invisibility.c | 2 +- TemplePushing.c4s/System.c4g/MagicAir.c | 2 +- TemplePushing.c4s/System.c4g/MagicEarth.c | 2 +- TemplePushing.c4s/System.c4g/MagicFire.c | 2 +- TemplePushing.c4s/System.c4g/MagicFlint.c | 2 +- TemplePushing.c4s/System.c4g/MagicLightning.c | 2 +- TemplePushing.c4s/System.c4g/MagicWater.c | 2 +- TemplePushing.c4s/System.c4g/Scroll.c | 1 + TemplePushing.c4s/System.c4g/Vanish.c | 2 +- 28 files changed, 65 insertions(+), 62 deletions(-) create mode 100644 TemplePushing.c4s/System.c4g/FindCriteria.c delete mode 100644 TemplePushing.c4s/System.c4g/Find_Criteria.c (limited to 'TemplePushing.c4s') diff --git a/TemplePushing.c4s/System.c4g/Aimer.c b/TemplePushing.c4s/System.c4g/Aimer.c index 381aa58..cc9490b 100644 --- a/TemplePushing.c4s/System.c4g/Aimer.c +++ b/TemplePushing.c4s/System.c4g/Aimer.c @@ -1,4 +1,4 @@ -/*-- Aimer appendto --*/ +/*-- Improve Aimer selection --*/ #strict 2 #appendto AIMR diff --git a/TemplePushing.c4s/System.c4g/Airblast.c b/TemplePushing.c4s/System.c4g/Airblast.c index 473263b..9c33031 100644 --- a/TemplePushing.c4s/System.c4g/Airblast.c +++ b/TemplePushing.c4s/System.c4g/Airblast.c @@ -1,4 +1,4 @@ -/* Airblast kill tracking */ +/* Improve Airblast kill tracking */ #strict diff --git a/TemplePushing.c4s/System.c4g/ApocalypseEffects.c b/TemplePushing.c4s/System.c4g/ApocalypseEffects.c index 0e6ad59..45a8ecf 100644 --- a/TemplePushing.c4s/System.c4g/ApocalypseEffects.c +++ b/TemplePushing.c4s/System.c4g/ApocalypseEffects.c @@ -1,4 +1,4 @@ -/*-- Apocalypse effects --*/ +/*-- Apocalyptic Mode effects --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Arrow.c b/TemplePushing.c4s/System.c4g/Arrow.c index f4e2202..5d8dc06 100644 --- a/TemplePushing.c4s/System.c4g/Arrow.c +++ b/TemplePushing.c4s/System.c4g/Arrow.c @@ -1,4 +1,4 @@ -/*-- Don't hit shooter directly after shooting --*/ +/*-- Prevent firing clonk from hitting itself --*/ #strict 2 #appendto ARRW #appendto FARW diff --git a/TemplePushing.c4s/System.c4g/Arrowpack.c b/TemplePushing.c4s/System.c4g/Arrowpack.c index 0bdf5a1..a0b6805 100644 --- a/TemplePushing.c4s/System.c4g/Arrowpack.c +++ b/TemplePushing.c4s/System.c4g/Arrowpack.c @@ -1,4 +1,4 @@ -/*-- Arrow packs shoot arrows --*/ +/*-- Make Clonks able to shoot arrows without a bow --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/BigRock.c b/TemplePushing.c4s/System.c4g/BigRock.c index 4cf3dca..6e97fe0 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 allies --*/ +/*-- Prevent rock strike from hitting allies --*/ #appendto BIRK #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Blackout.c b/TemplePushing.c4s/System.c4g/Blackout.c index a901930..62261a6 100644 --- a/TemplePushing.c4s/System.c4g/Blackout.c +++ b/TemplePushing.c4s/System.c4g/Blackout.c @@ -1,4 +1,4 @@ -/*-- Blackout kill tracking and colour modulation by tea, --*/ +/*-- Blackout kill tracking and colour modulation by team --*/ #appendto MBOT #strict 2 diff --git a/TemplePushing.c4s/System.c4g/CurseFall.c b/TemplePushing.c4s/System.c4g/CurseFall.c index cd1d8df..15877fa 100644 --- a/TemplePushing.c4s/System.c4g/CurseFall.c +++ b/TemplePushing.c4s/System.c4g/CurseFall.c @@ -1,4 +1,4 @@ -/*-- Falling curse kill tracking --*/ +/*-- Improve falling curse kill tracking --*/ #strict 2 #appendto CFAL diff --git a/TemplePushing.c4s/System.c4g/Dragonbreath.c b/TemplePushing.c4s/System.c4g/Dragonbreath.c index 010cdc4..2b7e861 100644 --- a/TemplePushing.c4s/System.c4g/Dragonbreath.c +++ b/TemplePushing.c4s/System.c4g/Dragonbreath.c @@ -1,4 +1,4 @@ -/*-- Dont set caster on fire --*/ +/*-- Prevent caster from setting himself on fire --*/ #strict 2 #appendto MDBT diff --git a/TemplePushing.c4s/System.c4g/Explode.c b/TemplePushing.c4s/System.c4g/Explode.c index e1b87aa..1f34e35 100644 --- a/TemplePushing.c4s/System.c4g/Explode.c +++ b/TemplePushing.c4s/System.c4g/Explode.c @@ -1,5 +1,5 @@ -/* Fix kill-tracking for "Explosionspunkt" - * (only moved SetController under Fling) */ +/* Fix kill tracking for explosions */ + #strict // Objekte beschädigen und wegschleudern diff --git a/TemplePushing.c4s/System.c4g/FindCriteria.c b/TemplePushing.c4s/System.c4g/FindCriteria.c new file mode 100644 index 0000000..8563ad3 --- /dev/null +++ b/TemplePushing.c4s/System.c4g/FindCriteria.c @@ -0,0 +1,38 @@ +/*-- Additional FindObjects search criteria for a certain angle range --*/ +#strict 2 + +global func SwapIfBigger(&smaller, &bigger) +{ + if (bigger < smaller) + { + var swap = smaller; + smaller = bigger; + bigger = swap; + } +} + +global func Find_Angle(int angleStart, int angleEnd, bool biggerPart, int x, int y) +{ + while (angleStart < 0) angleStart += 360; + while (angleEnd < 0) angleEnd += 360; + angleStart %= 360; + angleEnd %= 360; + SwapIfBigger(angleStart, angleEnd); + if (angleEnd - angleStart > 180) biggerPart = !biggerPart; + return [C4FO_Func, "Find_AngleCheck", angleStart, angleEnd, biggerPart, GetX() + x, GetY() + y]; +} + +global func Find_AngleCheck(int angleStart, int angleEnd, bool biggerPart, int x, int y) +{ + var angle = Angle(x, y, GetX(), GetY()); + var inside = Inside(angle, angleStart, angleEnd); + var ret; + if (biggerPart) ret = !inside; + else ret = inside; + return ret; +} + +global func Find_Procedure(string procedure) +{ + return Find_FuncEqual("GetProcedure()", procedure); +} diff --git a/TemplePushing.c4s/System.c4g/Find_Criteria.c b/TemplePushing.c4s/System.c4g/Find_Criteria.c deleted file mode 100644 index 406bb5a..0000000 --- a/TemplePushing.c4s/System.c4g/Find_Criteria.c +++ /dev/null @@ -1,38 +0,0 @@ -/*-- FindObjects search criteria for a certain angle-range --*/ -#strict 2 - -global func SwapIfBigger(&smaller, &bigger) -{ - if (bigger < smaller) - { - var swap = smaller; - smaller = bigger; - bigger = swap; - } -} - -global func Find_Angle(int angleStart, int angleEnd, bool biggerPart, int x, int y) -{ - while (angleStart < 0) angleStart += 360; - while (angleEnd < 0) angleEnd += 360; - angleStart %= 360; - angleEnd %= 360; - SwapIfBigger(angleStart, angleEnd); - if (angleEnd - angleStart > 180) biggerPart = !biggerPart; - return [C4FO_Func, "Find_AngleCheck", angleStart, angleEnd, biggerPart, GetX() + x, GetY() + y]; -} - -global func Find_AngleCheck(int angleStart, int angleEnd, bool biggerPart, int x, int y) -{ - var angle = Angle(x, y, GetX(), GetY()); - var inside = Inside(angle, angleStart, angleEnd); - var ret; - if (biggerPart) ret = !inside; - else ret = inside; - return ret; -} - -global func Find_Procedure(string procedure) -{ - return Find_FuncEqual("GetProcedure()", procedure); -} diff --git a/TemplePushing.c4s/System.c4g/FireBall.c b/TemplePushing.c4s/System.c4g/FireBall.c index 9a54584..8578ebc 100644 --- a/TemplePushing.c4s/System.c4g/FireBall.c +++ b/TemplePushing.c4s/System.c4g/FireBall.c @@ -1,4 +1,5 @@ /*-- Increase distance to caster to avoid autokills --*/ +/*-- Prevent Fire Ball from being held indefinitely --*/ #appendto FIRB #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Firebreath.c b/TemplePushing.c4s/System.c4g/Firebreath.c index d7edc01..251217e 100644 --- a/TemplePushing.c4s/System.c4g/Firebreath.c +++ b/TemplePushing.c4s/System.c4g/Firebreath.c @@ -1,4 +1,4 @@ -/*-- Dont set caster on fire --*/ +/*-- Prevent caster from setting himself on fire --*/ #strict 2 #appendto FBRT diff --git a/TemplePushing.c4s/System.c4g/Freeze.c b/TemplePushing.c4s/System.c4g/Freeze.c index 879a05a..b2d9ad7 100644 --- a/TemplePushing.c4s/System.c4g/Freeze.c +++ b/TemplePushing.c4s/System.c4g/Freeze.c @@ -1,4 +1,4 @@ -/*-- Damage adjustment to Freeze --*/ +/*-- Adjust damage of Freeze --*/ #strict diff --git a/TemplePushing.c4s/System.c4g/Goblet.c b/TemplePushing.c4s/System.c4g/Goblet.c index 7877443..a083d8c 100644 --- a/TemplePushing.c4s/System.c4g/Goblet.c +++ b/TemplePushing.c4s/System.c4g/Goblet.c @@ -1,4 +1,4 @@ -/*-- Goblet --*/ +/*-- Add unique Goblet mechanics --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/GravityStops.c b/TemplePushing.c4s/System.c4g/GravityStops.c index d75b832..5c3698a 100644 --- a/TemplePushing.c4s/System.c4g/GravityStops.c +++ b/TemplePushing.c4s/System.c4g/GravityStops.c @@ -1,4 +1,4 @@ -/*-- Gravity stops Lavashots and magic lightnings --*/ +/*-- Make the Gravity spell stop Magic Lightning and Lavashot --*/ #strict 2 #appendto LGTS #appendto _LVS diff --git a/TemplePushing.c4s/System.c4g/Ice.c b/TemplePushing.c4s/System.c4g/Ice.c index f34825e..a0123c3 100644 --- a/TemplePushing.c4s/System.c4g/Ice.c +++ b/TemplePushing.c4s/System.c4g/Ice.c @@ -1,4 +1,4 @@ -/*--- Ice chunk creates frost wave upon impact ---*/ +/*--- Make ice chunk create frost wave upon impact ---*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/IceBall.c b/TemplePushing.c4s/System.c4g/IceBall.c index 658ee13..ce7fd10 100644 --- a/TemplePushing.c4s/System.c4g/IceBall.c +++ b/TemplePushing.c4s/System.c4g/IceBall.c @@ -1,4 +1,5 @@ /*-- Make Ice Ball compatible with scrolls and aimer --*/ +/*-- Prevent Ice Ball from being held indefinitely --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/Invisibility.c b/TemplePushing.c4s/System.c4g/Invisibility.c index e3291a7..339200d 100644 --- a/TemplePushing.c4s/System.c4g/Invisibility.c +++ b/TemplePushing.c4s/System.c4g/Invisibility.c @@ -1,4 +1,4 @@ -/*-- Shorten Invisibilty --*/ +/*-- Shorten Invisibilty duration --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/MagicAir.c b/TemplePushing.c4s/System.c4g/MagicAir.c index c5d3ec1..d0518fa 100644 --- a/TemplePushing.c4s/System.c4g/MagicAir.c +++ b/TemplePushing.c4s/System.c4g/MagicAir.c @@ -1,4 +1,4 @@ -/*-- No color modulation for air scrolls --*/ +/*-- Categorize certain spells as "Air" and assign white scroll colour --*/ #strict 2 #appendto ABLA #appendto MBOT diff --git a/TemplePushing.c4s/System.c4g/MagicEarth.c b/TemplePushing.c4s/System.c4g/MagicEarth.c index 66ace1f..fde196c 100644 --- a/TemplePushing.c4s/System.c4g/MagicEarth.c +++ b/TemplePushing.c4s/System.c4g/MagicEarth.c @@ -1,4 +1,4 @@ -/*-- Green color modulation for earth scrolls --*/ +/*-- Categorize certain spells as "Earth" and assign green scroll colour --*/ #strict 2 #appendto MSSH #appendto MARK diff --git a/TemplePushing.c4s/System.c4g/MagicFire.c b/TemplePushing.c4s/System.c4g/MagicFire.c index a8bdbbf..f11cefc 100644 --- a/TemplePushing.c4s/System.c4g/MagicFire.c +++ b/TemplePushing.c4s/System.c4g/MagicFire.c @@ -1,4 +1,4 @@ -/*-- Red color modulation for fire scrolls --*/ +/*-- Categorize certain spells as "Fire" and assign red scroll colour --*/ #strict 2 #appendto MDBT #appendto MFRB diff --git a/TemplePushing.c4s/System.c4g/MagicFlint.c b/TemplePushing.c4s/System.c4g/MagicFlint.c index 0fc5506..4b569d5 100644 --- a/TemplePushing.c4s/System.c4g/MagicFlint.c +++ b/TemplePushing.c4s/System.c4g/MagicFlint.c @@ -1,4 +1,4 @@ -/*-- Summon flint --*/ +/*-- Make Summon Flint spell compatible with scrolls --*/ #strict 2 diff --git a/TemplePushing.c4s/System.c4g/MagicLightning.c b/TemplePushing.c4s/System.c4g/MagicLightning.c index 0e9c13c..5de7c21 100644 --- a/TemplePushing.c4s/System.c4g/MagicLightning.c +++ b/TemplePushing.c4s/System.c4g/MagicLightning.c @@ -1,4 +1,4 @@ -/* Prevent Magic Lighting scroll from disappearing --*/ +/*-- Prevent Magic Lighting scrolls from disappearing --*/ #strict diff --git a/TemplePushing.c4s/System.c4g/MagicWater.c b/TemplePushing.c4s/System.c4g/MagicWater.c index 659d0a0..0bb0ba3 100644 --- a/TemplePushing.c4s/System.c4g/MagicWater.c +++ b/TemplePushing.c4s/System.c4g/MagicWater.c @@ -1,4 +1,4 @@ -/*-- Blue color modulation for scrolls --*/ +/*-- Categorize certain spells as "Water" and assign blue scroll colour --*/ #strict 2 #appendto MFWV #appendto ICNL diff --git a/TemplePushing.c4s/System.c4g/Scroll.c b/TemplePushing.c4s/System.c4g/Scroll.c index c9098df..871245f 100644 --- a/TemplePushing.c4s/System.c4g/Scroll.c +++ b/TemplePushing.c4s/System.c4g/Scroll.c @@ -1,3 +1,4 @@ +/*-- Scroll --*/ #strict 2 #appendto SCRL diff --git a/TemplePushing.c4s/System.c4g/Vanish.c b/TemplePushing.c4s/System.c4g/Vanish.c index 702b776..0248cb1 100644 --- a/TemplePushing.c4s/System.c4g/Vanish.c +++ b/TemplePushing.c4s/System.c4g/Vanish.c @@ -1,4 +1,4 @@ -/*-- Make certain items vanish --*/ +/*-- Make certain items vanish over time --*/ #strict 2 -- cgit v1.2.3-54-g00ecf