API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 27th, 2017
106
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 43.37 KB | None | 0 0
raw download clone embed print report
  1. Index: rewrite/Changelog-Trunk.txt
  2. ===================================================================
  3. --- rewrite/Changelog-Trunk.txt (revision 552)
  4. +++ rewrite/Changelog-Trunk.txt (working copy)
  5. @@ -1,5 +1,24 @@
  6. Date Added
  7.  
  8. +2010/11/07
  9. + * 'Exp gained' packets are now sent regardless of @showexp. @showexp can be enabled regardless of PACKETVER. [Gepard]
  10. + * Applied clif_equiplist fix by Ai4rei to prevent client crash when equipment is broken/repaired and PACKETVER >= 20100629. Follow-up to r14368. (bugreport:4459) [Gepard]
  11. +2010/11/02
  12. + * Fixed an issue where two ushorts were being strcmp'd. Follow-up to r14442. (bugreport:4523) [Paradox924X]
  13. + * Ensured character data is saved even when last map is the only value that has changed during save time. (bugreport:2218) [Paradox924X]
  14. + * Applied fix by Ai4rei to reintroduce mapName within charinfo packet when PACKETVER >= 20100803. Follow-up to r14432. (bugreport:4413) [Paradox924X]
  15. + * Updated script doc to appropriately describe the effects of close/close2 when used without a window on screen. (bugreport:898) [Paradox924X]
  16. + * Applied patch by xazax to clean up various bits of code across mapserver code. (bugreport:4512) [Paradox924X]
  17. +2010/11/01
  18. + * Changed Normal and Cash Food statuses so they do not stack and overwrite the other if the level (val1) is the same or higher. (bugreport:4519) [Paradox924X]
  19. + * Modified certain atcommands to use 64 bit arithmetic before capping a value to correct boundary logic for overflowing values. [Paradox924X]
  20. +2010/10/21
  21. + * Removed unused 'indoors' mapflag. [Gepard]
  22. +2010/10/17
  23. + * Fixed wrong char info packet size for clients after 2010-07-27. (bugreport:4413) [Gepard]
  24. +2010/10/13
  25. + * Prevented direct transformation into dummy jobs via @jobchange command. (bugreport:4227) [Paradox924X]
  26. + * Prevented @stpoint and @skpoint from causing overflows. [Paradox924X]
  27. 2010/10/11
  28. * Implemented official cash food behavior, including use delay, not being dispelled (including on death),
  29. distinct status effects and icons from the ordinary food types. (bugreport:2560) [Paradox924X]
  30. Index: rewrite/db/skill_db.txt
  31. ===================================================================
  32. --- rewrite/db/skill_db.txt (revision 552)
  33. +++ rewrite/db/skill_db.txt (working copy)
  34. @@ -407,7 +407,7 @@
  35. 315,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, BA_MUSICALLESSON,Music Lessons
  36. 316,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, BA_MUSICALSTRIKE,Melody Strike
  37. 317,0,8,4,0,0x41,0,5,1,no,0,0x20,0,misc,0, BA_DISSONANCE,Unchained Serenade
  38. -318,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0, BA_FROSTJOKE,Unbarring Octave
  39. +318,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0, BA_FROSTJOKER,Unbarring Octave
  40. 319,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0, BA_WHISTLE,Perfect Tablature
  41. 320,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0, BA_ASSASSINCROSS,Impressive Riff
  42. 321,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0, BA_POEMBRAGI,Magic Strings
  43. Index: rewrite/npc/battleground/kvm/kvm01.txt
  44. ===================================================================
  45. --- rewrite/npc/battleground/kvm/kvm01.txt (revision 552)
  46. +++ rewrite/npc/battleground/kvm/kvm01.txt (working copy)
  47. @@ -3,7 +3,7 @@
  48. //===== By: ==================================================
  49. //= ???, L0ne_W0lf
  50. //===== Current Version: =====================================
  51. -//= 1.1
  52. +//= 1.2
  53. //===== Compatible With: =====================================
  54. //= eAthena 1.0
  55. //===== Description: =========================================
  56. @@ -14,6 +14,9 @@
  57. //===== Additional Comments: =================================
  58. //= 1.0 First Version.
  59. //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
  60. +//= 1.2 Upated some announces and dialogs from iRO.
  61. +//= Changed how the scoreboard works slightly.
  62. +//= Removed the areapercentheals, and minor things.
  63. //============================================================
  64.  
  65. // Waiting Room NPCs
  66. @@ -60,23 +63,23 @@
  67. end;
  68. }
  69.  
  70. -bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 111
  71. -bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 111
  72. -bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 111
  73. -bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 111
  74. -bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 111
  75. -bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 111
  76. -bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 111
  77. +bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 139
  78. +bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 139
  79. +bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 139
  80. +bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 139
  81. +bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 139
  82. +bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 139
  83. +bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 139
  84.  
  85. -bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 111
  86. -bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 111
  87. -bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 111
  88. -bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 111
  89. -bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 111
  90. -bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 111
  91. -bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 111
  92. +bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 139
  93. +bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 139
  94. +bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 139
  95. +bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 139
  96. +bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 139
  97. +bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 139
  98. +bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 139
  99.  
  100. -bat_c01,54,128,3 script #A_camp_start01 111,4,4,{
  101. +bat_c01,54,128,3 script #A_camp_start01 139,4,4,{
  102. end;
  103.  
  104. OnInit:
  105. @@ -97,7 +100,7 @@
  106. end;
  107. }
  108.  
  109. -bat_c01,146,56,3 script #B_camp_start01 111,4,4,{
  110. +bat_c01,146,56,3 script #B_camp_start01 139,4,4,{
  111. end;
  112.  
  113. OnInit:
  114. @@ -143,9 +146,12 @@
  115. if( $@KvM01BG == 2 )
  116. {
  117. set .Guillaume_Count, .Guillaume_Count - 1;
  118. - set .Croix_Score, .Croix_Score + 1;
  119. - bg_updatescore "bat_c01",.Guillaume_Score,.Croix_Score;
  120. + bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count;
  121. if( .Guillaume_Count < 1 ) donpcevent "KvM01_BG::OnCroixWin";
  122. + else {
  123. + mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  124. + mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  125. + }
  126. }
  127. end;
  128.  
  129. @@ -155,9 +161,12 @@
  130. if( $@KvM01BG == 2 )
  131. {
  132. set .Croix_Count, .Croix_Count - 1;
  133. - set .Guillaume_Score, .Guillaume_Score + 1;
  134. - bg_updatescore "bat_c01",.Guillaume_Score,.Croix_Score;
  135. + bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count;
  136. if( .Croix_Count < 1 ) donpcevent "KvM01_BG::OnGuillaumeWin";
  137. + else {
  138. + mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  139. + mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  140. + }
  141. }
  142. end;
  143.  
  144. @@ -183,9 +192,6 @@
  145. // Warp Teams
  146. bg_warp $@KvM01BG_id1,"bat_c01",53,128;
  147. bg_warp $@KvM01BG_id2,"bat_c01",146,55;
  148. - // ScoreBoard
  149. - set .Guillaume_Score, 0;
  150. - set .Croix_Score, 0;
  151. initnpctimer;
  152. end;
  153.  
  154. @@ -247,34 +253,32 @@
  155. end;
  156. }
  157. set $@KvM01BG, 2; // Playing
  158. - areapercentheal "bat_c01",50,123,58,131,100,100;
  159. bg_warp $@KvM01BG_id1,"bat_c01",61,120;
  160. - areapercentheal "bat_c01",141,52,149,60,100,100;
  161. bg_warp $@KvM01BG_id2,"bat_c01",138,63;
  162. end;
  163.  
  164. OnTimer300000:
  165. - mapannounce "bat_c01", "KVM will be ending in 1 minute.",bc_map,"0x00ff00";
  166. + mapannounce "bat_c01", "1 minute remaining to finish the KVM battle.",bc_map,"0x00ff00";
  167. end;
  168.  
  169. OnTimer330000:
  170. - mapannounce "bat_c01", "KVM will be ending in 30 seconds.",bc_map,"0x00ff00";
  171. + mapannounce "bat_c01", "30 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  172. end;
  173.  
  174. OnTimer345000:
  175. - mapannounce "bat_c01", "KVM will be ending in 15 seconds.",bc_map,"0x00ff00";
  176. + mapannounce "bat_c01", "15 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  177. end;
  178.  
  179. OnTimer350000:
  180. - mapannounce "bat_c01", "KVM will be ending in 10 seconds.",bc_map,"0x00ff00";
  181. + mapannounce "bat_c01", "10 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  182. end;
  183.  
  184. OnTimer355000:
  185. - mapannounce "bat_c01", "KVM will be ending in 5 seconds.",bc_map,"0x00ff00";
  186. + mapannounce "bat_c01", "5 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  187. end;
  188.  
  189. OnTimer360000:
  190. - mapannounce "bat_c01", "KVM has ended.",bc_map,"0x00ff00";
  191. + mapannounce "bat_c01", "The KVM battle is over.",bc_map,"0x00ff00";
  192. if( .Croix_Count > .Guillaume_Count )
  193. donpcevent "KvM01_BG::OnCroixWin";
  194. else if( .Croix_Count < .Guillaume_Count )
  195. @@ -283,9 +287,9 @@
  196. { // Draw Game
  197. set $@KvM01BG, 3;
  198. set $@KvM01BG_Victory, 3;
  199. - mapannounce "bat_c01", "Number of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
  200. - mapannounce "bat_c01", "Number of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
  201. - mapannounce "bat_c01", "Regardless of the outcome of the two camps.",bc_map,"0x00ff00";
  202. + mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  203. + mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  204. + mapannounce "bat_c01", "This battle has ended in a draw.",bc_map,"0x00ff00";
  205. donpcevent "KvM01_BG::OnStop";
  206. }
  207. end;
  208. @@ -293,18 +297,18 @@
  209. OnGuillaumeWin:
  210. set $@KvM01BG, 3;
  211. set $@KvM01BG_Victory, 1;
  212. - mapannounce "bat_c01", "Guillaume camp victory.",bc_map,"0x00ff00";
  213. - mapannounce "bat_c01", "Congratulations to all Guillaume members.",bc_map,"0x00ff00";
  214. - mapannounce "bat_c01", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  215. + mapannounce "bat_c01", "Guillaume wins!",bc_map,"0x00ff00";
  216. + mapannounce "bat_c01", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
  217. + mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  218. donpcevent "KvM01_BG::OnStop";
  219. end;
  220.  
  221. OnCroixWin:
  222. set $@KvM01BG, 3;
  223. set $@KvM01BG_Victory, 2;
  224. - mapannounce "bat_c01", "Croix camp victory.",bc_map,"0x00ff00";
  225. - mapannounce "bat_c01", "Congratulations to all Croix members.",bc_map,"0x00ff00";
  226. - mapannounce "bat_c01", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  227. + mapannounce "bat_c01", "Croix wins!",bc_map,"0x00ff00";
  228. + mapannounce "bat_c01", "Congratulations to Croix members.",bc_map,"0x00ff00";
  229. + mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  230. donpcevent "KvM01_BG::OnStop";
  231. end;
  232.  
  233. @@ -321,8 +325,6 @@
  234. OnReset:
  235. set .Croix_Count, 0;
  236. set .Guillaume_Count, 0;
  237. - set .Croix_Score, 0;
  238. - set .Guillaume_Score, 0;
  239. set $@KvM01BG_Victory, 0;
  240. if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; set $@KvM01BG_id1, 0; }
  241. if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; set $@KvM01BG_id2, 0; }
  242. @@ -330,7 +332,7 @@
  243. disablenpc "KVM Officer#KVM01B";
  244. mapwarp "bat_c01","bat_room",154,150;
  245. maprespawnguildid "bat_c01",0,3; // Just in case someone else
  246. - bg_updatescore "bat_c01",0,0;
  247. + bg_updatescore "bat_c01",5,5;
  248. set $@KvM01BG, 0;
  249. donpcevent "KvM01_BG::OnReadyCheck"; // Maybe a game is ready to start
  250. end;
  251. @@ -353,10 +355,14 @@
  252. end;
  253.  
  254. OnTimer5000:
  255. - mapannounce "bat_c01", "If you do not claim your points now, you will not be able to.",bc_map,"0x00ff00";
  256. - mapannounce "bat_c01", "Please make sure to collect before the time expires.",bc_map,"0x00ff00";
  257. + mapannounce "bat_c01", "Unless you talk to the Officer, you cannot gain the points.",bc_map,"0x00ff00";
  258. + mapannounce "bat_c01", "Please be careful.",bc_map,"0x00ff00";
  259. end;
  260.  
  261. +OnTimer:55000:
  262. + mapannounce "bat_c01", "You will be sent back.",bc_map,"0x00ff00";
  263. + end;
  264. +
  265. OnTimer60000:
  266. stopnpctimer;
  267. donpcevent "KvM01_BG::OnReset";
  268. @@ -371,22 +377,23 @@
  269. if( $@KvM01BG_Victory == Bat_Team )
  270. { // Victory
  271. set kvm_point,kvm_point + 5;
  272. - mes "[Swandery]";
  273. - mes "Blessed Guillaume!!";
  274. - mes "Let's enjoy our glorious victory!";
  275. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  276. + mes "[KVM Officer]";
  277. + mes "Good Game.";
  278. + mes "May the glory of KVM be with you.";
  279. + mes "You aquire the winning points: 5";
  280. close2;
  281. }
  282. else
  283. { //
  284. set kvm_point,kvm_point + 1;
  285. - mes "[Swandery]";
  286. - mes "You lost, but you're dedicated to this battle.";
  287. - mes "This is a reward for your great dedication by Guillaume Marollo!";
  288. - mes "Just take this defeat a lesson, and later you would definitely learn.";
  289. + mes "[KVM Officer]";
  290. + mes "I am so sorry.";
  291. + mes "I wish you better luck next time.";
  292. + mes "You aquire the losing points: 1";
  293. close2;
  294. }
  295. bg_leave;
  296. + set Bat_Team,0;
  297. warp "bat_room",154,150;
  298. end;
  299. }
  300. @@ -399,37 +406,25 @@
  301. if( $@KvM01BG_Victory == Bat_Team )
  302. { // Victory
  303. set kvm_point,kvm_point + 5;
  304. - mes "[Swandery]";
  305. - mes "Blessed Croax!!";
  306. - mes "Let's enjoy our glorious victory!";
  307. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  308. + mes "[KVM Officer]";
  309. + mes "Good Game.";
  310. + mes "May the glory of KVM be with you.";
  311. + mes "You aquire the winning points: 5";
  312. close2;
  313. }
  314. else
  315. { //
  316. set kvm_point,kvm_point + 1;
  317. - mes "[Swandery]";
  318. - mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
  319. - mes "Even though we didn't win, we did our best.";
  320. - mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
  321. + mes "[KVM Officer]";
  322. + mes "I am so sorry.";
  323. + mes "I wish you better luck next time.";
  324. + mes "You aquire the losing points: 1";
  325. close2;
  326. }
  327. bg_leave;
  328. + set Bat_Team,0;
  329. warp "bat_room",154,150;
  330. end;
  331. }
  332. end;
  333. }
  334. -
  335. -// MapFlags
  336. -//============================================================
  337. -
  338. -bat_c01 mapflag battleground 2
  339. -bat_c01 mapflag nomemo
  340. -bat_c01 mapflag nosave SavePoint
  341. -bat_c01 mapflag noteleport
  342. -bat_c01 mapflag nowarp
  343. -bat_c01 mapflag nowarpto
  344. -bat_c01 mapflag noreturn
  345. -bat_c01 mapflag nobranch
  346. -bat_c01 mapflag nopenalty
  347. Index: rewrite/npc/battleground/kvm/kvm02.txt
  348. ===================================================================
  349. --- rewrite/npc/battleground/kvm/kvm02.txt (revision 552)
  350. +++ rewrite/npc/battleground/kvm/kvm02.txt (working copy)
  351. @@ -3,7 +3,7 @@
  352. //===== By: ==================================================
  353. //= ???, L0ne_W0lf
  354. //===== Current Version: =====================================
  355. -//= 1.1
  356. +//= 1.2
  357. //===== Compatible With: =====================================
  358. //= eAthena 1.0
  359. //===== Description: =========================================
  360. @@ -14,6 +14,9 @@
  361. //===== Additional Comments: =================================
  362. //= 1.0 First Version.
  363. //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
  364. +//= 1.2 Upated some announces and dialogs from iRO.
  365. +//= Changed how the scoreboard works slightly.
  366. +//= Removed the areapercentheals, and minor things.
  367. //============================================================
  368.  
  369. // Waiting Room NPCs
  370. @@ -60,23 +63,23 @@
  371. end;
  372. }
  373.  
  374. -bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 111
  375. -bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 111
  376. -bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 111
  377. -bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 111
  378. -bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 111
  379. -bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 111
  380. -bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 111
  381. +bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 139
  382. +bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 139
  383. +bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 139
  384. +bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 139
  385. +bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 139
  386. +bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 139
  387. +bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 139
  388.  
  389. -bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 111
  390. -bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 111
  391. -bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 111
  392. -bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 111
  393. -bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 111
  394. -bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 111
  395. -bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 111
  396. +bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 139
  397. +bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 139
  398. +bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 139
  399. +bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 139
  400. +bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 139
  401. +bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 139
  402. +bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 139
  403.  
  404. -bat_c02,54,128,3 script #A_camp_start02 111,4,4,{
  405. +bat_c02,54,128,3 script #A_camp_start02 139,4,4,{
  406. end;
  407.  
  408. OnInit:
  409. @@ -97,7 +100,7 @@
  410. end;
  411. }
  412.  
  413. -bat_c02,146,56,3 script #B_camp_start02 111,4,4,{
  414. +bat_c02,146,56,3 script #B_camp_start02 139,4,4,{
  415. end;
  416.  
  417. OnInit:
  418. @@ -143,9 +146,12 @@
  419. if( $@KvM02BG == 2 )
  420. {
  421. set .Guillaume_Count, .Guillaume_Count - 1;
  422. - set .Croix_Score, .Croix_Score + 1;
  423. - bg_updatescore "bat_c02",.Guillaume_Score,.Croix_Score;
  424. + bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count;
  425. if( .Guillaume_Count < 1 ) donpcevent "KvM02_BG::OnCroixWin";
  426. + else {
  427. + mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  428. + mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  429. + }
  430. }
  431. end;
  432.  
  433. @@ -155,9 +161,12 @@
  434. if( $@KvM02BG == 2 )
  435. {
  436. set .Croix_Count, .Croix_Count - 1;
  437. - set .Guillaume_Score, .Guillaume_Score + 1;
  438. - bg_updatescore "bat_c02",.Guillaume_Score,.Croix_Score;
  439. + bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count;
  440. if( .Croix_Count < 1 ) donpcevent "KvM02_BG::OnGuillaumeWin";
  441. + else {
  442. + mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  443. + mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  444. + }
  445. }
  446. end;
  447.  
  448. @@ -183,9 +192,6 @@
  449. // Warp Teams
  450. bg_warp $@KvM02BG_id1,"bat_c02",53,128;
  451. bg_warp $@KvM02BG_id2,"bat_c02",146,55;
  452. - // ScoreBoard
  453. - set .Guillaume_Score, 0;
  454. - set .Croix_Score, 0;
  455. initnpctimer;
  456. end;
  457.  
  458. @@ -247,34 +253,32 @@
  459. end;
  460. }
  461. set $@KvM02BG, 2; // Playing
  462. - areapercentheal "bat_c02",50,123,58,131,100,100;
  463. bg_warp $@KvM02BG_id1,"bat_c02",62,119;
  464. - areapercentheal "bat_c02",141,52,149,60,100,100;
  465. bg_warp $@KvM02BG_id2,"bat_c02",137,64;
  466. end;
  467.  
  468. OnTimer300000:
  469. - mapannounce "bat_c02", "KVM will be ending in 1 minute.",bc_map,"0x00ff00";
  470. + mapannounce "bat_c02", "1 minute remaining to finish the KVM battle.",bc_map,"0x00ff00";
  471. end;
  472.  
  473. OnTimer330000:
  474. - mapannounce "bat_c02", "KVM will be ending in 30 seconds.",bc_map,"0x00ff00";
  475. + mapannounce "bat_c02", "30 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  476. end;
  477.  
  478. OnTimer345000:
  479. - mapannounce "bat_c02", "KVM will be ending in 15 seconds.",bc_map,"0x00ff00";
  480. + mapannounce "bat_c02", "15 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  481. end;
  482.  
  483. OnTimer350000:
  484. - mapannounce "bat_c02", "KVM will be ending in 10 seconds.",bc_map,"0x00ff00";
  485. + mapannounce "bat_c02", "10 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  486. end;
  487.  
  488. OnTimer355000:
  489. - mapannounce "bat_c02", "KVM will be ending in 5 seconds.",bc_map,"0x00ff00";
  490. + mapannounce "bat_c02", "5 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  491. end;
  492.  
  493. OnTimer360000:
  494. - mapannounce "bat_c02", "KVM has ended.",bc_map,"0x00ff00";
  495. + mapannounce "bat_c02", "The KVM battle is over.",bc_map,"0x00ff00";
  496. if( .Croix_Count > .Guillaume_Count )
  497. donpcevent "KvM02_BG::OnCroixWin";
  498. else if( .Croix_Count < .Guillaume_Count )
  499. @@ -283,9 +287,9 @@
  500. { // Draw Game
  501. set $@KvM02BG, 3;
  502. set $@KvM02BG_Victory, 3;
  503. - mapannounce "bat_c02", "Number of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
  504. - mapannounce "bat_c02", "Number of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
  505. - mapannounce "bat_c02", "Regardless of the outcome of the two camps.",bc_map,"0x00ff00";
  506. + mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  507. + mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  508. + mapannounce "bat_c02", "This battle has ended in a draw.",bc_map,"0x00ff00";
  509. donpcevent "KvM02_BG::OnStop";
  510. }
  511. end;
  512. @@ -293,18 +297,18 @@
  513. OnGuillaumeWin:
  514. set $@KvM02BG, 3;
  515. set $@KvM02BG_Victory, 1;
  516. - mapannounce "bat_c02", "Guillaume camp victory.",bc_map,"0x00ff00";
  517. - mapannounce "bat_c02", "Congratulations to all Guillaume members.",bc_map,"0x00ff00";
  518. - mapannounce "bat_c02", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  519. + mapannounce "bat_c02", "Guillaume wins!",bc_map,"0x00ff00";
  520. + mapannounce "bat_c02", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
  521. + mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  522. donpcevent "KvM02_BG::OnStop";
  523. end;
  524.  
  525. OnCroixWin:
  526. set $@KvM02BG, 3;
  527. set $@KvM02BG_Victory, 2;
  528. - mapannounce "bat_c02", "Croix camp victory.",bc_map,"0x00ff00";
  529. - mapannounce "bat_c02", "Congratulations to all Croix members.",bc_map,"0x00ff00";
  530. - mapannounce "bat_c02", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  531. + mapannounce "bat_c02", "Croix wins!",bc_map,"0x00ff00";
  532. + mapannounce "bat_c02", "Congratulations to Croix members.",bc_map,"0x00ff00";
  533. + mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  534. donpcevent "KvM02_BG::OnStop";
  535. end;
  536.  
  537. @@ -321,8 +325,6 @@
  538. OnReset:
  539. set .Croix_Count, 0;
  540. set .Guillaume_Count, 0;
  541. - set .Croix_Score, 0;
  542. - set .Guillaume_Score, 0;
  543. set $@KvM02BG_Victory, 0;
  544. if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; set $@KvM02BG_id1, 0; }
  545. if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; set $@KvM02BG_id2, 0; }
  546. @@ -330,7 +332,7 @@
  547. disablenpc "KVM Officer#KVM02B";
  548. mapwarp "bat_c02","bat_room",154,150;
  549. maprespawnguildid "bat_c02",0,3; // Just in case someone else
  550. - bg_updatescore "bat_c02",0,0;
  551. + bg_updatescore "bat_c02",5,5;
  552. set $@KvM02BG, 0;
  553. donpcevent "KvM02_BG::OnReadyCheck"; // Maybe a game is ready to start
  554. end;
  555. @@ -353,10 +355,14 @@
  556. end;
  557.  
  558. OnTimer5000:
  559. - mapannounce "bat_c02", "If you do not claim your points now, you will not be able to.",bc_map,"0x00ff00";
  560. - mapannounce "bat_c02", "Please make sure to collect before the time expires.",bc_map,"0x00ff00";
  561. + mapannounce "bat_c02", "Unless you talk to the Officer, you cannot gain the points.",bc_map,"0x00ff00";
  562. + mapannounce "bat_c02", "Please be careful.",bc_map,"0x00ff00";
  563. end;
  564.  
  565. +OnTimer:55000:
  566. + mapannounce "bat_c02", "You will be sent back.",bc_map,"0x00ff00";
  567. + end;
  568. +
  569. OnTimer60000:
  570. stopnpctimer;
  571. donpcevent "KvM02_BG::OnReset";
  572. @@ -371,19 +377,22 @@
  573. if( $@KvM02BG_Victory == Bat_Team )
  574. { // Victory
  575. set kvm_point,kvm_point + 1;
  576. - mes "[Swandery]";
  577. - mes "Blessed Guillaume!!";
  578. - mes "Let's enjoy our glorious victory!";
  579. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  580. + mes "[KVM Officer]";
  581. + mes "Good Game.";
  582. + mes "May the glory of KVM be with you.";
  583. + mes "You aquire the winning points: 5";
  584. close2;
  585. }
  586. else
  587. { //
  588. - mes "[Swandery]";
  589. - mes "You lost, but you're dedicated to this battle.";
  590. + mes "[KVM Officer]";
  591. + mes "I am so sorry.";
  592. + mes "I wish you better luck next time.";
  593. + mes "You aquire the losing points: 0";
  594. close2;
  595. }
  596. bg_leave;
  597. + set Bat_Team,0;
  598. warp "bat_room",154,150;
  599. end;
  600. }
  601. @@ -396,37 +405,24 @@
  602. if( $@KvM02BG_Victory == Bat_Team )
  603. { // Victory
  604. set kvm_point,kvm_point + 1;
  605. - mes "[Swandery]";
  606. - mes "Blessed Croax!!";
  607. - mes "Let's enjoy our glorious victory!";
  608. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  609. - mes "Just take this defeat a lesson, and later you would definitely learn.";
  610. + mes "[KVM Officer]";
  611. + mes "Good Game.";
  612. + mes "May the glory of KVM be with you.";
  613. + mes "You aquire the winning points: 1";
  614. close2;
  615. }
  616. else
  617. { //
  618. - mes "[Swandery]";
  619. - mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
  620. - mes "Even though we didn't win, we did our best.";
  621. - mes "Please don't forget this battle. We can win the next.";
  622. + mes "[KVM Officer]";
  623. + mes "I am so sorry.";
  624. + mes "I wish you better luck next time.";
  625. + mes "You aquire the losing points: 0";
  626. close2;
  627. }
  628. bg_leave;
  629. + set Bat_Team,0;
  630. warp "bat_room",154,150;
  631. end;
  632. }
  633. end;
  634. }
  635. -
  636. -// MapFlags
  637. -//============================================================
  638. -
  639. -bat_c02 mapflag battleground 2
  640. -bat_c02 mapflag nomemo
  641. -bat_c02 mapflag nosave SavePoint
  642. -bat_c02 mapflag noteleport
  643. -bat_c02 mapflag nowarp
  644. -bat_c02 mapflag nowarpto
  645. -bat_c02 mapflag noreturn
  646. -bat_c02 mapflag nobranch
  647. -bat_c02 mapflag nopenalty
  648. Index: rewrite/npc/battleground/kvm/kvm03.txt
  649. ===================================================================
  650. --- rewrite/npc/battleground/kvm/kvm03.txt (revision 552)
  651. +++ rewrite/npc/battleground/kvm/kvm03.txt (working copy)
  652. @@ -3,7 +3,7 @@
  653. //===== By: ==================================================
  654. //= ???, L0ne_W0lf
  655. //===== Current Version: =====================================
  656. -//= 1.1
  657. +//= 1.2
  658. //===== Compatible With: =====================================
  659. //= eAthena 1.0
  660. //===== Description: =========================================
  661. @@ -14,6 +14,9 @@
  662. //===== Additional Comments: =================================
  663. //= 1.0 First Version.
  664. //= 1.1 Updated using official Aegis files. [L0ne_W0lf]
  665. +//= 1.2 Upated some announces and dialogs from iRO.
  666. +//= Changed how the scoreboard works slightly.
  667. +//= Removed the areapercentheals, and minor things.
  668. //============================================================
  669.  
  670. // Waiting Room NPCs
  671. @@ -60,23 +63,23 @@
  672. end;
  673. }
  674.  
  675. -bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 111
  676. -bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 111
  677. -bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 111
  678. -bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 111
  679. -bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 111
  680. -bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 111
  681. -bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 111
  682. +bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 139
  683. +bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 139
  684. +bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 139
  685. +bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 139
  686. +bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 139
  687. +bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 139
  688. +bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 139
  689.  
  690. -bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 111
  691. -bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 111
  692. -bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 111
  693. -bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 111
  694. -bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 111
  695. -bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 111
  696. -bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 111
  697. +bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 139
  698. +bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 139
  699. +bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 139
  700. +bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 139
  701. +bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 139
  702. +bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 139
  703. +bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 139
  704.  
  705. -bat_c03,54,128,3 script #A_camp_start03 111,4,4,{
  706. +bat_c03,54,128,3 script #A_camp_start03 139,4,4,{
  707. end;
  708.  
  709. OnInit:
  710. @@ -97,7 +100,7 @@
  711. end;
  712. }
  713.  
  714. -bat_c03,146,56,3 script #B_camp_start03 111,4,4,{
  715. +bat_c03,146,56,3 script #B_camp_start03 139,4,4,{
  716. end;
  717.  
  718. OnInit:
  719. @@ -143,9 +146,12 @@
  720. if( $@KvM03BG == 2 )
  721. {
  722. set .Guillaume_Count, .Guillaume_Count - 1;
  723. - set .Croix_Score, .Croix_Score + 1;
  724. - bg_updatescore "bat_c03",.Guillaume_Score,.Croix_Score;
  725. + bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count;
  726. if( .Guillaume_Count < 1 ) donpcevent "KvM03_BG::OnCroixWin";
  727. + else {
  728. + mapannounce "bat_c03", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  729. + mapannounce "bat_c03", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  730. + }
  731. }
  732. end;
  733.  
  734. @@ -155,9 +161,12 @@
  735. if( $@KvM03BG == 2 )
  736. {
  737. set .Croix_Count, .Croix_Count - 1;
  738. - set .Guillaume_Score, .Guillaume_Score + 1;
  739. - bg_updatescore "bat_c03",.Guillaume_Score,.Croix_Score;
  740. + bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count;
  741. if( .Croix_Count < 1 ) donpcevent "KvM03_BG::OnGuillaumeWin";
  742. + else {
  743. + mapannounce "bat_c03", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  744. + mapannounce "bat_c03", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  745. + }
  746. }
  747. end;
  748.  
  749. @@ -183,9 +192,6 @@
  750. // Warp Teams
  751. bg_warp $@KvM03BG_id1,"bat_c03",53,128;
  752. bg_warp $@KvM03BG_id2,"bat_c03",146,55;
  753. - // ScoreBoard
  754. - set .Guillaume_Score, 0;
  755. - set .Croix_Score, 0;
  756. initnpctimer;
  757. end;
  758.  
  759. @@ -247,30 +253,28 @@
  760. end;
  761. }
  762. set $@KvM03BG, 2; // Playing
  763. - areapercentheal "bat_c03",50,123,58,131,100,100;
  764. bg_warp $@KvM03BG_id1,"bat_c03",62,119;
  765. - areapercentheal "bat_c03",141,52,149,60,100,100;
  766. bg_warp $@KvM03BG_id2,"bat_c03",137,64;
  767. end;
  768.  
  769. OnTimer300000:
  770. - mapannounce "bat_c03", "KVM will be ending in 1 minute.",bc_map,"0x00ff00";
  771. + mapannounce "bat_c03", "1 minute remaining to finish the KVM battle.",bc_map,"0x00ff00";
  772. end;
  773.  
  774. OnTimer330000:
  775. - mapannounce "bat_c03", "KVM will be ending in 30 seconds.",bc_map,"0x00ff00";
  776. + mapannounce "bat_c03", "30 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  777. end;
  778.  
  779. OnTimer345000:
  780. - mapannounce "bat_c03", "KVM will be ending in 15 seconds.",bc_map,"0x00ff00";
  781. + mapannounce "bat_c03", "15 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  782. end;
  783.  
  784. OnTimer350000:
  785. - mapannounce "bat_c03", "KVM will be ending in 10 seconds.",bc_map,"0x00ff00";
  786. + mapannounce "bat_c03", "10 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  787. end;
  788.  
  789. OnTimer355000:
  790. - mapannounce "bat_c03", "KVM will be ending in 5 seconds.",bc_map,"0x00ff00";
  791. + mapannounce "bat_c03", "5 seconds remaining to finish the KVM battle.",bc_map,"0x00ff00";
  792. end;
  793.  
  794. OnTimer360000:
  795. @@ -283,9 +287,9 @@
  796. { // Draw Game
  797. set $@KvM03BG, 3;
  798. set $@KvM03BG_Victory, 3;
  799. - mapannounce "bat_c03", "Number of Guillaume survivors "+.Guillaume_Count+".",bc_map,"0x00ff00";
  800. - mapannounce "bat_c03", "Number of Croix survivors "+.Croix_Count+".",bc_map,"0x00ff00";
  801. - mapannounce "bat_c03", "Regardless of the outcome of the two camps.",bc_map,"0x00ff00";
  802. + mapannounce "bat_c03", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00";
  803. + mapannounce "bat_c03", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00";
  804. + mapannounce "bat_c03", "This battle has ended in a draw.",bc_map,"0x00ff00";
  805. donpcevent "KvM03_BG::OnStop";
  806. }
  807. end;
  808. @@ -293,18 +297,18 @@
  809. OnGuillaumeWin:
  810. set $@KvM03BG, 3;
  811. set $@KvM03BG_Victory, 1;
  812. - mapannounce "bat_c03", "Guillaume camp victory.",bc_map,"0x00ff00";
  813. - mapannounce "bat_c03", "Congratulations to all Guillaume members.",bc_map,"0x00ff00";
  814. - mapannounce "bat_c03", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  815. + mapannounce "bat_c03", "Guillaume wins!",bc_map,"0x00ff00";
  816. + mapannounce "bat_c03", "Congratulations to Guillaume members.",bc_map,"0x00ff00";
  817. + mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  818. donpcevent "KvM03_BG::OnStop";
  819. end;
  820.  
  821. OnCroixWin:
  822. set $@KvM03BG, 3;
  823. set $@KvM03BG_Victory, 2;
  824. - mapannounce "bat_c03", "Croix camp victory.",bc_map,"0x00ff00";
  825. - mapannounce "bat_c03", "Congratulations to all Croix members.",bc_map,"0x00ff00";
  826. - mapannounce "bat_c03", "All personnel move to the starting zone.",bc_map,"0x00ff00";
  827. + mapannounce "bat_c03", "Croix wins!",bc_map,"0x00ff00";
  828. + mapannounce "bat_c03", "Congratulations to Croix members.",bc_map,"0x00ff00";
  829. + mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00";
  830. donpcevent "KvM03_BG::OnStop";
  831. end;
  832.  
  833. @@ -321,8 +325,6 @@
  834. OnReset:
  835. set .Croix_Count, 0;
  836. set .Guillaume_Count, 0;
  837. - set .Croix_Score, 0;
  838. - set .Guillaume_Score, 0;
  839. set $@KvM03BG_Victory, 0;
  840. if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; set $@KvM03BG_id1, 0; }
  841. if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; set $@KvM03BG_id2, 0; }
  842. @@ -330,7 +332,7 @@
  843. disablenpc "VintenarKvM03b";
  844. mapwarp "bat_c03","bat_room",154,150;
  845. maprespawnguildid "bat_c03",0,3; // Just in case someone else
  846. - bg_updatescore "bat_c03",0,0;
  847. + bg_updatescore "bat_c03",5,5;
  848. set $@KvM03BG, 0;
  849. donpcevent "KvM03_BG::OnReadyCheck"; // Maybe a game is ready to start
  850. end;
  851. @@ -353,10 +355,14 @@
  852. end;
  853.  
  854. OnTimer5000:
  855. - mapannounce "bat_c03", "If you do not claim your points now, you will not be able to.",bc_map,"0x00ff00";
  856. - mapannounce "bat_c03", "Please make sure to collect before the time expires.",bc_map,"0x00ff00";
  857. + mapannounce "bat_c03", "Unless you talk to the Officer, you cannot gain the points.",bc_map,"0x00ff00";
  858. + mapannounce "bat_c03", "Please be careful.",bc_map,"0x00ff00";
  859. end;
  860.  
  861. +OnTimer:55000:
  862. + mapannounce "bat_c03", "You will be sent back.",bc_map,"0x00ff00";
  863. + end;
  864. +
  865. OnTimer60000:
  866. stopnpctimer;
  867. donpcevent "KvM03_BG::OnReset";
  868. @@ -371,21 +377,23 @@
  869. if( $@KvM03BG_Victory == Bat_Team )
  870. { // Victory
  871. set kvm_point,kvm_point + 2;
  872. - mes "[Swandery]";
  873. - mes "Blessed Guillaume!!";
  874. - mes "Let's enjoy our glorious victory!";
  875. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  876. + mes "[KVM Officer]";
  877. + mes "Good Game.";
  878. + mes "May the glory of KVM be with you.";
  879. + mes "You aquire the winning points: 2";
  880. close2;
  881. }
  882. else
  883. { //
  884. set kvm_point,kvm_point + 1;
  885. - mes "[Swandery]";
  886. - mes "You lost, but you're dedicated to this battle.";
  887. - mes "This is a reward for your great dedication by Guillaume Marollo!";
  888. + mes "[KVM Officer]";
  889. + mes "I am so sorry.";
  890. + mes "I wish you better luck next time.";
  891. + mes "You aquire the losing points: 1";
  892. close2;
  893. }
  894. bg_leave;
  895. + set Bat_Team,0;
  896. warp "bat_room",154,150;
  897. end;
  898. }
  899. @@ -398,37 +406,25 @@
  900. if( $@KvM03BG_Victory == Bat_Team )
  901. { // Victory
  902. set kvm_point,kvm_point + 2;
  903. - mes "[Swandery]";
  904. - mes "Blessed Croax!!";
  905. - mes "Let's enjoy our glorious victory!";
  906. - mes "" + strcharinfo(0) + ", its a sign reflecting victory";
  907. + mes "[KVM Officer]";
  908. + mes "Good Game.";
  909. + mes "May the glory of KVM be with you.";
  910. + mes "You aquire the winning points: 2";
  911. close2;
  912. }
  913. else
  914. { //
  915. set kvm_point,kvm_point + 1;
  916. - mes "[Swandery]";
  917. - mes "Oh, " + strcharinfo(0) + ". Don't be sad.";
  918. - mes "Even though we didn't win, we did our best.";
  919. - mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next.";
  920. + mes "[KVM Officer]";
  921. + mes "I am so sorry.";
  922. + mes "I wish you better luck next time.";
  923. + mes "You aquire the losing points: 1";
  924. close2;
  925. }
  926. bg_leave;
  927. + set Bat_Team,0;
  928. warp "bat_room",154,150;
  929. end;
  930. }
  931. end;
  932. }
  933. -
  934. -// MapFlags
  935. -//============================================================
  936. -
  937. -bat_c03 mapflag battleground 2
  938. -bat_c03 mapflag nomemo
  939. -bat_c03 mapflag nosave SavePoint
  940. -bat_c03 mapflag noteleport
  941. -bat_c03 mapflag nowarp
  942. -bat_c03 mapflag nowarpto
  943. -bat_c03 mapflag noreturn
  944. -bat_c03 mapflag nobranch
  945. -bat_c03 mapflag nopenalty
  946. Index: rewrite/npc/battleground/kvm/kvm_enter.txt
  947. ===================================================================
  948. --- rewrite/npc/battleground/kvm/kvm_enter.txt (revision 552)
  949. +++ rewrite/npc/battleground/kvm/kvm_enter.txt (working copy)
  950. @@ -3,7 +3,7 @@
  951. //===== By: ==================================================
  952. //= L0ne_W0lf
  953. //===== Current Version: =====================================
  954. -//= 1.0
  955. +//= 1.1
  956. //===== Compatible With: =====================================
  957. //= eAthena 1.0
  958. //===== Description: =========================================
  959. @@ -12,19 +12,33 @@
  960. //= Original NPCs scrapped from bg_common.
  961. //===== Additional Comments: =================================
  962. //= 1.0 First Version.
  963. +//= 1.1 Corrected some typos, and shifted messages around.
  964. +//= Corrected iRO style quest log entries, however it's
  965. +//= advisable that you not use them, as they conflict.
  966. //============================================================
  967.  
  968. -// KvM Officerer - Guillaume
  969. +// KvM Officer - Guillaume
  970. //============================================================
  971. bat_room,164,178,5 script KVM Mercenary Officer#1 418,{
  972. - set .@permit,checkquest(6026,PLAYTIME);
  973. + /*
  974. + set .@kvm,checkquest(6026,PLAYTIME);
  975. + if ((.@kvm == 0) || (.@kvm == 1)) {
  976. + mes "[Croix Mercenary Officer]";
  977. + mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us.";
  978. + close;
  979. + }
  980. + else if (.@kvm == 2) {
  981. + erasequest 6026;
  982. + }
  983. + */
  984. + set .@permit,checkquest(6025,PLAYTIME);
  985. if ((.@permit == 0) || (.@permit == 1)) {
  986. mes "[Guillaume Mercenary Officer]";
  987. - mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us.";
  988. + mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
  989. close;
  990. }
  991. - else {
  992. - if (checkquest(6025) >= 0) erasequest 6026;
  993. + else if (.@permit == 2) {
  994. + erasequest 6025;
  995. }
  996. mes "[Guillaume Mercenary Officer]";
  997. mes "Let them know the real might of Guillaume!";
  998. @@ -35,6 +49,7 @@
  999. mes "Show them how strong we are.";
  1000. mes "Today, everyone will hear the shout of triumph from Guillaume!";
  1001. close2;
  1002. + //setquest 6025;
  1003. if (BaseLevel > 79) {
  1004. warp "bat_room",169,223;
  1005. }
  1006. @@ -115,14 +130,25 @@
  1007. // KvM Officer - Croix
  1008. //============================================================
  1009. bat_room,164,121,1 script KVM Mercenary Officer#2 414,{
  1010. + /*
  1011. + set .@kvm,checkquest(6025,PLAYTIME);
  1012. + if ((.@kvm == 0) || (.@kvm == 1)) {
  1013. + mes "[Croix Mercenary Officer]";
  1014. + mes "I know that you've already signed with the Guillaume. Go back and join their team. We will not accept traitors to fight for us.";
  1015. + close;
  1016. + }
  1017. + else if (.@kvm == 2) {
  1018. + erasequest 6025;
  1019. + }
  1020. + */
  1021. set .@permit,checkquest(6025,PLAYTIME);
  1022. if ((.@permit == 0) || (.@permit == 1)) {
  1023. mes "[Croix Mercenary Officer]";
  1024. - mes "I know that you've already signed with the Guillaume. Go back and join their team. We will not accept traitors to fight for us.";
  1025. + mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
  1026. close;
  1027. }
  1028. - else {
  1029. - if (checkquest(6025) >= 0) erasequest 6025;
  1030. + else if (.@permit == 2) {
  1031. + erasequest 6025;
  1032. }
  1033. mes "[Croix Mercenary Officer]";
  1034. mes "Let them know the real might of Croix!";
  1035. @@ -133,6 +159,7 @@
  1036. mes "Show them how strong we are.";
  1037. mes "Today, everyone will hear the shout of triumph from Croix!";
  1038. close2;
  1039. + //setquest 6026;
  1040. if (BaseLevel > 79) {
  1041. warp "bat_room",169,207;
  1042. }
  1043. Index: rewrite/npc/Changelog.txt
  1044. ===================================================================
  1045. --- rewrite/npc/Changelog.txt (revision 552)
  1046. +++ rewrite/npc/Changelog.txt (working copy)
  1047. @@ -1,5 +1,9 @@
  1048. Date Added
  1049. ======
  1050. +2010/11/04
  1051. + * Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf]
  1052. + - Added a missing close in quests_13_2.txt. (bugreport:4520)
  1053. + - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522)
  1054. 2010/09/18
  1055. * Rev 14409 Updates, and bugfixes, the usual stuff. [L0ne_W0lf]
  1056. * Updated Sage quest skill quest with the file curtosy of 5511.
  1057. Index: rewrite/npc/mobs/fields/manuk.txt
  1058. ===================================================================
  1059. --- rewrite/npc/mobs/fields/manuk.txt (revision 552)
  1060. +++ rewrite/npc/mobs/fields/manuk.txt (working copy)
  1061. @@ -3,11 +3,13 @@
  1062. //===== By: ==================================================
  1063. //= alexx, MaC
  1064. //===== Current Version: =====================================
  1065. -//= 1.0
  1066. +//= 1.1a
  1067. //===== Compatible With: =====================================
  1068. //= Any Athena Version
  1069. //===== Additional Comments: =================================
  1070. //= 1.0 Official spawn ammounts from Aegis script [alexx]
  1071. +//= 1.1 Added 13.2 mob spawn update [scriptor]
  1072. +//= 1.1a Corrected fild2 mobs spawning on fild1. (bugreport:4248)
  1073. //============================================================
  1074.  
  1075. //============================================================
  1076. @@ -19,6 +21,13 @@
  1077. man_fild01,0,0,0,0 monster Centipede 1987,2,0,0,0
  1078.  
  1079. //============================================================
  1080. +// man_fild02 - Manuk Field
  1081. +//============================================================
  1082. +man_fild02,0,0,0,0 monster Bradium Golem 2024,50,0,0,0
  1083. +man_fild02,0,0,0,0 monster Centipede 1987,35,0,0,0
  1084. +man_fild02,0,0,0,0 monster Tatacho 1986,25,0,0,0
  1085. +
  1086. +//============================================================
  1087. // man_fild03 - Manuk Field
  1088. //============================================================
  1089. man_fild03,0,0,0,0 monster Hillthion 1989,25,0,0,0
  1090. Index: rewrite/npc/mobs/fields/splendide.txt
  1091. ===================================================================
  1092. --- rewrite/npc/mobs/fields/splendide.txt (revision 552)
  1093. +++ rewrite/npc/mobs/fields/splendide.txt (working copy)
  1094. @@ -3,14 +3,21 @@
  1095. //===== By: ==================================================
  1096. //= alexx, MaC
  1097. //===== Current Version: =====================================
  1098. -//= 1.0
  1099. +//= 1.1
  1100. //===== Compatible With: =====================================
  1101. //= Any Athena Version
  1102. //===== Additional Comments: =================================
  1103. //= 1.0 Official spawn ammounts from Aegis script [alexx]
  1104. +//= 1.1 Added 13.2 mob spawn update [scriptor]
  1105. //============================================================
  1106.  
  1107. //==================================================
  1108. +// spl_fild01 - Splendide Field
  1109. +//==================================================
  1110. +spl_fild01,0,0,0,0 monster Pinguicula 1995,50,0,0,0
  1111. +spl_fild01,0,0,0,0 monster Naga 1993,35,0,0,0
  1112. +spl_fild01,0,0,0,0 monster Cornus 1992,25,0,0,0
  1113. +
  1114. // spl_fild02 - Splendide Field
  1115. //==================================================
  1116. spl_fild02,0,0,0,0 monster Pinguicula 1995,95,0,0,0
  1117. Index: rewrite/npc/other/arena/arena_party.txt
  1118. ===================================================================
  1119. --- rewrite/npc/other/arena/arena_party.txt (revision 552)
  1120. +++ rewrite/npc/other/arena/arena_party.txt (working copy)
  1121. @@ -3,7 +3,7 @@
  1122. //===== By: ==================================================
  1123. //= SinSloth
  1124. //===== Current Version: =====================================
  1125. -//= 1.1
  1126. +//= 1.3
  1127. //===== Compatible With: =====================================
  1128. //= Any Athena Version
  1129. //===== Description: =========================================
  1130. @@ -13,6 +13,7 @@
  1131. //= 1.0a Fixed a typo.
  1132. //= 1.1 Replaced effect numerics with constants. [Samuray22]
  1133. //= 1.2 Fixed "OnMobDeath" doesn't work sometime. [Inkfish]
  1134. +//= 1.3 Corrected donpcevent typo. (bugreport:4374) [L0ne_w0lf]
  1135. //============================================================
  1136.  
  1137. arena_room,162,88,3 script Ponox 124,{
  1138. @@ -27,7 +28,7 @@
  1139. donpcevent "toarena#party::OnInit";
  1140. donpcevent "toout#party::OnInit";
  1141. warpwaitingpc "prt_are_in",73,78;
  1142. - donpcevent "toout#party::OnTime";
  1143. + donpcevent "toout#party::OnTimer";
  1144. donpcevent "Helper#party::OnEnter";
  1145. disablewaitingroomevent;
  1146. end;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!