# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1571431819 14400
# Node ID e3f46c421f0eaa78d6bcd33d5aaa89a7e2aa5991
# Parent  6554a615d45974107d929c9c661a5eaf61437489# Parent  9af48fd636c117d62626448545416fae92f36c40
Merge.

diff -r 9af48fd636c1 -r e3f46c421f0e eqclient.ini
--- a/eqclient.ini	Wed Oct 02 12:18:52 2019 -0400
+++ b/eqclient.ini	Fri Oct 18 16:50:19 2019 -0400
@@ -42,22 +42,22 @@
 DoProperTinting=FALSE
 Sound44k=0
 SpeakerType=0
-UISkin=Default
+UISkin=velious
 AtlasSkin=Default
 LoadSocialAnimations=TRUE
 UseLuclinVahShirMale=TRUE
 UseLuclinVahShirFemale=TRUE
 UseLuclinElementals=TRUE
 DefaultChannel=8
-LastCharSel=4
+LastCharSel=0
 SystemInfoDelay=0
 ShowCreationHelp=FALSE
 WindowedModeXOffset=0
 WindowedModeYOffset=0
 Music=0
 SoundVolume=7
-Gamma=20
-SpellParticleOpacity=0.570000
+Gamma=20.000000
+SpellParticleOpacity=0.480000
 EnvironmentParticleOpacity=1.000000
 ActorParticleOpacity=1.000000
 ShowAlarmWindow=false
@@ -409,7 +409,7 @@
 Realism=4
 ClipPlane=20
 FogScale=4.000000
-MaxFPS=100
+MaxFPS=60
 LODBias=10
 MouseSensitivity=5
 ShadowClipPlane=99
@@ -435,7 +435,7 @@
 pointMerchantNoConfirm=0
 MouseWheelZoom=1
 MouseRightHanded=1
-LoadScreenMode=1
+LoadScreenMode=0
 Channel00=1
 Channel01=1
 Channel02=1
@@ -517,7 +517,7 @@
 KEYMAPPING_RIGHT_1=32
 KEYMAPPING_LEFT_1=18
 KEYMAPPING_DUCK_1=33
-KEYMAPPING_TARGETNPC_1=0
+KEYMAPPING_TARGETNPC_1=30
 KEYMAPPING_CONSIDER_1=46
 KEYMAPPING_CAST1_1=59
 KEYMAPPING_CAST2_1=60
@@ -538,8 +538,10 @@
 KEYMAPPING_SIT_STAND_2=44
 KEYMAPPING_SIT_STAND_1=44
 KEYMAPPING_TARGETNPC_2=0
-KEYMAPPING_CYCLENPCTARGETS_1=30
+KEYMAPPING_CYCLENPCTARGETS_1=1073741867
 KEYMAPPING_OPEN_INV_BAGS_1=1073741847
 KEYMAPPING_NETSTAT_2=181
 KEYMAPPING_HOT1_7_2=45
 KEYMAPPING_HOT1_8_2=41
+KEYMAPPING_ZOOMIN_2=26
+KEYMAPPING_ZOOMOUT_2=27