diff options
| -rw-r--r-- | hercules/code/server/tmw/npcs.py | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/hercules/code/server/tmw/npcs.py b/hercules/code/server/tmw/npcs.py index 9916878..e1e9544 100644 --- a/hercules/code/server/tmw/npcs.py +++ b/hercules/code/server/tmw/npcs.py @@ -104,6 +104,10 @@ def convertTextLine(tracker): if len(line) >= 2 and line[0:2] == "//": return False + if line == "};\n": + tracker.w.write("}\n"); + return False + idx = line.find("|script|") if idx <= 0: idx = line.find("\tscript\t") @@ -364,6 +368,12 @@ def processStrReplace(tracker): ("isdead()", "ispcdead()"), ("changeSex", "changecharsex()"), ("getpartnerid2()", "getpartnerid()"), + ("getpartnerid2(0)", "getpartnerid()"), + ("getgmlevel(0)", "getgmlevel()"), + ("if @beer_count > 4", "if (@beer_count > 4)"), + ("if !(@Q_status)", "if (!(@Q_status))"), + ("if isin(\"021-1\", 130, 120, 140, 125) ", "if (isin(\"021-1\", 130, 120, 140, 125)) "), + ("if divorce(0) goto L_", "if (divorce()) goto L_"), ("getmap()", "getmapname()"), ("L_end", "L_End"), @@ -377,6 +387,7 @@ def processStrReplace(tracker): ("L_next", "L_Next"), ("L_close", "L_Close"), ("@NpcName$", "@npcname$"), + ("@npcName$", "@npcname$"), ("@cost", "@Cost"), ("@TEMP", "@temp"), ("L_Menuitems", "L_MenuItems"), @@ -411,6 +422,7 @@ def processStrReplace(tracker): ("L_Teach_initial", "L_Teach_Initial"), ("L_finish", "L_Finish"), ("L_No_ash", "L_No_Ash"), + ("L_no_ash", "L_No_Ash"), ("L_No_water", "L_No_Water"), ("L_cave", "L_Cave"), ("L_farewell", "L_Farewell"), @@ -456,7 +468,77 @@ def processStrReplace(tracker): ("L_kill", "L_Kill"), ("L_nothing", "L_Nothing"), ("L_lowlevel", "L_LowLevel"), + ("L_MENU", "L_Menu"), + ("L_potion", "L_Potion"), + ("L_fertig", "L_Fertig"), + ("L_exit", "L_Exit"), + ("L_fight", "L_Fight"), + ("L_start", "L_Start"), + ("L_unvollst", "L_Unvollst"), + ("L_no_room_for_rings", "L_No_Room_For_Rings"), ("@mask", "@Mask"), + ("@MAP$", "@map$"), + ("baselevel", "BaseLevel"), + ("L_Lifestones_Trade_Missing", "L_Lifestones_TM"), + ("L_Caretaker_first_reward", "L_Caretaker_fr"), + ("L_NohMask_TravelingTroupe", "L_NohMask_TravT"), + ("L_listen_to_a_story_first", "L_listen_to_sf"), + ("L_post_ironpowder_option", "L_post_ip_op"), + ("L_Sulphur_teach_spell_no", "L_Sulphur_tspell"), + ("L_Lifestones_MakeSelf_yes", "L_Lifestones_MSy"), + ("L_Lifestones_MakeSelf_no", "L_Lifestones_MSn"), + ("L_Caretaker_later_rewards", "L_Caretaker_lr"), + ("L_boneknife_quest_completed", "L_boneknife_qc"), + ("L_boneknife_quest_tooweak", "L_boneknife_qtw"), + ("L_tanktop_insufficient_cloth", "L_tanktop_ic"), + ("L_dark_green_q_toolittle", "L_dark_greenqtit"), + ("L_about_schools_minimenu", "L_about_sch_mm"), + ("L_insufficient_BaseLevel", "L_insuf_BL"), + ("L_Teach_Initial_nonature", "L_Teach_Ininn"), + ("L_Teach_CheckAdvanceTo2_fail", "L_Teach_CATo2f"), + ("L_Levelup2_must_practice", "L_Levelup2_mpr"), + ("L_Airlia_intro_mana_loss", "L_Airlia_iml"), + ("L_knife_quest_completecheck", "L_knife_q_cc"), + ("L_Magic_purify_explained", "L_Magic_pur_exp"), + ("L_tanktop_insufficient_Zeny", "L_tanktop_ins_Z"), + ("L_monster_oil_knows_recipe", "L_monsteroil_kn_r"), + ("L_Teach_CheckAdvanceToLOH", "L_TeachChATLOH"), + ("L_knife_quest_missing_stingers", "L_knife_qm_sti"), + ("L_Magic_train_tree_backgd", "L_Mag_tr_tr_ba"), + ("SUB_pick_one_of_many_items", "SUB_pick_1_m_it"), + ("L_about_other_prerequisites", "L_a_o_prereq"), + ("L_monster_oil_why_dangerous", "L_monstero_w_dang"), + ("L_Teach_LOH_advance_abort0", "L_Teach_LOH_a_a0"), + ("L_Teach_LOH_advance_abort1", "L_Teach_LOH_a_a1"), + ("L_knife_quest_missing_mushrooms", "L_knife_q_m_mushr"), + ("L_Magic_train_sagatha_fail", "L_Magic_tsag_f"), + ("L_Q_manaseed_touched_short", "L_Q_manas_tou_sh"), + ("L_monster_oil_ingredients", "L_monsoil_ingr"), + ("L_snakeskins_completecheck", "L_snakes_comc"), + ("L_Magic_train_sagatha_lvl1", "L_Mag_tr_sag_lvl1"), + ("L_make_mana_potion_missing", "L_make_m_p_mis"), + ("L_monster_oil_where_gold", "L_monoil_wg"), + ("L_golden_scorpion_wrestle_intro", "L_gold_scor_wr_i"), + ("L_component_quest_missing", "L_comp_q_mis"), + ("L_monster_oil_start_brew", "L_monsto_st_br"), + ("L_golden_requires_knife_quest_done", "L_gold_req_kn_q_d"), + ("LL_student_4_wrong_potion", "L_stud_4_wrong_p"), + ("L_monster_oil_missing_gold", "L_monsto_mis_g"), + ("L_golden_requires_knife_quest", "L_gold_req_kn_q"), + ("LL_Magic_skill_insufficient", "L_Mag_sk_insuf"), + ("L_monster_oil_out_of_leaves", "L_monso_oo_lea"), + ("L_too_lowlevel_for_stinger", "L_too_lol_f_sti"), + ("L_monster_oil_leaf_color", "L_monso_le_co"), + ("L_golden_scorpion_over_ask", "L_gold_scor_ov_a"), + ("S_monster_oil_random_move", "L_monso_rand_mo"), + ("L_golden_scorpion_ask_again", "L_gold_scor_as_ag"), + ("L_monster_oil_random_0_lighten", "L_monso_rand_0_li"), + ("L_golden_scorpion_wrestle_again", "L_gold_scorp_wre_ag"), + ("L_monster_oil_explode_dodge", "L_monso_expl_dod"), + ("L_golden_scorpion_wrestle", "L_gold_scorp_wre"), + ("L_monster_oil_no_gold_end", "L_monso_no_go_e"), + ("L_mopox_cure_", "L_moc_"), + ("L_mopox_failed_", "L_mof_"), # fix at same time usage with same name function and variable ("\"DailyQuestPoints\"", "\"DailyQuestPointsFunc\""), ]; |