Merge branch 'master' of https://github.com/stonedDiscord/serverD

AOprivateServer.pbp

@@ -7,7 +7,7 @@
   <section name="data">
     <explorer view="" pattern="8"/>
     <log show="1"/>
-    <lastopen date="2017-06-10 18:54" user="Sven" host="SPC"/>
+    <lastopen date="2017-09-06 02:54" user="sD" host="DESKTOP-6E31U1E"/>
   </section>
   <section name="files">
     <file name="Common.pb">
@@ -16,15 +16,15 @@
     </file>
     <file name="gui.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="b8c237a4bff713382d329f05bcb81b70"/>
+      <fingerprint md5="00a1fec2370fe0dab6aa4bcfac2410ab"/>
     </file>
     <file name="main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="46dc275b58dee261ac84cbb760693221"/>
+      <fingerprint md5="577689a50a76f182965482a526a01124"/>
     </file>
     <file name="server_shared.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="ace70aceceb4ff2137f8d058f87e3704"/>
+      <fingerprint md5="2d3d5d4520f14beb20560f3835b8967c"/>
     </file>
     <file name="shared_headers.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
@@ -41,8 +41,8 @@
       <icon enable="1">sD.ico</icon>
       <format exe="default" cpu="2"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1359"/>
-      <buildcount enable="1" value="151"/>
+      <compilecount enable="1" value="1373"/>
+      <buildcount enable="1" value="152"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2.%COMPILECOUNT.%BUILDCOUNT,0"/>
@@ -76,8 +76,8 @@
       <icon enable="0">owner.ico</icon>
       <format exe="console" cpu="0"/>
       <debugger custom="1" type="ide"/>
-      <compilecount enable="1" value="1338"/>
-      <buildcount enable="1" value="151"/>
+      <compilecount enable="1" value="1361"/>
+      <buildcount enable="1" value="152"/>
       <versioninfo enable="1">
         <field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
         <field1 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>

base/masterserver.ini

@@ -1,2 +1,3 @@
 [list]
+#0 = 127.0.0.1
 0 = master.aceattorneyonline.com

base/scene/AAOPublic2/areas.ini

@@ -6,7 +6,7 @@ number = 4
 4 = ModArea
 [filename]
 1 = default
-2 = gs4
+2 = animation
 3 = birthday
 4 = zetta
 [password]

base/scene/AAOPublic2/init.ini

@@ -1,48 +1,266 @@
 [Global]
 EviNumber = 6
-BackGround = gs4
+BackGround = AACourt
 
 [chars]
-number = 39
+number = 120
 0 = Phoenix
-1 = Miles
-2 = Judge
-3 = Gumshoe
-4 = Layton
-5 = Kristoph
-6 = Mia
-7 = Hawk
-8 = Adrian
-9 = Armstrong
-10 = Butz
-11 = Atmey
-12 = Lotta
-13 = Gant
-14 = Godot
-15 = Lana
-16 = Marshall
-17 = Apollo
-18 = Matt
-19 = April
-20 = Ema
-21 = Franny
-22 = Franziska
-23 = Klavier
-24 = Gregory
-25 = Grossberg
-26 = Ini
-27 = Justice
-28 = Lang
-29 = Maggey
-30 = Manfred
-31 = Maya
-32 = Oldbag
-33 = Payne
-34 = Pearl
-35 = Valant
-36 = Vasquez
-37 = Wellington
-38 = Zak
+1 = PhoenixSoj
+2 = Mia Young
+3 = Grossberg
+4 = Apollo
+5 = ApolloSoJ
+6 = Gregory AAI
+7 = Yew
+8 = Raymond Shields
+9 = Layton
+10 = AthenaCykesSOJ
+11 = Ryu Leg 
+12 = Kazuma 
+13 = Birdman
+14 = Dhurke D 
+15 = Maya
+16 = MayaSOJ
+17 = Ema
+18 = Trucy
+19 = Trucy SOJ
+20 = Kristoph G
+21 = Kay
+22 = Susato
+23 = Yuujin Mikotoba
+24 = Kazuma Assistant 
+25 = Payne Max 
+26 = Miles
+27 = MilesSOJ
+28 = Manfred
+29 = Neil
+30 = Franziska
+31 = Godot
+32 = Klavier
+33 = Portsman
+34 = Byrne
+35 = Sebastian
+36 = Blaise Debeste 
+37 = Barnham
+38 = Darklaw
+39 = Layton Inquisitor 
+40 = Blackquill
+41 = Payne SOJ
+42 = Nahyuta
+43 = Garan
+44 = Barok Z 
+45 = Paolo 
+46 = Dante
+47 = ProsecutorJustice
+48 = Hawk
+49 = Brisbane
+50 = Gumshoe
+51 = Angel Starr 
+52 = Marshall 
+53 = Meekins
+54 = Atmey
+55 = Daryan Crescend 
+56 = Buddy
+57 = Long Lang 
+58 = Shih-na
+59 = Tyrell Badd
+60 = Fulbright
+61 = EmaSOJ
+62 = Sherlock 
+63 = SherlockWatson
+64 = Iris Watson 
+65 = Tobias Gregson 
+66 = Cabanela
+67 = Seven
+68 = Kirigiri
+69 = Adachi
+70 = Snow
+71 = Butz
+72 = Cindy
+73 = Sahwit
+74 = April
+75 = Bellboy
+76 = White
+77 = WillP
+78 = Oldbag
+79 = Penny
+80 = Cody
+81 = Sal
+82 = Vasquez
+83 = Lotta
+84 = Polly
+85 = Yanni
+86 = Lana
+87 = Gant
+88 = Maggey
+89 = Wellington
+90 = Grey
+91 = Pearl
+92 = PearlSOJ
+93 = Morgan
+94 = DrHotti
+95 = Ini
+96 = Max
+97 = Regina
+98 = Moe
+99 = Ben
+100 = Acro
+101 = Matt
+102 = De Killer
+103 = Adrian
+104 = Dahlia
+105 = Ron
+106 = Desiree
+107 = Armstrong
+108 = Kudo
+109 = Viola
+110 = Lisa
+111 = Furio
+112 = Fawles
+113 = Iris
+114 = Bikini and Elise
+115 = Phoenix Hobo
+116 = Olga Orly
+117 = Zak
+118 = Wocky Kitaki
+119 = Plum Kitaki
+120 = Winfred Kitaki
+121 = Guy
+122 = Wesley Stickler
+123 = Alita Tiala
+124 = LeTouse
+125 = Machi Tobaye
+126 = Lamiroir
+127 = Valant
+128 = Vera
+129 = Drew
+130 = Spark
+131 = Rhoda Teneiro
+132 = Zinc Lablanc
+133 = Cammy
+134 = Lauren Paups
+135 = Ernest Amano
+136 = Lance Amano
+137 = Judge GK2
+138 = Colias Palaeno
+139 = Quercus Alba 
+140 = Di-Jun Huang 
+141 = Nicole Swift
+142 = Knightley
+143 = Jay Elbird 
+144 = Sirhan Dogen
+145 = Patricia
+146 = Katherine Hall
+147 = Jeffrey Master
+148 = Delicia
+149 = Dane Gustavia
+150 = Bonnie_Karin
+151 = John Marsh
+152 = Simon
+153 = Espella
+154 = Jinxie
+155 = LBelle
+156 = Juniper
+157 = Scuttlebutt
+158 = Means
+159 = Aura
+160 = Sasha
+161 = Orla
+162 = Crab
+163 = Marlon Rimes
+164 = Ahlbi
+165 = Bailiff
+166 = Bailiff GB
+167 = Rayfa
+168 = Andistandhin
+169 = Bonny de Famme 
+170 = Betty de Famme 
+171 = Roger Retinz 
+172 = Datz
+173 = Inga
+174 = Uendo
+175 = Geiru
+176 = Paul Atishon
+177 = Dhurke
+178 = Hosonaga
+179 = Uzukamaru Taizo 
+180 = Jezail
+181 = Stroganov
+182 = Roylott
+183 = Nikomina
+184 = Vortex
+185 = Cosney Megundal
+186 = Beppo
+187 = Adam Ladyfirst
+188 = Gina Lestrade
+189 = Natsume
+190 = William
+191 = Decago
+192 = O'Malley
+193 = Hutch Windibank
+194 = Crogrey
+195 = Narcissus
+196 = Mae
+197 = Shiv
+198 = Matilda
+199 = Matilda Headset
+200 = O'Reil
+201 = Oscar Fairplay
+202 = Donnabella
+203 = Hobbes
+204 = Joan Garrideb
+205 = Butch Browning
+206 = Archibald
+207 = Archibald Doctor
+208 = Connor
+209 = Dmitri
+210 = Judge ET
+211 = Judge's Bro
+212 = Judge GK
+213 = Justine Courtney
+214 = Judge Labyrinthia Edit 
+215 = JudgeCalifornia 
+216 = JudgeKhura'in 
+217 = JudgeDGS
+218 = The King v2 
+219 = Luke 
+220 = Flora 
+221 = Emmy
+222 = Katrielle Layton
+223 = Sissel 
+224 = Lynne
+225 = Missile
+226 = Ace
+227 = Santa
+228 = Clover
+229 = Snake
+230 = June
+231 = Lotus
+232 = Komaeda
+233 = Chiaki
+234 = IbukiHD
+235 = Mikan
+236 = Gundam
+237 = Hajime
+238 = Elizabeth
+239 = Margaret
+240 = Rise
+241 = Inferno Cop
+242 = Lucina
+243 = Chrom
+244 = Q
+245 = Sho
+246 = Hazama Honoka
+247 = Delia Kartmann
+248 = Rydia
+249 = Ranger Justice
+250 = Conway Stern
+251 = Caeser Villan
+252 = Warden
+253 = 1 Anonymous
+254 = 2 Anonymous
+255 = 3 Anonymous
+256 = 4 Anonymous
 
 [desc]
 0 = Deffence attorney!
@@ -55,9 +273,9 @@ number = 39
 
 [evi1]
 type = 1 
-name = Fingerprints
-desc = fingerprints northern sled dogs. These left incognito in the doorway of the Phoenix. Neighbors claimed to have seen her photo in the children's advertising chocolate
-image= 1.gif
+name = Camera
+desc = A camera found at the crime scene
+image= AAcamera.png
 [evi2]
 type = 1 
 name = Play
@@ -77,9 +295,9 @@ image= 4.png
 type = 1 
 name = Scarecrow expensive dog.
 desc = fighting breeds, were cuts on his back; there may be located your hook
-image= 5.gif
+image= 5.png
 [evi6]
 type = 1 
 name = Identification
 desc = It belongs to the judge, found near the docks, near the red wig
-image= 6.gif
+image= 6.png