diff options
| author | gumi <git@gumi.ca> | 2020-07-30 14:24:11 -0400 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2020-08-05 21:40:55 -0400 |
| commit | cab095a0e7b132d67a03412a6c3a9cf3e89c943a (patch) | |
| tree | 6242a852468f0f2d4140802db7722f9fe755652f | |
| parent | 670b053ae6296e78f42d30a4e89518244a284f67 (diff) | |
| download | serverdata-cab095a0e7b132d67a03412a6c3a9cf3e89c943a.tar.gz serverdata-cab095a0e7b132d67a03412a6c3a9cf3e89c943a.tar.bz2 serverdata-cab095a0e7b132d67a03412a6c3a9cf3e89c943a.tar.xz serverdata-cab095a0e7b132d67a03412a6c3a9cf3e89c943a.zip | |
remove the all mentions of sex or gender from scripts
210 files changed, 358 insertions, 368 deletions
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt index d262c1ca..8e25d07e 100644 --- a/npc/000-0-0/q'onan.txt +++ b/npc/000-0-0/q'onan.txt @@ -10,6 +10,6 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; end; } diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index 87ed2b34..c3de6d9a 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -74,7 +74,7 @@ OnTalk: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; end; OnSlow: @@ -89,6 +89,6 @@ OnSlow: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; end; } diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt index 5f2bb81c..ae85dadb 100644 --- a/npc/000-0-1/narrator.txt +++ b/npc/000-0-1/narrator.txt @@ -32,6 +32,6 @@ close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 9e82bed9..705b7eee 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -90,6 +90,6 @@ OnTouch: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; end; } diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 82aa4739..68862f3e 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -104,7 +104,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index fd90a83f..218048aa 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -160,7 +160,7 @@ L_Whyning: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index 092b7aaa..44924613 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -89,7 +89,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index e2a86d8a..a20ea0e6 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -143,7 +143,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 14; end; } diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt index fba4d817..d1852475 100644 --- a/npc/000-1/fexil.txt +++ b/npc/000-1/fexil.txt @@ -38,7 +38,7 @@ } OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index 77738a8a..b7c6d6bf 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -236,7 +236,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index d6bac175..369faacf 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -164,7 +164,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index b50db974..ab4ae74d 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -125,7 +125,7 @@ L_Close: goodbye; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index 93cfeb7f..866cf3fd 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -68,7 +68,7 @@ L_Close: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/maxe.txt b/npc/000-1/maxe.txt index 8bc3eeb1..578e1105 100644 --- a/npc/000-1/maxe.txt +++ b/npc/000-1/maxe.txt @@ -103,7 +103,7 @@ L_Secrets: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index 8420341b..6ddb9cf7 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -126,7 +126,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt index 16da0eb9..e83dba45 100644 --- a/npc/000-1/sapartan.txt +++ b/npc/000-1/sapartan.txt @@ -93,7 +93,7 @@ goodbye; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt index 44b3479a..867d6db6 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 3; end; diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt index 7c19bc5a..d37716e1 100644 --- a/npc/000-1/silvio.txt +++ b/npc/000-1/silvio.txt @@ -180,7 +180,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt index f90883d6..59c63a5f 100644 --- a/npc/000-1/tarlan.txt +++ b/npc/000-1/tarlan.txt @@ -59,7 +59,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index 5e5a2701..545254e2 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -118,7 +118,7 @@ L_Close: goodbye; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt index 1ca803dc..1a795437 100644 --- a/npc/000-2-0/billybons.txt +++ b/npc/000-2-0/billybons.txt @@ -90,7 +90,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index 24635648..0e95fdd9 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -296,7 +296,7 @@ OnTouch: end; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 10; .quest_debug = ShipQuests_Julia; } diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt index da074f25..c120951b 100644 --- a/npc/000-2-1/_savepoints.txt +++ b/npc/000-2-1/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index 6b444b49..68754d1e 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -311,7 +311,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .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 8c06ce48..423e42dc 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -299,7 +299,7 @@ OnSlow: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; end; } diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 0039e094..ca208dd8 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -207,7 +207,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index 31591734..a59819c2 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -88,7 +88,7 @@ L_Quit2: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index caf421bf..7459d550 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -11,7 +11,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 06825f0c..8b783971 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -297,7 +297,7 @@ OnDone: OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index bee4f34a..245f608f 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -10,7 +10,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt index 4f4714f1..6ac06e12 100644 --- a/npc/000-2-3/elmo.txt +++ b/npc/000-2-3/elmo.txt @@ -61,7 +61,7 @@ goodbye; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; end; } diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index 807127af..5ecdab89 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -271,7 +271,7 @@ L_Reward: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; end; } diff --git a/npc/000-2-4/alige.txt b/npc/000-2-4/alige.txt index fbfb79ee..0f833b64 100644 --- a/npc/000-2-4/alige.txt +++ b/npc/000-2-4/alige.txt @@ -33,7 +33,7 @@ OnTimer190: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt index 79cac06a..934db014 100644 --- a/npc/001-1/artaxe.txt +++ b/npc/001-1/artaxe.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/beuss.txt b/npc/001-1/beuss.txt index 9040f64e..88305100 100644 --- a/npc/001-1/beuss.txt +++ b/npc/001-1/beuss.txt @@ -22,7 +22,7 @@ OnTimer10000: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt index ac3cbf3f..afaf4866 100644 --- a/npc/001-1/calypsan.txt +++ b/npc/001-1/calypsan.txt @@ -98,7 +98,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; end; } diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt index b0151ea2..1f2945fc 100644 --- a/npc/001-1/chelios.txt +++ b/npc/001-1/chelios.txt @@ -110,7 +110,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index 8ab570bd..f7c86054 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -252,7 +252,7 @@ L_Bye: close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/001-1/devis.txt b/npc/001-1/devis.txt index 5f0d4868..fb6d3140 100644 --- a/npc/001-1/devis.txt +++ b/npc/001-1/devis.txt @@ -64,7 +64,7 @@ OnTimer1000: dographmovestep; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .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 170d397a..d89103b3 100644 --- a/npc/001-1/elmo.txt +++ b/npc/001-1/elmo.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt index 140f51b0..a57b5e78 100644 --- a/npc/001-1/enora.txt +++ b/npc/001-1/enora.txt @@ -441,7 +441,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 5; end; } diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt index 442b950d..3efe4d7f 100644 --- a/npc/001-1/eugene.txt +++ b/npc/001-1/eugene.txt @@ -78,7 +78,7 @@ L_QuestDone: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt index 7b612674..d66b9c31 100644 --- a/npc/001-1/fexil.txt +++ b/npc/001-1/fexil.txt @@ -138,7 +138,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/flyingpiou.txt b/npc/001-1/flyingpiou.txt index bb8440b3..af69d46f 100644 --- a/npc/001-1/flyingpiou.txt +++ b/npc/001-1/flyingpiou.txt @@ -105,7 +105,7 @@ OnTimer1000: dographmovestep; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 5; .walkmask = WALK_WATER; // .debug = 1; diff --git a/npc/001-1/juscare.txt b/npc/001-1/juscare.txt index 393186fa..a692486c 100644 --- a/npc/001-1/juscare.txt +++ b/npc/001-1/juscare.txt @@ -39,7 +39,7 @@ OnTimer1000: dographmovestep; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; // .debug = 1; initmovegraph diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt index 38ff2725..726305d2 100644 --- a/npc/001-1/katja.txt +++ b/npc/001-1/katja.txt @@ -122,7 +122,7 @@ L_Story: } OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt index 2595be63..2478d78e 100644 --- a/npc/001-1/koga.txt +++ b/npc/001-1/koga.txt @@ -25,7 +25,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; .alwaysVisible = true; end; diff --git a/npc/001-1/lucas.txt b/npc/001-1/lucas.txt index beaba179..aad347b8 100644 --- a/npc/001-1/lucas.txt +++ b/npc/001-1/lucas.txt @@ -12,7 +12,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-1/manhole.txt b/npc/001-1/manhole.txt index 3e8a5bc8..c0183f1f 100644 --- a/npc/001-1/manhole.txt +++ b/npc/001-1/manhole.txt @@ -22,7 +22,7 @@ close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -39,7 +39,7 @@ OnInit: close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -63,7 +63,7 @@ OnInit: close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -82,7 +82,7 @@ OnInit: close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-1/merlin.txt b/npc/001-1/merlin.txt index 7a7c1590..53ee082d 100644 --- a/npc/001-1/merlin.txt +++ b/npc/001-1/merlin.txt @@ -19,7 +19,7 @@ OnTouch: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-1/mouboo.txt b/npc/001-1/mouboo.txt index bee13d1e..0cc5c7d2 100644 --- a/npc/001-1/mouboo.txt +++ b/npc/001-1/mouboo.txt @@ -14,7 +14,7 @@ OnTimer2000: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .speed = 600; mouboograph; } @@ -29,7 +29,7 @@ OnTimer2000: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .speed = 600; mouboograph; } @@ -44,7 +44,7 @@ OnTimer2000: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .speed = 600; mouboograph; } @@ -59,7 +59,7 @@ OnTimer2000: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .speed = 600; mouboograph; } diff --git a/npc/001-1/pious.txt b/npc/001-1/pious.txt index 10f9d8e4..0a3baa1a 100644 --- a/npc/001-1/pious.txt +++ b/npc/001-1/pious.txt @@ -10,7 +10,7 @@ end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; } diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt index 6805356a..46cb5b31 100644 --- a/npc/001-1/qonan.txt +++ b/npc/001-1/qonan.txt @@ -97,7 +97,7 @@ L_QuestDone: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; .debug = 1; end; diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt index aab0ad84..33359378 100644 --- a/npc/001-1/qpid.txt +++ b/npc/001-1/qpid.txt @@ -164,7 +164,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; end; } diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt index fa95f737..6400cc7d 100644 --- a/npc/001-1/rowboat.txt +++ b/npc/001-1/rowboat.txt @@ -39,7 +39,7 @@ OnTimer1000: else domovestep; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; .speed = 175; diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt index 7cd419e4..a2311efb 100644 --- a/npc/001-1/rowboathelper.txt +++ b/npc/001-1/rowboathelper.txt @@ -65,7 +65,7 @@ OnTouch: end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; } @@ -89,7 +89,7 @@ OnTouch: end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; } @@ -113,7 +113,7 @@ OnTouch: end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; } diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt index 4a1103fb..56873965 100644 --- a/npc/001-1/rumly.txt +++ b/npc/001-1/rumly.txt @@ -221,6 +221,6 @@ OnTimer1800: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; end; } diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt index ceaeda8f..8b1705d8 100644 --- a/npc/001-1/salem.txt +++ b/npc/001-1/salem.txt @@ -214,7 +214,7 @@ OnPiouFlee: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; end; } diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt index 85e43235..59dd8cd7 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 3; end; @@ -57,7 +57,7 @@ OnInit: sellitem KhakiCottonDye, -1, 10; sellitem YellowCottonDye, -1, 10; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -102,7 +102,7 @@ OnInit: sellitem OrchidSilkDye, -1, 7; sellitem PinkiePinkSilkDye, -1, 7; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -129,7 +129,7 @@ OnInit: sellitem Aquada, -1, 50; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -151,7 +151,7 @@ OnInit: sellitem SmallTentacles, -1, 30; sellitem Tentacles, -1, 15; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -178,7 +178,7 @@ OnInit: sellitem CommonCarp, -1, 8; sellitem GrassCarp, -1, 7; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -200,7 +200,7 @@ OnInit: sellitem Manana, -1, 60; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -220,7 +220,7 @@ OnInit: sellitem Manana, -1, 30; // Add soft drinks. - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -244,7 +244,7 @@ OnInit: sellitem AtroposMixture, -1, 10; sellitem ElixirOfLife, -1, 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; @@ -277,7 +277,7 @@ OnInit: sellitem PiouEgg, -1, 25; // Add soft drinks. - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 4; end; diff --git a/npc/001-1/sign.txt b/npc/001-1/sign.txt index d489cc19..dd03b60e 100644 --- a/npc/001-1/sign.txt +++ b/npc/001-1/sign.txt @@ -11,7 +11,7 @@ OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -21,7 +21,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -31,7 +31,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -41,7 +41,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -51,7 +51,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -61,7 +61,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -71,7 +71,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -81,7 +81,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -91,7 +91,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -101,7 +101,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -111,7 +111,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -121,7 +121,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -131,7 +131,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -141,7 +141,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -151,7 +151,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -161,7 +161,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -171,7 +171,7 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -181,6 +181,6 @@ OnInit: OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/001-1/sophialla.txt b/npc/001-1/sophialla.txt index 0671307b..2e0a5c58 100644 --- a/npc/001-1/sophialla.txt +++ b/npc/001-1/sophialla.txt @@ -72,7 +72,7 @@ OnLegionComplete: close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; .alwaysVisible = true; end; diff --git a/npc/001-1/taree.txt b/npc/001-1/taree.txt index 5af18b0e..f1c4fe58 100644 --- a/npc/001-1/taree.txt +++ b/npc/001-1/taree.txt @@ -14,7 +14,7 @@ L_Close: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-1/trees.txt b/npc/001-1/trees.txt index 2c147bf9..47437020 100644 --- a/npc/001-1/trees.txt +++ b/npc/001-1/trees.txt @@ -103,7 +103,7 @@ L_FoundHim: LazyBrotherTreeFunc(1); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -112,7 +112,7 @@ OnInit: LazyBrotherTreeFunc(2); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -121,7 +121,7 @@ OnInit: LazyBrotherTreeFunc(3); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -130,7 +130,7 @@ OnInit: LazyBrotherTreeFunc(4); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -139,7 +139,7 @@ OnInit: LazyBrotherTreeFunc(5); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -148,7 +148,7 @@ OnInit: LazyBrotherTreeFunc(6); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -157,7 +157,7 @@ OnInit: LazyBrotherTreeFunc(7); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -166,7 +166,7 @@ OnInit: LazyBrotherTreeFunc(8); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -175,7 +175,7 @@ OnInit: LazyBrotherTreeFunc(9); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -184,7 +184,7 @@ OnInit: LazyBrotherTreeFunc(10); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -193,7 +193,7 @@ OnInit: LazyBrotherTreeFunc(11); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -202,7 +202,7 @@ OnInit: LazyBrotherTreeFunc(12); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -211,7 +211,7 @@ OnInit: LazyBrotherTreeFunc(13); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -220,7 +220,7 @@ OnInit: LazyBrotherTreeFunc(14); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -229,7 +229,7 @@ OnInit: LazyBrotherTreeFunc(15); end; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-1/wateranimation.txt b/npc/001-1/wateranimation.txt index 285a7788..1a11a90e 100644 --- a/npc/001-1/wateranimation.txt +++ b/npc/001-1/wateranimation.txt @@ -11,7 +11,7 @@ close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 5; end; } diff --git a/npc/001-1/xilaxa.txt b/npc/001-1/xilaxa.txt index f6f1189c..c52e83c6 100644 --- a/npc/001-1/xilaxa.txt +++ b/npc/001-1/xilaxa.txt @@ -17,7 +17,7 @@ OnTimer1000: dographmovestep; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .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 951d7d6a..c5d6ce70 100644 --- a/npc/001-2-0/resa.txt +++ b/npc/001-2-0/resa.txt @@ -74,7 +74,7 @@ OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/001-2-0/shop.txt b/npc/001-2-0/shop.txt index 9fe97b17..f2d2672e 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; diff --git a/npc/001-2-1/_savepoints.txt b/npc/001-2-1/_savepoints.txt index fa9c1ecc..bb4e89eb 100644 --- a/npc/001-2-1/_savepoints.txt +++ b/npc/001-2-1/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-10/_savepoints.txt b/npc/001-2-10/_savepoints.txt index 91b14f37..cc34de1f 100644 --- a/npc/001-2-10/_savepoints.txt +++ b/npc/001-2-10/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-11/_savepoints.txt b/npc/001-2-11/_savepoints.txt index 00b8c05c..5061e7b4 100644 --- a/npc/001-2-11/_savepoints.txt +++ b/npc/001-2-11/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt index 2f4e3da0..d2fb2dc8 100644 --- a/npc/001-2-11/mona.txt +++ b/npc/001-2-11/mona.txt @@ -165,7 +165,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; end; } diff --git a/npc/001-2-12/oscar.txt b/npc/001-2-12/oscar.txt index 5348af00..5e848258 100644 --- a/npc/001-2-12/oscar.txt +++ b/npc/001-2-12/oscar.txt @@ -138,7 +138,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-2-13/_savepoints.txt b/npc/001-2-13/_savepoints.txt index fd073ac6..6f280f95 100644 --- a/npc/001-2-13/_savepoints.txt +++ b/npc/001-2-13/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-15/_savepoints.txt b/npc/001-2-15/_savepoints.txt index cd164505..6e62c159 100644 --- a/npc/001-2-15/_savepoints.txt +++ b/npc/001-2-15/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt index a0051caa..e183dd0e 100644 --- a/npc/001-2-19/lloyd.txt +++ b/npc/001-2-19/lloyd.txt @@ -230,7 +230,7 @@ OnInit: .quest_debug = ArtisQuests_Lloyd; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/001-2-2/moon.txt b/npc/001-2-2/moon.txt index 1bc682c1..e0e42e4b 100644 --- a/npc/001-2-2/moon.txt +++ b/npc/001-2-2/moon.txt @@ -201,7 +201,7 @@ OnHour00: end; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .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 008cdb41..adb929e8 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: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 10; end; } diff --git a/npc/001-2-22/_savepoints.txt b/npc/001-2-22/_savepoints.txt index b4a5c1ba..3a1f7f0b 100644 --- a/npc/001-2-22/_savepoints.txt +++ b/npc/001-2-22/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -58,7 +58,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt index c5bb8aed..fc0f4df4 100644 --- a/npc/001-2-22/alige.txt +++ b/npc/001-2-22/alige.txt @@ -315,7 +315,7 @@ L_Quit: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .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 329d8567..103b7835 100644 --- a/npc/001-2-22/chefgado.txt +++ b/npc/001-2-22/chefgado.txt @@ -16,7 +16,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt index 9c4402a2..43e94f8f 100644 --- a/npc/001-2-22/peter.txt +++ b/npc/001-2-22/peter.txt @@ -297,7 +297,7 @@ OnDone: OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt index 4b76467a..3396f413 100644 --- a/npc/001-2-24/nard.txt +++ b/npc/001-2-24/nard.txt @@ -88,7 +88,7 @@ L_Lost: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; end; } diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt index b0873bcc..f4953376 100644 --- a/npc/001-2-26/ivan.txt +++ b/npc/001-2-26/ivan.txt @@ -80,7 +80,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt index cc62f4c1..a35b9317 100644 --- a/npc/001-2-27/don.txt +++ b/npc/001-2-27/don.txt @@ -91,7 +91,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt index 652eb3f6..bead9ed8 100644 --- a/npc/001-2-27/kaylo.txt +++ b/npc/001-2-27/kaylo.txt @@ -37,7 +37,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt index ea497820..09bf503a 100644 --- a/npc/001-2-27/lydon.txt +++ b/npc/001-2-27/lydon.txt @@ -30,7 +30,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/001-2-27/shop.txt b/npc/001-2-27/shop.txt index c942eef5..842988e4 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; @@ -43,7 +43,7 @@ OnInit: sellitem WoodenSword, -1, 50; sellitem TrainingArrow, -1, 20000; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; diff --git a/npc/001-2-28/jenna.txt b/npc/001-2-28/jenna.txt index 439ab3b4..6ec8c0c4 100644 --- a/npc/001-2-28/jenna.txt +++ b/npc/001-2-28/jenna.txt @@ -42,7 +42,7 @@ OnHour00: end; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .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 0cba5b2a..b12b7c6a 100644 --- a/npc/001-2-28/plush.txt +++ b/npc/001-2-28/plush.txt @@ -124,7 +124,6 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 5; } - diff --git a/npc/001-2-28/shop.txt b/npc/001-2-28/shop.txt index 1d435c31..bfb20700 100644 --- a/npc/001-2-28/shop.txt +++ b/npc/001-2-28/shop.txt @@ -12,7 +12,7 @@ OnInit: sellitem RedPlushWine, -1, 50; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 10; end; diff --git a/npc/001-2-29/_savepoints.txt b/npc/001-2-29/_savepoints.txt index c2176e4c..65e56c79 100644 --- a/npc/001-2-29/_savepoints.txt +++ b/npc/001-2-29/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-3/_savepoints.txt b/npc/001-2-3/_savepoints.txt index e835aaa1..64ed218f 100644 --- a/npc/001-2-3/_savepoints.txt +++ b/npc/001-2-3/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt index 8b8f92d4..1594f219 100644 --- a/npc/001-2-32/serena.txt +++ b/npc/001-2-32/serena.txt @@ -22,7 +22,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; end; } diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt index c751d4a0..7ac6d4cb 100644 --- a/npc/001-2-33/lozerk.txt +++ b/npc/001-2-33/lozerk.txt @@ -181,7 +181,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-2-34/samantha.txt b/npc/001-2-34/samantha.txt index d7fe5c08..9d81d492 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: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; end; } diff --git a/npc/001-2-37/_savepoints.txt b/npc/001-2-37/_savepoints.txt index 30d7a797..06ba9a0e 100644 --- a/npc/001-2-37/_savepoints.txt +++ b/npc/001-2-37/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-38/_savepoints.txt b/npc/001-2-38/_savepoints.txt index 59be0f59..26bbb153 100644 --- a/npc/001-2-38/_savepoints.txt +++ b/npc/001-2-38/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt index e2273850..2a948afe 100644 --- a/npc/001-2-39/qanon.txt +++ b/npc/001-2-39/qanon.txt @@ -91,7 +91,7 @@ function legionState { } OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-2-4/books.txt b/npc/001-2-4/books.txt index f4282f67..7ea5ec04 100644 --- a/npc/001-2-4/books.txt +++ b/npc/001-2-4/books.txt @@ -11,7 +11,7 @@ close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; } @@ -98,7 +98,7 @@ OnUse: OnInit: .book_name$ = getitemname(FishingGuideVolI); - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-2-4/robin.txt b/npc/001-2-4/robin.txt index 206dd993..5a38facd 100644 --- a/npc/001-2-4/robin.txt +++ b/npc/001-2-4/robin.txt @@ -59,7 +59,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-4/terry.txt b/npc/001-2-4/terry.txt index b2eb141e..88b57c8d 100644 --- a/npc/001-2-4/terry.txt +++ b/npc/001-2-4/terry.txt @@ -10,7 +10,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-40/trozz.txt b/npc/001-2-40/trozz.txt index 5cb02840..dadedc18 100644 --- a/npc/001-2-40/trozz.txt +++ b/npc/001-2-40/trozz.txt @@ -61,7 +61,7 @@ function Dueling { } OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt index 40d53085..2afac51f 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: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -40,7 +40,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -50,7 +50,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -60,7 +60,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -70,7 +70,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -80,7 +80,7 @@ OnInit: EdouardCheckChair .map$, .x, .y; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -153,7 +153,7 @@ OnChair: l("Anything else?"); break; case 4: - BarberChangeGender(); + BarberChangeBodyType(); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You look fantastic."), l("Anything else?"); @@ -170,7 +170,7 @@ OnChair: } while (1); OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-5/books.txt b/npc/001-2-5/books.txt index c0d05df2..3145146a 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"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-2-5/tutorial.txt b/npc/001-2-5/tutorial.txt index 7d9b429f..1438b148 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-2-6/books.txt b/npc/001-2-6/books.txt index 280f3a08..f8eb231b 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"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -107,7 +107,7 @@ OnUse: OnInit: .book_name$ = "Poem about Poems"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -140,7 +140,7 @@ OnUse: OnInit: .book_name$ = "Chorus of the Woods"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -169,7 +169,7 @@ OnUse: close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -204,7 +204,7 @@ OnUse: OnInit: .book_name$ = "Fluffy Animals who Love Their Owners"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -238,7 +238,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol I"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -274,7 +274,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol II"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -312,7 +312,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol III"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } @@ -347,7 +347,7 @@ OnUse: OnInit: .book_name$ = "World Story For Dummies, Vol IV"; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/001-2-6/christopher.txt b/npc/001-2-6/christopher.txt index 1bef6786..c9ca2648 100644 --- a/npc/001-2-6/christopher.txt +++ b/npc/001-2-6/christopher.txt @@ -63,7 +63,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-6/dolfina.txt b/npc/001-2-6/dolfina.txt index 8d9c1a2c..f30752b4 100644 --- a/npc/001-2-6/dolfina.txt +++ b/npc/001-2-6/dolfina.txt @@ -14,7 +14,7 @@ L_Close: close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/001-2-6/leonard.txt b/npc/001-2-6/leonard.txt index 259d4047..a31631b7 100644 --- a/npc/001-2-6/leonard.txt +++ b/npc/001-2-6/leonard.txt @@ -83,7 +83,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt index 2ff2d5ac..d3a0b096 100644 --- a/npc/001-2-9/janus.txt +++ b/npc/001-2-9/janus.txt @@ -165,7 +165,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/001-3-0/mundane.txt b/npc/001-3-0/mundane.txt index 2d03dbec..33b0ecfd 100644 --- a/npc/001-3-0/mundane.txt +++ b/npc/001-3-0/mundane.txt @@ -153,7 +153,7 @@ OnMove: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; .speed = 140; diff --git a/npc/001-3-2/henry.txt b/npc/001-3-2/henry.txt index f3ab598a..c3e9de83 100644 --- a/npc/001-3-2/henry.txt +++ b/npc/001-3-2/henry.txt @@ -332,7 +332,7 @@ function completedHenry { /////////////////////////////////////////////////////// OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; diff --git a/npc/008-1-1/galimatia.txt b/npc/008-1-1/galimatia.txt index a917397d..a6a7aaf7 100644 --- a/npc/008-1-1/galimatia.txt +++ b/npc/008-1-1/galimatia.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-1-1/koga.txt b/npc/008-1-1/koga.txt index e0a7c2b8..26f12772 100644 --- a/npc/008-1-1/koga.txt +++ b/npc/008-1-1/koga.txt @@ -21,7 +21,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt index afb35ad8..e5560730 100644 --- a/npc/008-1-1/morcant.txt +++ b/npc/008-1-1/morcant.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-1-1/sign.txt b/npc/008-1-1/sign.txt index df554c2d..8358914e 100644 --- a/npc/008-1-1/sign.txt +++ b/npc/008-1-1/sign.txt @@ -10,7 +10,7 @@ OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } 008-1-1,157,87,0 script Sign#008-1-1-central NPC_NO_SPRITE,{ @@ -19,6 +19,6 @@ OnInit: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/008-1-2/sign.txt b/npc/008-1-2/sign.txt index 73b011e3..d1d13469 100644 --- a/npc/008-1-2/sign.txt +++ b/npc/008-1-2/sign.txt @@ -9,7 +9,7 @@ close; OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -19,7 +19,7 @@ OnInit: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -29,6 +29,6 @@ OnInit: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/008-1/4144.txt b/npc/008-1/4144.txt index 953c2380..842f9269 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/008-1/auldsbel.txt b/npc/008-1/auldsbel.txt index dc7cf202..e1b452be 100644 --- a/npc/008-1/auldsbel.txt +++ b/npc/008-1/auldsbel.txt @@ -28,7 +28,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-1/banu.txt b/npc/008-1/banu.txt index d8040153..342475ea 100644 --- a/npc/008-1/banu.txt +++ b/npc/008-1/banu.txt @@ -15,7 +15,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-1/blossom.txt b/npc/008-1/blossom.txt index 42e2e9c8..24db6821 100644 --- a/npc/008-1/blossom.txt +++ b/npc/008-1/blossom.txt @@ -33,7 +33,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-1/confused-tree.txt b/npc/008-1/confused-tree.txt index 32b5b9a5..198aedd7 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 - .sex = G_OTHER; // gender of the npc + .bodytype = BODYTYPE_1; // BodyType 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/hinnak.txt b/npc/008-1/hinnak.txt index 812ad95b..31343728 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/jack.txt b/npc/008-1/jack.txt index de71c2e5..fdce7fe6 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/mikhail.txt b/npc/008-1/mikhail.txt index 3e442499..3d9441d1 100644 --- a/npc/008-1/mikhail.txt +++ b/npc/008-1/mikhail.txt @@ -116,7 +116,7 @@ OnInit: .quest = HurnscaldQuests_Soup; .quest_debug = .quest; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/milly.txt b/npc/008-1/milly.txt index 1ca72cee..35c0e6b7 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 - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/old-man.txt b/npc/008-1/old-man.txt index c2004a7d..e0df33bc 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .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 5b97547b..ddfb33c6 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; - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .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 9541da7b..6668ea1e 100644 --- a/npc/008-1/oscar.txt +++ b/npc/008-1/oscar.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-1/sabine.txt b/npc/008-1/sabine.txt index 87026efb..8f4fa713 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; - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt index a0b825ec..5ea1c139 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 10; end; diff --git a/npc/008-1/sign.txt b/npc/008-1/sign.txt index 17099ba4..7652c3f2 100644 --- a/npc/008-1/sign.txt +++ b/npc/008-1/sign.txt @@ -9,7 +9,7 @@ close; OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -18,7 +18,7 @@ OnInit: close; OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -27,7 +27,7 @@ OnInit: close; OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -36,7 +36,7 @@ OnInit: close; OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } @@ -45,6 +45,6 @@ OnInit: close; OnInit: .distance = 1; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/008-1/snarfles.txt b/npc/008-1/snarfles.txt index 6ad08867..d40bf309 100644 --- a/npc/008-1/snarfles.txt +++ b/npc/008-1/snarfles.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-1/voltain.txt b/npc/008-1/voltain.txt index b5f82db0..d3aa9bc8 100644 --- a/npc/008-1/voltain.txt +++ b/npc/008-1/voltain.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-0/_savepoints.txt b/npc/008-2-0/_savepoints.txt index 2c108fa8..cc12ff48 100644 --- a/npc/008-2-0/_savepoints.txt +++ b/npc/008-2-0/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-0/celestia.txt b/npc/008-2-0/celestia.txt index d6ce7bc5..4485ae73 100644 --- a/npc/008-2-0/celestia.txt +++ b/npc/008-2-0/celestia.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-2-1/_savepoints.txt b/npc/008-2-1/_savepoints.txt index 19f0f307..f6cc8572 100644 --- a/npc/008-2-1/_savepoints.txt +++ b/npc/008-2-1/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-1/generalstore.txt b/npc/008-2-1/generalstore.txt index 73b24a5e..b80f6561 100644 --- a/npc/008-2-1/generalstore.txt +++ b/npc/008-2-1/generalstore.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-1/inspector.txt b/npc/008-2-1/inspector.txt index 725f5cbd..54d4b6aa 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-1/richard.txt b/npc/008-2-1/richard.txt index 958ecab4..8535abfa 100644 --- a/npc/008-2-1/richard.txt +++ b/npc/008-2-1/richard.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-1/selim.txt b/npc/008-2-1/selim.txt index c578f6cd..457577ed 100644 --- a/npc/008-2-1/selim.txt +++ b/npc/008-2-1/selim.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-10/airlia.txt b/npc/008-2-10/airlia.txt index cb7aced2..05df3ef2 100644 --- a/npc/008-2-10/airlia.txt +++ b/npc/008-2-10/airlia.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-2-11/_savepoints.txt b/npc/008-2-11/_savepoints.txt index db593899..c725504a 100644 --- a/npc/008-2-11/_savepoints.txt +++ b/npc/008-2-11/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-12/nurse.txt b/npc/008-2-12/nurse.txt index 29452258..7c708e66 100644 --- a/npc/008-2-12/nurse.txt +++ b/npc/008-2-12/nurse.txt @@ -86,7 +86,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-13/_savepoints.txt b/npc/008-2-13/_savepoints.txt index b82ce152..86ecc1ef 100644 --- a/npc/008-2-13/_savepoints.txt +++ b/npc/008-2-13/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-13/lena.txt b/npc/008-2-13/lena.txt index df9f38e9..759cc64a 100644 --- a/npc/008-2-13/lena.txt +++ b/npc/008-2-13/lena.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-2-14/_savepoints.txt b/npc/008-2-14/_savepoints.txt index 9eb50488..ede785b2 100644 --- a/npc/008-2-14/_savepoints.txt +++ b/npc/008-2-14/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-14/doctor.txt b/npc/008-2-14/doctor.txt index 52c8653c..c8609330 100644 --- a/npc/008-2-14/doctor.txt +++ b/npc/008-2-14/doctor.txt @@ -65,7 +65,7 @@ OnInit: .quest_inspector = HurnscaldQuests_Inspector; .quest_debug = .quest_inspector; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-16/stove.txt b/npc/008-2-16/stove.txt index 40dfeca9..34b9dfaf 100644 --- a/npc/008-2-16/stove.txt +++ b/npc/008-2-16/stove.txt @@ -82,7 +82,7 @@ close; OnInit: - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; } diff --git a/npc/008-2-16/yannika.txt b/npc/008-2-16/yannika.txt index 9599a5d9..d22ef124 100644 --- a/npc/008-2-16/yannika.txt +++ b/npc/008-2-16/yannika.txt @@ -303,7 +303,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; .quest=General_Cooking; diff --git a/npc/008-2-17/angus.txt b/npc/008-2-17/angus.txt index 3efeefb6..0be2570c 100644 --- a/npc/008-2-17/angus.txt +++ b/npc/008-2-17/angus.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-17/caul.txt b/npc/008-2-17/caul.txt index 41c5488c..41ba53fa 100644 --- a/npc/008-2-17/caul.txt +++ b/npc/008-2-17/caul.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-18/malik.txt b/npc/008-2-18/malik.txt index ab95dc92..f285d8c7 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt index f9914f62..8a14deb9 100644 --- a/npc/008-2-2/barron.txt +++ b/npc/008-2-2/barron.txt @@ -27,7 +27,7 @@ speech S_LAST_NEXT, OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt index d1217884..feb6f1e2 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-2/ledmitz.txt b/npc/008-2-2/ledmitz.txt index 5939428e..4e310961 100644 --- a/npc/008-2-2/ledmitz.txt +++ b/npc/008-2-2/ledmitz.txt @@ -16,7 +16,7 @@ OnTalk: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// @@ -40,7 +40,7 @@ OnTalk: end; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt index cf02dc90..4d5470a9 100644 --- a/npc/008-2-2/melania.txt +++ b/npc/008-2-2/melania.txt @@ -101,7 +101,7 @@ } OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; .inn=RUSTYPICK_INN; end; diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt index 17127656..39c97f2b 100644 --- a/npc/008-2-2/melinda.txt +++ b/npc/008-2-2/melinda.txt @@ -123,7 +123,7 @@ OnTouch: end; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .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 d3699092..58c6002d 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 10; end; diff --git a/npc/008-2-20/valia.txt b/npc/008-2-20/valia.txt index 030bcf92..0090be12 100644 --- a/npc/008-2-20/valia.txt +++ b/npc/008-2-20/valia.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-2-22/_savepoints.txt b/npc/008-2-22/_savepoints.txt index 1cc5c220..352aeb45 100644 --- a/npc/008-2-22/_savepoints.txt +++ b/npc/008-2-22/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-24/troupe-leader.txt b/npc/008-2-24/troupe-leader.txt index 8b10fed8..47956d4b 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; - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-3/_savepoints.txt b/npc/008-2-3/_savepoints.txt index 4e70dc2e..5ef58255 100644 --- a/npc/008-2-3/_savepoints.txt +++ b/npc/008-2-3/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -32,7 +32,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -45,7 +45,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -58,7 +58,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -71,7 +71,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -84,7 +84,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -97,7 +97,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-32/thamas.txt b/npc/008-2-32/thamas.txt index f824493f..42871ec6 100644 --- a/npc/008-2-32/thamas.txt +++ b/npc/008-2-32/thamas.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-4/_savepoints.txt b/npc/008-2-4/_savepoints.txt index 0129971e..d7e1afab 100644 --- a/npc/008-2-4/_savepoints.txt +++ b/npc/008-2-4/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-4/bernard.txt b/npc/008-2-4/bernard.txt index 9f7af5c7..8ba6a18c 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-4/olana.txt b/npc/008-2-4/olana.txt index c16e8887..02cdf4f9 100644 --- a/npc/008-2-4/olana.txt +++ b/npc/008-2-4/olana.txt @@ -15,7 +15,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-6/alan.txt b/npc/008-2-6/alan.txt index 92262ebf..368b3f1e 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; - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; ////////// UNFINISHED ////////// diff --git a/npc/008-2-6/donald.txt b/npc/008-2-6/donald.txt index 2b3a72f3..c536e1ba 100644 --- a/npc/008-2-6/donald.txt +++ b/npc/008-2-6/donald.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-7/_savepoints.txt b/npc/008-2-7/_savepoints.txt index ab8ddbb4..dbf05a30 100644 --- a/npc/008-2-7/_savepoints.txt +++ b/npc/008-2-7/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-2-7/shop.txt b/npc/008-2-7/shop.txt index 30989eb3..22a175bb 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 2; end; diff --git a/npc/008-2-7/simon.txt b/npc/008-2-7/simon.txt index 1b4ae071..b5ef32ed 100644 --- a/npc/008-2-7/simon.txt +++ b/npc/008-2-7/simon.txt @@ -33,7 +33,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 2; end; } diff --git a/npc/008-2-7/wyara.txt b/npc/008-2-7/wyara.txt index 502a5409..de667ac4 100644 --- a/npc/008-2-7/wyara.txt +++ b/npc/008-2-7/wyara.txt @@ -77,7 +77,7 @@ function doStatusReset { } OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/008-2-9/_savepoints.txt b/npc/008-2-9/_savepoints.txt index b606d73c..4f81f0b7 100644 --- a/npc/008-2-9/_savepoints.txt +++ b/npc/008-2-9/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/008-3-5/nunia.txt b/npc/008-3-5/nunia.txt index b2234dff..0d0986ca 100644 --- a/npc/008-3-5/nunia.txt +++ b/npc/008-3-5/nunia.txt @@ -76,7 +76,7 @@ function nuniaBegin { } OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/012-1/aahna.txt b/npc/012-1/aahna.txt index 5e0aa294..533db46b 100644 --- a/npc/012-1/aahna.txt +++ b/npc/012-1/aahna.txt @@ -12,7 +12,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-1/aidan.txt b/npc/012-1/aidan.txt index b593127b..973d8292 100644 --- a/npc/012-1/aidan.txt +++ b/npc/012-1/aidan.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/ayasha.txt b/npc/012-1/ayasha.txt index 437b025f..1eb2994b 100644 --- a/npc/012-1/ayasha.txt +++ b/npc/012-1/ayasha.txt @@ -12,7 +12,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-1/crasmande.txt b/npc/012-1/crasmande.txt index 54fcbe91..dde77500 100644 --- a/npc/012-1/crasmande.txt +++ b/npc/012-1/crasmande.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/hasan.txt b/npc/012-1/hasan.txt index 06da9f5d..3a735566 100644 --- a/npc/012-1/hasan.txt +++ b/npc/012-1/hasan.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/ishi.txt b/npc/012-1/ishi.txt index 80119d6f..ac00463c 100644 --- a/npc/012-1/ishi.txt +++ b/npc/012-1/ishi.txt @@ -15,7 +15,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-1/kaan.txt b/npc/012-1/kaan.txt index f2a430fc..164c9fa8 100644 --- a/npc/012-1/kaan.txt +++ b/npc/012-1/kaan.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/liana.txt b/npc/012-1/liana.txt index 391be79e..df332417 100644 --- a/npc/012-1/liana.txt +++ b/npc/012-1/liana.txt @@ -20,7 +20,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-1/prawors.txt b/npc/012-1/prawors.txt index 5a76c6f9..4682c6a6 100644 --- a/npc/012-1/prawors.txt +++ b/npc/012-1/prawors.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/vincent.txt b/npc/012-1/vincent.txt index 85ae934b..b9d1e350 100644 --- a/npc/012-1/vincent.txt +++ b/npc/012-1/vincent.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-1/zegas.txt b/npc/012-1/zegas.txt index bc112793..6313b26c 100644 --- a/npc/012-1/zegas.txt +++ b/npc/012-1/zegas.txt @@ -31,7 +31,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-2-1/jessie.txt b/npc/012-2-1/jessie.txt index 9af3dd09..12190552 100644 --- a/npc/012-2-1/jessie.txt +++ b/npc/012-2-1/jessie.txt @@ -25,7 +25,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-2-1/tanisha.txt b/npc/012-2-1/tanisha.txt index 01c92662..ac28d2d0 100644 --- a/npc/012-2-1/tanisha.txt +++ b/npc/012-2-1/tanisha.txt @@ -13,7 +13,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-2-2/_savepoints.txt b/npc/012-2-2/_savepoints.txt index 1aedace4..d023d3f6 100644 --- a/npc/012-2-2/_savepoints.txt +++ b/npc/012-2-2/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: @@ -19,7 +19,7 @@ OnTouch: OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/012-2-2/sorfina.txt b/npc/012-2-2/sorfina.txt index 9f389b81..4ba7bec3 100644 --- a/npc/012-2-2/sorfina.txt +++ b/npc/012-2-2/sorfina.txt @@ -29,7 +29,7 @@ L_Legacy: close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 4; end; } diff --git a/npc/012-2-3/cynric.txt b/npc/012-2-3/cynric.txt index e243c30f..3ca1bf33 100644 --- a/npc/012-2-3/cynric.txt +++ b/npc/012-2-3/cynric.txt @@ -40,7 +40,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-2-3/nyle.txt b/npc/012-2-3/nyle.txt index 269bb20f..130500b1 100644 --- a/npc/012-2-3/nyle.txt +++ b/npc/012-2-3/nyle.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; tradertype(NST_MARKET); diff --git a/npc/012-2-4/morgan.txt b/npc/012-2-4/morgan.txt index b68e8d98..6510960e 100644 --- a/npc/012-2-4/morgan.txt +++ b/npc/012-2-4/morgan.txt @@ -15,7 +15,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt index b1be3bdf..caa39c57 100644 --- a/npc/012-2-4/zitoni.txt +++ b/npc/012-2-4/zitoni.txt @@ -71,7 +71,7 @@ L_mick: close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 3; end; } diff --git a/npc/012-2-5/rosen.txt b/npc/012-2-5/rosen.txt index f782ebcd..57bfbd01 100644 --- a/npc/012-2-5/rosen.txt +++ b/npc/012-2-5/rosen.txt @@ -15,7 +15,7 @@ close; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; end; } diff --git a/npc/012-2-5/toichi.txt b/npc/012-2-5/toichi.txt index c2ff6c78..0c44c48c 100644 --- a/npc/012-2-5/toichi.txt +++ b/npc/012-2-5/toichi.txt @@ -67,7 +67,7 @@ function askCrafting { } OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 4; .price = 6000; end; diff --git a/npc/012-2-7/_savepoints.txt b/npc/012-2-7/_savepoints.txt index 0230a227..6ba291b9 100644 --- a/npc/012-2-7/_savepoints.txt +++ b/npc/012-2-7/_savepoints.txt @@ -6,7 +6,7 @@ OnInit: .distance = 2; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; OnTouch: diff --git a/npc/012-3-3/manatree.txt b/npc/012-3-3/manatree.txt index 985ac2a8..86c5b4be 100644 --- a/npc/012-3-3/manatree.txt +++ b/npc/012-3-3/manatree.txt @@ -14,7 +14,7 @@ close; OnInit: - .sex = G_FEMALE; + .bodytype = BODYTYPE_2; .distance = 2; end; } diff --git a/npc/commands/gender.txt b/npc/commands/bodytype.txt index dce4cd90..290c6fd6 100644 --- a/npc/commands/gender.txt +++ b/npc/commands/bodytype.txt @@ -1,31 +1,31 @@ -// @gender atcommand -// changes or returns the gender +// @bodytype atcommand +// changes or returns the body type -- script @gender 32767,{ +- script @bodytype 32767,{ end; OnCall: if (.@atcmd_parameters$[0] == "") { - dispbottom("Your current body type is " + genderToString()); + dispbottom("Your current body type is " + bodytypeToString()); end; } - .@desired = stringToGender(.@atcmd_parameters$[0]); + .@desired = stringToBodytype(.@atcmd_parameters$[0]); - if (.@desired == Gender) { - dispbottom("Your body type is already " + genderToString()); + if (.@desired == BodyType) { + dispbottom("Your body type is already " + bodytypeToString()); } else { - Gender = .@desired; - dispbottom("Body type changed to " + genderToString()); + BodyType = .@desired; + dispbottom("Body type changed to " + bodytypeToString()); } end; OnInit: - bindatcmd("gender", "@gender::OnCall", 99, 99, false); - bindatcmd("bodytype", "@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); + 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); add_group_command("gender", 40, true, false); add_group_command("bodytype", 40, true, false); diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt index c95c24ab..0a4a953b 100644 --- a/npc/commands/debug-look.txt +++ b/npc/commands/debug-look.txt @@ -1,20 +1,4 @@ function script BarberDebug { - - function setGender { - clear(); - setnpcdialogtitle(l("Appearance Debug - Body Type Change")); - mes(l("Warning: changing your body type will send you back to the character selection screen.")); - mes(""); - mes(l("Please choose the desired body type:")); - next(); - menuint( - l("Body type %i", 1), GENDER_HIDDEN, - l("Body type %i", 2), GENDER_FEMALE, - l("Body type %i", 3), GENDER_MALE); - - Gender = @menuret; - return; - } function setStyle { clear; setnpcdialogtitle l("Appearance Debug - Barber"); @@ -54,7 +38,7 @@ function script BarberDebug { mes ""; mes "---"; - mes l("Body type") + ": " + genderToString(Gender); + mes l("Body type") + ": " + bodytypeToString(BodyType); mes l("Hair style") + ": " + getlook(LOOK_HAIR); mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR); mes l("Race") + ": " + Class + " (" + get_race() + ")";; @@ -71,7 +55,7 @@ function script BarberDebug { switch (@menu) { - case 1: setGender; break; + case 1: BarberChangeBodyType(); 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 40f61261..1fbad520 100644 --- a/npc/commands/debug-preset.txt +++ b/npc/commands/debug-preset.txt @@ -145,7 +145,9 @@ function script DoRoutine { .@base = readparam(bAgi); statusup2 bAgi, parsev(.@base, .@args$[0], 1, 99) - .@base; break; - /* (b) */ + case 98: /* b => body type */ + .@desired_bt = max(1, min(3, .@a)); + break; case 99: /* c => job */ jobchange max(0, min(6, .@a)); break; @@ -157,7 +159,7 @@ function script DoRoutine { equip max(1, min(32767, .@a)); break; /* (f) */ - /* (g) => gender (reserved) */ + /* (g) */ /* (h) */ case 105: /* i => Int */ .@base = readparam(bInt); @@ -223,6 +225,11 @@ function script DoRoutine { } } + if (.@desired_bt && BodyType != .@desired_bt) { + sleep2(500); + BodyType = .@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 aee1fb30..e9477387 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -110,25 +110,25 @@ function script BarberChangeColor { return; } -function script BarberChangeGender { +function script BarberChangeBodyType { mesn("Note"); mes(b(l("Changing your body type will send you back to the character selection screen."))); next(); mes(l("Please select the desired body type:")); menuint( - rif(Gender == GENDER_HIDDEN, "► ") + l("Body type %i", 1), GENDER_HIDDEN, - rif(Gender == GENDER_FEMALE, "► ") + l("Body type %i", 2), GENDER_FEMALE, - rif(Gender == GENDER_MALE, "► ") + l("Body type %i", 3), GENDER_MALE); + 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); - if (@menuret == Gender) { + if (BodyType == @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(); - Gender = @menuret; + BodyType = @menuret; close; } diff --git a/npc/functions/bodytype.txt b/npc/functions/bodytype.txt new file mode 100644 index 00000000..5d37775a --- /dev/null +++ b/npc/functions/bodytype.txt @@ -0,0 +1,19 @@ +function script stringToBodytype { + 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; + default: + return BODYTYPE_1; + } +} + +function script bodytypeToString { + .@bodytype = getarg(0, BodyType); + + return .@bodytype == BODYTYPE_2 ? l("type %i", 2) : + .@bodytype == BODYTYPE_3 ? l("type %i", 3) : l("type %i", 1); +} diff --git a/npc/functions/doors.txt b/npc/functions/doors.txt index 4cca24e3..d15969ad 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; - .sex = G_OTHER; + .bodytype = BODYTYPE_1; end; } diff --git a/npc/functions/gender.txt b/npc/functions/gender.txt deleted file mode 100644 index c8b74872..00000000 --- a/npc/functions/gender.txt +++ /dev/null @@ -1,19 +0,0 @@ -function script stringToGender { - switch (ord(strtolower(charat(getarg(0, "n"), 0)))) { - case 50: // 2 - case 102: // f - return GENDER_FEMALE; - case 51: // 3 - case 109: // m - return GENDER_MALE; - default: - return GENDER_HIDDEN; - } -} - -function script genderToString { - .@gender = getarg(0, Gender); - - return .@gender == GENDER_FEMALE ? l("type %i", 2) : - .@gender == GENDER_MALE ? l("type %i", 3) : l("type %i", 1); -} diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 1ae37a35..8132a78a 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -54,7 +54,8 @@ function script mesq { } function script g { - return Sex == 0 ? getarg(0) : getarg(1); + // TODO: remove gendered lines from NPCs, or use any(getarg(0), getarg(1)) to make it random + return BodyType == 0 ? getarg(0) : getarg(1); } function script b { @@ -308,4 +309,3 @@ function script delinventorylist { @inventorylist_count=0; return; } - diff --git a/npc/items/master_skillbook.txt b/npc/items/master_skillbook.txt index e00a1abc..d5ded1de 100644 --- a/npc/items/master_skillbook.txt +++ b/npc/items/master_skillbook.txt @@ -121,7 +121,7 @@ OnUse: OnInit: .book_name$ = getitemname(MasterBook); - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/items/recipes.txt b/npc/items/recipes.txt index 485336e3..c7e4b2a7 100644 --- a/npc/items/recipes.txt +++ b/npc/items/recipes.txt @@ -118,7 +118,7 @@ OnUse: OnInit: .book_name$ = getitemname(RecipeBook); - .sex = G_OTHER; + .bodytype = BODYTYPE_1; .distance = 1; end; } diff --git a/npc/scripts.conf b/npc/scripts.conf index d86046ad..e1873409 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -12,7 +12,7 @@ "npc/functions/RNGesus.txt", "npc/functions/math.txt", "npc/functions/warp.txt", -"npc/functions/gender.txt", +"npc/functions/bodytype.txt", "npc/functions/bitwise.txt", "npc/functions/event-listeners.txt", @@ -148,7 +148,7 @@ "npc/commands/super-menu.txt", "npc/commands/resync.txt", "npc/commands/python.txt", -"npc/commands/gender.txt", +"npc/commands/bodytype.txt", // config script "npc/config/hairstyle_config.txt", diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt index 4754e4ed..c041205f 100644 --- a/npc/test/npc1.txt +++ b/npc/test/npc1.txt @@ -688,7 +688,7 @@ OnTimer340: doorTimer; OnInit: - .sex = G_MALE; + .bodytype = BODYTYPE_3; .distance = 5; .alwaysVisible = true; waitingroom "test room", 2, "npc1::OnReadyCheck", 1; |