diff --git a/continents/newbieland.worldedit b/continents/newbieland.worldedit index 67a9967..87d239c 100644 --- a/continents/newbieland.worldedit +++ b/continents/newbieland.worldedit @@ -1,9 +1,9 @@ 2 - - - + + + @@ -14,12 +14,6 @@ - - - - - - - - + + diff --git a/leveldesign/game_elem/creature/objects/cushion_01.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_01.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_01.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_01.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_02.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_02.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_02.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_02.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_03.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_03.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_03.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_03.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_04_01.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_04_01.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_04_01.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_04_01.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_04_02.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_04_02.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_04_02.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_04_02.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_04_03.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_04_03.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_04_03.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_04_03.creature diff --git a/leveldesign/game_elem/creature/objects/cushion_04_04.creature b/leveldesign/game_elem/creature/objects/cushion/cushion_04_04.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/cushion_04_04.creature rename to leveldesign/game_elem/creature/objects/cushion/cushion_04_04.creature diff --git a/leveldesign/game_elem/creature/objects/_egg_feast.creature b/leveldesign/game_elem/creature/objects/egg/_egg_feast.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/_egg_feast.creature rename to leveldesign/game_elem/creature/objects/egg/_egg_feast.creature diff --git a/leveldesign/game_elem/creature/objects/egg.creature b/leveldesign/game_elem/creature/objects/egg/egg.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/egg.creature rename to leveldesign/game_elem/creature/objects/egg/egg.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg01a.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg01a.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg01a.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg01a.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg01b.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg01b.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg01b.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg01b.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg02a.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg02a.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg02a.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg02a.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg02b.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg02b.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg02b.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg02b.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg03a.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg03a.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg03a.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg03a.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg03b.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg03b.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg03b.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg03b.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg04a.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg04a.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg04a.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg04a.creature diff --git a/leveldesign/game_elem/creature/objects/object_easter_egg04b.creature b/leveldesign/game_elem/creature/objects/egg/object_easter_egg04b.creature similarity index 100% rename from leveldesign/game_elem/creature/objects/object_easter_egg04b.creature rename to leveldesign/game_elem/creature/objects/egg/object_easter_egg04b.creature diff --git a/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_01.creature b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_01.creature new file mode 100644 index 0000000..dec2d4f --- /dev/null +++ b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_01.creature @@ -0,0 +1,23 @@ + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_02.creature b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_02.creature new file mode 100644 index 0000000..d713c97 --- /dev/null +++ b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_02.creature @@ -0,0 +1,23 @@ + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_03.creature b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_03.creature new file mode 100644 index 0000000..276a703 --- /dev/null +++ b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_03.creature @@ -0,0 +1,23 @@ + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_04.creature b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_04.creature new file mode 100644 index 0000000..e916bb8 --- /dev/null +++ b/leveldesign/game_elem/creature/objects/nest_pendo/pendo_nest_04.creature @@ -0,0 +1,23 @@ + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/primitives/newbieland/botobjects_newbieland.primitive b/primitives/newbieland/botobjects_newbieland.primitive index 87047e9..1c8a683 100644 --- a/primitives/newbieland/botobjects_newbieland.primitive +++ b/primitives/newbieland/botobjects_newbieland.primitive @@ -1,7 +1,7 @@ - + class @@ -369,7 +369,7 @@ - + class npc_bot @@ -460,7 +460,7 @@ - + class npc_bot @@ -701,5 +701,329 @@ + + + class + npc_manager + + + name + pendo_nest + + + + + class + alias + + + name + alias + + + + + ai_activity + no_chan + + + class + npc_zone + + + name + pendo_nest + + + + + class + alias + + + name + alias + + + + + class + npc_group + + + name + pendo_nest_delta + + + + class + npc_group_parameters + + + name + parameters + + + + + + class + alias + + + name + alias + + + + + + + class + npc_bot + + + name + pendo_nest_delta_01 + + + sheet_client + pendo_nest_01 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_delta_02 + + + sheet_client + pendo_nest_02 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_delta_03 + + + sheet_client + pendo_nest_03 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_delta_04 + + + sheet_client + pendo_nest_04 + + + + + class + alias + + + name + alias + + + + + + + class + npc_group + + + name + pendo_nest_ashtarie + + + + class + npc_group_parameters + + + name + parameters + + + + + + class + alias + + + name + alias + + + + + + + class + npc_bot + + + name + pendo_nest_ashtarie_01 + + + sheet_client + pendo_nest_01 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_ashtarie_02 + + + sheet_client + pendo_nest_02 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_ashtarie_03 + + + sheet_client + pendo_nest_03 + + + + + class + alias + + + name + alias + + + + + + + + class + npc_bot + + + name + pendo_nest_ashtarie_04 + + + sheet_client + pendo_nest_04 + + + + + class + alias + + + name + alias + + + + + + diff --git a/primitives/newbieland/urban_newbieland.primitive b/primitives/newbieland/urban_newbieland.primitive index cb56385..b6bb8f5 100644 --- a/primitives/newbieland/urban_newbieland.primitive +++ b/primitives/newbieland/urban_newbieland.primitive @@ -955,49 +955,6 @@ - - - class - npc_group_event_handler - - - event - start_of_state - - - name - disp_jimman_handler - - - - - class - alias - - - name - alias - - - - - action - code - - - class - npc_event_handler_action - - - name - disp_jimman_action - - - parameters - ()rename("Jimman$#(Intendant)"); - - - @@ -1061,49 +1018,6 @@ - - - class - npc_group_event_handler - - - event - start_of_state - - - name - disp_sipvandil_handler - - - - - class - alias - - - name - alias - - - - - action - code - - - class - npc_event_handler_action - - - name - disp_sipvandil_action - - - parameters - ()rename("Sipvandil$#(Cuisinier)"); - - - @@ -1591,4 +1505,4 @@ - \ No newline at end of file +