Added Speck to M.E.R.C (by anv)

Browse Source

o From now on, as long as Speck is hired (or dead, or POW, or travelling), he won't be sitting on Speck Com nor sending you emails. However, is he's able to, he'll comment on current situation from battlefield: player owing money, Flo getting married, MERC merc dying, etc., so keeping him alive might be a good idea. Also added quotes for MERC website:
- on recruiting Speck
- on trying to recruit unavailable Speck
- on trying to recruit unavailable Biff (present in game files and code, but previously unused)
- Speck advertising himself

Fixed Biggin's wrong ammo (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1701 4f8fa57e-7814-0410-bad4-adc449f26b7c

...

This commit is contained in:

Wanne

2013-07-11 19:44:24 +00:00

parent 66739d1cf9

commit 91eeef7d4b

247 changed files with 29685 additions and 29563 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Data-1.13/BattleSNDS/149_ATTN.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_COOL.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_CURSE.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_CURSE.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_CURSE2.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_DYING.GAP

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_DYING.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_ENEM.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_GOTIT.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_HIT1.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_HIT2.GAP

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_HIT2.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_HUMM.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LAUGH.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LMATTN.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LMOK1.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LMOK2.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LMOK2.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LOCKED.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_LOCKED.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_NOTH.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_OK1.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_OK1.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_OK2.WAV

BIN

Binary file not shown.

Data-1.13/BattleSNDS/149_OK2.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_attn.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_cool.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_curse.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_curse.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_dying.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_enem.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_enem.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_gotit.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_gotit.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_hit1.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_hit2.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_humm.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_laugh.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_lmattn.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_lmok1.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_lmok2.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_lmok2.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_locked.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_locked.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_noth.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_ok1.ogg

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_ok2.gap

BIN

Binary file not shown.

Data-1.13/BattleSNDS/191_ok2.ogg

BIN

Binary file not shown.

Data-1.13/BinaryData/MERCBIOS.EDT

BIN

Binary file not shown.

Data-1.13/MercEdt/191.EDT

BIN

Binary file not shown.

Data-1.13/NpcData/159.EDT

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_084.gap

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_084.ogg

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_085.gap

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_085.ogg

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_086.gap

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_086.ogg

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_087.gap

BIN

Binary file not shown.

Data-1.13/Npc_Speech/159_087.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_000.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_001.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_001.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_002.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_002.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_003.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_004.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_004.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_005.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_005.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_006.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_007.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_007.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_008.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_008.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_009.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_009.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_010.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_010.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_011.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_012.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_013.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_013.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_014.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_014.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_015.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_015.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_018.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_018.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_019.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_019.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_020.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_020.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_021.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_021.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_022.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_022.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_023.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_023.ogg

BIN

Binary file not shown.

Data-1.13/Speech/191_024.gap

BIN

Binary file not shown.

Data-1.13/Speech/191_024.ogg

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More