summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-26 07:28:19 -0300
committerJesusaves <cpntb1@ymail.com>2020-04-26 07:28:19 -0300
commit080e42fc093a6693e225ea734d22049094351af0 (patch)
treeca7a507eb65cbe4239e47021c06fcc8e805ed383 /npc
parent0ed4665e14b6df06788c7b24c75380a230a8be61 (diff)
downloadserverdata-080e42fc093a6693e225ea734d22049094351af0.tar.gz
serverdata-080e42fc093a6693e225ea734d22049094351af0.tar.bz2
serverdata-080e42fc093a6693e225ea734d22049094351af0.tar.xz
serverdata-080e42fc093a6693e225ea734d22049094351af0.zip
Move more stuff from Real Estate System around.
It's still difficult to implement and maintain, imo.
Diffstat (limited to 'npc')
-rw-r--r--npc/009-6/utils.txt28
-rw-r--r--npc/009-7/utils.txt29
-rw-r--r--npc/012-8/utils.txt40
-rw-r--r--npc/017-7/utils.txt29
-rw-r--r--npc/017-8/utils.txt29
-rw-r--r--npc/functions/estate2.txt51
6 files changed, 55 insertions, 151 deletions
diff --git a/npc/009-6/utils.txt b/npc/009-6/utils.txt
index 816c56abe..65ffbb276 100644
--- a/npc/009-6/utils.txt
+++ b/npc/009-6/utils.txt
@@ -71,32 +71,4 @@ OnReload:
}
-009-6,21,23,0 script Wardrobe#RES_0096 NPC_NO_SPRITE,{
- openstorage;
- end;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-009-6,29,24,0 script Stovetop#RES_0096 NPC_NO_SPRITE,{
- realestate_cauldron();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-009-6,34,25,0 script Piano#RES_0096 NPC_NO_SPRITE,{
- realestate_piano();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
diff --git a/npc/009-7/utils.txt b/npc/009-7/utils.txt
index 1e111d23b..424a1f779 100644
--- a/npc/009-7/utils.txt
+++ b/npc/009-7/utils.txt
@@ -71,32 +71,3 @@ OnReload:
}
-009-7,21,23,0 script Wardrobe#RES_0097 NPC_NO_SPRITE,{
- openstorage;
- end;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-009-7,29,24,0 script Stovetop#RES_0097 NPC_NO_SPRITE,{
- realestate_cauldron();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-009-7,34,25,0 script Piano#RES_0097 NPC_NO_SPRITE,{
- realestate_piano();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
diff --git a/npc/012-8/utils.txt b/npc/012-8/utils.txt
index 952a3221b..7e34e91fe 100644
--- a/npc/012-8/utils.txt
+++ b/npc/012-8/utils.txt
@@ -22,6 +22,7 @@
// REAL_ESTATE_CREDITS → Credits equivalent to GP the player have. Will be used first.
+// Real Estate NPCs and settings
// The sign is the main controller for rent system
// Doorbell is the main controller for indoor
// This is the NPC script controller
@@ -52,10 +53,6 @@
end;
OnInit:
- // Estate Settings
- .id=1; // Estate ID
- .mapa$="012-8"; // Map name
-
// NPC Settings
.sex = G_OTHER;
.distance = 3;
@@ -65,39 +62,10 @@ OnInit:
OnReload:
//debugmes "[REAL ESTATE] NPC ONRELOAD";
// load_npc ( name , map, x , y{, cell} )
- load_npc("Wardrobe#RES_0128", .mapa$, 21, 23);
- load_npc("Cauldron#RES_0128", .mapa$, 28, 24);
- load_npc("Piano#RES_0128" , .mapa$, 34, 25);
- end;
-
-}
-
-012-8,21,23,0 script Wardrobe#RES_0128 NPC_NO_SPRITE,{
- openstorage;
+ load_npc("Wardrobe#RES_0128", .map$, 21, 23);
+ load_npc("Cauldron#RES_0128", .map$, 28, 24);
+ load_npc("Piano#RES_0128" , .map$, 34, 25);
end;
-OnInit:
- .distance=3;
- end;
-}
-
-
-012-8,29,24,0 script Cauldron#RES_0128 NPC_NO_SPRITE,{
- realestate_cauldron();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-012-8,34,25,0 script Piano#RES_0128 NPC_NO_SPRITE,{
- realestate_piano();
- close;
-
-OnInit:
- .distance=3;
- end;
}
diff --git a/npc/017-7/utils.txt b/npc/017-7/utils.txt
index 604bf19fe..28f69e283 100644
--- a/npc/017-7/utils.txt
+++ b/npc/017-7/utils.txt
@@ -72,32 +72,3 @@ OnReload:
}
-017-7,21,23,0 script Wardrobe#RES_0177 NPC_NO_SPRITE,{
- openstorage;
- end;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-017-7,29,24,0 script Cauldron#RES_0177 NPC_NO_SPRITE,{
- realestate_cauldron();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-017-7,34,25,0 script Piano#RES_0177 NPC_NO_SPRITE,{
- realestate_piano();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
diff --git a/npc/017-8/utils.txt b/npc/017-8/utils.txt
index ec0966b7d..70161131a 100644
--- a/npc/017-8/utils.txt
+++ b/npc/017-8/utils.txt
@@ -72,32 +72,3 @@ OnReload:
}
-017-8,21,23,0 script Wardrobe#RES_0178 NPC_NO_SPRITE,{
- openstorage;
- end;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-017-8,29,24,0 script Cauldron#RES_0178 NPC_NO_SPRITE,{
- realestate_cauldron();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
-
-017-8,34,25,0 script Piano#RES_0178 NPC_NO_SPRITE,{
- realestate_piano();
- close;
-
-OnInit:
- .distance=3;
- end;
-}
-
diff --git a/npc/functions/estate2.txt b/npc/functions/estate2.txt
index 758a73e4b..99100f2f8 100644
--- a/npc/functions/estate2.txt
+++ b/npc/functions/estate2.txt
@@ -273,3 +273,54 @@ function script realestate_cauldron {
return;
}
+////////////////////////////////////////////////////////////////////////////
+// TODO: NPCs toogle on/off controller?
+
+////////////////////////////////////////////////////////////////////////////
+012-8,21,23,0 script Wardrobe#RES_0128 NPC_NO_SPRITE,{
+ openstorage;
+ end;
+
+OnInit:
+ .distance=3;
+ end;
+}
+
+017-7,21,23,0 duplicate(Wardrobe#RES_0128) Wardrobe#RES_0177 NPC_NO_SPRITE
+017-8,21,23,0 duplicate(Wardrobe#RES_0128) Wardrobe#RES_0178 NPC_NO_SPRITE
+009-6,21,23,0 duplicate(Wardrobe#RES_0128) Wardrobe#RES_0096 NPC_NO_SPRITE
+009-7,21,23,0 duplicate(Wardrobe#RES_0128) Wardrobe#RES_0097 NPC_NO_SPRITE
+
+
+////////////////////////////////////////////////////////////////////////////
+012-8,29,24,0 script Cauldron#RES_0128 NPC_NO_SPRITE,{
+ realestate_cauldron();
+ close;
+
+OnInit:
+ .distance=3;
+ end;
+}
+
+017-7,29,24,0 duplicate(Cauldron#RES_0128) Cauldron#RES_0177 NPC_NO_SPRITE
+017-8,29,24,0 duplicate(Cauldron#RES_0128) Cauldron#RES_0178 NPC_NO_SPRITE
+009-6,29,24,0 duplicate(Cauldron#RES_0128) Stovetop#RES_0096 NPC_NO_SPRITE
+009-7,29,24,0 duplicate(Cauldron#RES_0128) Stovetop#RES_0097 NPC_NO_SPRITE
+
+
+////////////////////////////////////////////////////////////////////////////
+012-8,34,25,0 script Piano#RES_0128 NPC_NO_SPRITE,{
+ realestate_piano();
+ close;
+
+OnInit:
+ .distance=3;
+ end;
+}
+
+017-7,34,25,0 duplicate(Piano#RES_0128) Piano#RES_0177 NPC_NO_SPRITE
+017-8,34,25,0 duplicate(Piano#RES_0128) Piano#RES_0178 NPC_NO_SPRITE
+009-6,34,25,0 duplicate(Piano#RES_0128) Piano#RES_0096 NPC_NO_SPRITE
+009-7,34,25,0 duplicate(Piano#RES_0128) Piano#RES_0097 NPC_NO_SPRITE
+
+