diff --git a/Data/CommonEvents.rvdata2 b/Data/CommonEvents.rvdata2 index 5aace78..bcdd3a1 100644 Binary files a/Data/CommonEvents.rvdata2 and b/Data/CommonEvents.rvdata2 differ diff --git a/Data/Map049.rvdata2 b/Data/Map049.rvdata2 index 84b2a5c..917ee3f 100644 Binary files a/Data/Map049.rvdata2 and b/Data/Map049.rvdata2 differ diff --git a/Data/Map101.rvdata2 b/Data/Map101.rvdata2 index f4b9082..b59a51d 100644 Binary files a/Data/Map101.rvdata2 and b/Data/Map101.rvdata2 differ diff --git a/Data/Scripts.rvdata2 b/Data/Scripts.rvdata2 index f01362f..45df759 100644 Binary files a/Data/Scripts.rvdata2 and b/Data/Scripts.rvdata2 differ diff --git a/Scripts/Window_Base.rb b/Scripts/Window_Base.rb index c360aa2..a0ae562 100644 --- a/Scripts/Window_Base.rb +++ b/Scripts/Window_Base.rb @@ -224,7 +224,7 @@ class Window_Base < Window #-------------------------------------------------------------------------- def reset_font_settings change_color(normal_color) - contents.font.size = Font.default_size + contents.font.size = Font.default_size - 1 contents.font.bold = false contents.font.italic = false end diff --git a/YAML/CommonEvents.yaml b/YAML/CommonEvents.yaml index 0c20975..07a8b6e 100644 --- a/YAML/CommonEvents.yaml +++ b/YAML/CommonEvents.yaml @@ -212966,7 +212966,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Mashiro】']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['Actions? Like attacks... or manipulation?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['せんせいふつう', !!int '7', !!int '0', !!int '0']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Infe-Sensei】']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Masaki-Sensei】']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['Yes, attacks. Specifically?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['制服ふつうデフォ', !!int '2', !!int '0', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Mashiro】']} diff --git a/YAML/Map049.yaml b/YAML/Map049.yaml index 48094a1..31f9588 100644 --- a/YAML/Map049.yaml +++ b/YAML/Map049.yaml @@ -3366,7 +3366,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '20', 'サキュマ先生4', !!int '0', !!int '1', !!int '139', !!int '140', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '21', 'サキュマめながし', !!int '0', !!int '1', !!int '139', !!int '140', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['せんせいふつう', !!int '7', !!int '0', !!int '0']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Infe-Sensei】']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Masaki-Sensei】']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['That''s right, attacks. Specifically?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['制服ふつうデフォ', !!int '2', !!int '0', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Mashiro】']} diff --git a/YAML/Map101.yaml b/YAML/Map101.yaml index 8f55a02..ce1e502 100644 --- a/YAML/Map101.yaml +++ b/YAML/Map101.yaml @@ -423,7 +423,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Masaki-Sensei】']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['Everyone, listen while drawing her. Koga-san is\nquite innocent and, due to family circumstances,\nlacks proper sexual knowledge.']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['せんせいこまり', !!int '7', !!int '0', !!int '0']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Infe-Sensei】']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Masaki-Sensei】']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['What happens when such a lovely adolescent girl\nlearns incorrect masturbation techniques?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '83', 'ましろてれ2', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '84', 'ましろあせ', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} @@ -598,7 +598,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['Huh? What was I just...!? Eh, what is this\nbreathtaking view?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['せんせいキリ', !!int '7', !!int '0', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Sakyuma】']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['『Compulsory Instruction Hypnosis』. Go back to your\ndreamy state, okay?']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['『Compulsory Instruction Hypnosis』. Go back\nto your dreamy state, okay?']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '250', 'p': [!ruby/object:RPG::SE {'name': '魔王魂 効果音 システム10', 'pitch': !!int '100', 'volume': !!int '80'}]} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '213', 'p': [!!int '27', !!int '9', !!bool 'false']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['キョーコふつうほそめ2', !!int '0', !!int '0', !!int '0']} @@ -779,7 +779,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '82', '股抑え2くちぎり', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['', !!int '6', !!int '1', !!int '2']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Mashiro】']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['(Ugh... I can''t move my body from this position,\nthinking that they might see parts they\nshouldn''t... P-Please... let this class end\nsoon...!)']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['(Ugh... I can''t move my body from this position,\nthinking that they might see parts they shouldn''t...\nP-Please... let this class end soon...!)']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '221', 'p': []} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '80', '股抑え2め2', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '81', '股抑え2まゆこま', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} @@ -797,7 +797,7 @@ - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '231', 'p': [!!int '82', '股抑え2くちひらき', !!int '0', !!int '1', !!int '39', !!int '40', !!int '100', !!int '100', !!int '255', !!int '0']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '101', 'p': ['', !!int '6', !!int '1', !!int '2']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['【Mashiro】']} - - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['(M-My heartbeat is so loud... Just being aware\nthat they''re watching me... makes all the fine\nhairs on my body stand up, and I feel shivers all\nover...!)']} + - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '401', 'p': ['(M-My heartbeat is so loud... Just being aware that\nthey''re watching me... makes all the fine hairs on\nmy body stand up, and I feel shivers all over...!)']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '355', 'p': ['if Input.press?(:CTRL)']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '655', 'p': ['wait(6)']} - !ruby/object:RPG::EventCommand {'i': !!int '0', 'c': !!int '655', 'p': ['else']}