diff options
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | conf-tmpl/map_athena.conf | 1 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/type/indoors.txt | 104 | ||||
| -rw-r--r-- | db/Changelog.txt | 34 | ||||
| -rw-r--r-- | npc/cities/valkyrie.txt | 296 | ||||
| -rw-r--r-- | npc/guild/Extras/woe_warper.txt | 96 | ||||
| -rw-r--r-- | src/char_sql/char.c | 10 |
7 files changed, 277 insertions, 265 deletions
diff --git a/Changelog.txt b/Changelog.txt index fe13502fd..7d155a84d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 11/17 + * Added stub-handler for packet 0x3090 into char_sql [MouseJstr] * Fixed a crash in the afm reading/closing code [MouseJstr] * Added skill_steal_type to battle_athena.conf for the new (but unconfirmed) stealing formula [celest] diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf index 386e88f4c..72e9c8a12 100644 --- a/conf-tmpl/map_athena.conf +++ b/conf-tmpl/map_athena.conf @@ -319,6 +319,7 @@ npc: npc/other/blackjack.txt // Dev NPCs npc: npc/other/devnpc.txt +npc: npc/other/poetry/ayothaya.txt //= MC Cameri's Bank NPC //npc: npc/other/mc_cameri/bank.txt diff --git a/conf-tmpl/mapflag/type/indoors.txt b/conf-tmpl/mapflag/type/indoors.txt index c7312cd9b..56c5060da 100644 --- a/conf-tmpl/mapflag/type/indoors.txt +++ b/conf-tmpl/mapflag/type/indoors.txt @@ -1,53 +1,53 @@ -//===== eAthena Script =======================================
-//= Map Flags for Indoors Buildings or Dungeons
-//===== By: ==================================================
-//= eAthena Dev Team
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//= 'indoors' turns off all night effects.
-//============================================================
-
-alberta_in.gat mapflag indoors
-izlude_in.gat mapflag indoors
-gef_tower.gat mapflag indoors
-geffen_in.gat mapflag indoors
-moc_castle.gat mapflag indoors
-morocc_in.gat mapflag indoors
-payon_in01.gat mapflag indoors
-payon_in02.gat mapflag indoors
-payon_in03.gat mapflag indoors
-prt_in.gat mapflag indoors
-prt_castle.gat mapflag indoors
-prt_church.gat mapflag indoors
-in_orcs01.gat mapflag indoors
-aldeba_in.gat mapflag indoors
-monk_in.gat mapflag indoors
-prt_are_in.gat mapflag indoors
-arena_room.gat mapflag indoors
-sword_1-1.gat mapflag indoors
-sword_2-1.gat mapflag indoors
-sword_3-1.gat mapflag indoors
-xmas_in.gat mapflag indoors
-cmd_in01.gat mapflag indoors
-cmd_in02.gat mapflag indoors
-yuno_in01.gat mapflag indoors
-yuno_in03.gat mapflag indoors
-yuno_in04.gat mapflag indoors
-yuno_in05.gat mapflag indoors
-alde_alche.gat mapflag indoors
-sec_in01.gat mapflag indoors
-ama_in01.gat mapflag indoors
-ama_in02.gat mapflag indoors
-gon_in.gat mapflag indoors
-um_in.gat mapflag indoors
-nif_in.gat mapflag indoors
-lou_in01.gat mapflag indoors
-lou_in02.gat mapflag indoors
-jawaii_in.gat mapflag indoors
-que_god01.gat mapflag indoors
-que_god02.gat mapflag indoors
-ayo_in01.gat mapflag indoors
+//===== eAthena Script ======================================= +//= Map Flags for Indoors Buildings or Dungeons +//===== By: ================================================== +//= eAthena Dev Team +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= +//===== Description: ========================================= +//= 'indoors' turns off all night effects. +//============================================================ + +alberta_in.gat mapflag indoors +izlude_in.gat mapflag indoors +gef_tower.gat mapflag indoors +geffen_in.gat mapflag indoors +moc_castle.gat mapflag indoors +morocc_in.gat mapflag indoors +payon_in01.gat mapflag indoors +payon_in02.gat mapflag indoors +payon_in03.gat mapflag indoors +prt_in.gat mapflag indoors +prt_castle.gat mapflag indoors +prt_church.gat mapflag indoors +in_orcs01.gat mapflag indoors +aldeba_in.gat mapflag indoors +monk_in.gat mapflag indoors +prt_are_in.gat mapflag indoors +arena_room.gat mapflag indoors +sword_1-1.gat mapflag indoors +sword_2-1.gat mapflag indoors +sword_3-1.gat mapflag indoors +xmas_in.gat mapflag indoors +cmd_in01.gat mapflag indoors +cmd_in02.gat mapflag indoors +yuno_in01.gat mapflag indoors +yuno_in03.gat mapflag indoors +yuno_in04.gat mapflag indoors +yuno_in05.gat mapflag indoors +alde_alche.gat mapflag indoors +sec_in01.gat mapflag indoors +ama_in01.gat mapflag indoors +ama_in02.gat mapflag indoors +gon_in.gat mapflag indoors +um_in.gat mapflag indoors +nif_in.gat mapflag indoors +lou_in01.gat mapflag indoors +lou_in02.gat mapflag indoors +jawaii_in.gat mapflag indoors +que_god01.gat mapflag indoors +que_god02.gat mapflag indoors +ayo_in01.gat mapflag indoors ayo_in02.gat mapflag indoors
\ No newline at end of file diff --git a/db/Changelog.txt b/db/Changelog.txt index 07d575699..294327e92 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -1,18 +1,18 @@ - Post here any database changes ok guys? [shadowlady]
-
- ==== progress ====
- Ayathoya mobs == Added but using poring stats ( ? )
- Ayathoya items == Added but no effect ( all are "ect" itens)
- Skill databases == celest working on them i believe.
-
-11/16
- item 7110 fixed name -> Broken Sword (part of Bongun quest) [Lupus]
-
-11/16 - Added BaseJob to const.txt [celest]
-
-11/15
- - Minor fix on wedding skills, to use 15% of SP/HP . [shadowlady]
- - ?
-
-11/14
+ Post here any database changes ok guys? [shadowlady] + + ==== progress ==== + Ayathoya mobs == Added but using poring stats ( ? ) + Ayathoya items == Added but no effect ( all are "ect" itens) + Skill databases == celest working on them i believe. + +11/16 + item 7110 fixed name -> Broken Sword (part of Bongun quest) [Lupus] + +11/16 - Added BaseJob to const.txt [celest] + +11/15 + - Minor fix on wedding skills, to use 15% of SP/HP . [shadowlady] + - ? + +11/14 - Fixed Golden Thief Bug Mode!(+detects hidden) [Lupus]
\ No newline at end of file diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 4f42804ee..6c0c4a67c 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -1,149 +1,149 @@ -// Valkyrie Replacement after kRO.
-// The Jobquest from kRO on how to advance to a Reborn class.
-// Made by: Nana
-// 1.01 bugfixex by Lupus
-
-
-// -== Warp's needed! ==-
-valkyrie.gat,48,73,0 warp valk01 1,1,valkyrie.gat,48,64,0
-valkyrie.gat,48,66,0 warp valk01 1,1,valkyrie.gat,48,75,0
-
-// -== Book of Ymir (Heavens Door) ==-
-yuno_in02.gat,93,207,0 script Book of Ymir 111,{
- if(valkyrie_Q == 1) goto L_Faded;
- if(valkyrie_Q == 2) goto L_Start;
- mes "[Book of Ymir]";
- mes ". . . . .";
- close;
-
-L_Faded:
- mes "[Book of Ymir]";
- mes "*The book opens as you aproach it*";
- next;
- mes "[Book of Ymir]";
- mes "Those seeking the final foretreess in this world shall venture through hardships let alone to mankind. Venturing through rough times, helped by friends and loved ones, one can finaly after alot of work and commitment see the true view of the world and then.. go beond it.";
- next;
- mes "[Book of Ymir]";
- mes "*After reading the two first pages you turn the other page, and watches the words fade away as you try to read them...";
- close;
-
-L_Start:
- mes "[Book of Ymir]";
- mes "*The book opens as you aproach it*";
- next;
- mes "[Book of Ymir]";
- mes "Those seeking the final foretreess in this world shall venture through hardships let alone to mankind. Venturing through rough times, helped by friends and loved ones, one can finaly after alot of work and commitment see the true view of the world and then.. go beond it.";
- next;
- mes "[Book of Ymir]";
- mes "*After reading the first two pages you flip the last one and continues to read..";
- next;
- mes "[Book of Ymir]";
- mes "That is when the god's and goddess of this world comes forth towards you in all disguise, checking you though. Reading your mind, thoughts and true feeling of the heart.";
- mes "If the god's, decended from the world along time ago, accepts you into the halls of Valkyrie, high up above the clouds in the sacred realm of Valkyrie, into gods light you will become reborn, and sendt out to face the world once again.";
- next;
- mes "[Book of Ymir]";
- mes "And only after then, the decended ones will aprove you to the highest obedience.. Into the warmth of Valkyrie, you will be welcomed by the gods themself.";
- next;
- mes "[Book og Ymir]";
- mes "*As you close the book a strange ray of light sourounds you and you suddently feel light. Everything around you fades away and all you can see left is white before you pass out.*";
- warp "valkyrie",48,9;
- set valkyrie_Q,0;
- close;
-}
-
-// -== The Librarian that watches the "Book of Ymir" ==-
-yuno_in02.gat,91,176,5 script Librarian 754,{
- if(readparam(19) >= 7) goto L_Pay;
- mes "[Librarian]";
- mes "Have a look around, but dont touch the book. Only a few chosen one can read its wise words.";
- close;
-
-L_Pay:
- mes "[Librarian]";
- mes "You seem like a worthy human.";
- mes "I, the 78th Librarian of the secret order sworn to protect this book wont thread lightly on you.";
- mes "In order to let me allow you to view into this wonderous book, you have to do two things for me.";
- next;
- mes "[Librarian]";
- mes "One. You have to pay me 1,285,000 zeny. Remember that you need the accurate amount. Not over or under 1,285,000z.";
- mes "Two. You have to venture deep inside of Yuno castle, into the Heart of Ymir.";
- mes "Remember that you cannot view the book unless you have done this.";
- mes "Now go, brave one.";
- menu "Pay now",pay_now,"Close",-;
- close;
-
-pay_now:
- if(readparam(20) < 1285000) goto accurate_z;
- if(readparam(20) > 1285000) goto accurate_z;
- mes "[Librarian]";
- mes "Go now, into Heart of Ymir";
- mes "There, you'll find the last pice of information before you can open the book.";
- set valkyrie_Q,1;
- set zeny,zeny-1285000;
- close;
-
-accurate_z:
- mes "[Librarian]";
- mes "You didnt bring me the accurate number of zeny i wanted. Bring me back only 1,285,000 zeny!";
- mes "Not more, nor less.";
- close;
-}
-
-// -== The Heart of Ymir ==-
-yuno_in05.gat,80,44,0 script Heart of Ymir 803,{
- if(valkyrie_Q < 1) goto not_applicable;
- if(valkyrie_Q == 1) goto L_Listen;
- if(valkyrie_Q == 2) goto L_Done;
- mes "[Heart of Ymir]";
- mes "The book wont open.";
- close;
-
-not_applicable:
- mes "[Heart of Ymir]";
- mes "The book wont open.";
- mes "It seems like you have to pay the Librarian to open this book first!";
- close;
-
-L_Listen:
- mes "[Heart of Ymir]";
- mes "Thus upon hard times and our self esteem is at it's lowest, then is when our faith have to be the strongest.";
- mes "For aeon's the secret guardians of the path to heaven has protected the sacret gate from evil spirits entering it.";
- mes "Thus, the bonds became to weaken over time.. Thats when the Legion of Sages started recruiting and making young, brave, quick minded mages, sages, teaching them the laws and propositions of our world.";
- next;
- mes "[Heart of Ymir]";
- mes "Aeons passed and the Sages grew stronger in both min and forces. Until they all were feared throughout the monsters world.";
- mes "Now, after listening to my words of wisdom, please advance to the Book of Ymir and give yourself in to god's light.";
- mes "If you are pure of heart and have no evil intentions, the gates of dawn will open for you and take you in...";
- set valkyrie_Q,2;
- close;
-
-L_Done:
- mes "[Heart of Ymir]";
- mes "I have nothing more to teach you, nor to tell you.";
- close;
-}
-
-// -== Researcher of the Book of Ymir ==-
-yuno_in02.gat,90,77,4 script Researcher 744,{
- mes "[Researcher]";
- mes "Argh, where is it!?";
- mes "They said that it would be around here somewhere..";
- mes "Maybe i have to look deeper into this castle..";
- close;
-}
-
-// -== Valhallana ==-
-valkyrie.gat,48,86,6 script Valkyrie 811,{
- if(readparam(19) < 7) goto L_cannot;
- mes "[Valhallana]";
- mes "Welcome to Valkyrie "+strcharinfo(0)+", from this point of, there is no returning back.";
- mes "Please go over there, to the person representing your class.";
- mes "Good Luck.";
- close;
-
-L_cannot:
- mes "[Valhallana]";
- mes "You don't belong here yet.";
- warp "prontera",100,100;
- close;
+// Valkyrie Replacement after kRO. +// The Jobquest from kRO on how to advance to a Reborn class. +// Made by: Nana +// 1.01 bugfixex by Lupus + + +// -== Warp's needed! ==- +valkyrie.gat,48,73,0 warp valk01 1,1,valkyrie.gat,48,64,0 +valkyrie.gat,48,66,0 warp valk01 1,1,valkyrie.gat,48,75,0 + +// -== Book of Ymir (Heavens Door) ==- +yuno_in02.gat,93,207,0 script Book of Ymir 111,{ + if(valkyrie_Q == 1) goto L_Faded; + if(valkyrie_Q == 2) goto L_Start; + mes "[Book of Ymir]"; + mes ". . . . ."; + close; + +L_Faded: + mes "[Book of Ymir]"; + mes "*The book opens as you aproach it*"; + next; + mes "[Book of Ymir]"; + mes "Those seeking the final foretreess in this world shall venture through hardships let alone to mankind. Venturing through rough times, helped by friends and loved ones, one can finaly after alot of work and commitment see the true view of the world and then.. go beond it."; + next; + mes "[Book of Ymir]"; + mes "*After reading the two first pages you turn the other page, and watches the words fade away as you try to read them..."; + close; + +L_Start: + mes "[Book of Ymir]"; + mes "*The book opens as you aproach it*"; + next; + mes "[Book of Ymir]"; + mes "Those seeking the final foretreess in this world shall venture through hardships let alone to mankind. Venturing through rough times, helped by friends and loved ones, one can finaly after alot of work and commitment see the true view of the world and then.. go beond it."; + next; + mes "[Book of Ymir]"; + mes "*After reading the first two pages you flip the last one and continues to read.."; + next; + mes "[Book of Ymir]"; + mes "That is when the god's and goddess of this world comes forth towards you in all disguise, checking you though. Reading your mind, thoughts and true feeling of the heart."; + mes "If the god's, decended from the world along time ago, accepts you into the halls of Valkyrie, high up above the clouds in the sacred realm of Valkyrie, into gods light you will become reborn, and sendt out to face the world once again."; + next; + mes "[Book of Ymir]"; + mes "And only after then, the decended ones will aprove you to the highest obedience.. Into the warmth of Valkyrie, you will be welcomed by the gods themself."; + next; + mes "[Book og Ymir]"; + mes "*As you close the book a strange ray of light sourounds you and you suddently feel light. Everything around you fades away and all you can see left is white before you pass out.*"; + warp "valkyrie",48,9; + set valkyrie_Q,0; + close; +} + +// -== The Librarian that watches the "Book of Ymir" ==- +yuno_in02.gat,91,176,5 script Librarian 754,{ + if(readparam(19) >= 7) goto L_Pay; + mes "[Librarian]"; + mes "Have a look around, but dont touch the book. Only a few chosen one can read its wise words."; + close; + +L_Pay: + mes "[Librarian]"; + mes "You seem like a worthy human."; + mes "I, the 78th Librarian of the secret order sworn to protect this book wont thread lightly on you."; + mes "In order to let me allow you to view into this wonderous book, you have to do two things for me."; + next; + mes "[Librarian]"; + mes "One. You have to pay me 1,285,000 zeny. Remember that you need the accurate amount. Not over or under 1,285,000z."; + mes "Two. You have to venture deep inside of Yuno castle, into the Heart of Ymir."; + mes "Remember that you cannot view the book unless you have done this."; + mes "Now go, brave one."; + menu "Pay now",pay_now,"Close",-; + close; + +pay_now: + if(readparam(20) < 1285000) goto accurate_z; + if(readparam(20) > 1285000) goto accurate_z; + mes "[Librarian]"; + mes "Go now, into Heart of Ymir"; + mes "There, you'll find the last pice of information before you can open the book."; + set valkyrie_Q,1; + set zeny,zeny-1285000; + close; + +accurate_z: + mes "[Librarian]"; + mes "You didnt bring me the accurate number of zeny i wanted. Bring me back only 1,285,000 zeny!"; + mes "Not more, nor less."; + close; +} + +// -== The Heart of Ymir ==- +yuno_in05.gat,80,44,0 script Heart of Ymir 803,{ + if(valkyrie_Q < 1) goto not_applicable; + if(valkyrie_Q == 1) goto L_Listen; + if(valkyrie_Q == 2) goto L_Done; + mes "[Heart of Ymir]"; + mes "The book wont open."; + close; + +not_applicable: + mes "[Heart of Ymir]"; + mes "The book wont open."; + mes "It seems like you have to pay the Librarian to open this book first!"; + close; + +L_Listen: + mes "[Heart of Ymir]"; + mes "Thus upon hard times and our self esteem is at it's lowest, then is when our faith have to be the strongest."; + mes "For aeon's the secret guardians of the path to heaven has protected the sacret gate from evil spirits entering it."; + mes "Thus, the bonds became to weaken over time.. Thats when the Legion of Sages started recruiting and making young, brave, quick minded mages, sages, teaching them the laws and propositions of our world."; + next; + mes "[Heart of Ymir]"; + mes "Aeons passed and the Sages grew stronger in both min and forces. Until they all were feared throughout the monsters world."; + mes "Now, after listening to my words of wisdom, please advance to the Book of Ymir and give yourself in to god's light."; + mes "If you are pure of heart and have no evil intentions, the gates of dawn will open for you and take you in..."; + set valkyrie_Q,2; + close; + +L_Done: + mes "[Heart of Ymir]"; + mes "I have nothing more to teach you, nor to tell you."; + close; +} + +// -== Researcher of the Book of Ymir ==- +yuno_in02.gat,90,77,4 script Researcher 744,{ + mes "[Researcher]"; + mes "Argh, where is it!?"; + mes "They said that it would be around here somewhere.."; + mes "Maybe i have to look deeper into this castle.."; + close; +} + +// -== Valhallana ==- +valkyrie.gat,48,86,6 script Valkyrie 811,{ + if(readparam(19) < 7) goto L_cannot; + mes "[Valhallana]"; + mes "Welcome to Valkyrie "+strcharinfo(0)+", from this point of, there is no returning back."; + mes "Please go over there, to the person representing your class."; + mes "Good Luck."; + close; + +L_cannot: + mes "[Valhallana]"; + mes "You don't belong here yet."; + warp "prontera",100,100; + close; }
\ No newline at end of file diff --git a/npc/guild/Extras/woe_warper.txt b/npc/guild/Extras/woe_warper.txt index 91e6be6d1..801df78c7 100644 --- a/npc/guild/Extras/woe_warper.txt +++ b/npc/guild/Extras/woe_warper.txt @@ -1,48 +1,48 @@ -//Custom WOE warper 1.1 [Lupus]
-//you can get to Novice Castles, too
-
-n_castle.gat,102,107,5 script Vimta 757,{
- mes "[Vimta]";
- mes "Hello, "+ strcharinfo(0) +"! What would you like?";
- next;
- menu "Warp me to Prontera",-,"Cancel",LEnd;
-
- warp "prontera.gat",155,177+rand(5);
- close;
- LEnd:
- mes "[Vimta]";
- mes "Ok. I'll wait here.";
- close;
-}
-
-prontera.gat,130,217,5 script Vimta 757,{
- mes "[Vimta]";
- mes "Hello there! I'm a WOE representative, Vimta.";
- if (getcharid(2) < 1000 ) mes "You are not a guild member, "+ strcharinfo(0) +"? Naff off for now.";
- if (getcharid(2) < 1000 ) close;
- if (agitcheck(0) == 0) mes "When WOE is off I can warp you to Novice Castles only:";
- if (agitcheck(0) != 0) mes "I can warp you to any Castle:";
- next;
- if (agitcheck(0) == 0) menu "Novice Castles",novice_cas,"Cancel",-;
- if (agitcheck(0) != 0) menu "Prontera Castles",prtg_cas,"Payon Castles",payg_cas,"Geffen Castles",gefg_cas,"Aldebaran Castles",aldeg_cas,"Novice Castles",novice_cas,"Cancel",-;
-
- mes "[Vimta]";
- mes "Don't think too long, War of Emperium is such a cool thing.";
- close;
-
- prtg_cas:
- warp "prt_gld.gat", 159, 38; close;
-
-
- payg_cas:
- warp "pay_gld.gat", 202, 173; close;
-
- gefg_cas:
- warp "gef_fild13.gat", 270, 225; close;
-
- aldeg_cas:
- warp "alde_gld.gat", 186, 157; close;
-
- novice_cas:
- warp "n_castle.gat", 102, 103+rand(5); close;
-}
+//Custom WOE warper 1.1 [Lupus] +//you can get to Novice Castles, too + +n_castle.gat,102,107,5 script Vimta 757,{ + mes "[Vimta]"; + mes "Hello, "+ strcharinfo(0) +"! What would you like?"; + next; + menu "Warp me to Prontera",-,"Cancel",LEnd; + + warp "prontera.gat",155,177+rand(5); + close; + LEnd: + mes "[Vimta]"; + mes "Ok. I'll wait here."; + close; +} + +prontera.gat,130,217,5 script Vimta 757,{ + mes "[Vimta]"; + mes "Hello there! I'm a WOE representative, Vimta."; + if (getcharid(2) < 1000 ) mes "You are not a guild member, "+ strcharinfo(0) +"? Naff off for now."; + if (getcharid(2) < 1000 ) close; + if (agitcheck(0) == 0) mes "When WOE is off I can warp you to Novice Castles only:"; + if (agitcheck(0) != 0) mes "I can warp you to any Castle:"; + next; + if (agitcheck(0) == 0) menu "Novice Castles",novice_cas,"Cancel",-; + if (agitcheck(0) != 0) menu "Prontera Castles",prtg_cas,"Payon Castles",payg_cas,"Geffen Castles",gefg_cas,"Aldebaran Castles",aldeg_cas,"Novice Castles",novice_cas,"Cancel",-; + + mes "[Vimta]"; + mes "Don't think too long, War of Emperium is such a cool thing."; + close; + + prtg_cas: + warp "prt_gld.gat", 159, 38; close; + + + payg_cas: + warp "pay_gld.gat", 202, 173; close; + + gefg_cas: + warp "gef_fild13.gat", 270, 225; close; + + aldeg_cas: + warp "alde_gld.gat", 186, 157; close; + + novice_cas: + warp "n_castle.gat", 102, 103+rand(5); close; +} diff --git a/src/char_sql/char.c b/src/char_sql/char.c index fbd7ddda4..d436eb631 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1902,6 +1902,16 @@ int parse_frommap(int fd) { RFIFOSKIP(fd,6); break; + case 0x3090: + { + int r = inter_parse_frommap(fd); + if (r == 1) break; // processed + if (r == 2) return 0; // need more packet + } + + printf("parse_frommap: unsupported packet %x! \n", RFIFOW(fd,0)); + break; + default: // inter server - packet { |