diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-11-10 15:35:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-11-13 06:49:35 +0300 |
| commit | c4ad7a2bdcfc30e72df5c733221fa07a8d37c1ce (patch) | |
| tree | 63b6ad7665e76ffb359f111abc9c1320e786bf6a | |
| parent | 5838c6001f2bf57c9cbe5753d3a667ac5a8ab984 (diff) | |
| download | serverdata-genderfix.tar.gz serverdata-genderfix.tar.bz2 serverdata-genderfix.tar.xz serverdata-genderfix.zip | |
Change body type back to gendergenderfix
244 files changed, 356 insertions, 360 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt index 8e25d07e..0b0f75fc 100644 --- a/npc/000-0-0/q'onan.txt +++ b/npc/000-0-0/q'onan.txt @@ -10,6 +10,6 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; end; } diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index c3de6d9a..f337be09 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -74,7 +74,7 @@ OnTalk: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; end; OnSlow: @@ -89,6 +89,6 @@ OnSlow: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; end; } diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt index c681d75c..e36509df 100644 --- a/npc/000-0-1/narrator.txt +++ b/npc/000-0-1/narrator.txt @@ -35,7 +35,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; if (debug > 0) { // debug commands to skip the tutorial diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index e95d59eb..70c754bc 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -87,6 +87,6 @@ OnTouch: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; end; } diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 68862f3e..dedc2f37 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -104,7 +104,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 218048aa..0d1f7f9f 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -160,7 +160,7 @@ L_Whyning: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index 44924613..02a5fcd6 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -89,7 +89,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index a20ea0e6..5f877a5f 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -143,7 +143,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 14; end; } diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt index d1852475..59338324 100644 --- a/npc/000-1/fexil.txt +++ b/npc/000-1/fexil.txt @@ -38,7 +38,7 @@ } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index b7c6d6bf..06eaaf3f 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -236,7 +236,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index 369faacf..8d7b27cb 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -164,7 +164,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index ab4ae74d..cb8b96ac 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -125,7 +125,7 @@ L_Close: goodbye; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index 866cf3fd..1327ef97 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -68,7 +68,7 @@ L_Close: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/maxe.txt b/npc/000-1/maxe.txt index 578e1105..089bfdc9 100644 --- a/npc/000-1/maxe.txt +++ b/npc/000-1/maxe.txt @@ -103,7 +103,7 @@ L_Secrets: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index 6ddb9cf7..572b4a44 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -126,7 +126,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt index e83dba45..db2e54de 100644 --- a/npc/000-1/sapartan.txt +++ b/npc/000-1/sapartan.txt @@ -93,7 +93,7 @@ goodbye; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt index 867d6db6..2ab3bc99 100644 --- a/npc/000-1/shop.txt +++ b/npc/000-1/shop.txt @@ -18,7 +18,7 @@ OnInit: sellitem LousyMoccasins, -1, 20; sellitem PiouSlayer, -1, 15; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 3; end; diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt index d37716e1..ae8d0b8f 100644 --- a/npc/000-1/silvio.txt +++ b/npc/000-1/silvio.txt @@ -180,7 +180,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt index 59c63a5f..68ddd7ac 100644 --- a/npc/000-1/tarlan.txt +++ b/npc/000-1/tarlan.txt @@ -59,7 +59,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index 545254e2..e7c57441 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -118,7 +118,7 @@ L_Close: goodbye; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt index 1a795437..600f59c1 100644 --- a/npc/000-2-0/billybons.txt +++ b/npc/000-2-0/billybons.txt @@ -90,7 +90,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index 0e95fdd9..1c3dbd61 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -296,7 +296,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 10; .quest_debug = ShipQuests_Julia; } diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index 68754d1e..418f75f5 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -311,7 +311,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; // Array of foods (remember to update in 001-2-22 as well) diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 51c42298..fabddd51 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -299,7 +299,7 @@ OnSlow: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; end; } diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 75d4e434..0b75ffa0 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -222,7 +222,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index a59819c2..d7b1d999 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -88,7 +88,7 @@ L_Quit2: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index 7459d550..7075da1f 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -11,7 +11,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 8b783971..f025ef63 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -297,7 +297,7 @@ OnDone: OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index 245f608f..a1686c60 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -10,7 +10,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt index 6ac06e12..52ebc414 100644 --- a/npc/000-2-3/elmo.txt +++ b/npc/000-2-3/elmo.txt @@ -61,7 +61,7 @@ goodbye; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; end; } diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index f99f1144..63957c5d 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -336,7 +336,7 @@ L_Reward: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; end; } diff --git a/npc/000-2-4/alige.txt b/npc/000-2-4/alige.txt index 0f833b64..0566b969 100644 --- a/npc/000-2-4/alige.txt +++ b/npc/000-2-4/alige.txt @@ -33,7 +33,7 @@ OnTimer190: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt index 934db014..22071d6f 100644 --- a/npc/001-1/artaxe.txt +++ b/npc/001-1/artaxe.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/beuss.txt b/npc/001-1/beuss.txt index 88305100..5f1b07d5 100644 --- a/npc/001-1/beuss.txt +++ b/npc/001-1/beuss.txt @@ -22,7 +22,7 @@ OnTimer10000: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt index afaf4866..3dee70ea 100644 --- a/npc/001-1/calypsan.txt +++ b/npc/001-1/calypsan.txt @@ -98,7 +98,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt index 1f2945fc..4ddbce53 100644 --- a/npc/001-1/chelios.txt +++ b/npc/001-1/chelios.txt @@ -110,7 +110,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index f7c86054..99b668fc 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -252,7 +252,7 @@ L_Bye: close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; end; } diff --git a/npc/001-1/devis.txt b/npc/001-1/devis.txt index fb6d3140..7d14ed0c 100644 --- a/npc/001-1/devis.txt +++ b/npc/001-1/devis.txt @@ -64,7 +64,7 @@ OnTimer1000: dographmovestep; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; initmovegraph "start_pos", 193, 109, "dock_ent", 194, 109, diff --git a/npc/001-1/elmo.txt b/npc/001-1/elmo.txt index d89103b3..8a374b23 100644 --- a/npc/001-1/elmo.txt +++ b/npc/001-1/elmo.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt index 73e81422..f7d3dcaa 100644 --- a/npc/001-1/enora.txt +++ b/npc/001-1/enora.txt @@ -443,7 +443,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 5; end; } diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt index 950da353..7870bfba 100644 --- a/npc/001-1/eugene.txt +++ b/npc/001-1/eugene.txt @@ -78,7 +78,7 @@ L_QuestDone: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt index d66b9c31..13c3db38 100644 --- a/npc/001-1/fexil.txt +++ b/npc/001-1/fexil.txt @@ -138,7 +138,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/flyingpiou.txt b/npc/001-1/flyingpiou.txt index af69d46f..82acbdbc 100644 --- a/npc/001-1/flyingpiou.txt +++ b/npc/001-1/flyingpiou.txt @@ -105,7 +105,7 @@ OnTimer1000: dographmovestep; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 5; .walkmask = WALK_WATER; // .debug = 1; diff --git a/npc/001-1/juscare.txt b/npc/001-1/juscare.txt index a692486c..023feac0 100644 --- a/npc/001-1/juscare.txt +++ b/npc/001-1/juscare.txt @@ -39,7 +39,7 @@ OnTimer1000: dographmovestep; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // .debug = 1; initmovegraph diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt index 726305d2..e4d49c5c 100644 --- a/npc/001-1/katja.txt +++ b/npc/001-1/katja.txt @@ -122,7 +122,7 @@ L_Story: } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt index 045f9431..d5d002b0 100644 --- a/npc/001-1/koga.txt +++ b/npc/001-1/koga.txt @@ -38,7 +38,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 6; //.alwaysVisible = true; end; diff --git a/npc/001-1/lucas.txt b/npc/001-1/lucas.txt index aad347b8..d809b8f7 100644 --- a/npc/001-1/lucas.txt +++ b/npc/001-1/lucas.txt @@ -12,7 +12,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-1/manhole.txt b/npc/001-1/manhole.txt index c0183f1f..a818cff1 100644 --- a/npc/001-1/manhole.txt +++ b/npc/001-1/manhole.txt @@ -22,7 +22,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -39,7 +39,7 @@ OnInit: close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -63,7 +63,7 @@ OnInit: close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -82,7 +82,7 @@ OnInit: close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt index 53ee082d..92b4b1db 100644 --- a/npc/001-1/merlin.txt +++ b/npc/001-1/merlin.txt @@ -19,7 +19,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-1/mouboo.txt b/npc/001-1/mouboo.txt index 0cc5c7d2..055f697d 100644 --- a/npc/001-1/mouboo.txt +++ b/npc/001-1/mouboo.txt @@ -14,7 +14,7 @@ OnTimer2000: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .speed = 600; mouboograph; } @@ -29,7 +29,7 @@ OnTimer2000: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .speed = 600; mouboograph; } @@ -44,7 +44,7 @@ OnTimer2000: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .speed = 600; mouboograph; } @@ -59,7 +59,7 @@ OnTimer2000: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .speed = 600; mouboograph; } diff --git a/npc/001-1/pious.txt b/npc/001-1/pious.txt index 0a3baa1a..c9678332 100644 --- a/npc/001-1/pious.txt +++ b/npc/001-1/pious.txt @@ -10,7 +10,7 @@ end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 2; end; } diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt index 46cb5b31..fa876561 100644 --- a/npc/001-1/qonan.txt +++ b/npc/001-1/qonan.txt @@ -97,7 +97,7 @@ L_QuestDone: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; .debug = 1; end; diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt index 33359378..435280e4 100644 --- a/npc/001-1/qpid.txt +++ b/npc/001-1/qpid.txt @@ -164,7 +164,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt index a3b50597..f5d8a9b8 100644 --- a/npc/001-1/rowboat.txt +++ b/npc/001-1/rowboat.txt @@ -53,7 +53,7 @@ OnTimer1000: else domovestep; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; .speed = 175; .caller = 0; diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt index efb93e8b..dbe0179a 100644 --- a/npc/001-1/rowboathelper.txt +++ b/npc/001-1/rowboathelper.txt @@ -85,7 +85,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; } @@ -109,7 +109,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; } @@ -133,7 +133,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; } diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt index 56873965..d8b1ddce 100644 --- a/npc/001-1/rumly.txt +++ b/npc/001-1/rumly.txt @@ -221,6 +221,6 @@ OnTimer1800: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; end; } diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt index 8b1705d8..7d007aa8 100644 --- a/npc/001-1/salem.txt +++ b/npc/001-1/salem.txt @@ -214,7 +214,7 @@ OnPiouFlee: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; end; } diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt index 59dd8cd7..6a18f17d 100644 --- a/npc/001-1/shop.txt +++ b/npc/001-1/shop.txt @@ -18,7 +18,7 @@ OnInit: sellitem LousyMoccasins, -1, 20; sellitem PiouSlayer, -1, 15; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 3; end; @@ -57,7 +57,7 @@ OnInit: sellitem KhakiCottonDye, -1, 10; sellitem YellowCottonDye, -1, 10; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -102,7 +102,7 @@ OnInit: sellitem OrchidSilkDye, -1, 7; sellitem PinkiePinkSilkDye, -1, 7; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -129,7 +129,7 @@ OnInit: sellitem Aquada, -1, 50; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -151,7 +151,7 @@ OnInit: sellitem SmallTentacles, -1, 30; sellitem Tentacles, -1, 15; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -178,7 +178,7 @@ OnInit: sellitem CommonCarp, -1, 8; sellitem GrassCarp, -1, 7; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -200,7 +200,7 @@ OnInit: sellitem Manana, -1, 60; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -220,7 +220,7 @@ OnInit: sellitem Manana, -1, 30; // Add soft drinks. - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -244,7 +244,7 @@ OnInit: sellitem AtroposMixture, -1, 10; sellitem ElixirOfLife, -1, 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; @@ -277,7 +277,7 @@ OnInit: sellitem PiouEgg, -1, 25; // Add soft drinks. - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; diff --git a/npc/001-1/sign.txt b/npc/001-1/sign.txt index dd03b60e..e10231fb 100644 --- a/npc/001-1/sign.txt +++ b/npc/001-1/sign.txt @@ -11,7 +11,7 @@ OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -21,7 +21,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -31,7 +31,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -41,7 +41,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -51,7 +51,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -61,7 +61,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -71,7 +71,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -81,7 +81,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -91,7 +91,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -101,7 +101,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -111,7 +111,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -121,7 +121,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -131,7 +131,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -141,7 +141,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -151,7 +151,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -161,7 +161,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -171,7 +171,7 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -181,6 +181,6 @@ OnInit: OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } diff --git a/npc/001-1/sophialla.txt b/npc/001-1/sophialla.txt index c26c3cbe..57d838de 100644 --- a/npc/001-1/sophialla.txt +++ b/npc/001-1/sophialla.txt @@ -82,7 +82,7 @@ OnLegionComplete: close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; .alwaysVisible = true; end; diff --git a/npc/001-1/taree.txt b/npc/001-1/taree.txt index f1c4fe58..d48ddc30 100644 --- a/npc/001-1/taree.txt +++ b/npc/001-1/taree.txt @@ -14,7 +14,7 @@ L_Close: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-1/trees.txt b/npc/001-1/trees.txt index 47437020..72f2f17e 100644 --- a/npc/001-1/trees.txt +++ b/npc/001-1/trees.txt @@ -103,7 +103,7 @@ L_FoundHim: LazyBrotherTreeFunc(1); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -112,7 +112,7 @@ OnInit: LazyBrotherTreeFunc(2); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -121,7 +121,7 @@ OnInit: LazyBrotherTreeFunc(3); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -130,7 +130,7 @@ OnInit: LazyBrotherTreeFunc(4); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -139,7 +139,7 @@ OnInit: LazyBrotherTreeFunc(5); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -148,7 +148,7 @@ OnInit: LazyBrotherTreeFunc(6); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -157,7 +157,7 @@ OnInit: LazyBrotherTreeFunc(7); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -166,7 +166,7 @@ OnInit: LazyBrotherTreeFunc(8); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -175,7 +175,7 @@ OnInit: LazyBrotherTreeFunc(9); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -184,7 +184,7 @@ OnInit: LazyBrotherTreeFunc(10); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -193,7 +193,7 @@ OnInit: LazyBrotherTreeFunc(11); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -202,7 +202,7 @@ OnInit: LazyBrotherTreeFunc(12); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -211,7 +211,7 @@ OnInit: LazyBrotherTreeFunc(13); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -220,7 +220,7 @@ OnInit: LazyBrotherTreeFunc(14); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -229,7 +229,7 @@ OnInit: LazyBrotherTreeFunc(15); end; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt index 1a11a90e..82464dc8 100644 --- a/npc/001-1/wateranimation.txt +++ b/npc/001-1/wateranimation.txt @@ -11,7 +11,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 5; end; } diff --git a/npc/001-1/xilaxa.txt b/npc/001-1/xilaxa.txt index c52e83c6..e0b2e01c 100644 --- a/npc/001-1/xilaxa.txt +++ b/npc/001-1/xilaxa.txt @@ -17,7 +17,7 @@ OnTimer1000: dographmovestep; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; initmovegraph "mid", 54, 43, 60, 46, "left", 47, 50, 52, 55, diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt index c5d6ce70..bbdcfb73 100644 --- a/npc/001-2-0/resa.txt +++ b/npc/001-2-0/resa.txt @@ -74,7 +74,7 @@ OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; end; } diff --git a/npc/001-2-0/shop.txt b/npc/001-2-0/shop.txt index f2d2672e..1ad8cd4a 100644 --- a/npc/001-2-0/shop.txt +++ b/npc/001-2-0/shop.txt @@ -18,7 +18,7 @@ OnInit: sellitem BrownTrousers, -1, 30; sellitem BrimmedHat, -1, 35; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 2; end; diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt index d2fb2dc8..c53cf393 100644 --- a/npc/001-2-11/mona.txt +++ b/npc/001-2-11/mona.txt @@ -165,7 +165,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/001-2-12/oscar.txt b/npc/001-2-12/oscar.txt index 5e848258..59e481ab 100644 --- a/npc/001-2-12/oscar.txt +++ b/npc/001-2-12/oscar.txt @@ -138,7 +138,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt index 692dd6a9..bb41fb91 100644 --- a/npc/001-2-19/lloyd.txt +++ b/npc/001-2-19/lloyd.txt @@ -229,7 +229,7 @@ OnInit: .quest_debug = ArtisQuests_Lloyd; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Bank configuration diff --git a/npc/001-2-2/moon.txt b/npc/001-2-2/moon.txt index e0e42e4b..0c2afc3f 100644 --- a/npc/001-2-2/moon.txt +++ b/npc/001-2-2/moon.txt @@ -201,7 +201,7 @@ OnHour00: end; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; initpath "move", 41, 30, "dir", DOWN, 0, diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt index adb929e8..d7620003 100644 --- a/npc/001-2-21/julia.txt +++ b/npc/001-2-21/julia.txt @@ -135,7 +135,7 @@ L_Island: goto L_YNMenu; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 10; end; } diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt index fc0f4df4..329bb06f 100644 --- a/npc/001-2-22/alige.txt +++ b/npc/001-2-22/alige.txt @@ -315,7 +315,7 @@ L_Quit: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; // Array of foods (remember to update in 000-2-1 as well) diff --git a/npc/001-2-22/chefgado.txt b/npc/001-2-22/chefgado.txt index 86f30070..8f30b2e5 100644 --- a/npc/001-2-22/chefgado.txt +++ b/npc/001-2-22/chefgado.txt @@ -107,7 +107,7 @@ function foodQuest { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt index 43e94f8f..7ffc4611 100644 --- a/npc/001-2-22/peter.txt +++ b/npc/001-2-22/peter.txt @@ -297,7 +297,7 @@ OnDone: OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt index 3396f413..fea9c141 100644 --- a/npc/001-2-24/nard.txt +++ b/npc/001-2-24/nard.txt @@ -88,7 +88,7 @@ L_Lost: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; end; } diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt index f4953376..154db36c 100644 --- a/npc/001-2-26/ivan.txt +++ b/npc/001-2-26/ivan.txt @@ -80,7 +80,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt index a35b9317..b63b159b 100644 --- a/npc/001-2-27/don.txt +++ b/npc/001-2-27/don.txt @@ -91,7 +91,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt index bead9ed8..8656c729 100644 --- a/npc/001-2-27/kaylo.txt +++ b/npc/001-2-27/kaylo.txt @@ -37,7 +37,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt index 09bf503a..3425259f 100644 --- a/npc/001-2-27/lydon.txt +++ b/npc/001-2-27/lydon.txt @@ -30,7 +30,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/001-2-27/shop.txt b/npc/001-2-27/shop.txt index 842988e4..a435e0f0 100644 --- a/npc/001-2-27/shop.txt +++ b/npc/001-2-27/shop.txt @@ -14,7 +14,7 @@ OnInit: sellitem CopperArmbands, -1, 28; sellitem IronArmbands, -1, 20; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 2; end; @@ -43,7 +43,7 @@ OnInit: sellitem WoodenSword, -1, 50; sellitem TrainingArrow, -1, 20000; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 2; end; diff --git a/npc/001-2-28/jenna.txt b/npc/001-2-28/jenna.txt index 6ec8c0c4..e004e8df 100644 --- a/npc/001-2-28/jenna.txt +++ b/npc/001-2-28/jenna.txt @@ -42,7 +42,7 @@ OnHour00: end; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 5; initmovegraph "m_table_1", 52, 32, "m_table_2", 56, 32, diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt index b12b7c6a..bddab211 100644 --- a/npc/001-2-28/plush.txt +++ b/npc/001-2-28/plush.txt @@ -124,6 +124,6 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 5; } diff --git a/npc/001-2-28/shop.txt b/npc/001-2-28/shop.txt index bfb20700..c7e8d429 100644 --- a/npc/001-2-28/shop.txt +++ b/npc/001-2-28/shop.txt @@ -12,7 +12,7 @@ OnInit: sellitem RedPlushWine, -1, 50; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 10; end; diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt index 06b409ff..c17d9638 100644 --- a/npc/001-2-32/serena.txt +++ b/npc/001-2-32/serena.txt @@ -22,7 +22,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt index 5b8b00ed..cdf36a49 100644 --- a/npc/001-2-33/lozerk.txt +++ b/npc/001-2-33/lozerk.txt @@ -189,7 +189,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-2-34/samantha.txt b/npc/001-2-34/samantha.txt index 9d81d492..df6d7de2 100644 --- a/npc/001-2-34/samantha.txt +++ b/npc/001-2-34/samantha.txt @@ -48,7 +48,7 @@ // The city is being attacked. Go help the warriors and town-guard. OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt index 36cf47e5..57b4a1e8 100644 --- a/npc/001-2-39/qanon.txt +++ b/npc/001-2-39/qanon.txt @@ -125,7 +125,7 @@ function legionState2 { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-2-4/books.txt b/npc/001-2-4/books.txt index 7ea5ec04..63e3d684 100644 --- a/npc/001-2-4/books.txt +++ b/npc/001-2-4/books.txt @@ -11,7 +11,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; } @@ -98,7 +98,7 @@ OnUse: OnInit: .book_name$ = getitemname(FishingGuideVolI); - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-2-4/robin.txt b/npc/001-2-4/robin.txt index 5a38facd..0bf3d195 100644 --- a/npc/001-2-4/robin.txt +++ b/npc/001-2-4/robin.txt @@ -59,7 +59,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-4/terry.txt b/npc/001-2-4/terry.txt index 88b57c8d..cb8b4716 100644 --- a/npc/001-2-4/terry.txt +++ b/npc/001-2-4/terry.txt @@ -10,7 +10,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-40/trozz.txt b/npc/001-2-40/trozz.txt index dadedc18..816d5616 100644 --- a/npc/001-2-40/trozz.txt +++ b/npc/001-2-40/trozz.txt @@ -61,7 +61,7 @@ function Dueling { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt index abb764b7..126ccf6e 100644 --- a/npc/001-2-41/edouard.txt +++ b/npc/001-2-41/edouard.txt @@ -30,7 +30,7 @@ function script EdouardCheckChair { EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -40,7 +40,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -50,7 +50,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -60,7 +60,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -70,7 +70,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -80,7 +80,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -137,7 +137,7 @@ OnChair: l("What is my current hairstyle and hair color?"), l("I'd like to get a different style."), l("Can you do something with my color?"), - l("How about changing my body type?"), + l("How about changing my gender?"), l("What's your story again?"), l("I'm fine for now, thank you."); @@ -159,7 +159,7 @@ OnChair: l("Anything else?"); break; case 4: - BarberChangeBodyType(); + BarberChangeGender(); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You look fantastic."), l("Anything else?"); @@ -176,7 +176,7 @@ OnChair: } while (1); OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-5/books.txt b/npc/001-2-5/books.txt index 3145146a..dcfe8dab 100644 --- a/npc/001-2-5/books.txt +++ b/npc/001-2-5/books.txt @@ -28,7 +28,7 @@ OnUse: OnInit: .book_name$ = "Communication Theory"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-2-5/tutorial.txt b/npc/001-2-5/tutorial.txt index 1438b148..8b41db53 100644 --- a/npc/001-2-5/tutorial.txt +++ b/npc/001-2-5/tutorial.txt @@ -261,7 +261,7 @@ OnInit: bindatcmd "info", "#EvolTutorial::OnUse", 0, 0, 0; bindatcmd "tutorial", "#EvolTutorial::OnUse", 0, 0, 0; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt index f8eb231b..bf6c97fc 100644 --- a/npc/001-2-6/books.txt +++ b/npc/001-2-6/books.txt @@ -52,7 +52,7 @@ OnUse: OnInit: .book_name$ = "The Piou and The Fluffy"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -107,7 +107,7 @@ OnUse: OnInit: .book_name$ = "Poem about Poems"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -140,7 +140,7 @@ OnUse: OnInit: .book_name$ = "Chorus of the Woods"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -169,7 +169,7 @@ OnUse: close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -204,7 +204,7 @@ OnUse: OnInit: .book_name$ = "Fluffy Animals who Love Their Owners"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -238,7 +238,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol I"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -274,7 +274,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol II"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -312,7 +312,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol III"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } @@ -347,7 +347,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol IV"; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/001-2-6/christopher.txt b/npc/001-2-6/christopher.txt index c9ca2648..492b51a7 100644 --- a/npc/001-2-6/christopher.txt +++ b/npc/001-2-6/christopher.txt @@ -63,7 +63,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-6/dolfina.txt b/npc/001-2-6/dolfina.txt index f30752b4..28e7afa5 100644 --- a/npc/001-2-6/dolfina.txt +++ b/npc/001-2-6/dolfina.txt @@ -14,7 +14,7 @@ L_Close: close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; end; } diff --git a/npc/001-2-6/leonard.txt b/npc/001-2-6/leonard.txt index a31631b7..52a97833 100644 --- a/npc/001-2-6/leonard.txt +++ b/npc/001-2-6/leonard.txt @@ -83,7 +83,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 2; end; } diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt index d3a0b096..ae5415f6 100644 --- a/npc/001-2-9/janus.txt +++ b/npc/001-2-9/janus.txt @@ -165,7 +165,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/001-3-0/mundane.txt b/npc/001-3-0/mundane.txt index c52f4cf1..7f3c71f0 100644 --- a/npc/001-3-0/mundane.txt +++ b/npc/001-3-0/mundane.txt @@ -155,7 +155,7 @@ OnMove: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; .speed = 140; diff --git a/npc/001-3-2/henry.txt b/npc/001-3-2/henry.txt index f405907e..c5ae41f2 100644 --- a/npc/001-3-2/henry.txt +++ b/npc/001-3-2/henry.txt @@ -346,7 +346,7 @@ function completedHenry { /////////////////////////////////////////////////////// OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; diff --git a/npc/001-3-2/smuggler.txt b/npc/001-3-2/smuggler.txt index 377ce4d5..c86608a8 100644 --- a/npc/001-3-2/smuggler.txt +++ b/npc/001-3-2/smuggler.txt @@ -74,7 +74,7 @@ function smugglerBoarding { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; .speed = 175; .alwaysVisible = true; diff --git a/npc/008-1-1/galimatia.txt b/npc/008-1-1/galimatia.txt index f5439978..45c4c6a6 100644 --- a/npc/008-1-1/galimatia.txt +++ b/npc/008-1-1/galimatia.txt @@ -386,7 +386,7 @@ OnInit: .REQ3_OUTPUT = RoseHat; .REQ3_OUTPUT_AMOUNT = 1; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-1-1/hal.txt b/npc/008-1-1/hal.txt index 3797f29b..1142cfd7 100644 --- a/npc/008-1-1/hal.txt +++ b/npc/008-1-1/hal.txt @@ -126,7 +126,7 @@ OnInit: .REQ0_OUTPUT = BottleOfWater; .REQ0_OUTPUT_AMOUNT = 1 ; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; }
\ No newline at end of file diff --git a/npc/008-1-1/koga.txt b/npc/008-1-1/koga.txt index 404d1235..f46fc0e4 100644 --- a/npc/008-1-1/koga.txt +++ b/npc/008-1-1/koga.txt @@ -28,7 +28,7 @@ function kogaWrongMap { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 7; .alwaysVisible = true; end; diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt index 385cf824..81a7103d 100644 --- a/npc/008-1-1/morcant.txt +++ b/npc/008-1-1/morcant.txt @@ -56,7 +56,7 @@ OnInit: OnInstanceInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; .speed=120; //.alwaysVisible=true; diff --git a/npc/008-1-1/sign.txt b/npc/008-1-1/sign.txt index 8358914e..f7f406d7 100644 --- a/npc/008-1-1/sign.txt +++ b/npc/008-1-1/sign.txt @@ -10,7 +10,7 @@ OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } 008-1-1,157,87,0 script Sign#008-1-1-central NPC_NO_SPRITE,{ @@ -19,6 +19,6 @@ OnInit: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } diff --git a/npc/008-1-1/soldiers.txt b/npc/008-1-1/soldiers.txt index a1636409..40c023e6 100644 --- a/npc/008-1-1/soldiers.txt +++ b/npc/008-1-1/soldiers.txt @@ -15,7 +15,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } @@ -27,7 +27,7 @@ OnInit: close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-1-2/sign.txt b/npc/008-1-2/sign.txt index d1d13469..d01f665d 100644 --- a/npc/008-1-2/sign.txt +++ b/npc/008-1-2/sign.txt @@ -9,7 +9,7 @@ close; OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -19,7 +19,7 @@ OnInit: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -29,6 +29,6 @@ OnInit: OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } diff --git a/npc/008-1/4144.txt b/npc/008-1/4144.txt index 842f9269..e97fc654 100644 --- a/npc/008-1/4144.txt +++ b/npc/008-1/4144.txt @@ -84,7 +84,7 @@ OnInit: setunitdata(.@npcId, UDT_HAIRCOLOR, rand(1,20)); npcsit; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-1/auldsbel.txt b/npc/008-1/auldsbel.txt index 3d3ebbf5..e9efcb04 100644 --- a/npc/008-1/auldsbel.txt +++ b/npc/008-1/auldsbel.txt @@ -48,7 +48,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-1/banu.txt b/npc/008-1/banu.txt index 183d33c3..e2b980b7 100644 --- a/npc/008-1/banu.txt +++ b/npc/008-1/banu.txt @@ -15,7 +15,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-1/blossom.txt b/npc/008-1/blossom.txt index 8746752e..2116f0fc 100644 --- a/npc/008-1/blossom.txt +++ b/npc/008-1/blossom.txt @@ -72,7 +72,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-1/confused-tree.txt b/npc/008-1/confused-tree.txt index 5ed54448..97d487b3 100644 --- a/npc/008-1/confused-tree.txt +++ b/npc/008-1/confused-tree.txt @@ -928,7 +928,7 @@ OnInit: // config below .hotwords$ = "tree"; // what hot words the npc should listen to, besides its own name (regex) .distance = 14; // the npc will only listen to player within X tiles - .bodytype = BODYTYPE_1; // BodyType of the npc + .sex = GENDER_FEMALE; // Gender of the npc .dir = season_direction(); // sprite direction according to the season .talk_rate = 1; // min number of seconds to wait between replies .repeat_rate = 1; // min number of seconds to wait before sending the same message twice in a row diff --git a/npc/008-1/crane.txt b/npc/008-1/crane.txt index d8099536..63486999 100644 --- a/npc/008-1/crane.txt +++ b/npc/008-1/crane.txt @@ -87,7 +87,7 @@ function foodQuest { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-1/hinnak.txt b/npc/008-1/hinnak.txt index 31343728..6791552b 100644 --- a/npc/008-1/hinnak.txt +++ b/npc/008-1/hinnak.txt @@ -338,7 +338,7 @@ OnInit: .quest = HurnscaldQuests_Hinnak; .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/jack.txt b/npc/008-1/jack.txt index fdce7fe6..6f4f6b07 100644 --- a/npc/008-1/jack.txt +++ b/npc/008-1/jack.txt @@ -299,7 +299,7 @@ OnInit: .quest_shield = HurnscaldQuests_WoodenShield; .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_bow; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/mikhail.txt b/npc/008-1/mikhail.txt index 3d9441d1..59063612 100644 --- a/npc/008-1/mikhail.txt +++ b/npc/008-1/mikhail.txt @@ -116,7 +116,7 @@ OnInit: .quest = HurnscaldQuests_Soup; .quest_debug = .quest; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/milly.txt b/npc/008-1/milly.txt index 35c0e6b7..83be0c3d 100644 --- a/npc/008-1/milly.txt +++ b/npc/008-1/milly.txt @@ -105,7 +105,7 @@ function script GetBeanieCopter { OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; // TODO: change this to the milly quest debug when it exists - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/old-man.txt b/npc/008-1/old-man.txt index e0df33bc..1f91c048 100644 --- a/npc/008-1/old-man.txt +++ b/npc/008-1/old-man.txt @@ -73,7 +73,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 1; // this npc has bad hearing .speed = 2000; // this npc is very old // TODO: move graph (after the Hurnscald map is finalized) diff --git a/npc/008-1/old-woman.txt b/npc/008-1/old-woman.txt index ddfb33c6..03de9bfe 100644 --- a/npc/008-1/old-woman.txt +++ b/npc/008-1/old-woman.txt @@ -120,7 +120,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 1; // this npc has bad hearing .speed = 2000; // this npc is very old // TODO: move graph (after the Hurnscald map is finalized) diff --git a/npc/008-1/oscar.txt b/npc/008-1/oscar.txt index d7c2f6d5..e7245251 100644 --- a/npc/008-1/oscar.txt +++ b/npc/008-1/oscar.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-1/rossy.txt b/npc/008-1/rossy.txt index 8e63bd27..db4a4b01 100644 --- a/npc/008-1/rossy.txt +++ b/npc/008-1/rossy.txt @@ -379,7 +379,7 @@ function rossyJulietIntro { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Quest conf diff --git a/npc/008-1/sabine.txt b/npc/008-1/sabine.txt index 8f4fa713..0c013818 100644 --- a/npc/008-1/sabine.txt +++ b/npc/008-1/sabine.txt @@ -49,7 +49,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt index 5ea1c139..28ec24a3 100644 --- a/npc/008-1/shop.txt +++ b/npc/008-1/shop.txt @@ -20,7 +20,7 @@ OnInit: sellitem AWhiteTulip, -1, 50; sellitem AYellowTulip, -1, 50; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 10; end; diff --git a/npc/008-1/sign.txt b/npc/008-1/sign.txt index 7652c3f2..6a7e3e4e 100644 --- a/npc/008-1/sign.txt +++ b/npc/008-1/sign.txt @@ -9,7 +9,7 @@ close; OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -18,7 +18,7 @@ OnInit: close; OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -27,7 +27,7 @@ OnInit: close; OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -36,7 +36,7 @@ OnInit: close; OnInit: .distance = 2; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } @@ -45,6 +45,6 @@ OnInit: close; OnInit: .distance = 1; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } diff --git a/npc/008-1/snarfles.txt b/npc/008-1/snarfles.txt index 6332b4c9..2f9c5345 100644 --- a/npc/008-1/snarfles.txt +++ b/npc/008-1/snarfles.txt @@ -92,7 +92,7 @@ function foodQuest { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-1/voltain.txt b/npc/008-1/voltain.txt index 6ab22f1e..c2b0fc15 100644 --- a/npc/008-1/voltain.txt +++ b/npc/008-1/voltain.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-0/celestia.txt b/npc/008-2-0/celestia.txt index 9e39b7fc..b195c38f 100644 --- a/npc/008-2-0/celestia.txt +++ b/npc/008-2-0/celestia.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-2-1/generalstore.txt b/npc/008-2-1/generalstore.txt index b7f9b03f..70235bc4 100644 --- a/npc/008-2-1/generalstore.txt +++ b/npc/008-2-1/generalstore.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/008-2-1/inspector.txt b/npc/008-2-1/inspector.txt index 54d4b6aa..4e1303e2 100644 --- a/npc/008-2-1/inspector.txt +++ b/npc/008-2-1/inspector.txt @@ -175,7 +175,7 @@ OnInit: .quest = HurnscaldQuests_Inspector; .quest_debug = .quest; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-1/richard.txt b/npc/008-2-1/richard.txt index acff286a..77d16710 100644 --- a/npc/008-2-1/richard.txt +++ b/npc/008-2-1/richard.txt @@ -52,7 +52,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Bank configuration diff --git a/npc/008-2-1/selim.txt b/npc/008-2-1/selim.txt index 2bdea97d..1cfff3e5 100644 --- a/npc/008-2-1/selim.txt +++ b/npc/008-2-1/selim.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-10/airlia.txt b/npc/008-2-10/airlia.txt index 437e624d..d221672d 100644 --- a/npc/008-2-10/airlia.txt +++ b/npc/008-2-10/airlia.txt @@ -28,7 +28,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-2-12/nurse.txt b/npc/008-2-12/nurse.txt index 753739d5..2da8d1d3 100644 --- a/npc/008-2-12/nurse.txt +++ b/npc/008-2-12/nurse.txt @@ -170,7 +170,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; end; } diff --git a/npc/008-2-13/lena.txt b/npc/008-2-13/lena.txt index 74f47724..d647faa4 100644 --- a/npc/008-2-13/lena.txt +++ b/npc/008-2-13/lena.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-2-14/doctor.txt b/npc/008-2-14/doctor.txt index 0dd6caea..763c62dd 100644 --- a/npc/008-2-14/doctor.txt +++ b/npc/008-2-14/doctor.txt @@ -109,7 +109,7 @@ function doctorEyePatch { OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/008-2-16/stove.txt b/npc/008-2-16/stove.txt index 34b9dfaf..fbc19ef5 100644 --- a/npc/008-2-16/stove.txt +++ b/npc/008-2-16/stove.txt @@ -82,7 +82,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 2; end; } diff --git a/npc/008-2-16/yannika.txt b/npc/008-2-16/yannika.txt index ecf9551a..48621f88 100644 --- a/npc/008-2-16/yannika.txt +++ b/npc/008-2-16/yannika.txt @@ -460,7 +460,7 @@ } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; .quest=General_Cooking; diff --git a/npc/008-2-17/angus.txt b/npc/008-2-17/angus.txt index 48fe7c9c..f43b0fda 100644 --- a/npc/008-2-17/angus.txt +++ b/npc/008-2-17/angus.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-17/caul.txt b/npc/008-2-17/caul.txt index c3202f11..a28edc3c 100644 --- a/npc/008-2-17/caul.txt +++ b/npc/008-2-17/caul.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-18/malik.txt b/npc/008-2-18/malik.txt index f285d8c7..57b05931 100644 --- a/npc/008-2-18/malik.txt +++ b/npc/008-2-18/malik.txt @@ -50,7 +50,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt index 8a14deb9..f9f25ce0 100644 --- a/npc/008-2-2/barron.txt +++ b/npc/008-2-2/barron.txt @@ -27,7 +27,7 @@ speech S_LAST_NEXT, OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt index 8788620a..44d61a12 100644 --- a/npc/008-2-2/kfahr.txt +++ b/npc/008-2-2/kfahr.txt @@ -778,7 +778,7 @@ OnInit: .KNIFE_QUEST_XP = 50000; .STINGER_QUEST_XP = 80000; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-2/ledmitz.txt b/npc/008-2-2/ledmitz.txt index 3ed94009..46bdaccd 100644 --- a/npc/008-2-2/ledmitz.txt +++ b/npc/008-2-2/ledmitz.txt @@ -16,7 +16,7 @@ OnTalk: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } @@ -31,7 +31,7 @@ OnTalk: end; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt index 0fc490df..1f75f15e 100644 --- a/npc/008-2-2/melania.txt +++ b/npc/008-2-2/melania.txt @@ -101,7 +101,7 @@ } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; .inn=RUSTYPICK_INN; end; diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt index 39c97f2b..e3d6c847 100644 --- a/npc/008-2-2/melinda.txt +++ b/npc/008-2-2/melinda.txt @@ -123,7 +123,7 @@ OnTouch: end; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 5; .speed = 300; initmovegraph "startspot", 40, 29, diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt index 58c6002d..c83146ac 100644 --- a/npc/008-2-2/shop.txt +++ b/npc/008-2-2/shop.txt @@ -20,7 +20,7 @@ OnInit: sellitem SmallHealing, -1, 50; sellitem MaggotSlimePotion, -1, 50; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 10; end; diff --git a/npc/008-2-20/valia.txt b/npc/008-2-20/valia.txt index ce6c6f5d..f3ac81ac 100644 --- a/npc/008-2-20/valia.txt +++ b/npc/008-2-20/valia.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-2-24/chef.txt b/npc/008-2-24/chef.txt index 37a36d60..4d9578ec 100644 --- a/npc/008-2-24/chef.txt +++ b/npc/008-2-24/chef.txt @@ -264,7 +264,7 @@ function deliverSalad { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-2-24/troupe-leader.txt b/npc/008-2-24/troupe-leader.txt index 47956d4b..5d164684 100644 --- a/npc/008-2-24/troupe-leader.txt +++ b/npc/008-2-24/troupe-leader.txt @@ -104,7 +104,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-32/thamas.txt b/npc/008-2-32/thamas.txt index 3af725aa..526effb1 100644 --- a/npc/008-2-32/thamas.txt +++ b/npc/008-2-32/thamas.txt @@ -78,7 +78,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-4/bernard.txt b/npc/008-2-4/bernard.txt index 8ba6a18c..3859c7e6 100644 --- a/npc/008-2-4/bernard.txt +++ b/npc/008-2-4/bernard.txt @@ -215,7 +215,7 @@ OnInit: .quest = HurnscaldQuests_Soup; .quest_debug = .quest; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-4/olana.txt b/npc/008-2-4/olana.txt index c8eceed7..0ee7504d 100644 --- a/npc/008-2-4/olana.txt +++ b/npc/008-2-4/olana.txt @@ -313,7 +313,7 @@ function olanaRossyHappy { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; .minLevel = 40; end; diff --git a/npc/008-2-6/alan.txt b/npc/008-2-6/alan.txt index 368b3f1e..11f533dd 100644 --- a/npc/008-2-6/alan.txt +++ b/npc/008-2-6/alan.txt @@ -305,7 +305,7 @@ OnInit: .quest_shield = HurnscaldQuests_WoodenShield; .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_bow; - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-6/donald.txt b/npc/008-2-6/donald.txt index 35e81c9f..38a3bf7a 100644 --- a/npc/008-2-6/donald.txt +++ b/npc/008-2-6/donald.txt @@ -25,7 +25,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; tradertype(NST_MARKET); diff --git a/npc/008-2-7/shop.txt b/npc/008-2-7/shop.txt index d565205f..6793becc 100644 --- a/npc/008-2-7/shop.txt +++ b/npc/008-2-7/shop.txt @@ -19,7 +19,7 @@ OnInit: sellitem ConcPotion, -1, 3; sellitem IronPotion, -1, 3; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; diff --git a/npc/008-2-7/simon.txt b/npc/008-2-7/simon.txt index 2bce2c8e..c35ad3d4 100644 --- a/npc/008-2-7/simon.txt +++ b/npc/008-2-7/simon.txt @@ -33,7 +33,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-2-7/wyara.txt b/npc/008-2-7/wyara.txt index 5a05a008..5aa5c3f4 100644 --- a/npc/008-2-7/wyara.txt +++ b/npc/008-2-7/wyara.txt @@ -77,7 +77,7 @@ function doStatusReset { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/008-3-0/clauquer.txt b/npc/008-3-0/clauquer.txt index 45d217fc..04acdf05 100644 --- a/npc/008-3-0/clauquer.txt +++ b/npc/008-3-0/clauquer.txt @@ -133,7 +133,7 @@ function clauquerPrologue { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/008-3-0/juliet.txt b/npc/008-3-0/juliet.txt index c4f15fc0..6a510299 100644 --- a/npc/008-3-0/juliet.txt +++ b/npc/008-3-0/juliet.txt @@ -27,7 +27,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; diff --git a/npc/008-3-5/nunia.txt b/npc/008-3-5/nunia.txt index e58df875..a18350b3 100644 --- a/npc/008-3-5/nunia.txt +++ b/npc/008-3-5/nunia.txt @@ -76,7 +76,7 @@ function nuniaBegin { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/009-2-3/chef.txt b/npc/009-2-3/chef.txt index 51e0a5eb..73cc4614 100644 --- a/npc/009-2-3/chef.txt +++ b/npc/009-2-3/chef.txt @@ -83,7 +83,7 @@ function cookingDeal { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; .amount = 10; end; diff --git a/npc/009-2-7/jpmorbid.txt b/npc/009-2-7/jpmorbid.txt index 9c8cf768..c973b339 100644 --- a/npc/009-2-7/jpmorbid.txt +++ b/npc/009-2-7/jpmorbid.txt @@ -52,7 +52,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Bank configuration diff --git a/npc/012-1/aahna.txt b/npc/012-1/aahna.txt index 533db46b..b28714b9 100644 --- a/npc/012-1/aahna.txt +++ b/npc/012-1/aahna.txt @@ -12,7 +12,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-1/aidan.txt b/npc/012-1/aidan.txt index 973d8292..6ea8a0ce 100644 --- a/npc/012-1/aidan.txt +++ b/npc/012-1/aidan.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/ayasha.txt b/npc/012-1/ayasha.txt index 1eb2994b..4c1a466f 100644 --- a/npc/012-1/ayasha.txt +++ b/npc/012-1/ayasha.txt @@ -12,7 +12,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-1/crasmande.txt b/npc/012-1/crasmande.txt index dde77500..01e5835a 100644 --- a/npc/012-1/crasmande.txt +++ b/npc/012-1/crasmande.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/hasan.txt b/npc/012-1/hasan.txt index 3a735566..eecf3653 100644 --- a/npc/012-1/hasan.txt +++ b/npc/012-1/hasan.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/ishi.txt b/npc/012-1/ishi.txt index ac00463c..8861ed28 100644 --- a/npc/012-1/ishi.txt +++ b/npc/012-1/ishi.txt @@ -15,7 +15,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-1/kaan.txt b/npc/012-1/kaan.txt index 164c9fa8..9f083227 100644 --- a/npc/012-1/kaan.txt +++ b/npc/012-1/kaan.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/liana.txt b/npc/012-1/liana.txt index df332417..dbe8dfa1 100644 --- a/npc/012-1/liana.txt +++ b/npc/012-1/liana.txt @@ -20,7 +20,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-1/prawors.txt b/npc/012-1/prawors.txt index 785ff66f..08bf6b94 100644 --- a/npc/012-1/prawors.txt +++ b/npc/012-1/prawors.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/tiki.txt b/npc/012-1/tiki.txt index d50c27c8..de6a6503 100644 --- a/npc/012-1/tiki.txt +++ b/npc/012-1/tiki.txt @@ -125,7 +125,7 @@ function tikiSubmit { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; tradertype(NST_MARKET); diff --git a/npc/012-1/vincent.txt b/npc/012-1/vincent.txt index b9d1e350..fea13996 100644 --- a/npc/012-1/vincent.txt +++ b/npc/012-1/vincent.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-1/zegas.txt b/npc/012-1/zegas.txt index 6313b26c..78d72da0 100644 --- a/npc/012-1/zegas.txt +++ b/npc/012-1/zegas.txt @@ -31,7 +31,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-2-1/jessie.txt b/npc/012-2-1/jessie.txt index 12190552..0e8d748f 100644 --- a/npc/012-2-1/jessie.txt +++ b/npc/012-2-1/jessie.txt @@ -25,7 +25,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-2-1/tanisha.txt b/npc/012-2-1/tanisha.txt index ac28d2d0..b6d361de 100644 --- a/npc/012-2-1/tanisha.txt +++ b/npc/012-2-1/tanisha.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-2-2/sorfina.txt b/npc/012-2-2/sorfina.txt index be92fa32..86f8c82f 100644 --- a/npc/012-2-2/sorfina.txt +++ b/npc/012-2-2/sorfina.txt @@ -29,7 +29,7 @@ L_Legacy: close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/012-2-3/cynric.txt b/npc/012-2-3/cynric.txt index 960a96fb..5600e334 100644 --- a/npc/012-2-3/cynric.txt +++ b/npc/012-2-3/cynric.txt @@ -44,7 +44,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Bank configuration diff --git a/npc/012-2-3/nyle.txt b/npc/012-2-3/nyle.txt index 130500b1..c2ba0f1c 100644 --- a/npc/012-2-3/nyle.txt +++ b/npc/012-2-3/nyle.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; tradertype(NST_MARKET); diff --git a/npc/012-2-4/morgan.txt b/npc/012-2-4/morgan.txt index 6510960e..f99906d1 100644 --- a/npc/012-2-4/morgan.txt +++ b/npc/012-2-4/morgan.txt @@ -15,7 +15,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt index caa39c57..e52aca4e 100644 --- a/npc/012-2-4/zitoni.txt +++ b/npc/012-2-4/zitoni.txt @@ -71,7 +71,7 @@ L_mick: close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 3; end; } diff --git a/npc/012-2-5/rosen.txt b/npc/012-2-5/rosen.txt index 57bfbd01..8802e1ee 100644 --- a/npc/012-2-5/rosen.txt +++ b/npc/012-2-5/rosen.txt @@ -15,7 +15,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/012-2-5/toichi.txt b/npc/012-2-5/toichi.txt index 0c44c48c..3089fcf0 100644 --- a/npc/012-2-5/toichi.txt +++ b/npc/012-2-5/toichi.txt @@ -67,7 +67,7 @@ function askCrafting { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; .price = 6000; end; diff --git a/npc/012-3-3/manatree.txt b/npc/012-3-3/manatree.txt index 86c5b4be..2eb07687 100644 --- a/npc/012-3-3/manatree.txt +++ b/npc/012-3-3/manatree.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; end; } diff --git a/npc/020-1/adrian.txt b/npc/020-1/adrian.txt index ca4b1a3f..c8144007 100644 --- a/npc/020-1/adrian.txt +++ b/npc/020-1/adrian.txt @@ -37,7 +37,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; } diff --git a/npc/020-1/aisha.txt b/npc/020-1/aisha.txt index 5c276f9c..08aa85c9 100644 --- a/npc/020-1/aisha.txt +++ b/npc/020-1/aisha.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/anwar.txt b/npc/020-1/anwar.txt index 63355ab6..ff638770 100644 --- a/npc/020-1/anwar.txt +++ b/npc/020-1/anwar.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/bodyguard.txt b/npc/020-1/bodyguard.txt index 4b60c5b6..daf13b45 100644 --- a/npc/020-1/bodyguard.txt +++ b/npc/020-1/bodyguard.txt @@ -48,7 +48,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/budifis.txt b/npc/020-1/budifis.txt index b67a42fd..826c4990 100644 --- a/npc/020-1/budifis.txt +++ b/npc/020-1/budifis.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/cyndala.txt b/npc/020-1/cyndala.txt index b5d9d7e9..38e358e7 100644 --- a/npc/020-1/cyndala.txt +++ b/npc/020-1/cyndala.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/ekinu.txt b/npc/020-1/ekinu.txt index 1f8987c7..d566351d 100644 --- a/npc/020-1/ekinu.txt +++ b/npc/020-1/ekinu.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/eomie.txt b/npc/020-1/eomie.txt index c96389ca..48632ac7 100644 --- a/npc/020-1/eomie.txt +++ b/npc/020-1/eomie.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/froma.txt b/npc/020-1/froma.txt index f3aba5e4..13ae2488 100644 --- a/npc/020-1/froma.txt +++ b/npc/020-1/froma.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/harper.txt b/npc/020-1/harper.txt index 11749dfd..9bc327ec 100644 --- a/npc/020-1/harper.txt +++ b/npc/020-1/harper.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/hocus.txt b/npc/020-1/hocus.txt index aee036e5..935eb5e5 100644 --- a/npc/020-1/hocus.txt +++ b/npc/020-1/hocus.txt @@ -68,7 +68,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/inar.txt b/npc/020-1/inar.txt index 0d705f46..dcc1eda8 100644 --- a/npc/020-1/inar.txt +++ b/npc/020-1/inar.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/itka.txt b/npc/020-1/itka.txt index 679c1792..86410153 100644 --- a/npc/020-1/itka.txt +++ b/npc/020-1/itka.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/joelin.txt b/npc/020-1/joelin.txt index ee34800b..7966c38f 100644 --- a/npc/020-1/joelin.txt +++ b/npc/020-1/joelin.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/jossy.txt b/npc/020-1/jossy.txt index de14c876..15125903 100644 --- a/npc/020-1/jossy.txt +++ b/npc/020-1/jossy.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/mahoud.txt b/npc/020-1/mahoud.txt index d8d63cc2..4e8d6678 100644 --- a/npc/020-1/mahoud.txt +++ b/npc/020-1/mahoud.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/malivox.txt b/npc/020-1/malivox.txt index 9f2b7787..1bebc91b 100644 --- a/npc/020-1/malivox.txt +++ b/npc/020-1/malivox.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/marikel.txt b/npc/020-1/marikel.txt index d9492077..1ebe25a6 100644 --- a/npc/020-1/marikel.txt +++ b/npc/020-1/marikel.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/martha.txt b/npc/020-1/martha.txt index 9b22e80e..2cdf95b1 100644 --- a/npc/020-1/martha.txt +++ b/npc/020-1/martha.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/neko.txt b/npc/020-1/neko.txt index 5e572b70..b6ee77bc 100644 --- a/npc/020-1/neko.txt +++ b/npc/020-1/neko.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/nickos.txt b/npc/020-1/nickos.txt index 892842bd..ce3674c2 100644 --- a/npc/020-1/nickos.txt +++ b/npc/020-1/nickos.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/noke.txt b/npc/020-1/noke.txt index 561cbb74..c335da4c 100644 --- a/npc/020-1/noke.txt +++ b/npc/020-1/noke.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/odonell.txt b/npc/020-1/odonell.txt index cb582c90..a3dd01be 100644 --- a/npc/020-1/odonell.txt +++ b/npc/020-1/odonell.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/philip.txt b/npc/020-1/philip.txt index b73b9685..c2dad700 100644 --- a/npc/020-1/philip.txt +++ b/npc/020-1/philip.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/popaul.txt b/npc/020-1/popaul.txt index b6e553f0..07126332 100644 --- a/npc/020-1/popaul.txt +++ b/npc/020-1/popaul.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/pusco.txt b/npc/020-1/pusco.txt index 5a5b4767..3bd9ad50 100644 --- a/npc/020-1/pusco.txt +++ b/npc/020-1/pusco.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/ryan.txt b/npc/020-1/ryan.txt index 9aaae54e..c9bce290 100644 --- a/npc/020-1/ryan.txt +++ b/npc/020-1/ryan.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/sander.txt b/npc/020-1/sander.txt index f5a05e73..8f822029 100644 --- a/npc/020-1/sander.txt +++ b/npc/020-1/sander.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/tindris.txt b/npc/020-1/tindris.txt index 60a3a36a..e65a6db8 100644 --- a/npc/020-1/tindris.txt +++ b/npc/020-1/tindris.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } @@ -26,7 +26,7 @@ OnInit: close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-1/vaspina.txt b/npc/020-1/vaspina.txt index 46fa1316..c731aeda 100644 --- a/npc/020-1/vaspina.txt +++ b/npc/020-1/vaspina.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-0/kaizer.txt b/npc/020-2-0/kaizer.txt index b9d53543..8a77980c 100644 --- a/npc/020-2-0/kaizer.txt +++ b/npc/020-2-0/kaizer.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-10/hetchel.txt b/npc/020-2-10/hetchel.txt index 5114124e..34755ff4 100644 --- a/npc/020-2-10/hetchel.txt +++ b/npc/020-2-10/hetchel.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-18/inya.txt b/npc/020-2-18/inya.txt index aec5ee0a..aff5aae5 100644 --- a/npc/020-2-18/inya.txt +++ b/npc/020-2-18/inya.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-20/drabur.txt b/npc/020-2-20/drabur.txt index 8be16d8d..44ca52b5 100644 --- a/npc/020-2-20/drabur.txt +++ b/npc/020-2-20/drabur.txt @@ -38,7 +38,7 @@ close; OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; tradertype(NST_MARKET); diff --git a/npc/020-2-20/riskim.txt b/npc/020-2-20/riskim.txt index 4478a3d8..a1388c06 100644 --- a/npc/020-2-20/riskim.txt +++ b/npc/020-2-20/riskim.txt @@ -146,7 +146,7 @@ function foodQuestline { } OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; .price = 120; end; diff --git a/npc/020-2-24/kylian.txt b/npc/020-2-24/kylian.txt index 446f17bb..262c8a05 100644 --- a/npc/020-2-24/kylian.txt +++ b/npc/020-2-24/kylian.txt @@ -57,7 +57,7 @@ function kylianLuggage { } OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; end; } diff --git a/npc/020-2-26/receptionist.txt b/npc/020-2-26/receptionist.txt index 4e2c3963..3ff7656d 100644 --- a/npc/020-2-26/receptionist.txt +++ b/npc/020-2-26/receptionist.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-28/pauline.txt b/npc/020-2-28/pauline.txt index 720ab465..47bd5d46 100644 --- a/npc/020-2-28/pauline.txt +++ b/npc/020-2-28/pauline.txt @@ -32,7 +32,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-3/inac.txt b/npc/020-2-3/inac.txt index 57650aa7..6efc608a 100644 --- a/npc/020-2-3/inac.txt +++ b/npc/020-2-3/inac.txt @@ -13,7 +13,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-30/david.txt b/npc/020-2-30/david.txt index 3329485a..1e7f2158 100644 --- a/npc/020-2-30/david.txt +++ b/npc/020-2-30/david.txt @@ -36,7 +36,7 @@ function rossyPotion { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-34/donutello.txt b/npc/020-2-34/donutello.txt index c14420e6..5f2abf2c 100644 --- a/npc/020-2-34/donutello.txt +++ b/npc/020-2-34/donutello.txt @@ -161,7 +161,7 @@ OnRattoKill: } OnInit: - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 4; end; } diff --git a/npc/020-2-5/dausen.txt b/npc/020-2-5/dausen.txt index 157c689e..49c87553 100644 --- a/npc/020-2-5/dausen.txt +++ b/npc/020-2-5/dausen.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-5/filipa.txt b/npc/020-2-5/filipa.txt index 1390df19..bce9a376 100644 --- a/npc/020-2-5/filipa.txt +++ b/npc/020-2-5/filipa.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-7/manoli.txt b/npc/020-2-7/manoli.txt index 2f1b7b63..75b52c2a 100644 --- a/npc/020-2-7/manoli.txt +++ b/npc/020-2-7/manoli.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/020-2-9/heathin.txt b/npc/020-2-9/heathin.txt index 7c0e1a57..a9be60d1 100644 --- a/npc/020-2-9/heathin.txt +++ b/npc/020-2-9/heathin.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 2; end; } diff --git a/npc/020-2-9/hydusun.txt b/npc/020-2-9/hydusun.txt index b80c1e78..6ea2af4e 100644 --- a/npc/020-2-9/hydusun.txt +++ b/npc/020-2-9/hydusun.txt @@ -52,7 +52,7 @@ close; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 4; // Bank configuration diff --git a/npc/020-2-9/jhedia.txt b/npc/020-2-9/jhedia.txt index 3f24d448..b136df4d 100644 --- a/npc/020-2-9/jhedia.txt +++ b/npc/020-2-9/jhedia.txt @@ -14,7 +14,7 @@ close; OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; end; } diff --git a/npc/commands/bodytype.txt b/npc/commands/bodytype.txt index 290c6fd6..6ad1b887 100644 --- a/npc/commands/bodytype.txt +++ b/npc/commands/bodytype.txt @@ -1,52 +1,47 @@ -// @bodytype atcommand -// changes or returns the body type +// @gender atcommand +// changes or returns the gender -- script @bodytype 32767,{ +- script @gender 32767,{ end; OnCall: if (.@atcmd_parameters$[0] == "") { - dispbottom("Your current body type is " + bodytypeToString()); + dispbottom("Your current gender is " + genderToString()); end; } - .@desired = stringToBodytype(.@atcmd_parameters$[0]); + .@desired = stringToGender(.@atcmd_parameters$[0]); - if (.@desired == BodyType) { - dispbottom("Your body type is already " + bodytypeToString()); + if (.@desired == Gender) { + dispbottom("Your gender is already " + genderToString()); } else { - BodyType = .@desired; - dispbottom("Body type changed to " + bodytypeToString()); + Gender = .@desired; + dispbottom("Gender changed to " + genderToString()); } end; OnInit: - bindatcmd("gender", "@bodytype::OnCall", 99, 99, false); - bindatcmd("bodytype", "@bodytype::OnCall", 99, 99, false); - bindatcmd("body", "@bodytype::OnCall", 99, 99, false); - bindatcmd("type", "@bodytype::OnCall", 99, 99, false); - bindatcmd("changesex", "@bodytype::OnCall", 99, 99, false); + bindatcmd("gender", "@gender::OnCall", 99, 99, false); + bindatcmd("body", "@gender::OnCall", 99, 99, false); + bindatcmd("type", "@gender::OnCall", 99, 99, false); + bindatcmd("changesex", "@gender::OnCall", 99, 99, false); add_group_command("gender", 40, true, false); - add_group_command("bodytype", 40, true, false); add_group_command("body", 40, true, false); add_group_command("type", 40, true, false); add_group_command("changesex", 40, true, false); add_group_command("gender", 50, true, false); - add_group_command("bodytype", 50, true, false); add_group_command("body", 50, true, false); add_group_command("type", 50, true, false); add_group_command("changesex", 50, true, false); add_group_command("gender", 60, true, false); - add_group_command("bodytype", 60, true, false); add_group_command("body", 60, true, false); add_group_command("type", 60, true, false); add_group_command("changesex", 60, true, false); add_group_command("gender", 80, true, false); - add_group_command("bodytype", 80, true, false); add_group_command("body", 80, true, false); add_group_command("type", 80, true, false); add_group_command("changesex", 80, true, false); diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt index 0a4a953b..bb535ba2 100644 --- a/npc/commands/debug-look.txt +++ b/npc/commands/debug-look.txt @@ -38,7 +38,7 @@ function script BarberDebug { mes ""; mes "---"; - mes l("Body type") + ": " + bodytypeToString(BodyType); + mes l("Gender") + ": " + genderToString(Gender); mes l("Hair style") + ": " + getlook(LOOK_HAIR); mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR); mes l("Race") + ": " + Class + " (" + get_race() + ")";; @@ -47,7 +47,7 @@ function script BarberDebug { next; mes l("What do you want to change?"); select - menuimage("actions/edit", l("Body type") + " [" + l("Requires logout") + "]"), + menuimage("actions/edit", l("Gender") + " [" + l("Requires logout") + "]"), menuimage("actions/edit", l("Hair style")), menuimage("actions/edit", l("Hair color")), menuimage("actions/edit", l("Race")), @@ -55,7 +55,7 @@ function script BarberDebug { switch (@menu) { - case 1: BarberChangeBodyType(); break; + case 1: BarberChangeGender(); break; case 2: setStyle; break; case 3: setColor; break; case 4: setRace; break; diff --git a/npc/commands/debug-preset.txt b/npc/commands/debug-preset.txt index 1fbad520..f72ce657 100644 --- a/npc/commands/debug-preset.txt +++ b/npc/commands/debug-preset.txt @@ -145,7 +145,7 @@ function script DoRoutine { .@base = readparam(bAgi); statusup2 bAgi, parsev(.@base, .@args$[0], 1, 99) - .@base; break; - case 98: /* b => body type */ + case 98: /* b => gender */ .@desired_bt = max(1, min(3, .@a)); break; case 99: /* c => job */ @@ -225,9 +225,9 @@ function script DoRoutine { } } - if (.@desired_bt && BodyType != .@desired_bt) { + if (.@desired_bt && Gender != .@desired_bt) { sleep2(500); - BodyType = .@desired_bt; // this forces a logout so we must be it last + Gender = .@desired_bt; // this forces a logout so we must be it last } return; diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index 3d2e3014..6ce19eea 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -110,25 +110,25 @@ function script BarberChangeColor { return; } -function script BarberChangeBodyType { +function script BarberChangeGender { mesn("Note"); - mes(b(l("Changing your body type will send you back to the character selection screen."))); + mes(b(l("Changing your gender will send you back to the character selection screen."))); next(); - mes(l("Please select the desired body type:")); + mes(l("Please select the desired gender:")); menuint( - rif(BodyType == BODYTYPE_1, "► ") + l("Body type %i", 1), BODYTYPE_1, - rif(BodyType == BODYTYPE_2, "► ") + l("Body type %i", 2), BODYTYPE_2, - rif(BodyType == BODYTYPE_3, "► ") + l("Body type %i", 3), BODYTYPE_3); + rif(Gender == GENDER_FEMALE, "► ") + l("Gender female"), GENDER_FEMALE, + rif(Gender == GENDER_MALE, "► ") + l("Gender male", 2), GENDER_MALE, + rif(Gender == GENDER_HIDDEN, "► ") + l("Gender hidden"), GENDER_HIDDEN); - if (BodyType == @menuret) { + if (Gender == @menuret) { return; // don't kick to char selection when not needed } // FIXME: when manaplus supports seamless changing for evol2, use a simple return; closedialog(); close2(); - BodyType = @menuret; + Gender = @menuret; close; } diff --git a/npc/functions/bodytype.txt b/npc/functions/bodytype.txt index 5d37775a..b67c9294 100644 --- a/npc/functions/bodytype.txt +++ b/npc/functions/bodytype.txt @@ -1,19 +1,21 @@ -function script stringToBodytype { +function script stringToGender { switch (ord(strtolower(charat(getarg(0, "n"), 0)))) { - case 50: // 2 - case 102: // f - return BODYTYPE_2; - case 51: // 3 case 109: // m - return BODYTYPE_3; + return GENDER_MALE; + case 102: // f + return GENDER_FEMALE; default: - return BODYTYPE_1; + return GENDER_HIDDEN; } } -function script bodytypeToString { - .@bodytype = getarg(0, BodyType); +function script genderToString { + .@sex = getarg(0, Gender); - return .@bodytype == BODYTYPE_2 ? l("type %i", 2) : - .@bodytype == BODYTYPE_3 ? l("type %i", 3) : l("type %i", 1); + if (.@sex == 0) + return l("female"); + else if (.@sex == 1) + return l("male"); + else + return l("hidden"); } diff --git a/npc/functions/doors.txt b/npc/functions/doors.txt index d15969ad..6d73acf0 100644 --- a/npc/functions/doors.txt +++ b/npc/functions/doors.txt @@ -43,7 +43,7 @@ function script doorTimer { function script doorInit { .distance = 5; .alwaysVisible = true; - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; end; } diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 3be6b6fb..aaac5c16 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -54,8 +54,7 @@ function script mesq { } function script g { - // TODO: remove gendered lines from NPCs, or use any(getarg(0), getarg(1)) to make it random - return BodyType == 0 ? getarg(0) : getarg(1); + return Gender == 0 ? getarg(0) : getarg(1); } function script b { diff --git a/npc/items/master_skillbook.txt b/npc/items/master_skillbook.txt index efd582a4..7e01e7d0 100644 --- a/npc/items/master_skillbook.txt +++ b/npc/items/master_skillbook.txt @@ -123,7 +123,7 @@ OnUse: OnInit: .book_name$ = getitemname(MasterBook); - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/items/recipes.txt b/npc/items/recipes.txt index c624a357..5cb3cb0f 100644 --- a/npc/items/recipes.txt +++ b/npc/items/recipes.txt @@ -277,7 +277,7 @@ OnUse: OnInit: .book_name$ = getitemname(RecipeBook); - .bodytype = BODYTYPE_1; + .sex = GENDER_FEMALE; .distance = 1; end; } diff --git a/npc/marine/saluc.txt b/npc/marine/saluc.txt index 56bc493f..1206415c 100644 --- a/npc/marine/saluc.txt +++ b/npc/marine/saluc.txt @@ -113,7 +113,7 @@ function confirmTravel { } OnInit: - .bodytype = BODYTYPE_2; + .sex = GENDER_MALE; .distance = 4; .price = 100; // Current a constant, but maybe... In future... .artis = false; diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt index c041205f..9002d308 100644 --- a/npc/test/npc1.txt +++ b/npc/test/npc1.txt @@ -688,7 +688,7 @@ OnTimer340: doorTimer; OnInit: - .bodytype = BODYTYPE_3; + .sex = GENDER_HIDDEN; .distance = 5; .alwaysVisible = true; waitingroom "test room", 2, "npc1::OnReadyCheck", 1; |