cinderweb

Untitled

Sep 10th, 2013
86
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.67 KB | None | 0 0
  1. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git diff HEAD 715daeb50afd6c0d6f822bf8bd2821677e3c41a5
  2. diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
  3. index c8cd338..d9ac43d 100644
  4. --- a/world/map/npc/001-1/_import.txt
  5. +++ b/world/map/npc/001-1/_import.txt
  6. @@ -3,7 +3,6 @@
  7. map: 001-1.gat
  8. npc: npc/001-1/_mobs.txt
  9. npc: npc/001-1/_warps.txt
  10. -npc: npc/001-1/alec.txt
  11. npc: npc/001-1/banker.txt
  12. npc: npc/001-1/barber.txt
  13. npc: npc/001-1/bard.txt
  14. diff --git a/world/map/npc/001-1/alec.txt b/world/map/npc/001-1/alec.txt
  15. deleted file mode 100644
  16. index 1d81d73..0000000
  17. --- a/world/map/npc/001-1/alec.txt
  18. +++ /dev/null
  19. @@ -1,9 +0,0 @@
  20. -001-1.gat,44,39,0|script|Alec|214,
  21. -{
  22. - set @npcname$, "Alec";
  23. - set @newspaper_price, 5;
  24. - callfunc "Papernews";
  25. - set @npcname$, "";
  26. - set @newspaper_price, 0;
  27. - close;
  28. -}
  29. diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
  30. index 47c81fd..cfd187f 100644
  31. --- a/world/map/npc/009-1/_import.txt
  32. +++ b/world/map/npc/009-1/_import.txt
  33. @@ -3,7 +3,6 @@
  34. map: 009-1.gat
  35. npc: npc/009-1/_mobs.txt
  36. npc: npc/009-1/_warps.txt
  37. -npc: npc/009-1/aldan.txt
  38. npc: npc/009-1/jack.txt
  39. npc: npc/009-1/mapflags.txt
  40. npc: npc/009-1/milly.txt
  41. diff --git a/world/map/npc/009-1/aldan.txt b/world/map/npc/009-1/aldan.txt
  42. deleted file mode 100644
  43. index 5870a56..0000000
  44. --- a/world/map/npc/009-1/aldan.txt
  45. +++ /dev/null
  46. @@ -1,9 +0,0 @@
  47. -009-1.gat,56,38,0|script|Aldan|214,
  48. -{
  49. - set @npcname$, "Aldan";
  50. - set @newspaper_price, 5;
  51. - callfunc "Papernews";
  52. - set @npcname$, "";
  53. - set @newspaper_price, 0;
  54. - close;
  55. -}
  56. diff --git a/world/map/npc/functions/paperboy.txt b/world/map/npc/functions/pape
  57. deleted file mode 100644
  58. index 0dd916e..0000000
  59. --- a/world/map/npc/functions/paperboy.txt
  60. +++ /dev/null
  61. @@ -1,34 +0,0 @@
  62. -//The paperboy system
  63. -
  64. -function|script|Papernews|,
  65. -{
  66. - mes "[" + @npcname$ + "]";
  67. - mes "\"Would you like to buy one of our bi-weekly newsletters?\"";
  68. - mes "\"Only " + @newspaper_price + " gold pieces?\"";
  69. - menu
  70. - "Yes I would.", L_Start_Paper,
  71. - "No thanks.", L_Close;
  72. -
  73. -L_Start_Paper:
  74. - if (Zeny < @newspaper_price) goto L_NotEnoughMoney;
  75. - set Zeny, Zeny - @newspaper_price;
  76. - mes "[THE NEWS]";
  77. - mes "We have a new gm. He goes by the name of Melkior so give him a wave an
  78. - next;
  79. - mes "There seems to be some troubles brewing in Nivalis. They say that the
  80. - next;
  81. - mes "In Tulimshar some new caves have opened up, and the sewers are startin
  82. - next;
  83. - mes "In Hurnscald the nurse is still looking for adventurers brave enough t
  84. - next;
  85. - mes "There seem to be bandits on the road at times between Hurnscald and th
  86. - goto L_Close;
  87. -
  88. -L_NotEnoughMoney:
  89. - mes "[" + @npcname$ + "]";
  90. - mes "\"I'm sure it's an oversight but you don't have enough money.\"";
  91. - goto L_Close;
  92. -
  93. -L_Return:
  94. - return;
  95. -}
  96. diff --git a/world/map/npc/functions/paperboy.txt~ b/world/map/npc/functions/pap
  97. deleted file mode 100644
  98. index c5d7ffa..0000000
  99. --- a/world/map/npc/functions/paperboy.txt~
  100. +++ /dev/null
  101. @@ -1,34 +0,0 @@
  102. -//The paperboy system
  103. -
  104. -function|script|Papernews|,
  105. -{
  106. - mes "[" + @npcname$ + "]";
  107. - mes "\"Would you like to buy one of our bi-weekly newsletters?\"";
  108. - mes "\"Only " + @newspaper_price + " gold pieces?\"";
  109. - menu
  110. - "Yes I would.", L_Start_Paper,
  111. - "No thanks.", L_Close;
  112. -
  113. -L_Start_Paper:
  114. - if (Zeny < @newspaper_price) goto L_NotEnoughMoney;
  115. - set Zeny, Zeny - @newspaper_price;
  116. - mes "[THE NEWS]";
  117. - mes "[We have a new gm. He goes by the name of Melkior so give him a wave a
  118. - next;
  119. - mes "[There seems to be some troubles brewing in Nivalis. They say that the
  120. - next;
  121. - mes "[In Tulimshar some new caves have opened up, and the sewers are starti
  122. - next;
  123. - mes "[In Hurnscald the nurse is still looking for adventurers brave enough
  124. - next;
  125. - mes "[There seem to be bandits on the road at times between Hurnscald and t
  126. - goto L_Close;
  127. -
  128. -L_NotEnoughMoney:
  129. - mes "[" + @npcname$ + "]";
  130. - mes "\"I'm sure it's an oversight but you don't have enough money.\"";
  131. - goto L_Close;
  132. -
  133. -L_Return:
  134. - return;
  135. -}
  136. diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
  137. index b583c65..26a0b0b 100644
  138. --- a/world/map/npc/scripts.conf
  139. +++ b/world/map/npc/scripts.conf
  140. @@ -19,7 +19,6 @@ npc: npc/functions/water_bottle.txt
  141. npc: npc/functions/evil_obelisk.txt
  142. npc: npc/functions/debug.txt
  143. npc: npc/functions/lockpicking.txt
  144. -npc: npc/functions/paperboy.txt
  145.  
  146. // Item Functions
  147. npc: npc/items/magic_gm_top_hat.txt
  148. (END)
Advertisement
Add Comment
Please, Sign In to add comment