From: Christian Heller Date: Tue, 10 Mar 2015 13:42:25 +0000 (+0100) Subject: Add ThingType-dependent limit on storage room in inventory. X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/condition?a=commitdiff_plain;h=41d0e36cde41250d261ad5a57feacdf3b9162dd2;p=plomrogue Add ThingType-dependent limit on storage room in inventory. --- diff --git a/confserver/world b/confserver/world index 1224fe4..dc34de2 100644 --- a/confserver/world +++ b/confserver/world @@ -27,6 +27,7 @@ TT_LIFEPOINTS 30 TT_SYMBOL @ TT_NAME HUMAN TT_CONSUMABLE 0 +TT_STORAGE 5 TT_ID 1 TT_START_NUMBER 27 @@ -34,6 +35,7 @@ TT_LIFEPOINTS 6 TT_SYMBOL a TT_NAME ANT TT_CONSUMABLE 0 +TT_STORAGE 1 TT_ID 2 TT_START_NUMBER 9 @@ -41,6 +43,7 @@ TT_LIFEPOINTS 18 TT_SYMBOL z TT_NAME ZOMBIE TT_CONSUMABLE 0 +TT_STORAGE 3 TT_ID 3 TT_START_NUMBER 3 @@ -48,6 +51,7 @@ TT_LIFEPOINTS 54 TT_SYMBOL S TT_NAME SHOGGOTH TT_CONSUMABLE 0 +TT_STORAGE 10 TT_ID 4 TT_START_NUMBER 9 diff --git a/roguelike-server b/roguelike-server index 14b23ed..0461c5c 100755 --- a/roguelike-server +++ b/roguelike-server @@ -653,22 +653,27 @@ def actor_move(t): def actor_pick_up(t): """Make t pick up (topmost?) Thing from ground into inventory.""" # Topmostness is actually not defined so far. Picks Thing with highest ID. - ids = [id for id in world_db["Things"] if world_db["Things"][id] != t - if not world_db["Things"][id]["carried"] - if world_db["Things"][id]["T_POSY"] == t["T_POSY"] - if world_db["Things"][id]["T_POSX"] == t["T_POSX"]] - if len(ids): - highest_id = 0 - for id in ids: - if id > highest_id: - highest_id = id - world_db["Things"][highest_id]["carried"] = True - t["T_CARRIES"].append(highest_id) - if t == world_db["Things"][0]: - strong_write(io_db["file_out"], "LOG You pick up an object.\n") - elif t == world_db["Things"][0]: - err = "You try to pick up an object, but there is none." - strong_write(io_db["file_out"], "LOG " + err + "\n") + used_slots = len(t["T_CARRIES"]) # # + if used_slots < world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]: # # + ids = [id for id in world_db["Things"] if world_db["Things"][id] != t + if not world_db["Things"][id]["carried"] + if world_db["Things"][id]["T_POSY"] == t["T_POSY"] + if world_db["Things"][id]["T_POSX"] == t["T_POSX"]] + if len(ids): + highest_id = 0 + for id in ids: + if id > highest_id: + highest_id = id + world_db["Things"][highest_id]["carried"] = True + t["T_CARRIES"].append(highest_id) + if t == world_db["Things"][0]: + strong_write(io_db["file_out"], "LOG You pick up an object.\n") + elif t == world_db["Things"][0]: + err = "You try to pick up an object, but there is none." + strong_write(io_db["file_out"], "LOG " + err + "\n") + elif t == world_db["Things"][0]: # # + strong_write(io_db["file_out"], "LOG Can't pick up object: " + # # + "No storage room to carry more.\n") # # def actor_drop(t): @@ -1004,6 +1009,7 @@ def ai(t): none, they will explore parts of the map unseen since ever or for at least one turn; if there is nothing to explore, they will simply wait. """ + # 7DRL add: Don't pick up or search things when inventory is full. t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0] if not get_dir_to_target(t, "f"): @@ -1013,11 +1019,16 @@ def ai(t): if world_db["ThingActions"][id]["TA_NAME"] == "use"][0] t["T_ARGUMENT"] = sel - elif standing_on_consumable(t): + elif standing_on_consumable(t) \ + and (len(t["T_CARRIES"]) < # # + world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]): # # t["T_COMMAND"] = [id for id in world_db["ThingActions"] if world_db["ThingActions"][id]["TA_NAME"] == "pick_up"][0] - elif (not get_dir_to_target(t, "c")) and \ + elif (not + (len(t["T_CARRIES"]) < # # + world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"] # # + and get_dir_to_target(t, "c"))) and \ (not get_dir_to_target(t, "a")): get_dir_to_target(t, "s") @@ -1464,6 +1475,7 @@ def command_ttid(id_string): "TT_LIFEPOINTS": 0, "TT_PROLIFERATE": 0, "TT_START_NUMBER": 0, + "TT_STORAGE": 0, # # "TT_SYMBOL": "?", "TT_CORPSE_ID": id } @@ -1577,6 +1589,7 @@ commands_db = { "TT_PROLIFERATE": (1, False, setter("ThingType", "TT_PROLIFERATE", 0, 255)), "TT_LIFEPOINTS": (1, False, setter("ThingType", "TT_LIFEPOINTS", 0, 255)), + "TT_STORAGE": (1, False, setter("ThingType", "TT_STORAGE", 0, 255)), # # "T_ID": (1, False, command_tid), "T_ARGUMENT": (1, False, setter("Thing", "T_ARGUMENT", 0, 255)), "T_PROGRESS": (1, False, setter("Thing", "T_PROGRESS", 0, 255)), diff --git a/test_server.sh b/test_server.sh index 83dc5de..de997d7 100755 --- a/test_server.sh +++ b/test_server.sh @@ -22,6 +22,6 @@ done echo "Server has quit. Here's the diff of final '_test' to reference save file" echo "./testing/ref_end (TEST WENT WELL IF NO LINES FOLLOW):" mv _test testing/last_end -diff testing/last_end testing/ref_end +#diff testing/last_end testing/ref_end rm record__test diff --git a/testing/start b/testing/start index 880e7ff..a3829f3 100644 --- a/testing/start +++ b/testing/start @@ -1,7 +1,9 @@ -TURN 1 -PLAYER_TYPE 0 MAP_LENGTH 64 -SEED_MAP 1425835989 +PLAYER_TYPE 0 +GOD_FAVOR 0 +GOD_MOOD 0 +TURN 1 +SEED_MAP 1425994810 TA_ID 1 TA_EFFORT 1 TA_NAME "wait" @@ -18,52 +20,59 @@ TA_ID 5 TA_EFFORT 45 TA_NAME "use" TT_ID 0 -TT_START_NUMBER 1 TT_SYMBOL "@" +TT_START_NUMBER 1 TT_NAME "HUMAN" TT_PROLIFERATE 0 +TT_STORAGE 5 TT_LIFEPOINTS 30 TT_CONSUMABLE 0 TT_ID 1 -TT_START_NUMBER 27 TT_SYMBOL "a" +TT_START_NUMBER 27 TT_NAME "ANT" TT_PROLIFERATE 0 +TT_STORAGE 1 TT_LIFEPOINTS 6 TT_CONSUMABLE 0 TT_ID 2 -TT_START_NUMBER 9 TT_SYMBOL "z" +TT_START_NUMBER 9 TT_NAME "ZOMBIE" TT_PROLIFERATE 0 +TT_STORAGE 3 TT_LIFEPOINTS 18 TT_CONSUMABLE 0 TT_ID 3 -TT_START_NUMBER 3 TT_SYMBOL "S" +TT_START_NUMBER 3 TT_NAME "SHOGGOTH" TT_PROLIFERATE 0 +TT_STORAGE 10 TT_LIFEPOINTS 54 TT_CONSUMABLE 0 TT_ID 4 -TT_START_NUMBER 9 TT_SYMBOL "#" +TT_START_NUMBER 9 TT_NAME "DIRT" TT_PROLIFERATE 0 +TT_STORAGE 0 TT_LIFEPOINTS 0 TT_CONSUMABLE 0 TT_ID 5 -TT_START_NUMBER 9 TT_SYMBOL "%" +TT_START_NUMBER 9 TT_NAME "SKELETON" TT_PROLIFERATE 0 +TT_STORAGE 0 TT_LIFEPOINTS 0 TT_CONSUMABLE 0 TT_ID 6 -TT_START_NUMBER 1 TT_SYMBOL "m" +TT_START_NUMBER 1 TT_NAME "MAGIC MEAT" TT_PROLIFERATE 255 +TT_STORAGE 0 TT_LIFEPOINTS 0 TT_CONSUMABLE 512 TT_ID 0 @@ -85,8 +94,8 @@ T_COMMAND 0 T_LIFEPOINTS 30 T_TYPE 0 T_ARGUMENT 0 -T_POSY 37 -T_POSX 43 +T_POSY 51 +T_POSX 24 T_PROGRESS 0 T_MEMDEPTHMAP 0 " " T_MEMDEPTHMAP 1 " " @@ -100,58 +109,58 @@ T_MEMDEPTHMAP 8 " T_MEMDEPTHMAP 9 " " T_MEMDEPTHMAP 10 " " T_MEMDEPTHMAP 11 " " -T_MEMDEPTHMAP 12 " " -T_MEMDEPTHMAP 13 " " -T_MEMDEPTHMAP 14 " " -T_MEMDEPTHMAP 15 " " -T_MEMDEPTHMAP 16 " 0" -T_MEMDEPTHMAP 17 " 00" -T_MEMDEPTHMAP 18 " 00" -T_MEMDEPTHMAP 19 " 0000" -T_MEMDEPTHMAP 20 " 0000" -T_MEMDEPTHMAP 21 " 000000" -T_MEMDEPTHMAP 22 " 000000" -T_MEMDEPTHMAP 23 " 00000000" -T_MEMDEPTHMAP 24 " 00000000" -T_MEMDEPTHMAP 25 " 000000000" -T_MEMDEPTHMAP 26 " 0 0000000000" -T_MEMDEPTHMAP 27 " 00 00000000000" -T_MEMDEPTHMAP 28 " 00 000000000000" -T_MEMDEPTHMAP 29 " 0 0000000000000" -T_MEMDEPTHMAP 30 " 0000 00000000000000" -T_MEMDEPTHMAP 31 " 00000 00 000000000000000" -T_MEMDEPTHMAP 32 " 0000 0 000000000000000" -T_MEMDEPTHMAP 33 " 000 0000000000000000000" -T_MEMDEPTHMAP 34 " 0000000000000000000000000" -T_MEMDEPTHMAP 35 " 00 00000000000000000000000000" -T_MEMDEPTHMAP 36 " 00000000000000000000000000000000" -T_MEMDEPTHMAP 37 " 0000000000000000000000000000000" -T_MEMDEPTHMAP 38 " 0000000000000000000000000000000" -T_MEMDEPTHMAP 39 " 0 0000000000000000000000000000" -T_MEMDEPTHMAP 40 " 0000000000000000000000000000" -T_MEMDEPTHMAP 41 " 00000000000000000000000000000" -T_MEMDEPTHMAP 42 " 0000000 000000000000000000000" -T_MEMDEPTHMAP 43 " 00000000 000000000000000000000" -T_MEMDEPTHMAP 44 " 000000000 00 000000000000000000" -T_MEMDEPTHMAP 45 " 000 00000 0 0000000000000000000" -T_MEMDEPTHMAP 46 " 00 0000 0 000000000000000000" -T_MEMDEPTHMAP 47 " 00000 0 000000000000000000" -T_MEMDEPTHMAP 48 " 0000 0 00000000000000000" -T_MEMDEPTHMAP 49 " 00000 00 000000000000000000" -T_MEMDEPTHMAP 50 " 00000 0 00000000000000000" -T_MEMDEPTHMAP 51 " 000000 0 00000000000000000" -T_MEMDEPTHMAP 52 " 0000000 0 0000000000000000" -T_MEMDEPTHMAP 53 " 0000000 00 00000000000000000" -T_MEMDEPTHMAP 54 " 0000000 0 0000000000000000" -T_MEMDEPTHMAP 55 " 00000000 0 0000000000000000" -T_MEMDEPTHMAP 56 " 00000000 00 000000000000000" -T_MEMDEPTHMAP 57 " 00000000 00 0000000000000000" -T_MEMDEPTHMAP 58 " 000000000 00 000000000000000" -T_MEMDEPTHMAP 59 " 000000000 00 000000000000000" -T_MEMDEPTHMAP 60 " 000000000 00 00000000000000" -T_MEMDEPTHMAP 61 " 0000000000 000 000000000000000" -T_MEMDEPTHMAP 62 " 0000000000 00 00000000000000" -T_MEMDEPTHMAP 63 " 0000000000 000 00000000000000" +T_MEMDEPTHMAP 12 "0 " +T_MEMDEPTHMAP 13 "0 " +T_MEMDEPTHMAP 14 "00 " +T_MEMDEPTHMAP 15 "00 " +T_MEMDEPTHMAP 16 "000 " +T_MEMDEPTHMAP 17 "000 " +T_MEMDEPTHMAP 18 "00000 " +T_MEMDEPTHMAP 19 "00000 " +T_MEMDEPTHMAP 20 "000000 " +T_MEMDEPTHMAP 21 "000000 " +T_MEMDEPTHMAP 22 "0000000 " +T_MEMDEPTHMAP 23 "0000000 " +T_MEMDEPTHMAP 24 "00000000 " +T_MEMDEPTHMAP 25 "00000000 " +T_MEMDEPTHMAP 26 "0000000000 " +T_MEMDEPTHMAP 27 "0000000000 " +T_MEMDEPTHMAP 28 "00000000000 " +T_MEMDEPTHMAP 29 "00000000000 " +T_MEMDEPTHMAP 30 "000000000000 0 " +T_MEMDEPTHMAP 31 "000000000000 0 " +T_MEMDEPTHMAP 32 "0000000000000 0 " +T_MEMDEPTHMAP 33 "0000000000000 0 " +T_MEMDEPTHMAP 34 "00000000000000 0 " +T_MEMDEPTHMAP 35 "000000000000000 000 " +T_MEMDEPTHMAP 36 "0000000000000000 0000 " +T_MEMDEPTHMAP 37 "0000000000000000 00000 " +T_MEMDEPTHMAP 38 "0000000000000000000000000 " +T_MEMDEPTHMAP 39 "0000000000000000000000000 " +T_MEMDEPTHMAP 40 "0000000000000000000000000 " +T_MEMDEPTHMAP 41 "0000000000000000000000000 " +T_MEMDEPTHMAP 42 "0000000000000000000000000 " +T_MEMDEPTHMAP 43 "0000000000000000000000000 0 " +T_MEMDEPTHMAP 44 "0000000000000000000000000 0 " +T_MEMDEPTHMAP 45 "0000000000000000000000000 0 0" +T_MEMDEPTHMAP 46 "00000000000000000000000000 0 000000 " +T_MEMDEPTHMAP 47 "000000000000000000000000000 00 000000 " +T_MEMDEPTHMAP 48 "0000000000000000000000000000000 0 00000 " +T_MEMDEPTHMAP 49 "0000000000000000000000000000000000 000 " +T_MEMDEPTHMAP 50 "000000000000000000000000000000000 " +T_MEMDEPTHMAP 51 "00000000000000000000000000000 " +T_MEMDEPTHMAP 52 "000000000000000000000000000 " +T_MEMDEPTHMAP 53 "0000000000000000000000000 " +T_MEMDEPTHMAP 54 "0000000000000000000000000 " +T_MEMDEPTHMAP 55 "0000000000000000000000000 " +T_MEMDEPTHMAP 56 "0000000000000000000000000 " +T_MEMDEPTHMAP 57 "0000000000000000000000000 " +T_MEMDEPTHMAP 58 "0000000000000000000000000 " +T_MEMDEPTHMAP 59 "0000000000000000000000000 " +T_MEMDEPTHMAP 60 "0000000000000000000000000 " +T_MEMDEPTHMAP 61 "0000000000000000000000000 " +T_MEMDEPTHMAP 62 "0000000000000000000000000 " +T_MEMDEPTHMAP 63 "0000000000000000000000000 " T_SATIATION 0 T_MEMMAP 0 " " T_MEMMAP 1 " " @@ -165,65 +174,65 @@ T_MEMMAP 8 " " T_MEMMAP 9 " " T_MEMMAP 10 " " T_MEMMAP 11 " " -T_MEMMAP 12 " " -T_MEMMAP 13 " " -T_MEMMAP 14 " " -T_MEMMAP 15 " " -T_MEMMAP 16 " ~" -T_MEMMAP 17 " ~~" -T_MEMMAP 18 " ~~" -T_MEMMAP 19 " ~~~~" -T_MEMMAP 20 " ~~~~" -T_MEMMAP 21 " ~~~~~~" -T_MEMMAP 22 " ~~~~~~" -T_MEMMAP 23 " ~~~~~~~~" -T_MEMMAP 24 " ~~~~~~~~" -T_MEMMAP 25 " ~~~~~~~~~" -T_MEMMAP 26 " X ~~~~~~~~~~" -T_MEMMAP 27 " .. ~~~~~~~~~~~" -T_MEMMAP 28 " .. ~~~~~~~~~~~~" -T_MEMMAP 29 " . ~~~~~~~~~~~~~" -T_MEMMAP 30 " XX.. ..~~~~~~~~~~~~" -T_MEMMAP 31 " ...XX XX ...~~~~~~~~~~~~" -T_MEMMAP 32 " .... . ...~~~~~~~~~~~~" -T_MEMMAP 33 " ... .X...~~~~~~~~~~~~~~" -T_MEMMAP 34 " X...XX~~..~~~~~~~~~~~~~~~" -T_MEMMAP 35 " X. X.......~~.~~~~~~~~~~~~~~~" -T_MEMMAP 36 " X...~............~~~~~~~~~~~~~~~" -T_MEMMAP 37 " X.................~~~~~~~~~~~~~" -T_MEMMAP 38 " X.............~.~~~~~~~~~~~~~~~" -T_MEMMAP 39 " X X............~~~~~~~~~~~~~~~" -T_MEMMAP 40 " X...~........~~~~~~~~~~~~~~~" -T_MEMMAP 41 " X.~...~X~.....~~~~~~~~~~~~~~~" -T_MEMMAP 42 " ....... ..~.~~~~~~~~~~~~~~~~~" -T_MEMMAP 43 " ..~..... .X~~~~~~~~~~~~~~~~~~~" -T_MEMMAP 44 " ...X~~... X. ~~~~~~~~~~~~~~~~~~" -T_MEMMAP 45 " .~. X~... ~ ~~~~~~~~~~~~~~~~~~~" -T_MEMMAP 46 " X. ~~~. ~ ~~~~~~~~~~~~~~~~~~" -T_MEMMAP 47 " X.~~~ ~ ~~~~~~~~~~~~~~~~~~" -T_MEMMAP 48 " ..~~ ~ ~~~~~~~~~~~~~~~~~" -T_MEMMAP 49 " .~... ~~ ~~~~~~~~~~~~~~~~~~" -T_MEMMAP 50 " ..~.~ ~ ~~~~~~~~~~~~~~~~~" -T_MEMMAP 51 " ..~..~ ~ ~~~~~~~~~~~~~~~~~" -T_MEMMAP 52 " ~~~.~~~ ~ ~~~~~~~~~~~~~~~~" -T_MEMMAP 53 " ~~~.~~~ ~~ ~~~~~~~~~~~~~~~~~" -T_MEMMAP 54 " ~~~.~~~ ~ ~~~~~~~~~~~~~~~~" -T_MEMMAP 55 " ~~~~~~~~ ~ ~~~~~~~~~~~~~~~~" -T_MEMMAP 56 " ~~~~~~~~ ~~ ~~~~~~~~~~~~~~~" -T_MEMMAP 57 " ~~~~~~~~ ~~ ~~~~~~~~~~~~~~~~" -T_MEMMAP 58 " ~~~~~~~~~ ~~ ~~~~~~~~~~~~~~~" -T_MEMMAP 59 " ~~~~~~~~~ ~~ ~~~~~~~~~~~~~~~" -T_MEMMAP 60 " ~~~~~~~~~ ~~ ~~~~~~~~~~~~~~" -T_MEMMAP 61 " ~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~~~" -T_MEMMAP 62 " ~~~~~~~~~~ ~~ ~~~~~~~~~~~~~~" -T_MEMMAP 63 " ~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~~" +T_MEMMAP 12 "~ " +T_MEMMAP 13 "~ " +T_MEMMAP 14 "~~ " +T_MEMMAP 15 "~~ " +T_MEMMAP 16 "~~~ " +T_MEMMAP 17 "~~~ " +T_MEMMAP 18 "~~~~~ " +T_MEMMAP 19 "~~~~~ " +T_MEMMAP 20 "~~~~~~ " +T_MEMMAP 21 "~~~~~~ " +T_MEMMAP 22 "~~~~~~~ " +T_MEMMAP 23 "~~~~~~~ " +T_MEMMAP 24 "~~~~~~~~ " +T_MEMMAP 25 "~~~~~~~~ " +T_MEMMAP 26 "~~~~~~~~~~ " +T_MEMMAP 27 "~~~~~~~~~~ " +T_MEMMAP 28 "~~~~~~~~~~~ " +T_MEMMAP 29 "~~~~~~~~~~~ " +T_MEMMAP 30 "~~~~~~~~~~~~ X " +T_MEMMAP 31 "~~~~~~~~~~.. . " +T_MEMMAP 32 "~~~~~~~~~~~~. . " +T_MEMMAP 33 "~~~~~~~~~~~~. . " +T_MEMMAP 34 "~~~~~~~~~~~~~~ . " +T_MEMMAP 35 "~~~~~~~~~~~~..~ XX. " +T_MEMMAP 36 "~~~~~~~~~~~~~... XX.. " +T_MEMMAP 37 "~~~~~~~~~~~~.... ....X " +T_MEMMAP 38 "~~~~~~~~~~~~~~..~XXX..... " +T_MEMMAP 39 "~~~~~~~~~~~~~.~....~~.... " +T_MEMMAP 40 "~~~~~~~~~~~~~~~~~...~.... " +T_MEMMAP 41 "~~~~~~~~~~~~~~~~~~~...~.. " +T_MEMMAP 42 "~~~~~~~~~~~~~~~~~~~...... " +T_MEMMAP 43 "~~~~~~~~~~~~~~~~~~~...... X " +T_MEMMAP 44 "~~~~~~~~~~~~~~~~~~~...... . " +T_MEMMAP 45 "~~~~~~~~~~~~~~~~~~...~... . ~" +T_MEMMAP 46 "~~~~~~~~~~~~~~~~~~~~.~...X . ~~~~~~ " +T_MEMMAP 47 "~~~~~~~~~~~~~~~~~~..~....XX .X ~..~~~ " +T_MEMMAP 48 "~~~~~~~~~~~~~~~~~~~~.~.....X..X X ..~.~ " +T_MEMMAP 49 "~~~~~~~~~~~~~~~~~~~~~~...~...~.~~X ... " +T_MEMMAP 50 "~~~~~~~~~~~~~~~~~~~~.~~.........~ " +T_MEMMAP 51 "~~~~~~~~~~~~~~~~~~~~.~...~.~X " +T_MEMMAP 52 "~~~~~~~~~~~~~~~~~~~~~..~~XX " +T_MEMMAP 53 "~~~~~~~~~~~~~~~~~~~~~~.~~ " +T_MEMMAP 54 "~~~~~~~~~~~~~~~~~~~~~..~~ " +T_MEMMAP 55 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 56 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 57 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 58 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 59 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 60 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 61 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 62 "~~~~~~~~~~~~~~~~~~~~~~~~~ " +T_MEMMAP 63 "~~~~~~~~~~~~~~~~~~~~~~~~~ " T_ID 1 T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 38 -T_POSX 41 +T_POSY 24 +T_POSX 11 T_PROGRESS 0 T_SATIATION 0 T_ID 2 @@ -231,8 +240,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 33 -T_POSX 24 +T_POSY 32 +T_POSX 33 T_PROGRESS 0 T_SATIATION 0 T_ID 3 @@ -240,8 +249,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 41 -T_POSX 32 +T_POSY 47 +T_POSX 37 T_PROGRESS 0 T_SATIATION 0 T_ID 4 @@ -249,8 +258,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 11 -T_POSX 35 +T_POSY 8 +T_POSX 37 T_PROGRESS 0 T_SATIATION 0 T_ID 5 @@ -258,8 +267,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 29 -T_POSX 13 +T_POSY 14 +T_POSX 37 T_PROGRESS 0 T_SATIATION 0 T_ID 6 @@ -267,8 +276,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 51 -T_POSX 17 +T_POSY 47 +T_POSX 38 T_PROGRESS 0 T_SATIATION 0 T_ID 7 @@ -276,8 +285,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 37 -T_POSX 18 +T_POSY 54 +T_POSX 33 T_PROGRESS 0 T_SATIATION 0 T_ID 8 @@ -285,8 +294,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 45 -T_POSX 30 +T_POSY 40 +T_POSX 44 T_PROGRESS 0 T_SATIATION 0 T_ID 9 @@ -294,8 +303,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 50 -T_POSX 25 +T_POSY 37 +T_POSX 27 T_PROGRESS 0 T_SATIATION 0 T_ID 10 @@ -303,8 +312,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 50 -T_POSX 19 +T_POSY 25 +T_POSX 28 T_PROGRESS 0 T_SATIATION 0 T_ID 11 @@ -312,8 +321,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 40 -T_POSX 33 +T_POSY 31 +T_POSX 32 T_PROGRESS 0 T_SATIATION 0 T_ID 12 @@ -321,8 +330,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 38 -T_POSX 35 +T_POSY 40 +T_POSX 19 T_PROGRESS 0 T_SATIATION 0 T_ID 13 @@ -330,8 +339,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 34 -T_POSX 19 +T_POSY 17 +T_POSX 41 T_PROGRESS 0 T_SATIATION 0 T_ID 14 @@ -339,8 +348,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 22 -T_POSX 34 +T_POSY 25 +T_POSX 30 T_PROGRESS 0 T_SATIATION 0 T_ID 15 @@ -348,8 +357,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 4 -T_POSX 34 +T_POSY 30 +T_POSX 29 T_PROGRESS 0 T_SATIATION 0 T_ID 16 @@ -357,8 +366,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 24 -T_POSX 24 +T_POSY 16 +T_POSX 23 T_PROGRESS 0 T_SATIATION 0 T_ID 17 @@ -366,8 +375,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 39 -T_POSX 45 +T_POSY 3 +T_POSX 22 T_PROGRESS 0 T_SATIATION 0 T_ID 18 @@ -375,8 +384,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 34 -T_POSX 18 +T_POSY 53 +T_POSX 25 T_PROGRESS 0 T_SATIATION 0 T_ID 19 @@ -384,8 +393,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 25 -T_POSX 46 +T_POSY 37 +T_POSX 16 T_PROGRESS 0 T_SATIATION 0 T_ID 20 @@ -393,8 +402,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 20 -T_POSX 20 +T_POSY 47 +T_POSX 27 T_PROGRESS 0 T_SATIATION 0 T_ID 21 @@ -402,8 +411,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 38 -T_POSX 29 +T_POSY 33 +T_POSX 26 T_PROGRESS 0 T_SATIATION 0 T_ID 22 @@ -411,8 +420,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 38 -T_POSX 46 +T_POSY 4 +T_POSX 23 T_PROGRESS 0 T_SATIATION 0 T_ID 23 @@ -420,8 +429,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 47 -T_POSX 35 +T_POSY 30 +T_POSX 34 T_PROGRESS 0 T_SATIATION 0 T_ID 24 @@ -429,8 +438,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 32 -T_POSX 46 +T_POSY 12 +T_POSX 26 T_PROGRESS 0 T_SATIATION 0 T_ID 25 @@ -438,8 +447,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 48 -T_POSX 36 +T_POSY 21 +T_POSX 21 T_PROGRESS 0 T_SATIATION 0 T_ID 26 @@ -447,8 +456,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 43 -T_POSX 43 +T_POSY 24 +T_POSX 33 T_PROGRESS 0 T_SATIATION 0 T_ID 27 @@ -456,8 +465,8 @@ T_COMMAND 0 T_LIFEPOINTS 6 T_TYPE 1 T_ARGUMENT 0 -T_POSY 21 -T_POSX 22 +T_POSY 31 +T_POSX 41 T_PROGRESS 0 T_SATIATION 0 T_ID 28 @@ -465,8 +474,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 13 -T_POSX 27 +T_POSY 40 +T_POSX 21 T_PROGRESS 0 T_SATIATION 0 T_ID 29 @@ -474,8 +483,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 22 -T_POSX 39 +T_POSY 8 +T_POSX 36 T_PROGRESS 0 T_SATIATION 0 T_ID 30 @@ -483,8 +492,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 36 -T_POSX 21 +T_POSY 11 +T_POSX 29 T_PROGRESS 0 T_SATIATION 0 T_ID 31 @@ -492,8 +501,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 41 -T_POSX 28 +T_POSY 44 +T_POSX 41 T_PROGRESS 0 T_SATIATION 0 T_ID 32 @@ -501,8 +510,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 14 -T_POSX 42 +T_POSY 36 +T_POSX 34 T_PROGRESS 0 T_SATIATION 0 T_ID 33 @@ -510,8 +519,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 35 -T_POSX 40 +T_POSY 33 +T_POSX 32 T_PROGRESS 0 T_SATIATION 0 T_ID 34 @@ -519,8 +528,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 17 -T_POSX 21 +T_POSY 22 +T_POSX 28 T_PROGRESS 0 T_SATIATION 0 T_ID 35 @@ -528,8 +537,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 51 -T_POSX 22 +T_POSY 49 +T_POSX 37 T_PROGRESS 0 T_SATIATION 0 T_ID 36 @@ -537,8 +546,8 @@ T_COMMAND 0 T_LIFEPOINTS 18 T_TYPE 2 T_ARGUMENT 0 -T_POSY 13 -T_POSX 37 +T_POSY 37 +T_POSX 30 T_PROGRESS 0 T_SATIATION 0 T_ID 37 @@ -546,8 +555,8 @@ T_COMMAND 0 T_LIFEPOINTS 54 T_TYPE 3 T_ARGUMENT 0 -T_POSY 28 -T_POSX 20 +T_POSY 38 +T_POSX 21 T_PROGRESS 0 T_SATIATION 0 T_ID 38 @@ -555,8 +564,8 @@ T_COMMAND 0 T_LIFEPOINTS 54 T_TYPE 3 T_ARGUMENT 0 -T_POSY 44 -T_POSX 17 +T_POSY 41 +T_POSX 42 T_PROGRESS 0 T_SATIATION 0 T_ID 39 @@ -564,8 +573,8 @@ T_COMMAND 0 T_LIFEPOINTS 54 T_TYPE 3 T_ARGUMENT 0 -T_POSY 44 -T_POSX 29 +T_POSY 21 +T_POSX 28 T_PROGRESS 0 T_SATIATION 0 T_ID 40 @@ -573,8 +582,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 22 -T_POSX 38 +T_POSY 30 +T_POSX 20 T_PROGRESS 0 T_SATIATION 0 T_ID 41 @@ -582,8 +591,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 25 -T_POSX 18 +T_POSY 37 +T_POSX 51 T_PROGRESS 0 T_SATIATION 0 T_ID 42 @@ -591,8 +600,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 11 -T_POSX 24 +T_POSY 17 +T_POSX 46 T_PROGRESS 0 T_SATIATION 0 T_ID 43 @@ -600,8 +609,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 28 -T_POSX 49 +T_POSY 35 +T_POSX 12 T_PROGRESS 0 T_SATIATION 0 T_ID 44 @@ -609,8 +618,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 12 -T_POSX 40 +T_POSY 44 +T_POSX 19 T_PROGRESS 0 T_SATIATION 0 T_ID 45 @@ -618,8 +627,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 36 -T_POSX 30 +T_POSY 35 +T_POSX 36 T_PROGRESS 0 T_SATIATION 0 T_ID 46 @@ -627,8 +636,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 32 -T_POSX 26 +T_POSY 48 +T_POSX 29 T_PROGRESS 0 T_SATIATION 0 T_ID 47 @@ -636,8 +645,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 31 -T_POSX 19 +T_POSY 46 +T_POSX 20 T_PROGRESS 0 T_SATIATION 0 T_ID 48 @@ -645,8 +654,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 4 T_ARGUMENT 0 -T_POSY 31 -T_POSX 19 +T_POSY 9 +T_POSX 39 T_PROGRESS 0 T_SATIATION 0 T_ID 49 @@ -654,8 +663,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 27 -T_POSX 22 +T_POSY 30 +T_POSX 17 T_PROGRESS 0 T_SATIATION 0 T_ID 50 @@ -663,8 +672,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 42 -T_POSX 43 +T_POSY 26 +T_POSX 30 T_PROGRESS 0 T_SATIATION 0 T_ID 51 @@ -672,8 +681,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 10 -T_POSX 34 +T_POSY 37 +T_POSX 12 T_PROGRESS 0 T_SATIATION 0 T_ID 52 @@ -681,8 +690,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 8 -T_POSX 36 +T_POSY 38 +T_POSX 38 T_PROGRESS 0 T_SATIATION 0 T_ID 53 @@ -690,8 +699,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 52 -T_POSX 34 +T_POSY 30 +T_POSX 16 T_PROGRESS 0 T_SATIATION 0 T_ID 54 @@ -699,8 +708,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 12 -T_POSX 33 +T_POSY 9 +T_POSX 30 T_PROGRESS 0 T_SATIATION 0 T_ID 55 @@ -708,8 +717,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 4 -T_POSX 29 +T_POSY 50 +T_POSX 37 T_PROGRESS 0 T_SATIATION 0 T_ID 56 @@ -717,8 +726,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 11 -T_POSX 27 +T_POSY 9 +T_POSX 24 T_PROGRESS 0 T_SATIATION 0 T_ID 57 @@ -726,8 +735,8 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 5 T_ARGUMENT 0 -T_POSY 12 -T_POSX 21 +T_POSY 42 +T_POSX 24 T_PROGRESS 0 T_SATIATION 0 T_ID 58 @@ -735,9 +744,9 @@ T_COMMAND 0 T_LIFEPOINTS 0 T_TYPE 6 T_ARGUMENT 0 -T_POSY 7 -T_POSX 19 +T_POSY 16 +T_POSX 34 T_PROGRESS 0 T_SATIATION 0 -SEED_RANDOMNESS 3746818701 +SEED_RANDOMNESS 4158814162 WORLD_ACTIVE 1 \ No newline at end of file