Skip to content

Commit

Permalink
Release candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
DMD authored and DMD committed Aug 19, 2016
1 parent c8da412 commit adccc1b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Configurator/HouseRulesWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<CheckBox VerticalAlignment="Center" Content="Allow XP overflow" IsChecked="{Binding AllowXpOverflow}" Margin="0,5,0,5" ToolTip="Allows experience points to accumulate beyond the limit of the next level."/>
<CheckBox VerticalAlignment="Center" Content="Slower levelling" IsChecked="{Binding SlowerLevelling}" Margin="0,5,0,5" ToolTip="Adjuts the experience point curve such that you rapidly get to level 3, but level more slowly afterwards. You will be about 1-2 levels behind a normal game."/>
<CheckBox VerticalAlignment="Center" Content="Tolerant Townsfolk" IsChecked="{Binding TolerantTownsfolk}" Margin="0,5,0,5" ToolTip="Townsfolk will be tolerant of monstrous party members and NPCs."/>
<CheckBox VerticalAlignment="Center" Content="Prestige Classes (WIP preview)" IsChecked="{Binding NewClasses}" Margin="0,5,0,5" ToolTip="Enables Prestige Classes. Currently WIP!"/>
<CheckBox VerticalAlignment="Center" Content="Prestige Classes" IsChecked="{Binding NewClasses}" Margin="0,5,0,5" ToolTip="Enables Prestige Classes. Currently only the Eldritch Knight and Mystic Theurge are selectable, with more on the way :)"/>
</StackPanel>
<Button x:Name="button" Content="Ok" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
</Grid>
Expand Down
5 changes: 5 additions & 0 deletions TemplePlus/ai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1765,6 +1765,11 @@ class AiReplacements : public TempleFix
}
}
}*/
if (!triggerer || !attachee){
int dummy = 1;
if (!triggerer && !attachee)
return 0;
}
if (san == san_start_combat)
{
int dummy = 1;
Expand Down
2 changes: 1 addition & 1 deletion TemplePlus/ui/ui_char_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@ BOOL UiCharEditor::ClassNextBtnMsg(int widId, TigMsg * msg){
}

if (_msg->widgetEventType == TigMsgWidgetEvent::Entered) {
auto textboxText = fmt::format("Coming soon!");
auto textboxText = fmt::format("Prestige Classes\n\n Currently limited to Eldritch Knight and Mystic Theurge. The rest are on the way!");
if (textboxText.size() >= 1024)
textboxText[1023] = 0;
strcpy(temple::GetRef<char[1024]>(0x10C80CC0), &textboxText[0]);
Expand Down
Binary file modified tpdata/tpgamefiles.dat
Binary file not shown.

0 comments on commit adccc1b

Please sign in to comment.