diff --git a/gamemodes/new.pwn b/gamemodes/new.pwn index f7e04b8..7eceea3 100644 --- a/gamemodes/new.pwn +++ b/gamemodes/new.pwn @@ -17,7 +17,7 @@ //////////////////////////////////////////////////////////////////////////////// -const Float:CURRENT_PAEDITOR_VERSION = 1.39; +const Float:CURRENT_PAEDITOR_VERSION = 1.49; static http_address_available_version[] = "https://pastebin.com/raw/xebukdmH"; diff --git a/resources/colors.json b/resources/colors.json index a6cb2c8..6f792dc 100644 --- a/resources/colors.json +++ b/resources/colors.json @@ -29,6 +29,9 @@ }, { "hex": "7bc233" + }, + { + "hex": "4788cc" } ] } diff --git a/resources/objects.json b/resources/objects.json index 3d4c0d7..91ef1d8 100644 --- a/resources/objects.json +++ b/resources/objects.json @@ -59,6 +59,9 @@ }, { "modelid": 352 + }, + { + "modelid": 3056 } ] } diff --git a/scriptfiles/project/import/.list.json b/scriptfiles/project/import/.list.json index 6e2f0d7..4cbfd3e 100644 --- a/scriptfiles/project/import/.list.json +++ b/scriptfiles/project/import/.list.json @@ -1,7 +1,3 @@ { - "list": [ - { - "name": "asd" - } - ] + "list": [] } diff --git a/scriptfiles/project/import/asd.json b/scriptfiles/project/import/asd.json deleted file mode 100644 index 6ccdbfc..0000000 --- a/scriptfiles/project/import/asd.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "skinid": 60, - "animation": -1, - "attach": [ - { - "slotid": 0, - "boneid": 1, - "objectid": 339, - "fOffsetX": 0.0, - "fOffsetY": 0.0, - "fOffsetZ": 0.0, - "fRotX": 0.0, - "fRotY": 0.0, - "fRotZ": 0.0, - "fScaleX": 1.0, - "fScaleY": 1.0, - "fScaleZ": 1.0, - "materialcolor1": 0, - "materialcolor2": 0, - "note": "-" - } - ] -} diff --git a/source/attach_menu/colors.inc b/source/attach_menu/colors.inc index 9e4f937..d7be2b3 100644 --- a/source/attach_menu/colors.inc +++ b/source/attach_menu/colors.inc @@ -93,6 +93,11 @@ public OnVirtualKeyReleased(playerid, key_vk) language_MessageError(playerid, "MSG_START_SELECT_OBJ_PRESS_OBJ"); return 0; } + if (attachmain_IsUseMultiObject(playerid)) + { + language_MessageError(playerid, "MSG_NO_AVAILABLE_MULTIPLE_OBJ"); + return 0; + } gAttachColorsSelectColorId[playerid] = 0; gAttachColorsPage[playerid] = 0; gAttachObjectOpenRmouse[playerid] = true; @@ -112,6 +117,11 @@ public OnVirtualKeyReleased(playerid, key_vk) language_MessageError(playerid, "MSG_START_SELECT_OBJ_PRESS_OBJ"); return 0; } + if (attachmain_IsUseMultiObject(playerid)) + { + language_MessageError(playerid, "MSG_NO_AVAILABLE_MULTIPLE_OBJ"); + return 0; + } gAttachColorsSelectColorId[playerid] = 1; gAttachColorsPage[playerid] = 0; gAttachObjectOpenRmouse[playerid] = true; diff --git a/source/gui/attach_menu.inc b/source/gui/attach_menu.inc index e470db9..1c1d3d2 100644 --- a/source/gui/attach_menu.inc +++ b/source/gui/attach_menu.inc @@ -513,7 +513,7 @@ public OnGameModeInit() TextDrawSetProportional(gui_AttachMenu[49], 1); TextDrawSetShadow(gui_AttachMenu[49], 0); - gui_AttachMenu[50] = TextDrawCreate(370.2025, 418.0335, "<__>"); + gui_AttachMenu[50] = TextDrawCreate(369.0, 418.0335, "<_>"); TextDrawLetterSize(gui_AttachMenu[50], 0.2806, 1.7632); TextDrawAlignment(gui_AttachMenu[50], 1); TextDrawColor(gui_AttachMenu[50], 950371583); @@ -665,7 +665,7 @@ public OnGameModeInit() TextDrawSetProportional(gui_AttachMenu[65], 1); TextDrawSetShadow(gui_AttachMenu[65], 0); - gui_AttachMenu[66] = TextDrawCreate(604.3046, 437.2296, "Next_skin"); + gui_AttachMenu[66] = TextDrawCreate(603.0, 437.2296, "Next_skin"); TextDrawLetterSize(gui_AttachMenu[66], 0.1668, 0.8201); TextDrawTextSize(gui_AttachMenu[66], 32.0000, 0.0000); TextDrawAlignment(gui_AttachMenu[66], 1); @@ -694,7 +694,7 @@ public OnGameModeInit() TextDrawSetProportional(gui_AttachMenu[68], 0); TextDrawSetShadow(gui_AttachMenu[68], 0); - gui_AttachMenu[69] = TextDrawCreate(450.0999, 420.8927, "<____>"); + gui_AttachMenu[69] = TextDrawCreate(449.5, 420.8927, "<__>"); TextDrawLetterSize(gui_AttachMenu[69], 0.3123, 1.2764); TextDrawAlignment(gui_AttachMenu[69], 1); TextDrawColor(gui_AttachMenu[69], -1061109505); diff --git a/source/gui/attach_objects_list.inc b/source/gui/attach_objects_list.inc index 2af3a5d..d6a9c62 100644 --- a/source/gui/attach_objects_list.inc +++ b/source/gui/attach_objects_list.inc @@ -104,7 +104,7 @@ public OnPlayerClickPlayerTextDraw(playerid, PlayerText:playertextid) } const INDEX_TD_ID = 0, - INDEX_TYPE_ID = 0; + INDEX_TYPE_ID = 1; static const index[][] = { diff --git a/source/project/main.inc b/source/project/main.inc index 8533f54..aa3549b 100644 --- a/source/project/main.inc +++ b/source/project/main.inc @@ -135,6 +135,7 @@ DialogResponse:dProjectMainMenu(playerid, response, listitem, inputtext[]) Dialog_Show(playerid, "dProjectMainMenu"); return 0; } + attachmain_ClearMultiObjSlots(playerid); gui_atatch_menu_HideMenu(playerid); gui_camera_rot_HideInfo(playerid); attachmain_ClearArray(playerid);