Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git diff HEAD 715daeb50afd6c0d6f822bf8bd2821677e3c41a5
- diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
- index c8cd338..d9ac43d 100644
- --- a/world/map/npc/001-1/_import.txt
- +++ b/world/map/npc/001-1/_import.txt
- @@ -3,7 +3,6 @@
- map: 001-1.gat
- npc: npc/001-1/_mobs.txt
- npc: npc/001-1/_warps.txt
- -npc: npc/001-1/alec.txt
- npc: npc/001-1/banker.txt
- npc: npc/001-1/barber.txt
- npc: npc/001-1/bard.txt
- diff --git a/world/map/npc/001-1/alec.txt b/world/map/npc/001-1/alec.txt
- deleted file mode 100644
- index 1d81d73..0000000
- --- a/world/map/npc/001-1/alec.txt
- +++ /dev/null
- @@ -1,9 +0,0 @@
- -001-1.gat,44,39,0|script|Alec|214,
- -{
- - set @npcname$, "Alec";
- - set @newspaper_price, 5;
- - callfunc "Papernews";
- - set @npcname$, "";
- - set @newspaper_price, 0;
- - close;
- -}
- diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
- index 47c81fd..cfd187f 100644
- --- a/world/map/npc/009-1/_import.txt
- +++ b/world/map/npc/009-1/_import.txt
- @@ -3,7 +3,6 @@
- map: 009-1.gat
- npc: npc/009-1/_mobs.txt
- npc: npc/009-1/_warps.txt
- -npc: npc/009-1/aldan.txt
- npc: npc/009-1/jack.txt
- npc: npc/009-1/mapflags.txt
- npc: npc/009-1/milly.txt
- diff --git a/world/map/npc/009-1/aldan.txt b/world/map/npc/009-1/aldan.txt
- deleted file mode 100644
- index 5870a56..0000000
- --- a/world/map/npc/009-1/aldan.txt
- +++ /dev/null
- @@ -1,9 +0,0 @@
- -009-1.gat,56,38,0|script|Aldan|214,
- -{
- - set @npcname$, "Aldan";
- - set @newspaper_price, 5;
- - callfunc "Papernews";
- - set @npcname$, "";
- - set @newspaper_price, 0;
- - close;
- -}
- diff --git a/world/map/npc/functions/paperboy.txt b/world/map/npc/functions/pape
- deleted file mode 100644
- index 0dd916e..0000000
- --- a/world/map/npc/functions/paperboy.txt
- +++ /dev/null
- @@ -1,34 +0,0 @@
- -//The paperboy system
- -
- -function|script|Papernews|,
- -{
- - mes "[" + @npcname$ + "]";
- - mes "\"Would you like to buy one of our bi-weekly newsletters?\"";
- - mes "\"Only " + @newspaper_price + " gold pieces?\"";
- - menu
- - "Yes I would.", L_Start_Paper,
- - "No thanks.", L_Close;
- -
- -L_Start_Paper:
- - if (Zeny < @newspaper_price) goto L_NotEnoughMoney;
- - set Zeny, Zeny - @newspaper_price;
- - mes "[THE NEWS]";
- - mes "We have a new gm. He goes by the name of Melkior so give him a wave an
- - next;
- - mes "There seems to be some troubles brewing in Nivalis. They say that the
- - next;
- - mes "In Tulimshar some new caves have opened up, and the sewers are startin
- - next;
- - mes "In Hurnscald the nurse is still looking for adventurers brave enough t
- - next;
- - mes "There seem to be bandits on the road at times between Hurnscald and th
- - goto L_Close;
- -
- -L_NotEnoughMoney:
- - mes "[" + @npcname$ + "]";
- - mes "\"I'm sure it's an oversight but you don't have enough money.\"";
- - goto L_Close;
- -
- -L_Return:
- - return;
- -}
- diff --git a/world/map/npc/functions/paperboy.txt~ b/world/map/npc/functions/pap
- deleted file mode 100644
- index c5d7ffa..0000000
- --- a/world/map/npc/functions/paperboy.txt~
- +++ /dev/null
- @@ -1,34 +0,0 @@
- -//The paperboy system
- -
- -function|script|Papernews|,
- -{
- - mes "[" + @npcname$ + "]";
- - mes "\"Would you like to buy one of our bi-weekly newsletters?\"";
- - mes "\"Only " + @newspaper_price + " gold pieces?\"";
- - menu
- - "Yes I would.", L_Start_Paper,
- - "No thanks.", L_Close;
- -
- -L_Start_Paper:
- - if (Zeny < @newspaper_price) goto L_NotEnoughMoney;
- - set Zeny, Zeny - @newspaper_price;
- - mes "[THE NEWS]";
- - mes "[We have a new gm. He goes by the name of Melkior so give him a wave a
- - next;
- - mes "[There seems to be some troubles brewing in Nivalis. They say that the
- - next;
- - mes "[In Tulimshar some new caves have opened up, and the sewers are starti
- - next;
- - mes "[In Hurnscald the nurse is still looking for adventurers brave enough
- - next;
- - mes "[There seem to be bandits on the road at times between Hurnscald and t
- - goto L_Close;
- -
- -L_NotEnoughMoney:
- - mes "[" + @npcname$ + "]";
- - mes "\"I'm sure it's an oversight but you don't have enough money.\"";
- - goto L_Close;
- -
- -L_Return:
- - return;
- -}
- diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
- index b583c65..26a0b0b 100644
- --- a/world/map/npc/scripts.conf
- +++ b/world/map/npc/scripts.conf
- @@ -19,7 +19,6 @@ npc: npc/functions/water_bottle.txt
- npc: npc/functions/evil_obelisk.txt
- npc: npc/functions/debug.txt
- npc: npc/functions/lockpicking.txt
- -npc: npc/functions/paperboy.txt
- // Item Functions
- npc: npc/items/magic_gm_top_hat.txt
- (END)
Advertisement
Add Comment
Please, Sign In to add comment