diff --git a/gamedir/Data-1.13/BattleSNDS/215_ATTN.MP3 b/gamedir/Data-1.13/BattleSNDS/215_ATTN.MP3 new file mode 100644 index 000000000..24c48c595 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_ATTN.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_COOL.MP3 b/gamedir/Data-1.13/BattleSNDS/215_COOL.MP3 new file mode 100644 index 000000000..4c87415b1 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_COOL.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_COOL2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_COOL2.MP3 new file mode 100644 index 000000000..c3a09da00 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_COOL2.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_CURSE.MP3 b/gamedir/Data-1.13/BattleSNDS/215_CURSE.MP3 new file mode 100644 index 000000000..be77c9377 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_CURSE.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_CURSE2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_CURSE2.MP3 new file mode 100644 index 000000000..2c88fd45b Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_CURSE2.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_CURSE3.MP3 b/gamedir/Data-1.13/BattleSNDS/215_CURSE3.MP3 new file mode 100644 index 000000000..189c1eb06 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_CURSE3.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_DYING.MP3 b/gamedir/Data-1.13/BattleSNDS/215_DYING.MP3 new file mode 100644 index 000000000..9bc5847cd Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_DYING.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_DYING2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_DYING2.MP3 new file mode 100644 index 000000000..8219a26ea Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_DYING2.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_DYING3.MP3 b/gamedir/Data-1.13/BattleSNDS/215_DYING3.MP3 new file mode 100644 index 000000000..4938d903a Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_DYING3.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_ENEM.MP3 b/gamedir/Data-1.13/BattleSNDS/215_ENEM.MP3 new file mode 100644 index 000000000..f4787c7e4 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_ENEM.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_GOTIT.WAV b/gamedir/Data-1.13/BattleSNDS/215_GOTIT.WAV new file mode 100644 index 000000000..9fa93af32 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_GOTIT.WAV differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT1.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT1.MP3 new file mode 100644 index 000000000..5a07693a3 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT1.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT2.MP3 new file mode 100644 index 000000000..1226c214d Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT2.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT3.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT3.MP3 new file mode 100644 index 000000000..37ef202cb Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT3.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT4.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT4.MP3 new file mode 100644 index 000000000..c1b340396 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT4.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT5.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT5.MP3 new file mode 100644 index 000000000..da01ab5ca Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT5.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT6.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT6.MP3 new file mode 100644 index 000000000..429d640dd Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT6.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT7.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT7.MP3 new file mode 100644 index 000000000..c4c4ec2f9 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT7.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HIT8.MP3 b/gamedir/Data-1.13/BattleSNDS/215_HIT8.MP3 new file mode 100644 index 000000000..54b33e4f4 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HIT8.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_HUMM.WAV b/gamedir/Data-1.13/BattleSNDS/215_HUMM.WAV new file mode 100644 index 000000000..009946e77 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_HUMM.WAV differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_LAUGH.MP3 b/gamedir/Data-1.13/BattleSNDS/215_LAUGH.MP3 new file mode 100644 index 000000000..39d14f0ab Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_LAUGH.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_LMATTN.MP3 b/gamedir/Data-1.13/BattleSNDS/215_LMATTN.MP3 new file mode 100644 index 000000000..6fd7a1fb3 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_LMATTN.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_LMOK1.MP3 b/gamedir/Data-1.13/BattleSNDS/215_LMOK1.MP3 new file mode 100644 index 000000000..d43f4bc3d Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_LMOK1.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_LOCKED.MP3 b/gamedir/Data-1.13/BattleSNDS/215_LOCKED.MP3 new file mode 100644 index 000000000..1517cdd20 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_LOCKED.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_LOCKED2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_LOCKED2.MP3 new file mode 100644 index 000000000..1506d8920 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_LOCKED2.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_NOTH.MP3 b/gamedir/Data-1.13/BattleSNDS/215_NOTH.MP3 new file mode 100644 index 000000000..6d5b3812e Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_NOTH.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_OK1.MP3 b/gamedir/Data-1.13/BattleSNDS/215_OK1.MP3 new file mode 100644 index 000000000..72a74eb44 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_OK1.MP3 differ diff --git a/gamedir/Data-1.13/BattleSNDS/215_OK2.MP3 b/gamedir/Data-1.13/BattleSNDS/215_OK2.MP3 new file mode 100644 index 000000000..367a456d9 Binary files /dev/null and b/gamedir/Data-1.13/BattleSNDS/215_OK2.MP3 differ diff --git a/gamedir/Data-1.13/MercEdt/215.EDT b/gamedir/Data-1.13/MercEdt/215.EDT new file mode 100644 index 000000000..0573d41c4 Binary files /dev/null and b/gamedir/Data-1.13/MercEdt/215.EDT differ diff --git a/gamedir/Data-1.13/Scripts/Overhead.lua b/gamedir/Data-1.13/Scripts/Overhead.lua index 66b757b67..d47c886a1 100644 --- a/gamedir/Data-1.13/Scripts/Overhead.lua +++ b/gamedir/Data-1.13/Scripts/Overhead.lua @@ -68,18 +68,57 @@ Quests = Profil = { + BARRY = 0, + BLOOD = 1, LYNX = 2, + GRIZZLY = 3, + VICKI = 4, + TREVOR = 5, GRUNTY = 6, + IVAN = 7, + STEROID = 8, + IGOR = 9, + SHADOW = 10, + RED = 11, + REAPER = 12, + FIDEL = 13, + FOX = 14, SIDNEY = 15, + GUS = 16, BUNS = 17, ICE = 18, + SPIDER = 19, + CLIFF = 20, + BULL = 21, HITMAN = 22, + BUZZ = 23, RAIDER = 24, RAVEN = 25, + STATIC = 26, + LEN = 27, + DANNY = 28, + MAGIC = 29, STEPHEN = 30, + SCULLY = 31, + MALICE = 32, + DRQ = 33, + NAILS = 34, THOR = 35, SCOPE = 36, + WOLF = 37, + MD = 38, + MELTDOWN = 39, + BIFF = 40, + HAYWIRE = 41, + GASKET = 42, + RAZOR = 43, + FLO = 44, GUMPY = 45, + LARRY = 46, + LARRY_STONED = 47, + COUGAR = 48, + NUMB = 49, + BUBBA = 50, MIGUEL = 57, CARLOS = 58, IRA = 59, @@ -181,7 +220,8 @@ Profil = CARL = 158, LAURA = 175, RUDOLF = 177, - NO_PROFILE = 200, + SKITZ = 179, + BUNS_CHAOTIC = 215, MOUSE = 245, STELLA = 248, } @@ -2785,8 +2825,9 @@ DialogueActionEvent = ADE_SEX = 11, -- does exactly what you think it does ADE_WEATHERCHANGE = 12, -- the weather has changed in the current sector, and we can warn the player about that, aData1 is of Weather ADE_SKILL_RESULT = 13, -- we used a skill, and comment on the result, aData1 is of Skill, aData2 indicates whether it was a success (1) or failure (0) - ADE_GRENADEWARNING = 14, -- a delayed enemy grenade was dropped nearby, and we can shout a warning + ADE_GRENADEWARNING = 14, -- a delayed enemy grenade was dropped nearby, and we can shout a warning, aData1 is the itemnumber of the grenade ADE_CONSUMEITEM = 15, -- we applied an item to us, aData1 is the item index + ADE_NPC_DEATH = 16, -- someone died, aData1 is the profile of the dead NPC, aData2 the profile of the killer, aData3 the bodytype of the dead } -- functions used here: @@ -2809,64 +2850,77 @@ DialogueActionEvent = -- aData1, aData2, aData3 are additional data, see event description on what they do in each event function HandleAdditionalDialogue(sSectorX, sSectorY, bSectorZ, ubProfile, iFaceIndex, usEventNr, aData1, aData2, aData3 ) - if ( ubProfile == Profil.BUNS ) then + if ( ubProfile == Profil.BUNS_CHAOTIC ) then - -- merc is the 1st one to explore this room, aData1 indicates the room in this event - if ( usEventNr == DialogueActionEvent.ADE_DISCOVER_ROOM ) then - - -- surface sectors - if ( bSectorZ == 0 ) then - - -- Omerta - if ( (sSectorY == SectorY.MAP_ROW_A) and ( (sSectorX == 9) or (sSectorX == 10) ) ) then - - -- We use a random comment on the derelict houses in Omerta whenever we enter a room. As there are quite a few of those, don't always do so, otherwise this can be annoying - choicenr = math.random(1, 25) - - if ( choicenr == 1 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//emptyhouse.ogg", "Hello? Anyone there? Hmm. It seems that this place is as quiet as a tomb.") - end - - end - - end - -- we can 'react' on what lines other people use -- this happens when we are in the same sector, awake and concious -- aData1 indicates the profile number in this event -- aData2 indicates the specific voice line we react to - elseif ( usEventNr == DialogueActionEvent.ADE_DIALOGUE_REACTION ) then + if ( usEventNr == DialogueActionEvent.ADE_DIALOGUE_REACTION ) then if ( aData1 == Profil.FRED ) then - if ( aData2 == 12 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//fred0.ogg", "Pleasant fellow, I suppose, but too honest for his own good.") + if ( aData2 == 12 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//nicebutharmless.MP3", "Pleasant fellow, I suppose, but too honest for his own good.") end - elseif ( aData1 == Profil.JOEY ) then + elseif ( aData1 == Profil.ELLIOT ) then - if ( aData2 == 0 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//joey0.ogg", "Ah, clever little fellow. Do not turn your back on this one.") + if ( aData2 == 0 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//elliot.mp3", "Death doesn't seem to have kept him from talking.") end + + end + + elseif ( usEventNr == DialogueActionEvent.ADE_SECTOR_COMMENTARY ) then + + -- surface sectors + if ( bSectorZ == 0 ) then + + -- Alma base + if ( (sSectorX == 13) and (sSectorY == SectorY.MAP_ROW_H) ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//almabase.mp3", "This must be where the savant has set up shop. Very impressive.") - elseif ( aData1 == Profil.PABLO ) then - - if ( aData2 == 2 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//pablo2.ogg", "Lying pig.") - end - - elseif ( aData1 == Profil.ARMAND ) then - - if ( aData2 == 14 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//armand0.ogg", "A very distinguished gentleman. I only hope he's telling the truth.") + -- Hicks farm + elseif ( (sSectorX == 10) and (sSectorY == SectorY.MAP_ROW_F) ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//hicksfarm.ogg", "Nothing but crude brutes. The savant would not ally with them... at least... I hope not.") + end end - -- we applied an item to us, aData1 is the item index - elseif ( usEventNr == DialogueActionEvent.ADE_CONSUMEITEM ) then + -- aData1 is the itemnumber of the grenade + elseif ( usEventNr == DialogueActionEvent.ADE_GRENADEWARNING ) then + + SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//grenadewarning.ogg", "Be careful, it would probably burn your legs right off!") + + -- someone died, aData1 is the profile of the dead NPC, aData2 the profile of the killer, aData3 the bodytype of the dead + elseif ( usEventNr == DialogueActionEvent.ADE_NPC_DEATH ) then + + if ( aData2 == Profil.BUNS_CHAOTIC ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//friendlyfire.MP3", "So sorry. I slipped.") + + elseif ( (aData1 == Profil.BUZZ) or + (aData1 == Profil.MELTDOWN) or + (aData1 == Profil.ANNIE) or + (aData1 == Profil.MADAME) or + (aData1 == Profil.DOREEN) ) then + + SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//likedfemaledeath.MP3", "Her blood will be avenged.") + + elseif ( (aData1 == Profil.REAPER) or + (aData1 == Profil.HAYWIRE) or + (aData1 == Profil.RAZOR) or + (aData1 == Profil.SLAY) or + (aData1 == Profil.CARMEN) or + (aData1 == Profil.JOE) or + (aData1 == Profil.CHRIS) or + (aData1 == Profil.KINGPIN) or + (aData1 == Profil.MIKE) or + (aData1 == Profil.SKITZ) ) then + + SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//likedmaledeath.MP3", "Very sad. But he was weak.") - if ( aData1 == 1752 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//painkillers.ogg", "Not so bad now.") - elseif ( aData1 == 235 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns//regenbooster.ogg", "I am better now.") end end end + end diff --git a/gamedir/Data-1.13/Speech/215_000.MP3 b/gamedir/Data-1.13/Speech/215_000.MP3 new file mode 100644 index 000000000..c3b62f927 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_000.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_001.MP3 b/gamedir/Data-1.13/Speech/215_001.MP3 new file mode 100644 index 000000000..fa58b51f2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_001.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_002.MP3 b/gamedir/Data-1.13/Speech/215_002.MP3 new file mode 100644 index 000000000..fb9635054 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_002.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_003.MP3 b/gamedir/Data-1.13/Speech/215_003.MP3 new file mode 100644 index 000000000..3eb8e26f1 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_003.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_004.MP3 b/gamedir/Data-1.13/Speech/215_004.MP3 new file mode 100644 index 000000000..7a2d14d73 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_004.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_005.ogg b/gamedir/Data-1.13/Speech/215_005.ogg new file mode 100644 index 000000000..212b24c3f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_005.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_006.MP3 b/gamedir/Data-1.13/Speech/215_006.MP3 new file mode 100644 index 000000000..74e064685 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_006.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_007.MP3 b/gamedir/Data-1.13/Speech/215_007.MP3 new file mode 100644 index 000000000..d649fdbd5 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_007.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_008.ogg b/gamedir/Data-1.13/Speech/215_008.ogg new file mode 100644 index 000000000..d57bd4113 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_008.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_009.MP3 b/gamedir/Data-1.13/Speech/215_009.MP3 new file mode 100644 index 000000000..12f0c114f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_009.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_010.MP3 b/gamedir/Data-1.13/Speech/215_010.MP3 new file mode 100644 index 000000000..3ea30b078 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_010.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_011.MP3 b/gamedir/Data-1.13/Speech/215_011.MP3 new file mode 100644 index 000000000..ebf9d1f98 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_011.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_012.MP3 b/gamedir/Data-1.13/Speech/215_012.MP3 new file mode 100644 index 000000000..0ed13199a Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_012.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_013.MP3 b/gamedir/Data-1.13/Speech/215_013.MP3 new file mode 100644 index 000000000..4a93706ad Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_013.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_014.MP3 b/gamedir/Data-1.13/Speech/215_014.MP3 new file mode 100644 index 000000000..0fab2c5ec Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_014.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_019.MP3 b/gamedir/Data-1.13/Speech/215_019.MP3 new file mode 100644 index 000000000..b6bce148c Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_019.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_020.MP3 b/gamedir/Data-1.13/Speech/215_020.MP3 new file mode 100644 index 000000000..9760dd923 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_020.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_021.MP3 b/gamedir/Data-1.13/Speech/215_021.MP3 new file mode 100644 index 000000000..9f96bf833 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_021.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_022.MP3 b/gamedir/Data-1.13/Speech/215_022.MP3 new file mode 100644 index 000000000..5d79678f5 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_022.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_023.MP3 b/gamedir/Data-1.13/Speech/215_023.MP3 new file mode 100644 index 000000000..80afc6f00 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_023.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_024.MP3 b/gamedir/Data-1.13/Speech/215_024.MP3 new file mode 100644 index 000000000..7a0aa5327 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_024.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_025.MP3 b/gamedir/Data-1.13/Speech/215_025.MP3 new file mode 100644 index 000000000..6f1e35266 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_025.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_026.MP3 b/gamedir/Data-1.13/Speech/215_026.MP3 new file mode 100644 index 000000000..02a3244df Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_026.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_027.MP3 b/gamedir/Data-1.13/Speech/215_027.MP3 new file mode 100644 index 000000000..2e4270ee1 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_027.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_028.MP3 b/gamedir/Data-1.13/Speech/215_028.MP3 new file mode 100644 index 000000000..0af5782ff Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_028.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_032.MP3 b/gamedir/Data-1.13/Speech/215_032.MP3 new file mode 100644 index 000000000..3035ab8c2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_032.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_033.MP3 b/gamedir/Data-1.13/Speech/215_033.MP3 new file mode 100644 index 000000000..e659dfb9b Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_033.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_034.ogg b/gamedir/Data-1.13/Speech/215_034.ogg new file mode 100644 index 000000000..396ad14a7 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_034.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_035.MP3 b/gamedir/Data-1.13/Speech/215_035.MP3 new file mode 100644 index 000000000..202e631ac Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_035.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_036.MP3 b/gamedir/Data-1.13/Speech/215_036.MP3 new file mode 100644 index 000000000..7967e7eb5 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_036.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_037.MP3 b/gamedir/Data-1.13/Speech/215_037.MP3 new file mode 100644 index 000000000..bd90125b8 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_037.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_038.MP3 b/gamedir/Data-1.13/Speech/215_038.MP3 new file mode 100644 index 000000000..5cf9d5fe2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_038.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_039.MP3 b/gamedir/Data-1.13/Speech/215_039.MP3 new file mode 100644 index 000000000..ecbcf58df Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_039.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_040.MP3 b/gamedir/Data-1.13/Speech/215_040.MP3 new file mode 100644 index 000000000..1cab2a41f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_040.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_041.WAV b/gamedir/Data-1.13/Speech/215_041.WAV new file mode 100644 index 000000000..20b6cbb8f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_041.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_042.WAV b/gamedir/Data-1.13/Speech/215_042.WAV new file mode 100644 index 000000000..6744c8861 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_042.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_043.ogg b/gamedir/Data-1.13/Speech/215_043.ogg new file mode 100644 index 000000000..da5046714 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_043.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_044.MP3 b/gamedir/Data-1.13/Speech/215_044.MP3 new file mode 100644 index 000000000..2ce4fa03d Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_044.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_045.MP3 b/gamedir/Data-1.13/Speech/215_045.MP3 new file mode 100644 index 000000000..620c60a2f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_045.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_046.MP3 b/gamedir/Data-1.13/Speech/215_046.MP3 new file mode 100644 index 000000000..7a21857e6 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_046.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_047.WAV b/gamedir/Data-1.13/Speech/215_047.WAV new file mode 100644 index 000000000..3c1e8f5e7 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_047.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_054.WAV b/gamedir/Data-1.13/Speech/215_054.WAV new file mode 100644 index 000000000..2ec2125f6 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_054.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_055.MP3 b/gamedir/Data-1.13/Speech/215_055.MP3 new file mode 100644 index 000000000..333687d58 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_055.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_056.MP3 b/gamedir/Data-1.13/Speech/215_056.MP3 new file mode 100644 index 000000000..5f54cc0b9 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_056.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_057.MP3 b/gamedir/Data-1.13/Speech/215_057.MP3 new file mode 100644 index 000000000..f4f816734 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_057.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_058.MP3 b/gamedir/Data-1.13/Speech/215_058.MP3 new file mode 100644 index 000000000..aaccc31d2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_058.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_059.MP3 b/gamedir/Data-1.13/Speech/215_059.MP3 new file mode 100644 index 000000000..839348f18 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_059.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_060.ogg b/gamedir/Data-1.13/Speech/215_060.ogg new file mode 100644 index 000000000..691ed6363 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_060.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_061.MP3 b/gamedir/Data-1.13/Speech/215_061.MP3 new file mode 100644 index 000000000..079f36d7e Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_061.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_062.MP3 b/gamedir/Data-1.13/Speech/215_062.MP3 new file mode 100644 index 000000000..d2581ccf9 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_062.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_063.MP3 b/gamedir/Data-1.13/Speech/215_063.MP3 new file mode 100644 index 000000000..29f3f4933 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_063.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_064.MP3 b/gamedir/Data-1.13/Speech/215_064.MP3 new file mode 100644 index 000000000..94bbca69a Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_064.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_065.ogg b/gamedir/Data-1.13/Speech/215_065.ogg new file mode 100644 index 000000000..c34c9d266 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_065.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_066.MP3 b/gamedir/Data-1.13/Speech/215_066.MP3 new file mode 100644 index 000000000..2e659a427 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_066.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_067.MP3 b/gamedir/Data-1.13/Speech/215_067.MP3 new file mode 100644 index 000000000..fdff3e5c2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_067.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_068.ogg b/gamedir/Data-1.13/Speech/215_068.ogg new file mode 100644 index 000000000..5eb606775 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_068.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_069.MP3 b/gamedir/Data-1.13/Speech/215_069.MP3 new file mode 100644 index 000000000..0225d2e5c Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_069.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_070.MP3 b/gamedir/Data-1.13/Speech/215_070.MP3 new file mode 100644 index 000000000..7c1ff1747 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_070.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_072.MP3 b/gamedir/Data-1.13/Speech/215_072.MP3 new file mode 100644 index 000000000..7b2097646 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_072.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_073.WAV b/gamedir/Data-1.13/Speech/215_073.WAV new file mode 100644 index 000000000..b77935350 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_073.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_074.ogg b/gamedir/Data-1.13/Speech/215_074.ogg new file mode 100644 index 000000000..db000866d Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_074.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_075.MP3 b/gamedir/Data-1.13/Speech/215_075.MP3 new file mode 100644 index 000000000..88d59bf7e Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_075.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_076.MP3 b/gamedir/Data-1.13/Speech/215_076.MP3 new file mode 100644 index 000000000..079eef9f5 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_076.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_077.MP3 b/gamedir/Data-1.13/Speech/215_077.MP3 new file mode 100644 index 000000000..d0b6925af Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_077.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_078.ogg b/gamedir/Data-1.13/Speech/215_078.ogg new file mode 100644 index 000000000..a16720cfb Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_078.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_083.ogg b/gamedir/Data-1.13/Speech/215_083.ogg new file mode 100644 index 000000000..fac479048 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_083.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_084.WAV b/gamedir/Data-1.13/Speech/215_084.WAV new file mode 100644 index 000000000..07bccf046 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_084.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_085.WAV b/gamedir/Data-1.13/Speech/215_085.WAV new file mode 100644 index 000000000..045387f00 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_085.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_089.ogg b/gamedir/Data-1.13/Speech/215_089.ogg new file mode 100644 index 000000000..4bbf59f73 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_089.ogg differ diff --git a/gamedir/Data-1.13/Speech/215_090.MP3 b/gamedir/Data-1.13/Speech/215_090.MP3 new file mode 100644 index 000000000..0fb5697f4 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_090.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_095.MP3 b/gamedir/Data-1.13/Speech/215_095.MP3 new file mode 100644 index 000000000..5e706c1fd Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_095.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_098.WAV b/gamedir/Data-1.13/Speech/215_098.WAV new file mode 100644 index 000000000..a02de1364 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_098.WAV differ diff --git a/gamedir/Data-1.13/Speech/215_099.MP3 b/gamedir/Data-1.13/Speech/215_099.MP3 new file mode 100644 index 000000000..d7bce37b1 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_099.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_110.MP3 b/gamedir/Data-1.13/Speech/215_110.MP3 new file mode 100644 index 000000000..494a3e725 Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_110.MP3 differ diff --git a/gamedir/Data-1.13/Speech/215_116.ogg b/gamedir/Data-1.13/Speech/215_116.ogg new file mode 100644 index 000000000..e5b37d73f Binary files /dev/null and b/gamedir/Data-1.13/Speech/215_116.ogg differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/almabase.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/almabase.MP3 new file mode 100644 index 000000000..1d9909376 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/almabase.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/elliot.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/elliot.MP3 new file mode 100644 index 000000000..815281377 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/elliot.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/friendlyfire.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/friendlyfire.MP3 new file mode 100644 index 000000000..5251d7a78 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/friendlyfire.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/grenadewarning.ogg b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/grenadewarning.ogg new file mode 100644 index 000000000..b4978227a Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/grenadewarning.ogg differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/hicksfarm.ogg b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/hicksfarm.ogg new file mode 100644 index 000000000..00ea432c8 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/hicksfarm.ogg differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedfemaledeath.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedfemaledeath.MP3 new file mode 100644 index 000000000..fa4527440 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedfemaledeath.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedmaledeath.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedmaledeath.MP3 new file mode 100644 index 000000000..706455e6c Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/likedmaledeath.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/nicebutharmless.MP3 b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/nicebutharmless.MP3 new file mode 100644 index 000000000..ce18719f0 Binary files /dev/null and b/gamedir/Data-1.13/Speech/Additional/Buns_chaotic/nicebutharmless.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Special/buns_ptsd_activation.MP3 b/gamedir/Data-1.13/Speech/Special/buns_ptsd_activation.MP3 new file mode 100644 index 000000000..8c3a64e3a Binary files /dev/null and b/gamedir/Data-1.13/Speech/Special/buns_ptsd_activation.MP3 differ diff --git a/gamedir/Data-1.13/Speech/Special/buns_ptsd_deactivation.MP3 b/gamedir/Data-1.13/Speech/Special/buns_ptsd_deactivation.MP3 new file mode 100644 index 000000000..a9b7e6b9a Binary files /dev/null and b/gamedir/Data-1.13/Speech/Special/buns_ptsd_deactivation.MP3 differ diff --git a/gamedir/Data-1.13/TableData/AIMAvailability.xml b/gamedir/Data-1.13/TableData/AIMAvailability.xml index 2086f8a8f..8e3dc1af3 100644 --- a/gamedir/Data-1.13/TableData/AIMAvailability.xml +++ b/gamedir/Data-1.13/TableData/AIMAvailability.xml @@ -1291,9 +1291,9 @@ 215 - + Buns -1 - -1 + 17 216 diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml index e3777b79a..33bc2887d 100644 --- a/gamedir/Data-1.13/TableData/Backgrounds.xml +++ b/gamedir/Data-1.13/TableData/Backgrounds.xml @@ -416,24 +416,12 @@ 17 Nurse/Soldier/Shooter Nurse/Soldier/Shooter - That combination will definitely spice up your resume. - 2 - 2 - 3 - 8 - 7 + That combination definitely spices up your resume. -10 - 5 - 8 - 3 - 3 30 - 2 + 10 + 6 5 - 4 - -3 - 3 - 10 3 2 1 @@ -4102,11 +4090,20 @@ 1 + 215 - Placeholder - Placeholder - Not needed! + Split personality + Split personality + Since contracting PTSD, Buns involuntarily switches to a second personality under high stress. Her alternate persona is highly aggressive. + 6 + 20 + 10 + 20 + 10 + 5 + -25 + 1 1 1 diff --git a/gamedir/Data-1.13/TableData/Disease.xml b/gamedir/Data-1.13/TableData/Disease.xml index b55850b69..9f30167f1 100644 --- a/gamedir/Data-1.13/TableData/Disease.xml +++ b/gamedir/Data-1.13/TableData/Disease.xml @@ -28,6 +28,7 @@ 0 0 1 + 0 0 0 0 @@ -71,6 +72,7 @@ 0 0 1 + 0 0 0 0 @@ -114,6 +116,7 @@ 0 0 0 + 0 0 -10 0 @@ -157,6 +160,7 @@ 0 0 0 + 0 0 -30 0 @@ -200,6 +204,7 @@ 0 0 1 + 0 0 0 -7 @@ -243,6 +248,7 @@ 0 0 1 + 0 0 0 0 @@ -287,6 +293,7 @@ 0 0 1 + 0 0 0 0 @@ -330,6 +337,7 @@ 0 0 1 + 0 -10 0 0 @@ -373,6 +381,7 @@ 1 0 1 + 0 0 0 0 @@ -416,6 +425,7 @@ 0 0 0 + 0 -5 -5 0 @@ -459,6 +469,7 @@ 1 1 0 + 0 0 0 0 @@ -494,7 +505,7 @@ 0 0 50 - 10 + 40 0 0 0 @@ -502,6 +513,7 @@ 0 1 0 + 1 0 0 0 @@ -545,6 +557,7 @@ 1 1 0 + 0 -50 0 0 @@ -588,6 +601,7 @@ 1 1 0 + 0 0 -20 0 @@ -631,6 +645,7 @@ 1 1 0 + 0 0 0 -20 @@ -646,6 +661,7 @@ 1.0 + 15 Drug Addiction |D|r|u|g |A|d|d|i|c|t|i|o|n @@ -674,6 +690,7 @@ 1 1 1 + 0 -20 -40 -20 @@ -717,6 +734,7 @@ 1 1 0 + 0 -20 0 0 @@ -761,6 +779,7 @@ 1 1 0 + 0 0 0 0 diff --git a/gamedir/Data-1.13/TableData/HiddenNames.xml b/gamedir/Data-1.13/TableData/HiddenNames.xml index fe62175a4..7930f8c28 100644 --- a/gamedir/Data-1.13/TableData/HiddenNames.xml +++ b/gamedir/Data-1.13/TableData/HiddenNames.xml @@ -1076,7 +1076,7 @@ 215 - + Buns 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml index 47014b72a..265271d36 100644 --- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -23612,6 +23612,7 @@ + 215 diff --git a/gamedir/Data-1.13/TableData/MercOpinions.xml b/gamedir/Data-1.13/TableData/MercOpinions.xml index e59e475d6..5ca7ae6d6 100644 --- a/gamedir/Data-1.13/TableData/MercOpinions.xml +++ b/gamedir/Data-1.13/TableData/MercOpinions.xml @@ -221,7 +221,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -484,7 +484,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -747,7 +747,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -1010,7 +1010,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -1273,7 +1273,7 @@ 0 0 0 - 0 + 2 0 0 0 @@ -1536,7 +1536,7 @@ 0 0 0 - 0 + -15 0 0 0 @@ -1799,7 +1799,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -2062,7 +2062,7 @@ 0 0 0 - 0 + -7 0 0 0 @@ -2325,7 +2325,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -2588,7 +2588,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -2851,7 +2851,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -3114,7 +3114,7 @@ 0 0 0 - 0 + -25 0 0 0 @@ -3377,7 +3377,7 @@ 0 0 0 - 0 + 10 0 0 0 @@ -3640,7 +3640,7 @@ 0 0 0 - 0 + 6 0 0 0 @@ -3903,7 +3903,7 @@ 0 0 0 - 0 + -7 0 0 0 @@ -4166,7 +4166,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -4429,7 +4429,7 @@ 0 0 0 - 0 + -9 0 0 0 @@ -4955,7 +4955,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -5218,7 +5218,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -5481,7 +5481,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -5744,7 +5744,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -6007,7 +6007,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -6270,7 +6270,7 @@ 0 0 0 - 0 + 4 0 0 0 @@ -6533,7 +6533,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -6796,7 +6796,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -7059,7 +7059,7 @@ 0 0 0 - 0 + 3 0 0 0 @@ -7322,7 +7322,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -7585,7 +7585,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -7848,7 +7848,7 @@ 0 0 0 - 0 + -25 0 0 0 @@ -8111,7 +8111,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -8374,7 +8374,7 @@ 0 0 0 - 0 + -7 0 0 0 @@ -8637,7 +8637,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -8900,7 +8900,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -9163,7 +9163,7 @@ 0 0 0 - 0 + 2 0 0 0 @@ -9426,7 +9426,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -9689,7 +9689,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -9952,7 +9952,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -10215,7 +10215,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -10478,7 +10478,7 @@ 0 0 0 - 0 + 8 0 0 0 @@ -10741,7 +10741,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -11004,7 +11004,7 @@ 0 0 0 - 0 + 7 0 0 0 @@ -11267,7 +11267,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -11530,7 +11530,7 @@ 0 0 0 - 0 + 25 0 0 0 @@ -11793,7 +11793,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -12056,7 +12056,7 @@ 0 0 0 - 0 + 8 0 0 0 @@ -12319,7 +12319,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -12582,7 +12582,7 @@ 0 0 0 - 0 + 4 0 0 0 @@ -12845,7 +12845,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -13108,7 +13108,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -13371,7 +13371,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -15212,7 +15212,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -15475,7 +15475,7 @@ 0 0 0 - 0 + -15 0 0 0 @@ -15738,7 +15738,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -16001,7 +16001,7 @@ 0 0 0 - 0 + -10 0 0 0 @@ -16264,7 +16264,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -16790,7 +16790,7 @@ 0 0 0 - 0 + -8 0 0 0 @@ -17053,7 +17053,7 @@ 0 0 0 - 0 + -8 0 0 0 @@ -17579,7 +17579,7 @@ 0 0 0 - 0 + -15 0 0 0 @@ -17842,7 +17842,7 @@ 0 0 0 - 0 + -7 0 0 0 @@ -18105,7 +18105,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -18368,7 +18368,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -18631,7 +18631,7 @@ 0 0 0 - 0 + -1 0 0 0 @@ -19157,7 +19157,7 @@ 0 0 0 - 0 + 15 0 0 0 @@ -19420,7 +19420,7 @@ 0 0 0 - 0 + -6 0 0 0 @@ -19683,7 +19683,7 @@ 0 0 0 - 0 + -20 0 0 0 @@ -20209,7 +20209,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -20735,7 +20735,7 @@ 0 0 0 - 0 + 4 0 0 0 @@ -21787,7 +21787,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -22050,7 +22050,7 @@ 0 0 0 - 0 + 5 0 0 0 @@ -22576,7 +22576,7 @@ 0 0 0 - 0 + 2 0 0 0 @@ -22839,7 +22839,7 @@ 0 0 0 - 0 + -5 0 0 0 @@ -23102,7 +23102,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -23365,7 +23365,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -23628,7 +23628,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -23891,7 +23891,7 @@ 0 0 0 - 0 + -4 0 0 0 @@ -24154,7 +24154,7 @@ 0 0 0 - 0 + -2 0 0 0 @@ -24417,7 +24417,7 @@ 0 0 0 - 0 + 3 0 0 0 @@ -24680,7 +24680,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -24943,7 +24943,7 @@ 0 0 0 - 0 + -10 0 0 0 @@ -25995,7 +25995,7 @@ 0 0 0 - 0 + -3 0 0 0 @@ -26521,7 +26521,7 @@ 0 0 0 - 0 + -7 0 0 0 @@ -47298,7 +47298,7 @@ 0 0 0 - 0 + 25 0 0 0 @@ -50450,10 +50450,10 @@ -3 -3 -3 - -3 - -3 - -3 - -3 + 0 + 0 + 0 + 0 -3 -3 -3 @@ -50493,7 +50493,7 @@ -3 5 5 - -3 + 0 192 @@ -56546,162 +56546,162 @@ 215 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + Buns + -4 + 3 + 2 + -3 + -2 + -5 + -6 + -7 + -6 + -4 + -7 + -10 + 10 + 5 + -25 + -10 + -5 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -7 + -5 + -5 + 3 + -10 + 8 + -6 + -6 + 5 + -7 + -5 + 1 + -10 + -4 + 3 + -9 + 3 + -7 + 2 + -5 + -10 + 10 + -20 + 15 + -5 + 20 + -10 + -11 + -6 + -4 + -6 + 3 + -4 0 0 0 0 0 0 - 0 - 0 - 0 - 0 - 0 + -8 + -7 + -7 + -3 + 3 0 - 0 - 0 + -6 + 6 0 - 0 - 0 - 0 - 0 - 0 + 3 + -10 + -5 + -13 + 5 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 4 + -10 + -12 + -8 + -7 + -15 + 10 + 10 0 0 0 0 0 0 - 0 - 0 + 7 + 15 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 4 + 12 + 4 + -6 + -7 + 2 + 3 + 4 + -2 + 6 + -6 + 4 + -3 + -10 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -25 + -12 + 5 + -7 + -4 + -6 + 3 + 7 + 5 + -13 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 3 + 6 + 3 + -6 + -2 + 4 + 3 + -7 + -7 + 5 + -5 + -5 + 4 + -3 + -12 + -3 + -5 + -4 + -11 + -2 + -4 + -4 + -6 + -15 + -11 0 0 - 0 - 0 + -4 + 12 0 0 0 0 0 0 - 0 - 0 + 5 + -5 0 - 0 - 0 + 12 + -6 0 0 0 @@ -56716,40 +56716,40 @@ 0 0 0 - 0 - 0 - 0 - 0 + 1 + 2 + -4 + -2 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -5 + -6 + -6 + -5 + -6 + -8 + -3 + -5 + 7 + 17 + -7 + -3 + -4 + 2 + -6 + -4 + -5 + -6 + -15 + -14 + -3 + -14 0 0 0 0 0 - 0 - 0 + -3 + 3 0 0 0 @@ -56771,40 +56771,40 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -4 + 2 + -5 + -4 + -7 + -4 + -3 + -14 + -5 + -3 + 2 + 6 + -4 + 4 + 5 + 3 + -4 + -4 + -5 + -7 + -4 + 3 + -4 + -3 + -4 + -6 + 1 + -25 + -4 + -7 + 2 + 3 + -4 + -5 0 @@ -59520,10 +59520,6 @@ 0 0 0 - 0 - 0 - 0 - 0 0 0 0 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index f31983af5..b816daffa 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -136,7 +136,7 @@ - + @@ -192,7 +192,10 @@ IRAQI, // 40 SYRIAN, BELGIAN, - PORTOGUESE, --> + PORTOGUESE, + BELARUSIAN_NAT, + SERBIAN_NAT, // 45 + PAISTANI_NAT, --> @@ -18385,8 +18388,8 @@ 0 0 0 - 20 - 0 + 9 + 20 0 247 255 @@ -20821,98 +20824,99 @@ 215 - 0 - - - 215 + 1 + Monica "Buns" Sondergaard + Buns + 17 215 - 0 - 0 - 0 - 0 + 12 + 10 + 10 + 28 0 0 - 0 - 0 - - - - - 0 - 0 + 3000 + 2000 + TANPANTS + WHITEVEST + PINKSKIN + BROWNHEAD + 1 + 3 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 6 + 11 + 12 + 8 + 65 + 40 + 79 + 79 + 59 + 78 + 87 + 93 + 78 + 52 + 7 + 12 + 13 + 2 + 0 + 8 + 13 + 4 + 11 + 15 + 255 + 255 + 255 + 255 + 255 + 255 + 255 + 255 + 18 + 255 + 34 + 255 0 - 0 + 255 0 - 0 + 255 0 - 0 - 0 + 255 + 44 0 - 0 - 0 - 0 - 0 - 0 - -1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - -1 - -1 + 6 + 3 + 2 + 2 + 2 + 18 + 1 + 2 + 2 + 725 + 4700 + 8500 + 1 + 1800 + 1979 + 30 + 45 0 - 0 - 0 - 0 - 0 + 25 + 65 + 200 + 50 0 0 0 0 0 0 + 215 216 diff --git a/gamedir/Data-1.13/TableData/MercQuote.xml b/gamedir/Data-1.13/TableData/MercQuote.xml index dda5f51d5..31400de59 100644 --- a/gamedir/Data-1.13/TableData/MercQuote.xml +++ b/gamedir/Data-1.13/TableData/MercQuote.xml @@ -2366,14 +2366,14 @@ 215 - + Buns 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 2 + 62 + 3 + 1 + 1 216 diff --git a/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml b/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml index 868d95710..daad997f6 100644 --- a/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml +++ b/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml @@ -1076,8 +1076,8 @@ 215 - - 0 + Buns + 1 216