Skip to content
Permalink
Browse files
Merge pull request #981 from rathena/woe_te-restrictions 
WoE:Training Edition implementation
* Added a new version of WoE, WoE:TE which forbids 3rd class and 2nd expanded class from joining.
  - 10 new WoE castles.
  - New zone for job_noenter_map.txt
  - Various items are restricted.
* New monsters for the guild dungeon.
  • Loading branch information
@secretdataz
secretdataz committed Oct 1, 2016
2 parents 3b09de1 + 42ce38c commit 7a011ecd3491adcd8ff82305d8e6fa9915c2a0d9
Showing with 7,107 additions and 315 deletions.
  1. +1 −1 conf/battle/items.conf
  2. +8 −2 conf/msg_conf/map_msg.conf
  3. +26 −9 db/castle_db.txt
  4. +1 −0 db/import-tmpl/job_noenter_map.txt
  5. +2 −0 db/pre-re/item_noequip.txt
  6. +1 −0 db/pre-re/job_noenter_map.txt
  7. +2 −7 db/pre-re/skill_nocast_db.txt
  8. +3 −2 db/re/item_db.txt
  9. +212 −96 db/re/item_noequip.txt
  10. +67 −0 db/re/job_noenter_map.txt
  11. +48 −48 db/re/mob_db.txt
  12. +1 −1 db/re/mob_race2_db.txt
  13. +454 −0 db/re/mob_skill_db.txt
  14. +18 −0 db/re/quest_db.txt
  15. +41 −5 db/re/skill_nocast_db.txt
  16. +284 −0 db/status_disabled.txt
  17. +13 −0 doc/mapflags.txt
  18. +40 −9 doc/script_commands.txt
  19. +2 −0 npc/mapflag/gvg.txt
  20. +182 −0 npc/re/guides/guides_woe_te.txt
  21. +1,218 −0 npc/re/guild3/agit_main_te.txt
  22. +51 −0 npc/re/guild3/agit_start_te.txt
  23. +72 −0 npc/re/guild3/te_aldecas1.txt
  24. +67 −0 npc/re/guild3/te_aldecas2.txt
  25. +70 −0 npc/re/guild3/te_aldecas3.txt
  26. +72 −0 npc/re/guild3/te_aldecas4.txt
  27. +71 −0 npc/re/guild3/te_aldecas5.txt
  28. +65 −0 npc/re/guild3/te_prtcas01.txt
  29. +67 −0 npc/re/guild3/te_prtcas02.txt
  30. +65 −0 npc/re/guild3/te_prtcas03.txt
  31. +65 −0 npc/re/guild3/te_prtcas04.txt
  32. +63 −0 npc/re/guild3/te_prtcas05.txt
  33. +18 −1 npc/re/mapflag/gvg.txt
  34. +15 −0 npc/re/mapflag/nobranch.txt
  35. +16 −9 npc/re/mapflag/noicewall.txt
  36. +15 −0 npc/re/mapflag/nomemo.txt
  37. +17 −8 npc/re/mapflag/nosave.txt
  38. +23 −0 npc/re/mapflag/noteleport.txt
  39. +24 −0 npc/re/mapflag/nowarp.txt
  40. +15 −8 npc/re/mapflag/nowarpto.txt
  41. +7 −8 npc/re/mapflag/restricted.txt
  42. +144 −0 npc/re/merchants/te_merchant.txt
  43. +30 −0 npc/re/mobs/dungeons/teg_dun.txt
  44. +27 −0 npc/re/other/Global_Functions.txt
  45. +1,007 −0 npc/re/quests/woe_te/te_goditem_alde1.txt
  46. +1,004 −0 npc/re/quests/woe_te/te_goditem_prt01.txt
  47. +42 −0 npc/re/quests/woe_te/te_mission_alde.txt
  48. +568 −0 npc/re/quests/woe_te/te_mission_main.txt
  49. +41 −0 npc/re/quests/woe_te/te_mission_prt.txt
  50. +9 −1 npc/re/scripts_athena.conf
  51. +13 −0 npc/re/scripts_guild.conf
  52. +1 −0 npc/re/scripts_monsters.conf
  53. +288 −1 npc/re/warps/guildcastles.txt
  54. +73 −23 src/map/atcommand.c
  55. +2 −2 src/map/battle.c
  56. +1 −1 src/map/clif.c
  57. +47 −23 src/map/guild.c
  58. +4 −0 src/map/guild.h
  59. +3 −3 src/map/itemdb.c
  60. +1 −1 src/map/log.c
  61. +3 −2 src/map/map.c
  62. +23 −10 src/map/map.h
  63. +16 −1 src/map/mob.c
  64. +19 −0 src/map/npc.c
  65. +3 −2 src/map/pc.c
  66. +210 −17 src/map/script.c
  67. +3 −0 src/map/script_constants.h
  68. +14 −8 src/map/skill.c
  69. +9 −6 src/map/status.c
2 conf/battle/items.conf
View file
@@ -81,7 +81,7 @@ autospell_stacking: no
// Allow the consumption of usable items that are disabled by item_noequip.txt? (Note 1)
// no = can't be consumed
// yes = consumed with no effect
allow_consume_restricted_item: yes
allow_consume_restricted_item: no

// Allow equipping items that are disabled by item_noequip.txt? (Note 1)
// no = can't be equipped and will be unequipped when entering the map
10 conf/msg_conf/map_msg.conf
View file
@@ -418,7 +418,7 @@
400: Usage: @jailfor <time> <character name>
401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
// WoE SE (@agitstart2)
// WoE SE (@agitstart2/@agitend2)
403: War of Emperium SE has been initiated.
404: War of Emperium SE is currently in progress.
405: War of Emperium SE has been ended.
@@ -795,7 +795,13 @@
747: The Baby is not a Novice.
748: A parent or Baby was not found.

//749-899 free
// WoE TE (@agitstart3/@agitend3)
749: War of Emperium TE has been initiated.
750: War of Emperium TE is currently in progress.
751: War of Emperium TE has been ended.
752: War of Emperium TE is currently not in progress.

//753-899 free

//------------------------------------
// More atcommands message
35 db/castle_db.txt
View file
@@ -9,18 +9,19 @@
// 04. OnGuildBreakEventName NPC unique name to invoke ::OnGuildBreak on, when a occupied
// castle is abandoned during guild break.

0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01 // kRO : Noisyubantian
1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02 // kRO : Hohensyubangawoo
2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03 // kRO : Nyirenverk
3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04 // kRO : Byirtsburi
// WOE FE castle
0,aldeg_cas01,Neuschwanstein,Agit#aldeg_cas01 // kRO : Noisyubantian
1,aldeg_cas02,Hohenschwangau,Agit#aldeg_cas02 // kRO : Hohensyubangawoo
2,aldeg_cas03,Nuernberg,Agit#aldeg_cas03 // kRO : Nyirenverk
3,aldeg_cas04,Wuerzburg,Agit#aldeg_cas04 // kRO : Byirtsburi
4,aldeg_cas05,Rothenburg,Agit#aldeg_cas05 // kRO : Rotenburk
5,gefg_cas01,Repherion,Agit#gefg_cas01 // kRO : Reprion
6,gefg_cas02,Eeyolbriggar,Agit#gefg_cas02 // kRO : Yolbriger
7,gefg_cas03,Yesnelph,Agit#gefg_cas03 // kRO : Isinlife
8,gefg_cas04,Bergel,Agit#gefg_cas04 // kRO : Berigel
8,gefg_cas04,Bergel,Agit#gefg_cas04 // kRO : Berigel
9,gefg_cas05,Mersetzdeitz,Agit#gefg_cas05 // kRO : Melsedetsu
10,payg_cas01,Bright Arbor,Agit#payg_cas01 // kRO : Mingting
11,payg_cas02,Scarlet Palace,Agit#payg_cas02 // kRO : Tiantan
11,payg_cas02,Scarlet Palace,Agit#payg_cas02 // kRO : Tiantan
12,payg_cas03,Holy Shadow,Agit#payg_cas03 // kRO : Fuying
13,payg_cas04,Sacred Altar,Agit#payg_cas04 // kRO : Honglou
14,payg_cas05,Bamboo Grove Hill,Agit#payg_cas05 // kRO : Zhulinxian
@@ -29,17 +30,33 @@
17,prtg_cas03,Fadhgridh,Agit#prtg_cas03 // kRO : Lazrigees
18,prtg_cas04,Skoegul,Agit#prtg_cas04 // kRO : Squagul
19,prtg_cas05,Gondul,Agit#prtg_cas05 // kRO : Guindull

// WOE NGuild castle
20,nguild_alde,Earth,Agit_N01
21,nguild_gef,Air,Agit_N02
22,nguild_pay,Water,Agit_N03
23,nguild_prt,Fire,Agit_N04

// WOE SE castle
24,schg_cas01,Himinn,Manager#schg_cas01 // kRO : Himinn
25,schg_cas02,Andlangr,Manager#schg_cas02 // kRO : Andlangr
26,schg_cas03,Viblainn,Manager#schg_cas03 // kRO : Viblainn
25,schg_cas02,Andlangr,Manager#schg_cas02 // kRO : Andlangr
26,schg_cas03,Viblainn,Manager#schg_cas03 // kRO : Viblainn
27,schg_cas04,Hljod,Manager#schg_cas04 // kRO : Hljod
28,schg_cas05,Skidbladnir,Manager#schg_cas05 // kRO : Skidbladnir
28,schg_cas05,Skidbladnir,Manager#schg_cas05 // kRO : Skidbladnir
29,arug_cas01,Mardol,Manager#arug_cas01 // kRO : Mardol
30,arug_cas02,Cyr,Manager#arug_cas02 // kRO : Cyr
31,arug_cas03,Horn,Manager#arug_cas03 // kRO : Horn
32,arug_cas04,Gefn,Manager#arug_cas04 // kRO : Gefn
33,arug_cas05,Bandis,Manager#arug_cas05 // kRO : Bandis

// WOE TE castle
34,te_aldecas1,Kafragarten 1,Manager_TE#Glaris
35,te_aldecas2,Kafragarten 2,Manager_TE#Defolty
36,te_aldecas3,Kafragarten 3,Manager_TE#Sorin
37,te_aldecas4,Kafragarten 4,Manager_TE#Bennit
38,te_aldecas5,Kafragarten 5,Manager_TE#W
39,te_prtcas01,Gloria 1,Manager_TE#Gaebolg
40,te_prtcas02,Gloria 2,Manager_TE#Richard
41,te_prtcas03,Gloria 3,Manager_TE#Wigner
42,te_prtcas04,Gloria 4,Manager_TE#Heine
43,te_prtcas05,Gloria 5,Manager_TE#Nerious
1 db/import-tmpl/job_noenter_map.txt
View file
@@ -10,6 +10,7 @@
// 2 - restricted in PVP
// 4 - restricted in GVG
// 8 - restricted in Battlegrounds
// 16 - restricted in WOE:TE castles
// Restricted zones - configured by 'restricted <number>' mapflag
// 32 - restricted in zone 1
// 64 - restricted in zone 2
2 db/pre-re/item_noequip.txt
View file
@@ -9,6 +9,7 @@
// 2 - restricted in PVP
// 4 - restricted in GVG
// 8 - restricted in Battlegrounds
// 16 - restricted in WOE:TE castles
// Restricted zones - configured by 'restricted <number>' mapflag
// 32 - restricted in zone 1
// 64 - restricted in zone 2
@@ -17,6 +18,7 @@
// 512 - restricted in zone 5
// 1024 - restricted in zone 6
// 2048 - restricted in zone 7
// 4096 - restricted in zone 8
//
// Passing negative value as flag will unset the flag instead.
//
1 db/pre-re/job_noenter_map.txt
View file
@@ -10,6 +10,7 @@
// 2 - restricted in PVP
// 4 - restricted in GVG
// 8 - restricted in Battlegrounds
// 16 - restricted in WOE:TE castles
// Restricted zones - configured by 'restricted <number>' mapflag
// 32 - restricted in zone 1
// 64 - restricted in zone 2
9 db/pre-re/skill_nocast_db.txt
View file
@@ -9,7 +9,7 @@
// 2 - cannot be used in PvP maps (use this instead of 1 for PK-mode servers)
// 4 - cannot be used in GvG maps
// 8 - cannot be used in Battleground maps
// 16 - cannot be cloned (clones will not copy this skill)
// 16 - cannot be used in WOE:TE castles
// Restricted zones - configured by 'restricted <number>' mapflag
// 32 - cannot be used in zone 1 maps
// 64 - cannot be used in zone 2 maps
@@ -18,6 +18,7 @@
// 512 - cannot be used in zone 5 maps
// 1024 - cannot be used in zone 6 maps
// 2048 - cannot be used in zone 7 maps
// 4096 - cannot be used in zone 8 maps
//
// Example:
// 8,6 // Endure cannot be used in PvP and GvG maps (2+4)
@@ -99,12 +100,6 @@
488,3 //CG_HERMODE
3013,3 //KO_KYOUGAKU

//----------------------------------------------------------------------------
// Clone Forbidden/pointless skills
//----------------------------------------------------------------------------
77,16 //PR_TURNUNDEAD
79,16 //PR_MAGNUS

//----------------------------------------------------------------------------
// Zone 1 - Aldebaran Turbo Track
//----------------------------------------------------------------------------
5 db/re/item_db.txt
View file
@@ -1288,7 +1288,7 @@
2017,Divine_Cross_,Divine Cross,5,20,,1500,120:210,,1,1,0x00008100,63,2,34,4,70,1,23,{ bonus bUnbreakableWeapon,1; bonus bAtkEle,Ele_Holy; bonus bDex,4; },{},{}
2018,Metal_Staff,Metal Staff,5,20,,0,50:70,,1,1,0x00818315,63,2,34,3,1,1,23,{ if(BaseJob==Job_Wizard) bonus bMatk,15; else if(BaseJob==Job_Sage) bonus bMatk,10; bonus bMatk,(getrefine()*5); .@i = min(BaseLevel/10,12); if(.@i>2) bonus bMatk,((.@i-2)*5); },{},{}
2019,TE_Woe_Two_Hand_Staff,TE Woe Two Hand Staff,5,0,,0,50:130,,1,0,0x00818315,63,2,34,3,40,1,23,{ bonus2 bMagicAddRace,RC_Player,20; bonus3 bAddEff,Eff_Stun,1000,ATF_MAGIC; bonus bHPRecovRate,5; bonus bSPRecovRate,5; },{},{}
2020,Jormungand,Jormungand,5,10,,3000,200:280,,,0,0x810200,63,2,34,4,1,,23,{ bonus bInt,20; bonus bUnbreakableWeapon,1; },{},{}
2020,Jormungand,Jormungand,5,10,,3000,200:280,,,0,0x810200,63,2,34,4,1,0,23,{ bonus bInt,20; bonus bUnbreakableWeapon,1; },{},{}
2021,Ganbantein,Ganbantein,5,0,,2000,100:320,,1,0,0x00000200,56,2,2,4,100,1,10,{ bonus bInt,25; bonus bDex,25; bonus3 bAddEff,Eff_Poison,1000,ATF_MAGIC; bonus3 bAutoSpell,"AB_SILENTIUM",1,100; bonus bUnbreakableWeapon,1; },{},{}
2022,Geffen_Staff,Staff of Geffen,5,20,,1000,100:300,,1,1,0x00000200,18,2,34,1,150,1,23,{ bonus bInt,20; },{},{}
2023,Tanos_Two-handed_Stick,Tanos Two-handed Stick,5,10,,1400,120:250,,,1,0x810200,63,2,34,4,120,1,23,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus bHealPower,18; bonus2 bHPLossRate,100,10000; },{},{}
@@ -1381,7 +1381,7 @@
2179,TE_Woe_Shield,TE Woe Shield,4,0,,0,,25,,0,0x000444A2,63,2,32,1,40,1,3,{ bonus bMdef,5; bonus bMaxHP,200; bonus2 bSubRace,RC_Player,20; },{},{}
2180,TE_Woe_Magic_Guard,TE Woe Magic Guard,4,0,,0,,5,,0,0x00818315,63,2,32,1,40,1,1,{ bonus bMdef,25; bonus bMaxSP,200; bonus2 bSubRace,RC_Player,10; },{},{}
2181,Hervor,Hervor,4,10,,1500,,100,,0,0xFFFFFFFF,63,2,32,,1,,2,{ bonus bMdef,5; bonus2 bSubRace,RC_All,30; bonus bUnbreakableArmor,1; },{},{}
2182,Hervor_Alvitr,Hervor Alvitr,4,0,,3000,,150,,0,0x000FDF80,56,2,32,1,100,0,2,{ bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_Player,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT; },{},{}
2182,Hervor_Alvitr,Hervor Alvitr,4,0,,3000,,150,,0,0x000FDF80,56,2,32,1,100,0,2,{ bonus bMdef,10; bonus bVit,20; bonus2 bSubRace,RC_All,30; bonus bUnbreakableShield,1; autobonus2 "{ sc_end SC_STUN; sc_end SC_SLEEP; sc_end SC_CURSE; sc_end SC_STONE; sc_end SC_POISON; sc_end SC_BLIND; sc_end SC_SILENCE; sc_end SC_BLEEDING; sc_end SC_CONFUSION; sc_end SC_FREEZE; bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Sleep,10000; bonus2 bResEff,Eff_Curse,10000; bonus2 bResEff,Eff_Stone,10000; bonus2 bResEff,Eff_Poison,10000; bonus2 bResEff,Eff_Blind,10000; bonus2 bResEff,Eff_Silence,10000; bonus2 bResEff,Eff_Bleeding,10000; bonus2 bResEff,Eff_Confusion,10000; bonus2 bResEff,Eff_Freeze,10000; }",10,60000,BF_SHORT; },{},{}
2183,Impr_Angel's_Safeguard,Advanced Angelic Guard,4,10000,,400,,30,,1,0x00000001,63,2,32,,99,1,1,{ bonus2 bSubRace,RC_Demon,5; bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_Neutral,-5; },{},{}
2185,Magic_Reflect,Magic Reflect,4,10,,1000,,50,,1,0xFFFFFFFF,63,2,32,,99,1,3,{ bonus bMdef,10; bonus bMagicDamageReturn,3+((getrefine()>=9) ? 3 : 0); },{},{}
2186,Great_Encyclopedia_Revision,Great Encyclopedia Revision,4,10,,200,0:5,50,,1,0x00810100,63,2,32,,99,1,4,{ bonus bInt,3; bonus bDex,2; .@r = getrefine(); bonus bCritical,3+((.@r >= 7) ? 2 : 0); if(.@r >= 9) bonus bMatk,5; },{},{}
@@ -6013,6 +6013,7 @@
11056,Elemental_Spirit_Guide,Elemental Spirit Guide,3,1000,,10,,,,,,,,,,,,,{},{},{}
11057,Feb_Sweets,February Sweets,3,20,,50,,,,,,,,,,,,,{},{},{}
11058,Novice_Combi_Book,Novice Combi Book,3,0,,10,,,,,,,,,,,,,{},{},{}
11059,WoE_TE_Rental_List,WoE TE Rental List,3,0,,10,,,,,,,,,,,,,{},{},{}
11060,Energy_Xtal_Combi_Book,Energy Crystal Book,3,0,,10,,,,,,,,,,,,,{},{},{}
11061,Honor_Proof_Exchange_List,Honor Proof Exchange List,3,20,,10,,,,,,,,,,,,,{},{},{}
//===================================================================

0 comments on commit 7a011ec

Please sign in to comment.