Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Updated the effect list a bit

Browse Source 
- Fixed some npc typos

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10531 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-05-11 17:20:20 +00:00
parent cc636df44f
commit 41d87e49c5
7 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/05/11 2007/05/11
* Updated the effect list a bit, changes by Au{R}oN
* Re-phrased the attacker flee/def penalty config descs [ultramage] * Re-phrased the attacker flee/def penalty config descs [ultramage]
Ref: http://www.eathena.ws/board/index.php?showtopic=150918 Ref: http://www.eathena.ws/board/index.php?showtopic=150918
* Attempt to fix unwanted teleporting of immobile mobs [Playtester] * Attempt to fix unwanted teleporting of immobile mobs [Playtester]

22
conf-tmpl/battle/items.conf
View File

@ -15,16 +15,14 @@
// Originally Translated by Peter Kieser <pfak@telus.net> // Originally Translated by Peter Kieser <pfak@telus.net>
// Made in to plainer English by Ancyker // Made in to plainer English by Ancyker
//-------------------------------------------------------------- //--------------------------------------------------------------
//Note 1: Directives can be set using on/off, yes/no or 1/0. //Note 1: Value is a config switch (on/off, yes/no or 1/0)
//Note 2: All rates are in percents, 100 would mean 100%, 200 //Note 2: Value is in percents (100 means 100%)
// would mean 200%, etc //Note 3: Value is not limited to 60k (see below)
//Note 3: Value is not limited to 60K (see below) //Note 4: Value is a bitmask. If no description is given,
// Other Information: // assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
// All options are limited to a max of 60K (aprox) which is 600% //Other Information:
// or 60secs as appropiate. // All values are limited to a number between 0 and 60k
// 1000 miliseconds is 1 second. // (60000, 600%, 60secs, ...), unless otherwise specified.
// Unless otherwise specified, the minimum value is 0 for all
// features.
//-------------------------------------------------------------- //--------------------------------------------------------------
// The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3) // The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3)
@ -75,8 +73,8 @@ item_check: no
// On officials this is 0, but it's set to 100ms as a measure against bots/macros. // On officials this is 0, but it's set to 100ms as a measure against bots/macros.
item_use_interval: 100 item_use_interval: 100
//Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card). // Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
//For example, if left at 50. An item can give bNoMagicDamage,40; // For example, if left at 50. An item can give bNoMagicDamage,40;
// which reduces magic damage by 40%, but does not blocks status changes. // which reduces magic damage by 40%, but does not blocks status changes.
gtb_sc_immunity: 50 gtb_sc_immunity: 50

81
doc/effect_list.txt
View File

@ -1,11 +1,12 @@
//===== Athena Doc ======================================== //===== Athena Doc ========================================
//= Client Effect List //= Client Effects List
//===== By ================================================ //===== By ================================================
//= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon //= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon
//===== Version =========================================== //===== Version ===========================================
//= 1.0 //= 1.1
//========================================================= //=========================================================
//= 1.0 - Formatted to the standard //= 1.0 - Formatted to the standard
//= 1.1 - New effects, from 2007/05/07 Sakexe [Au{R}oN]
//===== Description ======================================= //===== Description =======================================
//= A list of client-side effects sorted by their ID //= A list of client-side effects sorted by their ID
//========================================================= //=========================================================
@ -221,7 +222,7 @@ number description
200. (nothing) 200. (nothing)
201. (nothing) 201. (nothing)
202. Lv 99 Aura Bubble 202. Lv 99 Aura Bubble
203. Mental Strenght Lightning (Without Sound) 203. Mental Strength Lightning (Without Sound)
204. Red Herb/Potion 204. Red Herb/Potion
205. Orange Potion 205. Orange Potion
206. Yellow Potion 206. Yellow Potion
@ -339,14 +340,14 @@ number description
318. Something Like Big Square Beam 318. Something Like Big Square Beam
319. Another Small Basilica 319. Another Small Basilica
320. Offensive Heal 320. Offensive Heal
321. Warp NPC °_° 321. Warp NPC O.O
322. Big Sunlight Through The Roof 322. Big Sunlight Through The Roof
323. Small Sunlight Through The Roof 323. Small Sunlight Through The Roof
324. Medium Sunlight Through The Roof 324. Medium Sunlight Through The Roof
325. Another Heal Effect 325. Another Heal Effect
326. Chase Walk Left Foot 326. Chase Walk Left Foot
327. Chse Walk Right Foot 327. Chse Walk Right Foot
328. Asura Strike Word 328. Monk Asura Strike
329. Triple Strike 329. Triple Strike
330. Combo Finish 330. Combo Finish
331. Natural HP Regeneration 331. Natural HP Regeneration
@ -354,7 +355,7 @@ number description
333. Autumn Leaves 333. Autumn Leaves
334. Blind 334. Blind
335. Poison 335. Poison
336. Kirye Eleison/Parring/Defender Shield 336. Kyrie Eleison/Parrying Shield
337. Class Change 337. Class Change
338. Super Novice/Taekwon Level Up Angel 338. Super Novice/Taekwon Level Up Angel
339. Spiral Pierce 339. Spiral Pierce
@ -413,7 +414,7 @@ number description
392. Reject Sword 392. Reject Sword
393. Arrow Vulcan 393. Arrow Vulcan
394. Sheltering Bliss 394. Sheltering Bliss
395. Soul Change (The same of 384) 395. Soul Change (the same as 384)
396. Marionette Control 396. Marionette Control
397. (nothing) 397. (nothing)
398. (nothing) 398. (nothing)
@ -447,9 +448,9 @@ number description
426. Running Hit Effect 426. Running Hit Effect
427. (nothing) 427. (nothing)
428. (nothing) 428. (nothing)
429. Taekwon Normal Kick 429. Taekwon Normal Kicks
430. The Same of 429 430. Taekwon Normal Kicks
431. The Same of 429 and 430 431. Taekwon Normal Kicks
432. Star Gladiator Map Recognize 432. Star Gladiator Map Recognize
433. Something like 432 433. Something like 432
434. Like 429, 430 and 431 434. Like 429, 430 and 431
@ -481,7 +482,7 @@ number description
460. Green tornado (unused) 460. Green tornado (unused)
461. Blue tornado (unused) 461. Blue tornado (unused)
462. Kaupe Dodge Effect 462. Kaupe Dodge Effect
463. The Same of 462 463. Kaupe Dodge Effect
464. White tornado (unused) 464. White tornado (unused)
465. Purple tornado (unused) 465. Purple tornado (unused)
466. Another Round Kick 466. Another Round Kick
@ -503,8 +504,8 @@ number description
482. Demon of The Sun Moon And Stars (Level 8) 482. Demon of The Sun Moon And Stars (Level 8)
483. Demon of The Sun Moon And Stars (Level 9) 483. Demon of The Sun Moon And Stars (Level 9)
484. Demon of The Sun Moon And Stars (Level 10) 484. Demon of The Sun Moon And Stars (Level 10)
485. Lightning like Mental Strenght but White 485. Mental Strength Lightning but White
486. Like Mental Strenght but White 486. Mental Strength Lightning
487. Demon of The Sun Moon And Stars Ground Effect 487. Demon of The Sun Moon And Stars Ground Effect
488. Comfort Skills 488. Comfort Skills
489. (nothing) 489. (nothing)
@ -518,9 +519,9 @@ number description
497. Twilight Alchemy 1 497. Twilight Alchemy 1
498. Twilight Alchemy 2 498. Twilight Alchemy 2
499. Twilight Alchemy 3 499. Twilight Alchemy 3
500. Need More Test Skill 500. Player Become Blue with Blue Aura
501. WTF? 501. Chase Walk Animation
502. Need More Test Skill 502. Player Become Yellow with Yellow Aura
503. Soul Link Word 503. Soul Link Word
504. (nothing) 504. (nothing)
505. Memorize 505. Memorize
@ -528,18 +529,18 @@ number description
507. Authoritative Badge 507. Authoritative Badge
508. Fire Cracker 508. Fire Cracker
509. Valentine Day Hearth (Wings) 509. Valentine Day Hearth (Wings)
510. WOOH! Another Ashura Strike Word (Its the opposite of the original 328!!) 510. Champion Asura Strike
511. (nothing) 511. (nothing)
512. Chain Crush COmbo 512. Chain Crush Combo
513. O_O Like Area Cast Target 513. Area Cast
514. O_O I Really don't know this 514. Really Big Circle O.O
515. Einbroch Fog 515. Einbroch Fog
516. Airship Cloud 516. Airship Cloud
517. (nothing) 517. (nothing)
518. Cart Termination 518. Cart Termination
519. Speed Down Potion 519. Speed Down Potion
520. Shield Bumerang 520. Shield Bumerang
521. O_O I Really don't know this 521. Player Become Red with Red Aura
522. Gravitation Field 522. Gravitation Field
523. Tarot Card of Fate (The Fool) 523. Tarot Card of Fate (The Fool)
524. Tarot Card of Fate (The Magician) 524. Tarot Card of Fate (The Magician)
@ -555,21 +556,21 @@ number description
534. Tarot Card of Fate (The Tower) 534. Tarot Card of Fate (The Tower)
535. Tarot Card of Fate (The Star) 535. Tarot Card of Fate (The Star)
536. Tarot Card of Fate (The Sun) 536. Tarot Card of Fate (The Sun)
537. O_O I Really don't know this 537. Acid Demonstration
538. O_O I Really don't know this 538. Player Become Green with Green Aura
539. Throw Random Bottle 539. Throw Random Bottle
540. Instant Small->Normal 540. Instant Small->Normal
541. (nothing) 541. (nothing)
542. KA-Spell (1st Part) 542. KA-Spell (1st Part)
543. Kahii 543. Kahii
544. Warmth Red Sprite 544. Warmth Red Sprite
545. Sound and... PUFF Crash Client :P 545. Sound and... PUFF Client Crash :P
546. Another HP/SP Regeneration 546. Another HP/SP Regeneration
547. Estin 547. Estin
548. Istant Red Sprite 548. Istant Red Sprite
549. Istant Blue Sprite 549. Istant Blue Sprite
550. Another Effect like Running Hit 550. Another Effect like Running Hit
551. O_O Effect Like Estun but with Circle 551. Effect Like Estun but with Circle
552. (nothing) 552. (nothing)
553. Esma 553. Esma
554. (nothing) 554. (nothing)
@ -603,10 +604,10 @@ number description
582. Another Super Novice/Taekwon Angel 582. Another Super Novice/Taekwon Angel
583. Warmth Hit 583. Warmth Hit
584. Full Buster 584. Full Buster
585. A Gunslinger Skill 585. 5 Medium Size Explosion
586. Somatology Lab Mobs Aura 586. Somatology Lab Mobs Aura
587. WTF? 587. Big Purple Flame
588. WTF? 588. Little Red Flame
589. Eswoo 589. Eswoo
590. Running Stop 590. Running Stop
591. (nothing) 591. (nothing)
@ -617,7 +618,7 @@ number description
596. Food Effect (AGI) 596. Food Effect (AGI)
597. Food Effect (DEX) 597. Food Effect (DEX)
598. Food Effect (LUK) 598. Food Effect (LUK)
599. O_O I Really don't know this 599. Cast Time Sound and Flashing Animation on Player
600. Something Happen Near Shadow Sprite 600. Something Happen Near Shadow Sprite
601. Sight Blaster 601. Sight Blaster
602. Something About 2nd Class New Skills 602. Something About 2nd Class New Skills
@ -630,7 +631,7 @@ number description
609. Cooking Failed 609. Cooking Failed
610. Success 610. Success
611. Failed 611. Failed
612. -?- 612. Korean Words and /no1 Smile O.O
613. Throw Shuriken 613. Throw Shuriken
614. Throw Kunai 614. Throw Kunai
615. Throw Fumma Shuriken 615. Throw Fumma Shuriken
@ -673,8 +674,8 @@ number description
652. Like Regeneration Number but Red with a Sound 652. Like Regeneration Number but Red with a Sound
653. Like Regeneration Number but Red 653. Like Regeneration Number but Red
654. Like Regeneration Number but Purple 654. Like Regeneration Number but Purple
655. Player Become Green slooooooowly 655. Mobs Skill (Change to Undead Element)
656. Green FLash 656. Final animation for Change Undead Element
657. (nothing) 657. (nothing)
658. (nothing) 658. (nothing)
659. (nothing) 659. (nothing)
@ -684,8 +685,16 @@ number description
663. (nothing) 663. (nothing)
664. (nothing) 664. (nothing)
665. Little Blue Ball Falling From Sky 665. Little Blue Ball Falling From Sky
666. New Mobs Skill (Earthquake) 666. Mobs Skill (Earthquake)
667. (nothing) 667. (nothing)
668. New Mobs Skill (Unamed) 668. Mobs Skill (Scream)
669. New Mobs Skill (Unamed) 669. Mobs Skill (Critical Slash)
670.+ No More Effects 670. Mobs Skill (Scream Without Sound)
671. The Japan Earth Symbol (Like 'Seven Wind LV 1' but is in the Ground)
672. The Japan Wind Symbol (Like 'Seven Wind LV 2' but is in the Ground)
673. (nothing)
674. Like Curse Effect
675. Like Parrying/Kyrie Eleison barrier but is Yellow with small Cross in every barrier piece
676. Mobs Skill (Maybe is Full Screen Slow Down, or something like Slow Cast)
677. Mobs Skill (Unamed)
678+. No More Effects in 2007/05/07 Sakexe

2
npc/cities/izlude.txt
View File

@ -450,7 +450,7 @@ izlude,124,178,4 script Soldier 105,{
izlude,56,126,7 script Cebalis::RedCebalis 85,{ izlude,56,126,7 script Cebalis::RedCebalis 85,{
mes "[Red]"; mes "[Red]";
mes "The only slill that's needed for a"; mes "The only skill that's needed for a";
mes "Swordman is ^FF0000Bash^000000! Bash, Bash and"; mes "Swordman is ^FF0000Bash^000000! Bash, Bash and";
mes "ONLY ^FF0000BASH^000000! No need to waste time"; mes "ONLY ^FF0000BASH^000000! No need to waste time";
mes "and effort for smaller skills!"; mes "and effort for smaller skills!";

2
npc/quests/skills/knight_skills.txt
View File

@ -262,7 +262,7 @@ prontera,69,351,0 script #Observer 111,{
mes "- enough. -"; mes "- enough. -";
close; close;
} }
mes "- You can see the Calvary Division -"; mes "- You can see the Cavalry Division -";
mes "- training very hard. -"; mes "- training very hard. -";
mes "- The loud shoutings are quite annoying, -"; mes "- The loud shoutings are quite annoying, -";
mes "- but they are working hard -"; mes "- but they are working hard -";

9
npc/warps/fields/veins_fild.txt
View File

@ -39,12 +39,9 @@ ve_fild05,359,192,0 warp veinswarp5019 1,1,ve_fild06,84,179
ve_fild04,115,49,0 warp veinswarp5020 1,1,ve_fild06,84,179 ve_fild04,115,49,0 warp veinswarp5020 1,1,ve_fild06,84,179
ve_fild06,88,176,0 script veinswarp5021 45,1,1,{ ve_fild06,88,176,0 script veinswarp5021 45,1,1,{
switch(rand(2)){ if (rand(2))
case 1:
warp "ve_fild04",115,52; warp "ve_fild04",115,52;
break; else
default:
warp "ve_fild05",354,192; warp "ve_fild05",354,192;
break; end;
}
} }

3
src/map/status.c
View File

@ -5750,12 +5750,13 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
val4 = BF_WEAPON|BF_MISC; //Type val4 = BF_WEAPON|BF_MISC; //Type
break; break;
case SC_ENCHANTARMS: case SC_ENCHANTARMS:
//end previous enchants
skill_enchant_elemental_end(bl,type);
//Make sure the received element is valid. //Make sure the received element is valid.
if (val2 >= ELE_MAX) if (val2 >= ELE_MAX)
val2 = val2%ELE_MAX; val2 = val2%ELE_MAX;
else if (val2 < 0) else if (val2 < 0)
val2 = rand()%ELE_MAX; val2 = rand()%ELE_MAX;
skill_enchant_elemental_end(bl,type);
break; break;
case SC_ARMOR_ELEMENT: case SC_ARMOR_ELEMENT:
//Place here SCs that have no SCB_* data, no skill associated, no ICON //Place here SCs that have no SCB_* data, no skill associated, no ICON